Commit Graph
886 Commits
Author SHA1 Message Date
Tianyi Cui e4a08fff9e Merge remote-tracking branch 'origin/master' into codex/simp-hide-fs-internals
# Conflicts:
#	packages/fs/fs-local/README.md
#	packages/fs/tool-fs/README.md
2026-07-14 15:43:35 +08:00
Tianyi Cui 6cbb3270c3 Merge branch 'codex/simp-prune-tools-prompt-surface' into codex/simp-drop-assembled-section-order 2026-07-14 15:42:52 +08:00
Tianyi Cui 3707aaa72e Merge branch 'codex/simp-prune-tools-prompt-surface' into codex/simp-prune-code-runtime-surface
# Conflicts:
#	packages/code-runtime/code-runtime-worker/README.md
#	packages/code-runtime/code-runtime/README.md
2026-07-14 15:42:39 +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 a5e1717059 Merge branch 'codex/simp-ui-identity-residue' into codex/simp-hide-concrete-agent-loop 2026-07-14 15:31:20 +08:00
Tianyi Cui e3767c64d9 Merge branch 'codex/simp-unify-agent-session-id' into codex/simp-ui-identity-residue 2026-07-14 15:31:13 +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
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
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
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 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 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 b5d3caf3d3 Merge remote-tracking branch 'origin/master' into codex/simp-share-loader-smoke-harness 2026-07-14 11:58:43 +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 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 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
Dudu-0223 eae8b8ce2e feat(ui): configure maxParallelToolCalls for factory-created agents
The acp and stdio-agent plugins only forwarded `model` into their created
agents, so every factory/ACP deployment was pinned to the agent-loop default
parallel cap with no cordis.yml override. Add a `maxParallelToolCalls` config
field (positive-integer validated) to both, threaded through the existing
per-agent options path — symmetric with `model`.
2026-07-14 11:55:39 +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
Tianyi Cui c74f17a143 docs: audit hook compatibility limits 2026-07-14 11:22:53 +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 8ab39267f3 Merge remote-tracking branch 'origin/master' into codex/truncated-design
# Conflicts:
#	docs/rfc/INDEX.md
2026-07-14 11:06:41 +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
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 8780a73750 Merge branch 'master' into session-query 2026-07-14 10:53: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 0c19d69507 Merge branch 'codex/simp-ui-identity-residue' into codex/simp-hide-concrete-agent-loop
# Conflicts:
#	packages/core/agent-loop/README.md
2026-07-14 10:35:15 +08:00
Tianyi Cui e150806171 Merge branch 'codex/simp-unify-agent-session-id' into codex/simp-ui-identity-residue 2026-07-14 10:30:04 +08:00