Commit Graph
1290 Commits
Author SHA1 Message Date
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
Tianyi Cui 04c956a900 Merge branch 'codex/simp-ui-identity-residue' into codex/simp-hide-concrete-agent-loop
# Conflicts:
#	docs/config-catalog.md
#	docs/cordis-catalog/events.md
#	docs/cordis-catalog/services.md
#	docs/event-producer-consumer.md
2026-07-14 14:28:40 +08:00
Tianyi Cui c158f72ac8 Merge branch 'codex/simp-unify-agent-session-id' into codex/simp-ui-identity-residue
# Conflicts:
#	docs/event-producer-consumer.md
2026-07-14 14:27:18 +08:00
Tianyi Cui b58cf7ec2f fix: coordinate overlapping configured reloads 2026-07-14 14:24:21 +08:00
Hypatia May dc60fe9572 Avoid retaining processed session seqs 2026-07-14 14:23:02 +08:00
Tianyi Cui 5caa9c4f33 Merge branch 'codex/simp-agent-entry-state' into codex/simp-unify-agent-session-id
# Conflicts:
#	docs/cordis-catalog/services.md
2026-07-14 14:14:22 +08:00
Tianyi Cui c920e8a2e8 Merge branch 'codex/simp-compaction-surface' into codex/simp-agent-entry-state 2026-07-14 14:14:09 +08:00
Tianyi Cui 539850578a fix: reject legacy header deltas on append 2026-07-14 14:06:28 +08:00
Hypatia May dbe65e1d13 Unify session surface validation 2026-07-14 13:49:36 +08:00
Tianyi Cui 89d8d56785 docs: omit model experience for generic packages 2026-07-14 13:31:31 +08:00
Tianyi Cui 4ce2f55fed Merge branch 'codex/simp-drop-assembled-section-order' into codex/simp-drop-unused-schema-default 2026-07-14 12:49:36 +08:00
Tianyi Cui 8f68e0465b Merge branch 'codex/simp-prune-tools-prompt-surface' into codex/simp-drop-assembled-section-order 2026-07-14 12:49:36 +08:00
Tianyi Cui c814975d51 Merge branch 'codex/simp-prune-tools-prompt-surface' into codex/simp-prune-code-runtime-surface 2026-07-14 12:49:36 +08:00
Tianyi Cui 458f87ea03 refactor: remove unused surface invalidation 2026-07-14 12:48:19 +08:00
Tianyi Cui 6b0de58b1c Merge branch 'codex/simp-ui-identity-residue' into codex/simp-hide-concrete-agent-loop
# Conflicts:
#	docs/config-catalog.md
#	docs/cordis-catalog/events.md
#	docs/cordis-catalog/services.md
#	docs/event-producer-consumer.md
2026-07-14 12:46:55 +08:00
Tianyi Cui faf438df58 Merge branch 'codex/simp-unify-agent-session-id' into codex/simp-ui-identity-residue
# Conflicts:
#	docs/event-producer-consumer.md
2026-07-14 12:46:39 +08:00
Tianyi Cui b47e4c5276 fix: suppress teardown startup failures 2026-07-14 12:45:12 +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 8a56ad0553 Merge branch 'codex/simp-compaction-surface' into codex/simp-agent-entry-state 2026-07-14 12:41:34 +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 49e45ff184 fix: reject legacy fallback headers 2026-07-14 12:32:44 +08:00
Tianyi Cui 91ad787ef4 Merge branch 'codex/simp-ui-identity-residue' into codex/simp-hide-concrete-agent-loop
# Conflicts:
#	docs/config-catalog.md
#	docs/cordis-catalog/events.md
#	docs/cordis-catalog/services.md
#	docs/event-producer-consumer.md
2026-07-14 12:26:33 +08:00
Tianyi Cui cb0bc7ee89 Merge branch 'codex/simp-unify-agent-session-id' into codex/simp-ui-identity-residue
# Conflicts:
#	docs/event-producer-consumer.md
2026-07-14 12:26:14 +08:00
Tianyi Cui a25c0f084f fix: totalize configured startup failures 2026-07-14 12:25:30 +08:00
Tianyi Cui 0567ff85cb Merge branch 'codex/simp-drop-assembled-section-order' into codex/simp-drop-unused-schema-default 2026-07-14 11:58:01 +08:00
Tianyi Cui c4c8ba1b8c Merge branch 'codex/simp-prune-tools-prompt-surface' into codex/simp-drop-assembled-section-order 2026-07-14 11:57:56 +08:00
Tianyi Cui 7e58e9a35b Merge branch 'codex/simp-prune-tools-prompt-surface' into codex/simp-prune-code-runtime-surface 2026-07-14 11:57:51 +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 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
Dudu-0223 5ab8f2e328 docs: correct fs/observed concurrency-safety wording
The read tool's isConcurrencySafe rationale called the fs/observed recorder
"commutative" and said concurrent reads "converge to one observed version",
overstating the guarantee: the WeakMap record is last-writer-wins. Safety comes
from write/edit re-checking the version in their in-lock CAS (a stale
observation only forces a later edit to fail closed with FS_STALE_VERSION), as
the RFC already states. Align the read comment, the ToolDefinition JSDoc, both
READMEs, and the regenerated catalogs.
2026-07-14 11:56:27 +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 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 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 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
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
Dudu-0223 8ab39267f3 Merge remote-tracking branch 'origin/master' into codex/truncated-design
# Conflicts:
#	docs/rfc/INDEX.md
2026-07-14 11:06:41 +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 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
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 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