Commit Graph

915 Commits

Author SHA1 Message Date
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
8780a73750 Merge branch 'master' into session-query 2026-07-14 10:53:25 +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
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
f2664e91de Merge branch 'codex/simp-compaction-surface' into codex/simp-agent-entry-state 2026-07-14 09:55:31 +08:00
Tianyi Cui
a98a0696f2 Merge branch 'codex/simp-trim-hook-snapshot-noise' into codex/simp-compaction-surface 2026-07-14 09:55:31 +08:00
Tianyi Cui
a8c0e8a03c test: cover successful ACP cleanup failure 2026-07-14 09:55:15 +08:00
Tianyi Cui
4b1b9cce3a Merge branch 'codex/simp-compaction-surface' into codex/simp-agent-entry-state 2026-07-14 09:46:31 +08:00
Tianyi Cui
1c8668c406 Merge branch 'codex/simp-trim-hook-snapshot-noise' into codex/simp-compaction-surface 2026-07-14 09:46:31 +08:00
Tianyi Cui
6b59b6050e fix: preserve ACP scenario cleanup failures 2026-07-14 09:43:12 +08:00
Tianyi Cui
d706a7035d Merge branch 'codex/simp-compaction-surface' into codex/simp-agent-entry-state 2026-07-14 09:19:55 +08:00
Tianyi Cui
bc21f8d2f8 Merge branch 'codex/simp-trim-hook-snapshot-noise' into codex/simp-compaction-surface 2026-07-14 09:19:55 +08:00
Tianyi Cui
d4c96deac3 refactor: share ACP callback cleanup 2026-07-14 09:19:02 +08:00
Tianyi Cui
9d35517809 Merge branch 'codex/simp-compaction-surface' into codex/simp-agent-entry-state 2026-07-14 09:13:57 +08:00
Tianyi Cui
2a787ae84d Merge branch 'codex/simp-trim-hook-snapshot-noise' into codex/simp-compaction-surface 2026-07-14 09:13:57 +08:00
Tianyi Cui
e784e4dce5 fix: await ACP client callbacks during shutdown 2026-07-14 09:12:32 +08:00
Hypatia May
e9f0c37745 Merge remote-tracking branch 'origin/master' into session-query
# Conflicts:
#	docs/rfc/INDEX.md
#	packages/README.md
2026-07-14 08:36:06 +08:00
Tianyi Cui
f9c597ece0 Merge branch 'codex/simp-compaction-surface' into codex/simp-agent-entry-state 2026-07-14 07:30:01 +08:00
Tianyi Cui
26489351ba Merge branch 'codex/simp-trim-hook-snapshot-noise' into codex/simp-compaction-surface 2026-07-14 07:30:01 +08:00
Tianyi Cui
0b492e6e62 fix: drain ACP test launcher streams 2026-07-14 07:22:22 +08:00
Tianyi Cui
bee4b5414e Merge branch 'codex/simp-compaction-surface' into codex/simp-agent-entry-state 2026-07-14 07:01:30 +08:00
Tianyi Cui
033d4ec266 Merge branch 'codex/simp-trim-hook-snapshot-noise' into codex/simp-compaction-surface 2026-07-14 07:01:30 +08:00
Tianyi Cui
e2a5a160d3 fix: settle ACP update waiters on shutdown 2026-07-14 07:00:10 +08:00
Tianyi Cui
e3865bce25 Merge branch 'codex/simp-compaction-surface' into codex/simp-agent-entry-state 2026-07-14 06:41:36 +08:00
Tianyi Cui
def127a1b2 Merge branch 'codex/simp-trim-hook-snapshot-noise' into codex/simp-compaction-surface 2026-07-14 06:41:36 +08:00
Tianyi Cui
140d32681e fix: make ACP test teardown failure-safe 2026-07-14 06:33:22 +08:00
Tianyi Cui
ac6d65b4b7 Merge branch 'codex/simp-compaction-surface' into codex/simp-agent-entry-state 2026-07-14 06:08:58 +08:00
Tianyi Cui
d68bfb1de3 Merge branch 'codex/simp-trim-hook-snapshot-noise' into codex/simp-compaction-surface 2026-07-14 06:08:54 +08:00
Tianyi Cui
60ce23d77c fix: surface ACP launcher spawn failures 2026-07-14 06:07:37 +08:00
Tianyi Cui
867f41bad7 Merge branch 'codex/simp-compaction-surface' into codex/simp-agent-entry-state 2026-07-14 05:47:46 +08:00
Tianyi Cui
4640f05976 Merge branch 'codex/simp-trim-hook-snapshot-noise' into codex/simp-compaction-surface 2026-07-14 05:46:47 +08:00
Tianyi Cui
9028c9b63b fix: contain ACP update predicate failures 2026-07-14 05:35:34 +08:00
Tianyi Cui
7a33ee94be refactor: remove agent entry mirror 2026-07-14 01:29:16 +08:00
Tianyi Cui
d7de8a8d13 refactor: narrow compaction surface 2026-07-14 01:24:20 +08:00
Tianyi Cui
c378dbf36a Merge remote-tracking branch 'origin/master' into unify-acp-example 2026-07-14 01:11:37 +08:00
Tianyi Cui
e3d7bb62d8 fix(permission): address human review feedback 2026-07-14 01:09:44 +08:00
Tianyi Cui
8f99e424c4 Merge branch 'codex/simp-snapshot-fixture-inventory' into codex/simp-shared-acp-test-launcher 2026-07-14 01:04:00 +08:00
Tianyi Cui
2a75f0893a Merge branch 'codex/simp-session-log-representation' into codex/simp-snapshot-fixture-inventory 2026-07-14 01:02:41 +08:00
Tianyi Cui
b35d66b86d fix: reject legacy session events on every path 2026-07-14 00:59:25 +08:00
Tianyi Cui
cdc3522e48 Merge remote-tracking branch 'origin/master' into unify-acp-example
# Conflicts:
#	docs/config-catalog.md
#	docs/module-graph.md
#	pnpm-lock.yaml
2026-07-14 00:56:28 +08:00
Tianyi Cui
461c0c598c Merge branch 'codex/simp-session-dead-surface' into codex/simp-session-log-representation 2026-07-14 00:54:55 +08:00
Tianyi Cui
36a4b16f18 Merge remote-tracking branch 'origin/master' into codex/simp-session-dead-surface 2026-07-14 00:53:26 +08:00
Tianyi Cui
f0cad87492 Merge branch 'codex/simp-snapshot-fixture-inventory' into codex/simp-shared-acp-test-launcher 2026-07-14 00:49:27 +08:00
Tianyi Cui
6ad4b4fa42 fix: let snapshot recording create fixture inventory 2026-07-14 00:46:46 +08:00