Tianyi Cui
7c6ead8b6f
Merge branch 'codex/simp-hide-concrete-agent-loop' into codex/simp-hide-subagent-internals
2026-07-15 20:50:50 +08:00
Tianyi Cui
7396fb6fb5
Merge branch 'codex/simp-ui-identity-residue' into codex/simp-hide-concrete-agent-loop
2026-07-15 20:50:50 +08:00
Tianyi Cui
d6cc898a30
Merge branch 'codex/simp-unify-agent-session-id' into codex/simp-ui-identity-residue
2026-07-15 20:50:50 +08:00
Tianyi Cui
273dfca1a5
Merge branch 'codex/simp-agent-entry-state' into codex/simp-unify-agent-session-id
2026-07-15 20:50:50 +08:00
Tianyi Cui
c6817b5585
Merge branch 'codex/simp-compaction-surface' into codex/simp-agent-entry-state
2026-07-15 20:50:50 +08:00
Tianyi Cui
11af4e0cc6
Merge branch 'codex/simp-trim-hook-snapshot-noise' into codex/simp-compaction-surface
2026-07-15 20:50:50 +08:00
Tianyi Cui
ac6e397336
Merge branch 'codex/simp-snapshot-fixture-inventory' into codex/simp-shared-acp-test-launcher
2026-07-15 20:50:50 +08:00
Tianyi Cui
f56f39cb0f
Merge branch 'codex/simp-session-log-representation' into codex/simp-snapshot-fixture-inventory
2026-07-15 20:50:49 +08:00
Tianyi Cui
1c3bb4f8a8
Merge remote-tracking branch 'origin/master' into codex/simp-session-log-representation
2026-07-15 20:50:40 +08:00
Huanqi Cao
30a209aab5
fix(e2e): reach child quiescence before temp-dir cleanup in built-bin smokes
...
The acp built-bin smoke killed its child and immediately rm'd the temp
consumer dir; POSIX tolerates unlinking a live process's cwd, Windows fails
EBUSY while the child still holds its cwd and session-log handles (the CI
windows job's only red step). Await the child's exit after SIGKILL and give
both smokes' rm a brief retry for the OS handle-release lag.
2026-07-15 19:13:05 +08:00
Tianyi Cui
26a03cfbd6
Merge branch 'codex/simp-hide-concrete-agent-loop' into codex/simp-hide-subagent-internals
2026-07-15 17:55:57 +08:00
Tianyi Cui
d06500fe9b
Merge branch 'codex/simp-ui-identity-residue' into codex/simp-hide-concrete-agent-loop
2026-07-15 17:55:57 +08:00
Tianyi Cui
02da758a68
Merge branch 'codex/simp-unify-agent-session-id' into codex/simp-ui-identity-residue
2026-07-15 17:55:57 +08:00
Tianyi Cui
6245094fe1
Merge branch 'codex/simp-agent-entry-state' into codex/simp-unify-agent-session-id
2026-07-15 17:55:57 +08:00
Tianyi Cui
d48edf818f
Merge branch 'codex/simp-compaction-surface' into codex/simp-agent-entry-state
2026-07-15 17:55:57 +08:00
Tianyi Cui
87c900dfb2
Document compaction result diagnostics
2026-07-15 17:55:48 +08:00
Tianyi Cui
2176e25910
Merge branch 'codex/simp-trim-hook-snapshot-noise' into codex/simp-compaction-surface
2026-07-15 17:55:13 +08:00
Tianyi Cui
0b585e1d27
Merge branch 'codex/simp-snapshot-fixture-inventory' into codex/simp-shared-acp-test-launcher
2026-07-15 17:55:06 +08:00
Tianyi Cui
e2c9048c16
Merge branch 'codex/simp-session-log-representation' into codex/simp-snapshot-fixture-inventory
2026-07-15 17:55:05 +08:00
Tianyi Cui
25a5dc35ba
Refresh Cordis event API summaries
2026-07-15 17:53:51 +08:00
Tianyi Cui
263d8a6dff
Merge branch 'codex/simp-hide-concrete-agent-loop' into codex/simp-hide-subagent-internals
2026-07-15 17:37:08 +08:00
Tianyi Cui
e1c0d0b579
Merge branch 'codex/simp-ui-identity-residue' into codex/simp-hide-concrete-agent-loop
2026-07-15 17:37:08 +08:00
Tianyi Cui
cdeec6fc1d
Update built JSON-RPC probe path
2026-07-15 17:36:51 +08:00
Tianyi Cui
3460f9c10b
Merge branch 'codex/simp-agent-entry-state' into codex/simp-unify-agent-session-id
2026-07-15 17:26:29 +08:00
Tianyi Cui
8c7e2b4426
Merge branch 'codex/simp-hide-concrete-agent-loop' into codex/simp-hide-subagent-internals
2026-07-15 17:26:29 +08:00
Tianyi Cui
6ee2655cab
Merge branch 'codex/simp-ui-identity-residue' into codex/simp-hide-concrete-agent-loop
2026-07-15 17:26:29 +08:00
Tianyi Cui
9035ef1f98
Merge branch 'codex/simp-unify-agent-session-id' into codex/simp-ui-identity-residue
2026-07-15 17:26:29 +08:00
Tianyi Cui
f20f5c2958
Merge branch 'codex/simp-compaction-surface' into codex/simp-agent-entry-state
2026-07-15 17:26:28 +08:00
Tianyi Cui
8eccd5416e
Document restored compaction result fields
2026-07-15 17:26:28 +08:00
Tianyi Cui
0521ec02ef
Merge branch 'codex/simp-hide-concrete-agent-loop' into codex/simp-hide-subagent-internals
2026-07-15 17:24:08 +08:00
Tianyi Cui
7fd7261bcd
Merge branch 'codex/simp-ui-identity-residue' into codex/simp-hide-concrete-agent-loop
2026-07-15 17:24:08 +08:00
Tianyi Cui
d6ba1fef26
Merge branch 'codex/simp-agent-entry-state' into codex/simp-unify-agent-session-id
2026-07-15 17:24:07 +08:00
Tianyi Cui
6edb44657c
Merge branch 'codex/simp-unify-agent-session-id' into codex/simp-ui-identity-residue
2026-07-15 17:24:07 +08:00
Tianyi Cui
623c2fa8d2
Merge branch 'codex/simp-compaction-surface' into codex/simp-agent-entry-state
2026-07-15 17:24:07 +08:00
Tianyi Cui
d25a56b431
Restore CompactionResult diagnostics
2026-07-15 17:23:39 +08:00
Tianyi Cui
41e711c01e
Merge branch 'codex/simp-agent-entry-state' into codex/simp-unify-agent-session-id
2026-07-15 17:09:32 +08:00
Tianyi Cui
54485f7767
Merge branch 'codex/simp-compaction-surface' into codex/simp-agent-entry-state
2026-07-15 17:09:32 +08:00
Tianyi Cui
c2081d8abf
Merge branch 'codex/simp-trim-hook-snapshot-noise' into codex/simp-compaction-surface
2026-07-15 17:09:32 +08:00
Tianyi Cui
80fc984ee2
Merge branch 'codex/simp-hide-concrete-agent-loop' into codex/simp-hide-subagent-internals
2026-07-15 17:09:32 +08:00
Tianyi Cui
5a2f9182f6
Merge branch 'codex/simp-ui-identity-residue' into codex/simp-hide-concrete-agent-loop
2026-07-15 17:09:32 +08:00
Tianyi Cui
4c2ed42f48
Merge branch 'codex/simp-unify-agent-session-id' into codex/simp-ui-identity-residue
2026-07-15 17:09:32 +08:00
Tianyi Cui
8e7cf8cc10
Update ACP launcher example path
2026-07-15 17:09:18 +08:00
Tianyi Cui
0da51d416e
Merge branch 'codex/simp-hide-concrete-agent-loop' into codex/simp-hide-subagent-internals
2026-07-15 17:06:48 +08:00
Tianyi Cui
92bf506fb0
Merge branch 'codex/simp-ui-identity-residue' into codex/simp-hide-concrete-agent-loop
...
# Conflicts:
# docs/config-catalog.md
# packages/core/README.md
2026-07-15 17:06:39 +08:00
Tianyi Cui
3d26e83930
Merge branch 'codex/simp-unify-agent-session-id' into codex/simp-ui-identity-residue
...
# Conflicts:
# AGENTS.md
# knip.json
# packages/ui/jsonrpc/README.md
# scripts/run-gates.ts
2026-07-15 17:06:13 +08:00
Tianyi Cui
5ef3dd979f
Merge branch 'codex/simp-agent-entry-state' into codex/simp-unify-agent-session-id
...
# Conflicts:
# docs/config-catalog.md
# docs/cookbook/extension-cookbook.i18n.yaml
# docs/module-graph.md
# packages/examples/stdio-demo/README.md
# packages/examples/stdio-demo/src/index.ts
# pnpm-lock.yaml
2026-07-15 17:01:59 +08:00
Tianyi Cui
edd990c5d9
Merge branch 'codex/simp-compaction-surface' into codex/simp-agent-entry-state
2026-07-15 16:57:39 +08:00
Tianyi Cui
3ce477123c
Merge branch 'codex/simp-trim-hook-snapshot-noise' into codex/simp-compaction-surface
2026-07-15 16:57:39 +08:00
Tianyi Cui
d4bb9ce2c3
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/README.md
# packages/support/acp-snapshot/src/harness.ts
2026-07-15 16:57:26 +08:00
Tianyi Cui
c6731b4db3
Merge branch 'codex/simp-session-log-representation' into codex/simp-snapshot-fixture-inventory
2026-07-15 16:56:14 +08:00
