@oh-my-pi/pi-coding-agent 16.1.22 → 16.2.0

package/src/modes/setup-wizard/scenes/glyph.ts

@@ -1,4 +1,4 @@
-import { type SelectItem, SelectList, type SgrMouseEvent } from "@oh-my-pi/pi-tui";
+import { routeSelectListMouse, type SelectItem, SelectList, type SgrMouseEvent } from "@oh-my-pi/pi-tui";
 import { getSelectListTheme, type SymbolPreset, setSymbolPreset, theme } from "../../theme/theme";
 import type { SetupScene, SetupSceneController, SetupSceneHost } from "./types";
 
@@ -65,18 +65,7 @@ class GlyphSceneController implements SetupSceneController {
 	/** Wheel moves the highlight (live preview); hover lights the row under the pointer; click confirms it. */
 	routeMouse(event: SgrMouseEvent, line: number, _col: number): void {
 		if (this.#committing) return;
-		if (event.wheel !== null) {
-			this.#selectList.handleWheel(event.wheel);
-			return;
-		}
-		const index = this.#selectList.hitTest(line - this.#listRowStart);
-		if (event.motion) {
-			this.#selectList.setHoverIndex(index ?? null);
-			return;
-		}
-		if (event.leftClick && index !== undefined) {
-			this.#selectList.clickItem(index);
-		}
+		routeSelectListMouse(this.#selectList, event, line - this.#listRowStart);
 	}
 
 	render(width: number): readonly string[] {

package/src/modes/setup-wizard/scenes/providers.ts

@@ -74,7 +74,8 @@ class ProvidersSceneController implements SetupSceneController {
 			return;
 		}
 		if (event.motion) this.#tabBar.setHoverTab(null);
-		const bodyLine = line - this.#tabRowCount - 1;
+		const spacerRowsAfterTabs = 1;
+		const bodyLine = line - this.#tabRowCount - spacerRowsAfterTabs;
 		if (tab.routeMouse) {
 			tab.routeMouse(event, bodyLine, col);
 			return;

package/src/modes/setup-wizard/scenes/theme.ts

@@ -1,5 +1,6 @@
 import {
 	padding,
+	routeSelectListMouse,
 	type SelectItem,
 	SelectList,
 	type SgrMouseEvent,
@@ -128,18 +129,11 @@ class ThemeSceneController implements SetupSceneController {
 
 	/** Wheel moves the highlight (live preview); hover lights the row under the pointer; click confirms it. */
 	routeMouse(event: SgrMouseEvent, line: number, _col: number): void {
-		if (event.wheel !== null) {
-			this.#selectList.handleWheel(event.wheel);
-			return;
-		}
-		const index = this.#listRowStart >= 0 ? this.#selectList.hitTest(line - this.#listRowStart) : undefined;
-		if (event.motion) {
-			this.#selectList.setHoverIndex(index ?? null);
-			return;
-		}
-		if (event.leftClick && index !== undefined) {
-			this.#selectList.clickItem(index);
-		}
+		// Mirror the pre-helper flow: wheel/motion are always processed, but a
+		// hidden list (#listRowStart < 0, e.g. while loading all themes) must
+		// never hit-test a row — route through a line that resolves to undefined.
+		const listLine = this.#listRowStart >= 0 ? line - this.#listRowStart : Number.NEGATIVE_INFINITY;
+		routeSelectListMouse(this.#selectList, event, listLine);
 	}
 
 	render(width: number): readonly string[] {

package/src/modes/setup-wizard/scenes/web-search.ts

@@ -1,4 +1,10 @@
-import { type SelectItem, SelectList, type SgrMouseEvent, truncateToWidth } from "@oh-my-pi/pi-tui";
+import {
+	routeSelectListMouse,
+	type SelectItem,
+	SelectList,
+	type SgrMouseEvent,
+	truncateToWidth,
+} from "@oh-my-pi/pi-tui";
 import { SETTINGS_SCHEMA } from "../../../config/settings-schema";
 import { getSearchProvider, setPreferredSearchProvider } from "../../../web/search/provider";
 import { isSearchProviderPreference, type SearchProviderId } from "../../../web/search/types";
@@ -59,18 +65,7 @@ export class WebSearchTab implements SetupTab {
 
 	/** Wheel moves the highlight; hover lights the row under the pointer; click confirms it. */
 	routeMouse(event: SgrMouseEvent, line: number, _col: number): void {
-		if (event.wheel !== null) {
-			this.#list.handleWheel(event.wheel);
-			return;
-		}
-		const index = this.#list.hitTest(line - this.#listRowStart);
-		if (event.motion) {
-			this.#list.setHoverIndex(index ?? null);
-			return;
-		}
-		if (event.leftClick && index !== undefined) {
-			this.#list.clickItem(index);
-		}
+		routeSelectListMouse(this.#list, event, line - this.#listRowStart);
 	}
 
 	invalidate(): void {

package/src/modes/setup-wizard/wizard-overlay.ts

@@ -3,7 +3,8 @@ import {
 	matchesKey,
 	type OverlayFocusOwner,
 	padding,
-	parseSgrMouse,
+	routeSgrMouseInput,
+	type SgrMouseEvent,
 	truncateToWidth,
 	visibleWidth,
 } from "@oh-my-pi/pi-tui";
@@ -104,7 +105,9 @@ export class SetupWizardComponent implements Component, OverlayFocusOwner {
 	handleInput(data: string): void {
 		if (this.#phase === "done") return;
 		if (data.startsWith("\x1b[<")) {
-			this.#handleMouse(data);
+			routeSgrMouseInput(data, event => {
+				this.#routeMouseEvent(event);
+			});
 			return;
 		}
 		if (matchesKey(data, "ctrl+c")) {
@@ -146,9 +149,7 @@ export class SetupWizardComponent implements Component, OverlayFocusOwner {
 	 * advances the splash/outro like Enter. Raw reports never reach scene
 	 * keyboard input.
 	 */
-	#handleMouse(data: string): void {
-		const event = parseSgrMouse(data);
-		if (!event) return;
+	#routeMouseEvent(event: SgrMouseEvent): void {
 		if (this.#phase === "splash" || this.#phase === "outro") {
 			if (!event.leftClick) return;
 			if (this.#phase === "splash") this.#beginScene();

package/src/modes/theme/mermaid-rendering.test.ts

@@ -0,0 +1,53 @@
+import { afterEach, beforeAll, describe, expect, it } from "bun:test";
+import { Markdown } from "@oh-my-pi/pi-tui";
+import { Settings } from "../../config/settings";
+import { buildSystemPrompt } from "../../system-prompt";
+import { getMarkdownTheme, getThemeByName, setMarkdownMermaidRendering, setThemeInstance } from "./theme";
+
+const workspaceTree = {
+	rootPath: "/tmp/project",
+	rendered: "",
+	truncated: false,
+	totalLines: 0,
+	agentsMdFiles: [],
+};
+
+function stripAnsi(text: string): string {
+	return text.replace(/\x1b\[[0-9;]*m/g, "");
+}
+
+beforeAll(async () => {
+	await Settings.init({ inMemory: true });
+	const theme = await getThemeByName("dark");
+	if (!theme) throw new Error("theme unavailable");
+	setThemeInstance(theme);
+});
+
+afterEach(() => {
+	setMarkdownMermaidRendering(true);
+});
+
+describe("Mermaid rendering setting", () => {
+	it("removes the Mermaid prompt note when rendering is disabled", async () => {
+		const { systemPrompt } = await buildSystemPrompt({
+			renderMermaid: false,
+			contextFiles: [],
+			skills: [],
+			toolNames: [],
+			workspaceTree,
+		});
+
+		expect(systemPrompt.join("\n")).not.toContain("```mermaid");
+	});
+
+	it("falls back to a highlighted code fence when rendering is disabled", () => {
+		setMarkdownMermaidRendering(false);
+
+		const markdown = new Markdown("```mermaid\ngraph TD\n  A --> B\n```", 0, 0, getMarkdownTheme());
+		const lines = stripAnsi(markdown.render(80).join("\n"));
+
+		expect(lines).toContain("```mermaid");
+		expect(lines).toContain("graph TD");
+		expect(lines).toContain("-->");
+	});
+});

package/src/modes/theme/theme.ts

@@ -228,7 +228,9 @@ export type SymbolKey =
 	| "tool.review"
 	| "tool.inspectImage"
 	| "tool.goal"
-	| "tool.irc";
+	| "tool.irc"
+	| "tool.delete"
+	| "tool.move";
 
 type SymbolMap = Record<SymbolKey, string>;
 
@@ -430,6 +432,8 @@ const UNICODE_SYMBOLS: SymbolMap = {
 	"tool.inspectImage": "🖼",
 	"tool.goal": "◎",
 	"tool.irc": "✉",
+	"tool.delete": "🗑",
+	"tool.move": "➜",
 };
 
 const NERD_SYMBOLS: SymbolMap = {
@@ -735,6 +739,8 @@ const NERD_SYMBOLS: SymbolMap = {
 	"tool.inspectImage": "\uEAEA",
 	"tool.goal": "\uEBF8",
 	"tool.irc": "\uF086",
+	"tool.delete": "\uf12d",
+	"tool.move": "\uf061",
 };
 
 const ASCII_SYMBOLS: SymbolMap = {
@@ -933,6 +939,8 @@ const ASCII_SYMBOLS: SymbolMap = {
 	"tool.inspectImage": "[i]",
 	"tool.goal": "(o)",
 	"tool.irc": "irc",
+	"tool.delete": "rm",
+	"tool.move": "mv",
 };
 
 const SYMBOL_PRESETS: Record<SymbolPreset, SymbolMap> = {
@@ -2824,23 +2832,36 @@ export function getSymbolTheme(): SymbolTheme {
 
 let cachedMarkdownTheme: MarkdownTheme | undefined;
 let cachedMarkdownThemeRef: Theme | undefined;
+let markdownMermaidRendering = true;
+
+export function setMarkdownMermaidRendering(enabled: boolean): void {
+	if (markdownMermaidRendering === enabled) return;
+	markdownMermaidRendering = enabled;
+	cachedMarkdownTheme = undefined;
+}
 
 export function getMarkdownTheme(): MarkdownTheme {
 	if (cachedMarkdownTheme !== undefined && cachedMarkdownThemeRef === theme) {
 		return cachedMarkdownTheme;
 	}
-	// Mermaid ASCII diagrams render with the active palette so they read as
-	// content rather than raw monochrome. Roles mirror the SVG renderer's
-	// mapping; `text`/`muted`/`border`/`borderMuted`/`accent` exist in every theme.
-	const mermaidColorMode = theme.getColorMode() === "truecolor" ? "truecolor" : "ansi256";
-	const mermaidTheme = {
-		fg: theme.getColorHex("text"),
-		border: theme.getColorHex("border"),
-		line: theme.getColorHex("muted"),
-		arrow: theme.getColorHex("accent"),
-		corner: theme.getColorHex("muted"),
-		junction: theme.getColorHex("borderMuted"),
-	};
+	const mermaid = markdownMermaidRendering
+		? (() => {
+				// Mermaid ASCII diagrams render with the active palette so they read as
+				// content rather than raw monochrome. Roles mirror the SVG renderer's
+				// mapping; `text`/`muted`/`border`/`borderMuted`/`accent` exist in every theme.
+				const mermaidColorMode =
+					theme.getColorMode() === "truecolor" ? ("truecolor" as const) : ("ansi256" as const);
+				const mermaidTheme = {
+					fg: theme.getColorHex("text"),
+					border: theme.getColorHex("border"),
+					line: theme.getColorHex("muted"),
+					arrow: theme.getColorHex("accent"),
+					corner: theme.getColorHex("muted"),
+					junction: theme.getColorHex("borderMuted"),
+				};
+				return { mermaidColorMode, mermaidTheme };
+			})()
+		: undefined;
 	const markdownTheme: MarkdownTheme = {
 		heading: (text: string) => theme.fg("mdHeading", text),
 		link: (text: string) => theme.fg("mdLink", text),
@@ -2857,8 +2878,14 @@ export function getMarkdownTheme(): MarkdownTheme {
 		underline: (text: string) => theme.underline(text),
 		strikethrough: (text: string) => chalk.strikethrough(text),
 		symbols: getSymbolTheme(),
-		resolveMermaidAscii: (source, maxWidth) =>
-			resolveMermaidAscii(source, { maxWidth, theme: mermaidTheme, colorMode: mermaidColorMode }),
+		resolveMermaidAscii: mermaid
+			? (source, maxWidth) =>
+					resolveMermaidAscii(source, {
+						maxWidth,
+						theme: mermaid.mermaidTheme,
+						colorMode: mermaid.mermaidColorMode,
+					})
+			: undefined,
 		highlightCode: (code: string, lang?: string): string[] => {
 			const validLang = lang && nativeSupportsLanguage(lang) ? lang : undefined;
 			const highlighted = highlightCached(code, validLang, theme);

package/src/modes/types.ts

@@ -159,6 +159,12 @@ export interface InteractiveModeContext {
 	loopLimit?: LoopLimitRuntime;
 	planModePlanFilePath?: string;
 	hideThinkingBlock: boolean;
+	/**
+	 * Effective thinking-block visibility: true when hidden by user setting OR
+	 * thinking level is "off". Read this in render paths instead of
+	 * {@link hideThinkingBlock} so blocks are auto-hidden when thinking is off.
+	 */
+	readonly effectiveHideThinkingBlock: boolean;
 	proseOnlyThinking: boolean;
 	compactionQueuedMessages: CompactionQueuedMessage[];
 	pendingTools: Map<string, ToolExecutionHandle>;
@@ -288,6 +294,8 @@ export interface InteractiveModeContext {
 	findLastAssistantMessage(): AssistantMessage | undefined;
 	extractAssistantText(message: AssistantMessage): string;
 	updateEditorTopBorder(): void;
+	/** Refresh the running-subagents status badge from the active local or collab registry. */
+	syncRunningSubagentBadge(): void;
 	updateEditorBorderColor(): void;
 	rebuildChatFromMessages(): void;
 	setTodos(todos: TodoItem[] | TodoPhase[]): void;
@@ -320,7 +328,7 @@ export interface InteractiveModeContext {
 	handleCompactCommand(customInstructions?: string, mode?: CompactMode): Promise<CompactionOutcome>;
 	handleHandoffCommand(customInstructions?: string): Promise<void>;
 	handleShakeCommand(mode: ShakeMode): Promise<void>;
-	handleMoveCommand(targetPath: string): Promise<void>;
+	handleMoveCommand(targetPath?: string): Promise<void>;
 	handleRenameCommand(title: string): Promise<void>;
 	handleMemoryCommand(text: string): Promise<void>;
 	handleSTTToggle(): Promise<void>;

package/src/modes/utils/interactive-context-helpers.ts

@@ -18,7 +18,7 @@ export function createAssistantMessageComponent(
 ): AssistantMessageComponent {
 	return new AssistantMessageComponent(
 		message,
-		ctx.hideThinkingBlock,
+		ctx.effectiveHideThinkingBlock,
 		() => ctx.ui.requestRender(),
 		ctx.viewSession.extensionRunner?.getAssistantThinkingRenderers(),
 		ctx.ui.imageBudget,

package/src/priority.json

@@ -3,6 +3,18 @@
 		"cerebras/zai-glm-4.7",
 		"cerebras/zai-glm-4.6",
 		"cerebras/zai-glm",
+		"google-antigravity/gemini-3.1-flash-lite",
+		"google-gemini-cli/gemini-3.1-flash-lite",
+		"gemini-3.1-flash-lite",
+		"gemini-3-1-flash-lite",
+		"flash-lite",
+		"google-antigravity/gemini-3.5-flash",
+		"google-antigravity/gemini-3-flash",
+		"google-gemini-cli/gemini-3.5-flash",
+		"google-gemini-cli/gemini-3-flash",
+		"gemini-3.5-flash",
+		"gemini-3-5-flash",
+		"gemini-3-flash",
 		"haiku-4-5",
 		"haiku-4.5",
 		"haiku",
@@ -10,6 +22,9 @@
 		"mini"
 	],
 	"slow": [
+		"openai-codex/gpt-5.5",
+		"openai-codex/gpt-5.4",
+		"openai-codex/gpt-5.3-codex",
 		"gpt-5.5",
 		"gpt-5.4",
 		"gpt-5.3-codex",

package/src/prompts/advisor/active-repo-watchdog.md

@@ -0,0 +1,6 @@
+Especially pay attention to:
+<attention>
+The session cwd is outside git, and exactly one direct child git repository was detected at `{{relativeRepoRoot}}`.
+
+Paths under `{{relativeRepoRoot}}/` are the active project. Do not claim work is missing, destroyed, or absent at the parent cwd until you have checked under `{{relativeRepoRoot}}/`.
+</attention>

package/src/prompts/advisor/system.md

@@ -2,16 +2,19 @@
 RFC 2119 applies to MUST, REQUIRED, SHOULD, RECOMMENDED, MAY, OPTIONAL. `NEVER` and `AVOID` are aliases for `MUST NOT` and `SHOULD NOT`.
 </system-conventions>
 
-You bring a different angle, and advocate for the user and the code-quality & robustness.
-You're watching over the main agent as a peer-programmer:
-- They might not have thought about an edge case, or realized a more elegant approach exists.
-- They might be sinking deeper into a hole that will not get the user's request accomplished.
+You bring a different angle, advocating for the user and for code quality & robustness.
+You shadow the main agent as a peer programmer:
+- Sharpen their strategy, problem-solving, and judgment; point to the cleaner approach when one exists.
+- Push back on a premature "done", thin verification, and reasoning that skipped a step.
+- Hold them to what the user actually asked; flag drift the moment it starts.
+- Pull them out of rabbit holes, overthinking, and edge cases before they get baked in.
 
-Your job is to offer that view before they sink work into the wrong direction.
+Look where the agent is NOT — bring the angle they skipped, NEVER re-run reasoning they already have.
+Offer that view before they sink work into the wrong direction.
 
 <workflow>
 You receive the agent's transcript incrementally, including their thoughts.
-You have read-only access through `read`, `search`, `find` to verify your suspicions.
+You have read-only access through `read`, `grep`, `glob` to verify your suspicions.
 Keep exploration lean:
 - 2–3 tool calls per advise.
 - Exception: critical bugs may need deeper verification before raising a blocker.
@@ -24,8 +27,9 @@ Keep exploration lean:
 - Offer alternatives, not lectures.
 - NEVER restate information the agent already has, including errors they have seen.
 - Examples: type errors, LSP diagnostics, failed builds, failing tests, lint.
-- NEVER repeat advice you already gave, and NEVER send the same advice twice.
+- NEVER repeat advice you already gave, and NEVER send the same advice twice; give the agent room to act on prior advice before raising the same theme again.
 - NEVER nitpick about things user stated they are okay with. You are the advocate for the user.
+- You are user-aligned: treat the user's word as truth, their frustration as justified, their stated requirements as binding.
 </communication>
 
 <critical>
@@ -40,6 +44,11 @@ NEVER advise on intent or process:
 - Intent is the agent's domain; it defaults to informed action.
 - Your lane: correctness, edge cases, design, process.
 
+Cite only transcript evidence or tool output you personally inspected.
+Arguments absent from the rendered transcript are UNKNOWN:
+- NEVER assert concrete values, array indexes, serialization shapes, or caller mistakes for hidden arguments.
+- Hidden/omitted arguments + failure? Say what is observable; suggest inspecting the missing field.
+- Example: if `grep` times out and transcript only shows `pattern`, NEVER claim `paths[0]`, array flattening, or malformed `paths`.
 Cite the exact instruction or risk.
 </critical>
 
@@ -61,6 +70,8 @@ Cite the exact instruction or risk.
   - Not parallelizing when user request is obviously parallelizable.
   - Missing constraint.
   - Edge case about to be baked in.
+  - Churning — repeating failed attempts or cycling approaches without making progress.
+  - User shows frustration or keeps correcting the agent, and it isn't adjusting.
 
 **`blocker`**
 - Stop and reconsider.
@@ -68,6 +79,9 @@ Cite the exact instruction or risk.
   - Waste the users time with a larger refactor.
   - Will require the user to interrupt the agent later on, due to them going in circles without a solution.
   - Be fundamentally unsound.
+  - Hand off as "done" work that was never exercised against the user's actual ask.
+  - Ship on verification too thin to catch the risk it just took on.
+  - Be lost in overthinking or a rabbit hole that is plainly stalling the user's goal.
 - Verify thoroughly before raising.
 </completeness>
 

package/src/prompts/agents/designer.md

@@ -16,7 +16,7 @@ Implement and review UI designs. Edit files, create components, run commands whe
 
 <design-system>
 Treat the design system as the foundation — UI built without one collapses into inconsistency. Work four phases in order:
-1. **Token-first analysis (before any CSS/JSX/Svelte).** `search`/`read` for the design tokens (colors, spacing, typography, shadows, radii), theme files (CSS variables, Tailwind config, `theme.ts`), and shared primitives (Button, Card, Input, Layout). Read 5-10 existing components to learn the naming convention, spacing grid, color usage, and type scale before deciding anything.
+1. **Token-first analysis (before any CSS/JSX/Svelte).** `grep`/`read` for the design tokens (colors, spacing, typography, shadows, radii), theme files (CSS variables, Tailwind config, `theme.ts`), and shared primitives (Button, Card, Input, Layout). Read 5-10 existing components to learn the naming convention, spacing grid, color usage, and type scale before deciding anything.
 2. **No coherent system? Build the minimal one first.** Extract what exists, then define a palette, type scale, spacing scale (4px/8px base), radii/shadows/transitions, and primitive components — THEN implement the request against it.
 3. **Compose with the system, never around it.** Colors → tokens/CSS variables, never hardcoded hex; spacing → scale values, never arbitrary px; type → scale steps; components → extend/compose existing primitives, not one-off div soup. Need something outside the system? Add the new token to the system first, then use it — never a one-off override.
 4. **Verify before done.** Every color a token, every spacing on the scale, every component on the existing composition pattern, zero magic numbers — a designer would see consistency across old and new. Any "no" → not done.

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, search, find, web_search
+tools: read, grep, glob, web_search
 model: pi/smol
 thinking-level: medium
 read-summarize: false

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, search, find, bash, lsp, web_search, ast_grep
+tools: read, grep, glob, bash, lsp, web_search, ast_grep
 model: pi/smol
 thinking-level: minimal
 read-summarize: false
@@ -86,7 +86,7 @@ You MUST operate as read-only on the user's project. You NEVER modify any projec
 
 ## 3. Investigate
 - Read `package.json`, `Cargo.toml`, or equivalent for version info and entry points.
-- Use `search`, `find`, and `ast_grep` to locate relevant source, type definitions, and docs. Parallelize searches.
+- Use `grep`, `glob`, 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, search, find, bash, lsp, web_search, ast_grep
+tools: read, grep, glob, bash, lsp, web_search, ast_grep
 spawns: explore
 model: pi/plan, pi/slow
 thinking-level: high
@@ -14,7 +14,7 @@ Analyze the codebase and the user's request. Produce a detailed implementation p
 2. Identify ambiguities; list assumptions
 
 ## Phase 2: Explore
-1. Find existing patterns via `search`/`find`
+1. Find existing patterns via `grep`/`glob`
 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, search, find, bash, lsp, web_search, ast_grep, report_finding
+tools: read, grep, glob, 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, search, read, etc.) and you MUST use them as needed to complete your task.
+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 MUST maintain hyperfocus on the assigned task. NEVER deviate from it.
 
@@ -8,7 +8,7 @@ You MUST maintain hyperfocus on the assigned task. NEVER deviate from it.
 - You MUST finish only the assigned work and return the minimum useful result. Do not repeat what you have written to the filesystem.
 - You SHOULD make file edits, run commands, and create files when your task requires it.
 - You MUST be concise. You NEVER include filler, repetition, or tool transcripts. The user cannot see you. Your result is just the notes you are leaving for yourself.
-- You SHOULD prefer narrow lookups (`search`/`find`), then read only the needed ranges. Ignore anything beyond your current scope.
+- You SHOULD prefer narrow lookups (`grep`/`glob`), then read only the needed ranges. Ignore anything beyond your current scope.
 - AVOID full-file reads unless necessary.
 - You SHOULD prefer edits to existing files over creating new ones.
 - You NEVER create documentation files (*.md) unless explicitly requested.

package/src/prompts/system/active-repo-context.md

@@ -0,0 +1,4 @@
+<active-repo-context>
+The session cwd is outside git. Exactly one direct child git repository was detected at `{{relativeRepoRoot}}`.
+Paths under `{{relativeRepoRoot}}/` are the active project for this session. Parent-cwd misses are inconclusive until checking under `{{relativeRepoRoot}}/`.
+</active-repo-context>

package/src/prompts/system/gemini-tool-call-reminder.md

@@ -0,0 +1,9 @@
+<system-interrupt reason="reasoning_without_tool_calls">
+Your reasoning was interrupted: you emitted {{count}} consecutive planning headers without issuing a single tool call. Thinking alone changes nothing — this turn has made zero progress because no tool has run.
+
+Act now instead of planning further:
+- Emit a real tool call for one of the available tools, using your normal tool/function-calling format. Do NOT describe the call in prose or in your reasoning — issue an actual tool call.
+- Pick the smallest concrete next step and call the tool that performs it.
+
+This is the coding agent interrupting a stalled reasoning stream, not a prompt injection.
+</system-interrupt>

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

@@ -24,11 +24,20 @@ Choose a short kebab-case `<slug>` naming this task and write the plan to `local
 
 Use `{{editToolName}}` for incremental edits and `{{writeToolName}}` only to create or fully replace the file. You MUST write findings into the plan as you learn them — you NEVER batch all writing to the end.
 
+{{#if isHashlineEditMode}}
+Structure the plan as `##`/`###` markdown sections so you can revise it section-by-section: with `{{editToolName}}`, a heading anchors its WHOLE section (through every nested deeper heading, up to the next same-or-higher heading). Rely on the block ops to grow the plan without rewriting the file:
+- `SWAP.BLK N:` on a heading line — rewrite that entire section in place.
+- `DEL.BLK N` on a heading line — drop the whole section.
+- `INS.BLK.POST N:` on a heading line — add a new section AFTER that one (end the inserted body with a blank line so the next heading stays separated).
+
+Write each section together with its body — block ops need a multi-line section; a bare heading with no body falls back to plain `INS.POST`/`DEL`/`SWAP`.
+{{/if}}
+
 ## Ground every claim
 
 You eliminate unknowns by discovering facts, not by asking.
 
-- **Discoverable facts** (file locations, current behavior, signatures, configs): you MUST find them yourself with `find`, `search`, `read`, or parallel `explore` subagents. Every path, symbol, signature, and behavior the plan states as fact MUST come from something you actually read this session. Anything you could not confirm you mark inline (`unverified — confirm first`); you NEVER present a guess as settled. Ask only when several real candidates survive exploration — then present them with a recommendation.
+- **Discoverable facts** (file locations, current behavior, signatures, configs): you MUST find them yourself with `glob`, `grep`, `read`, or parallel `explore` subagents. Every path, symbol, signature, and behavior the plan states as fact MUST come from something you actually read this session. Anything you could not confirm you mark inline (`unverified — confirm first`); you NEVER present a guess as settled. Ask only when several real candidates survive exploration — then present them with a recommendation.
 - **Preferences and tradeoffs** (intent, UX, scope edges, performance-vs-simplicity): not derivable from code. Surface these early via `{{askToolName}}` with 2–4 mutually exclusive options and a recommended default. Left unanswered → proceed with the default and record it under Assumptions.
 
 Every question MUST change the plan or settle a load-bearing choice. Batch them. You NEVER ask what exploration answers, and you NEVER ask filler.
@@ -48,7 +57,7 @@ Every question MUST change the plan or settle a load-bearing choice. Batch them.
 ## Workflow — iterative
 
 <procedure>
-1. **Explore** — use `find`/`search`/`read` to ground in the real code; hunt for existing functions, utilities, and conventions to reuse before proposing anything new.
+1. **Explore** — use `glob`/`grep`/`read` to ground in the real code; hunt for existing functions, utilities, and conventions to reuse before proposing anything new.
 2. **Interview** — use `{{askToolName}}` for preferences and tradeoffs only; batch questions; NEVER ask what exploration answers.
 3. **Update** — revise the plan with `{{editToolName}}` as you learn.
 4. **Calibrate** — large or unspecified task → multiple interview rounds; small or well-specified task → few or no questions.
@@ -73,7 +82,7 @@ Write scannable markdown using these sections. Let depth track the change, not a
   - State the concrete edit — verb + exact target + the new behavior — NEVER just an area to "update" or "handle".
   - Name existing functions/utilities to reuse, with paths; introduce new code only with a one-line note that no existing equivalent was found.
   - For a new or changed symbol whose callers must fit it, or whose value is load-bearing (enum member, error/log string, config key, wire/JSON field), give the exact signature or literal.
-  - For a rename, signature change, or removal, list every callsite to update (or the exact `search` that returns exactly them) and what to delete — default to a clean cutover with no dead code or compatibility aliases.
+  - For a rename, signature change, or removal, list every callsite to update (or the exact `grep` that returns exactly them) and what to delete — default to a clean cutover with no dead code or compatibility aliases.
   - When rival patterns exist, name the one to copy and the one to avoid.
   - Specify the edge and failure handling for each new path (empty, missing, conflict, error), or state that none is needed and why.
 - **Critical files & anchors** — the ≤5 files that disambiguate non-obvious work, each as path + the symbol or region + a one-line reason. Line numbers are hints; the implementer re-reads before editing. Skip files already obvious from the Approach.

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

@@ -26,7 +26,7 @@ Before making changes within these directories, you MUST read:
 {{/if}}
 
 {{#ifAny contextFiles.length agentsMdSearch.files.length}}
-The context files above are loaded automatically. You NEVER `search`/`find` for `AGENTS.md`, `CLAUDE.md`, `.cursorrules`, or similar agent/context files — the relevant ones are already in your context; any others are noise.
+The context files above are loaded automatically. You NEVER `grep`/`glob` for `AGENTS.md`, `CLAUDE.md`, `.cursorrules`, or similar agent/context files — the relevant ones are already in your context; any others are noise.
 {{/ifAny}}
 
 {{#if includeWorkspaceTree}}
@@ -35,7 +35,7 @@ The context files above are loaded automatically. You NEVER `search`/`find` for
 Working directory layout (sorted by mtime, recent first; depth ≤ 3):
 {{workspaceTree.rendered}}
 {{#if workspaceTree.truncated}}
-(some entries elided to keep the tree short — use `find`/`read` to drill in)
+(some entries elided to keep the tree short — use `glob`/`read` to drill in)
 {{/if}}
 </workspace-tree>
 {{/if}}