pku-xht
e3ac9e85e5
Merge commit '5a0d28e200d89dca2b8004d9cd624629a1409a3f' into codex/bounded-background-tasks-v2
...
# Conflicts:
# .agents/notes/implemented/architecture/2026-06-20-generic-long-running-tool-runtime.i18n.yaml
# .agents/notes/implemented/architecture/2026-06-20-generic-long-running-tool-runtime.md
# .agents/notes/implemented/architecture/2026-06-20-generic-long-running-tool-runtime.zh.md
2026-08-11 22:28:38 +08:00
Tianyi Cui
564a853a04
Merge pull request #2277 from deepseek-harness/codex/background-first-continuable-subagents
...
feat(subagent): default continuable delegation to background
2026-08-11 22:21:02 +08:00
Dudu-0223
c778b5b0db
fix(subagent): address background-first review
2026-08-11 21:52:59 +08:00
Dudu-0223
8344d64363
feat(subagent): default continuable delegation to background
2026-08-11 21:52:59 +08:00
Yichen Jiang
adfd54dc5c
Merge branch 'master' into worktree/minimal-profiles-bare-runtime
2026-08-11 21:11:32 +08:00
pku-xht
fe09a45fca
Merge commit 'f5a147f8da75e7bab0c617e0c7594c62db306e26' into codex/bounded-background-tasks-v2
2026-08-11 20:12:04 +08:00
Tianyi Cui
7028df46e4
Merge worktree/schedule-explicit-at into worktree/schedule-fixed-rate
2026-08-11 19:23:20 +08:00
Tianyi Cui
035f3e5a65
Merge worktree/schedule-conversational-after into worktree/schedule-explicit-at
2026-08-11 19:20:38 +08:00
Tianyi Cui
32a9a0ac61
Merge remote-tracking branch 'origin/master' into worktree/schedule-conversational-after
2026-08-11 19:10:26 +08:00
Tianyi Cui
3f01ff8291
Merge remote-tracking branch 'origin/master' into worktree/schedule-conversational-after
2026-08-11 19:05:13 +08:00
pku-xht
b38e02462b
Merge commit '5427cbcc19cfd1ce9f3af1ae22207852cc5740fa' into codex/workflow-runs-chat-node-f6
2026-08-11 18:09:43 +08:00
pku-xht
c98a4d0949
refactor(tasks): simplify admission configuration
2026-08-11 17:12:53 +08:00
pku-xht
b5fb52688f
Merge commit 'f1a9ab14fe882f9b855ea9cc3f16ddc9a3b0284d' into codex/bounded-background-tasks-v2
...
# Conflicts:
# .agents/notes/implemented/architecture/2026-06-20-generic-long-running-tool-runtime.i18n.yaml
# .agents/notes/implemented/architecture/2026-06-20-generic-long-running-tool-runtime.md
# .agents/notes/implemented/architecture/2026-06-20-generic-long-running-tool-runtime.zh.md
# .agents/notes/implemented/architecture/2026-07-26-task-registry-seam.i18n.yaml
# .agents/notes/implemented/architecture/2026-07-26-task-registry-seam.md
# .agents/notes/implemented/architecture/2026-07-26-task-registry-seam.zh.md
# docs/config-catalog.i18n.yaml
# docs/config-catalog.md
# docs/config-catalog.zh.md
# docs/subsystems/tasks.i18n.yaml
# docs/subsystems/tasks.md
# docs/subsystems/tasks.zh.md
# packages/examples/acp-demo/src/index.ts
# packages/tasks/tasks-local/tests/tasks.spec.ts
# packages/tasks/tasks/README.i18n.yaml
# packages/tasks/tasks/README.md
# packages/tasks/tasks/README.zh.md
2026-08-11 16:44:05 +08:00
pku-xht
f32a51b284
fix(tasks): bound per-session background work
2026-08-11 16:23:05 +08:00
Yichen Jiang
2b5c17ab6b
Merge remote-tracking branch 'origin/master' into worktree/minimal-profiles-bare-runtime
...
# Conflicts:
# examples/jsonrpc-agent/README.i18n.yaml
# examples/jsonrpc-agent/README.md
2026-08-11 15:51:03 +08:00
Turtle
c6f3870b51
test: refresh terminology snapshots
2026-08-11 15:23:05 +08:00
Turtle
0c708cb10d
refactor: replace overloaded surface terminology
2026-08-11 15:23:05 +08:00
Yichen Jiang
663253099d
feat: align minimal runtime profiles
2026-08-11 15:19:33 +08:00
Hypatia May
6a604aaa85
Merge branch 'feat/subagent-settlement-delivery' into feat/subagent-list-agents-vocabulary
2026-08-11 14:53:11 +08:00
Hypatia May
ef8637f864
Merge branch 'feat/subagent-report-semantics' into feat/subagent-settlement-delivery
...
# Conflicts:
# docs/event-producer-consumer.i18n.yaml
# docs/event-producer-consumer.md
2026-08-11 14:52:49 +08:00
Hypatia May
fafb10eecb
Merge commit '38d82c497765ce0344800e3d5af9f1ee073f4bb5' into feat/subagent-report-semantics
2026-08-11 14:50:35 +08:00
Hypatia May
6c4ed5e036
test(snapshot): refresh pins after master merge
2026-08-11 14:45:14 +08:00
Hypatia May
7b8635d47d
test(snapshot): refresh pins after master merge
2026-08-11 14:41:11 +08:00
Hypatia May
87f446ca62
test(snapshot): refresh pins after master merge
2026-08-11 14:37:44 +08:00
Yichen Jiang
b06969b56f
Merge remote-tracking branch 'origin/master' into worktree/preset-plane-fallout-p1
...
Only `docs/module-graph.*` conflicted, from master's new
`@deepseek-ai/dsh-message-feedback` package; generated, so taken from master
and regenerated.
Hook bypassed as before: the staged-pairing check hands an archived note path
to `verify-translation-pairing`. The full-corpus gate passes.
2026-08-11 14:13:32 +08:00
Hypatia May
bb11d72962
test(snapshot): refresh pins after master merge
2026-08-11 14:02:16 +08:00
Hypatia May
66cdba7c6c
Merge branch 'feat/subagent-settlement-delivery' into feat/subagent-list-agents-vocabulary
...
# 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/subagent-depth-two-rejection/session.1.jsonl
# examples/acp-agent/tests/snapshots/subagent-depth-two-rejection/session.2.jsonl
# examples/acp-agent/tests/snapshots/subagent-mixed/session.1.jsonl
# examples/acp-agent/tests/snapshots/subagent-mixed/session.2.jsonl
# examples/acp-agent/tests/snapshots/subagent-multi/session.1.jsonl
# examples/acp-agent/tests/snapshots/subagent-multi/session.2.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
# examples/headless-agent/tests/snapshots/compaction-recovery/session.jsonl
# examples/headless-agent/tests/snapshots/pty-tools/session.jsonl
2026-08-11 13:58:56 +08:00
Hypatia May
8d5223bd1a
test(snapshot): refresh pins after master merge
2026-08-11 13:58:36 +08:00
Hypatia May
9a8a2fc206
Merge branch 'feat/subagent-report-semantics' into feat/subagent-settlement-delivery
...
# 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/subagent-depth-two-rejection/session.1.jsonl
# examples/acp-agent/tests/snapshots/subagent-depth-two-rejection/session.2.jsonl
# examples/acp-agent/tests/snapshots/subagent-mixed/session.1.jsonl
# examples/acp-agent/tests/snapshots/subagent-mixed/session.2.jsonl
# examples/acp-agent/tests/snapshots/subagent-multi/session.1.jsonl
# examples/acp-agent/tests/snapshots/subagent-multi/session.2.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
# examples/headless-agent/tests/snapshots/compaction-recovery/session.jsonl
# examples/headless-agent/tests/snapshots/pty-tools/session.jsonl
2026-08-11 13:55:11 +08:00
Hypatia May
e673a125bd
test(snapshot): refresh pins after master merge
2026-08-11 13:54:51 +08:00
Hypatia May
d4c125ceee
Merge commit '580051aeb594e683b6fe088b04d9bffe4c4b5b62' into feat/subagent-report-semantics
2026-08-11 13:50:44 +08:00
hypatiamay
c76570a3b8
Merge pull request #2138 from deepseek-harness/feat/parallel-subagent-calls
...
feat(subagent): sibling delegations are concurrency-safe
2026-08-11 13:24:43 +08:00
Hypatia May
c2261bad05
test(snapshot): refresh fork schema pins after master merge
2026-08-11 13:23:43 +08:00
Hypatia May
0264935351
Merge branch 'feat/subagent-settlement-delivery' into feat/subagent-list-agents-vocabulary
...
# 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/subagent-depth-two-rejection/session.1.jsonl
# examples/acp-agent/tests/snapshots/subagent-depth-two-rejection/session.2.jsonl
# examples/acp-agent/tests/snapshots/subagent-mixed/session.1.jsonl
# examples/acp-agent/tests/snapshots/subagent-mixed/session.2.jsonl
# examples/acp-agent/tests/snapshots/subagent-multi/session.1.jsonl
# examples/acp-agent/tests/snapshots/subagent-multi/session.2.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
# examples/headless-agent/tests/snapshots/compaction-recovery/session.jsonl
# examples/headless-agent/tests/snapshots/pty-tools/session.jsonl
2026-08-11 13:19:27 +08:00
Hypatia May
8d9b71d50a
test(snapshot): refresh fork schema pins after master merge
2026-08-11 13:17:40 +08:00
Hypatia May
bc3325a5f1
Merge branch 'feat/subagent-report-semantics' into feat/subagent-settlement-delivery
...
# 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/subagent-depth-two-rejection/session.1.jsonl
# examples/acp-agent/tests/snapshots/subagent-depth-two-rejection/session.2.jsonl
# examples/acp-agent/tests/snapshots/subagent-mixed/session.1.jsonl
# examples/acp-agent/tests/snapshots/subagent-mixed/session.2.jsonl
# examples/acp-agent/tests/snapshots/subagent-multi/session.1.jsonl
# examples/acp-agent/tests/snapshots/subagent-multi/session.2.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
# examples/headless-agent/tests/snapshots/compaction-recovery/session.jsonl
# examples/headless-agent/tests/snapshots/pty-tools/session.jsonl
2026-08-11 13:14:02 +08:00
Hypatia May
41790845e9
test(snapshot): refresh fork schema pins after master merge
2026-08-11 13:10:25 +08:00
Hypatia May
48dd924eda
Merge branch 'feat/subagent-settlement-delivery' into feat/subagent-list-agents-vocabulary
2026-08-11 13:02:40 +08:00
Hypatia May
9340604ea5
Merge branch 'feat/subagent-report-semantics' into feat/subagent-settlement-delivery
2026-08-11 13:02:22 +08:00
Hypatia May
dbcbdfa9ce
Merge commit '7baf2c33efb98eeea690c5ac58579c95dc52edd1' into feat/subagent-report-semantics
2026-08-11 13:01:29 +08:00
Yichen Jiang
cc1cf12cb6
Merge remote-tracking branch 'origin/master' into worktree/preset-plane-fallout-p1
...
Generated docs (`module-graph`, `event-producer-consumer`) taken from master
and regenerated. The `cordis-inspect-jsdoc` golden likewise: master's copy is
the base, and this branch's `presentAs` per-scope rewording is re-applied on
top, since `cordis_inspect` renders that JSDoc into model-visible output.
Hook bypassed as before: the staged-pairing check hands an archived note path
to `verify-translation-pairing`. The full-corpus gate passes.
2026-08-11 12:57:58 +08:00
Hypatia May
a26d03960a
feat(subagent): sibling delegations are concurrency-safe
...
One assistant message carrying several subagent calls now overlaps them
under the rolling pool (maxParallelToolCalls) instead of serializing each
foreground delegation behind an exclusive barrier; results still commit
in model order.
tool-subagent declares isConcurrencySafe: () => true for every call form:
children work in their own sessions, a run never mutates the parent
session, and sibling workspace coordination already belongs to the model
for background, continuable, and workflow children. The former
serial-execution pin flips to a parallel pin plus a gated genuine-overlap
test, and the authored subagent-parallel snapshot pins the assembled
transcript (tool/call, tool/call, tool/result, tool/result) with
interchangeable twin children, which replay race-free under the existing
first-call binding and createdAt harvest ordering.
The provider seam now requires concurrent starts and continuable
preparations for distinct children to isolate operation-local state,
cancellation, settlement, and cleanup; a continuable gate test proves a
cancelled preparation leaves no Agent or durable Session while its
sibling persists independently.
Closes deepseek-harness/deepseek-harness#1489
2026-08-11 12:41:24 +08:00
Hypatia May
567fcadba0
fix(subagent): report resumable children as ready
...
list_agents called a storage-only continuable child 'complete', inviting
parents to poll it for a result that will never appear there. Rename the
status to 'ready' — resumable, not terminal — and rewrite the tool
description to say a parent is told when a child finishes, so listing is
for recall, not polling.
2026-08-11 12:38:57 +08:00
Turtle
d00590c707
docs: replace nonexistent repository references
2026-08-11 12:35:38 +08:00
Hypatia May
85dd22fd4f
feat(subagent): deliver continuable child settlement to parents
...
A continuable child that stopped without reporting — an error, a token
ceiling, cancellation, teardown — left its parent nothing to act on.
The continuation manager now delivers an unconditional settlement
notice to the durable direct parent before releasing ownership, folding
consumed work (foldConsumedWork supersedes findLastMessageTurnEnd) so a
claimed-but-unrun prompt reads as aborted rather than completed, waking
an idle parent, steering a busy one, and never waking a closing tree.
2026-08-11 12:31:49 +08:00
creatixchu
10d9fd21f2
Merge remote-tracking branch 'origin/master' into feat/read-image-context
2026-08-11 12:08:33 +08:00
Turtle
a9852a2b5b
Merge pull request #2152 from deepseek-harness/codex/remove-source-installer
...
cleanup: simplify source execution around pnpm dsh
2026-08-11 12:07:29 +08:00
creatixchu
2a755f2863
Merge remote-tracking branch 'origin/master' into feat/read-image-context
2026-08-11 11:54:22 +08:00
Hypatia May
76cf6cbd0b
feat(subagent): make final reports the continuable return contract
...
A continuable child could finish without giving its parent a usable
result: the report tool was described as optional and its default
delivery stayed quiet. Install the child-scoped report obligation (tool
description plus the tool:report prompt section), default reportDelivery
to wakeup, bind shipped subagent_fork delegations to one-shot so fork
keeps its prefix reuse, and extend the ACP snapshot harness to pin child
system prompts alongside child tool schemas.
2026-08-11 11:50:39 +08:00
creatixchu
5265fd084d
fix(snapshot): use rescoped Cordis package
2026-08-11 11:23:49 +08:00
