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

refactor(tools): let the terminal marker ride the nested result

Browse Source 
The staged-promotion machinery (concludingParents keyed by parent token
plus a pendingParentConclusions staging map) spread one fact — this call
concluded the turn — across three registry-side collections with manual
cleanup. Align it with how additionalContexts already crosses the same
boundary: concludeTurn() marks only its own execution, the marker rides
that execution's successful result (ToolExecutionFailure types
concludesTurn as never, so a policy-converted failure sheds it with the
type), and the composite that owns the nested dispatch forwards it —
Code Mode's binding does so beside its existing context forwarding.

The registry loses both parent-keyed collections and the promotion
block; the propagation decision moves to the owning boundary; the
structured-output consumer's own two-phase commit is untouched.
This commit is contained in:
_Kerman
2026-07-26 21:24:16 +08:00
parent 39c09c9a49
commit 04f0435cc9
4 changed files with 68 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
packages/core/tools/tests/tools.spec.ts
View File

@@ -553,18 +553,20 @@ describe('ToolRegistry', () => {
expect(nested.isError ? undefined : nested.value).toBe('')
})
it('propagates a nested concludeTurn only when the nested verdict stays successful', async () => {
it('carries a nested conclusion on the nested result for its composite to forward', async () => {
const ctx = await setup()
ctx.tools.register({
...echoTool,
name: 'terminal-nested',
async execute(_args, exec) {
exec.concludeTurn()
return 'staged'
return 'terminal'
},
})
// A composite that swallows its nested failure and returns success — the
// Code Mode shape the staged propagation exists for.
// A composite that forwards the marker from the nested result — the Code
// Mode dispatch shape. A recovering composite (nested failure swallowed)
// has no marker to forward: ToolExecutionFailure types concludesTurn as
// never, so only an authoritative nested success can conclude the run.
let call = 0
ctx.tools.register({
...echoTool,
@@ -574,13 +576,13 @@ describe('ToolRegistry', () => {
const nested = await ctx.tools.execute({
signal: exec.signal, callId: CallId(`nested-${call}`), name: 'terminal-nested', arguments: {}, parent: exec.token,
})
if (nested.concludesTurn) exec.concludeTurn()
return nested.isError ? 'nested failed, composite recovered' : 'nested succeeded'
},
})
// A policy converts the nested success into an error: the staged
// conclusion must NOT reach the composite, or the loop would stop the
// turn on a failed terminal operation.
// A policy converts the nested success into an error: the failed result
// carries no marker, so the recovering composite does not conclude.
const veto = ctx.on('tools/post-execute', async (exec, _result, next): Promise<PostToolDecision> => {
if (exec.name !== 'terminal-nested') return next()
return { kind: 'block', feedback: [{ type: 'text', text: 'nested success rejected' }] }
@@ -592,8 +594,8 @@ describe('ToolRegistry', () => {
expect(recovered.concludesTurn).toBeUndefined()
veto()
// The same nested call succeeding promotes the marker: the composite's
// own successful result now carries concludesTurn.
// The same nested call succeeding carries the marker; the composite
// forwards it onto its own successful result.
const concluded = await ctx.tools.execute({
signal: testToolSignal, callId: CallId('composite-ok'), name: 'composite', arguments: {},
})