@oh-my-pi/pi-agent-core 14.5.13 → 14.6.0

package/CHANGELOG.md

@@ -2,6 +2,11 @@
 
 ## [Unreleased]
 
+## [14.6.0] - 2026-05-02
+### Fixed
+
+- Fixed request cancellation before provider events by emitting an aborted assistant message and ending the stream with `stopReason: "aborted"`
+
 ## [14.5.10] - 2026-04-30
 
 ### Added
@@ -328,4 +333,4 @@ Initial release under @oh-my-pi scope. See previous releases at [badlogic/pi-mon
 
 - `Agent` constructor now has all options optional (empty options use defaults).
 
-- `queueMessage()` is now synchronous (no longer returns a Promise).
+- `queueMessage()` is now synchronous (no longer returns a Promise).

package/package.json

@@ -1,7 +1,7 @@
 {
 	"type": "module",
 	"name": "@oh-my-pi/pi-agent-core",
-	"version": "14.5.13",
+	"version": "14.6.0",
 	"description": "General-purpose agent with transport abstraction, state management, and attachment support",
 	"homepage": "https://github.com/can1357/oh-my-pi",
 	"author": "Can Boluk",
@@ -35,9 +35,9 @@
 		"fmt": "biome format --write ."
 	},
 	"dependencies": {
-		"@oh-my-pi/pi-ai": "14.5.13",
-		"@oh-my-pi/pi-natives": "14.5.13",
-		"@oh-my-pi/pi-utils": "14.5.13"
+		"@oh-my-pi/pi-ai": "14.6.0",
+		"@oh-my-pi/pi-natives": "14.6.0",
+		"@oh-my-pi/pi-utils": "14.6.0"
 	},
 	"devDependencies": {
 		"@sinclair/typebox": "^0.34.49",

package/src/agent-loop.ts

@@ -4,6 +4,7 @@
  */
 import {
 	type AssistantMessage,
+	type AssistantMessageEvent,
 	type Context,
 	EventStream,
 	streamSimple,
@@ -348,38 +349,23 @@ async function streamAssistantResponse(
 	let partialMessage: AssistantMessage | null = null;
 	let addedPartial = false;
 
-	for await (const event of response) {
+	const responseIterator = response[Symbol.asyncIterator]();
+	while (true) {
+		const read = await readResponseEvent(responseIterator, signal);
+		if (read.type === "aborted") {
+			return emitAbortedAssistantMessage(partialMessage, addedPartial, context, config, stream);
+		}
+		if (read.type === "error") {
+			throw read.error;
+		}
+		if (read.result.done) {
+			break;
+		}
+
+		const event = read.result.value;
 		// Check for abort signal before processing each event
 		if (signal?.aborted) {
-			const errorMessage = "Request was aborted";
-			const abortedMessage: AssistantMessage = partialMessage
-				? { ...partialMessage, stopReason: "aborted", errorMessage }
-				: {
-						role: "assistant",
-						content: [],
-						api: config.model.api,
-						provider: config.model.provider,
-						model: config.model.id,
-						usage: {
-							input: 0,
-							output: 0,
-							cacheRead: 0,
-							cacheWrite: 0,
-							totalTokens: 0,
-							cost: { input: 0, output: 0, cacheRead: 0, cacheWrite: 0, total: 0 },
-						},
-						stopReason: "aborted",
-						errorMessage,
-						timestamp: Date.now(),
-					};
-			if (addedPartial) {
-				context.messages[context.messages.length - 1] = abortedMessage;
-			} else {
-				context.messages.push(abortedMessage);
-				stream.push({ type: "message_start", message: { ...abortedMessage } });
-			}
-			stream.push({ type: "message_end", message: abortedMessage });
-			return abortedMessage;
+			return emitAbortedAssistantMessage(partialMessage, addedPartial, context, config, stream);
 		}
 
 		switch (event.type) {
@@ -434,6 +420,83 @@ async function streamAssistantResponse(
 	return await response.result();
 }
 
+type ResponseEventRead =
+	| { type: "event"; result: IteratorResult<AssistantMessageEvent> }
+	| { type: "error"; error: unknown }
+	| { type: "aborted" };
+
+async function readResponseEvent(
+	iterator: AsyncIterator<AssistantMessageEvent>,
+	signal: AbortSignal | undefined,
+): Promise<ResponseEventRead> {
+	if (!signal) {
+		return { type: "event", result: await iterator.next() };
+	}
+	if (signal.aborted) {
+		const returnPromise = iterator.return?.();
+		if (returnPromise) void returnPromise.catch(() => {});
+		return { type: "aborted" };
+	}
+
+	const { promise: abortPromise, resolve: resolveAbort } = Promise.withResolvers<ResponseEventRead>();
+	const onAbort = () => resolveAbort({ type: "aborted" });
+	signal.addEventListener("abort", onAbort, { once: true });
+
+	const eventPromise = iterator.next().then(
+		result => ({ type: "event" as const, result }),
+		error => ({ type: "error" as const, error }),
+	);
+
+	try {
+		const read = await Promise.race([eventPromise, abortPromise]);
+		if (read.type === "aborted") {
+			const returnPromise = iterator.return?.();
+			if (returnPromise) void returnPromise.catch(() => {});
+		}
+		return read;
+	} finally {
+		signal.removeEventListener("abort", onAbort);
+	}
+}
+
+function emitAbortedAssistantMessage(
+	partialMessage: AssistantMessage | null,
+	addedPartial: boolean,
+	context: AgentContext,
+	config: AgentLoopConfig,
+	stream: EventStream<AgentEvent, AgentMessage[]>,
+): AssistantMessage {
+	const errorMessage = "Request was aborted";
+	const abortedMessage: AssistantMessage = partialMessage
+		? { ...partialMessage, stopReason: "aborted", errorMessage }
+		: {
+				role: "assistant",
+				content: [],
+				api: config.model.api,
+				provider: config.model.provider,
+				model: config.model.id,
+				usage: {
+					input: 0,
+					output: 0,
+					cacheRead: 0,
+					cacheWrite: 0,
+					totalTokens: 0,
+					cost: { input: 0, output: 0, cacheRead: 0, cacheWrite: 0, total: 0 },
+				},
+				stopReason: "aborted",
+				errorMessage,
+				timestamp: Date.now(),
+			};
+	if (addedPartial) {
+		context.messages[context.messages.length - 1] = abortedMessage;
+	} else {
+		context.messages.push(abortedMessage);
+		stream.push({ type: "message_start", message: { ...abortedMessage } });
+	}
+	stream.push({ type: "message_end", message: abortedMessage });
+	return abortedMessage;
+}
+
 /**
  * Execute tool calls from an assistant message.
  */