@oh-my-pi/pi-agent-core 1.337.1 → 1.341.0

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@oh-my-pi/pi-agent-core",
-	"version": "1.337.1",
+	"version": "1.341.0",
 	"description": "General-purpose agent with transport abstraction, state management, and attachment support",
 	"type": "module",
 	"main": "./src/index.ts",

package/src/agent-loop.ts

@@ -156,6 +156,7 @@ async function runLoop(
 				stream,
 				config.getQueuedMessages,
 				config.getToolContext,
+				config.interruptMode,
 			);
 			toolResults.push(...toolExecution.toolResults);
 			queuedAfterTools = toolExecution.queuedMessages ?? null;
@@ -282,6 +283,7 @@ async function executeToolCalls(
 	stream: EventStream<AgentEvent, AgentMessage[]>,
 	getQueuedMessages?: AgentLoopConfig["getQueuedMessages"],
 	getToolContext?: AgentLoopConfig["getToolContext"],
+	interruptMode?: AgentLoopConfig["interruptMode"],
 ): Promise<{ toolResults: ToolResultMessage[]; queuedMessages?: AgentMessage[] }> {
 	const toolCalls = assistantMessage.content.filter((c) => c.type === "toolCall");
 	const results: ToolResultMessage[] = [];
@@ -353,7 +355,8 @@ async function executeToolCalls(
 		stream.push({ type: "message_end", message: toolResultMessage });
 
 		// Check for queued messages - skip remaining tools if user interrupted
-		if (getQueuedMessages) {
+		// Only interrupt mid-execution if interruptMode is "immediate" (default)
+		if (interruptMode !== "wait" && getQueuedMessages) {
 			const queued = await getQueuedMessages();
 			if (queued.length > 0) {
 				queuedMessages = queued;

package/src/agent.ts

@@ -52,6 +52,12 @@ export interface AgentOptions {
 	 */
 	queueMode?: "all" | "one-at-a-time";
 
+	/**
+	 * Interrupt mode: "immediate" = check queue after each tool (interrupt remaining),
+	 * "wait" = only process queue after turn completes
+	 */
+	interruptMode?: "immediate" | "wait";
+
 	/**
 	 * Custom stream function (for proxy backends, etc.). Default uses streamSimple.
 	 */
@@ -88,6 +94,7 @@ export class Agent {
 	private transformContext?: (messages: AgentMessage[], signal?: AbortSignal) => Promise<AgentMessage[]>;
 	private messageQueue: AgentMessage[] = [];
 	private queueMode: "all" | "one-at-a-time";
+	private interruptMode: "immediate" | "wait";
 	public streamFn: StreamFn;
 	public getApiKey?: (provider: string) => Promise<string | undefined> | string | undefined;
 	private getToolContext?: () => AgentToolContext | undefined;
@@ -99,6 +106,7 @@ export class Agent {
 		this.convertToLlm = opts.convertToLlm || defaultConvertToLlm;
 		this.transformContext = opts.transformContext;
 		this.queueMode = opts.queueMode || "one-at-a-time";
+		this.interruptMode = opts.interruptMode || "immediate";
 		this.streamFn = opts.streamFn || streamSimple;
 		this.getApiKey = opts.getApiKey;
 		this.getToolContext = opts.getToolContext;
@@ -134,6 +142,14 @@ export class Agent {
 		return this.queueMode;
 	}
 
+	setInterruptMode(mode: "immediate" | "wait") {
+		this.interruptMode = mode;
+	}
+
+	getInterruptMode(): "immediate" | "wait" {
+		return this.interruptMode;
+	}
+
 	setTools(t: AgentTool<any>[]) {
 		this._state.tools = t;
 	}
@@ -256,6 +272,7 @@ export class Agent {
 			transformContext: this.transformContext,
 			getApiKey: this.getApiKey,
 			getToolContext: this.getToolContext,
+			interruptMode: this.interruptMode,
 			getQueuedMessages: async () => {
 				if (this.queueMode === "one-at-a-time") {
 					if (this.messageQueue.length > 0) {

package/src/types.ts

@@ -82,6 +82,14 @@ export interface AgentLoopConfig extends SimpleStreamOptions {
 	 */
 	getQueuedMessages?: () => Promise<AgentMessage[]>;
 
+	/**
+	 * Controls when queued messages interrupt tool execution.
+	 *
+	 * - "immediate" (default): Check queue after each tool, interrupt remaining tools if messages exist
+	 * - "wait": Only process queued messages after the entire turn completes
+	 */
+	interruptMode?: "immediate" | "wait";
+
 	/**
 	 * Provides tool execution context, resolved per tool call.
 	 * Use for late-bound UI or session state access.