experimental-ash 0.2.0-alpha.2 → 0.2.0-alpha.21

package/dist/src/harness/tool-loop.js

@@ -1,12 +1,12 @@
-import { stepCountIs, ToolLoopAgent, } from "ai";
-import { createCompactionCompletedEvent, createCompactionRequestedEvent, createInputRequestedEvent, createRunFailedEvent, } from "../protocol/message.js";
+import { stepCountIs, ToolLoopAgent } from "ai";
+import { createInputRequestedEvent } from "../protocol/message.js";
 import { ASK_QUESTION_TOOL_NAME } from "../runtime/framework-tools/ask-question.js";
-import { compactMessages, getInputTokenCount, resolveCompactionModel, shouldCompact, } from "./compaction.js";
-import { emitCompletedStepOutput, emitToolCallActionsAndResults, emitTurnEpilogue, emitTurnPreamble, getHarnessEmissionState, setHarnessEmissionState, } from "./emission.js";
+import { advanceStep, emitFailedStep, emitStreamContent, emitTurnEpilogue, emitTurnPreamble, getHarnessEmissionState, setHarnessEmissionState, } from "./emission.js";
 import { extractQuestionInputRequests, extractToolApprovalInputRequests, } from "./input-extraction.js";
-import { applyStepInputToMessages, consumeDeferredStepInput, getApprovedTools, hasDeferredStepInput, hasStepInput, recordApprovedTools, resolveEmitterInput, setPendingRuntimeInputBatch, } from "./input-requests.js";
+import { consumeDeferredStepInput, getApprovedTools, hasDeferredStepInput, hasStepInput, resolvePendingInput, setPendingInputBatch, } from "./input-requests.js";
 import { resolveAssistantStepText } from "./messages.js";
-import { applyLastToolCacheBreakpoint, buildPromptCachePrepareStep, detectPromptCachePath, getAnthropicCacheMarker, mergeGatewayAutoCaching, } from "./prompt-cache.js";
+import { applyLastToolCacheBreakpoint, detectPromptCachePath, getAnthropicCacheMarker, } from "./prompt-cache.js";
+import { buildStepHooks, emitStepActions } from "./step-hooks.js";
 import { buildToolSetWithProviderTools } from "./tools.js";
 /**
  * Creates a tool-loop harness step function backed by AI SDK `ToolLoopAgent`.
@@ -17,220 +17,169 @@ import { buildToolSetWithProviderTools } from "./tools.js";
  * and let the agent execute any tool calls. Returns the updated session and a
  * `next` instruction telling the runtime what to do.
  *
- * When an `emit` callback is provided via config, the harness emits the full
- * lifecycle event sequence at the appropriate points during execution.
+ * Step-internal work (step.started emission, compaction, prompt caching,
+ * action emission, step.completed) is delegated to `ToolLoopAgent` hooks
+ * via {@link buildStepHooks}. The harness itself owns only turn-level
+ * bookends, input resolution, and the continuation decision.
  */
 export function createToolLoopHarness(config) {
     const emit = config.emit;
     async function runStep(initialSession, input) {
         let session = initialSession;
         let emissionState = getHarnessEmissionState(session);
+        // --- Input resolution ---------------------------------------------------
+        const stepInput = consumeDeferredStepInput({ input, session });
+        session = stepInput.session;
+        const pending = resolvePendingInput({ session, stepInput: stepInput.input });
+        if (pending.outcome === "unresolved") {
+            return { next: null, session: pending.session };
+        }
+        // --- Turn preamble ------------------------------------------------------
         if (emit && hasStepInput(input)) {
             emissionState = await emitTurnPreamble(emit, input ?? {}, emissionState, config.runtimeIdentity);
             session = setHarnessEmissionState(session, emissionState);
         }
-        const stepInput = consumeDeferredStepInput({
-            input,
-            session,
-        });
-        session = stepInput.session;
-        // Let the channel emitter convert raw text into structured input
-        // results when the session has a pending input batch (e.g. Slack
-        // user replies "yes" to approve a tool call).
-        const resolvedInput = resolveEmitterInput({
-            channelEmitter: config.channelEmitter,
-            session,
-            stepInput: stepInput.input,
-        });
-        session = recordApprovedTools({
-            inputResults: resolvedInput?.inputResults ?? [],
-            session,
-        });
-        const preparedInput = applyStepInputToMessages({ input: resolvedInput, session });
-        let messages = preparedInput.messages;
-        session = preparedInput.session;
+        session = pending.session;
+        const messages = pending.messages;
+        if (stepInput.input?.message !== undefined && !pending.deferredMessage) {
+            messages.push({ content: stepInput.input.message, role: "user" });
+        }
+        // --- Model + tools ------------------------------------------------------
         const model = await config.resolveModel(session.agent.modelReference);
         const cachePath = detectPromptCachePath(model);
-        const providerOptions = toToolLoopProviderOptions(cachePath.kind === "gateway-auto"
-            ? mergeGatewayAutoCaching(session.agent.modelReference.providerOptions)
-            : session.agent.modelReference.providerOptions);
-        if (shouldCompact(messages, session.compaction)) {
-            const compaction = await resolveCompactionModel({
-                compactionModelReference: session.agent.compactionModelReference,
-                model,
-                modelReference: session.agent.modelReference,
-                resolveModel: config.resolveModel,
-            });
-            if (emit) {
-                await emit(createCompactionRequestedEvent({
-                    modelId: formatModelId(compaction.model),
-                    runId: "",
-                    sequence: emissionState.sequence,
-                    sessionId: "",
-                    thresholdPercent: 0,
-                    turnId: emissionState.turnId,
-                    usageInputTokens: getInputTokenCount(messages, session.compaction),
-                }));
-            }
-            messages = await compactMessages(messages, compaction.model, session.compaction, compaction.providerOptions);
-            if (config.onCompaction) {
-                const compacted = await config.onCompaction(session);
-                session = compacted.session;
-                for (const msg of compacted.messages) {
-                    messages.push(msg);
-                }
-            }
-            if (emit) {
-                await emit(createCompactionCompletedEvent({
-                    lastCompactionIndex: 0,
-                    modelId: formatModelId(compaction.model),
-                    runId: "",
-                    sequence: emissionState.sequence,
-                    sessionId: "",
-                    turnId: emissionState.turnId,
-                }));
-            }
-        }
+        const marker = cachePath.kind === "anthropic-direct" ? getAnthropicCacheMarker() : undefined;
         const tools = await buildToolSetWithProviderTools({
             approvedTools: getApprovedTools(session),
-            definitions: session.agent.tools,
-            executors: config.toolExecutors,
             isRoot: session.agent.isRoot,
             modelReference: session.agent.modelReference,
-            needsApprovalFns: config.toolNeedsApprovalFns,
+            tools: config.tools,
         });
-        let effectiveTools = tools;
-        let prepareStep;
-        if (cachePath.kind === "anthropic-direct") {
-            const marker = getAnthropicCacheMarker();
-            effectiveTools = applyLastToolCacheBreakpoint(tools, marker);
-            prepareStep = buildPromptCachePrepareStep(marker);
-        }
+        const effectiveTools = marker ? applyLastToolCacheBreakpoint(tools, marker) : tools;
+        // --- Build hooks --------------------------------------------------------
+        const hooks = buildStepHooks({
+            cachePath,
+            emit,
+            emissionState,
+            marker,
+            model,
+            onCompaction: config.onCompaction,
+            resolveModel: config.resolveModel,
+            session,
+        });
+        // --- Execute via ToolLoopAgent ------------------------------------------
         const agent = new ToolLoopAgent({
             instructions: session.agent.system || undefined,
             model,
-            prepareStep,
-            providerOptions,
+            onStepFinish: hooks.onStepFinish,
+            prepareStep: hooks.prepareStep,
             stopWhen: stepCountIs(1),
             tools: effectiveTools,
         });
         let result;
         try {
-            result = await agent.generate({ messages });
+            if (emit) {
+                const streamResult = await agent.stream({ messages });
+                await emitStreamContent(emit, emissionState, streamResult.fullStream);
+                result = await hooks.stepResult;
+                await emitStepActions(emit, emissionState, result, {
+                    excludedActionToolNames: new Set([ASK_QUESTION_TOOL_NAME]),
+                });
+            }
+            else {
+                await agent.generate({ messages });
+                result = await hooks.stepResult;
+            }
         }
         catch (error) {
             if (emit) {
-                await emit(createRunFailedEvent({
+                await emitFailedStep(emit, emissionState, {
                     code: "MODEL_CALL_FAILED",
                     message: error instanceof Error ? error.message : String(error),
-                    runId: "",
-                    sessionId: "",
-                }));
+                    sessionId: session.sessionId,
+                });
             }
             throw error;
         }
-        const responseMessages = result.response.messages;
-        const stepOutput = resolveAssistantStepText(responseMessages, result.text);
-        const approvalRequests = extractToolApprovalInputRequests({ content: result.content ?? [] });
-        const approvalRequestCallIds = new Set(approvalRequests.map((request) => request.action.callId));
-        const questionRequests = extractQuestionInputRequests({
-            toolCalls: result.toolCalls,
-            excludedCallIds: approvalRequestCallIds,
+        session = hooks.getSession();
+        // --- Handle result ------------------------------------------------------
+        return handleStepResult({
+            config,
+            emit,
+            emissionState,
+            messages,
+            result,
+            runStep,
+            session,
+        });
+    }
+    return runStep;
+}
+// ---------------------------------------------------------------------------
+// Post-step result handling
+// ---------------------------------------------------------------------------
+/**
+ * Processes the step result: extracts input requests, decides whether to
+ * park, continue the tool loop, or terminate.
+ */
+async function handleStepResult(input) {
+    const { config, emit, messages, result, runStep } = input;
+    let { emissionState, session } = input;
+    const responseMessages = result.response.messages;
+    const stepOutput = resolveAssistantStepText(responseMessages, result.text);
+    const approvalRequests = extractToolApprovalInputRequests({ content: result.content ?? [] });
+    const approvalRequestCallIds = new Set(approvalRequests.map((request) => request.action.callId));
+    const questionRequests = extractQuestionInputRequests({
+        toolCalls: result.toolCalls,
+        excludedCallIds: approvalRequestCallIds,
+    });
+    const inputRequests = [...approvalRequests, ...questionRequests];
+    const baseSession = {
+        ...session,
+        compaction: {
+            ...session.compaction,
+            lastKnownInputTokens: result.usage?.inputTokens,
+        },
+    };
+    // --- Park on input requests -----------------------------------------------
+    if (inputRequests.length > 0) {
+        let parkedSession = setPendingInputBatch({
+            requests: inputRequests,
+            responseMessages,
+            session: { ...baseSession, history: messages },
         });
-        const runtimeInputRequests = [...approvalRequests, ...questionRequests];
-        const runtimeActionToolCalls = result.toolCalls.filter((call) => call.toolName !== ASK_QUESTION_TOOL_NAME && !approvalRequestCallIds.has(call.toolCallId));
-        const baseSession = {
-            ...session,
-            compaction: {
-                ...session.compaction,
-                lastKnownInputTokens: result.usage?.inputTokens,
-            },
-        };
-        const completedStepOutput = {
-            finishReason: normalizeAssistantStepFinishReason(result.finishReason),
-            message: stepOutput,
-            reasoning: result.reasoningText,
-        };
-        if (runtimeInputRequests.length > 0) {
-            let parkedSession = setPendingRuntimeInputBatch({
-                requests: runtimeInputRequests,
-                responseMessages,
-                session: {
-                    ...baseSession,
-                    history: messages,
-                },
-            });
-            if (emit) {
-                await emitCompletedStepOutput(emit, emissionState, completedStepOutput);
-                if (runtimeActionToolCalls.length > 0) {
-                    await emitToolCallActionsAndResults(emit, emissionState, {
-                        toolCalls: runtimeActionToolCalls,
-                        toolResults: result.toolResults,
-                    });
-                }
-                await emit(createInputRequestedEvent({
-                    requests: runtimeInputRequests,
-                    sequence: emissionState.sequence,
-                    turnId: emissionState.turnId,
-                }));
-                if (config.mode === "conversation") {
-                    emissionState = await emitTurnEpilogue(emit, emissionState, config.mode, result.usage);
-                    parkedSession = setHarnessEmissionState(parkedSession, emissionState);
-                }
-            }
-            return {
-                next: null,
-                session: parkedSession,
-            };
-        }
-        const updatedHistory = [...messages, ...responseMessages];
-        let nextSession = {
-            ...baseSession,
-            history: updatedHistory,
-        };
-        const continueLoop = runtimeActionToolCalls.length > 0 || hasDeferredStepInput(nextSession);
         if (emit) {
-            await emitCompletedStepOutput(emit, emissionState, completedStepOutput);
-            if (runtimeActionToolCalls.length > 0) {
-                await emitToolCallActionsAndResults(emit, emissionState, {
-                    toolCalls: runtimeActionToolCalls,
-                    toolResults: result.toolResults,
-                });
+            await emit(createInputRequestedEvent({
+                requests: inputRequests,
+                sequence: emissionState.sequence,
+                stepIndex: emissionState.stepIndex,
+                turnId: emissionState.turnId,
+            }));
+            if (config.mode === "conversation") {
+                emissionState = await emitTurnEpilogue(emit, emissionState, config.mode);
+                parkedSession = setHarnessEmissionState(parkedSession, emissionState);
             }
-            if (!continueLoop) {
-                emissionState = await emitTurnEpilogue(emit, emissionState, config.mode, result.usage);
-            }
-            nextSession = setHarnessEmissionState(nextSession, emissionState);
-        }
-        if (continueLoop) {
-            return { next: runStep, session: nextSession };
         }
-        return {
-            next: config.mode === "task" ? { done: true, output: stepOutput ?? "" } : null,
-            session: nextSession,
-        };
+        return { next: null, session: parkedSession };
     }
-    return runStep;
-}
-function formatModelId(model) {
-    if (typeof model === "string") {
-        return model;
+    // --- Continue or terminate ------------------------------------------------
+    const updatedHistory = [...messages, ...responseMessages];
+    let nextSession = { ...baseSession, history: updatedHistory };
+    const continueLoop = responseMessages.at(-1)?.role === "tool" || hasDeferredStepInput(nextSession);
+    if (emit) {
+        if (!continueLoop) {
+            emissionState = await emitTurnEpilogue(emit, emissionState, config.mode);
+        }
+        else {
+            emissionState = advanceStep(emissionState);
+        }
+        nextSession = setHarnessEmissionState(nextSession, emissionState);
     }
-    return `${model.provider}/${model.modelId}`;
-}
-function toToolLoopProviderOptions(value) {
-    return value;
-}
-function normalizeAssistantStepFinishReason(value) {
-    switch (value) {
-        case "content-filter":
-        case "error":
-        case "length":
-        case "stop":
-        case "tool-calls":
-            return value;
-        default:
-            return "other";
+    if (continueLoop) {
+        return { next: runStep, session: nextSession };
     }
+    return {
+        next: config.mode === "task" ? { done: true, output: stepOutput ?? "" } : null,
+        session: nextSession,
+    };
 }
 //# sourceMappingURL=tool-loop.js.map

package/dist/src/harness/tool-loop.js.map

@@ -1 +1 @@
-{"version":3,"file":"tool-loop.js","sourceRoot":"","sources":["../../../src/harness/tool-loop.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"tool-loop.js","sourceRoot":"","sources":["../../../src/harness/tool-loop.ts"],"names":[],"mappings":"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"}

package/dist/src/harness/tools.d.ts

@@ -1,27 +1,25 @@
 import { type ToolSet } from "ai";
-import type { NeedsApprovalContext } from "../public/definitions/tool.js";
 import type { RuntimeModelReference } from "../runtime/agent/bootstrap.js";
-import type { SessionToolDefinition, ToolExecutorMap } from "./types.js";
+import type { HarnessToolMap } from "./types.js";
 /**
- * Builds an AI SDK `ToolSet` from serializable session definitions and an
- * executor map that provides the actual execute functions.
+ * Builds an AI SDK `ToolSet` from unified harness tool definitions.
+ *
+ * Each tool's schema, execute function, and approval gate are read from
+ * the same {@link HarnessToolDefinition}. Tools without `execute` are
+ * surfaced to the model as client-side tools (no server execution).
  */
 export declare function buildToolSet(input: {
     readonly approvedTools?: ReadonlySet<string>;
-    readonly definitions: readonly SessionToolDefinition[];
-    readonly executors: ToolExecutorMap;
     readonly isRoot?: boolean;
-    readonly needsApprovalFns?: ReadonlyMap<string, (ctx: NeedsApprovalContext) => boolean>;
+    readonly tools: HarnessToolMap;
 }): ToolSet;
 /**
  * Builds the AI SDK ToolSet for one harness step.
  *
- * Most tools have local executors registered by the execution layer and are
- * assembled by {@link buildToolSet}. Provider-managed tools (those whose
- * `execute` is the {@link PROVIDER_MANAGED_EXECUTE} sentinel) have no local
- * executor — the execution layer intentionally skips them. This function
- * detects the gap in the executor map and injects the real AI SDK provider
- * tool in their place.
+ * Most tools have local executors and are assembled by {@link buildToolSet}.
+ * Provider-managed tools (e.g. web_search) have no local `execute` — the
+ * execution layer intentionally omits it. This function detects the gap and
+ * injects the real AI SDK provider tool in their place.
  *
  * When a user overrides a provider-managed tool via `defineTool()`, their
  * tool has a real executor and flows through the normal path — no
@@ -29,10 +27,8 @@ export declare function buildToolSet(input: {
  */
 export declare function buildToolSetWithProviderTools(input: {
     readonly approvedTools?: ReadonlySet<string>;
-    readonly definitions: readonly SessionToolDefinition[];
-    readonly executors: ToolExecutorMap;
     readonly isRoot?: boolean;
     readonly modelReference: RuntimeModelReference;
-    readonly needsApprovalFns?: ReadonlyMap<string, (ctx: NeedsApprovalContext) => boolean>;
+    readonly tools: HarnessToolMap;
 }): Promise<ToolSet>;
 //# sourceMappingURL=tools.d.ts.map

package/dist/src/harness/tools.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tools.d.ts","sourceRoot":"","sources":["../../../src/harness/tools.ts"],"names":[],"mappings":"AAAA,OAAO,EAAc,KAAK,OAAO,EAAQ,MAAM,IAAI,CAAC;AACpD,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,+BAA+B,CAAC;AAC1E,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,+BAA+B,CAAC;AAI3E,OAAO,KAAK,EAAE,qBAAqB,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAEzE;;;GAGG;AACH,wBAAgB,YAAY,CAAC,KAAK,EAAE;IAClC,QAAQ,CAAC,aAAa,CAAC,EAAE,WAAW,CAAC,MAAM,CAAC,CAAC;IAC7C,QAAQ,CAAC,WAAW,EAAE,SAAS,qBAAqB,EAAE,CAAC;IACvD,QAAQ,CAAC,SAAS,EAAE,eAAe,CAAC;IACpC,QAAQ,CAAC,MAAM,CAAC,EAAE,OAAO,CAAC;IAC1B,QAAQ,CAAC,gBAAgB,CAAC,EAAE,WAAW,CAAC,MAAM,EAAE,CAAC,GAAG,EAAE,oBAAoB,KAAK,OAAO,CAAC,CAAC;CACzF,GAAG,OAAO,CA6CV;AAED;;;;;;;;;;;;;GAaG;AACH,wBAAsB,6BAA6B,CAAC,KAAK,EAAE;IACzD,QAAQ,CAAC,aAAa,CAAC,EAAE,WAAW,CAAC,MAAM,CAAC,CAAC;IAC7C,QAAQ,CAAC,WAAW,EAAE,SAAS,qBAAqB,EAAE,CAAC;IACvD,QAAQ,CAAC,SAAS,EAAE,eAAe,CAAC;IACpC,QAAQ,CAAC,MAAM,CAAC,EAAE,OAAO,CAAC;IAC1B,QAAQ,CAAC,cAAc,EAAE,qBAAqB,CAAC;IAC/C,QAAQ,CAAC,gBAAgB,CAAC,EAAE,WAAW,CAAC,MAAM,EAAE,CAAC,GAAG,EAAE,oBAAoB,KAAK,OAAO,CAAC,CAAC;CACzF,GAAG,OAAO,CAAC,OAAO,CAAC,CAwBnB"}
+{"version":3,"file":"tools.d.ts","sourceRoot":"","sources":["../../../src/harness/tools.ts"],"names":[],"mappings":"AAAA,OAAO,EAAc,KAAK,OAAO,EAAQ,MAAM,IAAI,CAAC;AACpD,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,+BAA+B,CAAC;AAK3E,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;AAEjD;;;;;;GAMG;AACH,wBAAgB,YAAY,CAAC,KAAK,EAAE;IAClC,QAAQ,CAAC,aAAa,CAAC,EAAE,WAAW,CAAC,MAAM,CAAC,CAAC;IAC7C,QAAQ,CAAC,MAAM,CAAC,EAAE,OAAO,CAAC;IAC1B,QAAQ,CAAC,KAAK,EAAE,cAAc,CAAC;CAChC,GAAG,OAAO,CAmCV;AAED;;;;;;;;;;;GAWG;AACH,wBAAsB,6BAA6B,CAAC,KAAK,EAAE;IACzD,QAAQ,CAAC,aAAa,CAAC,EAAE,WAAW,CAAC,MAAM,CAAC,CAAC;IAC7C,QAAQ,CAAC,MAAM,CAAC,EAAE,OAAO,CAAC;IAC1B,QAAQ,CAAC,cAAc,EAAE,qBAAqB,CAAC;IAC/C,QAAQ,CAAC,KAAK,EAAE,cAAc,CAAC;CAChC,GAAG,OAAO,CAAC,OAAO,CAAC,CAoBnB"}

package/dist/src/harness/tools.js

@@ -1,37 +1,33 @@
 import { jsonSchema, tool } from "ai";
 import { WEB_SEARCH_TOOL_DEFINITION } from "../runtime/framework-tools/web-search.js";
+import { executeAuthoredTool } from "./execute-tool.js";
 import { resolveWebSearchBackend, resolveWebSearchProviderTool } from "./provider-tools.js";
 import { normalizeToolInputSchema } from "./tool-schema.js";
 /**
- * Builds an AI SDK `ToolSet` from serializable session definitions and an
- * executor map that provides the actual execute functions.
+ * Builds an AI SDK `ToolSet` from unified harness tool definitions.
+ *
+ * Each tool's schema, execute function, and approval gate are read from
+ * the same {@link HarnessToolDefinition}. Tools without `execute` are
+ * surfaced to the model as client-side tools (no server execution).
  */
 export function buildToolSet(input) {
     const tools = {};
-    for (const definition of input.definitions) {
+    for (const definition of input.tools.values()) {
         const baseToolDefinition = {
             description: definition.description,
-            inputSchema: jsonSchema(normalizeToolInputSchema(definition.parameters)),
-            needsApproval: async () => {
-                const toolFn = input.needsApprovalFns?.get(definition.name);
-                const required = toolFn !== undefined
-                    ? toolFn({
-                        approvedTools: input.approvedTools ?? new Set(),
-                        toolName: definition.name,
-                    })
-                    : false;
-                if (required && input.isRoot === false) {
-                    throw new Error(`Tool approval is currently not supported for subagent runs. Remove the needsApproval override on "${definition.name}" for the subagent or use never().`);
-                }
-                return required;
-            },
+            inputSchema: jsonSchema(normalizeToolInputSchema(definition.inputSchema)),
+            needsApproval: buildNeedsApprovalFn(definition, input),
         };
-        const execute = input.executors.get(definition.name);
-        if (execute !== undefined) {
+        if (definition.execute !== undefined) {
+            const executableDefinition = definition;
             tools[definition.name] = tool({
                 ...baseToolDefinition,
                 execute: async (rawInput) => {
-                    return (await execute(rawInput));
+                    const result = await executeAuthoredTool(executableDefinition, rawInput);
+                    if (!result.ok) {
+                        return { code: result.code, message: result.message };
+                    }
+                    return result.output;
                 },
             });
             continue;
@@ -43,12 +39,10 @@ export function buildToolSet(input) {
 /**
  * Builds the AI SDK ToolSet for one harness step.
  *
- * Most tools have local executors registered by the execution layer and are
- * assembled by {@link buildToolSet}. Provider-managed tools (those whose
- * `execute` is the {@link PROVIDER_MANAGED_EXECUTE} sentinel) have no local
- * executor — the execution layer intentionally skips them. This function
- * detects the gap in the executor map and injects the real AI SDK provider
- * tool in their place.
+ * Most tools have local executors and are assembled by {@link buildToolSet}.
+ * Provider-managed tools (e.g. web_search) have no local `execute` — the
+ * execution layer intentionally omits it. This function detects the gap and
+ * injects the real AI SDK provider tool in their place.
  *
  * When a user overrides a provider-managed tool via `defineTool()`, their
  * tool has a real executor and flows through the normal path — no
@@ -58,16 +52,14 @@ export async function buildToolSetWithProviderTools(input) {
     const tools = {
         ...buildToolSet({
             approvedTools: input.approvedTools,
-            definitions: input.definitions,
-            executors: input.executors,
             isRoot: input.isRoot,
-            needsApprovalFns: input.needsApprovalFns,
+            tools: input.tools,
         }),
     };
-    // Inject the real provider tool for web_search when the execution layer
-    // skipped its executor (i.e. the framework definition uses the sentinel).
-    const hasWebSearchInSession = input.definitions.some((t) => t.name === WEB_SEARCH_TOOL_DEFINITION.name);
-    if (hasWebSearchInSession && !input.executors.has(WEB_SEARCH_TOOL_DEFINITION.name)) {
+    // Inject the real provider tool for web_search when the definition has
+    // no local execute (i.e. the framework definition uses the provider sentinel).
+    const webSearchTool = input.tools.get(WEB_SEARCH_TOOL_DEFINITION.name);
+    if (webSearchTool !== undefined && webSearchTool.execute === undefined) {
         const backend = resolveWebSearchBackend(input.modelReference);
         if (backend !== null) {
             tools[WEB_SEARCH_TOOL_DEFINITION.name] = await resolveWebSearchProviderTool(backend);
@@ -75,4 +67,18 @@ export async function buildToolSetWithProviderTools(input) {
     }
     return tools;
 }
+function buildNeedsApprovalFn(definition, input) {
+    return async () => {
+        if (definition.needsApproval === undefined)
+            return false;
+        const required = definition.needsApproval({
+            approvedTools: input.approvedTools ?? new Set(),
+            toolName: definition.name,
+        });
+        if (required && input.isRoot === false) {
+            throw new Error(`Tool approval is currently not supported for subagent runs. Remove the needsApproval override on "${definition.name}" for the subagent or use never().`);
+        }
+        return required;
+    };
+}
 //# sourceMappingURL=tools.js.map

package/dist/src/harness/tools.js.map

@@ -1 +1 @@
-{"version":3,"file":"tools.js","sourceRoot":"","sources":["../../../src/harness/tools.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"tools.js","sourceRoot":"","sources":["../../../src/harness/tools.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAgB,IAAI,EAAE,MAAM,IAAI,CAAC;AAEpD,OAAO,EAAE,0BAA0B,EAAE,MAAM,0CAA0C,CAAC;AACtF,OAAO,EAAE,mBAAmB,EAA8B,MAAM,mBAAmB,CAAC;AACpF,OAAO,EAAE,uBAAuB,EAAE,4BAA4B,EAAE,MAAM,qBAAqB,CAAC;AAC5F,OAAO,EAAE,wBAAwB,EAAE,MAAM,kBAAkB,CAAC;AAG5D;;;;;;GAMG;AACH,MAAM,UAAU,YAAY,CAAC,KAI5B;IACC,MAAM,KAAK,GAAoC,EAAE,CAAC;IAElD,KAAK,MAAM,UAAU,IAAI,KAAK,CAAC,KAAK,CAAC,MAAM,EAAE,EAAE,CAAC;QAC9C,MAAM,kBAAkB,GAAG;YACzB,WAAW,EAAE,UAAU,CAAC,WAAW;YACnC,WAAW,EAAE,UAAU,CACrB,wBAAwB,CAAC,UAAU,CAAC,WAAW,CAAqC,CACrF;YACD,aAAa,EAAE,oBAAoB,CAAC,UAAU,EAAE,KAAK,CAAC;SACvD,CAAC;QAEF,IAAI,UAAU,CAAC,OAAO,KAAK,SAAS,EAAE,CAAC;YACrC,MAAM,oBAAoB,GAAG,UAE5B,CAAC;YACF,KAAK,CAAC,UAAU,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC;gBAC5B,GAAG,kBAAkB;gBACrB,OAAO,EAAE,KAAK,EAAE,QAAiB,EAAE,EAAE;oBACnC,MAAM,MAAM,GAAG,MAAM,mBAAmB,CAAC,oBAAoB,EAAE,QAAQ,CAAC,CAAC;oBAEzE,IAAI,CAAC,MAAM,CAAC,EAAE,EAAE,CAAC;wBACf,OAAO,EAAE,IAAI,EAAE,MAAM,CAAC,IAAI,EAAE,OAAO,EAAE,MAAM,CAAC,OAAO,EAAE,CAAC;oBACxD,CAAC;oBAED,OAAO,MAAM,CAAC,MAAM,CAAC;gBACvB,CAAC;aACF,CAAoB,CAAC;YACtB,SAAS;QACX,CAAC;QAED,KAAK,CAAC,UAAU,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,kBAAkB,CAAoB,CAAC;IACvE,CAAC;IAED,OAAO,KAAgB,CAAC;AAC1B,CAAC;AAED;;;;;;;;;;;GAWG;AACH,MAAM,CAAC,KAAK,UAAU,6BAA6B,CAAC,KAKnD;IACC,MAAM,KAAK,GAAY;QACrB,GAAG,YAAY,CAAC;YACd,aAAa,EAAE,KAAK,CAAC,aAAa;YAClC,MAAM,EAAE,KAAK,CAAC,MAAM;YACpB,KAAK,EAAE,KAAK,CAAC,KAAK;SACnB,CAAC;KACH,CAAC;IAEF,uEAAuE;IACvE,+EAA+E;IAC/E,MAAM,aAAa,GAAG,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,0BAA0B,CAAC,IAAI,CAAC,CAAC;IACvE,IAAI,aAAa,KAAK,SAAS,IAAI,aAAa,CAAC,OAAO,KAAK,SAAS,EAAE,CAAC;QACvE,MAAM,OAAO,GAAG,uBAAuB,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC;QAC9D,IAAI,OAAO,KAAK,IAAI,EAAE,CAAC;YACrB,KAAK,CAAC,0BAA0B,CAAC,IAAI,CAAC,GAAG,MAAM,4BAA4B,CAAC,OAAO,CAAC,CAAC;QACvF,CAAC;IACH,CAAC;IAED,OAAO,KAAK,CAAC;AACf,CAAC;AAED,SAAS,oBAAoB,CAC3B,UAAiC,EACjC,KAAkF;IAElF,OAAO,KAAK,IAAI,EAAE;QAChB,IAAI,UAAU,CAAC,aAAa,KAAK,SAAS;YAAE,OAAO,KAAK,CAAC;QAEzD,MAAM,QAAQ,GAAG,UAAU,CAAC,aAAa,CAAC;YACxC,aAAa,EAAE,KAAK,CAAC,aAAa,IAAI,IAAI,GAAG,EAAE;YAC/C,QAAQ,EAAE,UAAU,CAAC,IAAI;SAC1B,CAAC,CAAC;QAEH,IAAI,QAAQ,IAAI,KAAK,CAAC,MAAM,KAAK,KAAK,EAAE,CAAC;YACvC,MAAM,IAAI,KAAK,CACb,qGAAqG,UAAU,CAAC,IAAI,oCAAoC,CACzJ,CAAC;QACJ,CAAC;QAED,OAAO,QAAQ,CAAC;IAClB,CAAC,CAAC;AACJ,CAAC"}