@ai-sdk/harness 1.0.35 → 1.0.37

package/dist/agent/index.js

@@ -95,6 +95,11 @@ async function validateLifecycleStateData(input) {
       message: "Resume session state cannot contain pending tool approvals; unfinished turns must be stored as `continueFrom`."
     });
   }
+  if (state.type === "resume-session" && "pendingToolResults" in state && state.pendingToolResults !== void 0) {
+    throw new HarnessError({
+      message: "Resume session state cannot contain pending tool results; unfinished turns must be stored as `continueFrom`."
+    });
+  }
   const data = harness.lifecycleStateSchema == null ? state.data : await (async () => {
     const result = await safeValidateTypes({
       value: state.data,
@@ -127,7 +132,8 @@ async function validateLifecycleStateData(input) {
     harnessId: state.harnessId,
     specificationVersion: state.specificationVersion,
     data,
-    ...state.pendingToolApprovals !== void 0 ? { pendingToolApprovals: state.pendingToolApprovals } : {}
+    ...state.pendingToolApprovals !== void 0 ? { pendingToolApprovals: state.pendingToolApprovals } : {},
+    ...state.pendingToolResults !== void 0 ? { pendingToolResults: state.pendingToolResults } : {}
   };
 }
 
@@ -227,6 +233,7 @@ var HarnessStreamTextResult = class {
     this.currentStepContent = [];
     this.currentStepWarnings = [];
     this.stepNumber = 0;
+    this.stepStarted = false;
     // Accumulators that span the whole turn.
     this.accumulatedUsage = createNullLanguageModelUsage();
     this.finalProviderMetadata = void 0;
@@ -243,6 +250,7 @@ var HarnessStreamTextResult = class {
     const baseStream = new ReadableStream({
       start(c) {
         controllerRef = c;
+        c.enqueue({ type: "start" });
       }
     });
     this.fullStreamController = controllerRef;
@@ -265,9 +273,27 @@ var HarnessStreamTextResult = class {
    * into the current step's content array where applicable.
    */
   enqueue(part) {
+    this.startStep();
     this.fullStreamController.enqueue(part);
     this.appendToCurrentStepContent(part);
   }
+  /**
+   * Push a continuation input into the consumer stream without attributing it
+   * to the next model step. Approval responses and client tool results arrive
+   * between model calls and therefore must not create or alter a StepResult.
+   */
+  enqueueContinuation(part) {
+    this.fullStreamController.enqueue(part);
+  }
+  /**
+   * Drop content replayed while a suspended host-input pause closes its
+   * already-recorded model step.
+   */
+  discardCurrentStepContent() {
+    this.currentStepContent = [];
+    this.currentStepWarnings = [];
+    this.stepStarted = false;
+  }
   /**
    * Mark the end of a step. Builds a `StepResult` from the accumulated
    * content and records it in the steps array. Accepts the V4-shaped
@@ -275,6 +301,7 @@ var HarnessStreamTextResult = class {
    * flat shape internally.
    */
   finishStep(input) {
+    this.startStep();
     const normalizedUsage = asLanguageModelUsage(input.usage);
     const finishReason = input.finishReason.unified;
     const rawFinishReason = input.finishReason.raw;
@@ -322,46 +349,38 @@ var HarnessStreamTextResult = class {
     this.stepNumber += 1;
     this.currentStepContent = [];
     this.currentStepWarnings = [];
+    this.stepStarted = false;
+    return step;
+  }
+  startStep() {
+    if (this.stepStarted) return;
+    this.stepStarted = true;
+    this.fullStreamController.enqueue({
+      type: "start-step",
+      request: {},
+      warnings: this.currentStepWarnings
+    });
   }
   /**
    * Resolve every delayed promise and close `fullStream`. Idempotent.
    */
   async finish(input) {
     if (this.settled) return;
-    this.settled = true;
+    if (this.currentStepContent.length > 0) {
+      this.fail(
+        new Error(
+          "HarnessAgent: received terminal finish with unclosed step content. Harness adapters must emit `finish-step` before `finish`."
+        )
+      );
+      return;
+    }
     if (input != null) {
       this.finalFinishReason = input.finishReason.unified;
       this.finalRawFinishReason = input.finishReason.raw;
       this.finalProviderMetadata = input.providerMetadata;
       this.accumulatedUsage = asLanguageModelUsage(input.totalUsage);
     }
-    if (this.currentStepContent.length > 0) {
-      const trailingStep = new DefaultStepResult({
-        callId: generateId(),
-        stepNumber: this.stepNumber,
-        provider: this.providerName,
-        modelId: this.modelId,
-        runtimeContext: this.runtimeContext,
-        toolsContext: this.toolsContext,
-        content: this.currentStepContent,
-        finishReason: this.finalFinishReason,
-        rawFinishReason: this.finalRawFinishReason,
-        usage: createNullLanguageModelUsage(),
-        performance: createEmptyPerformance(),
-        warnings: this.currentStepWarnings.length > 0 ? this.currentStepWarnings : void 0,
-        request: {},
-        response: {
-          id: generateId(),
-          timestamp: /* @__PURE__ */ new Date(),
-          modelId: this.modelId,
-          messages: []
-        },
-        providerMetadata: this.finalProviderMetadata
-      });
-      this.stepsBuffer.push(trailingStep);
-      this.currentStepContent = [];
-      this.currentStepWarnings = [];
-    }
+    this.settled = true;
     const finalStep = this.stepsBuffer.length > 0 ? this.stepsBuffer[this.stepsBuffer.length - 1] : new DefaultStepResult({
       callId: generateId(),
       stepNumber: 0,
@@ -1218,7 +1237,7 @@ function logBridgeError({
 
 // src/agent/internal/run-prompt.ts
 function runPrompt(input) {
-  var _a3, _b3, _c, _d;
+  var _a3, _b3, _c, _d, _e, _f, _g;
   const result = new HarnessStreamTextResult({
     tools: input.tools,
     runtimeContext: input.runtimeContext,
@@ -1228,11 +1247,16 @@ function runPrompt(input) {
     sessionId: input.session.sessionId
   });
   const pendingToolApprovals = (_a3 = input.pendingToolApprovals) != null ? _a3 : [];
-  const onPendingToolApproval = (_b3 = input.onPendingToolApproval) != null ? _b3 : (() => {
+  const pendingToolResults = (_b3 = input.pendingToolResults) != null ? _b3 : [];
+  const onPendingToolApproval = (_c = input.onPendingToolApproval) != null ? _c : (() => {
+  });
+  const onToolApprovalSettled = (_d = input.onToolApprovalSettled) != null ? _d : (() => {
+  });
+  const onPendingToolResult = (_e = input.onPendingToolResult) != null ? _e : (() => {
   });
-  const onToolApprovalSettled = (_c = input.onToolApprovalSettled) != null ? _c : (() => {
+  const onToolResultSettled = (_f = input.onToolResultSettled) != null ? _f : (() => {
   });
-  const activeTools = (_d = input.activeTools) != null ? _d : input.tools;
+  const activeTools = (_g = input.activeTools) != null ? _g : input.tools;
   const telemetry = createTurnTelemetry({
     telemetry: input.telemetry,
     harnessId: input.harness.harnessId,
@@ -1242,7 +1266,7 @@ function runPrompt(input) {
     runtimeContext: input.runtimeContext
   });
   const done = (async () => {
-    var _a4, _b4, _c2, _d2, _e, _f, _g, _h;
+    var _a4, _b4, _c2, _d2, _e2, _f2, _g2, _h, _i, _j, _k, _l, _m;
     let bridge;
     try {
       bridge = await toHarnessStream({
@@ -1273,6 +1297,7 @@ function runPrompt(input) {
         context: "failed to start harness turn",
         error: err
       });
+      (_a4 = input.onTurnFailed) == null ? void 0 : _a4.call(input);
       result.fail(err);
       return;
     }
@@ -1287,12 +1312,25 @@ function runPrompt(input) {
       pendingToolApprovals.map((approval) => [approval.toolCallId, approval])
     );
     const continuationsByApprovalId = new Map(
-      ((_a4 = input.toolApprovalContinuations) != null ? _a4 : []).map((continuation) => [
+      ((_b4 = input.toolApprovalContinuations) != null ? _b4 : []).map((continuation) => [
         continuation.approvalResponse.approvalId,
         continuation
       ])
     );
-    const settledApprovalToolCallIds = /* @__PURE__ */ new Set();
+    const pendingResultsByToolCallId = new Map(
+      pendingToolResults.map((pendingResult) => [
+        pendingResult.toolCallId,
+        pendingResult
+      ])
+    );
+    const continuationsByToolCallId = new Map(
+      ((_c2 = input.toolResultContinuations) != null ? _c2 : []).map((continuation) => [
+        continuation.toolCallId,
+        continuation
+      ])
+    );
+    const settledHostToolCallIds = /* @__PURE__ */ new Set();
+    let closingResumedStep = false;
     let finalFinish;
     let stepText = "";
     let stepReasoning = "";
@@ -1326,19 +1364,29 @@ function runPrompt(input) {
       unified: "tool-calls",
       raw: void 0
     };
-    const finishForToolApprovalPause = async () => {
+    const completeStep = (input2) => {
       telemetry.stepFinish({
-        finishReason: toolCallsFinishReason,
-        usage: zeroUsage,
+        finishReason: input2.finishReason,
+        usage: input2.usage,
+        providerMetadata: input2.providerMetadata,
         content: buildStepContent()
       });
       resetStepContent();
-      result.finishStep({
-        finishReason: toolCallsFinishReason,
-        usage: zeroUsage,
-        providerMetadata: void 0,
+      return result.finishStep({
+        finishReason: input2.finishReason,
+        usage: input2.usage,
+        providerMetadata: input2.providerMetadata,
         warnings: []
       });
+    };
+    const finishForHostInputPause = async (options) => {
+      if (options.completeCurrentStep) {
+        completeStep({
+          finishReason: toolCallsFinishReason,
+          usage: zeroUsage,
+          providerMetadata: void 0
+        });
+      }
       telemetry.end({
         finishReason: toolCallsFinishReason,
         usage: zeroUsage
@@ -1364,7 +1412,7 @@ function runPrompt(input) {
       });
     };
     const enqueueApprovalResponse = (approval, continuation) => {
-      result.enqueue({
+      result.enqueueContinuation({
         type: "tool-approval-response",
         approvalId: approval.approvalId,
         toolCall: continuation.toolCall,
@@ -1373,13 +1421,34 @@ function runPrompt(input) {
         ...approval.providerExecuted !== void 0 ? { providerExecuted: approval.providerExecuted } : {}
       });
     };
+    const recordPendingToolResult = (options) => {
+      var _a5;
+      const pendingResult = (_a5 = pendingResultsByToolCallId.get(options.toolCall.toolCallId)) != null ? _a5 : {
+        toolCallId: options.toolCall.toolCallId,
+        toolName: options.toolCall.toolName,
+        input: options.toolCall.input
+      };
+      pendingResultsByToolCallId.set(pendingResult.toolCallId, pendingResult);
+      onPendingToolResult(pendingResult);
+      return pendingResult;
+    };
+    const processPendingToolResultContinuation = async (pendingResult, continuation) => {
+      onToolResultSettled(pendingResult.toolCallId);
+      pendingResultsByToolCallId.delete(pendingResult.toolCallId);
+      settledHostToolCallIds.add(pendingResult.toolCallId);
+      await control.submitToolResult({
+        toolCallId: pendingResult.toolCallId,
+        output: continuation.output,
+        isError: continuation.isError
+      });
+    };
     const processPendingApprovalContinuation = async (approval, continuation) => {
       var _a5;
       enqueueApprovalResponse(approval, continuation);
       onToolApprovalSettled(approval.approvalId);
       pendingApprovalsByApprovalId.delete(approval.approvalId);
       pendingApprovalsByToolCallId.delete(approval.toolCallId);
-      settledApprovalToolCallIds.add(approval.toolCallId);
+      settledHostToolCallIds.add(approval.toolCallId);
       if (approval.kind === "builtin") {
         if (control.submitToolApproval == null) {
           throw new Error(
@@ -1391,7 +1460,7 @@ function runPrompt(input) {
           approved: continuation.approvalResponse.approved,
           reason: continuation.approvalResponse.reason
         });
-        return;
+        return "continued";
       }
       if (!continuation.approvalResponse.approved) {
         await control.submitToolResult({
@@ -1401,7 +1470,7 @@ function runPrompt(input) {
             reason: continuation.approvalResponse.reason
           }
         });
-        return;
+        return "continued";
       }
       const rawToolCall = (_a5 = rawToolCallsByToolCallId.get(approval.toolCallId)) != null ? _a5 : {
         type: "tool-call",
@@ -1409,7 +1478,7 @@ function runPrompt(input) {
         toolName: approval.toolName,
         input: approval.input
       };
-      const outcome = await maybeExecuteHostTool({
+      const execution = await maybeExecuteHostTool({
         event: rawToolCall,
         tools: activeTools,
         sandboxSession: input.sandboxSession,
@@ -1435,13 +1504,36 @@ function runPrompt(input) {
           });
         }
       });
-      telemetry.toolEnd(rawToolCall.toolCallId, outcome);
+      if (!execution.executed) {
+        recordPendingToolResult({ toolCall: rawToolCall });
+        await finishForHostInputPause({ completeCurrentStep: false });
+        return "awaiting-tool-result";
+      }
+      telemetry.toolEnd(rawToolCall.toolCallId, execution.outcome);
+      return "continued";
     };
     try {
       for (const approval of pendingToolApprovals) {
         const continuation = continuationsByApprovalId.get(approval.approvalId);
         if (continuation != null) {
-          await processPendingApprovalContinuation(approval, continuation);
+          const outcome = await processPendingApprovalContinuation(
+            approval,
+            continuation
+          );
+          if (outcome === "awaiting-tool-result") return;
+          closingResumedStep = true;
+        }
+      }
+      for (const pendingResult of pendingToolResults) {
+        const continuation = continuationsByToolCallId.get(
+          pendingResult.toolCallId
+        );
+        if (continuation != null) {
+          await processPendingToolResultContinuation(
+            pendingResult,
+            continuation
+          );
+          closingResumedStep = true;
         }
       }
       while (true) {
@@ -1449,14 +1541,20 @@ function runPrompt(input) {
         if (done2) break;
         if (value == null) continue;
         if (value.type === "stream-start") {
-          telemetry.start((_b4 = value.modelId) != null ? _b4 : input.session.modelId);
+          telemetry.start((_d2 = value.modelId) != null ? _d2 : input.session.modelId);
         }
         if (value.type !== "stream-start" && value.type !== "finish-step" && value.type !== "finish" && value.type !== "error") {
           telemetry.ensureStepOpen();
         }
         const displayValue = stripWorkDir(value, input.sessionWorkDir);
-        const settledApprovalToolCallReplay = displayValue.type === "tool-call" && !displayValue.providerExecuted && settledApprovalToolCallIds.has(displayValue.toolCallId);
-        if (settledApprovalToolCallReplay) {
+        const settledHostInputReplay = (displayValue.type === "tool-call" || displayValue.type === "tool-result" || displayValue.type === "tool-approval-request") && settledHostToolCallIds.has(displayValue.toolCallId);
+        if (settledHostInputReplay) {
+          continue;
+        }
+        if (displayValue.type === "finish-step" && closingResumedStep) {
+          closingResumedStep = false;
+          resetStepContent();
+          result.discardCurrentStepContent();
           continue;
         }
         if (displayValue.type === "tool-approval-request") {
@@ -1469,7 +1567,7 @@ function runPrompt(input) {
           const rawToolCall = rawToolCallsByToolCallId.get(
             displayValue.toolCallId
           );
-          const toolName = (_c2 = rawToolCall == null ? void 0 : rawToolCall.toolName) != null ? _c2 : toolCall.toolName;
+          const toolName = (_e2 = rawToolCall == null ? void 0 : rawToolCall.toolName) != null ? _e2 : toolCall.toolName;
           if (!isHarnessV1BuiltinToolIncluded({
             toolName,
             toolFiltering: input.builtinToolFiltering
@@ -1534,13 +1632,13 @@ function runPrompt(input) {
             );
           }
           const rawToolCall = rawToolCallsByToolCallId.get(value.toolCallId);
-          const pendingApproval = (_f = pendingApprovalsByApprovalId.get(value.approvalId)) != null ? _f : {
+          const pendingApproval = (_h = pendingApprovalsByApprovalId.get(value.approvalId)) != null ? _h : {
             approvalId: value.approvalId,
             toolCallId: value.toolCallId,
             toolName: toolCall.toolName,
-            input: (_d2 = rawToolCall == null ? void 0 : rawToolCall.input) != null ? _d2 : JSON.stringify(toolCall.input),
+            input: (_f2 = rawToolCall == null ? void 0 : rawToolCall.input) != null ? _f2 : JSON.stringify(toolCall.input),
             kind: "builtin",
-            providerExecuted: (_e = rawToolCall == null ? void 0 : rawToolCall.providerExecuted) != null ? _e : true,
+            providerExecuted: (_g2 = rawToolCall == null ? void 0 : rawToolCall.providerExecuted) != null ? _g2 : true,
             ...(rawToolCall == null ? void 0 : rawToolCall.nativeName) !== void 0 ? { nativeName: rawToolCall.nativeName } : {}
           };
           pendingApprovalsByApprovalId.set(
@@ -1555,10 +1653,12 @@ function runPrompt(input) {
             pendingApproval.approvalId
           );
           if (continuation != null) {
-            await processPendingApprovalContinuation(
+            const outcome = await processPendingApprovalContinuation(
               pendingApproval,
               continuation
             );
+            if (outcome === "awaiting-tool-result") return;
+            closingResumedStep = true;
             continue;
           }
           onPendingToolApproval(pendingApproval);
@@ -1566,22 +1666,14 @@ function runPrompt(input) {
             approvalId: pendingApproval.approvalId,
             toolCall
           });
-          await finishForToolApprovalPause();
+          await finishForHostInputPause({ completeCurrentStep: true });
           return;
         }
         if (value.type === "finish-step") {
-          telemetry.stepFinish({
+          completeStep({
             finishReason: value.finishReason,
             usage: value.usage,
-            providerMetadata: value.harnessMetadata,
-            content: buildStepContent()
-          });
-          resetStepContent();
-          result.finishStep({
-            finishReason: value.finishReason,
-            usage: value.usage,
-            providerMetadata: value.harnessMetadata,
-            warnings: []
+            providerMetadata: value.harnessMetadata
           });
         }
         if (value.type === "finish") {
@@ -1642,7 +1734,7 @@ function runPrompt(input) {
             telemetry.toolEnd(toolCall.toolCallId, { ok: true, output });
             continue;
           }
-          const pendingApproval = (_g = pendingApprovalsByToolCallId.get(toolCall.toolCallId)) != null ? _g : customToolApprovalDecision.type === "request" ? {
+          const pendingApproval = (_i = pendingApprovalsByToolCallId.get(toolCall.toolCallId)) != null ? _i : customToolApprovalDecision.type === "request" ? {
             approvalId: generateId4(),
             toolCallId: toolCall.toolCallId,
             toolName: toolCall.toolName,
@@ -1664,10 +1756,12 @@ function runPrompt(input) {
               pendingApproval.approvalId
             );
             if (continuation != null) {
-              await processPendingApprovalContinuation(
+              const outcome = await processPendingApprovalContinuation(
                 pendingApproval,
                 continuation
               );
+              if (outcome === "awaiting-tool-result") return;
+              closingResumedStep = true;
               continue;
             }
             const pendingParsedToolCall = toolCallsByToolCallId.get(
@@ -1683,10 +1777,10 @@ function runPrompt(input) {
               approvalId: pendingApproval.approvalId,
               toolCall: pendingParsedToolCall
             });
-            await finishForToolApprovalPause();
+            await finishForHostInputPause({ completeCurrentStep: true });
             return;
           }
-          const outcome = await maybeExecuteHostTool({
+          const execution = await maybeExecuteHostTool({
             event: toolCall,
             tools: activeTools,
             sandboxSession: input.sandboxSession,
@@ -1712,7 +1806,12 @@ function runPrompt(input) {
               });
             }
           });
-          telemetry.toolEnd(toolCall.toolCallId, outcome);
+          if (!execution.executed) {
+            recordPendingToolResult({ toolCall });
+            await finishForHostInputPause({ completeCurrentStep: true });
+            return;
+          }
+          telemetry.toolEnd(toolCall.toolCallId, execution.outcome);
         }
         if (value.type === "error") {
           telemetry.error(value.error);
@@ -1722,11 +1821,16 @@ function runPrompt(input) {
             context: "harness stream error",
             error: value.error
           });
+          (_j = input.onTurnFailed) == null ? void 0 : _j.call(input);
           result.fail(value.error);
           return;
         }
       }
-      (_h = input.onTurnFinished) == null ? void 0 : _h.call(input);
+      if (finalFinish != null) {
+        (_k = input.onTurnFinished) == null ? void 0 : _k.call(input);
+      } else {
+        (_l = input.onTurnFailed) == null ? void 0 : _l.call(input);
+      }
       await result.finish(
         finalFinish ? {
           finishReason: finalFinish.finishReason,
@@ -1742,6 +1846,7 @@ function runPrompt(input) {
         context: "harness turn failed",
         error: err
       });
+      (_m = input.onTurnFailed) == null ? void 0 : _m.call(input);
       result.fail(err);
     } finally {
       reader.releaseLock();
@@ -1764,7 +1869,7 @@ function hasTool(input) {
 }
 async function maybeExecuteHostTool(input) {
   const tool = input.tools[input.event.toolName];
-  if (!isExecutableTool(tool)) return { ok: true, output: void 0 };
+  if (!isExecutableTool(tool)) return { executed: false };
   const parsed = await safeParseJSON({ text: input.event.input });
   const args = parsed.success ? parsed.value : input.event.input;
   try {
@@ -1791,14 +1896,14 @@ async function maybeExecuteHostTool(input) {
       toolCallId: input.event.toolCallId,
       output
     });
-    return { ok: true, output };
+    return { executed: true, outcome: { ok: true, output } };
   } catch (err) {
     await input.control.submitToolResult({
       toolCallId: input.event.toolCallId,
       output: { error: String(err) },
       isError: true
     });
-    return { ok: false, error: err };
+    return { executed: true, outcome: { ok: false, error: err } };
   }
 }
 async function validateToolCall(args) {
@@ -1837,10 +1942,11 @@ function promptToText(prompt) {
 var HarnessAgentSession = class {
   constructor(options) {
     this.pendingToolApprovals = /* @__PURE__ */ new Map();
+    this.pendingToolResults = /* @__PURE__ */ new Map();
     this.sessionState = "active";
     this.turnSequence = 0;
     this.activeTurnSequence = 0;
-    var _a3, _b3;
+    var _a3, _b3, _c;
     this.sessionId = options.sessionId;
     this.harness = options.harness;
     this.underlyingSession = options.underlyingSession;
@@ -1852,7 +1958,10 @@ var HarnessAgentSession = class {
     for (const approval of (_a3 = options.pendingToolApprovals) != null ? _a3 : []) {
       this.pendingToolApprovals.set(approval.approvalId, approval);
     }
-    this.turnState = (_b3 = options.turnState) != null ? _b3 : this.pendingToolApprovals.size > 0 ? "awaiting-approval" : "idle";
+    for (const pendingResult of (_b3 = options.pendingToolResults) != null ? _b3 : []) {
+      this.pendingToolResults.set(pendingResult.toolCallId, pendingResult);
+    }
+    this.turnState = (_c = options.turnState) != null ? _c : this.pendingToolApprovals.size > 0 ? "awaiting-approval" : this.pendingToolResults.size > 0 ? "awaiting-tool-result" : "idle";
     this.isResume = options.underlyingSession.isResume;
   }
   /**
@@ -1877,6 +1986,9 @@ var HarnessAgentSession = class {
   getSessionWorkDir() {
     return this.sessionWorkDir;
   }
+  hasUnfinishedTurn() {
+    return this.turnState !== "idle";
+  }
   promptTurn(options) {
     const session = this.requireReusableSession();
     this.requirePromptableTurn();
@@ -1899,6 +2011,7 @@ var HarnessAgentSession = class {
         telemetry: options.telemetry,
         toolApproval: this.toolApproval,
         pendingToolApprovals: this.getPendingToolApprovals(),
+        pendingToolResults: this.getPendingToolResults(),
         onPendingToolApproval: (approval) => {
           this.pendingToolApprovals.set(approval.approvalId, approval);
           this.markAwaitingApprovalIfActive();
@@ -1906,11 +2019,20 @@ var HarnessAgentSession = class {
         onToolApprovalSettled: (approvalId) => {
           this.pendingToolApprovals.delete(approvalId);
         },
+        onPendingToolResult: (pendingResult) => {
+          this.pendingToolResults.set(pendingResult.toolCallId, pendingResult);
+          this.markAwaitingToolResultIfActive();
+        },
+        onToolResultSettled: (toolCallId) => {
+          this.pendingToolResults.delete(toolCallId);
+        },
         onTurnFinished: () => {
           this.finishTrackedTurn({ turnId });
+        },
+        onTurnFailed: () => {
+          this.finishTrackedTurn({ turnId });
         }
       });
-      this.trackTurnCompletion({ done: turn.done, turnId });
       return turn;
     } catch (error) {
       this.finishTrackedTurn({ turnId });
@@ -1939,7 +2061,9 @@ var HarnessAgentSession = class {
         telemetry: options.telemetry,
         toolApproval: this.toolApproval,
         pendingToolApprovals: this.getPendingToolApprovals(),
+        pendingToolResults: this.getPendingToolResults(),
         toolApprovalContinuations: options.toolApprovalContinuations,
+        toolResultContinuations: options.toolResultContinuations,
         onPendingToolApproval: (approval) => {
           this.pendingToolApprovals.set(approval.approvalId, approval);
           this.markAwaitingApprovalIfActive();
@@ -1947,11 +2071,20 @@ var HarnessAgentSession = class {
         onToolApprovalSettled: (approvalId) => {
           this.pendingToolApprovals.delete(approvalId);
         },
+        onPendingToolResult: (pendingResult) => {
+          this.pendingToolResults.set(pendingResult.toolCallId, pendingResult);
+          this.markAwaitingToolResultIfActive();
+        },
+        onToolResultSettled: (toolCallId) => {
+          this.pendingToolResults.delete(toolCallId);
+        },
         onTurnFinished: () => {
           this.finishTrackedTurn({ turnId });
+        },
+        onTurnFailed: () => {
+          this.finishTrackedTurn({ turnId });
         }
       });
-      this.trackTurnCompletion({ done: turn.done, turnId });
       return turn;
     } catch (error) {
       this.finishTrackedTurn({ turnId });
@@ -2095,9 +2228,13 @@ var HarnessAgentSession = class {
   getPendingToolApprovals() {
     return Array.from(this.pendingToolApprovals.values());
   }
-  addPendingToolApprovals(state) {
+  getPendingToolResults() {
+    return Array.from(this.pendingToolResults.values());
+  }
+  addPendingToolState(state) {
     const pendingToolApprovals = this.getPendingToolApprovals();
-    if (pendingToolApprovals.length === 0) {
+    const pendingToolResults = this.getPendingToolResults();
+    if (pendingToolApprovals.length === 0 && pendingToolResults.length === 0) {
       return {
         type: state.type,
         harnessId: state.harnessId,
@@ -2107,7 +2244,8 @@ var HarnessAgentSession = class {
     }
     return {
       ...state,
-      pendingToolApprovals
+      ...pendingToolApprovals.length > 0 ? { pendingToolApprovals } : {},
+      ...pendingToolResults.length > 0 ? { pendingToolResults } : {}
     };
   }
   async suspendCurrentTurn(options) {
@@ -2118,7 +2256,7 @@ var HarnessAgentSession = class {
       expectedType: "continue-turn"
     });
     this.turnState = "suspended";
-    return this.addPendingToolApprovals(validated);
+    return this.addPendingToolState(validated);
   }
   toResumeStateWithContinuation(options) {
     const { continueFrom } = options;
@@ -2142,7 +2280,7 @@ var HarnessAgentSession = class {
     );
   }
   requireContinuableTurn() {
-    if (this.turnState === "awaiting-approval" || this.turnState === "suspended") {
+    if (this.turnState === "awaiting-approval" || this.turnState === "awaiting-tool-result" || this.turnState === "suspended") {
       return;
     }
     if (this.turnState === "running") {
@@ -2159,22 +2297,23 @@ var HarnessAgentSession = class {
       this.turnState = "awaiting-approval";
     }
   }
+  markAwaitingToolResultIfActive() {
+    if (this.sessionState === "active") {
+      this.turnState = "awaiting-tool-result";
+    }
+  }
   startTrackedTurn() {
     const turnId = ++this.turnSequence;
     this.activeTurnSequence = turnId;
     this.turnState = "running";
     return turnId;
   }
-  trackTurnCompletion(options) {
-    void Promise.resolve(options.done).finally(() => {
-      this.finishTrackedTurn({ turnId: options.turnId });
-    }).catch(() => {
-    });
-  }
   finishTrackedTurn(options) {
     if (this.sessionState !== "active") return;
     if (this.activeTurnSequence !== options.turnId) return;
-    this.turnState = this.pendingToolApprovals.size > 0 ? "awaiting-approval" : "idle";
+    this.pendingToolApprovals.clear();
+    this.pendingToolResults.clear();
+    this.turnState = "idle";
   }
   endLocalHandle(options) {
     this.sessionState = options.sessionState;
@@ -2256,6 +2395,48 @@ function collectHarnessAgentToolApprovalContinuations(input) {
   return continuations;
 }
 
+// src/agent/harness-agent-tool-result-continuation.ts
+function collectHarnessAgentToolResultContinuations(input) {
+  const lastMessage = input.messages.at(-1);
+  if ((lastMessage == null ? void 0 : lastMessage.role) !== "tool") return [];
+  return lastMessage.content.filter((part) => part.type === "tool-result").map(
+    (part) => toToolResultContinuation({
+      toolCallId: part.toolCallId,
+      output: part.output
+    })
+  );
+}
+function toToolResultContinuation(input) {
+  switch (input.output.type) {
+    case "text":
+    case "json":
+      return {
+        toolCallId: input.toolCallId,
+        output: input.output.value
+      };
+    case "error-text":
+    case "error-json":
+      return {
+        toolCallId: input.toolCallId,
+        output: input.output.value,
+        isError: true
+      };
+    case "execution-denied":
+      return {
+        toolCallId: input.toolCallId,
+        output: {
+          type: input.output.type,
+          reason: input.output.reason
+        }
+      };
+    case "content":
+      return {
+        toolCallId: input.toolCallId,
+        output: input.output
+      };
+  }
+}
+
 // src/agent/internal/bootstrap-recipe.ts
 var BOOTSTRAP_SCHEMA_VERSION = 1;
 async function hashHarnessBootstrap(recipe) {
@@ -2807,7 +2988,8 @@ var HarnessAgent = class {
         sessionWorkDir,
         toolApproval: this.settings.toolApproval,
         pendingToolApprovals: effectiveContinueFrom == null ? void 0 : effectiveContinueFrom.pendingToolApprovals,
-        turnState: effectiveContinueFrom == null ? "idle" : effectiveContinueFrom.pendingToolApprovals != null && effectiveContinueFrom.pendingToolApprovals.length > 0 ? "awaiting-approval" : "suspended"
+        pendingToolResults: effectiveContinueFrom == null ? void 0 : effectiveContinueFrom.pendingToolResults,
+        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) {
       await cleanupAfterStartFailure({
@@ -2848,13 +3030,14 @@ var HarnessAgent = class {
    * consuming a turn that crossed a process boundary.
    */
   async continueGenerate(options) {
-    var _a3;
+    var _a3, _b3;
     const runtimeContext = {};
     const { result, done } = this._startTurn({
       session: options.session,
       turnInput: {
         mode: "continue",
-        toolApprovalContinuations: (_a3 = options.toolApprovalContinuations) != null ? _a3 : []
+        toolApprovalContinuations: (_a3 = options.toolApprovalContinuations) != null ? _a3 : [],
+        toolResultContinuations: (_b3 = options.toolResultContinuations) != null ? _b3 : []
       },
       runtimeContext,
       abortSignal: options.abortSignal
@@ -2871,13 +3054,14 @@ var HarnessAgent = class {
    * follows from how the adapter resumed the session.
    */
   async continueStream(options) {
-    var _a3;
+    var _a3, _b3;
     const runtimeContext = {};
     const { result } = this._startTurn({
       session: options.session,
       turnInput: {
         mode: "continue",
-        toolApprovalContinuations: (_a3 = options.toolApprovalContinuations) != null ? _a3 : []
+        toolApprovalContinuations: (_a3 = options.toolApprovalContinuations) != null ? _a3 : [],
+        toolResultContinuations: (_b3 = options.toolResultContinuations) != null ? _b3 : []
       },
       runtimeContext,
       abortSignal: options.abortSignal
@@ -2896,7 +3080,8 @@ var HarnessAgent = class {
         runtimeContext: input.runtimeContext,
         abortSignal: input.abortSignal,
         telemetry: this.settings.telemetry,
-        toolApprovalContinuations: input.turnInput.toolApprovalContinuations
+        toolApprovalContinuations: input.turnInput.toolApprovalContinuations,
+        toolResultContinuations: input.turnInput.toolResultContinuations
       });
     }
     return input.session.promptTurn({
@@ -2947,10 +3132,12 @@ var HarnessAgent = class {
     const messages = Array.isArray(options.prompt) ? options.prompt : options.messages;
     if (Array.isArray(messages)) {
       const toolApprovalContinuations = collectHarnessAgentToolApprovalContinuations({ messages });
-      if (toolApprovalContinuations.length > 0) {
+      const toolResultContinuations = collectHarnessAgentToolResultContinuations({ messages });
+      if (toolApprovalContinuations.length > 0 || toolResultContinuations.length > 0) {
         return {
           mode: "continue",
-          toolApprovalContinuations
+          toolApprovalContinuations,
+          toolResultContinuations
         };
       }
       for (let i = messages.length - 1; i >= 0; i--) {
@@ -3482,6 +3669,7 @@ export {
   HarnessCapabilityUnsupportedError,
   HarnessError,
   collectHarnessAgentToolApprovalContinuations,
+  collectHarnessAgentToolResultContinuations,
   createFileReporter,
   createTraceTreeReporter,
   prepareHarnessSandboxTemplate,