Hypatia May
97f5ec95cd
Merge remote-tracking branch 'origin/master' into session-query-trace
...
# Conflicts:
# docs/cordis-catalog/services.md
# packages/core/session/README.md
# packages/support/invariants/src/index.ts
# packages/support/invariants/tests/invariants.spec.ts
2026-07-14 17:31:46 +08:00
Tianyi Cui
32ed403500
Merge remote-tracking branch 'origin/master' into codex/simp-prune-tools-prompt-surface
...
# Conflicts:
# docs/config-catalog.md
# docs/cordis-catalog/services.md
# packages/core/agent-loop/src/loop.ts
# packages/core/session/README.md
# packages/core/session/tests/derived-cache.spec.ts
2026-07-14 17:30:34 +08:00
Tianyi Cui
4cea4979c6
docs: classify loader smoke support surface
2026-07-14 16:24:21 +08:00
Tianyi Cui
71790b7047
Merge remote-tracking branch 'origin/master' into codex/simp-share-loader-smoke-harness
...
# Conflicts:
# packages/support/README.md
2026-07-14 16:10:26 +08:00
Tianyi Cui
6682149348
Merge remote-tracking branch 'origin/master' into codex/simp-prune-tools-prompt-surface
2026-07-14 15:41:46 +08:00
Tianyi Cui
440afff96e
Merge branch 'codex/simp-agent-entry-state' into codex/simp-unify-agent-session-id
...
# Conflicts:
# packages/ui/stdio-agent/README.md
2026-07-14 15:27:32 +08:00
Tianyi Cui
a30660a63f
Merge branch 'codex/simp-snapshot-fixture-inventory' into codex/simp-shared-acp-test-launcher
...
# Conflicts:
# packages/support/README.md
# packages/support/acp-snapshot/README.md
2026-07-14 15:26:34 +08:00
Tianyi Cui
2ef709a496
Merge branch 'codex/simp-session-log-representation' into codex/simp-snapshot-fixture-inventory
2026-07-14 15:25:36 +08:00
Tianyi Cui
443526285e
Merge branch 'codex/simp-session-dead-surface' into codex/simp-session-log-representation
...
# Conflicts:
# docs/persistence-catalog.md
# packages/bash/bash/src/session-mode.ts
2026-07-14 15:25:26 +08:00
Tianyi Cui
7e9bf9b951
refactor: remove impossible ACP drain branch
2026-07-14 15:06:33 +08:00
Hypatia May
eb42eeda13
Merge remote-tracking branch 'origin/master' into session-query-trace
...
# Conflicts:
# packages/session-query/session-query/README.md
# packages/support/invariants/src/index.ts
2026-07-14 14:40:26 +08:00
Tianyi Cui
8590ba00a4
Merge remote-tracking branch 'origin/master' into codex/trim-ai-prose
...
# Conflicts:
# docs/AGENTS.md
# docs/config-catalog.md
# packages/bash/bash-sandbox/src/index.ts
# packages/bash/bash/src/session-mode.ts
# packages/bash/tool-bash/README.md
# packages/code-runtime/code-runtime-worker/README.md
# packages/compact/compact/src/index.ts
# packages/core/agent-core/README.md
# packages/hooks/hooks-claude/src/config.ts
# packages/hooks/hooks-claude/src/index.ts
# packages/hooks/hooks-codex/src/config.ts
# packages/hooks/hooks-codex/src/index.ts
# packages/llm/llm/README.md
# packages/session-persistence/session-persistence-jsonl/README.md
# packages/session-persistence/session-persistence/README.md
# packages/skill/skill-local/README.md
# packages/support/acp-snapshot/README.md
# packages/support/invariants/src/index.ts
# packages/ui/acp/README.md
# packages/ui/jsonrpc-agent/README.md
# packages/ui/jsonrpc/README.md
# packages/ui/permission/README.md
# packages/ui/user-approval/README.md
# packages/ui/user-interaction/README.md
# packages/web/web-search-deepseek/README.md
2026-07-14 14:37:16 +08:00
Hypatia May
dc60fe9572
Avoid retaining processed session seqs
2026-07-14 14:23:02 +08:00
Hypatia May
dbe65e1d13
Unify session surface validation
2026-07-14 13:49:36 +08:00
Tianyi Cui
253f707c35
Merge branch 'codex/simp-agent-entry-state' into codex/simp-unify-agent-session-id
...
# Conflicts:
# docs/cordis-catalog/services.md
2026-07-14 12:41:47 +08:00
Tianyi Cui
2027c70a17
fix: drain failed ACP launches
2026-07-14 12:38:32 +08:00
Tianyi Cui
85a1bbc7d5
Merge branch 'codex/simp-snapshot-fixture-inventory' into codex/simp-shared-acp-test-launcher
2026-07-14 12:36:59 +08:00
Tianyi Cui
287041e39e
fix: preserve malformed snapshot fixtures
2026-07-14 12:35:25 +08:00
Tianyi Cui
1ab64dba62
Merge remote-tracking branch 'origin/master' into codex/trim-ai-prose
...
# Conflicts:
# docs/config-catalog.md
# docs/development.i18n.yaml
# docs/development.zh.md
# docs/rfc/implemented/feature/2026-06-14-acp-agent-client-protocol.md
# docs/rfc/implemented/feature/2026-07-06-sandbox.md
# examples/AGENTS.md
# examples/README.md
# examples/acp-agent/README.md
# examples/acp-agent/cordis.yml
# examples/acp-agent/tests/acp.e2e.ts
# examples/acp-agent/tests/escalation.e2e.ts
# examples/sandbox-acp-agent/README.md
# examples/sandbox-acp-agent/cordis.snapshot.yml
# examples/sandbox-acp-agent/cordis.yml
# examples/sandbox-acp-agent/tests/acp.snapshot.ts
# packages/ui/acp-agent/src/bin.ts
# packages/ui/acp/README.md
# packages/ui/jsonrpc-agent/README.md
# packages/ui/jsonrpc-agent/src/bin.ts
# scripts/verify-translation-pairing.ts
2026-07-14 12:34:14 +08:00
Tianyi Cui
b5d3caf3d3
Merge remote-tracking branch 'origin/master' into codex/simp-share-loader-smoke-harness
2026-07-14 11:58:43 +08:00
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
