Tianyi Cui
51f3a9e441
Merge remote-tracking branch 'origin/master' into codex/simp-prune-tools-prompt-surface
...
# Conflicts:
# packages/core/session/src/surface.ts
2026-07-14 11:57:39 +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
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
a50e8bc1f3
Merge remote-tracking branch 'origin/master' into codex/model-experience-readmes-20260712
...
# Conflicts:
# packages/bash/bash-sandbox/README.md
# packages/sandbox/sandbox-local/README.md
2026-07-14 11:28:08 +08:00
Hypatia May
d9714fb30b
Merge remote-tracking branch 'origin/master' into session-query-trace
2026-07-14 11:16:15 +08:00
Dudu-0223
30ba5bd23c
Merge remote-tracking branch 'origin/master' into codex/truncated-design
...
# Conflicts:
# docs/config-catalog.md
# docs/rfc/INDEX.md
# examples/acp-agent/README.md
# packages/bash/tool-bash/tests/tools.spec.ts
2026-07-14 10:57:29 +08:00
kingwl
85a2140781
Merge origin/master (single-exe pipeline #253 , duplication lint #281 , side-sessions RFC)
...
Beyond line merges: python/sdk-runtime's deploy manifest gains
@deepseek-ai/dsh-mode — the single-exe closure gate
(verify-runtime-closure) requires every workspace peer of dsh-acp, and
the bridge's type-only peer edge on dsh-mode counts; the AGENTS.md
efficiency section is condensed to fit the 1820-word ceiling after
master's single-exe additions. Catalogs and graphs regenerated.
2026-07-14 10:46:09 +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
Hypatia May
3b48adeabf
Merge remote-tracking branch 'origin/master' into session-query-trace-filter
...
# Conflicts:
# docs/rfc/INDEX.md
# packages/README.md
2026-07-14 10:14:57 +08:00
Tianyi Cui
3e2ba3f557
fix: stop ACP teardown when fallback kill fails
2026-07-14 10:13:05 +08:00
Tianyi Cui
17e7649b49
Merge branch 'codex/simp-agent-entry-state' into codex/simp-unify-agent-session-id
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
43812841a5
Merge branch 'codex/simp-agent-entry-state' into codex/simp-unify-agent-session-id
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
a21802ce14
Merge branch 'codex/simp-agent-entry-state' into codex/simp-unify-agent-session-id
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
93cb03b19e
Merge branch 'codex/simp-agent-entry-state' into codex/simp-unify-agent-session-id
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
Tianyi Cui
5a9d5f58a5
Merge branch 'codex/simp-agent-entry-state' into codex/simp-unify-agent-session-id
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
0dbee62981
Merge branch 'codex/simp-agent-entry-state' into codex/simp-unify-agent-session-id
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
3c90cd7a6f
Merge branch 'codex/simp-agent-entry-state' into codex/simp-unify-agent-session-id
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
5147495a3b
Merge branch 'codex/simp-agent-entry-state' into codex/simp-unify-agent-session-id
2026-07-14 06:09:02 +08:00
Tianyi Cui
60ce23d77c
fix: surface ACP launcher spawn failures
2026-07-14 06:07:37 +08:00
Tianyi Cui
818c37a992
Merge branch 'codex/simp-agent-entry-state' into codex/simp-unify-agent-session-id
2026-07-14 05:48:44 +08:00
Tianyi Cui
9028c9b63b
fix: contain ACP update predicate failures
2026-07-14 05:35:34 +08:00
Tianyi Cui
0815ff4db4
refactor: share loader smoke harness
2026-07-14 05:00:54 +08:00
Tianyi Cui
0236a12324
refactor: prune core tool and prompt surface
2026-07-14 02:54:30 +08:00
Tianyi Cui
17c99efcc1
fix: complete unified subagent identity
2026-07-14 02:24:55 +08:00
Tianyi Cui
709cc7200e
refactor: unify agent and session identity
2026-07-14 01:59:21 +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
461c0c598c
Merge branch 'codex/simp-session-dead-surface' into codex/simp-session-log-representation
2026-07-14 00:54:55 +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
d11b713e0a
Merge remote-tracking branch 'origin/master' into codex/trim-ai-prose
...
# Conflicts:
# docs/config-catalog.md
# scripts/gen-persistence-catalog.ts
# scripts/jsdoc.ts
# scripts/verify-md-wrap.ts
# scripts/verify-package-paths.ts
2026-07-14 00:47:30 +08:00
Tianyi Cui
6ad4b4fa42
fix: let snapshot recording create fixture inventory
2026-07-14 00:46:46 +08:00
Tianyi Cui
dd3941af99
Merge branch 'codex/simp-snapshot-fixture-inventory' into codex/simp-shared-acp-test-launcher
2026-07-14 00:38:11 +08:00
Tianyi Cui
bbddd782fd
Merge branch 'codex/simp-session-log-representation' into codex/simp-snapshot-fixture-inventory
...
# Conflicts:
# examples/acp-agent/tests/acp.snapshot.ts
2026-07-14 00:36:28 +08:00
Tianyi Cui
3a1332e3f0
Merge remote-tracking branch 'origin/master' into codex/model-experience-readmes-20260712
2026-07-14 00:36:28 +08:00
Tianyi Cui
788fb48d4c
Merge branch 'codex/simp-session-dead-surface' into codex/simp-session-log-representation
...
# Conflicts:
# docs/event-producer-consumer.md
2026-07-14 00:34:46 +08:00
Tianyi Cui
4d9f771f94
Merge remote-tracking branch 'origin/master' into codex/model-experience-readmes-20260712
...
# Conflicts:
# package.json
# packages/code-runtime/code-runtime-worker/README.md
# packages/workflow/tool-workflow/README.md
2026-07-14 00:34:25 +08:00
Tianyi Cui
53d9634043
chore: tighten TypeScript duplication lint
2026-07-14 00:24:04 +08:00
Tianyi Cui
eed43abe66
docs: address final model experience review
2026-07-14 00:22:52 +08:00
Tianyi Cui
0e7d539bbc
refactor: share the ACP test launcher
2026-07-14 00:18:00 +08:00