@oh-my-pi/pi-coding-agent 14.5.3 → 14.5.5

package/src/lsp/edits.ts

@@ -1,5 +1,6 @@
 import * as fs from "node:fs/promises";
 import path from "node:path";
+import { formatPathRelativeToCwd } from "../tools/path-utils";
 import type { CreateFile, DeleteFile, RenameFile, TextDocumentEdit, TextEdit, WorkspaceEdit } from "./types";
 import { uriToFile } from "./utils";
 
@@ -67,7 +68,7 @@ export async function applyWorkspaceEdit(edit: WorkspaceEdit, cwd: string): Prom
 		for (const [uri, textEdits] of Object.entries(edit.changes)) {
 			const filePath = uriToFile(uri);
 			await applyTextEdits(filePath, textEdits);
-			applied.push(`Applied ${textEdits.length} edit(s) to ${path.relative(cwd, filePath)}`);
+			applied.push(`Applied ${textEdits.length} edit(s) to ${formatPathRelativeToCwd(filePath, cwd)}`);
 		}
 	}
 
@@ -80,26 +81,28 @@ export async function applyWorkspaceEdit(edit: WorkspaceEdit, cwd: string): Prom
 				const filePath = uriToFile(docChange.textDocument.uri);
 				const textEdits = docChange.edits.filter((e): e is TextEdit => "range" in e && "newText" in e);
 				await applyTextEdits(filePath, textEdits);
-				applied.push(`Applied ${textEdits.length} edit(s) to ${path.relative(cwd, filePath)}`);
+				applied.push(`Applied ${textEdits.length} edit(s) to ${formatPathRelativeToCwd(filePath, cwd)}`);
 			} else if ("kind" in change && change.kind) {
 				// Resource operations
 				if (change.kind === "create") {
 					const createOp = change as CreateFile;
 					const filePath = uriToFile(createOp.uri);
 					await Bun.write(filePath, "");
-					applied.push(`Created ${path.relative(cwd, filePath)}`);
+					applied.push(`Created ${formatPathRelativeToCwd(filePath, cwd)}`);
 				} else if (change.kind === "rename") {
 					const renameOp = change as RenameFile;
 					const oldPath = uriToFile(renameOp.oldUri);
 					const newPath = uriToFile(renameOp.newUri);
 					await fs.mkdir(path.dirname(newPath), { recursive: true });
 					await fs.rename(oldPath, newPath);
-					applied.push(`Renamed ${path.relative(cwd, oldPath)} → ${path.relative(cwd, newPath)}`);
+					applied.push(
+						`Renamed ${formatPathRelativeToCwd(oldPath, cwd)} → ${formatPathRelativeToCwd(newPath, cwd)}`,
+					);
 				} else if (change.kind === "delete") {
 					const deleteOp = change as DeleteFile;
 					const filePath = uriToFile(deleteOp.uri);
 					await fs.rm(filePath, { recursive: true });
-					applied.push(`Deleted ${path.relative(cwd, filePath)}`);
+					applied.push(`Deleted ${formatPathRelativeToCwd(filePath, cwd)}`);
 				}
 			}
 		}

package/src/lsp/index.ts

@@ -6,7 +6,7 @@ import type { BunFile } from "bun";
 import { type Theme, theme } from "../modes/theme/theme";
 import lspDescription from "../prompts/tools/lsp.md" with { type: "text" };
 import type { ToolSession } from "../tools";
-import { resolveToCwd } from "../tools/path-utils";
+import { formatPathRelativeToCwd, resolveToCwd } from "../tools/path-utils";
 import { ToolAbortError, throwIfAborted } from "../tools/tool-errors";
 import { clampTimeout } from "../tools/tool-timeouts";
 import {
@@ -562,7 +562,7 @@ async function getDiagnosticsForFile(
 	}
 
 	const uri = fileToUri(absolutePath);
-	const relPath = path.relative(cwd, absolutePath);
+	const relPath = formatPathRelativeToCwd(absolutePath, cwd);
 	const allDiagnostics: Diagnostic[] = [];
 	const serverNames: string[] = [];
 
@@ -1229,7 +1229,7 @@ export class LspTool implements AgentTool<typeof lspSchema, LspToolDetails, Them
 				}
 
 				const uri = fileToUri(resolved);
-				const relPath = path.relative(this.session.cwd, resolved);
+				const relPath = formatPathRelativeToCwd(resolved, this.session.cwd);
 				const allDiagnostics: Diagnostic[] = [];
 
 				// Query all applicable servers for this file
@@ -1707,7 +1707,7 @@ export class LspTool implements AgentTool<typeof lspSchema, LspToolDetails, Them
 					if (!result || result.length === 0) {
 						output = "No symbols found";
 					} else {
-						const relPath = path.relative(this.session.cwd, targetFile);
+						const relPath = formatPathRelativeToCwd(targetFile, this.session.cwd);
 						if ("selectionRange" in result[0]) {
 							const lines = (result as DocumentSymbol[]).flatMap(s => formatDocumentSymbol(s));
 							output = `Symbols in ${relPath}:\n${lines.join("\n")}`;

package/src/lsp/utils.ts

@@ -5,7 +5,7 @@ import path from "node:path";
 import { isEnoent } from "@oh-my-pi/pi-utils";
 import { type Theme, theme } from "../modes/theme/theme";
 import { formatGroupedFiles } from "../tools/grouped-file-output";
-import { resolveToCwd } from "../tools/path-utils";
+import { formatPathRelativeToCwd, resolveToCwd } from "../tools/path-utils";
 import type {
 	CodeAction,
 	Command,
@@ -229,7 +229,7 @@ export function formatDiagnosticsSummary(diagnostics: Diagnostic[]): string {
  * Format a location as file:line:col relative to cwd.
  */
 export function formatLocation(location: Location, cwd: string): string {
-	const file = path.relative(cwd, uriToFile(location.uri));
+	const file = formatPathRelativeToCwd(uriToFile(location.uri), cwd);
 	const line = location.range.start.line + 1;
 	const col = location.range.start.character + 1;
 	return `${file}:${line}:${col}`;
@@ -255,7 +255,7 @@ export function formatWorkspaceEdit(edit: WorkspaceEdit, cwd: string): string[]
 	// Handle changes map (legacy format)
 	if (edit.changes) {
 		for (const [uri, textEdits] of Object.entries(edit.changes)) {
-			const file = path.relative(cwd, uriToFile(uri));
+			const file = formatPathRelativeToCwd(uriToFile(uri), cwd);
 			results.push(`${file}: ${textEdits.length} edit${textEdits.length > 1 ? "s" : ""}`);
 		}
 	}
@@ -264,20 +264,20 @@ export function formatWorkspaceEdit(edit: WorkspaceEdit, cwd: string): string[]
 	if (edit.documentChanges) {
 		for (const change of edit.documentChanges) {
 			if ("edits" in change && change.textDocument) {
-				const file = path.relative(cwd, uriToFile(change.textDocument.uri));
+				const file = formatPathRelativeToCwd(uriToFile(change.textDocument.uri), cwd);
 				results.push(`${file}: ${change.edits.length} edit${change.edits.length > 1 ? "s" : ""}`);
 			} else if ("kind" in change) {
 				switch (change.kind) {
 					case "create":
-						results.push(`CREATE: ${path.relative(cwd, uriToFile(change.uri))}`);
+						results.push(`CREATE: ${formatPathRelativeToCwd(uriToFile(change.uri), cwd)}`);
 						break;
 					case "rename":
 						results.push(
-							`RENAME: ${path.relative(cwd, uriToFile(change.oldUri))} ${theme.nav.cursor} ${path.relative(cwd, uriToFile(change.newUri))}`,
+							`RENAME: ${formatPathRelativeToCwd(uriToFile(change.oldUri), cwd)} ${theme.nav.cursor} ${formatPathRelativeToCwd(uriToFile(change.newUri), cwd)}`,
 						);
 						break;
 					case "delete":
-						results.push(`DELETE: ${path.relative(cwd, uriToFile(change.uri))}`);
+						results.push(`DELETE: ${formatPathRelativeToCwd(uriToFile(change.uri), cwd)}`);
 						break;
 				}
 			}

package/src/mcp/discoverable-tool-metadata.ts

@@ -53,7 +53,7 @@ const FIELD_WEIGHTS = {
 } as const;
 
 export function isMCPToolName(name: string): boolean {
-	return name.startsWith("mcp_");
+	return name.startsWith("mcp__");
 }
 
 function getSchemaPropertyKeys(parameters: unknown): string[] {

package/src/mcp/manager.ts

@@ -472,7 +472,7 @@ export class MCPManager {
 	}
 
 	#replaceServerTools(name: string, tools: CustomTool<TSchema, MCPToolDetails>[]): void {
-		this.#tools = this.#tools.filter(t => !t.name.startsWith(`mcp_${name}_`));
+		this.#tools = this.#tools.filter(t => !t.name.startsWith(`mcp__${name}_`));
 		this.#tools.push(...tools);
 	}
 
@@ -644,8 +644,8 @@ export class MCPManager {
 		}
 
 		// Remove tools from this server and notify consumers
-		const hadTools = this.#tools.some(t => t.name.startsWith(`mcp_${name}_`));
-		this.#tools = this.#tools.filter(t => !t.name.startsWith(`mcp_${name}_`));
+		const hadTools = this.#tools.some(t => t.name.startsWith(`mcp__${name}_`));
+		this.#tools = this.#tools.filter(t => !t.name.startsWith(`mcp__${name}_`));
 		if (hadTools) this.#onToolsChanged?.(this.#tools);
 
 		// Notify prompt consumers so stale commands are cleared

package/src/mcp/tool-bridge.ts

@@ -159,7 +159,7 @@ async function reconnectWithAbort(reconnect: MCPReconnect, signal?: AbortSignal)
  * Prefixes with server name to avoid conflicts. If the tool name already
  * starts with the server name (e.g., server "puppeteer" with tool
  * "puppeteer_screenshot"), strips the redundant prefix to produce
- * "mcp_puppeteer_screenshot" instead of "mcp_puppeteer_puppeteer_screenshot".
+ * "mcp__puppeteer_screenshot" instead of "mcp__puppeteer_puppeteer_screenshot".
  */
 function sanitizeMCPToolNamePart(value: string, fallback: string): string {
 	const sanitized = value
@@ -183,7 +183,7 @@ export function createMCPToolName(serverName: string, toolName: string): string
 		normalizedToolName = sanitizedToolName.slice(prefixWithUnderscore.length);
 	}
 
-	return `mcp_${sanitizedServerName}_${normalizedToolName}`;
+	return `mcp__${sanitizedServerName}_${normalizedToolName}`;
 }
 
 /**
@@ -193,9 +193,9 @@ export function createMCPToolName(serverName: string, toolName: string): string
  * The original MCP tool name may have had the server name as a prefix.
  */
 export function parseMCPToolName(name: string): { serverName: string; toolName: string } | null {
-	if (!name.startsWith("mcp_")) return null;
+	if (!name.startsWith("mcp__")) return null;
 
-	const rest = name.slice(4);
+	const rest = name.slice(5);
 	const underscoreIdx = rest.indexOf("_");
 	if (underscoreIdx === -1) return null;
 

package/src/memories/index.ts

@@ -539,7 +539,7 @@ function shouldPersistResponseItemForMemories(message: AgentMessage): boolean {
 	}
 	if (role !== "toolResult") return false;
 	const toolName = (message as { toolName?: string }).toolName;
-	if (toolName === "bash" || toolName === "python" || toolName === "read" || toolName === "grep") {
+	if (toolName === "bash" || toolName === "python" || toolName === "read" || toolName === "search") {
 		const text = extractMessageText(message);
 		return text.length > 0 && text.length <= 32_000;
 	}

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

@@ -106,7 +106,7 @@ export function mapToolKind(toolName: string): ToolKind {
 		case "bash":
 		case "python":
 			return "execute";
-		case "grep":
+		case "search":
 		case "find":
 		case "ast_grep":
 			return "search";

package/src/modes/components/session-observer-overlay.ts

@@ -518,7 +518,7 @@ export class SessionObserverOverlayComponent extends Container {
 			case "write":
 			case "edit":
 				return args.path ? `path: ${args.path}` : "";
-			case "grep":
+			case "search":
 				return [args.pattern ? `pattern: ${args.pattern}` : "", args.path ? `path: ${args.path}` : ""]
 					.filter(Boolean)
 					.join(", ");

package/src/modes/components/settings-defs.ts

@@ -214,15 +214,15 @@ const OPTION_PROVIDERS: Partial<Record<SettingPath, OptionProvider>> = {
 		{ value: "3", label: "3 reminders" },
 		{ value: "5", label: "5 reminders" },
 	],
-	// Grep context
-	"grep.contextBefore": [
+	// Search context
+	"search.contextBefore": [
 		{ value: "0", label: "0 lines" },
 		{ value: "1", label: "1 line" },
 		{ value: "2", label: "2 lines" },
 		{ value: "3", label: "3 lines" },
 		{ value: "5", label: "5 lines" },
 	],
-	"grep.contextAfter": [
+	"search.contextAfter": [
 		{ value: "0", label: "0 lines" },
 		{ value: "1", label: "1 line" },
 		{ value: "2", label: "2 lines" },

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

@@ -665,10 +665,10 @@ class TreeList implements Component {
 					.slice(0, 50);
 				return `[bash: ${cmd}${rawCmd.length > 50 ? "..." : ""}]`;
 			}
-			case "grep": {
+			case "search": {
 				const pattern = String(args.pattern || "");
 				const path = shortenPath(String(args.path || "."));
-				return `[grep: /${pattern}/ in ${path}]`;
+				return `[search: /${pattern}/ in ${path}]`;
 			}
 			case "find": {
 				const pattern = String(args.pattern || "");

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

@@ -127,14 +127,38 @@ export class UiHelpers {
 						this.ctx.chatContainer.addChild(component);
 						break;
 					}
-					if (message.customType === "irc:incoming" || message.customType === "irc:autoreply") {
+					if (
+						message.customType === "irc:incoming" ||
+						message.customType === "irc:autoreply" ||
+						message.customType === "irc:relay"
+					) {
 						const details = (
-							message as CustomMessage<{ from?: string; to?: string; message?: string; reply?: string }>
+							message as CustomMessage<{
+								from?: string;
+								to?: string;
+								message?: string;
+								reply?: string;
+								body?: string;
+								kind?: "message" | "reply";
+							}>
 						).details;
-						const isIncoming = message.customType === "irc:incoming";
-						const peer = isIncoming ? (details?.from ?? "?") : (details?.to ?? "?");
-						const body = isIncoming ? (details?.message ?? "") : (details?.reply ?? "");
-						const arrow = isIncoming ? `\u21e6 ${peer}` : `\u21e8 ${peer} (auto)`;
+						let arrow: string;
+						let body: string;
+						if (message.customType === "irc:incoming") {
+							const peer = details?.from ?? "?";
+							body = details?.message ?? "";
+							arrow = `\u21e6 ${peer}`;
+						} else if (message.customType === "irc:autoreply") {
+							const peer = details?.to ?? "?";
+							body = details?.reply ?? "";
+							arrow = `\u21e8 ${peer} (auto)`;
+						} else {
+							const from = details?.from ?? "?";
+							const to = details?.to ?? "?";
+							body = details?.body ?? "";
+							const suffix = details?.kind === "reply" ? " (auto)" : "";
+							arrow = `${from} \u21e8 ${to}${suffix}`;
+						}
 						const header = `${theme.fg("accent", `[IRC] ${arrow}`)}`;
 						this.ctx.chatContainer.addChild(new Text(header, 1, 0));
 						if (body) {
@@ -226,7 +250,7 @@ export class UiHelpers {
 		sessionContext: SessionContext,
 		options: { updateFooter?: boolean; populateHistory?: boolean } = {},
 	): void {
-		this.ctx.optimisticUserMessageSignature = undefined;
+		// Preserved: message_start handler owns this lifecycle (see #783)
 		this.ctx.pendingTools.clear();
 
 		if (options.updateFooter) {

package/src/prompts/agents/explore.md

@@ -1,7 +1,7 @@
 ---
 name: explore
 description: Fast read-only codebase scout returning compressed context for handoff
-tools: read, grep, find, web_search
+tools: read, search, find, web_search
 model: pi/smol
 thinking-level: med
 output:

package/src/prompts/agents/librarian.md

@@ -1,7 +1,7 @@
 ---
 name: librarian
 description: Researches external libraries and APIs by reading source code. Returns definitive, source-verified answers.
-tools: read, grep, find, bash, lsp, web_search, ast_grep
+tools: read, search, find, bash, lsp, web_search, ast_grep
 model: pi/smol
 thinking-level: minimal
 output:
@@ -87,7 +87,7 @@ Before acting, determine what kind of question this is:
 
 ## 3. Investigate
 - Read `package.json`, `Cargo.toml`, or equivalent for version info and entry points.
-- Use `grep`, `find`, and `ast_grep` to locate relevant source, type definitions, and docs. Parallelize searches.
+- Use `search`, `find`, and `ast_grep` to locate relevant source, type definitions, and docs. Parallelize searches.
 - Read the actual implementation — not just README examples. READMEs are aspirational; source code is truth.
 - For behavior questions: trace through the implementation. Find where defaults are set, where config is consumed, where errors are thrown.
 - Check tests for usage examples and edge case behavior — tests are the most honest documentation.

package/src/prompts/agents/plan.md

@@ -1,7 +1,7 @@
 ---
 name: plan
 description: Software architect for complex multi-file architectural decisions. NOT for simple tasks, single-file changes, or tasks completable in <5 tool calls.
-tools: read, grep, find, bash, lsp, web_search, ast_grep
+tools: read, search, find, bash, lsp, web_search, ast_grep
 spawns: explore
 model: pi/plan, pi/slow
 thinking-level: high
@@ -14,7 +14,7 @@ You are an expert software architect analyzing the codebase and the user's reque
 2. Identify ambiguities; list assumptions
 
 ## Phase 2: Explore
-1. Find existing patterns via grep/find
+1. Find existing patterns via `search`/`find`
 2. Read key files; understand architecture
 3. Trace data flow through relevant paths
 4. Identify types, interfaces, contracts

package/src/prompts/agents/reviewer.md

@@ -1,7 +1,7 @@
 ---
 name: reviewer
 description: "Code review specialist for quality/security analysis"
-tools: read, grep, find, bash, lsp, web_search, ast_grep, report_finding
+tools: read, search, find, bash, lsp, web_search, ast_grep, report_finding
 spawns: explore
 model: pi/slow
 thinking-level: high

package/src/prompts/agents/task.md

@@ -1,6 +1,6 @@
 You are a worker agent for delegated tasks.
 
-You have FULL access to all tools (edit, write, bash, grep, read, etc.) and you **MUST** use them as needed to complete your task.
+You have FULL access to all tools (edit, write, bash, search, read, etc.) and you **MUST** use them as needed to complete your task.
 
 You **MUST** maintain hyperfocus on the task at hand, do not deviate from what was assigned to you.
 
@@ -8,7 +8,7 @@ You **MUST** maintain hyperfocus on the task at hand, do not deviate from what w
 - You **MUST** finish only the assigned work and return the minimum useful result. Do not repeat what you have written to the filesystem.
 - You **MAY** make file edits, run commands, and create files when your task requires it—and **SHOULD** do so.
 - You **MUST** be concise. You **MUST NOT** include filler, repetition, or tool transcripts. User cannot even see you. Your result is just the notes you are leaving for yourself.
-- You **SHOULD** prefer narrow search (grep/find) then read only needed ranges. Do not bother yourself with anything beyond your current scope.
+- You **SHOULD** prefer narrow lookups (`search`/`find`) then read only needed ranges. Do not bother yourself with anything beyond your current scope.
 - You **SHOULD NOT** do full-file reads unless necessary.
 - You **SHOULD** prefer edits to existing files over creating new ones.
 - You **MUST NOT** create documentation files (*.md) unless explicitly requested.

package/src/prompts/system/plan-mode-active.md

@@ -42,7 +42,7 @@ Plan execution runs in fresh context (session cleared). You **MUST** make the pl
 
 <procedure>
 ### 1. Explore
-You **MUST** use `find`, `grep`, `read`, `ls` to understand the codebase.
+You **MUST** use `find`, `search`, `read` to understand the codebase.
 ### 2. Interview
 You **MUST** use `{{askToolName}}` to clarify:
 - Ambiguous requirements

package/src/prompts/system/system-prompt.md

@@ -78,10 +78,13 @@ If any check fails, continue or mark [blocked]. Do **NOT** reframe partial work
 - Prefer concise, information-dense writing.
 - Avoid repeating the user's request or narrating routine tool calls.
 - Do not give time estimates or predictions.
+- Do not emit closing summaries, recap paragraphs, or "what I did" wrap-ups. Final messages state the result and any blockers; the trace already shows the work.
 </communication>
 
 <output-contract>
 - Brief preambles are allowed when they improve orientation, but they **MUST** stay short and **MUST NOT** be treated as completion.
+- A phase boundary, todo flip, or completed sub-step is **NOT** a yield point. Continue directly to the next step in the same turn — do **NOT** stop to summarize, ask for acknowledgement, or wait for the user to say "go".
+- Yield only when (a) the whole deliverable is complete, (b) you are [blocked], or (c) the user asked a question that requires their input.
 - Claims about code, tools, tests, docs, or external sources **MUST** be grounded in what was actually observed.
 - If a statement is an inference, label it as such.
 - Be brief in prose, not in evidence, verification, or blocking details.
@@ -175,44 +178,45 @@ Most tools have a `{{intentField}}` parameter. Fill it with a concise intent in
 {{#if mcpDiscoveryMode}}
 ### MCP tool discovery
 {{#if hasMCPDiscoveryServers}}Discoverable MCP servers in this session: {{#list mcpDiscoveryServerSummaries join=", "}}{{this}}{{/list}}.{{/if}}
-If the task may involve external systems, SaaS APIs, chat, tickets, databases, deployments, or other non-local integrations, you **SHOULD** call `search_tool_bm25` before concluding no such tool exists.
+If the task may involve external systems, SaaS APIs, chat, tickets, databases, deployments, or other non-local integrations, you **SHOULD** call `{{toolRefs.search_tool_bm25}}` before concluding no such tool exists.
 {{/if}}
 
 {{#ifAny (includes tools "python") (includes tools "bash")}}
 ### Tool priority
-1. Use specialized tools first{{#ifAny (includes tools "read") (includes tools "grep") (includes tools "find") (includes tools "edit") (includes tools "lsp")}}: {{#has tools "read"}}`read`, {{/has}}{{#has tools "grep"}}`grep`, {{/has}}{{#has tools "find"}}`find`, {{/has}}{{#has tools "edit"}}`edit`, {{/has}}{{#has tools "lsp"}}`lsp`{{/has}}{{/ifAny}}
+1. Use specialized tools first{{#ifAny (includes tools "read") (includes tools "search") (includes tools "find") (includes tools "edit") (includes tools "lsp")}}: {{#has tools "read"}}`{{toolRefs.read}}`, {{/has}}{{#has tools "search"}}`{{toolRefs.search}}`, {{/has}}{{#has tools "find"}}`{{toolRefs.find}}`, {{/has}}{{#has tools "edit"}}`{{toolRefs.edit}}`, {{/has}}{{#has tools "lsp"}}`{{toolRefs.lsp}}`{{/has}}{{/ifAny}}
 2. Python: logic, loops, processing, display
 3. Bash: simple one-liners only
 You **MUST NOT** use Python or Bash when a specialized tool exists.
 {{/ifAny}}
 
-{{#ifAny (includes tools "read") (includes tools "write") (includes tools "grep") (includes tools "find") (includes tools "edit")}}
-{{#has tools "read"}}- Use `read`, not `cat`.{{/has}}
-{{#has tools "write"}}- Use `write`, not shell redirection.{{/has}}
-{{#has tools "grep"}}- Use `grep`, not shell regex search.{{/has}}
-{{#has tools "find"}}- Use `find`, not shell file globbing.{{/has}}
-{{#has tools "edit"}}- Use `edit` for surgical text changes, not `sed`.{{/has}}
+{{#ifAny (includes tools "read") (includes tools "write") (includes tools "search") (includes tools "find") (includes tools "edit")}}
+{{#has tools "read"}}- Use `{{toolRefs.read}}`, not `cat` or `ls`. `{{toolRefs.read}}` on a directory path lists its entries.{{/has}}
+{{#has tools "write"}}- Use `{{toolRefs.write}}`, not shell redirection.{{/has}}
+{{#has tools "search"}}- Use `{{toolRefs.search}}`, not shell regex search.{{/has}}
+{{#has tools "find"}}- Use `{{toolRefs.find}}`, not shell file globbing.{{/has}}
+{{#has tools "edit"}}- Use `{{toolRefs.edit}}` for surgical text changes, not `sed`.{{/has}}
 {{/ifAny}}
 
 ### Paths
-- For tools that take a `path` (or path-like field), prefer cwd-relative paths for files inside the cwd. Use absolute paths only when targeting files outside the cwd or when expanding `~`.
+- For tools that take a `path` or path-like field, you **MUST** use cwd-relative paths for files inside the current working directory.
+- You **MUST** use absolute paths only when targeting files outside the current working directory or when expanding `~`.
 
 {{#has tools "lsp"}}
 ### LSP guidance
 Use semantic tools for semantic questions:
-- Definition → `lsp definition`
-- Type → `lsp type_definition`
-- Implementations → `lsp implementation`
-- References → `lsp references`
-- What is this? → `lsp hover`
-- Refactors/imports/fixes → `lsp code_actions` (list first, then apply with `apply: true` + `query`)
+- Definition → `{{toolRefs.lsp}} definition`
+- Type → `{{toolRefs.lsp}} type_definition`
+- Implementations → `{{toolRefs.lsp}} implementation`
+- References → `{{toolRefs.lsp}} references`
+- What is this? → `{{toolRefs.lsp}} hover`
+- Refactors/imports/fixes → `{{toolRefs.lsp}} code_actions` (list first, then apply with `apply: true` + `query`)
 {{/has}}
 
 {{#ifAny (includes tools "ast_grep") (includes tools "ast_edit")}}
 ### AST guidance
 Use syntax-aware tools before text hacks:
-{{#has tools "ast_grep"}}- `ast_grep` for structural discovery{{/has}}
-{{#has tools "ast_edit"}}- `ast_edit` for codemods{{/has}}
+{{#has tools "ast_grep"}}- `{{toolRefs.ast_grep}}` for structural discovery{{/has}}
+{{#has tools "ast_edit"}}- `{{toolRefs.ast_edit}}` for codemods{{/has}}
 - Use `grep` only for plain text lookup when structure is irrelevant
 {{/ifAny}}
 
@@ -233,10 +237,10 @@ Match commands to the host shell: linux/bash and macos/zsh use Unix commands; wi
 {{/has}}
 
 ### Search before you read
-{{#has tools "grep"}}- Use `grep` to locate targets.{{/has}}
-{{#has tools "find"}}- Use `find` to map structure.{{/has}}
-{{#has tools "read"}}- Use `read` with offset or limit rather than whole-file reads when practical.{{/has}}
-{{#has tools "task"}}- Use `task` for investigate+edit when available.{{/has}}
+{{#has tools "grep"}}- Use `{{toolRefs.grep}}` to locate targets.{{/has}}
+{{#has tools "find"}}- Use `{{toolRefs.find}}` to map structure.{{/has}}
+{{#has tools "read"}}- Use `{{toolRefs.read}}` with offset or limit rather than whole-file reads when practical.{{/has}}
+{{#has tools "task"}}- Use `{{toolRefs.task}}` for investigate+edit when available.{{/has}}
 - Do not read a file hoping to find the right thing.
 
 <tool-persistence>
@@ -250,8 +254,8 @@ Match commands to the host shell: linux/bash and macos/zsh use Unix commands; wi
 
 {{#if (includes tools "inspect_image")}}
 ### Image inspection
-- For image understanding tasks you **MUST** use `inspect_image` over `read` to avoid overloading session context.
-- Write a specific `question` for `inspect_image`: what to inspect, constraints, and desired output format.
+- For image understanding tasks you **MUST** use `{{toolRefs.inspect_image}}` over `{{toolRefs.read}}` to avoid overloading session context.
+- Write a specific `question` for `{{toolRefs.inspect_image}}`: what to inspect, constraints, and desired output format.
 {{/if}}
 
 {{SECTION_SEPARATOR "Rules"}}
@@ -285,7 +289,7 @@ These are inviolable.
 ## 1. Scope
 {{#if skills.length}}- You **MUST** read skills that match the task domain before starting.{{/if}}
 {{#if rules.length}}- You **MUST** read rules that match the file paths you are touching before starting.{{/if}}
-{{#has tools "task"}}- Determine whether the task can be parallelized with `task`.{{/has}}
+{{#has tools "task"}}- Determine whether the task can be parallelized with `{{toolRefs.task}}`.{{/has}}
 - If the task is multi-file or imprecisely scoped, write a step-by-step plan before editing.
 - For new or unfamiliar work, think about architecture, review the codebase, consult authoritative docs when needed, then implement the best fit or surface tradeoffs.
 - If context is missing, use tools first; ask a minimal question only when necessary.
@@ -293,17 +297,18 @@ These are inviolable.
 ## 2. Before you edit
 - Read the relevant section of any file before editing.
 - You **MUST** search for existing examples before implementing a new pattern, utility, or abstraction. If the codebase already solves it, **MUST** reuse it; inventing a parallel convention is **PROHIBITED**.
-{{#has tools "lsp"}}- Before modifying a function, type, or exported symbol, run `lsp references` to find its consumers.{{/has}}
+{{#has tools "lsp"}}- Before modifying a function, type, or exported symbol, run `{{toolRefs.lsp}} references` to find its consumers.{{/has}}
 - If a file changed since you last read it, re-read before editing.
 
 ## 3. Parallelization
 - Prefer parallel work whenever the pieces are independent.
 {{#has tools "task"}}- Use tasks or subagents when independent investigations or edits can be split safely.{{/has}}
 - If you cannot explain why one piece depends on another, they are probably independent.
-
+{{#has tools "task"}}- When a plan feels too large for a single turn, parallelize aggressively — do **NOT** abandon phases, silently drop them, or narrate scope cuts. Scope pressure is a signal to delegate, not to shrink the work.{{/has}}
 ## 4. Task tracking
 - Update todos as you progress.
 - Skip task tracking only for trivial requests.
+- Marking a todo done is a transition, not a stop: in the same turn, start the next pending todo. Acceptable inter-phase text is one short line ("phase 1 done, starting phase 2") — not a recap, not a question.
 
 ## 5. While working
 - Keep one job per level of abstraction.
@@ -318,11 +323,9 @@ These are inviolable.
 - If blocked, exhaust tools and context first.
 
 ## 6. Verification
-- Test rigorously. Prefer unit or end-to-end tests.
-- You **MUST NOT** rely on mocks for behavior the production system owns — they invent behaviors that never happen in production and hide real bugs. Use mocks or fakes only for genuinely external, unstable, slow, or costly boundaries.
+- Test rigorously. Prefer unit or end-to-end tests, you **MUST NOT** rely on mocks.
 - Run only tests you added or modified unless asked otherwise.
-- You **MUST NOT** yield non-trivial work without proof: tests, linters, type checks, repro steps, or equivalent evidence.
-- High-impact actions **MUST** be verified or explicitly held for permission before yielding.
+- You **MUST NOT** yield non-trivial work without proof: tests, e2e run, browsing and QA testing, etc.
 
 {{#if secretsEnabled}}
 <redacted-content>
@@ -332,7 +335,7 @@ Some values in tool output are intentionally redacted as `#XXXX#` tokens. Treat
 
 {{SECTION_SEPARATOR "Now"}}
 
-The current working directory is '{{cwd}}'.
+The current working directory is '{{cwd}}'. Paths inside this directory **MUST** be passed to tools as relative paths.
 Today is '{{date}}'. Begin now.
 
 <critical>

package/src/prompts/tools/apply-patch.md

@@ -1,5 +1,3 @@
-## `apply_patch`
-
 Use the `apply_patch` shell command to edit files.
 Your patch language is a stripped‑down, file‑oriented diff format designed to be easy to parse and safe to apply. You can think of it as a high‑level envelope: