@oh-my-pi/pi-coding-agent 15.13.2 → 15.13.3

package/src/main.ts

@@ -274,7 +274,19 @@ export async function submitInteractiveInput(
 
 	try {
 		using _keepalive = new EventLoopKeepalive();
-		const streamingBehavior = session.isStreaming ? ("followUp" as const) : undefined;
+		// Honor the submission's queue intent, defaulting to followUp. Reading
+		// `session.isStreaming` to decide queue-vs-fresh is NOT atomic with the
+		// eventual `agent.prompt()` call inside `session.prompt()`: a background turn
+		// (queued-message drain, idle compaction, goal/loop continuation timer) can
+		// flip the agent busy in the gap, and a bare prompt() would then throw
+		// AgentBusyError straight to an error toast even though the UI shows no
+		// "Working…". Passing a behavior unconditionally is a no-op when the session
+		// is genuinely idle (a fresh turn runs and the option is ignored) and queues
+		// the message instead of erroring when a turn is already underway. Normal
+		// user Enter carries "steer" (interrupt, matching the streaming-branch Enter);
+		// background/continuation submits omit it and fall back to "followUp". The
+		// synthetic branch below opts out by design.
+		const streamingBehavior = input.streamingBehavior ?? ("followUp" as const);
 		// Continue shortcuts submit an already-started synthetic developer prompt with
 		// no optimistic user message.
 		if (!input.started && !mode.markPendingSubmissionStarted(input)) {
@@ -287,9 +299,7 @@ export async function submitInteractiveInput(
 				display: input.display ?? false,
 				attribution: "agent" as const,
 			};
-			await (streamingBehavior
-				? session.promptCustomMessage(message, { streamingBehavior })
-				: session.promptCustomMessage(message));
+			await session.promptCustomMessage(message, { streamingBehavior });
 		} else if (input.synthetic) {
 			// Synthetic continue shortcuts are hidden developer prompts. The streaming
 			// queue (#queueUserMessage) only carries user-attributed messages, so we do
@@ -299,7 +309,7 @@ export async function submitInteractiveInput(
 			// its role.
 			await session.prompt(input.text, { synthetic: true, expandPromptTemplates: false });
 		} else {
-			await session.prompt(input.text, { images: input.images, ...(streamingBehavior && { streamingBehavior }) });
+			await session.prompt(input.text, { images: input.images, streamingBehavior });
 		}
 	} catch (error: unknown) {
 		const errorMessage = error instanceof Error ? error.message : "Unknown error occurred";

package/src/modes/acp/acp-agent.ts

@@ -72,7 +72,7 @@ import { AUTO_THINKING, parseConfiguredThinkingLevel } from "../../thinking";
 import { normalizeLocalScheme } from "../../tools/path-utils";
 import { runResolveInvocation } from "../../tools/resolve";
 import { ToolError } from "../../tools/tool-errors";
-import { getVisibleThinkingText } from "../../utils/thinking-display";
+import { canonicalizeMessage } from "../../utils/thinking-display";
 import { createAcpClientBridge } from "./acp-client-bridge";
 import {
 	buildToolCallStartUpdate,
@@ -1907,7 +1907,7 @@ export class AcpAgent implements Agent {
 					continue;
 				}
 				if (item.type === "thinking" && "thinking" in item && typeof item.thinking === "string") {
-					const thinking = getVisibleThinkingText(item);
+					const thinking = canonicalizeMessage(item.thinking);
 					if (thinking.length === 0) continue;
 					notifications.push({
 						sessionId,

package/src/modes/acp/acp-event-mapper.ts

@@ -9,7 +9,7 @@ import type {
 import type { AgentSessionEvent } from "../../session/agent-session";
 import { resolveToCwd } from "../../tools/path-utils";
 import type { TodoStatus } from "../../tools/todo";
-import { hasVisibleThinking } from "../../utils/thinking-display";
+import { canonicalizeMessage } from "../../utils/thinking-display";
 
 interface MessageProgress {
 	textEmitted: boolean;
@@ -259,7 +259,7 @@ function mapAssistantMessageUpdate(
 			break;
 		case "thinking_delta": {
 			const block = event.assistantMessageEvent.partial?.content?.[event.assistantMessageEvent.contentIndex];
-			if (block?.type === "thinking" && !hasVisibleThinking(block)) return [];
+			if (block?.type === "thinking" && !canonicalizeMessage(block.thinking)) return [];
 			sessionUpdate = "agent_thought_chunk";
 			text = event.assistantMessageEvent.delta;
 			if (text.length > 0 && progress) {

package/src/modes/components/agent-hub.ts

@@ -41,7 +41,7 @@ import type { SessionMessageEntry } from "../../session/session-entries";
 import { parseSessionEntries } from "../../session/session-loader";
 import { createIrcMessageCard } from "../../tools/irc";
 import { replaceTabs, TRUNCATE_LENGTHS, truncateToWidth } from "../../tools/render-utils";
-import { hasVisibleThinking } from "../../utils/thinking-display";
+import { canonicalizeMessage } from "../../utils/thinking-display";
 import type { ObservableSession, SessionObserverRegistry } from "../session-observer-registry";
 import { getEditorTheme, theme } from "../theme/theme";
 import { matchesSelectDown, matchesSelectUp } from "../utils/keybinding-matchers";
@@ -193,6 +193,8 @@ export class AgentHubOverlayComponent extends Container {
 	#rows: AgentRef[] = [];
 	#selectedRow = 0;
 	#notice: string | undefined;
+	/** Captured row order from the first refresh; keeps the hub stable while open. */
+	#rowOrder: Map<string, number> | undefined;
 
 	// Chat state
 	#chatAgentId: string | undefined;
@@ -349,10 +351,32 @@ export class AgentHubOverlayComponent extends Container {
 
 	#refreshRows(): void {
 		const selectedId = this.#rows[this.#selectedRow]?.id;
-		this.#rows = this.#registry
-			.list()
-			.filter(ref => ref.id !== MAIN_AGENT_ID)
-			.sort((a, b) => STATUS_ORDER[a.status] - STATUS_ORDER[b.status] || b.lastActivity - a.lastActivity);
+		const refs = this.#registry.list().filter(ref => ref.id !== MAIN_AGENT_ID);
+
+		if (!this.#rowOrder) {
+			// First refresh (usually the constructor): order by status, then recency.
+			this.#rows = refs.sort(
+				(a, b) => STATUS_ORDER[a.status] - STATUS_ORDER[b.status] || b.lastActivity - a.lastActivity,
+			);
+			this.#rowOrder = new Map(this.#rows.map((ref, i) => [ref.id, i]));
+		} else {
+			// After the hub is open, freeze the relative order so keyboard selection
+			// does not jump around as agents heartbeat or update activity. New agents
+			// are appended at the end and then stay put.
+			this.#rows = refs.sort((a, b) => {
+				const statusDiff = STATUS_ORDER[a.status] - STATUS_ORDER[b.status];
+				if (statusDiff !== 0) return statusDiff;
+				const aOrder = this.#rowOrder!.get(a.id) ?? Number.MAX_SAFE_INTEGER;
+				const bOrder = this.#rowOrder!.get(b.id) ?? Number.MAX_SAFE_INTEGER;
+				return aOrder - bOrder;
+			});
+			for (const ref of this.#rows) {
+				if (!this.#rowOrder.has(ref.id)) {
+					this.#rowOrder.set(ref.id, this.#rowOrder.size);
+				}
+			}
+		}
+
 		const keptIndex = selectedId ? this.#rows.findIndex(ref => ref.id === selectedId) : -1;
 		this.#selectedRow = keptIndex >= 0 ? keptIndex : Math.min(this.#selectedRow, Math.max(0, this.#rows.length - 1));
 	}
@@ -1028,8 +1052,8 @@ export class AgentHubOverlayComponent extends Container {
 
 		const hasVisibleAssistantContent = message.content.some(
 			content =>
-				(content.type === "text" && content.text.trim().length > 0) ||
-				(content.type === "thinking" && hasVisibleThinking(content)),
+				(content.type === "text" && canonicalizeMessage(content.text)) ||
+				(content.type === "thinking" && canonicalizeMessage(content.thinking)),
 		);
 		if (hasVisibleAssistantContent) {
 			// New visible turn content closes the current read run (mirrors rebuild).

package/src/modes/components/assistant-message.ts

@@ -4,7 +4,7 @@ import type { AssistantThinkingRenderer } from "../../extensibility/extensions/t
 import { getMarkdownTheme, theme } from "../../modes/theme/theme";
 import { resolveAbortLabel, shouldRenderAbortReason } from "../../session/messages";
 import { getPreviewLines, resolveImageOptions, TRUNCATE_LENGTHS } from "../../tools/render-utils";
-import { getVisibleThinkingText, hasVisibleThinking } from "../../utils/thinking-display";
+import { canonicalizeMessage } from "../../utils/thinking-display";
 
 /**
  * Max lines of a turn-ending provider error rendered inline in the transcript.
@@ -232,9 +232,10 @@ export class AssistantMessageComponent extends Container {
 		const parts: string[] = [`htb:${this.hideThinkingBlock ? 1 : 0}`];
 		for (const content of message.content) {
 			if (content.type === "text") {
-				parts.push(content.text.trim() ? "T1" : "T0");
+				parts.push(canonicalizeMessage(content.text) ? "T1" : "T0");
 			} else if (content.type === "thinking") {
-				if (!hasVisibleThinking(content)) parts.push("K0");
+				const canon = canonicalizeMessage(content.thinking);
+				if (!canon) parts.push("K0");
 				else if (this.hideThinkingBlock) parts.push("KH");
 				else parts.push("KV");
 			} else {
@@ -267,7 +268,8 @@ export class AssistantMessageComponent extends Container {
 			for (const item of this.#fastPathItems) {
 				if (item.blockType === "thinking") {
 					const content = message.content[item.contentIndex];
-					if (content?.type === "thinking" && getVisibleThinkingText(content) !== item.lastText) return false;
+					if (content?.type === "thinking" && canonicalizeMessage(content.thinking) !== item.lastText)
+						return false;
 				}
 			}
 		}
@@ -291,13 +293,17 @@ export class AssistantMessageComponent extends Container {
 		for (const item of this.#fastPathItems) {
 			item.md.transientRenderCache = transient;
 			const content = message.content[item.contentIndex];
+			if (!content) {
+				this.#fastPathKey = undefined;
+				this.#fastPathItems = undefined;
+				return false;
+			}
 			let newText: string;
-			if (item.blockType === "text" && content?.type === "text") {
+			if (item.blockType === "text" && content.type === "text") {
 				newText = content.text.trim();
-			} else if (item.blockType === "thinking" && content?.type === "thinking") {
-				newText = getVisibleThinkingText(content);
+			} else if (item.blockType === "thinking" && content.type === "thinking") {
+				newText = canonicalizeMessage(content.thinking);
 			} else {
-				// Block at this index is gone or changed type (index shift) — fail closed.
 				this.#fastPathKey = undefined;
 				this.#fastPathItems = undefined;
 				return false;
@@ -329,24 +335,23 @@ export class AssistantMessageComponent extends Container {
 
 		const hasVisibleContent = message.content.some(
 			c =>
-				(c.type === "text" && c.text.trim()) ||
-				(!this.hideThinkingBlock && c.type === "thinking" && hasVisibleThinking(c)),
+				(c.type === "text" && canonicalizeMessage(c.text)) ||
+				(!this.hideThinkingBlock && c.type === "thinking" && canonicalizeMessage(c.thinking)),
 		);
 
 		// Render content in order
 		let thinkingIndex = 0;
 		for (let i = 0; i < message.content.length; i++) {
 			const content = message.content[i];
-			if (content.type === "text" && content.text.trim()) {
-				// Assistant text messages with no background - trim the text
+			if (content.type === "text" && canonicalizeMessage(content.text)) {
 				// Set paddingY=0 to avoid extra spacing before tool executions
 				const trimmed = content.text.trim();
 				const md = new Markdown(trimmed, 1, 0, getMarkdownTheme());
 				md.transientRenderCache = this.#lastUpdateTransient;
 				this.#contentContainer.addChild(md);
 				captureItems?.push({ md, contentIndex: i, blockType: "text", lastText: trimmed });
-			} else if (content.type === "thinking" && hasVisibleThinking(content)) {
-				const thinkingText = getVisibleThinkingText(content);
+			} else if (content.type === "thinking" && canonicalizeMessage(content.thinking)) {
+				const thinkingText = canonicalizeMessage(content.thinking);
 				if (this.hideThinkingBlock) {
 					thinkingIndex += 1;
 					continue;
@@ -355,7 +360,11 @@ export class AssistantMessageComponent extends Container {
 				// This avoids a superfluous blank line before separately-rendered tool execution blocks.
 				const hasVisibleContentAfter = message.content
 					.slice(i + 1)
-					.some(c => (c.type === "text" && c.text.trim()) || (c.type === "thinking" && hasVisibleThinking(c)));
+					.some(
+						c =>
+							(c.type === "text" && canonicalizeMessage(c.text)) ||
+							(c.type === "thinking" && canonicalizeMessage(c.thinking)),
+					);
 
 				// Thinking traces in thinkingText color, italic
 				const md = new Markdown(thinkingText, 1, 0, getMarkdownTheme(), {

package/src/modes/components/snapcompact-shape-preview-doc.md

@@ -1,8 +1,8 @@
 [User]: Fix the settings overlay crash. Wheeling past the last row throws.
 
-[Assistant tool calls]: read(path="src/select-list.ts:140-180")
+[Tool Call]: read(path="src/select-list.ts:140-180")
 
-[Tool result]: 162: const index = Math.floor(line / rowHeight); index is never checked against bounds.
+[Tool Result]: 162: const index = Math.floor(line / rowHeight); index is never checked against bounds.
 
 [Assistant]: Found it. The hit test indexes past the filtered list; clamping to the last row fixes the crash.
 

package/src/modes/components/snapcompact-shape-preview.ts

@@ -38,10 +38,10 @@ const ZOOM_SCALE = 4;
 const MAX_IMAGE_COLS = 28;
 const MAX_IMAGE_ROWS = 14;
 
-/** Sample transcript with `[Tool result]:` bodies wrapped in dim-ink toggles. */
+/** Sample transcript with `[Tool Result]:` bodies wrapped in dim-ink toggles. */
 const PREVIEW_TEXT = sampleDoc
 	.trim()
-	.replace(/\[Tool result\]: ([^[]*)/g, (_match, body: string) => `[Tool result]: ${DIM_ON}${body}${DIM_OFF}`);
+	.replace(/\[Tool Result\]: ([^[]*)/g, (_match, body: string) => `[Tool Result]: ${DIM_ON}${body}${DIM_OFF}`);
 
 type PreviewEntry =
 	| { state: "rendering" }

package/src/modes/components/tree-selector.ts

@@ -18,6 +18,7 @@ import { matchesAppInterrupt, matchesSelectDown, matchesSelectUp } from "../../m
 import type { SessionTreeNode } from "../../session/session-entries";
 import { shortenPath } from "../../tools/render-utils";
 import { toPathList } from "../../tools/search";
+import { canonicalizeMessage } from "../../utils/thinking-display";
 import { DynamicBorder } from "./dynamic-border";
 
 /** Gutter info: position (displayIndent where connector was) and whether to show │ */
@@ -702,12 +703,12 @@ class TreeList implements Component {
 	}
 
 	#hasTextContent(content: unknown): boolean {
-		if (typeof content === "string") return content.trim().length > 0;
+		if (typeof content === "string") return Boolean(canonicalizeMessage(content));
 		if (Array.isArray(content)) {
 			for (const c of content) {
 				if (typeof c === "object" && c !== null && "type" in c && c.type === "text") {
 					const text = (c as { text?: string }).text;
-					if (text && text.trim().length > 0) return true;
+					if (text && canonicalizeMessage(text)) return true;
 				}
 			}
 		}

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

@@ -22,7 +22,7 @@ import type { AgentSessionEvent } from "../../session/agent-session";
 import { isSilentAbort, readQueueChipText, resolveAbortLabel } from "../../session/messages";
 import type { ResolveToolDetails } from "../../tools/resolve";
 import { vocalizer } from "../../tts/vocalizer";
-import { hasVisibleThinking } from "../../utils/thinking-display";
+import { canonicalizeMessage } from "../../utils/thinking-display";
 import { interruptHint } from "../shared";
 import { StreamingRevealController } from "./streaming-reveal";
 import { ToolArgsRevealController } from "./tool-args-reveal";
@@ -480,8 +480,8 @@ export class EventController {
 
 			const visibleBlockCount = this.ctx.streamingMessage.content.filter(
 				content =>
-					(content.type === "text" && content.text.trim().length > 0) ||
-					(content.type === "thinking" && hasVisibleThinking(content)),
+					(content.type === "text" && canonicalizeMessage(content.text)) ||
+					(content.type === "thinking" && canonicalizeMessage(content.thinking)),
 			).length;
 			if (visibleBlockCount > this.#lastVisibleBlockCount) {
 				this.#resetReadGroup();

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

@@ -689,11 +689,17 @@ export class InputController {
 				this.ctx.pendingImages = [];
 				this.ctx.pendingImageLinks = [];
 
-				// Render user message immediately, then let session events catch up
+				// Render user message immediately, then let session events catch up.
+				// Tag the submission as "steer": this is a normal Enter the controller
+				// believed was idle, but a background turn can start in the gap before
+				// `submitInteractiveInput` dispatches it. Steering matches the
+				// streaming-branch Enter (above) and keeps the message from throwing
+				// AgentBusyError on that race.
 				const submission = this.ctx.startPendingSubmission({
 					text,
 					images,
 					imageLinks: inputImageLinks,
+					streamingBehavior: "steer",
 				});
 
 				this.ctx.onInputCallback(submission);

package/src/modes/controllers/streaming-reveal.ts

@@ -1,7 +1,7 @@
 import type { AssistantMessage } from "@oh-my-pi/pi-ai";
 import { getSegmenter } from "@oh-my-pi/pi-tui";
 import { LRUCache } from "lru-cache/raw";
-import { hasVisibleThinking } from "../../utils/thinking-display";
+import { canonicalizeMessage } from "../../utils/thinking-display";
 import type { AssistantMessageComponent } from "../components/assistant-message";
 
 export const STREAMING_REVEAL_FRAME_MS = 1000 / 30;
@@ -88,7 +88,7 @@ export function visibleUnits(message: AssistantMessage, hideThinking: boolean):
 	for (const block of message.content) {
 		if (block.type === "text") {
 			total += countGraphemes(block.text);
-		} else if (block.type === "thinking" && !hideThinking && hasVisibleThinking(block)) {
+		} else if (block.type === "thinking" && !hideThinking && canonicalizeMessage(block.thinking)) {
 			total += countGraphemes(block.thinking);
 		}
 	}
@@ -129,7 +129,7 @@ export function buildDisplayMessage(
 			const units = countOf(i, block.text);
 			content.push(revealTextBlock(block, remaining, units));
 			remaining = Math.max(0, remaining - units);
-		} else if (block.type === "thinking" && !hideThinking && hasVisibleThinking(block)) {
+		} else if (block.type === "thinking" && !hideThinking && canonicalizeMessage(block.thinking)) {
 			const units = countOf(i, block.thinking);
 			content.push(revealThinkingBlock(block, remaining, units));
 			remaining = Math.max(0, remaining - units);
@@ -231,7 +231,7 @@ export class StreamingRevealController {
 			const block = message.content[i]!;
 			if (block.type === "text") {
 				total += this.#unitCounter.count(i, block.text);
-			} else if (block.type === "thinking" && !this.#hideThinkingBlock && hasVisibleThinking(block)) {
+			} else if (block.type === "thinking" && !this.#hideThinkingBlock && canonicalizeMessage(block.thinking)) {
 				total += this.#unitCounter.count(i, block.thinking);
 			}
 		}

package/src/modes/interactive-mode.ts

@@ -1123,6 +1123,7 @@ export class InteractiveMode implements InteractiveModeContext {
 		imageLinks?: (string | undefined)[];
 		customType?: string;
 		display?: boolean;
+		streamingBehavior?: "steer" | "followUp";
 	}): SubmittedUserInput {
 		const submission: SubmittedUserInput = {
 			text: input.text,
@@ -1130,6 +1131,7 @@ export class InteractiveMode implements InteractiveModeContext {
 			imageLinks: input.imageLinks,
 			customType: input.customType,
 			display: input.display,
+			streamingBehavior: input.streamingBehavior,
 			cancelled: false,
 			started: false,
 		};

package/src/modes/types.ts

@@ -54,6 +54,11 @@ export type SubmittedUserInput = {
 	 *  turn. Used by the `c`/`.` continue shortcut. */
 	synthetic?: boolean;
 	display?: boolean;
+	/** Queue intent if the session is (or becomes) busy when this submission is
+	 *  dispatched: "steer" (interrupt the active turn) or "followUp" (process after
+	 *  it). Normal user Enter carries "steer" to match the streaming-branch Enter;
+	 *  background/continuation submits omit it and default to "followUp". */
+	streamingBehavior?: "steer" | "followUp";
 	cancelled: boolean;
 	started: boolean;
 };
@@ -222,6 +227,7 @@ export interface InteractiveModeContext {
 		imageLinks?: (string | undefined)[];
 		customType?: string;
 		display?: boolean;
+		streamingBehavior?: "steer" | "followUp";
 	}): SubmittedUserInput;
 	cancelPendingSubmission(): boolean;
 	markPendingSubmissionStarted(input: SubmittedUserInput): boolean;

package/src/modes/utils/ui-helpers.ts

@@ -45,7 +45,7 @@ import {
 import type { SessionContext } from "../../session/session-context";
 import { createIrcMessageCard } from "../../tools/irc";
 import { formatBytes, formatDuration } from "../../tools/render-utils";
-import { hasVisibleThinking } from "../../utils/thinking-display";
+import { canonicalizeMessage } from "../../utils/thinking-display";
 
 type TextBlock = { type: "text"; text: string };
 interface RenderInitialMessagesOptions {
@@ -399,8 +399,8 @@ export class UiHelpers {
 				const assistantComponent = lastChild instanceof AssistantMessageComponent ? lastChild : undefined;
 				const hasVisibleAssistantContent = message.content.some(
 					content =>
-						(content.type === "text" && content.text.trim().length > 0) ||
-						(content.type === "thinking" && hasVisibleThinking(content)),
+						(content.type === "text" && canonicalizeMessage(content.text)) ||
+						(content.type === "thinking" && canonicalizeMessage(content.thinking)),
 				);
 				if (hasVisibleAssistantContent) {
 					// Rebuild reconstructs immutable history; seal (not finalize) so the

package/src/prompts/agents/oracle.md

@@ -4,7 +4,6 @@ description: Wise senior engineer to consult or delegate work to — debugging,
 spawns: explore
 model: pi/slow
 thinking-level: xhigh
-blocking: true
 ---
 
 You are the wise guy on the team — a senior engineer with deep judgment that other agents consult when they are stuck, uncertain, or need a second opinion. You also take direct delegation: if the caller hands you work, you do it, including reads, writes, edits, and running commands.

package/src/prompts/agents/reviewer.md

@@ -5,7 +5,6 @@ tools: read, search, find, bash, lsp, web_search, ast_grep, report_finding
 spawns: explore
 model: pi/slow
 thinking-level: high
-blocking: true
 output:
   properties:
     overall_correctness:

package/src/prompts/system/unexpected-stop-classifier.md

@@ -0,0 +1,17 @@
+You are checking whether an assistant message is an unexpected stop. A message is an unexpected stop if the assistant says it will take an action, continue working, or call a tool, but then ends without actually doing so.
+
+Examples of unexpected stops:
+- "I should do the same for the JS eval worker. Doing that now."
+- "Let me run the tests next."
+- "I'll fix that now."
+- "Should I do that for you?"
+
+Not an unexpected stop:
+- "I've completed the task."
+- "Is there anything else I can help with?"
+- "The fix is done and tests pass."
+
+Message:
+{{message}}
+
+Answer with a single word: YES if this is an unexpected stop, NO otherwise.

package/src/prompts/system/unexpected-stop-retry.md

@@ -0,0 +1,4 @@
+<system-injection>
+You said you would continue with a tool call or action but stopped. Continue now.
+Attempt #{{retryCount}}/{{maxRetries}}
+</system-injection>