@ai-sdk/harness 1.0.93 → 1.0.95

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ai-sdk/harness",
-  "version": "1.0.93",
+  "version": "1.0.95",
   "type": "module",
   "license": "Apache-2.0",
   "sideEffects": false,
@@ -44,9 +44,9 @@
     }
   },
   "dependencies": {
-    "@ai-sdk/provider": "4.0.8",
-    "@ai-sdk/provider-utils": "5.0.33",
-    "ai": "7.0.84"
+    "@ai-sdk/provider": "4.0.9",
+    "@ai-sdk/provider-utils": "5.0.34",
+    "ai": "7.0.86"
   },
   "peerDependencies": {
     "ws": "^8.21.0",
@@ -58,7 +58,7 @@
     }
   },
   "devDependencies": {
-    "@ai-sdk/otel": "1.0.84",
+    "@ai-sdk/otel": "1.0.86",
     "@opentelemetry/sdk-trace-base": "2.7.1",
     "@types/node": "22.19.19",
     "@types/ws": "^8.5.13",

package/src/agent/harness-agent-session.ts

@@ -195,6 +195,7 @@ export class HarnessAgentSession {
     OUTPUT extends Output,
   >(options: {
     prompt: HarnessAgentPrompt;
+    model: string | undefined;
     skills: ReadonlyArray<HarnessV1Skill>;
     instructions: string | undefined;
     tools: TOOLS;
@@ -211,6 +212,7 @@ export class HarnessAgentSession {
     const session = this.requireReusableSession();
     this.requirePromptableTurn();
     this.persistedTurnSettings = {
+      ...(options.model == null ? {} : { model: options.model }),
       skills: options.skills,
       ...(options.instructions == null
         ? {}
@@ -230,6 +232,7 @@ export class HarnessAgentSession {
         harness: this.harness,
         session,
         prompt: options.prompt,
+        model: options.model,
         skills: options.skills,
         instructions: options.instructions,
         tools: options.tools,
@@ -290,6 +293,7 @@ export class HarnessAgentSession {
     RUNTIME_CONTEXT extends Context,
     OUTPUT extends Output,
   >(options: {
+    model: string | undefined;
     skills: ReadonlyArray<HarnessV1Skill>;
     instructions: string | undefined;
     tools: TOOLS;
@@ -312,6 +316,7 @@ export class HarnessAgentSession {
     const session = this.requireReusableSession();
     this.requireContinuableTurn();
     const turnSettings = this.resolveActiveTurnSettings({
+      model: options.model,
       skills: options.skills,
       instructions: options.instructions,
       tools: options.tools,
@@ -326,6 +331,7 @@ export class HarnessAgentSession {
         harness: this.harness,
         session,
         mode: 'continue',
+        model: turnSettings.persisted.model,
         skills: turnSettings.persisted.skills,
         instructions: turnSettings.persisted.instructions,
         tools: turnSettings.tools as TOOLS,
@@ -753,6 +759,7 @@ export class HarnessAgentSession {
   }
 
   private resolveActiveTurnSettings(options: {
+    model: string | undefined;
     skills: ReadonlyArray<HarnessV1Skill>;
     instructions: string | undefined;
     tools: ToolSet;
@@ -766,6 +773,7 @@ export class HarnessAgentSession {
     const persisted =
       this.persistedTurnSettings ??
       ({
+        ...(options.model == null ? {} : { model: options.model }),
         skills: options.skills,
         ...(options.instructions == null
           ? {}

package/src/agent/harness-agent-settings.ts

@@ -80,8 +80,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> =
   | {
@@ -122,8 +122,9 @@ export type HarnessAgentSettings<
   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;
 
@@ -203,7 +204,7 @@ export type HarnessAgentSettings<
           NoInfer<OUTPUT>,
           CALL_OPTIONS
         >,
-        'skills' | 'instructions' | 'tools'
+        'model' | 'skills' | 'instructions' | 'tools'
       >,
   ) => MaybePromiseLike<
     Pick<
@@ -214,7 +215,7 @@ export type HarnessAgentSettings<
         NoInfer<OUTPUT>,
         CALL_OPTIONS
       >,
-      'skills' | 'instructions' | 'tools'
+      'model' | 'skills' | 'instructions' | 'tools'
     > &
       Omit<Prompt, 'system' | 'instructions' | 'allowSystemInMessages'>
   >;

package/src/agent/harness-agent.ts

@@ -94,6 +94,7 @@ type PreparedHarnessAgentTurnSettings<
   THarness extends HarnessAgentAdapter<any>,
   TUserTools extends ToolSet,
 > = {
+  model: string | undefined;
   skills: ReadonlyArray<HarnessAgentSkill>;
   instructions: string | undefined;
   tools: HarnessAllTools<THarness, TUserTools>;
@@ -499,7 +500,6 @@ export class HarnessAgent<
 
     try {
       const baseStartOptions = {
-        model: this.settings.model,
         sessionId,
         resumeFrom: validatedResumeFrom,
         continueFrom: effectiveContinueFrom,
@@ -746,6 +746,7 @@ export class HarnessAgent<
     responseFormat: HarnessV1ResponseFormat | undefined;
   }) {
     return {
+      model: input.turnSettings.model,
       skills: input.turnSettings.skills,
       instructions: input.turnSettings.instructions,
       tools: input.turnSettings.tools,
@@ -864,6 +865,7 @@ export class HarnessAgent<
     } = callOptions;
 
     const baseCallArgs = {
+      model: this.settings.model,
       skills: this.settings.skills,
       instructions: this.settings.instructions,
       tools: this.settings.tools,
@@ -892,6 +894,7 @@ export class HarnessAgent<
     return {
       prompt: this._resolvePromptTurnInput(preparedCallArgs),
       ...this._prepareTurnSettings({
+        model: preparedCallArgs.model,
         skills: preparedCallArgs.skills,
         instructions: preparedCallArgs.instructions,
         tools: preparedCallArgs.tools,
@@ -905,6 +908,7 @@ export class HarnessAgent<
   }): PreparedHarnessAgentContinueTurnInput<THarness, TUserTools> {
     return {
       ...this._prepareTurnSettings({
+        model: this.settings.model,
         skills: this.settings.skills,
         instructions: this.settings.instructions,
         tools: this.settings.tools,
@@ -915,6 +919,7 @@ export class HarnessAgent<
   }
 
   private _prepareTurnSettings(options: {
+    model?: string;
     skills?: ReadonlyArray<HarnessAgentSkill>;
     instructions?: string;
     tools?: TUserTools;
@@ -932,6 +937,7 @@ export class HarnessAgent<
       inactiveTools: this.settings.inactiveTools,
     });
     return {
+      model: options.model,
       skills: options.skills ?? [],
       instructions: options.instructions,
       tools,

package/src/agent/internal/run-prompt.ts

@@ -44,7 +44,7 @@ import type { HarnessAgentToolResultContinuation } from '../harness-agent-tool-r
 import type { HarnessAgentToolApprovalConfiguration } from '../harness-agent-settings';
 import { HarnessStreamTextResult } from './harness-stream-text-result';
 import { translateStreamPart } from './translate-stream-part';
-import { stripWorkDir } from './strip-work-dir';
+import { createToolInputWorkDirStripper, stripWorkDir } from './strip-work-dir';
 import {
   createTurnTelemetry,
   type TurnContentPart,
@@ -81,6 +81,7 @@ export function runPrompt<
   mode?: 'prompt' | 'continue';
   /** Required for `mode: 'prompt'`; absent for `mode: 'continue'`. */
   prompt?: HarnessV1Prompt;
+  model?: string;
   skills?: ReadonlyArray<HarnessV1Skill>;
   instructions: string | undefined;
   tools: TOOLS;
@@ -137,12 +138,27 @@ export function runPrompt<
   const onPendingToolResult = input.onPendingToolResult ?? (() => {});
   const onToolResultSettled = input.onToolResultSettled ?? (() => {});
   const activeTools = input.activeTools ?? 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,
   });
@@ -181,6 +197,7 @@ export function runPrompt<
           input.mode === 'continue'
             ? emit =>
                 input.session.doContinueTurn({
+                  model: input.model,
                   skills: input.skills ?? [],
                   responseFormat: input.responseFormat,
                   tools: input.toolSpecs,
@@ -196,6 +213,7 @@ export function runPrompt<
                 }
                 return input.session.doPromptTurn({
                   prompt: input.prompt,
+                  model: input.model,
                   skills: input.skills ?? [],
                   responseFormat: input.responseFormat,
                   tools: input.toolSpecs,
@@ -220,6 +238,9 @@ export function runPrompt<
     const { stream, control } = bridge;
     input.onPromptControlAvailable?.(control);
     const reader = stream.getReader();
+    const stripToolInputWorkDir = createToolInputWorkDirStripper({
+      sessionWorkDir: input.sessionWorkDir,
+    });
     const toolCallsByToolCallId = new Map<string, ToolCallTextStreamPart>();
     const rawToolCallsByToolCallId = new Map<
       string,
@@ -534,7 +555,7 @@ export function runPrompt<
           input: approval.input,
         } satisfies Extract<HarnessV1StreamPart, { type: 'tool-call' }>);
 
-      await telemetry.start(input.session.modelId);
+      await telemetry.start(input.model);
       await telemetry.toolStart({
         toolCallId: rawToolCall.toolCallId,
         toolName: rawToolCall.toolName,
@@ -649,9 +670,9 @@ export function runPrompt<
         }
 
         // Begin the operation span on stream-start, using the runtime-resolved
-        // model the adapter reports (falling back to the session's model).
+        // model the adapter reports (falling back to the requested turn model).
         if (value.type === 'stream-start') {
-          await telemetry.start(value.modelId ?? input.session.modelId);
+          await telemetry.start(value.modelId ?? input.model);
         }
 
         // Open a step span lazily before the first content of each step.
@@ -664,6 +685,28 @@ export function runPrompt<
           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 displayValue of stripToolInputWorkDir(value)) {
+            for (const part of translateStreamPart<TOOLS>(
+              displayValue,
+              translateOptions,
+            )) {
+              result.enqueue(part);
+            }
+          }
+          continue;
+        }
+
         /*
          * Strip the session working-directory prefix for everything the
          * consumer sees. The original `value` is kept intact for host tool

package/src/agent/internal/strip-work-dir.ts

@@ -1,5 +1,57 @@
 import type { HarnessV1StreamPart } from '../../v1';
 
+type ToolInputStreamPart = Extract<
+  HarnessV1StreamPart,
+  {
+    type: 'tool-input-start' | 'tool-input-delta' | 'tool-input-end';
+  }
+>;
+
+export function createToolInputWorkDirStripper({
+  sessionWorkDir,
+}: {
+  sessionWorkDir: string;
+}): (part: ToolInputStreamPart) => ToolInputStreamPart[] {
+  const pendingByToolCallId = new Map<string, string>();
+
+  return part => {
+    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 stripped = stripStreamingString({
+        value: (pendingByToolCallId.get(part.id) ?? '') + part.delta,
+        workDir: sessionWorkDir,
+        final: false,
+      });
+      pendingByToolCallId.set(part.id, stripped.pending);
+      return stripped.output.length === 0
+        ? []
+        : [{ ...part, delta: stripped.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,
+        ];
+  };
+}
+
 /**
  * Remove the session working-directory prefix from path-bearing fields of a
  * stream event, returning a new event for display to consumers.
@@ -23,6 +75,8 @@ export function stripWorkDir(
   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':
@@ -50,6 +104,54 @@ function stripString(value: string, workDir: string): string {
   return value.split(`${workDir}/`).join('').split(workDir).join('.');
 }
 
+function stripStreamingString({
+  value,
+  workDir,
+  final,
+}: {
+  value: string;
+  workDir: string;
+  final: boolean;
+}): { output: string; pending: string } {
+  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: '' };
+}
+
 /**
  * Recursively strip the working directory from every string nested in an
  * arbitrary JSON-like value. Non-string leaves are returned unchanged.

package/src/agent/internal/translate-stream-part.ts

@@ -103,6 +103,11 @@ export function translateStreamPart<TOOLS extends ToolSet>(
         } as TextStreamPart<TOOLS>,
       ];
 
+    case 'tool-input-start':
+    case 'tool-input-delta':
+    case 'tool-input-end':
+      return [event as TextStreamPart<TOOLS>];
+
     case 'tool-call':
       // Tool-call validation is async (it parses input against the tool's
       // schema) and lives in `run-prompt.ts` where the merged tool set is in

package/src/agent/internal/turn-telemetry.ts

@@ -1,6 +1,11 @@
-import { generateId, type ModelMessage } from '@ai-sdk/provider-utils';
+import {
+  generateId,
+  type ModelMessage,
+  type ToolSet,
+} from '@ai-sdk/provider-utils';
 import { createTelemetryDispatcher } from 'ai/internal';
 import type { LanguageModelUsage, TelemetryOptions } from 'ai';
+import type { HarnessV1ToolSpec } from '../../v1';
 
 /*
  * Drives AI SDK's pluggable `Telemetry` lifecycle from a harness turn.
@@ -13,8 +18,9 @@ import type { LanguageModelUsage, TelemetryOptions } from 'ai';
  * step boundary, tool-calls = tool executions, `finish` = operation end. The
  * model-call-only event fields the harness has no value for (sampling params,
  * standardized prompt) are left `undefined` / cast; the fields the integrations
- * actually read (`callId`, `operationId`, `provider`, `modelId`, `messages`,
- * `toolCall`, `usage`, `finishReason`) carry real values.
+ * actually read (`callId`, `operationId`, `provider`, `modelId`,
+ * `instructions`, `messages`, `tools`, `toolCall`, `usage`, `finishReason`)
+ * carry real values.
  *
  * Telemetry is opt-in: the framework only drives it when `settings.telemetry`
  * is set (the dispatcher then also honours globally-registered integrations).
@@ -160,6 +166,9 @@ export function createTurnTelemetry(opts: {
   harnessId: string;
   modelId: string | undefined;
   instructions: string | undefined;
+  tools: ToolSet;
+  activeToolNames: string[];
+  toolSpecs: HarnessV1ToolSpec[];
   promptText: string;
   runtimeContext: unknown;
 }): TurnTelemetry {
@@ -177,6 +186,19 @@ export function createTurnTelemetry(opts: {
   const inputMessages: ModelMessage[] = [
     { role: 'user', content: opts.promptText },
   ];
+  const languageModelTools =
+    opts.toolSpecs.length === 0
+      ? undefined
+      : opts.toolSpecs.map(tool => ({
+          type: 'function' as const,
+          name: tool.name,
+          ...(tool.description != null
+            ? { description: tool.description }
+            : {}),
+          ...(tool.inputSchema != null
+            ? { inputSchema: tool.inputSchema }
+            : {}),
+        }));
 
   let started = false;
   let stepOpen = false;
@@ -211,9 +233,9 @@ export function createTurnTelemetry(opts: {
         operationId: 'ai.harness',
         provider,
         modelId,
-        tools: undefined,
+        tools: opts.tools,
         toolChoice: undefined,
-        activeTools: undefined,
+        activeTools: opts.activeToolNames,
         maxRetries: 0,
         timeout: undefined,
         headers: undefined,
@@ -243,13 +265,14 @@ export function createTurnTelemetry(opts: {
         provider,
         modelId,
         stepNumber,
-        tools: undefined,
+        tools: opts.tools,
         toolChoice: undefined,
-        activeTools: undefined,
+        activeTools: opts.activeToolNames,
         steps: new Array(stepNumber),
         providerOptions: undefined,
         output: undefined,
         runtimeContext,
+        instructions: opts.instructions,
         messages: inputMessages,
       }),
     );
@@ -260,8 +283,9 @@ export function createTurnTelemetry(opts: {
         callId,
         provider,
         modelId,
+        instructions: opts.instructions,
         messages: inputMessages,
-        tools: undefined,
+        tools: languageModelTools,
       }),
     );
   };
@@ -279,6 +303,8 @@ export function createTurnTelemetry(opts: {
     await dispatcher.onLanguageModelCallEnd?.(
       cast<'onLanguageModelCallEnd'>({
         callId,
+        provider,
+        modelId,
         finishReason,
         responseId: callId,
         usage,

package/src/utils/bridge-token.ts

@@ -0,0 +1,18 @@
+import { randomBytes } from 'node:crypto';
+import type { HarnessV1PortEndpoint } from '../v1';
+
+export function createBridgeToken(): string {
+  return randomBytes(32).toString('hex');
+}
+
+export function withBridgeToken({
+  endpoint,
+  token,
+}: {
+  endpoint: HarnessV1PortEndpoint;
+  token: string;
+}): HarnessV1PortEndpoint {
+  const bridgeUrl = new URL(endpoint.url);
+  bridgeUrl.searchParams.set('agent_bridge_token', token);
+  return { ...endpoint, url: bridgeUrl.toString() };
+}

package/src/utils/index.ts

@@ -40,6 +40,7 @@ export {
   type WaitForBridgeReadyOptions,
   type WaitForBridgeReadyResult,
 } from './bridge-ready';
+export { createBridgeToken, withBridgeToken } from './bridge-token';
 export {
   createBridgeErrorHandler,
   createBridgeStartupError,

package/src/v1/harness-v1-bridge-protocol.ts

@@ -21,6 +21,9 @@ import {
   harnessV1TextStartPartSchema,
   harnessV1ToolApprovalRequestPartSchema,
   harnessV1ToolCallPartSchema,
+  harnessV1ToolInputDeltaPartSchema,
+  harnessV1ToolInputEndPartSchema,
+  harnessV1ToolInputStartPartSchema,
   harnessV1ToolResultPartSchema,
 } from './harness-v1-stream-part';
 
@@ -213,6 +216,9 @@ export const harnessV1BridgeOutboundMessageSchema = z.discriminatedUnion(
     harnessV1ReasoningStartPartSchema,
     harnessV1ReasoningDeltaPartSchema,
     harnessV1ReasoningEndPartSchema,
+    harnessV1ToolInputStartPartSchema,
+    harnessV1ToolInputDeltaPartSchema,
+    harnessV1ToolInputEndPartSchema,
     harnessV1ToolCallPartSchema,
     harnessV1ToolApprovalRequestPartSchema,
     harnessV1ToolResultPartSchema,

package/src/v1/harness-v1-lifecycle-state.ts

@@ -24,6 +24,13 @@ export type HarnessV1PendingToolResult = {
  * so a resumed continuation cannot pick up configuration from a later turn.
  */
 export 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

package/src/v1/harness-v1-session.ts

@@ -21,12 +21,6 @@ import type { HarnessV1BuiltinToolFiltering } from './harness-v1-tool-filtering'
  * calling the adapter, so adapters never need to derive provider-specific paths.
  */
 export 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
@@ -171,14 +165,6 @@ export type HarnessV1Session = {
    */
   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