Coder/deepseek-harness
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(subagent): complete output selection contract

Browse Source
This commit is contained in:
Hypatia May
2026-08-10 22:19:14 +08:00
parent 084638af47
commit 4f23fa84cc
32 changed files with 113 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
packages/subagent/subagent-acp/src/run.ts
View File

@@ -233,9 +233,8 @@ export async function startAcpRun(request: SubagentStartRequest, spec: AcpRunSpe
let processDisposal: Promise<void> | undefined
const disposeProcess = (): Promise<void> => (processDisposal ??= disposeAcpChild(child, spec.disposeEofGraceMs))
// The child's streamed assistant text, accumulated under the seam's
// canonical selection rule (`AssistantOutputFold`); ACP surfaces no complete
// assistant messages, so only the streamed-fallback half applies.
// ACP exposes no complete assistant messages, so the shared fold selects its
// accumulated assistant text.
const fold = new AssistantOutputFold()
// Shared mutable state keeps cancellation visible across async closures.
const flags = { cancelled: false }

4
packages/subagent/subagent-dsh-sdk/README.i18n.yaml
View File

@@ -2,5 +2,5 @@
# side as of the last confirmed-consistent state. Both languages carry equal authority;
# after editing either side, bring the other along and re-record with:
# pnpm run verify-translation-pairing --write packages/subagent/subagent-dsh-sdk/README.md
README.md: 80f5c40a2c949b7c2a638ec19c02950e8cd69f0b
README.zh.md: b34421dbbf2d06b7c9236776aabf19ba8005204e
README.md: 493bb187d45c7654958cfb3dbbe1dee6bb21b368
README.zh.md: 2e1d9b1e602f2180d20d43fe8c358163ec4ec024

2
packages/subagent/subagent-dsh-sdk/README.md
View File

@@ -10,7 +10,7 @@ The SDK provider runs each subagent as a complete DeepSeek Harness runtime in a
The working directory resolves exactly like the ACP backend, through the seam's shared out-of-process helpers ([`dsh-subagent`](../subagent/README.md)): the configured `cwd` override when set (validated once at load), else the delegating parent session's cwd — never the server process's own cwd. The resolved path becomes the child process cwd and the workspace cwd of its SDK session.
The returned run id is minted in the parent namespace; the child runtime's session id exists only inside the child process. After publication the provider owns one SDK activity and reads the child's answer from its session events: the last complete NON-EMPTY `assistant/message` (an empty-content message hosts only usage and is skipped), or the `text-delta` stream accumulated before the activity was cut short — a partial answer survives cancel and error paths.
The returned run id is minted in the parent namespace; the child runtime's session id exists only inside the child process. After publication the provider owns one SDK activity and reads the child's answer from its session events: the last complete non-empty `assistant/message` (an empty-content message that records usage is skipped), or the accumulated `text-delta` stream when no such message exists. Partial output remains available after cancellation or an error.
`dispose()` is idempotent: it settles the result locally as `aborted` (there is no wire-level prompt cancel), then closes the runtime — a bounded protocol `shutdown` request followed by the shared stdin-EOF → SIGTERM → SIGKILL ladder to actual exit.

2
packages/subagent/subagent-dsh-sdk/README.zh.md
View File

@@ -10,7 +10,7 @@ SDK 提供方会在全新的子进程中把每个 subagent 作为完整的 DeepS
工作目录的解析与 ACP 后端完全一致，并使用 seam 共享的进程外辅助工具（[`dsh-subagent`](../subagent/README.md)）：设置了 `cwd` 覆盖值时使用该值（加载时校验一次），否则使用发起委派的父会话 cwd，绝不使用服务器进程自身的 cwd。解析出的路径同时成为子进程 cwd 和其 SDK 会话的工作区 cwd。
返回的 run id 在父级命名空间中生成；子运行时的会话 id 只存在于子进程内部。发布后，提供方拥有一段 SDK 活动，并从子会话事件中读取答案：最后一条完整且**非空**的 `assistant/message`（空内容消息仅承载 usage，会被跳过），或该活动中断前已经累积的 `text-delta` 流；部分答案在取消和错误路径上都得以保留。
返回的 run id 在父级命名空间中生成；子运行时的会话 id 只存在于子进程内部。发布后，提供方拥有一段 SDK 活动，并从子会话事件中读取答案：最后一条完整且非空的 `assistant/message`（记录 usage 的空内容消息会被跳过）；若没有这类消息，则取累积的 `text-delta` 流。取消或发生错误后，部分输出仍然可用。
`dispose()`（资源释放）是幂等的：先在本地把结果确定为 `aborted`（协议层面没有提示词取消机制），再关闭运行时，即先发出一次有界的协议 `shutdown` 请求，随后通过共享的 stdin-EOF → SIGTERM → SIGKILL 阶梯使进程实际退出。

2
packages/subagent/subagent-dsh-sdk/tests/subagent-dsh-sdk.spec.ts
View File

@@ -176,7 +176,7 @@ describe('dsh-subagent-dsh-sdk provider', () => {
await ctx.fiber.dispose()
})
it('keeps streamed text when the terminal message is an EMPTY usage-only step', async () => {
it('keeps streamed text when the terminal message is an empty usage-only step', async () => {
// The child streams its answer, then emits an empty-content
// assistant/message (the harness loop appends one to host usage on a
// max-tokens step that assembled no text blocks). The empty message is

4
packages/subagent/subagent-inprocess/README.i18n.yaml
View File

@@ -2,5 +2,5 @@
# side as of the last confirmed-consistent state. Both languages carry equal authority;
# after editing either side, bring the other along and re-record with:
# pnpm run verify-translation-pairing --write packages/subagent/subagent-inprocess/README.md
README.md: 2e2a3873843467b0811ccbc0ed1d9bb6a83eb31f
README.zh.md: 91013164e762bb01e7ad5a51597c6fa559c8d7a3
README.md: fd5129b044b3d9008c3ba73645f6de36ddbf35dc
README.zh.md: 8f7ff137f04183b50acbe96bcd20a4023dfb86f4

2
packages/subagent/subagent-inprocess/README.md
View File

@@ -14,7 +14,7 @@ The driver follows this sequence:
2. Call `parent.ctx.agents.create` directly, passing the required request signal into the factory's creation transaction.
3. During that transaction's unpublished setup window, install the requested persona, tool restriction, and structured-output runtime.
4. Publish the child, retain the returned `AgentHandle`, and drive one task with `child.followup(prompt)` followed by `child.whenIdle()`.
5. Read the child's own output — its last NON-EMPTY assistant message (an empty-content message hosts only usage and is skipped), else the text it streamed before cancel or truncation cut the turn short — and the final durable turn reason from the complete owned child run, excluding any fork seed.
5. Read the child's own output — its last non-empty assistant message (an empty-content message that records usage is skipped), or its accumulated assistant text when no such message exists — and the final durable turn reason from the complete owned child run, excluding any fork seed.
The child gets the parent's working-directory/session lineage and inherits the parent provider, model, and output-token cap unless `request.agentOptions` overrides them. It gets a fresh flat registration scope: parent ownership does not import parent tool restrictions or establish an authority subset.

2
packages/subagent/subagent-inprocess/README.zh.md
View File

@@ -14,7 +14,7 @@
2. 直接调用 `parent.ctx.agents.create`，把必需的请求信号传入工厂的创建事务。
3. 在该事务未发布的设置窗口中，安装请求的 persona、工具限制和结构化输出运行时。
4. 发布子 agent，保留返回的 `AgentHandle`，并通过先调用 `child.followup(prompt)`、再调用 `child.whenIdle()` 来驱动一项任务。
5. 从完整的自有子运行中读取子 agent 自身的输出——最后一条**非空** assistant 消息（空内容消息仅承载 usage，会被跳过），否则取轮次被取消或截断前已流式的文本——以及最终持久化的轮次原因，并排除任何 fork 初始内容。
5. 从完整的自有子运行中读取子 agent 自身的输出——最后一条非空 assistant 消息（记录 usage 的空内容消息会被跳过），若没有这类消息则取其累积的 assistant 文本——以及最终持久化的轮次原因，并排除任何 fork 初始内容。
子 agent 会获得父 agent 的工作目录／会话谱系；除非 `request.agentOptions` 覆盖，否则还会继承父 agent 的提供方、模型和输出 token 上限。它获得全新的扁平注册作用域：父级所有权不会导入父 agent 的工具限制，也不会建立权限子集。

6
packages/subagent/subagent-inprocess/tests/subagent-inprocess.spec.ts
View File

@@ -157,10 +157,8 @@ describe('startInProcessRun', () => {
})
it('keeps earlier streamed text when the final step appends an empty usage-only message', async () => {
// Step 1 streams "partial one" plus a tool call; step 2 hits max-tokens
// having assembled only a tool-call block, so the loop appends an EMPTY
// assistant/message to host usage. The empty message is not assistant
// output and must not erase step 1's text from the run's output.
// A tool-only max-tokens step records an empty assistant/message for
// usage. The result retains the preceding assistant output.
const { ctx, parent } = await setup([
toolCallResponse('t1', 'noop', {}, 'partial one'),
[

4
packages/subagent/subagent/README.i18n.yaml
View File

@@ -2,5 +2,5 @@
# side as of the last confirmed-consistent state. Both languages carry equal authority;
# after editing either side, bring the other along and re-record with:
# pnpm run verify-translation-pairing --write packages/subagent/subagent/README.md
README.md: 3bc5bc1c07077f21a4245c3ce08470bc976c1458
README.zh.md: 90fde6b4403891edf910c45327c9b0f629980303
README.md: b9757bb04609d3cdd1459d5845e5c59388b269f6
README.zh.md: 9d28d057e08ddb12530ba2894eda8046a5c0ff5a

2
packages/subagent/subagent/README.md
View File

@@ -60,7 +60,7 @@ The seam owns the depth vocabulary shared by Service providers and Consumers: th
`provider.start(request): Promise<SubagentRun>` is the ownership-transfer boundary; the delegation tool also uses it inside its one-shot Task-backed background path. Before fulfillment, the provider owns setup and must cancel, roll back, and quiesce unpublished resources on every failure. After fulfillment, the caller owns the run and must call `dispose()` on every path; remaining prompt and turn work belongs to `SubagentRun.result`.
`SubagentRun.result` resolves to `{ output, structured?, stopReason }`. Child-level failures resolve with a non-`completed` reason; only an infrastructure fault that the seam cannot represent may reject. `dispose()` is idempotent, cancels remaining work, and waits for both result settlement and child-resource quiescence. A result rejection remains on `result`; `dispose()` rejects only for an independent resource-release failure. `output` and the `subagent/end` edge's `lastAssistantMessage` share one selection rule, implemented once by the exported `AssistantOutputFold`/`finalAssistantOutput` helpers: the child's last non-empty assistant message, else the text it streamed before the turn was cut short ([`SubagentResult.output`](../../../docs/subsystems/subagent.md#the-terminal-result-subagentresult) owns the contract).
`SubagentRun.result` resolves to `{ output, structured?, stopReason }`. Child-level failures resolve with a non-`completed` reason; only an infrastructure fault that the seam cannot represent may reject. `dispose()` is idempotent, cancels remaining work, and waits for both result settlement and child-resource quiescence. A result rejection remains on `result`; `dispose()` rejects only for an independent resource-release failure. `output` and the `subagent/end` event's `lastAssistantMessage` use the exported `AssistantOutputFold`/`finalAssistantOutput` helpers to select the child's last non-empty assistant message, or its accumulated assistant text when no such message exists. `output` is `[]` and the event field is absent when the child produced neither ([`SubagentResult.output`](../../../docs/subsystems/subagent.md#the-terminal-result-subagentresult) owns the result contract).
A local run publishes an ordinary child agent/session before `start()` fulfills, returns that shared session id as `SubagentRun.id`, exposes the exact child as `SubagentRun.localAgent`, records `request.parent.session.id` in the child's `parentSession` header, and appends the resolved descriptor inside its initial turn. Remote providers instead mint a parent-scoped lifecycle id and return `localAgent: undefined`; without a local child session, their one-shot runs are not part of trace-backed enumeration.

2
packages/subagent/subagent/README.zh.md
View File

@@ -60,7 +60,7 @@ subagent seam 允许一个 agent（智能体）通过具名提供方把工作委
`provider.start(request): Promise<SubagentRun>` 是所有权转移边界；委派工具也会在其由 Task 支撑的一次性后台路径中使用它。兑现前，提供方拥有设置过程，并且每次失败时都必须取消、回滚并使未发布资源完全停稳。兑现后，调用方拥有该运行，并且必须在每条路径上调用 `dispose()`；剩余提示词和轮次工作属于 `SubagentRun.result`。
`SubagentRun.result` 兑现为 `{ output, structured?, stopReason }`。子 agent 级失败会以非 `completed` 原因兑现；只有 seam 无法表示的基础设施故障才可以拒绝。`dispose()` 是幂等的，会取消剩余工作，并等待结果结算以及子 agent 资源完全停稳。`result` 的 rejection 仍归 `result` 通道；只有独立的资源释放失败会使 `dispose()` 拒绝。`output` 与 `subagent/end` 边沿的 `lastAssistantMessage` 共用同一条选取规则，由导出的 `AssistantOutputFold`／`finalAssistantOutput` 辅助函数唯一实现：取子 agent 最后一条非空 assistant 消息，否则取轮次被截断前已流式的文本（契约归 [`SubagentResult.output`](../../../docs/subsystems/subagent.md#the-terminal-result-subagentresult) 所有）。
`SubagentRun.result` 兑现为 `{ output, structured?, stopReason }`。子 agent 级失败会以非 `completed` 原因兑现；只有 seam 无法表示的基础设施故障才可以拒绝。`dispose()` 是幂等的，会取消剩余工作，并等待结果结算以及子 agent 资源完全停稳。`result` 的 rejection 仍归 `result` 通道；只有独立的资源释放失败会使 `dispose()` 拒绝。`output` 与 `subagent/end` 事件的 `lastAssistantMessage` 使用导出的 `AssistantOutputFold`／`finalAssistantOutput` 辅助函数选取子 agent 最后一条非空 assistant 消息；若没有这类消息，则选取其累积的 assistant 文本。子 agent 两种输出均未产生时，`output` 为 `[]`，该事件字段缺省（结果约定归 [`SubagentResult.output`](../../../docs/subsystems/subagent.md#the-terminal-result-subagentresult) 所有）。
本地运行会在 `start()` 兑现前发布普通的子 agent／会话，把该共享会话 id 作为 `SubagentRun.id` 返回，以 `SubagentRun.localAgent` 公开准确的子 agent，把 `request.parent.session.id` 记录到子 agent 的 `parentSession` header，并在其初始轮次内追加已解析的描述符。远程提供方则生成 parent 作用域的生命周期 id，并返回 `localAgent: undefined`；由于没有本地 child 会话，其一次性运行不会进入基于追踪的枚举结果。

19
packages/subagent/subagent/src/assistant-output.ts
View File

@@ -1,12 +1,11 @@
/**
* Canonical selection of a child's final assistant output. Every surface that
* reports "the child's answer" — backend run results and
* `subagent/end.lastAssistantMessage` — applies this one rule so observers
* agree: the last NON-EMPTY assistant message wins; an empty-content message
* hosts only usage (the loop appends one when a max-tokens step assembled no
* executable blocks) and never erases real output; without any non-empty
* message, the text streamed so far is the answer (a partial surviving
* cancel, error, and truncation paths).
* Canonical selection of a child's final assistant output. Backend run results
* and `subagent/end.lastAssistantMessage` apply the same rule: select the last
* non-empty assistant message. An empty-content message records usage only
* when the loop appends it after a max-tokens step with no executable blocks,
* so it does not replace earlier output. If no non-empty message exists,
* select the accumulated assistant text. Selection is independent of the
* run's stop reason.
*
* @module @deepseek-ai/dsh-subagent/assistant-output
*/
@@ -35,7 +34,7 @@ export class AssistantOutputFold {
const content = event.data.message.content
if (content.length > 0) this.message = content
} else if (event.type === 'assistant/chunk' && event.data.chunk.type === 'text-delta') {
this.partial.push(event.data.chunk.text)
this.pushText(event.data.chunk.text)
}
}
@@ -44,7 +43,7 @@ export class AssistantOutputFold {
* @param text - the next streamed text piece (an empty piece is a no-op).
*/
pushText(text: string): void {
this.partial.push(text)
if (text.length > 0) this.partial.push(text)
}
/**

3
packages/subagent/subagent/src/lifecycle.ts
View File

@@ -129,8 +129,7 @@ export function observeRun(
emit('subagent/end', {
...identity,
stopReason: result.stopReason,
// One encoding for "no output" across both lifecycle shapes: the
// field is absent, matching the continuable epoch edge.
// Omit the field when no output exists, matching continuable epochs.
...result.output.length === 0 ? {} : { lastAssistantMessage: result.output },
}, parent)
},

8
packages/subagent/subagent/src/types.ts
View File

@@ -218,10 +218,10 @@ export type SubagentStopReason = SubagentStopReasonMap[keyof SubagentStopReasonM
*/
export interface SubagentResult {
/**
* The child's final assistant output: the content of the last NON-EMPTY
* assistant message (an empty-content message hosts only usage and is
* skipped), else the text streamed before the turn was cut short, or `[]`
* when the child produced none.
* The child's final assistant output is the content of its last non-empty
* assistant message. Empty-content messages, including usage-only messages,
* are skipped. Without a non-empty message, the output is its accumulated
* assistant text stream, or `[]` when the child produced neither.
*/
readonly output: ContentBlock[]
/**

35
packages/subagent/subagent/tests/assistant-output.spec.ts
View File

@@ -15,6 +15,22 @@ function reasoningDelta(text: string): SessionEvent {
return { type: 'assistant/chunk', data: { chunk: { type: 'reasoning-delta', text } } } as SessionEvent
}
function toolResult(text: string): SessionEvent {
return {
type: 'tool/result',
data: {
message: {
content: [{
type: 'tool-result',
toolCallId: 'call-1',
content: [{ type: 'text', text }],
isError: false,
}],
},
},
} as SessionEvent
}
describe('finalAssistantOutput', () => {
it('selects the last non-empty message past a later empty usage-only message', () => {
const events = [
@@ -25,19 +41,30 @@ describe('finalAssistantOutput', () => {
expect(finalAssistantOutput(events)).toEqual([{ type: 'text', text: 'step two' }])
})
it('prefers a non-empty message over the streamed text', () => {
it('prefers a non-empty message over text streamed before and after it', () => {
const events = [
textDelta('streamed '),
textDelta('text'),
textDelta('earlier partial'),
message([{ type: 'text', text: 'complete answer' }]),
textDelta('later partial'),
message([]),
]
expect(finalAssistantOutput(events)).toEqual([{ type: 'text', text: 'complete answer' }])
})
it('falls back to accumulated text deltas when no non-empty message exists', () => {
it('treats textless assistant content as a non-empty message', () => {
const content: ContentBlock[] = [{ type: 'reasoning', text: 'complete reasoning' }]
expect(finalAssistantOutput([
textDelta('streamed text'),
message(content),
textDelta('later partial'),
])).toEqual(content)
})
it('falls back to text deltas without including reasoning or tool-result content', () => {
const events = [
reasoningDelta('thinking'),
textDelta('partial '),
toolResult('tool output'),
textDelta('answer'),
message([]),
]

7
packages/subagent/subagent/tests/continuation.spec.ts
View File

@@ -1201,10 +1201,9 @@ describe('continuable review regressions', () => {
})
it('keeps the epoch\'s earlier text past a final empty usage-only message', async () => {
// Step 1 streams text plus a tool call; step 2 hits max-tokens having
// assembled only a tool-call block, so the loop appends an EMPTY
// assistant/message to host usage. The terminal edge reports the epoch's
// real answer text, not the internal usage marker.
// A tool-only max-tokens step records an empty assistant/message for
// usage. The terminal event retains the previous assistant content,
// including its tool call but not the intervening tool result.
const { ctx, parent } = await setup([
toolCallResponse('t1', 'noop', {}, 'partial one'),
[

4
packages/subagent/subagent/tests/service.spec.ts
View File

@@ -264,8 +264,8 @@ describe('SubagentService', () => {
stopReason: 'completed',
}))
// "No output" has ONE encoding on the end edge: the field is absent,
// never an empty array, matching the continuable epoch edge.
// The lifecycle event omits lastAssistantMessage when output is empty,
// matching the continuable epoch event.
const silent = new StubProvider('silent', NO_CAPS, { output: [], stopReason: 'completed' })
subagents.registerProvider(silent)
const silentRun = await subagents.start('silent', baseRequest())