@oh-my-pi/pi-coding-agent 15.12.1 → 15.12.3

package/src/modes/controllers/input-controller.ts

@@ -178,7 +178,12 @@ export class InputController {
 			} else if (this.ctx.session.isStreaming) {
 				this.ctx.notifyInterrupting();
 				void this.ctx.session.abort({ reason: USER_INTERRUPT_LABEL });
-			} else if (!this.ctx.editor.getText().trim()) {
+			} else if (this.ctx.editor.getText().trim()) {
+				// Esc with typed text clears the draft instead of (or before) any double-Esc action
+				this.ctx.editor.setText("");
+				this.ctx.ui.requestRender();
+				this.ctx.lastEscapeTime = 0;
+			} else {
 				// Double-interrupt with empty editor triggers /tree, /branch, or nothing based on setting
 				const action = settings.get("doubleEscapeAction");
 				if (action !== "none") {
@@ -189,6 +194,7 @@ export class InputController {
 						} else {
 							this.ctx.showUserMessageSelector();
 						}
+						this.ctx.ui.resetDisplay();
 						this.ctx.lastEscapeTime = 0;
 					} else {
 						this.ctx.lastEscapeTime = now;

package/src/session/agent-session.ts

@@ -1139,9 +1139,24 @@ export class AgentSession {
 		if (this.#promptInFlightCount === 0) {
 			this.#releasePowerAssertion();
 			this.#flushPendingAgentEnd();
+			this.#drainStrandedQueuedMessages();
 		}
 	}
 
+	/** A steer/follow-up can land after the agent loop's final queue poll but
+	 *  before the prompt unwinds: #promptInFlightCount keeps isStreaming true
+	 *  through post-prompt recovery, so senders (collab guests, skills) still
+	 *  queue via agent.steer()/followUp() instead of starting a fresh prompt.
+	 *  Without a drain those messages strand invisibly until the next manual
+	 *  prompt. Runs when the session settles; the guard makes it a no-op when
+	 *  the queue was consumed normally or a new turn already started. */
+	#drainStrandedQueuedMessages(): void {
+		if (!this.agent.hasQueuedMessages()) return;
+		this.#scheduleAgentContinue({
+			shouldContinue: () => this.#canAutoContinueForFollowUp() && this.agent.hasQueuedMessages(),
+		});
+	}
+
 	#resetInFlight(): void {
 		this.#promptInFlightCount = 0;
 		this.#releasePowerAssertion();
@@ -5255,6 +5270,14 @@ export class AgentSession {
 			} else {
 				this.agent.steer(normalizedAppMessage);
 			}
+			// The isStreaming check above can be stale: image normalization is
+			// awaited, so the turn may have ended in between, leaving the message
+			// queued on an idle agent. Mirror #queueSteer's idle-path delivery.
+			if (this.#canAutoContinueForFollowUp()) {
+				this.#scheduleAgentContinue({
+					shouldContinue: () => this.#canAutoContinueForFollowUp() && this.agent.hasQueuedMessages(),
+				});
+			}
 			return;
 		}
 

package/src/tools/ast-edit.ts

@@ -512,6 +512,14 @@ function buildChangeBody(groups: string[][], expanded: boolean, budget: number,
 	return lines;
 }
 
+/** One-line header preview of an AST pattern. `renderStatusLine` only flattens
+ * CR/LF, so a multi-line tab-indented pattern would otherwise punch raw tabs
+ * into the status line; collapse all whitespace runs to single spaces. */
+function patternPreview(pat: string | undefined): string | undefined {
+	const collapsed = pat?.replace(/\s+/g, " ").trim();
+	return collapsed || undefined;
+}
+
 export const astEditToolRenderer = {
 	inline: true,
 	renderCall(args: AstEditRenderArgs, _options: RenderResultOptions, uiTheme: Theme): Component {
@@ -520,7 +528,8 @@ export const astEditToolRenderer = {
 		const rewriteCount = args.ops?.length ?? 0;
 		if (rewriteCount > 1) meta.push(`${rewriteCount} rewrites`);
 
-		const description = rewriteCount === 1 ? args.ops?.[0]?.pat : rewriteCount ? `${rewriteCount} rewrites` : "?";
+		const description =
+			rewriteCount === 1 ? patternPreview(args.ops?.[0]?.pat) : rewriteCount ? `${rewriteCount} rewrites` : "?";
 		const header = renderStatusLine({ icon: "pending", title: "AST Edit", description, meta }, uiTheme);
 		// Pending call has no body yet — a lone status line is sleeker than an empty frame.
 		return new Text(header, 0, 0);
@@ -553,7 +562,7 @@ export const astEditToolRenderer = {
 
 		if (totalReplacements === 0) {
 			const rewriteCount = args?.ops?.length ?? 0;
-			const description = rewriteCount === 1 ? args?.ops?.[0]?.pat : undefined;
+			const description = rewriteCount === 1 ? patternPreview(args?.ops?.[0]?.pat) : undefined;
 			const meta = ["0 replacements"];
 			if (details?.scopePath) meta.push(`in ${details.scopePath}`);
 			if (filesSearched > 0) meta.push(`searched ${filesSearched}`);
@@ -578,7 +587,7 @@ export const astEditToolRenderer = {
 		meta.push(`searched ${filesSearched}`);
 		if (limitReached) meta.push(uiTheme.fg("warning", "limit reached"));
 		const rewriteCount = args?.ops?.length ?? 0;
-		const description = rewriteCount === 1 ? args?.ops?.[0]?.pat : undefined;
+		const description = rewriteCount === 1 ? patternPreview(args?.ops?.[0]?.pat) : undefined;
 
 		const textContent = result.details?.displayContent ?? result.content?.find(c => c.type === "text")?.text ?? "";
 		const allLines = textContent.split("\n");