@oh-my-pi/pi-coding-agent 15.10.4 → 15.10.6

package/src/internal-urls/local-protocol.ts

@@ -133,6 +133,19 @@ export function resolveLocalUrlToPath(input: string | InternalUrl, options: Loca
 	return resolved;
 }
 
+/**
+ * On-disk roots the eval helpers (`read`/`write`/`append`) substitute for
+ * internal-URL schemes so e.g. `write("local://x.md")` lands where a later
+ * `read local://x.md` resolves — instead of a literal `local:/` directory under
+ * the cwd (a stdlib `pathlib.Path`/`path.resolve` collapses `local://` to
+ * `local:/`). Keyed by scheme without the `://`. Currently only `local`, but the
+ * shape is a map so additional file-backed schemes can be added without
+ * re-plumbing the worker boundary.
+ */
+export function buildEvalUrlRoots(options: LocalProtocolOptions): Record<string, string> {
+	return { local: resolveLocalRoot(options) };
+}
+
 /**
  * Protocol handler for local:// URLs.
  *

package/src/lsp/render.ts

@@ -166,15 +166,17 @@ export function renderResult(
 			} else if (result.details?.action === "diagnostics" && text === "OK") {
 				label = "Diagnostics";
 				state = "success";
-				bodyLines = [`${theme.styledSymbol("status.success", "success")} ${theme.fg("dim", "OK")}`];
+				bodyLines = [`${theme.styledSymbol("tool.lsp", "accent")} ${theme.fg("dim", "OK")}`];
 			} else {
 				label = "Response";
 				bodyLines = renderGeneric(text, lines, expanded, theme);
 			}
 
 			const actionLabel = (request?.action ?? result.details?.action ?? label.toLowerCase()).replace(/_/g, " ");
-			const status = isPartial ? "running" : result.isError ? "error" : "success";
-			const icon = formatStatusIcon(status, theme, spinnerFrame);
+			const isSuccess = !isPartial && !result.isError;
+			const icon = isSuccess
+				? theme.styledSymbol("tool.lsp", "accent")
+				: formatStatusIcon(isPartial ? "running" : "error", theme, spinnerFrame);
 			const header = `${icon} LSP ${actionLabel}`;
 
 			return outputBlock.render(
@@ -325,7 +327,7 @@ function renderDiagnostics(
 			? theme.styledSymbol("status.error", "error")
 			: warnCount > 0
 				? theme.styledSymbol("status.warning", "warning")
-				: theme.styledSymbol("status.success", "success");
+				: theme.styledSymbol("tool.lsp", "accent");
 
 	const meta: string[] = [];
 	if (errorCount > 0) meta.push(`${errorCount} error${errorCount !== 1 ? "s" : ""}`);
@@ -407,7 +409,7 @@ function renderDiagnostics(
 function renderReferences(refMatch: RegExpMatchArray, lines: string[], expanded: boolean, theme: Theme): string[] {
 	const refCount = Number.parseInt(refMatch[1], 10);
 	const icon =
-		refCount > 0 ? theme.styledSymbol("status.success", "success") : theme.styledSymbol("status.warning", "warning");
+		refCount > 0 ? theme.styledSymbol("tool.lsp", "accent") : theme.styledSymbol("status.warning", "warning");
 
 	const locLines = lines.filter(l => /^\s*\S+:\d+:\d+/.test(l));
 
@@ -598,7 +600,7 @@ function renderGeneric(text: string, lines: string[], expanded: boolean, theme:
 		hasError && !hasSuccess
 			? theme.styledSymbol("status.error", "error")
 			: hasSuccess && !hasError
-				? theme.styledSymbol("status.success", "success")
+				? theme.styledSymbol("tool.lsp", "accent")
 				: theme.styledSymbol("status.info", "accent");
 
 	if (expanded) {

package/src/mcp/oauth-flow.ts

@@ -5,9 +5,9 @@
  * by providing authorization URL, token URL, and client credentials.
  */
 
-import type { OAuthCallbackFlowOptions } from "@oh-my-pi/pi-ai/utils/oauth/callback-server";
-import { OAuthCallbackFlow } from "@oh-my-pi/pi-ai/utils/oauth/callback-server";
-import type { OAuthController, OAuthCredentials } from "@oh-my-pi/pi-ai/utils/oauth/types";
+import type { OAuthCallbackFlowOptions } from "@oh-my-pi/pi-ai/oauth/callback-server";
+import { OAuthCallbackFlow } from "@oh-my-pi/pi-ai/oauth/callback-server";
+import type { OAuthController, OAuthCredentials } from "@oh-my-pi/pi-ai/oauth/types";
 
 const DEFAULT_PORT = 3000;
 const CALLBACK_PATH = "/callback";

package/src/mcp/render.ts

@@ -53,7 +53,13 @@ export function renderMCPResult(
 	const lines: string[] = [];
 	const isError = result.isError ?? result.details?.isError ?? false;
 	const title = result.details ? `${result.details.serverName}/${result.details.mcpToolName}` : "MCP";
-	lines.push(renderStatusLine({ icon: isError ? "error" : "success", title }, theme));
+	const success = !isError;
+	lines.push(
+		renderStatusLine(
+			success ? { iconOverride: theme.styledSymbol("tool.mcp", "accent"), title } : { icon: "error", title },
+			theme,
+		),
+	);
 
 	// Args section (when expanded)
 	if (expanded && args && typeof args === "object" && Object.keys(args).length > 0) {

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

@@ -649,6 +649,11 @@ export class AgentDashboard extends Container {
 		this.#buildLayout();
 	}
 
+	#shouldSubmitCreateDescription(data: string): boolean {
+		if (matchesKey(data, "ctrl+enter")) return true;
+		return process.platform === "win32" && data === "\n" && this.#createDescription.trim().length > 0;
+	}
+
 	async #generateAgentFromDescription(rawDescription: string): Promise<void> {
 		const description = rawDescription.trim();
 		this.#createDescription = description;
@@ -1094,10 +1099,7 @@ export class AgentDashboard extends Container {
 				}
 				return;
 			}
-			if (
-				!this.#createGenerating &&
-				(matchesKey(data, "ctrl+enter") || (data.charCodeAt(0) === 10 && data.length > 1))
-			) {
+			if (!this.#createGenerating && this.#shouldSubmitCreateDescription(data)) {
 				this.#submitCreateDescription();
 				return;
 			}

package/src/modes/components/custom-editor.ts

@@ -1,6 +1,6 @@
 import { addKeyAliases, canonicalKeyId, Editor, type KeyId, parseKey, parseKittySequence } from "@oh-my-pi/pi-tui";
 import type { AppKeybinding } from "../../config/keybindings";
-import { imageReferenceHyperlink, renderImageReferences } from "../image-references";
+import { imageReferenceHyperlink, PLACEHOLDER_REGEX, renderPlaceholders } from "../image-references";
 import { highlightMagicKeywords } from "../magic-keywords";
 import { theme } from "../theme/theme";
 
@@ -76,16 +76,22 @@ export function extractBracketedImagePastePath(data: string): string | undefined
 export class CustomEditor extends Editor {
 	imageLinks?: readonly (string | undefined)[];
 
+	/** Treat image/paste markers as indivisible: a stray backspace deletes the whole token
+	 *  instead of corrupting `[Paste #1, +30 lines]` into plain text. */
+	override atomicTokenPattern = PLACEHOLDER_REGEX;
+
 	/** Gradient-highlight the "ultrathink" / "orchestrate" / "workflowz" keywords as the user types
 	 *  them, skipping any occurrence inside code spans, fenced blocks, or XML sections. Also make
 	 *  pasted image placeholders visually distinct and hyperlink them once their blob file exists. */
 	decorateText = (text: string): string =>
-		renderImageReferences(text, {
+		renderPlaceholders(text, {
 			renderText: value => highlightMagicKeywords(value),
-			renderReference: (value, index) =>
-				imageReferenceHyperlink(value, index, this.imageLinks, label =>
-					theme.fg("accent", `\x1b[1m\x1b[4m${label}\x1b[24m\x1b[22m`),
-				),
+			renderReference: (value, kind, index) =>
+				kind === "image"
+					? imageReferenceHyperlink(value, index, this.imageLinks, label =>
+							theme.fg("accent", `\x1b[1m\x1b[4m${label}\x1b[24m\x1b[22m`),
+						)
+					: theme.fg("accent", `\x1b[1m${value}\x1b[22m`),
 		});
 	onEscape?: () => void;
 	onClear?: () => void;

package/src/modes/components/login-dialog.ts

@@ -1,4 +1,4 @@
-import { getOAuthProviders } from "@oh-my-pi/pi-ai/utils/oauth";
+import { getOAuthProviders } from "@oh-my-pi/pi-ai/oauth";
 import { Container, getKeybindings, Input, Spacer, Text, type TUI } from "@oh-my-pi/pi-tui";
 import { theme } from "../../modes/theme/theme";
 import { openPath } from "../../utils/open";

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

@@ -1,5 +1,5 @@
-import { getOAuthProviders } from "@oh-my-pi/pi-ai/utils/oauth";
-import type { OAuthProviderInfo } from "@oh-my-pi/pi-ai/utils/oauth/types";
+import { getOAuthProviders } from "@oh-my-pi/pi-ai/oauth";
+import type { OAuthProviderInfo } from "@oh-my-pi/pi-ai/oauth/types";
 import {
 	Container,
 	extractPrintableText,
@@ -179,10 +179,10 @@ export class OAuthSelectorComponent extends Container {
 			return theme.fg("error", ` ${theme.status.error} invalid`) + source;
 		}
 		if (state === "valid") {
-			return theme.fg("success", ` ${theme.status.success} logged in`) + source;
+			return theme.fg("success", ` ${theme.status.enabled} logged in`) + source;
 		}
 		return this.#hasSelectableAuth(providerId)
-			? theme.fg("success", ` ${theme.status.success} logged in`) + source
+			? theme.fg("success", ` ${theme.status.enabled} logged in`) + source
 			: "";
 	}
 

package/src/modes/components/read-tool-group.ts

@@ -54,6 +54,10 @@ type ReadToolResultDetails = {
 	};
 	conflictCount?: number;
 	displayReadTargets?: unknown;
+	displayContent?: {
+		text?: string;
+		startLine?: number;
+	};
 	meta?: {
 		source?: {
 			type?: string;
@@ -373,10 +377,13 @@ export class ReadToolGroupComponent extends Container implements ToolExecutionHa
 			typeof details?.conflictCount === "number" && details.conflictCount > 0 ? details.conflictCount : undefined;
 		entry.conflictCount = conflictCount;
 		entry.status = result.isError ? "error" : suffixResolution ? "warning" : "success";
-		// Store the text content for preview/expanded display
+		// Store clean display content for preview/expanded display when the read
+		// tool provides it; fall back to model-facing text for legacy results.
+		const displayContent =
+			typeof details?.displayContent?.text === "string" ? details.displayContent.text : undefined;
 		const textContent = result.content?.find(c => c.type === "text")?.text;
-		if (textContent !== undefined) {
-			entry.contentText = textContent;
+		if (displayContent !== undefined || textContent !== undefined) {
+			entry.contentText = displayContent ?? textContent;
 		}
 		this.#updateDisplay();
 	}

package/src/modes/components/{status-line.ts → status-line/component.ts}

@@ -4,46 +4,24 @@ import { estimateTokens } from "@oh-my-pi/pi-agent-core/compaction";
 import { type Component, truncateToWidth, visibleWidth } from "@oh-my-pi/pi-tui";
 import { formatCount, getProjectDir } from "@oh-my-pi/pi-utils";
 import { $ } from "bun";
-import { settings } from "../../config/settings";
-import type { StatusLinePreset, StatusLineSegmentId, StatusLineSeparatorStyle } from "../../config/settings-schema";
-import { theme } from "../../modes/theme/theme";
-import type { AgentSession } from "../../session/agent-session";
-import * as git from "../../utils/git";
-import { getSessionAccentAnsi, getSessionAccentHex } from "../../utils/session-color";
-import { sanitizeStatusText } from "../shared";
-import { computeNonMessageTokens } from "../utils/context-usage";
-import {
-	canReuseCachedPr,
-	createPrCacheContext,
-	isSamePrCacheContext,
-	type PrCacheContext,
-} from "./status-line/git-utils";
-import { getPreset } from "./status-line/presets";
-import { renderSegment, type SegmentContext } from "./status-line/segments";
-import { getSeparator } from "./status-line/separators";
-import { calculateTokensPerSecond } from "./status-line/token-rate";
-
-export interface StatusLineSegmentOptions {
-	model?: { showThinkingLevel?: boolean };
-	path?: { abbreviate?: boolean; maxLength?: number; stripWorkPrefix?: boolean };
-	git?: { showBranch?: boolean; showStaged?: boolean; showUnstaged?: boolean; showUntracked?: boolean };
-	time?: { format?: "12h" | "24h"; showSeconds?: boolean };
-}
-
-export interface StatusLineSettings {
-	preset?: StatusLinePreset;
-	leftSegments?: StatusLineSegmentId[];
-	rightSegments?: StatusLineSegmentId[];
-	separator?: StatusLineSeparatorStyle;
-	segmentOptions?: StatusLineSegmentOptions;
-	showHookStatus?: boolean;
-	sessionAccent?: boolean;
-}
-
-export type EffectiveStatusLineSettings = Required<
-	Pick<StatusLineSettings, "leftSegments" | "rightSegments" | "separator" | "segmentOptions">
-> &
-	StatusLineSettings;
+import { settings } from "../../../config/settings";
+import type { AgentSession } from "../../../session/agent-session";
+import * as git from "../../../utils/git";
+import { getSessionAccentAnsi, getSessionAccentHex } from "../../../utils/session-color";
+import { sanitizeStatusText } from "../../shared";
+import { theme } from "../../theme/theme";
+import { computeNonMessageTokens } from "../../utils/context-usage";
+import { canReuseCachedPr, createPrCacheContext, isSamePrCacheContext, type PrCacheContext } from "./git-utils";
+import { getPreset } from "./presets";
+import { renderSegment, type SegmentContext } from "./segments";
+import { getSeparator } from "./separators";
+import { calculateTokensPerSecond } from "./token-rate";
+import type {
+	EffectiveStatusLineSettings,
+	StatusLineSegmentId,
+	StatusLineSegmentOptions,
+	StatusLineSettings,
+} from "./types";
 
 // ═══════════════════════════════════════════════════════════════════════════
 // Per-message token cache

package/src/modes/components/status-line/index.ts

@@ -1,3 +1,4 @@
+export * from "./component";
 export * from "./presets";
 export * from "./segments";
 export * from "./separators";

package/src/modes/components/status-line/types.ts

@@ -1,14 +1,29 @@
 import type { StatusLinePreset, StatusLineSegmentId, StatusLineSeparatorStyle } from "../../../config/settings-schema";
 import type { AgentSession } from "../../../session/agent-session";
-import type { StatusLineSegmentOptions, StatusLineSettings } from "../status-line";
 
-export type {
-	StatusLinePreset,
-	StatusLineSegmentId,
-	StatusLineSegmentOptions,
-	StatusLineSeparatorStyle,
-	StatusLineSettings,
-};
+export type { StatusLinePreset, StatusLineSegmentId, StatusLineSeparatorStyle };
+
+export interface StatusLineSegmentOptions {
+	model?: { showThinkingLevel?: boolean };
+	path?: { abbreviate?: boolean; maxLength?: number; stripWorkPrefix?: boolean };
+	git?: { showBranch?: boolean; showStaged?: boolean; showUnstaged?: boolean; showUntracked?: boolean };
+	time?: { format?: "12h" | "24h"; showSeconds?: boolean };
+}
+
+export interface StatusLineSettings {
+	preset?: StatusLinePreset;
+	leftSegments?: StatusLineSegmentId[];
+	rightSegments?: StatusLineSegmentId[];
+	separator?: StatusLineSeparatorStyle;
+	segmentOptions?: StatusLineSegmentOptions;
+	showHookStatus?: boolean;
+	sessionAccent?: boolean;
+}
+
+export type EffectiveStatusLineSettings = Required<
+	Pick<StatusLineSettings, "leftSegments" | "rightSegments" | "separator" | "segmentOptions">
+> &
+	StatusLineSettings;
 
 // ═══════════════════════════════════════════════════════════════════════════
 // Segment Rendering

package/src/modes/components/tool-execution.ts

@@ -914,7 +914,7 @@ export class ToolExecutionComponent extends Container {
 	 */
 	#formatToolExecution(): string {
 		const lines: string[] = [];
-		const icon = this.#isPartial ? "pending" : this.#result?.isError ? "error" : "success";
+		const icon = this.#isPartial ? "pending" : this.#result?.isError ? "error" : "done";
 		lines.push(renderStatusLine({ icon, title: this.#toolLabel }, theme));
 
 		const argsObject = this.#args && typeof this.#args === "object" ? (this.#args as Record<string, unknown>) : null;

package/src/modes/components/transcript-container.ts

@@ -71,9 +71,7 @@ function commonPrefixLength(prev: string[], cur: string[]): number {
 }
 
 function commonSuffixLength(prev: string[], cur: string[], prefixLength: number): number {
-	const prevLimit = prev.length - prefixLength;
-	const curLimit = cur.length - prefixLength;
-	const limit = Math.min(prevLimit, curLimit);
+	const limit = Math.min(prev.length - prefixLength, cur.length - prefixLength);
 	let i = 0;
 	while (i < limit && prev[prev.length - 1 - i] === cur[cur.length - 1 - i]) i++;
 	return i;
@@ -95,14 +93,23 @@ function deriveLiveCommitState(
 		const staticRender = prefixLength === previous.lines.length && prefixLength === current.length;
 		if (!staticRender) {
 			const suffixLength = commonSuffixLength(previous.lines, current, prefixLength);
-			const stablePreviousLength = prefixLength + suffixLength;
-			const appendGrew =
-				previous.lines.length > 0 &&
-				current.length > previous.lines.length &&
-				stablePreviousLength >= previous.lines.length;
-			if (appendGrew && !volatile) {
+			// Append-only growth never rewrites a row that may already have scrolled
+			// into native scrollback; it only grows the block at/near its tail. Three
+			// shapes qualify: a pure bottom append, an insertion above stable trailing
+			// chrome (a streaming tool's footer/border), and an in-place extension of
+			// the current line by one streamed token (line count unchanged). The first
+			// two preserve every previous row across a matching prefix + suffix; the
+			// last leaves a single divergent previous row that the current row merely
+			// lengthens. A divergent interior row that is genuinely rewritten means the
+			// block re-laid-out committed content — volatile, and never committed.
+			const preservedEveryRow = prefixLength + suffixLength >= previous.lines.length;
+			const tailExtendedInPlace =
+				prefixLength + suffixLength === previous.lines.length - 1 &&
+				prefixLength < current.length &&
+				current[prefixLength]!.startsWith(previous.lines[prefixLength]!);
+			if ((preservedEveryRow || tailExtendedInPlace) && current.length >= previous.lines.length && !volatile) {
 				appendOnly = true;
-			} else if (stablePreviousLength < previous.lines.length) {
+			} else if (!preservedEveryRow && !tailExtendedInPlace) {
 				volatile = true;
 				appendOnly = false;
 			}

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

@@ -1,6 +1,6 @@
 import { Container, Markdown } from "@oh-my-pi/pi-tui";
 import { getMarkdownTheme, theme } from "../../modes/theme/theme";
-import { imageReferenceHyperlink, renderImageReferences } from "../image-references";
+import { imageReferenceHyperlink, renderPlaceholders } from "../image-references";
 import { highlightMagicKeywords } from "../magic-keywords";
 
 // OSC 133 shell integration: marks prompt zones for terminal multiplexers
@@ -26,9 +26,12 @@ export class UserMessageComponent extends Container {
 			: (value: string) => theme.fg("userMessageText", highlightMagicKeywords(value, keywordReset));
 		const imageLabel = (value: string) => theme.fg("accent", `\x1b[1m\x1b[4m${value}\x1b[24m\x1b[22m`);
 		const color = (value: string) =>
-			renderImageReferences(value, {
+			renderPlaceholders(value, {
 				renderText: baseText,
-				renderReference: (label, index) => imageReferenceHyperlink(label, index, imageLinks, imageLabel),
+				renderReference: (label, kind, index) =>
+					kind === "image"
+						? imageReferenceHyperlink(label, index, imageLinks, imageLabel)
+						: theme.fg("accent", `\x1b[1m${label}\x1b[22m`),
 			});
 		this.addChild(
 			new Markdown(text, 1, 1, getMarkdownTheme(), {

package/src/modes/components/welcome.ts

@@ -185,7 +185,7 @@ export class WelcomeComponent implements Component {
 			for (const server of this.lspServers) {
 				const icon =
 					server.status === "ready"
-						? theme.styledSymbol("status.success", "success")
+						? theme.styledSymbol("status.enabled", "success")
 						: server.status === "connecting"
 							? theme.styledSymbol("status.pending", "muted")
 							: theme.styledSymbol("status.error", "error");

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

@@ -798,7 +798,15 @@ export class EventController {
 			);
 		} else if (isShakeAction) {
 			// Shake produces no CompactionResult; rebuild on success, suppress benign skips.
+			// The fallback path (`errorMessage` set, `skipped` false) means shake reclaimed
+			// some tokens before deciding the threshold still wasn't cleared — rebuild so
+			// the chat reflects the dropped regions even though a context-full pass follows.
 			if (event.errorMessage) {
+				if (!event.skipped) {
+					this.ctx.rebuildChatFromMessages();
+					this.ctx.statusLine.invalidate();
+					this.ctx.updateEditorTopBorder();
+				}
 				this.ctx.showWarning(event.errorMessage);
 			} else if (!event.skipped) {
 				this.ctx.rebuildChatFromMessages();