@ai-sdk/harness 1.0.117 → 1.0.119

package/CHANGELOG.md

@@ -1,5 +1,27 @@
 # @ai-sdk/harness
 
+## 1.0.119
+
+### Patch Changes
+
+- 125f493: fix(harness): forward validated `toolsContext` to host-executed tools in alignment with `ToolLoopAgent`
+- Updated dependencies [0343bb1]
+- Updated dependencies [2b105fa]
+- Updated dependencies [125f493]
+  - ai@7.0.109
+
+## 1.0.118
+
+### Patch Changes
+
+- d975097: feat(harness): add `AbortSignal` to `SandboxChannel.connect`, plus a `sleep()` helper function
+- b2baeba: fix(harness): preserve work directory text inside longer path segments
+- Updated dependencies [3f6852a]
+- Updated dependencies [6317504]
+- Updated dependencies [3cb2dcd]
+- Updated dependencies [ccf98e7]
+  - ai@7.0.108
+
 ## 1.0.117
 
 ### Patch Changes

package/dist/agent/index.d.ts

@@ -1,5 +1,6 @@
 import * as _ai_sdk_provider_utils from '@ai-sdk/provider-utils';
-import { Experimental_SandboxSession, UserModelMessage, ToolResultPart, ProviderOptions, ToolSet, FlexibleSchema, Tool, Context, SystemModelMessage, MaybePromiseLike, Arrayable, ToolApprovalResponse, ModelMessage } from '@ai-sdk/provider-utils';
+import { Experimental_SandboxSession, UserModelMessage, ToolResultPart, ProviderOptions, ToolSet, FlexibleSchema, Tool, Context, InferToolSetContext, SystemModelMessage, MaybePromiseLike, Arrayable, ToolApprovalResponse, ModelMessage } from '@ai-sdk/provider-utils';
+import { ToolsContextSettings } from 'ai/internal';
 import { OutputInterface, AgentCallParameters, Prompt, StopCondition, GenerateTextOnStartCallback, GenerateTextOnStepStartCallback, OnLanguageModelCallStartCallback, OnLanguageModelCallEndCallback, OnToolExecutionStartCallback, OnToolExecutionEndCallback, GenerateTextOnStepEndCallback, GenerateTextOnEndCallback, ToolApprovalStatus, TelemetryOptions, ActiveTools, StreamTextResult, Agent, GenerateTextResult, AgentStreamParameters, Telemetry } from 'ai';
 import { z } from 'zod/v4';
 import { JSONSchema7, JSONValue, LanguageModelV4StreamPart, LanguageModelV4ToolCall, LanguageModelV4ToolApprovalRequest, LanguageModelV4ToolResult, LanguageModelV4FinishReason, LanguageModelV4Usage, AISDKError } from '@ai-sdk/provider';
@@ -1344,6 +1345,12 @@ type HarnessAgentSettings<THarness extends HarnessAgentAdapter<any> = HarnessAge
      * declare a tool with the same name as a builtin to override.
      */
     readonly tools?: TUserTools;
+    /**
+     * Per-tool context passed to host-executed tools. Each entry is validated
+     * against the matching tool's `contextSchema` before execution.
+     * `prepareCall` can replace it for each new turn.
+     */
+    readonly toolsContext?: InferToolSetContext<TUserTools>;
     /**
      * Skills made available to the underlying runtime. Each adapter decides how
      * to surface skills. `prepareCall` can replace them between completed turns.
@@ -1383,7 +1390,11 @@ type HarnessAgentSettings<THarness extends HarnessAgentAdapter<any> = HarnessAge
      * })
      * ```
      */
-    readonly prepareCall?: (options: Omit<AgentCallParameters<CALL_OPTIONS, HarnessAllTools<THarness, TUserTools>, RUNTIME_CONTEXT>, 'abortSignal' | 'timeout' | 'onStart' | 'experimental_onStart' | 'onStepStart' | 'experimental_onStepStart' | 'onToolExecutionStart' | 'experimental_onToolCallStart' | 'onToolExecutionEnd' | 'experimental_onToolCallFinish' | 'onStepEnd' | 'onStepFinish' | 'onEnd' | 'onFinish' | 'experimental_sandbox'> & Pick<HarnessAgentSettings<THarness, TUserTools, RUNTIME_CONTEXT, NoInfer<OUTPUT>, CALL_OPTIONS>, 'model' | 'skills' | 'instructions' | 'tools'>) => MaybePromiseLike<Pick<HarnessAgentSettings<THarness, TUserTools, RUNTIME_CONTEXT, NoInfer<OUTPUT>, CALL_OPTIONS>, 'model' | 'skills' | 'instructions' | 'tools'> & Omit<Prompt, 'system' | 'instructions' | 'allowSystemInMessages'>>;
+    readonly prepareCall?: (options: Omit<AgentCallParameters<CALL_OPTIONS, HarnessAllTools<THarness, TUserTools>, RUNTIME_CONTEXT>, 'abortSignal' | 'timeout' | 'onStart' | 'experimental_onStart' | 'onStepStart' | 'experimental_onStepStart' | 'onToolExecutionStart' | 'experimental_onToolCallStart' | 'onToolExecutionEnd' | 'experimental_onToolCallFinish' | 'onStepEnd' | 'onStepFinish' | 'onEnd' | 'onFinish' | 'experimental_sandbox'> & Pick<HarnessAgentSettings<THarness, TUserTools, RUNTIME_CONTEXT, NoInfer<OUTPUT>, CALL_OPTIONS>, 'model' | 'skills' | 'instructions' | 'tools'> & {
+        toolsContext: InferToolSetContext<TUserTools>;
+    }) => MaybePromiseLike<Pick<HarnessAgentSettings<THarness, TUserTools, RUNTIME_CONTEXT, NoInfer<OUTPUT>, CALL_OPTIONS>, 'model' | 'skills' | 'instructions' | 'tools'> & {
+        toolsContext: InferToolSetContext<TUserTools>;
+    } & Omit<Prompt, 'system' | 'instructions' | 'allowSystemInMessages'>>;
     /**
      * Optional specification for generating typed output. The same output
      * requirement is active for every turn run by this agent.
@@ -1478,7 +1489,7 @@ type HarnessAgentSettings<THarness extends HarnessAgentAdapter<any> = HarnessAge
      * stderr default — wire this to capture diagnostics in code.
      */
     readonly onLog?: (event: HarnessDiagnostic) => void;
-} & HarnessAgentToolFilteringSettings<HarnessAllTools<THarness, TUserTools>>;
+} & ToolsContextSettings<TUserTools> & HarnessAgentToolFilteringSettings<HarnessAllTools<THarness, TUserTools>>;
 
 type HarnessAgentLifecycleCallbacks<TOOLS extends ToolSet, RUNTIME_CONTEXT extends Context, OUTPUT extends OutputInterface> = {
     onStart?: GenerateTextOnStartCallback<TOOLS, RUNTIME_CONTEXT, OUTPUT>;
@@ -1533,6 +1544,7 @@ declare class HarnessAgentSession {
     private suspendedTurnState;
     private activeTurnSettings;
     private persistedTurnSettings;
+    private readonly resumedToolsContext;
     /**
      * Whether this session was created from `resumeFrom` or `continueFrom`.
      * Captured at construction so it survives lifecycle cleanup.
@@ -1549,6 +1561,7 @@ declare class HarnessAgentSession {
         pendingToolApprovals?: readonly HarnessAgentPendingToolApproval[];
         pendingToolResults?: readonly HarnessAgentPendingToolResult[];
         turnSettings?: HarnessV1TurnSettings;
+        resumedToolsContext?: Record<string, Context | undefined>;
         turnState?: HarnessAgentTurnState;
     });
     hasUnfinishedTurn(): boolean;
@@ -1558,6 +1571,7 @@ declare class HarnessAgentSession {
         skills: ReadonlyArray<HarnessV1Skill>;
         instructions: string | undefined;
         tools: TOOLS;
+        toolsContext: InferToolSetContext<TOOLS>;
         activeTools: ToolSet;
         toolSpecs: HarnessAgentToolSpec[];
         builtinToolFiltering: HarnessV1BuiltinToolFiltering | undefined;
@@ -1574,6 +1588,7 @@ declare class HarnessAgentSession {
         skills: ReadonlyArray<HarnessV1Skill>;
         instructions: string | undefined;
         tools: TOOLS;
+        toolsContext: InferToolSetContext<TOOLS>;
         activeTools: ToolSet;
         toolSpecs: HarnessAgentToolSpec[];
         builtinToolFiltering: HarnessV1BuiltinToolFiltering | undefined;
@@ -1756,6 +1771,13 @@ declare class HarnessAgent<THarness extends HarnessAgentAdapter<any> = HarnessAg
          * handing it to the adapter.
          */
         continueFrom?: HarnessAgentContinueTurnState;
+        /**
+         * Rebinds host-only tool context for an unfinished turn resumed with
+         * `continueFrom` (directly or through `resumeFrom`). Tool context is not
+         * serialized into lifecycle state because it may contain credentials or
+         * non-serializable host objects.
+         */
+        toolsContext?: ToolsContextSettings<TUserTools>['toolsContext'];
         /**
          * Existing sandbox session to run the harness in. When provided, the
          * caller retains ownership of the sandbox lifecycle.

package/dist/agent/index.js

@@ -164,7 +164,11 @@ import {
 import {
   getErrorMessage
 } from "@ai-sdk/provider";
-import { asLanguageModelUsage as asLanguageModelUsage2, parseToolCall } from "ai/internal";
+import {
+  asLanguageModelUsage as asLanguageModelUsage2,
+  parseToolCall,
+  validateToolContext
+} from "ai/internal";
 
 // src/agent/internal/harness-stream-text-result.ts
 import {
@@ -851,6 +855,11 @@ function notSupportedYet(feature) {
   );
 }
 
+// src/agent/internal/get-own.ts
+function getOwn(obj, key) {
+  return obj != null && Object.prototype.hasOwnProperty.call(obj, key) ? obj[key] : void 0;
+}
+
 // src/agent/internal/translate-stream-part.ts
 import { generateId } from "@ai-sdk/provider-utils";
 function translateStreamPart(event, options = {}) {
@@ -1014,30 +1023,44 @@ function translateStreamPart(event, options = {}) {
 function createToolInputWorkDirStripper({
   sessionWorkDir
 }) {
-  const pendingByToolCallId = /* @__PURE__ */ new Map();
+  const stateByToolCallId = /* @__PURE__ */ new Map();
   return (part) => {
     var _a4;
     if (sessionWorkDir.length === 0) return [part];
     if (part.type === "tool-input-start") {
-      pendingByToolCallId.set(part.id, "");
+      stateByToolCallId.set(part.id, {
+        pending: "",
+        precedingCharacter: void 0
+      });
       return [part];
     }
     if (part.type === "tool-input-delta") {
+      const state2 = (_a4 = stateByToolCallId.get(part.id)) != null ? _a4 : {
+        pending: "",
+        precedingCharacter: void 0
+      };
+      const value = state2.pending + part.delta;
       const stripped2 = stripStreamingString({
-        value: ((_a4 = pendingByToolCallId.get(part.id)) != null ? _a4 : "") + part.delta,
+        value,
         workDir: sessionWorkDir,
-        final: false
+        final: false,
+        precedingCharacter: state2.precedingCharacter
+      });
+      const pendingStart = value.length - stripped2.pending.length;
+      stateByToolCallId.set(part.id, {
+        pending: stripped2.pending,
+        precedingCharacter: stripped2.pending.length > 0 ? pendingStart > 0 ? value[pendingStart - 1] : state2.precedingCharacter : value.length > 0 ? value[value.length - 1] : state2.precedingCharacter
       });
-      pendingByToolCallId.set(part.id, stripped2.pending);
       return stripped2.output.length === 0 ? [] : [{ ...part, delta: stripped2.output }];
     }
-    const pending = pendingByToolCallId.get(part.id);
-    pendingByToolCallId.delete(part.id);
-    if (pending == null || pending.length === 0) return [part];
+    const state = stateByToolCallId.get(part.id);
+    stateByToolCallId.delete(part.id);
+    if (state == null || state.pending.length === 0) return [part];
     const stripped = stripStreamingString({
-      value: pending,
+      value: state.pending,
       workDir: sessionWorkDir,
-      final: true
+      final: true,
+      precedingCharacter: state.precedingCharacter
     });
     return stripped.output.length === 0 ? [part] : [
       { type: "tool-input-delta", id: part.id, delta: stripped.output },
@@ -1064,34 +1087,59 @@ function stripWorkDir(part, sessionWorkDir) {
   }
 }
 function stripString(value, workDir) {
-  return value.split(`${workDir}/`).join("").split(workDir).join(".");
+  return stripStreamingString({
+    value,
+    workDir,
+    final: true,
+    precedingCharacter: void 0
+  }).output;
 }
 function stripStreamingString({
   value,
   workDir,
-  final
+  final,
+  precedingCharacter
 }) {
   let remaining = value;
   let output = "";
+  let characterBeforeRemaining = precedingCharacter;
   while (remaining.length > 0) {
     const matchIndex = remaining.indexOf(workDir);
     if (matchIndex >= 0) {
-      output += remaining.slice(0, matchIndex);
       const followingIndex = matchIndex + workDir.length;
-      if (followingIndex === remaining.length && !final) {
-        return { output, pending: remaining.slice(matchIndex) };
+      const hasPathBoundary = isPathBoundary(
+        remaining,
+        matchIndex,
+        characterBeforeRemaining
+      );
+      if (hasPathBoundary && followingIndex === remaining.length && !final) {
+        return {
+          output: output + remaining.slice(0, matchIndex),
+          pending: remaining.slice(matchIndex)
+        };
       }
-      if (remaining[followingIndex] === "/") {
+      const isPath = hasPathBoundary && (followingIndex === remaining.length || remaining[followingIndex] === "/" || isPathTerminator(remaining[followingIndex]));
+      if (!isPath) {
+        output += remaining.slice(0, followingIndex);
+        characterBeforeRemaining = remaining[followingIndex - 1];
+        remaining = remaining.slice(followingIndex);
+      } else if (remaining[followingIndex] === "/") {
+        output += remaining.slice(0, matchIndex);
+        characterBeforeRemaining = remaining[followingIndex];
         remaining = remaining.slice(followingIndex + 1);
       } else {
-        output += ".";
+        output += remaining.slice(0, matchIndex) + ".";
         remaining = remaining.slice(followingIndex);
       }
       continue;
     }
     if (final) return { output: output + remaining, pending: "" };
     let pendingLength = Math.min(remaining.length, workDir.length - 1);
-    while (pendingLength > 0 && !workDir.startsWith(remaining.slice(-pendingLength))) {
+    while (pendingLength > 0 && (!workDir.startsWith(remaining.slice(-pendingLength)) || !isPathBoundary(
+      remaining,
+      remaining.length - pendingLength,
+      characterBeforeRemaining
+    ))) {
       pendingLength -= 1;
     }
     const outputLength = remaining.length - pendingLength;
@@ -1102,6 +1150,13 @@ function stripStreamingString({
   }
   return { output, pending: "" };
 }
+function isPathBoundary(value, index, precedingCharacter) {
+  const character = index === 0 ? precedingCharacter : value[index - 1];
+  return character === void 0 || /[\s"'`=]/.test(character);
+}
+function isPathTerminator(character) {
+  return character === void 0 || /[\s"'`;|&<>()]/.test(character);
+}
 function stripDeep(value, workDir) {
   if (typeof value === "string") return stripString(value, workDir);
   if (Array.isArray(value)) return value.map((item) => stripDeep(item, workDir));
@@ -1479,29 +1534,29 @@ function unwrapToolResultOutput(toolResult) {
   }
 }
 function runPrompt(input) {
-  var _a4, _b4, _c, _d, _e, _f, _g, _h, _i;
+  var _a4, _b4, _c, _d, _e, _f, _g, _h, _i, _j;
   const callId = generateId2();
-  const toolsContext = {};
+  const toolsContext = (_a4 = input.toolsContext) != null ? _a4 : {};
   const result = new HarnessStreamTextResult({
     tools: input.tools,
     runtimeContext: input.runtimeContext,
     toolsContext,
     harnessId: input.harness.harnessId,
     callId,
-    modelId: (_a4 = input.model) != null ? _a4 : "",
+    modelId: (_b4 = input.model) != null ? _b4 : "",
     output: input.output
   });
-  const pendingToolApprovals = (_b4 = input.pendingToolApprovals) != null ? _b4 : [];
-  const pendingToolResults = (_c = input.pendingToolResults) != null ? _c : [];
-  const onPendingToolApproval = (_d = input.onPendingToolApproval) != null ? _d : (() => {
+  const pendingToolApprovals = (_c = input.pendingToolApprovals) != null ? _c : [];
+  const pendingToolResults = (_d = input.pendingToolResults) != null ? _d : [];
+  const onPendingToolApproval = (_e = input.onPendingToolApproval) != null ? _e : (() => {
   });
-  const onToolApprovalSettled = (_e = input.onToolApprovalSettled) != null ? _e : (() => {
+  const onToolApprovalSettled = (_f = input.onToolApprovalSettled) != null ? _f : (() => {
   });
-  const onPendingToolResult = (_f = input.onPendingToolResult) != null ? _f : (() => {
+  const onPendingToolResult = (_g = input.onPendingToolResult) != null ? _g : (() => {
   });
-  const onToolResultSettled = (_g = input.onToolResultSettled) != null ? _g : (() => {
+  const onToolResultSettled = (_h = input.onToolResultSettled) != null ? _h : (() => {
   });
-  const activeTools = (_h = input.activeTools) != null ? _h : input.tools;
+  const activeTools = (_i = input.activeTools) != null ? _i : input.tools;
   const activeToolNames = Object.keys(input.tools).filter(
     (toolName) => Object.prototype.hasOwnProperty.call(activeTools, toolName) || Object.prototype.hasOwnProperty.call(
       input.harness.builtinTools,
@@ -1514,7 +1569,7 @@ function runPrompt(input) {
   const lifecycle = createTurnLifecycle({
     callId,
     telemetry: input.telemetry,
-    callbacks: (_i = input.callbacks) != null ? _i : {},
+    callbacks: (_j = input.callbacks) != null ? _j : {},
     harnessId: input.harness.harnessId,
     modelId: input.model,
     instructions: input.instructions,
@@ -1541,7 +1596,7 @@ function runPrompt(input) {
     result.fail(err);
   };
   const done = (async () => {
-    var _a5, _b5, _c2, _d2, _e2, _f2, _g2, _h2, _i2, _j, _k, _l, _m, _n, _o;
+    var _a5, _b5, _c2, _d2, _e2, _f2, _g2, _h2, _i2, _j2, _k, _l, _m, _n, _o;
     let bridge;
     try {
       bridge = await toHarnessStream({
@@ -1926,6 +1981,7 @@ function runPrompt(input) {
       const execution = await maybeExecuteHostTool({
         event: rawToolCall,
         tools: activeTools,
+        toolsContext,
         wrappedExecuteTool: lifecycle.executeTool,
         sandboxSession: input.sandboxSession,
         abortSignal: input.abortSignal,
@@ -2177,7 +2233,7 @@ function runPrompt(input) {
             toolName: toolCall.toolName,
             input: (_i2 = rawToolCall == null ? void 0 : rawToolCall.input) != null ? _i2 : JSON.stringify(toolCall.input),
             kind: "builtin",
-            providerExecuted: (_j = rawToolCall == null ? void 0 : rawToolCall.providerExecuted) != null ? _j : true,
+            providerExecuted: (_j2 = rawToolCall == null ? void 0 : rawToolCall.providerExecuted) != null ? _j2 : true,
             ...(rawToolCall == null ? void 0 : rawToolCall.nativeName) !== void 0 ? { nativeName: rawToolCall.nativeName } : {}
           };
           pendingApprovalsByApprovalId.set(
@@ -2372,6 +2428,7 @@ function runPrompt(input) {
               const execution = await maybeExecuteHostTool({
                 event: toolCall,
                 tools: activeTools,
+                toolsContext,
                 wrappedExecuteTool: lifecycle.executeTool,
                 sandboxSession: input.sandboxSession,
                 abortSignal: input.abortSignal,
@@ -2483,6 +2540,21 @@ async function maybeExecuteHostTool(input) {
   if (!isExecutableTool(tool)) return { executed: false };
   const parsed = await safeParseJSON2({ text: input.event.input });
   const args = parsed.success ? parsed.value : input.event.input;
+  let context;
+  try {
+    context = await validateToolContext({
+      toolName: input.event.toolName,
+      context: getOwn(input.toolsContext, input.event.toolName),
+      contextSchema: tool.contextSchema
+    });
+  } catch (err) {
+    await input.submitToolResult({
+      toolCallId: input.event.toolCallId,
+      output: { error: "Tool context validation failed." },
+      isError: true
+    });
+    return { executed: true, outcome: { ok: false, error: err } };
+  }
   try {
     const output = await input.wrappedExecuteTool({
       toolCallId: input.event.toolCallId,
@@ -2495,7 +2567,7 @@ async function maybeExecuteHostTool(input) {
             toolCallId: input.event.toolCallId,
             messages: [],
             abortSignal: input.abortSignal,
-            context: void 0,
+            context,
             experimental_sandbox: input.sandboxSession
           }
         });
@@ -2584,6 +2656,7 @@ var HarnessAgentSession = class {
       this.pendingToolResults.set(pendingResult.toolCallId, pendingResult);
     }
     this.persistedTurnSettings = options.turnSettings;
+    this.resumedToolsContext = options.resumedToolsContext;
     this.turnState = (_d = options.turnState) != null ? _d : this.pendingToolApprovals.size > 0 ? "awaiting-approval" : this.pendingToolResults.size > 0 ? "awaiting-tool-result" : "idle";
     this.isResume = options.underlyingSession.isResume;
   }
@@ -2624,6 +2697,7 @@ var HarnessAgentSession = class {
     this.activeTurnSettings = {
       persisted: this.persistedTurnSettings,
       tools: options.tools,
+      toolsContext: options.toolsContext,
       activeTools: options.activeTools,
       builtinToolFiltering: options.builtinToolFiltering
     };
@@ -2638,6 +2712,7 @@ var HarnessAgentSession = class {
         skills: options.skills,
         instructions: options.instructions,
         tools: options.tools,
+        toolsContext: options.toolsContext,
         activeTools: options.activeTools,
         toolSpecs: options.toolSpecs,
         builtinToolFiltering: options.builtinToolFiltering,
@@ -2697,6 +2772,7 @@ var HarnessAgentSession = class {
       skills: options.skills,
       instructions: options.instructions,
       tools: options.tools,
+      toolsContext: options.toolsContext,
       activeTools: options.activeTools,
       toolSpecs: options.toolSpecs,
       builtinToolFiltering: options.builtinToolFiltering
@@ -2712,6 +2788,7 @@ var HarnessAgentSession = class {
         skills: turnSettings.persisted.skills,
         instructions: turnSettings.persisted.instructions,
         tools: turnSettings.tools,
+        toolsContext: turnSettings.toolsContext,
         activeTools: turnSettings.activeTools,
         toolSpecs: [...turnSettings.persisted.tools],
         builtinToolFiltering: turnSettings.builtinToolFiltering,
@@ -3076,7 +3153,7 @@ var HarnessAgentSession = class {
     this.turnState = "idle";
   }
   resolveActiveTurnSettings(options) {
-    var _a4;
+    var _a4, _b4;
     if (this.activeTurnSettings != null) {
       return this.activeTurnSettings;
     }
@@ -3100,6 +3177,7 @@ var HarnessAgentSession = class {
     this.activeTurnSettings = {
       persisted,
       tools: options.tools,
+      toolsContext: (_b4 = this.resumedToolsContext) != null ? _b4 : options.toolsContext,
       activeTools,
       builtinToolFiltering: options.builtinToolFiltering
     };
@@ -3722,6 +3800,11 @@ var HarnessAgent = class {
       });
     }
     const effectiveContinueFrom = validatedContinueFrom != null ? validatedContinueFrom : validatedResumeFrom == null ? void 0 : validatedResumeFrom.continueFrom;
+    if ((options == null ? void 0 : options.toolsContext) != null && effectiveContinueFrom == null) {
+      throw new Error(
+        "HarnessAgent.createSession: `toolsContext` can only rebind an unfinished turn from `continueFrom` or `resumeFrom`."
+      );
+    }
     const isResumedSession = validatedResumeFrom != null || effectiveContinueFrom != null;
     let sandboxSession;
     let sessionWorkDir;
@@ -3884,6 +3967,7 @@ var HarnessAgent = class {
         pendingToolApprovals: effectiveContinueFrom == null ? void 0 : effectiveContinueFrom.pendingToolApprovals,
         pendingToolResults: effectiveContinueFrom == null ? void 0 : effectiveContinueFrom.pendingToolResults,
         turnSettings: effectiveContinueFrom == null ? void 0 : effectiveContinueFrom.turnSettings,
+        resumedToolsContext: options == null ? void 0 : options.toolsContext,
         turnState: effectiveContinueFrom == null ? "idle" : effectiveContinueFrom.pendingToolApprovals != null && effectiveContinueFrom.pendingToolApprovals.length > 0 ? "awaiting-approval" : effectiveContinueFrom.pendingToolResults != null && effectiveContinueFrom.pendingToolResults.length > 0 ? "awaiting-tool-result" : "suspended"
       });
     } catch (error) {
@@ -4007,6 +4091,7 @@ var HarnessAgent = class {
       skills: input.turnSettings.skills,
       instructions: input.turnSettings.instructions,
       tools: input.turnSettings.tools,
+      toolsContext: input.turnSettings.toolsContext,
       activeTools: input.turnSettings.activeTools,
       toolSpecs: input.turnSettings.toolSpecs,
       builtinToolFiltering: input.turnSettings.builtinToolFiltering,
@@ -4089,7 +4174,7 @@ var HarnessAgent = class {
     throw new Error("HarnessAgent: either `prompt` or `messages` is required.");
   }
   async _preparePromptTurnInput(options) {
-    var _a4, _b4, _c;
+    var _a4, _b4, _c, _d;
     let callOptions = options;
     if (this.settings.callOptionsSchema != null && options.options !== void 0) {
       const validatedOptions = await validateTypes({
@@ -4126,12 +4211,13 @@ var HarnessAgent = class {
       skills: this.settings.skills,
       instructions: this.settings.instructions,
       tools: this.settings.tools,
+      toolsContext: (_a4 = this.settings.toolsContext) != null ? _a4 : {},
       ...promptOptions
     };
-    const preparedCallArgs = (_c = await ((_b4 = (_a4 = this.settings).prepareCall) == null ? void 0 : _b4.call(
-      _a4,
+    const preparedCallArgs = (_d = await ((_c = (_b4 = this.settings).prepareCall) == null ? void 0 : _c.call(
+      _b4,
       baseCallArgs
-    ))) != null ? _c : baseCallArgs;
+    ))) != null ? _d : baseCallArgs;
     if (this._resolveContinueTurnInput(preparedCallArgs) != null) {
       throw new Error(
         "HarnessAgent.prepareCall must return a fresh user prompt, not a tool continuation."
@@ -4143,7 +4229,8 @@ var HarnessAgent = class {
         model: preparedCallArgs.model,
         skills: preparedCallArgs.skills,
         instructions: preparedCallArgs.instructions,
-        tools: preparedCallArgs.tools
+        tools: preparedCallArgs.tools,
+        toolsContext: preparedCallArgs.toolsContext
       })
     };
   }
@@ -4154,14 +4241,15 @@ var HarnessAgent = class {
         model: this.settings.model,
         skills: this.settings.skills,
         instructions: this.settings.instructions,
-        tools: this.settings.tools
+        tools: this.settings.tools,
+        toolsContext: this.settings.toolsContext
       }),
       toolApprovalContinuations: (_a4 = options.toolApprovalContinuations) != null ? _a4 : [],
       toolResultContinuations: (_b4 = options.toolResultContinuations) != null ? _b4 : []
     };
   }
   _prepareTurnSettings(options) {
-    var _a4, _b4, _c;
+    var _a4, _b4, _c, _d;
     const userTools = (_a4 = options.tools) != null ? _a4 : {};
     assertNoReservedQuestionTool({
       harness: this.settings.harness,
@@ -4183,6 +4271,7 @@ var HarnessAgent = class {
       skills: (_b4 = options.skills) != null ? _b4 : [],
       instructions: typeof options.instructions === "string" ? options.instructions : (_c = options.instructions) == null ? void 0 : _c.content,
       tools,
+      toolsContext: (_d = options.toolsContext) != null ? _d : {},
       activeTools: toolFiltering.activeUserTools,
       toolSpecs: this._toToolSpecs(toolFiltering.activeUserTools),
       builtinToolFiltering: toolFiltering.builtinToolFiltering