pku-xht
396925ad4c
Merge pull request #2137 from deepseek-harness/codex/product-subagent-presets
...
feat(agent-presets): add Codex and Claude Code subagent tools
2026-08-10 23:43:23 +08:00
Hypatia May
76061417d9
Merge remote-tracking branch 'origin/master' into fix/continuable-subagent-policy-inheritance
...
# Conflicts:
# examples/acp-agent/tests/snapshots/advanced-toolchain/session.1.jsonl
# examples/acp-agent/tests/snapshots/advanced-toolchain/session.2.jsonl
# examples/acp-agent/tests/snapshots/advanced-toolchain/session.jsonl
# examples/headless-agent/tests/snapshots/advanced-toolchain/session.1.jsonl
# examples/headless-agent/tests/snapshots/advanced-toolchain/session.2.jsonl
# examples/headless-agent/tests/snapshots/advanced-toolchain/session.jsonl
2026-08-10 22:02:36 +08:00
pku-xht
9a2799e941
Merge master at 261989e36e
2026-08-10 21:55:57 +08:00
Hypatia May
2b2899b4ce
Merge remote-tracking branch 'origin/master' into fix/continuable-subagent-policy-inheritance
...
# Conflicts:
# docs/module-graph.i18n.yaml
# docs/module-graph.md
# docs/module-graph.zh.md
# packages/subagent/subagent-inprocess/src/index.ts
# packages/subagent/subagent/package.json
# packages/subagent/subagent/src/child-agent.ts
# packages/subagent/subagent/src/continuation.ts
# packages/subagent/subagent/tsconfig.json
2026-08-10 21:42:45 +08:00
Turtle
993550e6c8
refactor: remove repository plugin path
2026-08-10 21:32:13 +08:00
pku-xht
e6b6f1a047
Merge master at 35eeb4a112
2026-08-10 20:25:58 +08:00
Hypatia May
501c3a8ab6
fix(subagent): pin delegated child approvals to 'never' within the inherited sandbox scope
...
A delegated in-process child now acts only within the sandbox scope fixed
at delegation: captureDelegatedPolicyOverrides still snapshots the parent's
explicit sandbox override but pins the child approval policy to 'never'
(instead of inheriting the parent's), so every child ask — sandbox_permissions
escalations included — is rejected deterministically by ApprovalService
before any answerer, with the audit pair still logged. Every in-process
child additionally receives the scoped subagent:delegation runtime-context
statement telling it to report a scope limitation instead of retrying.
Supersedes the approval half of the policy-inheritance decision (new Agent
Note cross-linked from both prior notes and the approval-seam Q&A); refreshed
child snapshot fixtures carry the pinned event, and
subagent-published-run-failure now persists a one-event child log.
2026-08-10 19:17:37 +08:00
ZiyaZhang
191c7625a4
Merge master and repair CI for bounded diff basis
2026-08-10 01:18:38 -07:00
Hypatia May
9ff522ee60
Merge remote-tracking branch 'origin/master' into fix/continuable-subagent-policy-inheritance
2026-08-10 15:55:36 +08:00
creatixchu
2fea703d67
Merge remote-tracking branch 'origin/master' into codex/pr-555-ci-fix
...
# Conflicts:
# docs/module-graph.i18n.yaml
# docs/module-graph.md
# docs/module-graph.zh.md
# packages/client/ui-conversation/src/client/input/hub.ts
# packages/client/ui-conversation/tests/input-bar.spec.tsx
# packages/client/ui-conversation/tests/service-orchestration.spec.ts
2026-08-10 15:19:32 +08:00
Hypatia May
3639b10c83
Merge remote-tracking branch 'origin/master' into fix/continuable-subagent-policy-inheritance
...
# Conflicts:
# docs/event-producer-consumer.i18n.yaml
# docs/event-producer-consumer.md
# docs/event-producer-consumer.zh.md
2026-08-10 14:36:08 +08:00
pku-xht
95d5735e05
Merge commit '851f05c4f8ae58415224ce1b562962b0c39621ac' into codex/product-subagent-presets
...
# Conflicts:
# packages/bundle/base/tests/base.spec.ts
2026-08-10 13:05:13 +08:00
pku-xht
b1d67a6935
feat(agent-presets): add Codex and Claude Code subagent tools
2026-08-10 12:45:05 +08:00
Huanqi Cao
c9285753de
Merge branch 'merge/1829-master' into merge/1990-1829
...
# Conflicts:
# docs/module-graph.i18n.yaml
# docs/module-graph.md
# docs/module-graph.zh.md
2026-08-10 12:35:32 +08:00
creatixchu
3764ce62a5
Merge remote-tracking branch 'origin/master' into codex/pr-555-ci-fix
...
# Conflicts:
# docs/config-catalog.i18n.yaml
# docs/config-catalog.md
# docs/config-catalog.zh.md
# docs/module-graph.i18n.yaml
# docs/module-graph.md
# docs/module-graph.zh.md
# examples/acp-agent/tests/snapshots/cordis-inspect-jsdoc/session.jsonl
# packages/client/connection/src/client/fixture.ts
# packages/host/apiproxy/src/api-proxy.ts
2026-08-10 12:33:36 +08:00
Hypatia May
64e0fbfd6d
fix(subagent): inherit parent policy overrides in continuable children
...
A continuable background child (the default backgroundMode for both
delegation tools) never received the parent session's explicit
sandbox/approval overrides: materialization applied only child
composition, so a danger-full-access parent produced workspace-write
children whose every out-of-workspace operation raised an approval
prompt.
Move the one-shot driver's capture/append pair into the shared
child-agent module (captureDelegatedPolicyOverrides /
appendDelegatedPolicyOverrides) and call it from both paths:
startContinuable captures before its first await, only fresh
materialization appends the source-tagged events (after any fork seed),
and a cold resume replays the persisted delegation events instead of
re-capturing the parent.
Adds the continuable inheritance unit suite, the ACP snapshot scenario
subagent-continuable-inheritance (fails without the fix), the
continuable policy-inheritance Agent Note, and the seam-level README
contract, with bilingual counterparts.
Fixes #1692
2026-08-10 12:16:19 +08:00
Yichen Jiang
c06f9041fc
Merge remote-tracking branch 'origin/master' into worktree/web-multimodal-image-input
...
# Conflicts:
# .agents/notes/implemented/architecture/2026-07-05-reconstructable-requests.i18n.yaml
# docs/config-catalog.md
# docs/cordis-catalog/events.md
# docs/cordis-catalog/services.md
# docs/core-data-structures/core.md
# docs/core-data-structures/core.zh.md
# docs/core-data-structures/llm-streaming.i18n.yaml
# docs/core-data-structures/llm-streaming.md
# docs/core-data-structures/llm-streaming.zh.md
# docs/event-producer-consumer.md
# docs/module-graph.md
# docs/subsystems/attachment.i18n.yaml
# docs/subsystems/attachment.md
# docs/subsystems/attachment.zh.md
# docs/subsystems/core.i18n.yaml
# examples/acp-agent/tests/snapshots/cordis-inspect-jsdoc/session.jsonl
# packages/README.i18n.yaml
# packages/README.md
# packages/README.zh.md
# packages/client/runtime/package.json
# packages/client/ui-conversation/package.json
# packages/client/ui-conversation/src/client/chat/AssistantMarkdown.tsx
# packages/client/ui-conversation/src/client/chat/ChatView.tsx
# packages/client/ui-conversation/src/client/chat/MessageItem.tsx
# packages/client/ui-conversation/src/client/index.ts
# packages/client/ui-conversation/tests/input-bar.spec.tsx
# packages/compact/compact-basic/README.i18n.yaml
# packages/compact/compact-basic/README.md
# packages/compact/compact-basic/README.zh.md
# packages/host/apiproxy/src/api-proxy.ts
# packages/host/apiproxy/src/api/index.ts
# packages/host/apiproxy/src/api/sessions.ts
# packages/host/apiproxy/src/index.ts
# packages/host/apiproxy/tests/api-proxy-models.spec.ts
# packages/self-modification/tool-cordis/src/api-catalog.ts
# pnpm-lock.yaml
# scripts/type-equiv.manifest.json
2026-08-09 23:33:35 +08:00
Huanqi Cao
a29966b71f
Merge branch 'feat/windows-pwsh-default' into feat/windows-acl-sandbox
...
# Conflicts:
# .agents/notes/implemented/feature/2026-08-02-pwsh-tool-bash-parity.i18n.yaml
# .agents/notes/implemented/feature/2026-08-02-pwsh-tool-bash-parity.md
# .agents/notes/implemented/feature/2026-08-02-pwsh-tool-bash-parity.zh.md
# docs/module-graph.i18n.yaml
# docs/module-graph.md
# docs/module-graph.zh.md
# packages/bash/tool-pwsh/README.i18n.yaml
# packages/bash/tool-pwsh/README.md
# packages/bash/tool-pwsh/README.zh.md
2026-08-09 23:19:14 +08:00
Yichen Jiang
7ea8bad7ee
Merge branch 'stack/agent-profiles-5-web-ui' into stack/agent-profiles-8-authoring
...
# Conflicts:
# docs/module-graph.i18n.yaml
# docs/module-graph.md
# docs/module-graph.zh.md
# docs/subsystems/tools.i18n.yaml
# docs/subsystems/tools.md
# docs/subsystems/tools.zh.md
# examples/acp-agent/tests/snapshots/cordis-inspect-jsdoc/session.jsonl
2026-08-09 21:38:26 +08:00
Yichen Jiang
5aa10901ad
Merge branch 'stack/agent-profiles-1-seam' into stack/agent-profiles-3-wire
...
# Conflicts:
# examples/acp-agent/tests/snapshots/cordis-inspect-jsdoc/session.jsonl
2026-08-09 21:35:37 +08:00
imccyu
1566a00eeb
test compact checkpoint snapshot identity
2026-08-09 20:42:39 +08:00
Yichen Jiang
8612f39759
Merge remote-tracking branch 'origin/stack/agent-profiles-5-web-ui' into stack/agent-profiles-8-authoring
...
# Conflicts:
# packages/client/connection/README.i18n.yaml
# packages/client/connection/README.md
# packages/client/connection/README.zh.md
2026-08-09 20:41:55 +08:00
Yichen Jiang
f80d2a742e
Merge remote-tracking branch 'origin/stack/agent-profiles-1-seam' into stack/agent-profiles-3-wire
...
# Conflicts:
# docs/module-graph.md
# packages/host/apiproxy/src/api-proxy.ts
# packages/host/apiproxy/tsconfig.json
2026-08-09 20:33:55 +08:00
imccyu
522acc7432
test: update conversation assembly coverage and docs
2026-08-09 18:16:44 +08:00
Huanqi Cao
f5caadc808
Merge branch 'feat/windows-pwsh-default' into feat/windows-acl-sandbox
...
# Conflicts:
# packages/bash/pwsh-local/src/index.ts
# packages/sandbox/sandbox-local/src/index.ts
2026-08-09 17:50:55 +08:00
Tianyi Cui
ceba53edd7
fix(fs): observe absence before guarded recreation
2026-08-09 17:43:53 +08:00
Huanqi Cao
165ad7e969
Merge branch 'feat/windows-pwsh-default' into feat/windows-acl-sandbox
...
# Conflicts:
# .agents/notes/implemented/feature/2026-08-01-pwsh-tool-and-executor.i18n.yaml
# .agents/notes/implemented/feature/2026-08-01-pwsh-tool-and-executor.zh.md
# packages/bash/tool-pwsh/README.i18n.yaml
# packages/bash/tool-pwsh/README.zh.md
2026-08-09 16:59:52 +08:00
Turtle
3766e333b1
test(snapshot): refresh session query tool schema
2026-08-09 15:51:34 +08:00
ZiyaZhang
4bfa127eb7
Merge remote-tracking branch 'origin/master' into fs-overwrite-diff-bound-v2
2026-08-09 00:34:29 -07:00
Turtle
76b3353452
docs: call waterfall interception short-circuiting
2026-08-09 13:13:37 +08:00
ZiyaZhang
1a6037c9fb
Merge remote-tracking branch 'origin/master' into fs-overwrite-diff-bound-v2
...
# Conflicts:
# docs/subsystems/lsp.i18n.yaml
# packages/fs/fs-local/README.i18n.yaml
# packages/fs/fs-local/README.md
# packages/fs/fs-local/README.zh.md
# packages/fs/fs-local/src/index.ts
2026-08-08 12:20:09 -07:00
ZiyaZhang
9a299f9827
fix(fs-local): degrade basis I/O failures to null
...
Descriptor-phase errnos in readTextForDiff fold to before: null so a file
deleted or made unreadable after the caller's preflight cannot fail the
committed write; cancellation and non-errno faults still propagate. Drops
the now-covered isFile v8 ignore, extends llm-replay with catalog
capability parity (defaultMaxTokens/reasoningEfforts), and records the
fs-write-overwrite-bounded keyless snapshot pinning the over-limit
whole-file fallback through the real acp-agent composition.
2026-08-08 11:49:42 -07:00
Huanqi Cao
97a62fa639
Merge remote-tracking branch 'origin/feat/windows-pwsh-default' into feat/windows-acl-sandbox
...
# Conflicts:
# docs/module-graph.md
# knip.json
# packages/pty/pty-local/tests/index.spec.ts
# scripts/check-workspace-constraints.ts
2026-08-09 00:29:55 +08:00
Yichen Jiang
c0522f21d9
Merge branch 'stack/agent-profiles-5-web-ui' into stack/agent-profiles-8-authoring
2026-08-08 22:54:07 +08:00
Yichen Jiang
bcfab57318
Merge branch 'stack/agent-profiles-1-seam' into stack/agent-profiles-3-wire
2026-08-08 22:47:15 +08:00
Tianyi Cui
07fbc2cda8
test(subagent): execute control tools in ACP replay
2026-08-08 21:05:58 +08:00
Tianyi Cui
582fafee5a
test(snapshot): refresh subagent control schema pin
2026-08-08 20:25:41 +08:00
Hypatia May
5e1ec10d5a
fix(subagent): address descendant listing review
2026-08-08 20:02:37 +08:00
Hypatia May
d769d3cbb7
feat(subagent): let ancestors interrupt descendants
...
interrupt_agent(agent_id) passes the calling agent as the ancestor
authority for ctx.subagents.interrupt(); the service verifies live
registry identity and recorded lineage, so a direct child or deeper
descendant stops with the same generic parameter while send_message keeps
its exact-direct-parent authority.
Discovery: list_agents gains an optional scope. descendants walks the new
SubagentService.listDescendants() — one lineage trace flattened in stable
pre-order across ordinary and one-shot intermediates, each entry carrying
its verified parentId and depth — and every status now comes from the
live Agent registry (running/idle/complete).
Refs #1535
2026-08-08 20:02:37 +08:00
Huanqi Cao
e9b1c64a38
fix(sandbox): update the missing-runner snapshot for the Windows-aware SANDBOX_UNAVAILABLE text
2026-08-08 18:16:19 +08:00
Yichen Jiang
ec9a08bdde
Merge remote-tracking branch 'origin/master' into worktree/web-multimodal-image-input
...
# Conflicts:
# .agents/notes/implemented/architecture/2026-07-05-reconstructable-requests.i18n.yaml
# docs/core-data-structures/core.i18n.yaml
# docs/module-graph.md
# packages/client/ui-conversation/src/client/chat/AssistantMarkdown.tsx
# packages/client/ui-conversation/src/client/index.ts
# packages/compact/compact-basic/README.i18n.yaml
2026-08-08 17:56:53 +08:00
Tianyi Cui
dc64c5f1c2
fix: guard human interaction by runtime ownership
2026-08-08 15:30:08 +08:00
Yichen Jiang
ede9020e18
test(gui): stabilize merged snapshot gates
2026-08-08 02:20:09 +08:00
Yichen Jiang
cc0f6e11b9
feat(tool-skill): teach the catalog about user-explicit skill injection
...
Both catalog renderings now tell the model that a directly invoked skill
arrives as an inline <skill_content> block to follow without re-loading it
through the skill tool — the seam rule that keeps the user-explicit path
and the model-autonomous path from double-injecting one skill.
2026-08-08 00:55:37 +08:00
Yichen Jiang
5ec13a23b3
Merge branch 'stack/agent-profiles-5-web-ui' into stack/agent-profiles-8-authoring
...
# Conflicts:
# packages/host/apiproxy/README.i18n.yaml
2026-08-07 15:41:18 +08:00
Yichen Jiang
6093c266c6
Merge branch 'stack/agent-profiles-1-seam' into stack/agent-profiles-3-wire
2026-08-07 15:41:09 +08:00
_Kerman
57749361ec
Merge pull request #1343 from deepseek-harness/feat/fs-tool-error-remedy
...
feat(fs): append recovery remedy to guarded-mutation errors
2026-08-07 14:15:08 +08:00
Yichen Jiang
9b56349ba3
Merge branch 'stack/agent-profiles-8-authoring' into stack/agent-profiles-9-rename
...
# Conflicts:
# docs/config-catalog.md
# docs/cordis-catalog/services.md
# packages/core/tools/README.i18n.yaml
# packages/core/tools/README.md
# packages/core/tools/README.zh.md
# packages/core/tools/src/index.ts
2026-08-07 13:59:20 +08:00
Yichen Jiang
f3f2129154
Merge branch 'stack/agent-profiles-2-configs' into stack/agent-profiles-3-wire
...
# Conflicts:
# packages/host/apiproxy/src/api-proxy.ts
# packages/host/apiproxy/tests/api-proxy-subagents.spec.ts
2026-08-07 13:39:29 +08:00
Chinesezjc
0567727410
Merge remote-tracking branch 'origin/master' into feat/todo-multi-in-progress
...
# Conflicts:
# apps/cli/config/base.cordis.yml
# packages/client/ui-conversation/README.i18n.yaml
2026-08-07 11:27:24 +08:00
