@giladbarnea/pi-user-agents 0.0.9 → 0.0.10

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@giladbarnea/pi-user-agents",
-  "version": "0.0.9",
+  "version": "0.0.10",
   "description": "Run, view, and control background Pi agents.",
   "keywords": [
     "pi-package",
@@ -33,7 +33,7 @@
     "test": "bun test"
   },
   "peerDependencies": {
-    "@earendil-works/pi-coding-agent": "*",
+    "@earendil-works/pi-coding-agent": ">=1.1.0",
     "@earendil-works/pi-tui": "*"
   },
   "publishConfig": {
@@ -45,7 +45,8 @@
     ]
   },
   "devDependencies": {
-    "@earendil-works/pi-coding-agent": "0.85.1",
+    "@earendil-works/pi-ai": "1.1.0",
+    "@earendil-works/pi-coding-agent": "1.1.0",
     "@earendil-works/pi-tui": "0.85.1"
   }
 }

package/runner.ts

@@ -625,7 +625,9 @@ export async function runChildTurns(
 ): Promise<void> {
 	let instruction = initialInstruction;
 	while (true) {
+		if (runningAgent.aborted) return;
 		const turnMessageStart = session.agent.state.messages.length;
+		runningAgent.runAborted = false;
 		if (!runningAgent.interruptRequested) {
 			logSteering(runningAgent.id, "turn-prompt-started", {
 				streaming: session.isStreaming,
@@ -633,8 +635,13 @@ export async function runChildTurns(
 			});
 			await session.prompt(instruction);
 		}
-		if (runningAgent.interruptRequested) {
-			const response = interruptedTurnResponse(session, turnMessageStart);
+		if (runningAgent.aborted) return;
+		if (runningAgent.interruptRequested || runningAgent.runAborted) {
+			const response = interruptedTurnResponse(
+				session,
+				turnMessageStart,
+				runningAgent.interruptRequested ? "Interrupted by user." : "Run cancelled.",
+			);
 			runningAgent.interruptRequested = false;
 			runningAgent.mainContextState = "separate";
 			runningAgent.status = "done-waiting-to-post";
@@ -693,14 +700,14 @@ export async function runChildTurns(
 	}
 }
 
-function interruptedTurnResponse(session: AgentSession, turnMessageStart: number): string {
+function interruptedTurnResponse(session: AgentSession, turnMessageStart: number, reason: string): string {
 	const assistantMessages = session.agent.state.messages
 		.slice(turnMessageStart)
 		.filter((message) => message.role === "assistant");
 	const lastAssistantMessage = assistantMessages.at(-1);
 	const partialResponse = lastAssistantMessage ? assistantText(lastAssistantMessage).trim() : "";
-	if (!partialResponse) return "Interrupted by user.";
-	return `Interrupted by user.\n\n${partialResponse}`;
+	if (!partialResponse) return reason;
+	return `${reason}\n\n${partialResponse}`;
 }
 
 async function createChildSession(
@@ -835,8 +842,10 @@ export function subscribeToChildSession(
 				streaming: session.isStreaming,
 				messageCount: event.messages.length,
 			});
-		if (event.type === "agent_settled")
-			logSteering(runningAgent.id, "child-agent-settled", { streaming: session.isStreaming });
+		if (event.type === "agent_settled") {
+			runningAgent.runAborted = event.aborted;
+			logSteering(runningAgent.id, "child-agent-settled", { streaming: session.isStreaming, aborted: event.aborted });
+		}
 		if (event.type === "turn_start")
 			logSteering(runningAgent.id, "turn-started", { streaming: session.isStreaming });
 		if (event.type === "turn_end")

package/shared.ts

@@ -144,6 +144,8 @@ export type RunningAgent = {
 	aborted?: boolean;
 	/** Set when the user interrupts only the active turn, leaving the child session alive. */
 	interruptRequested?: boolean;
+	/** Cancellation outcome of the current prompt, reported at session-level settlement. */
+	runAborted?: boolean;
 };
 
 export type CompletedAgent = {