@ai-sdk/harness-opencode 1.0.136 → 1.0.137

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @ai-sdk/harness-opencode
 
+## 1.0.137
+
+### Patch Changes
+
+- 82b6142: fix(harness-opencode): stop aborted OpenCode turns before starting the next turn
+- Updated dependencies [8c65988]
+- Updated dependencies [8182916]
+- Updated dependencies [527a163]
+  - @ai-sdk/provider@4.0.21
+  - @ai-sdk/provider-utils@5.0.53
+  - @ai-sdk/harness@1.0.135
+
 ## 1.0.136
 
 ### Patch Changes

package/dist/bridge/index.mjs

@@ -1988,6 +1988,9 @@ async function legacySessionPrompt({ client, sessionId, start, prompt: promptTex
 		}]
 	});
 }
+async function legacySessionAbort({ client, sessionId }) {
+	return client.session.abort({ sessionID: sessionId });
+}
 async function legacySessionSummarize({ client, sessionId, model }) {
 	return client.session.summarize({
 		sessionID: sessionId,
@@ -2062,6 +2065,24 @@ async function ensureSession({ client, start, emit }) {
 async function runPrompt({ client, sessionId, start, turn, emit }) {
 	const eventsAbort = new AbortController();
 	const turnSettled = createDeferred();
+	const promptRequestSettled = createDeferred();
+	let abortSessionPromise;
+	const abortSession = () => {
+		eventsAbort.abort();
+		turn.experimental_userMessages.close();
+		turnSettled.resolve("aborted");
+		abortSessionPromise ??= (async () => {
+			await promptRequestSettled.promise;
+			const aborted = await legacySessionAbort({
+				client,
+				sessionId
+			});
+			if (aborted.error) throw new Error(`OpenCode session abort failed: ${formatError(aborted.error)}`);
+		})();
+		abortSessionPromise.catch(() => {});
+	};
+	turn.abortSignal.addEventListener("abort", abortSession, { once: true });
+	if (turn.abortSignal.aborted) abortSession();
 	let sawContent = false;
 	let sawFinishStep = false;
 	let sawBusy = false;
@@ -2190,20 +2211,43 @@ async function runPrompt({ client, sessionId, start, turn, emit }) {
 			}
 		}
 	})();
-	const prompted = await legacySessionPrompt({
-		client,
-		sessionId,
-		start
-	});
-	if (prompted.error) {
-		eventsAbort.abort();
-		turn.experimental_userMessages.close(/* @__PURE__ */ new Error(`OpenCode prompt failed: ${formatError(prompted.error)}`));
-		throw new Error(`OpenCode prompt failed: ${formatError(prompted.error)}`);
-	}
+	if (!turn.abortSignal.aborted) {
+		let prompted;
+		try {
+			prompted = await legacySessionPrompt({
+				client,
+				sessionId,
+				start
+			});
+		} catch (error) {
+			promptRequestSettled.resolve(void 0);
+			turn.abortSignal.removeEventListener("abort", abortSession);
+			eventsAbort.abort();
+			turn.experimental_userMessages.close(error);
+			throw error;
+		}
+		promptRequestSettled.resolve(void 0);
+		if (prompted.error) {
+			turn.abortSignal.removeEventListener("abort", abortSession);
+			eventsAbort.abort();
+			turn.experimental_userMessages.close(/* @__PURE__ */ new Error(`OpenCode prompt failed: ${formatError(prompted.error)}`));
+			throw new Error(`OpenCode prompt failed: ${formatError(prompted.error)}`);
+		}
+	} else promptRequestSettled.resolve(void 0);
 	const settlement = await turnSettled.promise;
+	turn.abortSignal.removeEventListener("abort", abortSession);
 	eventsAbort.abort();
 	await eventLoop.catch(() => {});
 	await userMessageLoop.catch(() => {});
+	if (settlement === "aborted") {
+		try {
+			await abortSessionPromise;
+		} catch (error) {
+			closeRuntime();
+			throw error;
+		}
+		return;
+	}
 	if (settlement === "stream-ended") throw new Error("OpenCode event stream ended before the turn settled.");
 	if (terminalError) throw new Error(terminalError);
 	if (!sawFinishStep) {