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
Tianyi Cui
57a5cb4c94
Merge branch 'codex/simp-shared-acp-test-launcher' into codex/simp-trim-hook-snapshot-noise
2026-07-14 14:14:09 +08:00
Tianyi Cui
36b86fb045
Merge branch 'codex/simp-session-log-representation' into codex/simp-snapshot-fixture-inventory
2026-07-14 14:08:44 +08:00
Tianyi Cui
de44558f18
Merge branch 'codex/simp-snapshot-fixture-inventory' into codex/simp-shared-acp-test-launcher
2026-07-14 14:08:44 +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
deee72bdfb
Merge remote-tracking branch 'origin/master' into codex/model-experience-readmes-20260712
2026-07-14 13:24:54 +08:00
Tianyi Cui
c5e32955f8
Merge branch 'codex/simp-shared-acp-test-launcher' into codex/simp-trim-hook-snapshot-noise
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
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
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
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
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
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
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
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
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
99d2d5a092
Merge branch 'codex/simp-shared-acp-test-launcher' into codex/simp-trim-hook-snapshot-noise
2026-07-14 11:53:55 +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
Ziya
53556f9712
Merge remote-tracking branch 'upstream/master' into docs/i18n-capability
2026-07-13 20:51:12 -07: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
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
