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

Merge latest master into subagent policy inheritance

Browse Source 
Retarget the feature branch to the current master tip without rewriting its existing review history. Keeping this as a dedicated merge checkpoint makes the later simplification diff attributable to the stacked child rather than mixing base movement with design changes.

Resolve the identified-message API drift in the feature tests by constructing complete user messages, reading the nested tool-result message shape, and adapting the prompt-submit listener signature. Preserve both sides of the user-approval conflict: master’s createUserMessage wrapper and the feature’s inherited-policy attribution.

Regenerate the Cordis and persistence catalogs, re-record the session README pair, and refresh the affected ACP/headless fixtures so derived artifacts describe the merged source rather than either parent in isolation.

Validated with the focused policy/session/persistence/query suites (430 tests), focused ACP/headless snapshots (3 tests), build, doc-sync (25 gates), lint, hygiene, and git diff checks.
This commit is contained in:
Tianyi Cui
2026-07-28 21:11:20 +08:00
parent 2f93614efb cad0615261
commit afa38c4b2f
425 changed files with 7530 additions and 3109 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
packages/subagent/subagent-inprocess/tests/inheritance.spec.ts
View File

@@ -31,7 +31,7 @@ import * as AgentInvariant from '@deepseek-ai/dsh-agent/invariant'
import * as AgentLoopInvariant from '@deepseek-ai/dsh-agent-loop/invariant'
import SubagentService from '@deepseek-ai/dsh-subagent'
import { defineTool } from '@deepseek-ai/dsh-tools'
import type { ContentBlock } from '@deepseek-ai/dsh-llm'
import { createUserMessage, type ContentBlock } from '@deepseek-ai/dsh-llm'
import SandboxPolicyService, { setSandboxMode } from '@deepseek-ai/dsh-sandbox-policy'
import SandboxedFileSystem from '@deepseek-ai/dsh-fs-sandbox'
import * as ToolFs from '@deepseek-ai/dsh-tool-fs'
@@ -150,7 +150,11 @@ function registerDelegate(ctx: Context, captured: Agent[], raceSwitch?: 'danger-
function toolResultTexts(agent: Agent): string[] {
return agent.session.events
.filter((e): e is SessionEvent<'tool/result'> => e.type === 'tool/result')
.map(e => e.data.content.filter((b): b is Extract<ContentBlock, { type: 'text' }> => b.type === 'text').map(b => b.text).join(''))
.map(e => e.data.message.content
.flatMap(block => block.content)
.filter((block): block is Extract<ContentBlock, { type: 'text' }> => block.type === 'text')
.map(block => block.text)
.join(''))
}
/** Count the policy-override events in a session log. */
@@ -186,7 +190,7 @@ describe('sandbox-mode inheritance against the real fs fence', () => {
toolCallResponse('c-write', 'write', { file_path: blocked, content: 'escaped' }),
textResponse('child done'),
)
parent.followup({ content: [{ type: 'text', text: 'stage the session policy' }], source: { kind: 'user' } })
parent.followup(createUserMessage({ content: [{ type: 'text', text: 'stage the session policy' }], source: { kind: 'user' } }))
await parent.whenIdle()
const parentLogLength = parent.session.events.length
@@ -229,7 +233,7 @@ describe('sandbox-mode inheritance against the real fs fence', () => {
},
textResponse('child done'),
)
parent.followup({ content: [{ type: 'text', text: 'stage' }], source: { kind: 'user' } })
parent.followup(createUserMessage({ content: [{ type: 'text', text: 'stage' }], source: { kind: 'user' } }))
await parent.whenIdle()
const run = await startInProcessRun(spawnRequest(parent), {})
@@ -264,9 +268,9 @@ describe('sandbox-mode inheritance against the real fs fence', () => {
textResponse('fork child done'),
textResponse('turn two done'),
)
parent.followup({ content: [{ type: 'text', text: 'turn one' }], source: { kind: 'user' } })
parent.followup(createUserMessage({ content: [{ type: 'text', text: 'turn one' }], source: { kind: 'user' } }))
await parent.whenIdle()
parent.followup({ content: [{ type: 'text', text: 'turn two: delegate' }], source: { kind: 'user' } })
parent.followup(createUserMessage({ content: [{ type: 'text', text: 'turn two: delegate' }], source: { kind: 'user' } }))
await parent.whenIdle()
const child = captured[0] as Agent
@@ -297,9 +301,9 @@ describe('sandbox-mode inheritance against the real fs fence', () => {
textResponse('race child done'),
textResponse('turn two done'),
)
parent.followup({ content: [{ type: 'text', text: 'stage' }], source: { kind: 'user' } })
parent.followup(createUserMessage({ content: [{ type: 'text', text: 'stage' }], source: { kind: 'user' } }))
await parent.whenIdle()
parent.followup({ content: [{ type: 'text', text: 'delegate' }], source: { kind: 'user' } })
parent.followup(createUserMessage({ content: [{ type: 'text', text: 'delegate' }], source: { kind: 'user' } }))
await parent.whenIdle()
const child = captured[0] as Agent
@@ -329,9 +333,9 @@ describe('sandbox-mode inheritance against the real fs fence', () => {
textResponse('child done'),
textResponse('parent done'),
)
parent.followup({ content: [{ type: 'text', text: 'stage' }], source: { kind: 'user' } })
parent.followup(createUserMessage({ content: [{ type: 'text', text: 'stage' }], source: { kind: 'user' } }))
await parent.whenIdle()
parent.followup({ content: [{ type: 'text', text: 'delegate twice' }], source: { kind: 'user' } })
parent.followup(createUserMessage({ content: [{ type: 'text', text: 'delegate twice' }], source: { kind: 'user' } }))
await parent.whenIdle()
expect(captured).toHaveLength(2)
@@ -350,7 +354,7 @@ describe('inheritance survives prompt vetoes', () => {
// A veto-capable listener registered BEFORE the child exists — the
// Claude/Codex UserPromptSubmit hook shape: it blocks the child's prompt
// and never delegates. Inheritance must still run for the first turn.
ctx.on('agent/prompt-submit', (agent, _content, _source, _signal, next) => {
ctx.on('agent/prompt-submit', (agent, _message, _signal, next) => {
if (agent.session.header.parentSession !== undefined) {
return Promise.resolve({ kind: 'block' as const, reason: 'vetoed by test hook' })
}
@@ -363,7 +367,7 @@ describe('inheritance survives prompt vetoes', () => {
},
// No child model entries: the blocked prompt closes a zero-step turn.
)
parent.followup({ content: [{ type: 'text', text: 'stage' }], source: { kind: 'user' } })
parent.followup(createUserMessage({ content: [{ type: 'text', text: 'stage' }], source: { kind: 'user' } }))
await parent.whenIdle()
const run = await startInProcessRun(spawnRequest(parent), {})
@@ -432,7 +436,7 @@ describe('what a blocked child experiences', () => {
},
textResponse('child done'),
)
parent.followup({ content: [{ type: 'text', text: 'stage' }], source: { kind: 'user' } })
parent.followup(createUserMessage({ content: [{ type: 'text', text: 'stage' }], source: { kind: 'user' } }))
await parent.whenIdle()
const run = await startInProcessRun(spawnRequest(parent), {})
@@ -468,7 +472,7 @@ describe('what a blocked child experiences', () => {
}),
textResponse('child gave up'),
)
parent.followup({ content: [{ type: 'text', text: 'stage' }], source: { kind: 'user' } })
parent.followup(createUserMessage({ content: [{ type: 'text', text: 'stage' }], source: { kind: 'user' } }))
await parent.whenIdle()
const run = await startInProcessRun(spawnRequest(parent), {})