@oh-my-pi/pi-coding-agent 17.1.2 → 17.1.4

package/src/tools/computer/worker-entry.ts

@@ -1,25 +1,34 @@
 import { parentPort } from "node:worker_threads";
-import { consumeWorkerInbox } from "@oh-my-pi/pi-utils/worker-host";
+import { consumeWorkerInbox, isWorkerHostSelector } from "@oh-my-pi/pi-utils/worker-host";
 import type { ComputerWorkerInbound, ComputerWorkerTransport } from "./protocol";
 import { ComputerWorkerCore } from "./worker";
 
-if (!parentPort) throw new Error("computer-worker-entry: missing parentPort");
+export function startComputerWorker(): void {
+	if (!parentPort) throw new Error("computer-worker-entry: missing parentPort");
 
-const port = parentPort;
-const inbox = consumeWorkerInbox();
-const transport: ComputerWorkerTransport = {
-	send(message, transfer) {
-		port.postMessage(message, transfer ?? []);
-	},
-	onMessage(handler) {
-		if (inbox) return inbox.bind(message => handler(message as ComputerWorkerInbound));
-		const listener = (message: unknown): void => handler(message as ComputerWorkerInbound);
-		port.on("message", listener);
-		return () => port.off("message", listener);
-	},
-	close() {
-		port.close();
-	},
-};
+	const port = parentPort;
+	const inbox = consumeWorkerInbox();
+	const transport: ComputerWorkerTransport = {
+		send(message, transfer) {
+			port.postMessage(message, transfer ?? []);
+		},
+		onMessage(handler) {
+			if (inbox) return inbox.bind(message => handler(message as ComputerWorkerInbound));
+			const listener = (message: unknown): void => handler(message as ComputerWorkerInbound);
+			port.on("message", listener);
+			return () => port.off("message", listener);
+		},
+		close() {
+			port.close();
+		},
+	};
 
-new ComputerWorkerCore(transport);
+	new ComputerWorkerCore(transport);
+}
+
+// Bun workers report `import.meta.main === false`. The source fallback still
+// enters this file directly, while packaged CLI workers carry the selector and
+// start the named entry only after installing its inbox.
+if (!Bun.isMainThread && !process.argv.some(isWorkerHostSelector) && import.meta.path === Bun.main) {
+	startComputerWorker();
+}

package/src/tools/computer/worker.ts

@@ -1,9 +1,5 @@
-import {
-	type DesktopAction,
-	type DesktopCapture,
-	DesktopSession,
-	type DesktopSessionOptions,
-} from "@oh-my-pi/pi-natives";
+import type { DesktopAction, DesktopCapture, DesktopSession, DesktopSessionOptions } from "@oh-my-pi/pi-natives";
+import { createDesktopSession } from "@oh-my-pi/pi-natives/desktop";
 import type { ComputerWorkerError, ComputerWorkerInbound, ComputerWorkerTransport } from "./protocol";
 
 export interface NativeDesktopSession {
@@ -44,7 +40,7 @@ export class ComputerWorkerCore {
 
 	constructor(
 		private readonly transport: ComputerWorkerTransport,
-		private readonly createSession: NativeDesktopSessionFactory = options => new DesktopSession(options),
+		private readonly createSession: NativeDesktopSessionFactory = createDesktopSession,
 	) {
 		this.#unsubscribe = transport.onMessage(message => this.#onMessage(message));
 	}

package/src/tools/computer.ts

@@ -5,7 +5,8 @@ import type {
 	AgentToolUpdateCallback,
 	ToolApprovalDecision,
 } from "@oh-my-pi/pi-agent-core";
-import type { ComputerAction, ComputerSafetyCheck, ComputerToolCallMetadata } from "@oh-my-pi/pi-ai";
+import type { ComputerAction, ComputerSafetyCheck, ComputerToolCallMetadata, Model } from "@oh-my-pi/pi-ai";
+import { isClaudeModelId } from "@oh-my-pi/pi-catalog/identity";
 import type {
 	DesktopAction,
 	DesktopCapabilities,
@@ -21,6 +22,36 @@ import { type ComputerController, ComputerSupervisor, registerComputerController
 import type { ToolSession } from "./index";
 import { ToolError, throwIfAborted } from "./tool-errors";
 
+// Image transports that cannot preserve native screenshot detail resize frames
+// without returning transformed dimensions. Keep their native coordinate frames
+// below the empirically verified threshold so pointer actions match what the
+// model sees. Claude paths predate the resolved transport capability and retain
+// their established model-family fallback.
+const COORDINATE_SAFE_MAX_CAPTURE_WIDTH = 1280;
+const COORDINATE_SAFE_MAX_CAPTURE_HEIGHT = 896;
+
+function usesCoordinateSafeImageSizing(model: Model | undefined): boolean {
+	if (!model) return false;
+	const compat = model.compat;
+	return (
+		(!!compat && "supportsImageDetailOriginal" in compat && compat.supportsImageDetailOriginal === false) ||
+		isClaudeModelId(model.id) ||
+		(model.requestModelId !== undefined && isClaudeModelId(model.requestModelId)) ||
+		(typeof model.name === "string" && /^claude(?:\s|$)/i.test(model.name))
+	);
+}
+
+function captureOptions(session: ToolSession, coordinateSafeImageSizing: boolean): DesktopSessionOptions {
+	const maxWidth = session.settings.get("computer.maxWidth");
+	const maxHeight = session.settings.get("computer.maxHeight");
+	return {
+		backend: session.settings.get("computer.backend"),
+		display: session.settings.get("computer.display"),
+		maxWidth: coordinateSafeImageSizing ? Math.min(maxWidth, COORDINATE_SAFE_MAX_CAPTURE_WIDTH) : maxWidth,
+		maxHeight: coordinateSafeImageSizing ? Math.min(maxHeight, COORDINATE_SAFE_MAX_CAPTURE_HEIGHT) : maxHeight,
+	};
+}
+
 // Desktop actions cross the N-API boundary as i32; out-of-range JS numbers
 // must fail closed here instead of truncating in the napi conversion.
 const INT32_MIN = -2_147_483_648;
@@ -230,7 +261,7 @@ function isComputerAction(value: unknown): value is ComputerAction {
 function parseActions(value: unknown): ComputerAction[] {
 	// Missing or empty action batches degrade to a plain screenshot so a
 	// function-calling model can observe the screen before acting.
-	if (value === undefined) return [{ type: "screenshot" }];
+	if (value == null) return [{ type: "screenshot" }];
 	if (!Array.isArray(value)) throw new ToolError("Computer call requires an array of actions");
 	if (value.length === 0) return [{ type: "screenshot" }];
 	if (!value.every(isComputerAction)) throw new ToolError("Computer call contains an invalid action");
@@ -286,6 +317,7 @@ function callMetadata(context: AgentToolContext | undefined): ComputerToolCallMe
 export function computerApproval(args: unknown): ToolApprovalDecision {
 	const actions =
 		args && typeof args === "object" && "actions" in args ? (args as { actions?: unknown }).actions : undefined;
+	if (actions == null) return "read";
 	if (!Array.isArray(actions)) return "exec";
 	return actions.every(action => {
 		if (!action || typeof action !== "object") return false;
@@ -356,8 +388,16 @@ export class ComputerTool implements AgentTool<typeof computerSchema, ComputerTo
 		const actions = args && typeof args === "object" ? (args as { actions?: unknown }).actions : undefined;
 		return approvalActionSummary(actions);
 	};
-	readonly #controller: ComputerController;
-	readonly #unregisterOwner: () => void;
+	/**
+	 * Settings snapshot used to create the tool's current controller; refreshed
+	 * when a model switch crosses the coordinate-safe sizing boundary. Surfaced
+	 * by `/computer status`.
+	 */
+	effectiveConfiguration: Readonly<DesktopSessionOptions>;
+	readonly #createController: ComputerControllerFactory;
+	#controller: ComputerController;
+	#unregisterOwner: () => void;
+	#usesCoordinateSafeImageSizing: boolean;
 	#closed = false;
 	#description?: string;
 
@@ -365,12 +405,10 @@ export class ComputerTool implements AgentTool<typeof computerSchema, ComputerTo
 		readonly session: ToolSession,
 		createController: ComputerControllerFactory = options => new ComputerSupervisor(options),
 	) {
-		this.#controller = createController({
-			backend: session.settings.get("computer.backend"),
-			display: session.settings.get("computer.display"),
-			maxWidth: session.settings.get("computer.maxWidth"),
-			maxHeight: session.settings.get("computer.maxHeight"),
-		});
+		this.#createController = createController;
+		this.#usesCoordinateSafeImageSizing = usesCoordinateSafeImageSizing(session.getActiveModel?.());
+		this.effectiveConfiguration = Object.freeze(captureOptions(session, this.#usesCoordinateSafeImageSizing));
+		this.#controller = createController(this.effectiveConfiguration);
 		this.#unregisterOwner = registerComputerController(
 			session.getEvalKernelOwnerId?.() ?? undefined,
 			this.#controller,
@@ -381,6 +419,21 @@ export class ComputerTool implements AgentTool<typeof computerSchema, ComputerTo
 		return this.#description;
 	}
 
+	async #refreshControllerForModel(): Promise<void> {
+		const nextUsesCoordinateSafeImageSizing = usesCoordinateSafeImageSizing(this.session.getActiveModel?.());
+		if (nextUsesCoordinateSafeImageSizing === this.#usesCoordinateSafeImageSizing) return;
+
+		const previous = this.#controller;
+		const nextOptions = Object.freeze(captureOptions(this.session, nextUsesCoordinateSafeImageSizing));
+		const next = this.#createController(nextOptions);
+		this.#unregisterOwner();
+		this.#controller = next;
+		this.#unregisterOwner = registerComputerController(this.session.getEvalKernelOwnerId?.() ?? undefined, next);
+		this.#usesCoordinateSafeImageSizing = nextUsesCoordinateSafeImageSizing;
+		this.effectiveConfiguration = nextOptions;
+		await previous.close();
+	}
+
 	async execute(
 		_toolCallId: string,
 		params: ComputerParams,
@@ -396,6 +449,8 @@ export class ComputerTool implements AgentTool<typeof computerSchema, ComputerTo
 		if (pendingSafetyChecks.length > 0 && context?.providerSafetyApproved !== true) {
 			throw new ToolError("Provider safety checks require interactive approval before computer input");
 		}
+		await this.#refreshControllerForModel();
+		throwIfAborted(signal);
 		const capture = await this.#controller.execute(actions.map(toDesktopAction), signal);
 		throwIfAborted(signal);
 		const data = Buffer.from(capture.data).toBase64();

package/src/tools/gh-cache-invalidation.ts

@@ -18,6 +18,7 @@
  * dwarfs the cost of one cache miss.
  */
 import { invalidateAllForNumber, invalidateAllForRepo } from "./github-cache";
+import { tokenizeShellSegments } from "./shell-tokenize";
 
 const PR_URL_PATTERN = /^https:\/\/github\.com\/([^/\s]+\/[^/\s]+)\/pull\/(\d+)(?:[/?#].*)?$/i;
 const ISSUE_URL_PATTERN = /^https:\/\/github\.com\/([^/\s]+\/[^/\s]+)\/issues\/(\d+)(?:[/?#].*)?$/i;
@@ -154,87 +155,6 @@ function detectGhMutation(tokens: readonly string[]): { number?: number; repo?:
 	return repo !== undefined ? { repo } : {};
 }
 
-/**
- * Conservative tokenizer that splits a bash command into individual word
- * tokens. Handles single/double-quoted strings, backslash escapes, and
- * standard operators (`;`, `&&`, `||`, `|`, `&`, newlines) as token
- * boundaries that emit a sentinel `";"` so the caller treats the segments
- * as independent command sequences. We do not attempt full POSIX shell
- * parsing — heredocs, command substitution, and arithmetic expansion are
- * out of scope; the detector simply falls through when it cannot find a
- * clean `gh issue|pr <subcmd>` triple.
- */
-function tokenize(command: string): string[][] {
-	const segments: string[][] = [];
-	let current: string[] = [];
-	let buffer = "";
-	let inSingle = false;
-	let inDouble = false;
-	const pushBuffer = () => {
-		if (buffer.length > 0) {
-			current.push(buffer);
-			buffer = "";
-		}
-	};
-	const pushSegment = () => {
-		pushBuffer();
-		if (current.length > 0) segments.push(current);
-		current = [];
-	};
-	for (let i = 0; i < command.length; i++) {
-		const ch = command[i];
-		if (inSingle) {
-			if (ch === "'") {
-				inSingle = false;
-				continue;
-			}
-			buffer += ch;
-			continue;
-		}
-		if (inDouble) {
-			if (ch === "\\" && i + 1 < command.length) {
-				const next = command[i + 1];
-				if (next === '"' || next === "\\" || next === "$" || next === "`") {
-					buffer += next;
-					i++;
-					continue;
-				}
-			}
-			if (ch === '"') {
-				inDouble = false;
-				continue;
-			}
-			buffer += ch;
-			continue;
-		}
-		if (ch === "'") {
-			inSingle = true;
-			continue;
-		}
-		if (ch === '"') {
-			inDouble = true;
-			continue;
-		}
-		if (ch === "\\" && i + 1 < command.length) {
-			buffer += command[i + 1];
-			i++;
-			continue;
-		}
-		if (ch === " " || ch === "\t") {
-			pushBuffer();
-			continue;
-		}
-		if (ch === "\n" || ch === ";" || ch === "&" || ch === "|" || ch === "(" || ch === ")") {
-			pushSegment();
-			// `&&`, `||` already collapsed by the segment break above.
-			continue;
-		}
-		buffer += ch;
-	}
-	pushSegment();
-	return segments;
-}
-
 /**
  * Drop `github-cache` rows for any `gh issue|pr <mutating-subcmd>` call
  * embedded in `command`. Safe to invoke unconditionally; no-op when the
@@ -242,7 +162,7 @@ function tokenize(command: string): string[][] {
  */
 export function invalidateGithubCacheForBashCommand(command: string): void {
 	if (!command?.includes("gh")) return;
-	const segments = tokenize(command);
+	const segments = tokenizeShellSegments(command);
 	for (const segment of segments) {
 		const hit = detectGhMutation(segment);
 		if (!hit) continue;

package/src/tools/memory-render.ts

@@ -27,7 +27,7 @@ import {
 // from the active theme (`•` by default, a nerd-font dot under nerd themes).
 
 interface RetainRenderArgs {
-	items?: Array<{ content?: string; context?: string }>;
+	items?: unknown;
 }
 
 interface QueryRenderArgs {
@@ -35,7 +35,16 @@ interface QueryRenderArgs {
 }
 
 function retainContents(args: RetainRenderArgs | undefined): string[] {
-	return (args?.items ?? []).map(item => replaceTabs((item?.content ?? "").trim())).filter(line => line.length > 0);
+	const items = args?.items;
+	if (!Array.isArray(items)) return [];
+
+	const contents: string[] = [];
+	for (const item of items) {
+		if (!item || typeof item !== "object" || !("content" in item) || typeof item.content !== "string") continue;
+		const content = replaceTabs(item.content.trim());
+		if (content.length > 0) contents.push(content);
+	}
+	return contents;
 }
 
 function resultText(result: { content?: Array<{ type: string; text?: string }> }): string {

package/src/tools/render-utils.ts

@@ -13,7 +13,8 @@ import type { Component } from "@oh-my-pi/pi-tui";
 import { getKeybindings, replaceTabs, truncateToWidth } from "@oh-my-pi/pi-tui";
 import { pluralize } from "@oh-my-pi/pi-utils";
 import { formatKeyHints, type KeyId } from "../config/keybindings";
-import { settings } from "../config/settings";
+import { isSettingsInitialized, settings } from "../config/settings";
+import { getDefault } from "../config/settings-schema";
 import type { Theme } from "../modes/theme/theme";
 import { Hasher } from "../tui/utils";
 import { formatDimensionNote, type ResizedImage } from "../utils/image-resize";
@@ -27,8 +28,12 @@ export { replaceTabs, truncateToWidth, wrapTextWithAnsi } from "@oh-my-pi/pi-tui
 
 /** Resolve inline image dimension caps from settings and viewport. */
 export function resolveImageOptions(): { maxWidthCells: number; maxHeightCells?: number } {
-	const maxWidthCells = settings.get("tui.maxInlineImageColumns");
-	const rowSetting = Math.max(0, settings.get("tui.maxInlineImageRows"));
+	const activeSettings = isSettingsInitialized() ? settings : undefined;
+	const maxWidthCells = activeSettings?.get("tui.maxInlineImageColumns") ?? getDefault("tui.maxInlineImageColumns");
+	const rowSetting = Math.max(
+		0,
+		activeSettings?.get("tui.maxInlineImageRows") ?? getDefault("tui.maxInlineImageRows"),
+	);
 	const viewportRows = process.stdout.rows;
 	const viewportFraction = viewportRows ? Math.floor(viewportRows * 0.6) : 0;
 	let maxHeightCells: number | undefined;

package/src/tools/shell-tokenize.ts

@@ -0,0 +1,83 @@
+/**
+ * Conservative shell command tokenizer shared by the bash approval-pattern
+ * matcher and the gh-cache invalidator.
+ *
+ * Splits a bash command into independent command segments, each a list of word
+ * tokens. Handles single/double-quoted strings, backslash escapes, and the
+ * standard operators (`;`, `&&`, `||`, `|`, `&`, `(`, `)`, newlines) as segment
+ * boundaries so callers treat the pieces as independent command sequences.
+ *
+ * It is deliberately not a full POSIX parser — heredocs, command substitution,
+ * and arithmetic expansion are out of scope; callers fall through when they
+ * cannot find the structure they need.
+ */
+export function tokenizeShellSegments(command: string): string[][] {
+	const segments: string[][] = [];
+	let current: string[] = [];
+	let buffer = "";
+	let inSingle = false;
+	let inDouble = false;
+	const pushBuffer = () => {
+		if (buffer.length > 0) {
+			current.push(buffer);
+			buffer = "";
+		}
+	};
+	const pushSegment = () => {
+		pushBuffer();
+		if (current.length > 0) segments.push(current);
+		current = [];
+	};
+	for (let i = 0; i < command.length; i++) {
+		const ch = command[i];
+		if (inSingle) {
+			if (ch === "'") {
+				inSingle = false;
+				continue;
+			}
+			buffer += ch;
+			continue;
+		}
+		if (inDouble) {
+			if (ch === "\\" && i + 1 < command.length) {
+				const next = command[i + 1];
+				if (next === '"' || next === "\\" || next === "$" || next === "`") {
+					buffer += next;
+					i++;
+					continue;
+				}
+			}
+			if (ch === '"') {
+				inDouble = false;
+				continue;
+			}
+			buffer += ch;
+			continue;
+		}
+		if (ch === "'") {
+			inSingle = true;
+			continue;
+		}
+		if (ch === '"') {
+			inDouble = true;
+			continue;
+		}
+		if (ch === "\\" && i + 1 < command.length) {
+			buffer += command[i + 1];
+			i++;
+			continue;
+		}
+		if (ch === " " || ch === "\t") {
+			pushBuffer();
+			continue;
+		}
+		if (ch === "\n" || ch === ";" || ch === "&" || ch === "|" || ch === "(" || ch === ")") {
+			pushSegment();
+			// `&&`, `||` already collapsed by the segment break above.
+			continue;
+		}
+		buffer += ch;
+	}
+	pushSegment();
+	return segments;
+}

package/src/tools/todo.ts

@@ -2,7 +2,7 @@ import type { AgentTool, AgentToolContext, AgentToolResult, AgentToolUpdateCallb
 import type { ToolExample } from "@oh-my-pi/pi-ai";
 import type { Component } from "@oh-my-pi/pi-tui";
 import { Text } from "@oh-my-pi/pi-tui";
-import { isRecord, prompt } from "@oh-my-pi/pi-utils";
+import { isRecord, prompt, sanitizeText } from "@oh-my-pi/pi-utils";
 import { type } from "arktype";
 import chalk from "chalk";
 import type { RenderResultOptions } from "../extensibility/custom-tools/types";
@@ -12,7 +12,7 @@ import type { ToolSession } from "../sdk";
 import type { SessionEntry } from "../session/session-entries";
 import { framedBlock, renderStatusLine, renderTreeList } from "../tui";
 import { normalizePathLikeInput, resolveToCwd } from "./path-utils";
-import { formatErrorDetail, formatMoreItems, PREVIEW_LIMITS, pluralize } from "./render-utils";
+import { formatErrorDetail, formatMoreItems, PREVIEW_LIMITS, pluralize, replaceTabs } from "./render-utils";
 
 // =============================================================================
 // Types
@@ -929,9 +929,27 @@ export function phaseRomanNumeral(oneBasedIndex: number): string {
 	return out;
 }
 
-/** Display-only phase header: `I. Foundation`. State and prompts never see this. */
+/**
+ * Every render boundary in this file funnels display text through here.
+ *
+ * `sanitizeText` strips ANSI/C0 sequences but deliberately preserves tabs, and
+ * a raw tab punches holes in bordered TUI output, so both are needed. The raw
+ * value stays untouched everywhere else: task content and phase names are the
+ * identity keys the local list is looked up by, and what gets persisted.
+ */
+function forDisplay(text: string): string {
+	return replaceTabs(sanitizeText(text));
+}
+
+/**
+ * Display-only phase header: `I. Foundation`. State and prompts never see this.
+ *
+ * Sanitized for the same reason task labels are: this is a render boundary and
+ * the name may carry provider or session text holding control sequences. The
+ * raw `phase.name` stays the lookup key everywhere else.
+ */
 export function formatPhaseDisplayName(name: string, oneBasedIndex: number): string {
-	return `${phaseRomanNumeral(oneBasedIndex)}. ${name}`;
+	return `${phaseRomanNumeral(oneBasedIndex)}. ${forDisplay(name)}`;
 }
 
 export const TODO_STRIKE_HOLD_FRAMES = 2;
@@ -970,27 +988,31 @@ function formatTodoLine(
 	matched = false,
 ): string {
 	const checkbox = uiTheme.checkbox;
+	// Sanitize only for display. A mirrored Cursor snapshot carries provider text
+	// verbatim, and a label holding ANSI/C0 sequences would otherwise rewrite the
+	// terminal every time the list renders or replays. `item.content` stays raw
+	// everywhere else: it is the identity key the local list is looked up by
+	// (`findTaskByContent`) and what gets persisted.
+	const label = forDisplay(item.content);
 	switch (item.status) {
 		case "completed": {
-			const revealCount = completionKeys.has(item.content) ? strikeRevealCount(item.content, frame) : undefined;
+			const revealCount = completionKeys.has(item.content) ? strikeRevealCount(label, frame) : undefined;
 			const content =
-				revealCount === undefined
-					? strikethroughText(item.content)
-					: partialStrikethrough(item.content, revealCount);
+				revealCount === undefined ? strikethroughText(label) : partialStrikethrough(label, revealCount);
 			return uiTheme.fg("success", `${prefix}${checkbox.checked} ${content}`);
 		}
 		case "in_progress":
-			return uiTheme.fg("accent", `${prefix}${checkbox.unchecked} ${item.content}`);
+			return uiTheme.fg("accent", `${prefix}${checkbox.unchecked} ${label}`);
 		case "abandoned":
-			return uiTheme.fg("error", `${prefix}${checkbox.unchecked} ${strikethroughText(item.content)}`);
+			return uiTheme.fg("error", `${prefix}${checkbox.unchecked} ${strikethroughText(label)}`);
 		case "blocked": {
-			const note = item.blocker ? `blocked: ${item.blocker}` : "blocked";
-			return uiTheme.fg("warning", `${prefix}${checkbox.unchecked} ${item.content} (${note})`);
+			const note = item.blocker ? `blocked: ${forDisplay(item.blocker)}` : "blocked";
+			return uiTheme.fg("warning", `${prefix}${checkbox.unchecked} ${label} (${note})`);
 		}
 		default:
 			// A pending todo lit by a live subagent match renders accent, matching
 			// the sticky HUD's convention (#5873).
-			return uiTheme.fg(matched ? "accent" : "dim", `${prefix}${checkbox.unchecked} ${item.content}`);
+			return uiTheme.fg(matched ? "accent" : "dim", `${prefix}${checkbox.unchecked} ${label}`);
 	}
 }
 
@@ -1065,13 +1087,15 @@ export const todoToolRenderer = {
 		// both the new single-op and legacy batch shapes so a malformed delta
 		// never breaks the TUI render loop (#2005).
 		const opsList = normalizeTodoArg(args);
+		// Model-authored, partially-streamed strings going straight into a header:
+		// `renderStatusLine` only flattens CR/LF and leaves the rest to the caller.
 		const ops =
 			opsList.length === 0
 				? ["update"]
 				: opsList.map(e => {
-						const parts = [e.op ?? "update"];
-						if (e.task) parts.push(e.task);
-						if (e.phase) parts.push(e.phase);
+						const parts = [forDisplay(e.op ?? "update")];
+						if (e.task) parts.push(forDisplay(e.task));
+						if (e.phase) parts.push(forDisplay(e.phase));
 						if (Array.isArray(e.items) && e.items.length) {
 							parts.push(`${e.items.length} item${e.items.length === 1 ? "" : "s"}`);
 						}
@@ -1125,7 +1149,10 @@ export const todoToolRenderer = {
 			uiTheme,
 		);
 		if (allTasks.length === 0) {
-			const fallback = result.content?.find(content => content.type === "text")?.text ?? "No todos";
+			// Provider text on the Cursor path (the todo summary or a refusal note),
+			// so sanitize like every other label. The error branch above already
+			// goes through `formatErrorDetail`.
+			const fallback = forDisplay(result.content?.find(content => content.type === "text")?.text ?? "No todos");
 			return new Text(`${header}\n  ${uiTheme.fg("dim", fallback)}`, 0, 0);
 		}
 

package/src/tools/write.ts

@@ -1215,7 +1215,7 @@ export class WriteTool implements AgentTool<typeof writeSchema, WriteToolDetails
 
 			// Check if file exists and is auto-generated before overwriting
 			if (await fs.exists(absolutePath)) {
-				await assertEditableFile(absolutePath, path);
+				await assertEditableFile(absolutePath, path, this.session.settings);
 			}
 
 			const displayPath = formatPathRelativeToCwd(absolutePath, this.session.cwd);