mirror of
https://github.com/deepseek-ai/deepseek-harness.git
synced 2026-08-30 04:40:37 +00:00
The cross-seam blocker: structured_output recorded its value in the tool BODY, before tools/post-execute could block the call — a PostToolUse hook's block turned the logged result into isError while readResult still returned structured success and the continuation veto ended the turn. Two-phase commit: the body validates and STAGES (RunState.pending); a fourth runtime listener on tools/post-execute — prepend, so await next() returns the composed final decision — promotes the stage to captured only on an accepted call, and clears it on every path. A block now yields a consistent pair: the model and log see the isError feedback, the run settles error with no structured value, and the turn continues so the model can react. Regressions: block denies the capture end-to-end; accept-with-replacement still commits.
313 lines
16 KiB
TypeScript
313 lines
16 KiB
TypeScript
/**
|
|
* Structured-output support for the in-process subagent backends: the mechanism
|
|
* behind `SubagentStartRequest.outputSchema` for children that run as agents on
|
|
* the same context.
|
|
*
|
|
* The model-facing surface is one globally registered `structured_output` tool
|
|
* whose REGISTERED parameters are a placeholder — the real schema is per run.
|
|
* Because the tool registry and prompt assembly are context-global while
|
|
* schemas differ per child (two concurrent structured runs may carry different
|
|
* schemas), per-agent shaping happens on the `system-prompt/assemble`
|
|
* waterfall with a `prepend: true` listener that post-processes `await next()`
|
|
* — FINAL-ASSEMBLY enforcement: whatever downstream listeners mutated or
|
|
* replaced, the assembly the loop renders never carries `structured_output`
|
|
* for an agent without a structured run, and for one that has it always
|
|
* carries the run's OWN schema plus a trailing
|
|
* {@link STRUCTURED_OUTPUT_INSTRUCTION} section (the demand travels with the
|
|
* tool). The loop logs what the assembly produced as the request header, so
|
|
* the injection is a reconstructable fact of the session log, never a
|
|
* wire-only mutation (the reconstructability RFC).
|
|
* (Cooperative mutate-then-`next()` would not survive a downstream listener
|
|
* returning a replacement assembly — see the waterfall composition caveat in
|
|
* docs/architecture.md.)
|
|
*
|
|
* FIXME: the whole enforcement dance above exists because the tool registry
|
|
* and prompt assembly are context-global. If they become per-agent or
|
|
* per-session scoped, a structured run just registers its own schema'd tool on
|
|
* the child's scope and this module reduces to the capture tool plus the
|
|
* turn-stop — no placeholder, no final-assembly swap, no strip-for-everyone-
|
|
* else, no global-registration lifetime dance.
|
|
*
|
|
* A companion `agent/turn-continuation` listener stops a child's turn once its
|
|
* output is captured — without it, the loop's default "had tool calls ⇒
|
|
* continue" buys a wasted extra model step per structured child. It is also
|
|
* `prepend: true`: the veto must run before any earlier-registered listener
|
|
* that could short-circuit the chain into a forced continue. A third listener
|
|
* closes the within-step window the continuation veto cannot: a
|
|
* `tools/pre-execute` deny for any call arriving after the agent's capture, so
|
|
* a response that lists `structured_output` before further tool calls cannot
|
|
* run side effects after the final answer was accepted. A fourth,
|
|
* `tools/post-execute`, is the capture COMMIT: the tool body only stages the
|
|
* validated value, and it becomes the run's captured result only when the
|
|
* final post-execute decision accepts the call — a blocking hook downstream
|
|
* yields `isError` in the log, and the run must not report success for it.
|
|
*
|
|
* Lifetime is refcounted by structured RUNS: each acquires from start to
|
|
* settle, so the registrations exist exactly while at least one structured
|
|
* child is live — a plain deployment that never passes `outputSchema` carries
|
|
* no always-on global state, and a backend hot-reload mid-run cannot
|
|
* unregister the capture tool out from under a live child (the run holds its
|
|
* own acquisition). Registrations land on the ROOT context and the refcount
|
|
* disposes them when the last run settles; the next structured run
|
|
* re-registers them.
|
|
*
|
|
* @module @deepseek-ai/dsh-subagent-inprocess/structured
|
|
*/
|
|
|
|
import type { Context } from 'cordis'
|
|
import type { Agent } from '@deepseek-ai/dsh-agent'
|
|
import type { ContentBlock, ToolSchema } from '@deepseek-ai/dsh-llm'
|
|
import type { ContinuationDecision } from '@deepseek-ai/dsh-agent'
|
|
import type { AssembleContext, PromptAssembly } from '@deepseek-ai/dsh-system-prompt'
|
|
import type { PostToolDecision, PreToolDecision, ToolExecution, ToolExecutionResult } from '@deepseek-ai/dsh-tools'
|
|
import { ToolArgsError, validateStructuredValue, type StructuredOutputSchema } from '@deepseek-ai/dsh-tools'
|
|
|
|
/** The model-facing tool name a structured child must call to finish. */
|
|
export const STRUCTURED_OUTPUT_TOOL = 'structured_output'
|
|
|
|
/**
|
|
* The instruction the assembly listener appends to a structured child's
|
|
* system prompt as a trailing section on every assembly. Per-assembly state,
|
|
* NOT agent prompt state: `AgentOptions` has no prompt field (the persona is
|
|
* deployment config on the system-prompt plugin), so the same final-assembly
|
|
* enforcement that injects the schema'd tool carries the instruction that
|
|
* demands calling it.
|
|
*/
|
|
export const STRUCTURED_OUTPUT_INSTRUCTION
|
|
= 'When you have your final answer, you MUST report it by calling the '
|
|
+ `\`${STRUCTURED_OUTPUT_TOOL}\` tool with arguments matching its parameter schema exactly. `
|
|
+ 'Do not finish with a plain text answer: only the tool call counts as your result.'
|
|
|
|
/** One structured run's state: the schema to enforce and the captured value, once recorded. */
|
|
interface RunState {
|
|
readonly schema: StructuredOutputSchema
|
|
/**
|
|
* A validated value awaiting the post-execute verdict on ITS OWN call. Set
|
|
* by the capture tool's body, promoted to {@link RunState.captured} only
|
|
* when the final `tools/post-execute` decision accepts the call — a
|
|
* downstream block turns the logged result into `isError`, and a value
|
|
* committed at body time would let the run report success for a call the
|
|
* model saw fail.
|
|
*/
|
|
pending?: { value: unknown }
|
|
captured?: { value: unknown }
|
|
}
|
|
|
|
/** The per-root-context runtime: run states plus the shared registrations. */
|
|
interface StructuredRuntime {
|
|
refs: number
|
|
readonly states: WeakMap<Agent, RunState>
|
|
readonly disposers: (() => void)[]
|
|
}
|
|
|
|
/** One root context ⇒ one runtime (multi-app test isolation). */
|
|
const runtimes = new WeakMap<Context, StructuredRuntime>()
|
|
|
|
/**
|
|
* One holder's handle on the shared structured runtime. `release()` is
|
|
* idempotent per acquisition; the runtime's registrations are disposed when the
|
|
* LAST holder (backend plugin or live run) releases.
|
|
*/
|
|
export interface StructuredAcquisition {
|
|
/** Enforce `schema` on `agent`'s requests and start capturing its `structured_output` call. */
|
|
attach(agent: Agent, schema: StructuredOutputSchema): void
|
|
/** The captured value, once the child called the tool with valid arguments. */
|
|
captured(agent: Agent): { value: unknown } | undefined
|
|
/** Stop enforcing/capturing for `agent` (WeakMap-backed; safe to call twice). */
|
|
detach(agent: Agent): void
|
|
/** Drop this holder's reference (idempotent); the last release unregisters everything. */
|
|
release(): void
|
|
}
|
|
|
|
/**
|
|
* Acquire the per-root-context structured runtime, registering the capture tool
|
|
* and the runtime's listeners on the FIRST acquisition. See the module doc
|
|
* for the enforcement and lifetime design.
|
|
* @param ctx - any context of the app; the runtime keys off `ctx.root`.
|
|
* @returns this holder's handle (attach/captured/detach + idempotent release).
|
|
*/
|
|
export function acquireStructuredRuntime(ctx: Context): StructuredAcquisition {
|
|
const root: Context = ctx.root
|
|
let runtime = runtimes.get(root)
|
|
if (!runtime) {
|
|
runtime = { refs: 0, states: new WeakMap(), disposers: [] }
|
|
runtimes.set(root, runtime)
|
|
registerRuntime(root, runtime)
|
|
}
|
|
runtime.refs += 1
|
|
|
|
let released = false
|
|
return {
|
|
attach(agent: Agent, schema: StructuredOutputSchema): void {
|
|
runtime.states.set(agent, { schema })
|
|
},
|
|
captured(agent: Agent): { value: unknown } | undefined {
|
|
return runtime.states.get(agent)?.captured
|
|
},
|
|
detach(agent: Agent): void {
|
|
runtime.states.delete(agent)
|
|
},
|
|
release(): void {
|
|
if (released) return
|
|
released = true
|
|
runtime.refs -= 1
|
|
if (runtime.refs > 0) return
|
|
runtimes.delete(root)
|
|
for (const dispose of runtime.disposers.splice(0)) dispose()
|
|
},
|
|
}
|
|
}
|
|
|
|
/** Register the capture tool + the two listeners on the root context (first acquire). */
|
|
function registerRuntime(root: Context, runtime: StructuredRuntime): void {
|
|
// The registered parameters are a PLACEHOLDER: the request listener below
|
|
// swaps in the run's real schema per child, and strips the tool entirely for
|
|
// every agent without a structured run — so this shape is never model-visible.
|
|
//
|
|
// Registration does NOT ride on the acquiring backend's plugin-level
|
|
// `inject`: a backend that waited on `tools` would apply later than it did
|
|
// before this module existed, shifting when its PROVIDER registers — and the
|
|
// delegation tool mirrors provider lifecycle, so that shift would reorder
|
|
// the model-visible tool list of every existing prompt. Instead the capture
|
|
// tool registers synchronously when `tools` is already live (the common
|
|
// case), and through a scoped inject fiber when the Loader happens to start
|
|
// the backend first. Either way the registration lands on root and is
|
|
// disposed by the runtime's refcount; disposing the fiber also covers the
|
|
// never-activated case.
|
|
let disposeTool: (() => void) | undefined
|
|
const registerCapture = (tools: Context['tools']): void => {
|
|
disposeTool = tools.register({
|
|
name: STRUCTURED_OUTPUT_TOOL,
|
|
description:
|
|
'Report your final structured result. Call this exactly once, when your answer is complete; '
|
|
+ 'the arguments must match this tool\'s parameter schema exactly.',
|
|
parameters: { type: 'object', properties: {} },
|
|
execute(args: unknown, exec: ToolExecution): Promise<ContentBlock[]> {
|
|
const state = exec.agent ? runtime.states.get(exec.agent) : undefined
|
|
if (!state) {
|
|
// Reachable only if a non-structured agent somehow calls the tool (the
|
|
// request listener strips it, so the model never sees it) — fail loud
|
|
// rather than capture into nowhere.
|
|
throw new Error(`${STRUCTURED_OUTPUT_TOOL} is only available to subagents started with an output schema`)
|
|
}
|
|
const violations = validateStructuredValue(state.schema, args)
|
|
// ToolArgsError → isError result with INVALID_ARGS: the model retries
|
|
// within the same turn, exactly like a schema-validated defineTool call.
|
|
if (violations.length > 0) throw new ToolArgsError(violations)
|
|
// Two-phase commit: the body only STAGES the value; the post-execute
|
|
// listener below promotes it once the final decision accepts the call.
|
|
state.pending = { value: args }
|
|
return Promise.resolve([{ type: 'text', text: 'Structured output recorded.' }])
|
|
},
|
|
})
|
|
}
|
|
const liveTools = root.get('tools')
|
|
const toolsFiber = liveTools ? undefined : root.inject(['tools'], (childCtx: Context) => {
|
|
registerCapture(childCtx.root.tools)
|
|
})
|
|
if (liveTools) registerCapture(liveTools)
|
|
runtime.disposers.push(() => {
|
|
disposeTool?.()
|
|
void toolsFiber?.dispose()
|
|
})
|
|
|
|
// FINAL-ASSEMBLY enforcement (prepend: true = first registered = OUTERMOST
|
|
// wrapper): post-process whatever the downstream listeners and the registry
|
|
// produced, so a downstream listener returning a replacement assembly cannot
|
|
// leak the tool to other agents or erase the child's schema. The loop logs
|
|
// the rendered assembly as the step's request header, so the swap is
|
|
// reconstructable log state, never a wire-only mutation.
|
|
runtime.disposers.push(root.on('system-prompt/assemble', async function (
|
|
this: unknown, _assembly: PromptAssembly, context: AssembleContext, next: () => Promise<PromptAssembly>,
|
|
): Promise<PromptAssembly> {
|
|
const final = await next()
|
|
const state = context.agent ? runtime.states.get(context.agent) : undefined
|
|
if (state) {
|
|
const schemaEntry: ToolSchema = {
|
|
name: STRUCTURED_OUTPUT_TOOL,
|
|
description:
|
|
'Report your final structured result. Call this exactly once, when your answer is complete; '
|
|
+ 'the arguments must match this tool\'s parameter schema exactly.',
|
|
// ToolSchema.parameters is the wire-level JSON Schema object; the
|
|
// asserted subset type is structurally exactly that.
|
|
parameters: state.schema as unknown as Record<string, unknown>,
|
|
}
|
|
final.tools = [...final.tools.filter(tool => tool.name !== STRUCTURED_OUTPUT_TOOL), schemaEntry]
|
|
// The demand travels WITH the tool: a trailing section in the
|
|
// tool-guidance order band, appended after next() so it renders last
|
|
// (renderPrompt joins in array order).
|
|
final.sections = [...final.sections, { name: `tool:${STRUCTURED_OUTPUT_TOOL}`, order: 190, text: STRUCTURED_OUTPUT_INSTRUCTION }]
|
|
return final
|
|
}
|
|
// No structured run: strip the placeholder so it is never model-visible.
|
|
// An empty tools array canonicalizes to an absent header/wire field
|
|
// (canonicalHeader pins empty ≡ absent), so no re-shaping is needed here.
|
|
final.tools = final.tools.filter(tool => tool.name !== STRUCTURED_OUTPUT_TOOL)
|
|
return final
|
|
}, { prepend: true }))
|
|
|
|
// Stop a structured child's turn once its output is captured: the default
|
|
// "had tool calls ⇒ continue" would otherwise buy a wasted extra model step
|
|
// after every successful capture. `prepend: true` puts the veto OUTERMOST —
|
|
// an earlier-registered listener that short-circuits the chain (a goal-style
|
|
// force-continue returning without `next()`) would otherwise decide the turn
|
|
// before this listener ever ran, and no downstream decision may resurrect a
|
|
// structured turn that is already finished.
|
|
runtime.disposers.push(root.on('agent/turn-continuation', function (
|
|
this: unknown, agent: Agent, _turn: number, _decision: ContinuationDecision, next: () => Promise<ContinuationDecision>,
|
|
): Promise<ContinuationDecision> {
|
|
if (runtime.states.get(agent)?.captured) return Promise.resolve({ action: 'stop' })
|
|
return next()
|
|
}, { prepend: true }))
|
|
|
|
// The capture COMMIT: promote the staged value only when the final
|
|
// post-execute decision accepts the call. The capture tool's body cannot
|
|
// decide — `tools/post-execute` runs after it, and a blocking listener (a
|
|
// PostToolUse hook) turns the logged result into `isError` feedback; a value
|
|
// committed at body time would make readResult report `structured` success
|
|
// for a call whose result the model and session log saw fail. `prepend:
|
|
// true` = outermost at registration time, so `await next()` returns the
|
|
// COMPOSED downstream decision — the same final verdict the registry maps
|
|
// onto the result. (A later-registered outer listener that blocks without
|
|
// delegating skips this commit entirely: the staged value is dropped and the
|
|
// run errors — failure-safe in the same direction.) The staging slot clears
|
|
// on every path, including a rejecting downstream listener.
|
|
runtime.disposers.push(root.on('tools/post-execute', async function (
|
|
this: unknown, exec: ToolExecution, _result: ToolExecutionResult, next: () => Promise<PostToolDecision>,
|
|
): Promise<PostToolDecision> {
|
|
const state = exec.agent ? runtime.states.get(exec.agent) : undefined
|
|
if (!state || exec.name !== STRUCTURED_OUTPUT_TOOL || state.pending === undefined) return next()
|
|
const pending = state.pending
|
|
try {
|
|
const decision = await next()
|
|
if (decision.kind === 'accept') state.captured = pending
|
|
return decision
|
|
} finally {
|
|
delete state.pending
|
|
}
|
|
}, { prepend: true }))
|
|
|
|
// Terminal means terminal WITHIN the step, not only at its end: the
|
|
// turn-continuation veto above runs after every call in the current model
|
|
// response has executed, so a response that puts `structured_output` before
|
|
// further tool calls would still perform those side effects after the final
|
|
// answer was accepted. Deny every later call for a captured agent at the
|
|
// allow/deny gate — dispatch is skipped and the model sees an `isError`
|
|
// result naming the contract. Calls that PRECEDE the capture in the same
|
|
// response ran before `captured` was set and are untouched; a second
|
|
// `structured_output` is denied like any other call. `prepend: true` for the
|
|
// same reason as the continuation veto: no earlier-registered allow may
|
|
// short-circuit past the terminal contract.
|
|
runtime.disposers.push(root.on('tools/pre-execute', function (
|
|
this: unknown, exec: ToolExecution, next: () => Promise<PreToolDecision>,
|
|
): Promise<PreToolDecision> {
|
|
if (exec.agent && runtime.states.get(exec.agent)?.captured) {
|
|
return Promise.resolve({
|
|
kind: 'deny',
|
|
reason: `structured output already recorded: the run is complete, so \`${exec.name}\` is not executed`,
|
|
})
|
|
}
|
|
return next()
|
|
}, { prepend: true }))
|
|
}
|