@ai-sdk/harness 1.0.38 → 1.0.39

package/CHANGELOG.md

@@ -1,5 +1,12 @@
 # @ai-sdk/harness
 
+## 1.0.39
+
+### Patch Changes
+
+- 86a84c9: fix(harness): settle a turn aborted by the caller's abortSignal with an `abort` stream part instead of an AbortError `error` part, matching `streamText`'s abort contract
+  - ai@7.0.34
+
 ## 1.0.38
 
 ### Patch Changes

package/dist/agent/index.js

@@ -183,6 +183,9 @@ import {
   isExecutableTool,
   safeParseJSON
 } from "@ai-sdk/provider-utils";
+import {
+  getErrorMessage
+} from "@ai-sdk/provider";
 import { parseToolCall } from "ai/internal";
 
 // src/agent/internal/harness-stream-text-result.ts
@@ -457,6 +460,24 @@ var HarnessStreamTextResult = class {
     });
     this.fullStreamController.close();
   }
+  /**
+   * Settle the turn as user-aborted: emit a final `abort` part — matching
+   * `streamText`'s abort contract — and close the stream, instead of
+   * surfacing an `error` part. `toUIMessageStream` consumers then observe
+   * an `abort` chunk (and `isAborted: true`) rather than a spurious
+   * `onError`. The delayed promise accessors still reject with the
+   * underlying abort error so awaiting consumers do not hang. Idempotent.
+   */
+  abort(input) {
+    if (this.settled) return;
+    this.settled = true;
+    this.fullStreamController.enqueue({
+      type: "abort",
+      ...input.reason !== void 0 ? { reason: input.reason } : {}
+    });
+    this.fullStreamController.close();
+    this.rejectDelayedPromises(input.error);
+  }
   /**
    * Surface a fatal error as a stream `error` part + reject every delayed
    * promise so awaiting consumers stop hanging. Idempotent.
@@ -469,6 +490,9 @@ var HarnessStreamTextResult = class {
       error
     });
     this.fullStreamController.close();
+    this.rejectDelayedPromises(error);
+  }
+  rejectDelayedPromises(error) {
     for (const dp of [
       this._content,
       this._text,
@@ -596,6 +620,7 @@ var HarnessStreamTextResult = class {
   toUIMessageStream({
     originalMessages,
     generateMessageId,
+    onEnd,
     onFinish,
     messageMetadata,
     sendReasoning,
@@ -610,6 +635,7 @@ var HarnessStreamTextResult = class {
         tools: this.tools,
         originalMessages,
         generateMessageId,
+        onEnd,
         onFinish,
         messageMetadata,
         sendReasoning,
@@ -629,6 +655,7 @@ var HarnessStreamTextResult = class {
   toUIMessageStreamResponse({
     originalMessages,
     generateMessageId,
+    onEnd,
     onFinish,
     messageMetadata,
     sendReasoning,
@@ -642,6 +669,7 @@ var HarnessStreamTextResult = class {
       stream: this.toUIMessageStream({
         originalMessages,
         generateMessageId,
+        onEnd,
         onFinish,
         messageMetadata,
         sendReasoning,
@@ -1265,8 +1293,20 @@ function runPrompt(input) {
     promptText: input.prompt != null ? promptToText(input.prompt) : "",
     runtimeContext: input.runtimeContext
   });
+  const settleFailure = (err) => {
+    var _a4, _b4;
+    (_a4 = input.onTurnFailed) == null ? void 0 : _a4.call(input);
+    if ((_b4 = input.abortSignal) == null ? void 0 : _b4.aborted) {
+      result.abort({
+        error: err,
+        ...input.abortSignal.reason !== void 0 ? { reason: getErrorMessage(input.abortSignal.reason) } : {}
+      });
+      return;
+    }
+    result.fail(err);
+  };
   const done = (async () => {
-    var _a4, _b4, _c2, _d2, _e2, _f2, _g2, _h, _i, _j, _k, _l, _m;
+    var _a4, _b4, _c2, _d2, _e2, _f2, _g2, _h, _i, _j;
     let bridge;
     try {
       bridge = await toHarnessStream({
@@ -1297,8 +1337,7 @@ function runPrompt(input) {
         context: "failed to start harness turn",
         error: err
       });
-      (_a4 = input.onTurnFailed) == null ? void 0 : _a4.call(input);
-      result.fail(err);
+      settleFailure(err);
       return;
     }
     const { stream, control } = bridge;
@@ -1312,7 +1351,7 @@ function runPrompt(input) {
       pendingToolApprovals.map((approval) => [approval.toolCallId, approval])
     );
     const continuationsByApprovalId = new Map(
-      ((_b4 = input.toolApprovalContinuations) != null ? _b4 : []).map((continuation) => [
+      ((_a4 = input.toolApprovalContinuations) != null ? _a4 : []).map((continuation) => [
         continuation.approvalResponse.approvalId,
         continuation
       ])
@@ -1324,7 +1363,7 @@ function runPrompt(input) {
       ])
     );
     const continuationsByToolCallId = new Map(
-      ((_c2 = input.toolResultContinuations) != null ? _c2 : []).map((continuation) => [
+      ((_b4 = input.toolResultContinuations) != null ? _b4 : []).map((continuation) => [
         continuation.toolCallId,
         continuation
       ])
@@ -1541,7 +1580,7 @@ function runPrompt(input) {
         if (done2) break;
         if (value == null) continue;
         if (value.type === "stream-start") {
-          telemetry.start((_d2 = value.modelId) != null ? _d2 : input.session.modelId);
+          telemetry.start((_c2 = value.modelId) != null ? _c2 : input.session.modelId);
         }
         if (value.type !== "stream-start" && value.type !== "finish-step" && value.type !== "finish" && value.type !== "error") {
           telemetry.ensureStepOpen();
@@ -1567,7 +1606,7 @@ function runPrompt(input) {
           const rawToolCall = rawToolCallsByToolCallId.get(
             displayValue.toolCallId
           );
-          const toolName = (_e2 = rawToolCall == null ? void 0 : rawToolCall.toolName) != null ? _e2 : toolCall.toolName;
+          const toolName = (_d2 = rawToolCall == null ? void 0 : rawToolCall.toolName) != null ? _d2 : toolCall.toolName;
           if (!isHarnessV1BuiltinToolIncluded({
             toolName,
             toolFiltering: input.builtinToolFiltering
@@ -1587,6 +1626,17 @@ function runPrompt(input) {
             continue;
           }
         }
+        if (value.type === "error" && displayValue.type === "error") {
+          telemetry.error(value.error);
+          logBridgeError({
+            harnessId: input.harness.harnessId,
+            sessionId: input.session.sessionId,
+            context: "harness stream error",
+            error: value.error
+          });
+          settleFailure(displayValue.error);
+          return;
+        }
         for (const part of translateStreamPart(displayValue)) {
           result.enqueue(part);
         }
@@ -1632,13 +1682,13 @@ function runPrompt(input) {
             );
           }
           const rawToolCall = rawToolCallsByToolCallId.get(value.toolCallId);
-          const pendingApproval = (_h = pendingApprovalsByApprovalId.get(value.approvalId)) != null ? _h : {
+          const pendingApproval = (_g2 = pendingApprovalsByApprovalId.get(value.approvalId)) != null ? _g2 : {
             approvalId: value.approvalId,
             toolCallId: value.toolCallId,
             toolName: toolCall.toolName,
-            input: (_f2 = rawToolCall == null ? void 0 : rawToolCall.input) != null ? _f2 : JSON.stringify(toolCall.input),
+            input: (_e2 = rawToolCall == null ? void 0 : rawToolCall.input) != null ? _e2 : JSON.stringify(toolCall.input),
             kind: "builtin",
-            providerExecuted: (_g2 = rawToolCall == null ? void 0 : rawToolCall.providerExecuted) != null ? _g2 : true,
+            providerExecuted: (_f2 = rawToolCall == null ? void 0 : rawToolCall.providerExecuted) != null ? _f2 : true,
             ...(rawToolCall == null ? void 0 : rawToolCall.nativeName) !== void 0 ? { nativeName: rawToolCall.nativeName } : {}
           };
           pendingApprovalsByApprovalId.set(
@@ -1734,7 +1784,7 @@ function runPrompt(input) {
             telemetry.toolEnd(toolCall.toolCallId, { ok: true, output });
             continue;
           }
-          const pendingApproval = (_i = pendingApprovalsByToolCallId.get(toolCall.toolCallId)) != null ? _i : customToolApprovalDecision.type === "request" ? {
+          const pendingApproval = (_h = pendingApprovalsByToolCallId.get(toolCall.toolCallId)) != null ? _h : customToolApprovalDecision.type === "request" ? {
             approvalId: generateId4(),
             toolCallId: toolCall.toolCallId,
             toolName: toolCall.toolName,
@@ -1813,23 +1863,11 @@ function runPrompt(input) {
           }
           telemetry.toolEnd(toolCall.toolCallId, execution.outcome);
         }
-        if (value.type === "error") {
-          telemetry.error(value.error);
-          logBridgeError({
-            harnessId: input.harness.harnessId,
-            sessionId: input.session.sessionId,
-            context: "harness stream error",
-            error: value.error
-          });
-          (_j = input.onTurnFailed) == null ? void 0 : _j.call(input);
-          result.fail(value.error);
-          return;
-        }
       }
       if (finalFinish != null) {
-        (_k = input.onTurnFinished) == null ? void 0 : _k.call(input);
+        (_i = input.onTurnFinished) == null ? void 0 : _i.call(input);
       } else {
-        (_l = input.onTurnFailed) == null ? void 0 : _l.call(input);
+        (_j = input.onTurnFailed) == null ? void 0 : _j.call(input);
       }
       await result.finish(
         finalFinish ? {
@@ -1846,8 +1884,7 @@ function runPrompt(input) {
         context: "harness turn failed",
         error: err
       });
-      (_m = input.onTurnFailed) == null ? void 0 : _m.call(input);
-      result.fail(err);
+      settleFailure(err);
     } finally {
       reader.releaseLock();
     }