@ai-sdk/harness 1.0.93 → 1.0.95

package/CHANGELOG.md

@@ -1,5 +1,28 @@
 # @ai-sdk/harness
 
+## 1.0.95
+
+### Patch Changes
+
+- 371e954: feat(harness): add `createBridgeToken()` and `withBridgeToken()` helpers for bridge backed harness adapters
+- 87b4858: feat(harness): enhance per-turn telemetry with recently added per-turn configuration data
+- Updated dependencies [11109ae]
+  - ai@7.0.86
+
+## 1.0.94
+
+### Patch Changes
+
+- 8961fde: feat(harness): allow changing `model` between turns via call options
+- eb59f2a: fix(harness): ensure harness adapters can stream tool input deltas before the complete tool call arrives
+- Updated dependencies [55a9981]
+- Updated dependencies [dd32de2]
+- Updated dependencies [aa45741]
+- Updated dependencies [cc29073]
+  - ai@7.0.85
+  - @ai-sdk/provider@4.0.9
+  - @ai-sdk/provider-utils@5.0.34
+
 ## 1.0.93
 
 ### Patch Changes

package/dist/agent/index.d.ts

@@ -2,7 +2,7 @@ import * as _ai_sdk_provider_utils from '@ai-sdk/provider-utils';
 import { Experimental_SandboxSession, UserModelMessage, ToolSet, FlexibleSchema, Tool, Context, MaybePromiseLike, Arrayable, ToolApprovalResponse, ModelMessage } from '@ai-sdk/provider-utils';
 import { OutputInterface, AgentCallParameters, Prompt, StopCondition, ToolApprovalStatus, TelemetryOptions, ActiveTools, StreamTextResult, Agent, GenerateTextResult, AgentStreamParameters, Telemetry } from 'ai';
 import { z } from 'zod/v4';
-import { JSONSchema7, JSONValue, LanguageModelV4ToolCall, LanguageModelV4ToolApprovalRequest, LanguageModelV4ToolResult, LanguageModelV4FinishReason, LanguageModelV4Usage, AISDKError } from '@ai-sdk/provider';
+import { JSONSchema7, JSONValue, LanguageModelV4StreamPart, LanguageModelV4ToolCall, LanguageModelV4ToolApprovalRequest, LanguageModelV4ToolResult, LanguageModelV4FinishReason, LanguageModelV4Usage, AISDKError } from '@ai-sdk/provider';
 
 /**
  * One file to write into the sandbox as part of an adapter's bootstrap recipe.
@@ -472,6 +472,12 @@ type HarnessV1PendingToolResult = {
  * so a resumed continuation cannot pick up configuration from a later turn.
  */
 type HarnessV1TurnSettings = {
+    /**
+     * Model identifier selected for this turn. Adapters interpret this value
+     * according to the underlying harness runtime. Rerun-based continuations
+     * reuse it when reconstructing the turn.
+     */
+    readonly model?: string;
     /**
      * Skills made available to the underlying runtime for this turn. Adapters
      * must replace skills from the preceding completed turn before starting a
@@ -630,7 +636,13 @@ type HarnessV1StreamPart = {
     type: 'reasoning-end';
     id: string;
     harnessMetadata?: HarnessV1Metadata;
-} | (LanguageModelV4ToolCall & {
+} | Extract<LanguageModelV4StreamPart, {
+    type: 'tool-input-start';
+}> | Extract<LanguageModelV4StreamPart, {
+    type: 'tool-input-delta';
+}> | Extract<LanguageModelV4StreamPart, {
+    type: 'tool-input-end';
+}> | (LanguageModelV4ToolCall & {
     nativeName?: string;
     /**
      * Total tool calls in the current model step, when known before tool
@@ -683,11 +695,6 @@ type HarnessV1BuiltinToolFiltering = {
  * calling the adapter, so adapters never need to derive provider-specific paths.
  */
 type HarnessV1StartOptions = {
-    /**
-     * Model identifier selected by the consumer. Adapters interpret this value
-     * according to the underlying harness runtime.
-     */
-    readonly model?: string;
     /**
      * Stable identifier for this harness session. Used as the underlying
      * resource name where the adapter has a notion of a named session
@@ -815,13 +822,6 @@ type HarnessV1Session = {
      * sessions report `false`; resumed sessions report `true`.
      */
     readonly isResume: boolean;
-    /**
-     * The model id the underlying runtime is configured to use, if the adapter
-     * knows it (e.g. from its settings). Surfaced into telemetry as
-     * `gen_ai.request.model` and the trace span labels. Omitted when the adapter
-     * defers to the runtime's own default and has no concrete id.
-     */
-    readonly modelId?: string;
     /**
      * Run one prompt turn. Returns a control handle the host uses to feed
      * tool results, approvals, and user messages back into the turn while it
@@ -1250,8 +1250,8 @@ type HarnessTools<TOOLS extends ToolSet> = ActiveTools<NoInfer<TOOLS>>;
  *
  * Prompt, abortSignal, callbacks, and custom call options belong on the
  * `AgentCallParameters` / `AgentStreamParameters` passed to `generate` /
- * `stream`. `prepareCall` can derive turn-scoped skills, instructions, and
- * tools from those custom call options.
+ * `stream`. `prepareCall` can derive turn-scoped model, skills, instructions,
+ * and tools from those custom call options.
  */
 type HarnessAgentToolFilteringSettings<TOOLS extends ToolSet> = {
     /**
@@ -1281,8 +1281,9 @@ type HarnessAgentSettings<THarness extends HarnessAgentAdapter<any> = HarnessAge
      */
     readonly id?: string;
     /**
-     * Model identifier passed to the harness adapter when a session starts.
-     * Supported values are defined by the selected harness.
+     * Model identifier used by the harness adapter. Supported values are
+     * defined by the selected harness. `prepareCall` can replace it between
+     * completed turns.
      */
     readonly model?: string;
     /**
@@ -1326,7 +1327,7 @@ 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>, 'skills' | 'instructions' | 'tools'>) => MaybePromiseLike<Pick<HarnessAgentSettings<THarness, TUserTools, RUNTIME_CONTEXT, NoInfer<OUTPUT>, CALL_OPTIONS>, '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'>) => MaybePromiseLike<Pick<HarnessAgentSettings<THarness, TUserTools, RUNTIME_CONTEXT, NoInfer<OUTPUT>, CALL_OPTIONS>, 'model' | 'skills' | 'instructions' | 'tools'> & Omit<Prompt, 'system' | 'instructions' | 'allowSystemInMessages'>>;
     /**
      * Optional specification for generating typed output. The same output
      * requirement is active for every turn run by this agent.
@@ -1490,6 +1491,7 @@ declare class HarnessAgentSession {
     hasUnfinishedTurn(): boolean;
     promptTurn<TOOLS extends ToolSet, RUNTIME_CONTEXT extends Context, OUTPUT extends OutputInterface>(options: {
         prompt: HarnessAgentPrompt;
+        model: string | undefined;
         skills: ReadonlyArray<HarnessV1Skill>;
         instructions: string | undefined;
         tools: TOOLS;
@@ -1504,6 +1506,7 @@ declare class HarnessAgentSession {
         stopConditions: ReadonlyArray<StopCondition<TOOLS, RUNTIME_CONTEXT>>;
     }): HarnessAgentTurnResult<TOOLS, RUNTIME_CONTEXT, OUTPUT>;
     continueTurn<TOOLS extends ToolSet, RUNTIME_CONTEXT extends Context, OUTPUT extends OutputInterface>(options: {
+        model: string | undefined;
         skills: ReadonlyArray<HarnessV1Skill>;
         instructions: string | undefined;
         tools: TOOLS;

package/dist/agent/index.js

@@ -889,6 +889,10 @@ function translateStreamPart(event, options = {}) {
           providerMetadata: event.harnessMetadata
         }
       ];
+    case "tool-input-start":
+    case "tool-input-delta":
+    case "tool-input-end":
+      return [event];
     case "tool-call":
       return [];
     case "tool-approval-request":
@@ -988,9 +992,45 @@ function translateStreamPart(event, options = {}) {
 }
 
 // src/agent/internal/strip-work-dir.ts
+function createToolInputWorkDirStripper({
+  sessionWorkDir
+}) {
+  const pendingByToolCallId = /* @__PURE__ */ new Map();
+  return (part) => {
+    var _a4;
+    if (sessionWorkDir.length === 0) return [part];
+    if (part.type === "tool-input-start") {
+      pendingByToolCallId.set(part.id, "");
+      return [part];
+    }
+    if (part.type === "tool-input-delta") {
+      const stripped2 = stripStreamingString({
+        value: ((_a4 = pendingByToolCallId.get(part.id)) != null ? _a4 : "") + part.delta,
+        workDir: sessionWorkDir,
+        final: false
+      });
+      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 stripped = stripStreamingString({
+      value: pending,
+      workDir: sessionWorkDir,
+      final: true
+    });
+    return stripped.output.length === 0 ? [part] : [
+      { type: "tool-input-delta", id: part.id, delta: stripped.output },
+      part
+    ];
+  };
+}
 function stripWorkDir(part, sessionWorkDir) {
   if (sessionWorkDir.length === 0) return part;
   switch (part.type) {
+    case "tool-input-delta":
+      return { ...part, delta: stripString(part.delta, sessionWorkDir) };
     case "tool-call":
       return { ...part, input: stripString(part.input, sessionWorkDir) };
     case "tool-result":
@@ -1007,6 +1047,42 @@ function stripWorkDir(part, sessionWorkDir) {
 function stripString(value, workDir) {
   return value.split(`${workDir}/`).join("").split(workDir).join(".");
 }
+function stripStreamingString({
+  value,
+  workDir,
+  final
+}) {
+  let remaining = value;
+  let output = "";
+  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) };
+      }
+      if (remaining[followingIndex] === "/") {
+        remaining = remaining.slice(followingIndex + 1);
+      } else {
+        output += ".";
+        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))) {
+      pendingLength -= 1;
+    }
+    const outputLength = remaining.length - pendingLength;
+    return {
+      output: output + remaining.slice(0, outputLength),
+      pending: remaining.slice(outputLength)
+    };
+  }
+  return { output, pending: "" };
+}
 function stripDeep(value, workDir) {
   if (typeof value === "string") return stripString(value, workDir);
   if (Array.isArray(value)) return value.map((item) => stripDeep(item, workDir));
@@ -1021,7 +1097,9 @@ function stripDeep(value, workDir) {
 }
 
 // src/agent/internal/turn-telemetry.ts
-import { generateId as generateId3 } from "@ai-sdk/provider-utils";
+import {
+  generateId as generateId3
+} from "@ai-sdk/provider-utils";
 import { createTelemetryDispatcher } from "ai/internal";
 var NOOP = {
   async start() {
@@ -1089,6 +1167,12 @@ function createTurnTelemetry(opts) {
   const inputMessages = [
     { role: "user", content: opts.promptText }
   ];
+  const languageModelTools = opts.toolSpecs.length === 0 ? void 0 : opts.toolSpecs.map((tool) => ({
+    type: "function",
+    name: tool.name,
+    ...tool.description != null ? { description: tool.description } : {},
+    ...tool.inputSchema != null ? { inputSchema: tool.inputSchema } : {}
+  }));
   let started = false;
   let stepOpen = false;
   let stepNumber = 0;
@@ -1110,9 +1194,9 @@ function createTurnTelemetry(opts) {
         operationId: "ai.harness",
         provider,
         modelId,
-        tools: void 0,
+        tools: opts.tools,
         toolChoice: void 0,
-        activeTools: void 0,
+        activeTools: opts.activeToolNames,
         maxRetries: 0,
         timeout: void 0,
         headers: void 0,
@@ -1142,13 +1226,14 @@ function createTurnTelemetry(opts) {
         provider,
         modelId,
         stepNumber,
-        tools: void 0,
+        tools: opts.tools,
         toolChoice: void 0,
-        activeTools: void 0,
+        activeTools: opts.activeToolNames,
         steps: new Array(stepNumber),
         providerOptions: void 0,
         output: void 0,
         runtimeContext,
+        instructions: opts.instructions,
         messages: inputMessages
       })
     ));
@@ -1158,8 +1243,9 @@ function createTurnTelemetry(opts) {
         callId,
         provider,
         modelId,
+        instructions: opts.instructions,
         messages: inputMessages,
-        tools: void 0
+        tools: languageModelTools
       })
     ));
   };
@@ -1171,6 +1257,8 @@ function createTurnTelemetry(opts) {
       dispatcher,
       cast({
         callId,
+        provider,
+        modelId,
         finishReason,
         responseId: callId,
         usage,
@@ -1490,11 +1578,23 @@ function runPrompt(input) {
   const onToolResultSettled = (_f = input.onToolResultSettled) != null ? _f : (() => {
   });
   const activeTools = (_g = input.activeTools) != null ? _g : input.tools;
+  const activeToolNames = Object.keys(input.tools).filter(
+    (toolName) => Object.prototype.hasOwnProperty.call(activeTools, toolName) || Object.prototype.hasOwnProperty.call(
+      input.harness.builtinTools,
+      toolName
+    ) && isHarnessV1BuiltinToolIncluded({
+      toolName,
+      toolFiltering: input.builtinToolFiltering
+    })
+  );
   const telemetry = createTurnTelemetry({
     telemetry: input.telemetry,
     harnessId: input.harness.harnessId,
-    modelId: input.session.modelId,
+    modelId: input.model,
     instructions: input.instructions,
+    tools: input.tools,
+    activeToolNames,
+    toolSpecs: input.toolSpecs,
     promptText: input.prompt != null ? promptToText(input.prompt) : "",
     runtimeContext: input.runtimeContext
   });
@@ -1520,6 +1620,7 @@ function runPrompt(input) {
         invoke: input.mode === "continue" ? (emit) => {
           var _a6;
           return input.session.doContinueTurn({
+            model: input.model,
             skills: (_a6 = input.skills) != null ? _a6 : [],
             responseFormat: input.responseFormat,
             tools: input.toolSpecs,
@@ -1536,6 +1637,7 @@ function runPrompt(input) {
           }
           return input.session.doPromptTurn({
             prompt: input.prompt,
+            model: input.model,
             skills: (_a6 = input.skills) != null ? _a6 : [],
             responseFormat: input.responseFormat,
             tools: input.toolSpecs,
@@ -1559,6 +1661,9 @@ function runPrompt(input) {
     const { stream, control } = bridge;
     (_a5 = input.onPromptControlAvailable) == null ? void 0 : _a5.call(input, control);
     const reader = stream.getReader();
+    const stripToolInputWorkDir = createToolInputWorkDirStripper({
+      sessionWorkDir: input.sessionWorkDir
+    });
     const toolCallsByToolCallId = /* @__PURE__ */ new Map();
     const rawToolCallsByToolCallId = /* @__PURE__ */ new Map();
     const translateOptions = {
@@ -1803,7 +1908,7 @@ function runPrompt(input) {
         toolName: approval.toolName,
         input: approval.input
       };
-      await telemetry.start(input.session.modelId);
+      await telemetry.start(input.model);
       await telemetry.toolStart({
         toolCallId: rawToolCall.toolCallId,
         toolName: rawToolCall.toolName,
@@ -1902,11 +2007,25 @@ function runPrompt(input) {
           }
         }
         if (value.type === "stream-start") {
-          await telemetry.start((_e2 = value.modelId) != null ? _e2 : input.session.modelId);
+          await telemetry.start((_e2 = value.modelId) != null ? _e2 : input.model);
         }
         if (value.type !== "stream-start" && value.type !== "finish-step" && value.type !== "finish" && value.type !== "error") {
           await telemetry.ensureStepOpen();
         }
+        if (value.type === "tool-input-start" || value.type === "tool-input-delta" || value.type === "tool-input-end") {
+          if (settledHostToolCallIds.has(value.id) || settledBuiltinApprovalToolCallIds.has(value.id)) {
+            continue;
+          }
+          for (const displayValue2 of stripToolInputWorkDir(value)) {
+            for (const part of translateStreamPart(
+              displayValue2,
+              translateOptions
+            )) {
+              result.enqueue(part);
+            }
+          }
+          continue;
+        }
         const displayValue = stripWorkDir(value, input.sessionWorkDir);
         const settledHostInputReplay = (displayValue.type === "tool-call" || displayValue.type === "tool-result" || displayValue.type === "tool-approval-request") && settledHostToolCallIds.has(displayValue.toolCallId);
         const settledBuiltinApprovalReplay = (displayValue.type === "tool-call" || displayValue.type === "tool-approval-request") && settledBuiltinApprovalToolCallIds.has(displayValue.toolCallId);
@@ -2411,6 +2530,7 @@ var HarnessAgentSession = class {
     const session = this.requireReusableSession();
     this.requirePromptableTurn();
     this.persistedTurnSettings = {
+      ...options.model == null ? {} : { model: options.model },
       skills: options.skills,
       ...options.instructions == null ? {} : { instructions: options.instructions },
       tools: options.toolSpecs
@@ -2428,6 +2548,7 @@ var HarnessAgentSession = class {
         harness: this.harness,
         session,
         prompt: options.prompt,
+        model: options.model,
         skills: options.skills,
         instructions: options.instructions,
         tools: options.tools,
@@ -2484,6 +2605,7 @@ var HarnessAgentSession = class {
     const session = this.requireReusableSession();
     this.requireContinuableTurn();
     const turnSettings = this.resolveActiveTurnSettings({
+      model: options.model,
       skills: options.skills,
       instructions: options.instructions,
       tools: options.tools,
@@ -2498,6 +2620,7 @@ var HarnessAgentSession = class {
         harness: this.harness,
         session,
         mode: "continue",
+        model: turnSettings.persisted.model,
         skills: turnSettings.persisted.skills,
         instructions: turnSettings.persisted.instructions,
         tools: turnSettings.tools,
@@ -2863,6 +2986,7 @@ var HarnessAgentSession = class {
       return this.activeTurnSettings;
     }
     const persisted = (_a4 = this.persistedTurnSettings) != null ? _a4 : {
+      ...options.model == null ? {} : { model: options.model },
       skills: options.skills,
       ...options.instructions == null ? {} : { instructions: options.instructions },
       tools: options.toolSpecs
@@ -3663,7 +3787,6 @@ var HarnessAgent = class {
     }
     try {
       const baseStartOptions = {
-        model: this.settings.model,
         sessionId,
         resumeFrom: validatedResumeFrom,
         continueFrom: effectiveContinueFrom,
@@ -3805,6 +3928,7 @@ var HarnessAgent = class {
   }
   _buildTurnOptions(input) {
     return {
+      model: input.turnSettings.model,
       skills: input.turnSettings.skills,
       instructions: input.turnSettings.instructions,
       tools: input.turnSettings.tools,
@@ -3894,6 +4018,7 @@ var HarnessAgent = class {
       ...promptOptions
     } = callOptions;
     const baseCallArgs = {
+      model: this.settings.model,
       skills: this.settings.skills,
       instructions: this.settings.instructions,
       tools: this.settings.tools,
@@ -3911,6 +4036,7 @@ var HarnessAgent = class {
     return {
       prompt: this._resolvePromptTurnInput(preparedCallArgs),
       ...this._prepareTurnSettings({
+        model: preparedCallArgs.model,
         skills: preparedCallArgs.skills,
         instructions: preparedCallArgs.instructions,
         tools: preparedCallArgs.tools
@@ -3921,6 +4047,7 @@ var HarnessAgent = class {
     var _a4, _b4;
     return {
       ...this._prepareTurnSettings({
+        model: this.settings.model,
         skills: this.settings.skills,
         instructions: this.settings.instructions,
         tools: this.settings.tools
@@ -3944,6 +4071,7 @@ var HarnessAgent = class {
       inactiveTools: this.settings.inactiveTools
     });
     return {
+      model: options.model,
       skills: (_b4 = options.skills) != null ? _b4 : [],
       instructions: options.instructions,
       tools,