@oh-my-pi/pi-agent-core 11.5.2 → 11.6.0

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@oh-my-pi/pi-agent-core",
-	"version": "11.5.2",
+	"version": "11.6.0",
 	"description": "General-purpose agent with transport abstraction, state management, and attachment support",
 	"type": "module",
 	"main": "./src/index.ts",
@@ -24,9 +24,9 @@
 		"test": "bun test"
 	},
 	"dependencies": {
-		"@oh-my-pi/pi-ai": "11.5.2",
-		"@oh-my-pi/pi-tui": "11.5.2",
-		"@oh-my-pi/pi-utils": "11.5.2"
+		"@oh-my-pi/pi-ai": "11.6.0",
+		"@oh-my-pi/pi-tui": "11.6.0",
+		"@oh-my-pi/pi-utils": "11.6.0"
 	},
 	"keywords": [
 		"ai",

package/src/agent.ts

@@ -356,6 +356,38 @@ export class Agent {
 		this.followUpQueue = [];
 	}
 
+	hasQueuedMessages(): boolean {
+		return this.steeringQueue.length > 0 || this.followUpQueue.length > 0;
+	}
+
+	private dequeueSteeringMessages(): AgentMessage[] {
+		if (this.steeringMode === "one-at-a-time") {
+			if (this.steeringQueue.length > 0) {
+				const first = this.steeringQueue[0];
+				this.steeringQueue = this.steeringQueue.slice(1);
+				return [first];
+			}
+			return [];
+		}
+		const steering = this.steeringQueue.slice();
+		this.steeringQueue = [];
+		return steering;
+	}
+
+	private dequeueFollowUpMessages(): AgentMessage[] {
+		if (this.followUpMode === "one-at-a-time") {
+			if (this.followUpQueue.length > 0) {
+				const first = this.followUpQueue[0];
+				this.followUpQueue = this.followUpQueue.slice(1);
+				return [first];
+			}
+			return [];
+		}
+		const followUp = this.followUpQueue.slice();
+		this.followUpQueue = [];
+		return followUp;
+	}
+
 	/**
 	 * Remove and return the last steering message from the queue (LIFO).
 	 * Used by dequeue keybinding.
@@ -444,7 +476,9 @@ export class Agent {
 		await this._runLoop(msgs, promptOptions);
 	}
 
-	/** Continue from current context (for retry after overflow) */
+	/**
+	 * Continue from current context (used for retries and resuming queued messages).
+	 */
 	async continue() {
 		if (this._state.isStreaming) {
 			throw new Error("Agent is already processing. Wait for completion before continuing.");
@@ -455,6 +489,18 @@ export class Agent {
 			throw new Error("No messages to continue from");
 		}
 		if (messages[messages.length - 1].role === "assistant") {
+			const queuedSteering = this.dequeueSteeringMessages();
+			if (queuedSteering.length > 0) {
+				await this._runLoop(queuedSteering, { skipInitialSteeringPoll: true });
+				return;
+			}
+
+			const queuedFollowUp = this.dequeueFollowUpMessages();
+			if (queuedFollowUp.length > 0) {
+				await this._runLoop(queuedFollowUp);
+				return;
+			}
+
 			throw new Error("Cannot continue from message role: assistant");
 		}
 
@@ -466,10 +512,15 @@ export class Agent {
 	 * If messages are provided, starts a new conversation turn with those messages.
 	 * Otherwise, continues from existing context.
 	 */
-	private async _runLoop(messages?: AgentMessage[], options?: AgentPromptOptions) {
+	private async _runLoop(
+		messages?: AgentMessage[],
+		options?: AgentPromptOptions & { skipInitialSteeringPoll?: boolean },
+	) {
 		const model = this._state.model;
 		if (!model) throw new Error("No model configured");
 
+		let skipInitialSteeringPoll = options?.skipInitialSteeringPoll === true;
+
 		this.runningPrompt = new Promise<void>(resolve => {
 			this.resolveRunningPrompt = resolve;
 		});
@@ -528,33 +579,13 @@ export class Agent {
 			cursorExecHandlers: this.cursorExecHandlers,
 			cursorOnToolResult,
 			getSteeringMessages: async () => {
-				if (this.steeringMode === "one-at-a-time") {
-					if (this.steeringQueue.length > 0) {
-						const first = this.steeringQueue[0];
-						this.steeringQueue = this.steeringQueue.slice(1);
-						return [first];
-					}
+				if (skipInitialSteeringPoll) {
+					skipInitialSteeringPoll = false;
 					return [];
-				} else {
-					const steering = this.steeringQueue.slice();
-					this.steeringQueue = [];
-					return steering;
-				}
-			},
-			getFollowUpMessages: async () => {
-				if (this.followUpMode === "one-at-a-time") {
-					if (this.followUpQueue.length > 0) {
-						const first = this.followUpQueue[0];
-						this.followUpQueue = this.followUpQueue.slice(1);
-						return [first];
-					}
-					return [];
-				} else {
-					const followUp = this.followUpQueue.slice();
-					this.followUpQueue = [];
-					return followUp;
 				}
+				return this.dequeueSteeringMessages();
 			},
+			getFollowUpMessages: async () => this.dequeueFollowUpMessages(),
 		};
 
 		let partial: AgentMessage | null = null;