@ai-sdk/harness 1.0.107 → 1.0.108

package/CHANGELOG.md

@@ -1,5 +1,25 @@
 # @ai-sdk/harness
 
+## 1.0.108
+
+### Patch Changes
+
+- 4d1bf28: feat(harness): support `instructions` on `HarnessAgent` to be a `SystemModelMessage` for parity with `ToolLoopAgent`
+- cdc12a1: feat(harness): add support for using adapter-native subscriptions where available
+- d70a334: feat(workflow-harness): automatically persist validated `HarnessAgent` output in workflow results
+- 81ba84c: fix(harness): preserve completed host tool results across turn suspension and session finalization
+- Updated dependencies [5ec21a6]
+- Updated dependencies [db59d78]
+- Updated dependencies [7469a3b]
+- Updated dependencies [f87bf07]
+- Updated dependencies [bc5cb7a]
+- Updated dependencies [a5f449a]
+- Updated dependencies [813bb36]
+- Updated dependencies [c43e4b7]
+  - @ai-sdk/provider@4.0.14
+  - ai@7.0.98
+  - @ai-sdk/provider-utils@5.0.40
+
 ## 1.0.107
 
 ### Patch Changes

package/dist/agent/index.d.ts

@@ -1,5 +1,5 @@
 import * as _ai_sdk_provider_utils from '@ai-sdk/provider-utils';
-import { Experimental_SandboxSession, UserModelMessage, ToolResultPart, ProviderOptions, ToolSet, FlexibleSchema, Tool, Context, MaybePromiseLike, Arrayable, ToolApprovalResponse, ModelMessage } 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 { 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';
@@ -467,6 +467,12 @@ type HarnessV1PendingToolResult = {
     readonly toolName: string;
     readonly input: string;
     readonly providerOptions?: ProviderOptions;
+    /** Executed while suspending; submit on resume without running the tool again. */
+    readonly completedResult?: {
+        readonly output: unknown;
+        readonly isError?: boolean;
+        readonly toolResult?: ToolResultPart;
+    };
 };
 /**
  * Framework-owned settings captured when a turn begins. The same settings are
@@ -1347,9 +1353,10 @@ type HarnessAgentSettings<THarness extends HarnessAgentAdapter<any> = HarnessAge
      * Instructions for the underlying agent runtime. Adapters append these to a
      * native system or developer prompt when supported. Otherwise, they prepend
      * them to the user message. `prepareCall` can replace them between completed
-     * turns.
+     * turns. When a `SystemModelMessage` is provided, only its `content` is
+     * forwarded to the harness adapter.
      */
-    readonly instructions?: string;
+    readonly instructions?: string | SystemModelMessage;
     /**
      * Additional HTTP headers to be sent with every model request.
      *
@@ -1521,6 +1528,7 @@ declare class HarnessAgentSession {
     private turnState;
     private turnSequence;
     private activeTurnSequence;
+    private activePromptDone;
     private activePromptControl;
     private suspendedTurnState;
     private activeTurnSettings;
@@ -1633,6 +1641,7 @@ declare class HarnessAgentSession {
     private getPendingToolResults;
     private addPendingToolState;
     private suspendCurrentTurn;
+    private finalizeCurrentTurnSuspension;
     private captureStopConditionBoundary;
     private toResumeStateWithContinuation;
     private requirePromptableTurn;
@@ -1717,6 +1726,8 @@ declare class HarnessAgent<THarness extends HarnessAgentAdapter<any> = HarnessAg
     constructor(settings: HarnessAgentSettings<THarness, TUserTools, RUNTIME_CONTEXT, OUTPUT, CALL_OPTIONS>);
     /** Identifier of the harness backing this agent. */
     get harnessId(): string;
+    /** Whether this agent parses completed turns with its configured output. */
+    get hasOutput(): boolean;
     /**
      * Start a fresh session, or resume from state previously returned by
      * `session.detach()` or `session.stop()`. The returned

package/dist/agent/index.js

@@ -1795,22 +1795,6 @@ function runPrompt(input) {
       onPendingToolResult(pendingResult);
       return pendingResult;
     };
-    const processPendingToolResultContinuation = async (pendingResult, continuation) => {
-      const result2 = unwrapToolResultOutput(continuation);
-      onToolResultSettled(pendingResult.toolCallId);
-      pendingResultsByToolCallId.delete(pendingResult.toolCallId);
-      settledHostToolCallIds.add(pendingResult.toolCallId);
-      await control.submitToolResult({
-        toolCallId: pendingResult.toolCallId,
-        output: result2.output,
-        isError: result2.isError,
-        toolResult: {
-          ...continuation,
-          toolName: pendingResult.toolName,
-          ...continuation.providerOptions == null && pendingResult.providerOptions != null ? { providerOptions: pendingResult.providerOptions } : {}
-        }
-      });
-    };
     const enqueueHostToolOutcome = (options) => {
       if (options.outcome.ok) {
         const stripped = stripWorkDir(
@@ -1839,6 +1823,54 @@ function runPrompt(input) {
         error: options.outcome.error
       });
     };
+    const submitToolResult = async (submission) => {
+      var _a6, _b6, _c3;
+      if (!((_a6 = input.isTurnSuspending) == null ? void 0 : _a6.call(input))) {
+        return control.submitToolResult(submission);
+      }
+      const toolCall = (_c3 = (_b6 = rawToolCallsByToolCallId.get(submission.toolCallId)) != null ? _b6 : pendingResultsByToolCallId.get(submission.toolCallId)) != null ? _c3 : pendingToolApprovals.find(
+        (approval) => approval.toolCallId === submission.toolCallId
+      );
+      if (toolCall == null) {
+        throw new Error(
+          `Unknown suspended tool call '${submission.toolCallId}'.`
+        );
+      }
+      const { toolCallId, ...completedResult } = submission;
+      onPendingToolResult({
+        toolCallId,
+        toolName: toolCall.toolName,
+        input: toolCall.input,
+        completedResult
+      });
+      const parsed = toolCallsByToolCallId.get(toolCallId);
+      if (parsed != null && !settledHostToolCallIds.has(toolCallId)) {
+        bufferedToolOutcomes.push(
+          () => enqueueHostToolOutcome({
+            toolCall: parsed,
+            outcome: submission.isError ? { ok: false, error: submission.output } : { ok: true, output: submission.output }
+          })
+        );
+      }
+    };
+    const processPendingToolResultContinuation = async (pendingResult, continuation) => {
+      const submission = continuation == null ? pendingResult.completedResult : {
+        ...unwrapToolResultOutput(continuation),
+        toolResult: {
+          ...continuation,
+          toolName: pendingResult.toolName,
+          ...continuation.providerOptions == null && pendingResult.providerOptions != null ? { providerOptions: pendingResult.providerOptions } : {}
+        }
+      };
+      if (submission == null) return;
+      settledHostToolCallIds.add(pendingResult.toolCallId);
+      onToolResultSettled(pendingResult.toolCallId);
+      await submitToolResult({
+        toolCallId: pendingResult.toolCallId,
+        ...submission
+      });
+      pendingResultsByToolCallId.delete(pendingResult.toolCallId);
+    };
     const processPendingApprovalContinuation = async (approval, continuation) => {
       var _a6;
       const rawToolCall = (_a6 = rawToolCallsByToolCallId.get(approval.toolCallId)) != null ? _a6 : {
@@ -1877,7 +1909,7 @@ function runPrompt(input) {
       }
       settledHostToolCallIds.add(approval.toolCallId);
       if (!continuation.approved) {
-        await control.submitToolResult({
+        await submitToolResult({
           toolCallId: approval.toolCallId,
           output: {
             type: "execution-denied",
@@ -1897,7 +1929,7 @@ function runPrompt(input) {
         wrappedExecuteTool: lifecycle.executeTool,
         sandboxSession: input.sandboxSession,
         abortSignal: input.abortSignal,
-        control,
+        submitToolResult,
         onPreliminaryResult: (preliminaryOutput) => {
           const stripped = stripWorkDir(
             {
@@ -1956,12 +1988,12 @@ function runPrompt(input) {
         const continuation = continuationsByToolCallId.get(
           pendingResult.toolCallId
         );
-        if (continuation != null) {
+        if (continuation != null || pendingResult.completedResult != null) {
           await processPendingToolResultContinuation(
             pendingResult,
             continuation
           );
-          closingResumedStep = true;
+          if (pendingResult.completedResult == null) closingResumedStep = true;
         }
       }
       while (true) {
@@ -2218,7 +2250,7 @@ function runPrompt(input) {
                 toolName: toolCall.toolName
               })
             };
-            await control.submitToolResult({
+            await submitToolResult({
               toolCallId: toolCall.toolCallId,
               output
             });
@@ -2262,7 +2294,7 @@ function runPrompt(input) {
               type: "execution-denied",
               reason: customToolApprovalDecision.reason
             };
-            await control.submitToolResult({
+            await submitToolResult({
               toolCallId: toolCall.toolCallId,
               output
             });
@@ -2343,7 +2375,7 @@ function runPrompt(input) {
                 wrappedExecuteTool: lifecycle.executeTool,
                 sandboxSession: input.sandboxSession,
                 abortSignal: input.abortSignal,
-                control,
+                submitToolResult,
                 onPreliminaryResult: (preliminaryOutput) => {
                   const stripped = stripWorkDir(
                     {
@@ -2386,6 +2418,7 @@ function runPrompt(input) {
       await waitForOutstandingHostToolExecutions();
       const isTurnSuspending = ((_m = input.isTurnSuspending) == null ? void 0 : _m.call(input)) === true;
       if (isTurnSuspending) {
+        await publishToolExecutions();
         if (finalFinish == null) {
           result.discardCurrentStepContent();
         }
@@ -2476,13 +2509,13 @@ async function maybeExecuteHostTool(input) {
         return output2;
       }
     });
-    await input.control.submitToolResult({
+    await input.submitToolResult({
       toolCallId: input.event.toolCallId,
       output
     });
     return { executed: true, outcome: { ok: true, output } };
   } catch (err) {
-    await input.control.submitToolResult({
+    await input.submitToolResult({
       toolCallId: input.event.toolCallId,
       output: { error: String(err) },
       isError: true
@@ -2646,6 +2679,7 @@ var HarnessAgentSession = class {
         isTurnSuspending: () => this.activeTurnSequence === turnId && this.suspendedTurnState != null,
         onStopConditionMet: () => this.captureStopConditionBoundary({ session, turnId })
       });
+      this.activePromptDone = turn.done;
       return {
         ...turn,
         ready: this.waitForPromptControl({ turnId })
@@ -2721,6 +2755,7 @@ var HarnessAgentSession = class {
         isTurnSuspending: () => this.activeTurnSequence === turnId && this.suspendedTurnState != null,
         onStopConditionMet: () => this.captureStopConditionBoundary({ session, turnId })
       });
+      this.activePromptDone = turn.done;
       return {
         ...turn,
         ready: this.waitForPromptControl({ turnId })
@@ -2787,7 +2822,7 @@ var HarnessAgentSession = class {
     try {
       if (this.turnState !== "idle") {
         return this.toResumeStateWithContinuation({
-          continueFrom: await this.suspendCurrentTurn({ session })
+          continueFrom: await this.finalizeCurrentTurnSuspension({ session })
         });
       }
       const raw = await session.doDetach();
@@ -2818,7 +2853,7 @@ var HarnessAgentSession = class {
     try {
       if (this.turnState !== "idle") {
         return this.toResumeStateWithContinuation({
-          continueFrom: await this.suspendCurrentTurn({ session })
+          continueFrom: await this.finalizeCurrentTurnSuspension({ session })
         });
       }
       const raw = await session.doStop();
@@ -2880,7 +2915,7 @@ var HarnessAgentSession = class {
     }
     const session = this.underlyingSession;
     try {
-      return await this.suspendCurrentTurn({ session });
+      return await this.finalizeCurrentTurnSuspension({ session });
     } finally {
       this.endLocalHandle({ sessionState: "detached" });
     }
@@ -2927,6 +2962,11 @@ var HarnessAgentSession = class {
     this.turnState = "suspended";
     return state;
   }
+  async finalizeCurrentTurnSuspension(options) {
+    const state = await this.suspendCurrentTurn(options);
+    await this.activePromptDone;
+    return this.addPendingToolState(state);
+  }
   async captureStopConditionBoundary(options) {
     if (this.sessionState !== "active" || this.activeTurnSequence !== options.turnId) {
       return;
@@ -3639,6 +3679,10 @@ var HarnessAgent = class {
   get harnessId() {
     return this.settings.harness.harnessId;
   }
+  /** Whether this agent parses completed turns with its configured output. */
+  get hasOutput() {
+    return this.settings.output != null;
+  }
   /**
    * Start a fresh session, or resume from state previously returned by
    * `session.detach()` or `session.stop()`. The returned
@@ -4117,7 +4161,7 @@ var HarnessAgent = class {
     };
   }
   _prepareTurnSettings(options) {
-    var _a4, _b4;
+    var _a4, _b4, _c;
     const userTools = (_a4 = options.tools) != null ? _a4 : {};
     assertNoReservedQuestionTool({
       harness: this.settings.harness,
@@ -4137,7 +4181,7 @@ var HarnessAgent = class {
     return {
       model: options.model,
       skills: (_b4 = options.skills) != null ? _b4 : [],
-      instructions: options.instructions,
+      instructions: typeof options.instructions === "string" ? options.instructions : (_c = options.instructions) == null ? void 0 : _c.content,
       tools,
       activeTools: toolFiltering.activeUserTools,
       toolSpecs: this._toToolSpecs(toolFiltering.activeUserTools),