Tianyi Cui
7d40a9a0c5
Merge branch 'codex/simp-trim-hook-snapshot-noise' into codex/simp-compaction-surface
2026-07-14 12:39:44 +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
dc67def3f3
Merge branch 'codex/simp-session-log-representation' into codex/simp-snapshot-fixture-inventory
2026-07-14 12:34:31 +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
348281f745
Merge branch 'codex/simp-hide-concrete-agent-loop' into codex/simp-hide-subagent-internals
2026-07-14 12:26:42 +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
b8a454d4c4
Merge branch 'codex/simp-prune-web-seam-fields' into codex/simp-hide-web-provider-helpers
2026-07-14 12:12:49 +08:00
Tianyi Cui
db94c30cf9
Merge branch 'codex/simp-prune-llm-contract' into codex/simp-hide-llm-adapter-helpers
2026-07-14 12:12:49 +08:00
Tianyi Cui
9ace4073d5
Merge branch 'codex/simp-prune-bash-surface' into codex/simp-prune-sandbox-surface
2026-07-14 12:12:49 +08:00
Tianyi Cui
06b01852d5
Merge branch 'codex/simp-prune-tools-prompt-surface' into codex/simp-drop-assembled-section-order
2026-07-14 12:12:48 +08:00
Tianyi Cui
3ba92e70ad
Merge branch 'codex/simp-prune-tools-prompt-surface' into codex/simp-prune-code-runtime-surface
2026-07-14 12:12:48 +08:00
Tianyi Cui
7299cc4b3b
Merge branch 'codex/simp-shared-acp-test-launcher' into codex/simp-trim-hook-snapshot-noise
2026-07-14 12:12:40 +08:00
Tianyi Cui
1818f2e719
Merge branch 'codex/simp-trim-hook-snapshot-noise' into codex/simp-compaction-surface
2026-07-14 12:12:40 +08:00
Tianyi Cui
3c691bbc55
Merge branch 'codex/simp-snapshot-fixture-inventory' into codex/simp-shared-acp-test-launcher
2026-07-14 12:12:40 +08:00
Tianyi Cui
dae5fb9fb6
Merge branch 'codex/simp-hide-concrete-agent-loop' into codex/simp-hide-subagent-internals
2026-07-14 12:12:40 +08:00
Tianyi Cui
5c5875ab7e
Merge branch 'codex/simp-ui-identity-residue' into codex/simp-hide-concrete-agent-loop
2026-07-14 12:12:40 +08:00
Tianyi Cui
e218e36e88
Merge branch 'codex/simp-unify-agent-session-id' into codex/simp-ui-identity-residue
2026-07-14 12:12:40 +08:00
Tianyi Cui
bbeeaed43c
Merge branch 'codex/simp-agent-entry-state' into codex/simp-unify-agent-session-id
2026-07-14 12:12:40 +08:00
Tianyi Cui
38041c43a4
Merge branch 'codex/simp-session-log-representation' into codex/simp-snapshot-fixture-inventory
2026-07-14 12:12:39 +08:00
Tianyi Cui
fa9f8a794c
Merge branch 'codex/simp-session-dead-surface' into codex/simp-session-log-representation
2026-07-14 12:12:39 +08:00
Tianyi Cui
f47ac06f46
Merge remote-tracking branch 'origin/master' into codex/simp-share-loader-smoke-harness
2026-07-14 12:12:28 +08:00
Tianyi Cui
2d55c249e9
Merge remote-tracking branch 'origin/master' into codex/simp-drop-skill-provider-events
2026-07-14 12:12:28 +08:00
Tianyi Cui
75caa2490f
Merge remote-tracking branch 'origin/master' into codex/simp-prune-web-seam-fields
2026-07-14 12:12:28 +08:00
Tianyi Cui
7cec4115ef
Merge remote-tracking branch 'origin/master' into codex/simp-prune-llm-contract
2026-07-14 12:12:28 +08:00
Tianyi Cui
a6e59ecad9
Merge remote-tracking branch 'origin/master' into codex/simp-prune-workflow-worker-surface
2026-07-14 12:12:27 +08:00
Tianyi Cui
36e4481c19
Merge remote-tracking branch 'origin/master' into codex/simp-prune-bash-surface
2026-07-14 12:12:27 +08:00
Tianyi Cui
f729d71010
Merge remote-tracking branch 'origin/master' into codex/simp-hide-fs-internals
2026-07-14 12:12:27 +08:00
Tianyi Cui
87a7b599a5
Merge remote-tracking branch 'origin/master' into codex/simp-session-dead-surface
2026-07-14 12:12:27 +08:00
Tianyi Cui
b0e9c595b7
Merge remote-tracking branch 'origin/master' into codex/simp-prune-tools-prompt-surface
2026-07-14 12:12:27 +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
0f86a00299
Merge remote-tracking branch 'origin/master' into codex/simp-drop-skill-provider-events
2026-07-14 11:58:39 +08:00
Tianyi Cui
c739e32a73
Merge branch 'codex/simp-prune-web-seam-fields' into codex/simp-hide-web-provider-helpers
2026-07-14 11:58:36 +08:00
Tianyi Cui
414f696a74
Merge remote-tracking branch 'origin/master' into codex/simp-prune-web-seam-fields
2026-07-14 11:58:31 +08:00
Tianyi Cui
e5a684161c
Merge branch 'codex/simp-prune-llm-contract' into codex/simp-hide-llm-adapter-helpers
2026-07-14 11:58:27 +08:00
Tianyi Cui
6a0466583b
Merge remote-tracking branch 'origin/master' into codex/simp-prune-llm-contract
2026-07-14 11:58:21 +08:00
Tianyi Cui
880812939c
Merge remote-tracking branch 'origin/master' into codex/simp-prune-workflow-worker-surface
2026-07-14 11:58:17 +08:00
Tianyi Cui
9702c07191
Merge branch 'codex/simp-prune-bash-surface' into codex/simp-prune-sandbox-surface
2026-07-14 11:58:13 +08:00
Tianyi Cui
c8aa2302dc
Merge remote-tracking branch 'origin/master' into codex/simp-prune-bash-surface
2026-07-14 11:58:10 +08:00
Tianyi Cui
0ba3f1f110
Merge remote-tracking branch 'origin/master' into codex/simp-hide-fs-internals
2026-07-14 11:58:06 +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
99db6e88ed
Merge branch 'codex/simp-hide-concrete-agent-loop' into codex/simp-hide-subagent-internals
2026-07-14 11:56:52 +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
Dudu-0223