Commit Graph

1045 Commits

Author SHA1 Message Date
Tianyi Cui
99db6e88ed Merge branch 'codex/simp-hide-concrete-agent-loop' into codex/simp-hide-subagent-internals 2026-07-14 11:56:52 +08:00
Tianyi Cui
e2ba1e61da Merge branch 'codex/simp-ui-identity-residue' into codex/simp-hide-concrete-agent-loop 2026-07-14 11:56:47 +08:00
Tianyi Cui
4cdbe564d8 Merge branch 'codex/simp-unify-agent-session-id' into codex/simp-ui-identity-residue
# Conflicts:
#	docs/config-catalog.md
2026-07-14 11:56:35 +08:00
Tianyi Cui
9272d2871b Merge branch 'codex/simp-agent-entry-state' into codex/simp-unify-agent-session-id
# Conflicts:
#	docs/config-catalog.md
#	docs/cordis-catalog/services.md
2026-07-14 11:56:09 +08:00
Tianyi Cui
839538fdc8 Merge branch 'codex/simp-compaction-surface' into codex/simp-agent-entry-state 2026-07-14 11:54:03 +08:00
Tianyi Cui
633a18269d Merge branch 'codex/simp-trim-hook-snapshot-noise' into codex/simp-compaction-surface 2026-07-14 11:53:59 +08:00
Tianyi Cui
795371a209 Merge branch 'codex/simp-snapshot-fixture-inventory' into codex/simp-shared-acp-test-launcher
# Conflicts:
#	examples/acp-agent/tests/acp.e2e.ts
#	examples/acp-agent/tests/escalation.e2e.ts
#	examples/acp-agent/tests/hooks.e2e.ts
#	packages/support/acp-snapshot/src/harness.ts
2026-07-14 11:53:45 +08:00
Tianyi Cui
fd5ee06a97 Merge branch 'codex/simp-session-log-representation' into codex/simp-snapshot-fixture-inventory 2026-07-14 11:49:56 +08:00
Tianyi Cui
4d5fb2cb1d Merge branch 'codex/simp-session-dead-surface' into codex/simp-session-log-representation
# Conflicts:
#	docs/core-data-structures/session.md
#	docs/rfc/implemented/feature/2026-07-06-sandbox.md
#	examples/acp-agent/tests/snapshots/permission-switching/system-prompt.golden.md
#	examples/sandbox-acp-agent/tests/acp.snapshot.ts
#	examples/sandbox-acp-agent/tests/snapshots/mode-switching/session.jsonl
#	packages/core/session/README.md
#	packages/core/session/src/index.ts
#	packages/core/session/src/surface.ts
#	packages/core/session/tests/surface.spec.ts
#	scripts/type-equiv.manifest.json
2026-07-14 11:49:46 +08:00
Tianyi Cui
34fe20962f Merge remote-tracking branch 'origin/master' into codex/simp-session-dead-surface
# Conflicts:
#	packages/core/session/src/surface.ts
2026-07-14 11:39:11 +08:00
Tianyi Cui
6ec1c6ee5d Merge branch 'codex/simp-hide-concrete-agent-loop' into codex/simp-hide-subagent-internals 2026-07-14 11:35:59 +08:00
Tianyi Cui
545c7d57d3 Merge branch 'codex/simp-ui-identity-residue' into codex/simp-hide-concrete-agent-loop
# Conflicts:
#	docs/event-producer-consumer.md
2026-07-14 11:35:51 +08:00
Tianyi Cui
3746c37882 Merge branch 'codex/simp-unify-agent-session-id' into codex/simp-ui-identity-residue
# Conflicts:
#	docs/event-producer-consumer.md
2026-07-14 11:35:29 +08:00
Tianyi Cui
7d6ef0a472 fix: contain config failure observers 2026-07-14 11:33:36 +08:00
Tianyi Cui
1b41675036 Merge branch 'codex/simp-hide-concrete-agent-loop' into codex/simp-hide-subagent-internals 2026-07-14 11:27:42 +08:00
Tianyi Cui
54bd21cf58 Merge branch 'codex/simp-ui-identity-residue' into codex/simp-hide-concrete-agent-loop
# Conflicts:
#	docs/config-catalog.md
#	docs/cordis-catalog/services.md
#	docs/event-producer-consumer.md
2026-07-14 11:27:35 +08:00
Tianyi Cui
0d24cb14cb Merge branch 'codex/simp-unify-agent-session-id' into codex/simp-ui-identity-residue
# Conflicts:
#	docs/event-producer-consumer.md
2026-07-14 11:27:12 +08:00
Tianyi Cui
c1fb97c63a fix: surface config startup failures 2026-07-14 11:23:38 +08:00
Tianyi Cui
8ee8c7e5ee Merge branch 'codex/simp-hide-concrete-agent-loop' into codex/simp-hide-subagent-internals 2026-07-14 11:04:32 +08:00
Tianyi Cui
cce3df55a9 Merge branch 'codex/simp-ui-identity-residue' into codex/simp-hide-concrete-agent-loop
# Conflicts:
#	docs/event-producer-consumer.md
2026-07-14 11:04:12 +08:00
Tianyi Cui
63936dd884 Merge branch 'codex/simp-unify-agent-session-id' into codex/simp-ui-identity-residue 2026-07-14 11:03:48 +08:00
Tianyi Cui
e8f1bd41f5 fix: buffer stdio until exact session starts 2026-07-14 11:02:18 +08:00
Tianyi Cui
8d9d6e0eca Merge branch 'codex/simp-hide-concrete-agent-loop' into codex/simp-hide-subagent-internals 2026-07-14 10:54:35 +08:00
Tianyi Cui
7d30906ee4 Merge branch 'codex/simp-ui-identity-residue' into codex/simp-hide-concrete-agent-loop
# Conflicts:
#	docs/config-catalog.md
#	docs/cordis-catalog/services.md
2026-07-14 10:54:25 +08:00
Tianyi Cui
8780a73750 Merge branch 'master' into session-query 2026-07-14 10:53:25 +08:00
Tianyi Cui
783074aa4c Merge branch 'codex/simp-unify-agent-session-id' into codex/simp-ui-identity-residue 2026-07-14 10:51:00 +08:00
Tianyi Cui
46b8bce03a fix: join exact session startup on teardown 2026-07-14 10:49:15 +08:00
Tianyi Cui
547892b9d9 Merge branch 'codex/simp-hide-concrete-agent-loop' into codex/simp-hide-subagent-internals 2026-07-14 10:40:33 +08:00
Tianyi Cui
03d3e006b3 Merge branch 'codex/simp-ui-identity-residue' into codex/simp-hide-concrete-agent-loop 2026-07-14 10:40:33 +08:00
Tianyi Cui
3659c8a11f Merge branch 'codex/simp-unify-agent-session-id' into codex/simp-ui-identity-residue 2026-07-14 10:40:33 +08:00
Tianyi Cui
949ee03377 test: cover exact session restore failure 2026-07-14 10:38:53 +08:00
Tianyi Cui
a52d85b3d7 Merge branch 'codex/simp-hide-concrete-agent-loop' into codex/simp-hide-subagent-internals 2026-07-14 10:35:30 +08:00
Tianyi Cui
0c19d69507 Merge branch 'codex/simp-ui-identity-residue' into codex/simp-hide-concrete-agent-loop
# Conflicts:
#	packages/core/agent-loop/README.md
2026-07-14 10:35:15 +08:00
Tianyi Cui
cf21e252fa fix: recognize provider-owned local subagents 2026-07-14 10:32:02 +08:00
Tianyi Cui
e150806171 Merge branch 'codex/simp-unify-agent-session-id' into codex/simp-ui-identity-residue 2026-07-14 10:30:04 +08:00
Tianyi Cui
656ae95263 test: await exact stdio startup condition 2026-07-14 10:28:04 +08:00
Tianyi Cui
816b6e4c68 fix: restore exact config sessions on loop reload 2026-07-14 10:25:49 +08:00
Tianyi Cui
be34b9c545 Merge branch 'codex/simp-compaction-surface' into codex/simp-agent-entry-state 2026-07-14 10:15:54 +08:00
Tianyi Cui
b1f1d611e1 Merge branch 'codex/simp-hide-concrete-agent-loop' into codex/simp-hide-subagent-internals 2026-07-14 10:15:54 +08:00
Tianyi Cui
50d96689ac Merge branch 'codex/simp-ui-identity-residue' into codex/simp-hide-concrete-agent-loop 2026-07-14 10:15:54 +08:00
Tianyi Cui
9bf4ea6b7d Merge branch 'codex/simp-unify-agent-session-id' into codex/simp-ui-identity-residue 2026-07-14 10:15:54 +08:00
Tianyi Cui
e87204314e Merge branch 'codex/simp-agent-entry-state' into codex/simp-unify-agent-session-id 2026-07-14 10:15:54 +08:00
Tianyi Cui
e1bfa47962 Merge branch 'codex/simp-trim-hook-snapshot-noise' into codex/simp-compaction-surface 2026-07-14 10:15:53 +08:00
Tianyi Cui
3e2ba3f557 fix: stop ACP teardown when fallback kill fails 2026-07-14 10:13:05 +08:00
Tianyi Cui
7515e8eec0 Merge branch 'codex/simp-hide-concrete-agent-loop' into codex/simp-hide-subagent-internals 2026-07-14 10:06:29 +08:00
Tianyi Cui
df955c4cc5 Merge branch 'codex/simp-ui-identity-residue' into codex/simp-hide-concrete-agent-loop 2026-07-14 10:06:29 +08:00
Tianyi Cui
db3e97fc17 test: create built probe child in parent scope 2026-07-14 10:05:19 +08:00
Tianyi Cui
5c5aedf869 Merge branch 'codex/simp-hide-concrete-agent-loop' into codex/simp-hide-subagent-internals 2026-07-14 10:01:45 +08:00
Tianyi Cui
0e97d4e13b Merge branch 'codex/simp-ui-identity-residue' into codex/simp-hide-concrete-agent-loop 2026-07-14 10:01:45 +08:00
Tianyi Cui
00462f80a6 docs: expose agent ownership in Cordis catalog 2026-07-14 10:01:36 +08:00