@oh-my-pi/pi-coding-agent 13.1.2 → 13.2.1

package/src/modes/components/diff.ts

@@ -1,3 +1,4 @@
+import { getIndentation } from "@oh-my-pi/pi-utils";
 import * as Diff from "diff";
 import { theme } from "../../modes/theme/theme";
 import { replaceTabs } from "../../tools/render-utils";
@@ -12,26 +13,30 @@ const DIM_OFF = "\x1b[22m";
  * before the first non-whitespace character; remaining tabs in code
  * content are replaced with spaces (like replaceTabs).
  */
-function visualizeIndent(text: string): string {
+function visualizeIndent(text: string, filePath?: string): string {
 	const match = text.match(/^([ \t]+)/);
-	if (!match) return replaceTabs(text);
+	if (!match) return replaceTabs(text, filePath);
 	const indent = match[1];
 	const rest = text.slice(indent.length);
-	// Normalize: collapse 3-space groups (tab-width) into tab arrows,
-	// then handle remaining tabs and lone spaces.
-	const normalized = indent.replaceAll("\t", "   ");
+	const indentation = getIndentation(filePath);
+	const tabWidth = indentation.length;
+	const leftPadding = Math.floor(tabWidth / 2);
+	const rightPadding = Math.max(0, tabWidth - leftPadding - 1);
+	const tabMarker = `${DIM}${" ".repeat(leftPadding)}→${" ".repeat(rightPadding)}${DIM_OFF}`;
+	// Normalize: collapse configured tab-width groups into tab markers, then handle remaining spaces.
+	const normalized = indent.replaceAll("\t", indentation);
 	let visible = "";
 	let pos = 0;
 	while (pos < normalized.length) {
-		if (pos + 3 <= normalized.length && normalized.slice(pos, pos + 3) === "   ") {
-			visible += `${DIM} → ${DIM_OFF}`;
-			pos += 3;
+		if (pos + tabWidth <= normalized.length && normalized.slice(pos, pos + tabWidth) === indentation) {
+			visible += tabMarker;
+			pos += tabWidth;
 		} else {
 			visible += `${DIM}·${DIM_OFF}`;
 			pos++;
 		}
 	}
-	return `${visible}${replaceTabs(rest)}`;
+	return `${visible}${replaceTabs(rest, filePath)}`;
 }
 
 /**
@@ -96,7 +101,7 @@ function renderIntraLineDiff(oldContent: string, newContent: string): { removedL
 }
 
 export interface RenderDiffOptions {
-	/** File path (unused, kept for API compatibility) */
+	/** File path used to resolve indentation (.editorconfig + defaults) */
 	filePath?: string;
 }
 
@@ -106,7 +111,7 @@ export interface RenderDiffOptions {
  * - Removed lines: red, with inverse on changed tokens
  * - Added lines: green, with inverse on changed tokens
  */
-export function renderDiff(diffText: string, _options: RenderDiffOptions = {}): string {
+export function renderDiff(diffText: string, options: RenderDiffOptions = {}): string {
 	const lines = diffText.split("\n");
 	const result: string[] = [];
 
@@ -154,30 +159,55 @@ export function renderDiff(diffText: string, _options: RenderDiffOptions = {}):
 				const added = addedLines[0];
 
 				const { removedLine, addedLine } = renderIntraLineDiff(
-					replaceTabs(removed.content),
-					replaceTabs(added.content),
+					replaceTabs(removed.content, options.filePath),
+					replaceTabs(added.content, options.filePath),
 				);
 
-				result.push(theme.fg("toolDiffRemoved", formatLine("-", removed.lineNum, visualizeIndent(removedLine))));
-				result.push(theme.fg("toolDiffAdded", formatLine("+", added.lineNum, visualizeIndent(addedLine))));
+				result.push(
+					theme.fg(
+						"toolDiffRemoved",
+						formatLine("-", removed.lineNum, visualizeIndent(removedLine, options.filePath)),
+					),
+				);
+				result.push(
+					theme.fg("toolDiffAdded", formatLine("+", added.lineNum, visualizeIndent(addedLine, options.filePath))),
+				);
 			} else {
 				// Show all removed lines first, then all added lines
 				for (const removed of removedLines) {
 					result.push(
-						theme.fg("toolDiffRemoved", formatLine("-", removed.lineNum, visualizeIndent(removed.content))),
+						theme.fg(
+							"toolDiffRemoved",
+							formatLine("-", removed.lineNum, visualizeIndent(removed.content, options.filePath)),
+						),
 					);
 				}
 				for (const added of addedLines) {
-					result.push(theme.fg("toolDiffAdded", formatLine("+", added.lineNum, visualizeIndent(added.content))));
+					result.push(
+						theme.fg(
+							"toolDiffAdded",
+							formatLine("+", added.lineNum, visualizeIndent(added.content, options.filePath)),
+						),
+					);
 				}
 			}
 		} else if (parsed.prefix === "+") {
 			// Standalone added line
-			result.push(theme.fg("toolDiffAdded", formatLine("+", parsed.lineNum, visualizeIndent(parsed.content))));
+			result.push(
+				theme.fg(
+					"toolDiffAdded",
+					formatLine("+", parsed.lineNum, visualizeIndent(parsed.content, options.filePath)),
+				),
+			);
 			i++;
 		} else {
 			// Context line
-			result.push(theme.fg("toolDiffContext", formatLine(" ", parsed.lineNum, visualizeIndent(parsed.content))));
+			result.push(
+				theme.fg(
+					"toolDiffContext",
+					formatLine(" ", parsed.lineNum, visualizeIndent(parsed.content, options.filePath)),
+				),
+			);
 			i++;
 		}
 	}

package/src/modes/components/extensions/extension-dashboard.ts

@@ -298,7 +298,7 @@ class TwoColumnBody implements Component {
 
 	render(width: number): string[] {
 		const leftWidth = Math.floor(width * 0.5);
-		const rightWidth = width - leftWidth - 3;
+		const rightWidth = Math.max(0, width - leftWidth - 3);
 
 		const leftLines = this.leftPane.render(leftWidth);
 		const rightLines = this.rightPane.render(rightWidth);

package/src/modes/components/extensions/inspector-panel.ts

@@ -35,12 +35,18 @@ export class InspectorPanel implements Component {
 		lines.push("");
 
 		// Description (wrapped)
-		if (ext.description) {
-			const wrapped = wrapTextWithAnsi(ext.description, width - 2);
+		const desc = ext.description;
+		const isValidDescription = typeof desc === "string" && desc.length > 0;
+		if (isValidDescription && width > 2) {
+			const wrapped = wrapTextWithAnsi(desc, width - 2);
 			for (const line of wrapped) {
 				lines.push(truncateToWidth(line, width));
 			}
 			lines.push("");
+		} else if (isValidDescription) {
+			// Width too small for wrapping, show truncated single line
+			lines.push(truncateToWidth(desc, width));
+			lines.push("");
 		}
 
 		// Origin

package/src/modes/components/footer.ts

@@ -1,7 +1,6 @@
 import * as fs from "node:fs";
 import { type Component, padding, truncateToWidth, visibleWidth } from "@oh-my-pi/pi-tui";
-import { formatNumber } from "@oh-my-pi/pi-utils";
-import { getProjectDir } from "@oh-my-pi/pi-utils/dirs";
+import { formatNumber, getProjectDir } from "@oh-my-pi/pi-utils";
 import { theme } from "../../modes/theme/theme";
 import type { AgentSession } from "../../session/agent-session";
 import { shortenPath } from "../../tools/render-utils";

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

@@ -1,6 +1,5 @@
 import * as os from "node:os";
-import { formatDuration, formatNumber } from "@oh-my-pi/pi-utils";
-import { getProjectDir } from "@oh-my-pi/pi-utils/dirs";
+import { formatDuration, formatNumber, getProjectDir } from "@oh-my-pi/pi-utils";
 import { theme } from "../../../modes/theme/theme";
 import { shortenPath } from "../../../tools/render-utils";
 import type { RenderedSegment, SegmentContext, StatusLineSegment, StatusLineSegmentId } from "./types";

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

@@ -13,17 +13,10 @@ import {
 	Text,
 	type TUI,
 } from "@oh-my-pi/pi-tui";
-import { logger } from "@oh-my-pi/pi-utils";
-import { getProjectDir } from "@oh-my-pi/pi-utils/dirs";
+import { getProjectDir, logger } from "@oh-my-pi/pi-utils";
 import type { Theme } from "../../modes/theme/theme";
 import { theme } from "../../modes/theme/theme";
-import {
-	computeEditDiff,
-	computeHashlineDiff,
-	computePatchDiff,
-	type EditDiffError,
-	type EditDiffResult,
-} from "../../patch";
+import { computeEditDiff, computeHashlineDiff, computePatchDiff, type DiffError, type DiffResult } from "../../patch";
 import { BASH_DEFAULT_PREVIEW_LINES } from "../../tools/bash";
 import {
 	formatArgsInline,
@@ -106,7 +99,7 @@ export class ToolExecutionComponent extends Container {
 		details?: any;
 	};
 	// Cached edit diff preview (computed when args arrive, before tool executes)
-	#editDiffPreview?: EditDiffResult | EditDiffError;
+	#editDiffPreview?: DiffResult | DiffError;
 	#editDiffArgsKey?: string; // Track which args the preview is for
 	// Cached converted images for Kitty protocol (which requires PNG), keyed by index
 	#convertedImages: Map<number, { data: string; mimeType: string }> = new Map();

package/src/modes/components/welcome.ts

@@ -1,5 +1,5 @@
 import { type Component, padding, truncateToWidth, visibleWidth } from "@oh-my-pi/pi-tui";
-import { APP_NAME } from "@oh-my-pi/pi-utils/dirs";
+import { APP_NAME } from "@oh-my-pi/pi-utils";
 import { theme } from "../../modes/theme/theme";
 
 export interface RecentSession {

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

@@ -10,8 +10,7 @@ import {
 } from "@oh-my-pi/pi-ai";
 import { copyToClipboard } from "@oh-my-pi/pi-natives";
 import { Loader, Markdown, padding, Spacer, Text, visibleWidth } from "@oh-my-pi/pi-tui";
-import { formatDuration, Snowflake } from "@oh-my-pi/pi-utils";
-import { setProjectDir } from "@oh-my-pi/pi-utils/dirs";
+import { formatDuration, Snowflake, setProjectDir } from "@oh-my-pi/pi-utils";
 import { $ } from "bun";
 import { reset as resetCapabilities } from "../../capability";
 import { loadCustomShare } from "../../export/custom-share";

package/src/modes/controllers/mcp-command-controller.ts

@@ -4,7 +4,7 @@
  * Handles /mcp subcommands for managing MCP servers.
  */
 import { Spacer, Text } from "@oh-my-pi/pi-tui";
-import { getMCPConfigPath, getProjectDir } from "@oh-my-pi/pi-utils/dirs";
+import { getMCPConfigPath, getProjectDir } from "@oh-my-pi/pi-utils";
 import type { SourceMeta } from "../../capability/types";
 import { analyzeAuthError, discoverOAuthEndpoints, MCPManager } from "../../mcp";
 import { connectToServer, disconnectServer, listTools } from "../../mcp/client";

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

@@ -2,7 +2,7 @@ import type { ThinkingLevel } from "@oh-my-pi/pi-agent-core";
 import { getOAuthProviders, type OAuthProvider } from "@oh-my-pi/pi-ai";
 import type { Component } from "@oh-my-pi/pi-tui";
 import { Input, Loader, Spacer, Text } from "@oh-my-pi/pi-tui";
-import { getAgentDbPath, getProjectDir } from "@oh-my-pi/pi-utils/dirs";
+import { getAgentDbPath, getProjectDir } from "@oh-my-pi/pi-utils";
 import { MODEL_ROLES } from "../../config/model-registry";
 import { settings } from "../../config/settings";
 import { DebugSelectorComponent } from "../../debug";

package/src/modes/controllers/ssh-command-controller.ts

@@ -4,7 +4,7 @@
  * Handles /ssh subcommands for managing SSH host configurations.
  */
 import { Spacer, Text } from "@oh-my-pi/pi-tui";
-import { getProjectDir, getSSHConfigPath } from "@oh-my-pi/pi-utils/dirs";
+import { getProjectDir, getSSHConfigPath } from "@oh-my-pi/pi-utils";
 import { type SSHHost, sshCapability } from "../../capability/ssh";
 import { loadCapability } from "../../discovery";
 import { addSSHHost, readSSHConfigFile, removeSSHHost, type SSHHostConfig } from "../../ssh/config-writer";

package/src/modes/interactive-mode.ts

@@ -15,8 +15,7 @@ import {
 	Text,
 	TUI,
 } from "@oh-my-pi/pi-tui";
-import { hsvToRgb, isEnoent, logger, postmortem } from "@oh-my-pi/pi-utils";
-import { APP_NAME, getProjectDir } from "@oh-my-pi/pi-utils/dirs";
+import { APP_NAME, getProjectDir, hsvToRgb, isEnoent, logger, postmortem } from "@oh-my-pi/pi-utils";
 import chalk from "chalk";
 import { KeybindingsManager } from "../config/keybindings";
 import { renderPromptTemplate } from "../config/prompt-templates";
@@ -776,7 +775,7 @@ export class InteractiveMode implements InteractiveModeContext {
 		await this.sessionManager.flush();
 
 		// Emit shutdown event to hooks
-		await this.session.emitCustomToolSessionEvent("shutdown");
+		await this.session.dispose();
 
 		if (this.isInitialized) {
 			this.ui.requestRender(true);

package/src/modes/shared.ts

@@ -1,8 +1,7 @@
 import * as fs from "node:fs";
 import * as path from "node:path";
 import type { TabBarTheme } from "@oh-my-pi/pi-tui";
-import { isEnoent } from "@oh-my-pi/pi-utils";
-import { getProjectDir } from "@oh-my-pi/pi-utils/dirs";
+import { getProjectDir, isEnoent } from "@oh-my-pi/pi-utils";
 import { theme } from "./theme/theme";
 
 // ═══════════════════════════════════════════════════════════════════════════

package/src/modes/theme/theme.ts

@@ -6,8 +6,7 @@ import {
 	supportsLanguage as nativeSupportsLanguage,
 } from "@oh-my-pi/pi-natives";
 import type { EditorTheme, MarkdownTheme, SelectListTheme, SymbolTheme } from "@oh-my-pi/pi-tui";
-import { adjustHsv, isEnoent, logger } from "@oh-my-pi/pi-utils";
-import { getCustomThemesDir } from "@oh-my-pi/pi-utils/dirs";
+import { adjustHsv, getCustomThemesDir, isEnoent, logger } from "@oh-my-pi/pi-utils";
 import { type Static, Type } from "@sinclair/typebox";
 import { TypeCompiler } from "@sinclair/typebox/compiler";
 import chalk from "chalk";

package/src/patch/index.ts

@@ -77,31 +77,7 @@ export { normalizeCreateContent, normalizeDiff, parseHunks as parseDiffHunks } f
 export type { EditRenderContext, EditToolDetails } from "./shared";
 // Rendering
 export { editToolRenderer, getLspBatchRequest } from "./shared";
-export type {
-	ApplyPatchOptions,
-	ApplyPatchResult,
-	ContextLineResult,
-	DiffError,
-	DiffError as EditDiffError,
-	DiffHunk,
-	DiffHunk as UpdateChunk,
-	DiffHunk as UpdateFileChunk,
-	DiffResult,
-	DiffResult as EditDiffResult,
-	FileChange,
-	FileSystem,
-	FuzzyMatch as EditMatch,
-	FuzzyMatch,
-	HashMismatch,
-	MatchOutcome as EditMatchOutcome,
-	MatchOutcome,
-	Operation,
-	PatchInput,
-	SequenceSearchResult,
-} from "./types";
-// Types
-// Legacy aliases for backwards compatibility
-export { ApplyPatchError, EditMatchError, ParseError } from "./types";
+export * from "./types";
 
 // ═══════════════════════════════════════════════════════════════════════════
 // Schemas

package/src/prompts/agents/designer.md

@@ -5,11 +5,8 @@ spawns: explore
 model: google-gemini-cli/gemini-3-pro, gemini-3-pro, gemini-3, pi/default
 ---
 
-<role>Senior design engineer with 10+ years shipping production interfaces. Implements UI, conducts design reviews, refines components.</role>
-
-<critical>
-You MAY make file edits, create components, and run commands—and SHOULD do so when needed.
-</critical>
+You are an expert UI/UX designer implementing and reviewing UI designs.
+You **MAY** make file edits, create components, and run commands—and **SHOULD** do so when needed.
 
 <strengths>
 - Translate design intent into working UI code
@@ -35,9 +32,9 @@ You MAY make file edits, create components, and run commands—and SHOULD do so
 </procedure>
 
 <directives>
-- You SHOULD prefer editing existing files over creating new ones
-- Changes MUST be minimal and consistent with existing code style
-- You MUST NOT create documentation files (*.md) unless explicitly requested
+- You **SHOULD** prefer editing existing files over creating new ones
+- Changes **MUST** be minimal and consistent with existing code style
+- You **MUST NOT** create documentation files (*.md) unless explicitly requested
 </directives>
 
 <avoid>
@@ -66,6 +63,6 @@ You MAY make file edits, create components, and run commands—and SHOULD do so
 
 <critical>
 Every interface should prompt "how was this made?" not "which AI made this?"
-You MUST commit to clear aesthetic direction and execute with precision.
-You MUST keep going until implementation is complete.
+You **MUST** commit to clear aesthetic direction and execute with precision.
+You **MUST** keep going until implementation is complete.
 </critical>

package/src/prompts/agents/explore.md

@@ -74,39 +74,31 @@ output:
           type: string
 ---
 
-<role>File search specialist and codebase scout. Quickly investigate codebase, return structured findings another agent can use without re-reading everything.</role>
+You are a file search specialist and a codebase scout.
 
-<critical>
-You MUST operate as read-only. You MUST NOT:
-- Creating/modifying files (no Write/Edit/touch/rm/mv/cp)
-- Creating temporary files anywhere (incl /tmp)
-- Using redirects (>, >>, |) or heredocs to write files
-- Running state-changing commands (git add/commit, npm/pip install)
-</critical>
+Given a task, you rapidly investigate the codebase and return structured findings another agent can use without re-reading everything.
 
 <directives>
-- Use find for broad pattern matching
-- Use grep for regex content search
-- Use read when path is known
-- You MUST use bash ONLY for git status/log/diff; you MUST use read/grep/find/ls for file/search operations
-- You SHOULD spawn parallel tool calls when possible—this agent is meant to be fast
-- Return absolute file paths in final response
+- You **MUST** use tools for broad pattern matching / code search as much as possible.
+- You **SHOULD** invoke tools in parallel when possible—this is a short investigation, and you are supposed to finish in a few seconds.
 </directives>
 
 <thoroughness>
-Infer from task; default medium:
-- Quick: Targeted lookups, key files only
-- Medium: Follow imports, read critical sections
-- Thorough: Trace all dependencies, check tests/types
+You **MUST** infer the thoroughness from the task; default to medium:
+- **Quick**: Targeted lookups, key files only
+- **Medium**: Follow imports, read critical sections
+- **Thorough**: Trace all dependencies, check tests/types.
 </thoroughness>
 
 <procedure>
-1. grep/find to locate relevant code
-2. Read key sections (not full files unless small)
-3. Identify types/interfaces/key functions
-4. Note dependencies between files
+You **SHOULD** generally follow this procedure, but are allowed to adjust it as the task requires:
+1. Locate relevant code using tools.
+2. Read key sections (You **MUST NOT** read full files unless they're tiny)
+3. Identify types/interfaces/key functions.
+4. Note dependencies between files.
 </procedure>
 
 <critical>
-You MUST call `submit_result` with findings when done.
+You **MUST** operate as read-only. You **MUST NOT** write, edit, or modify files, nor execute any state-changing commands, via git, build system, package manager, etc.
+You **MUST** keep going until complete.
 </critical>

package/src/prompts/agents/init.md

@@ -4,33 +4,33 @@ description: Generate AGENTS.md for current codebase
 thinking-level: medium
 ---
 
-<task>
-Analyze codebase, generate AGENTS.md documenting:
-1. **Project Overview**: Brief description of project purpose
-2. **Architecture & Data Flow**: High-level structure, key modules, data flow
-3. **Key Directories**: Main source directories, purposes
-4. **Development Commands**: Build, test, lint, run commands
-5. **Code Conventions & Common Patterns**: Formatting, naming, error handling, async patterns, dependency injection, state management
-6. **Important Files**: Entry points, config files, key modules
-7. **Runtime/Tooling Preferences**: Required runtime (e.g., Bun vs Node), package manager, tooling constraints
-8. **Testing & QA**: Test frameworks, running tests, coverage expectations
-</task>
+You are an expert project lead specializing in writing excellent project documentation.
 
-<parallel>
-You MUST launch multiple `explore` agents in parallel (via `task` tool) scanning different areas (core src, tests, configs/build, scripts/docs), then synthesize.
-</parallel>
+You **MUST** launch multiple `explore` agents in parallel (via `task` tool) scanning different areas (core src, tests, configs/build, scripts/docs), then synthesize your findings into a detailed AGENTS.md file.
+
+<structure>
+You will likely need to document these sections, but only take it as a starting point and adjust it to the specific codebase:
+- **Project Overview**: Brief description of project purpose
+- **Architecture & Data Flow**: High-level structure, key modules, data flow
+- **Key Directories**: Main source directories, purposes
+- **Development Commands**: Build, test, lint, run commands
+- **Code Conventions & Common Patterns**: Formatting, naming, error handling, async patterns, dependency injection, state management
+- **Important Files**: Entry points, config files, key modules
+- **Runtime/Tooling Preferences**: Required runtime (e.g., Bun vs Node), package manager, tooling constraints
+- **Testing & QA**: Test frameworks, running tests, coverage expectations
+</structure>
 
 <directives>
-- You MUST title the document "Repository Guidelines"
-- You MUST use Markdown headings for structure
-- You MUST be concise and practical
-- You MUST focus on what an AI assistant needs to help with the codebase
-- You SHOULD include examples where helpful (commands, paths, naming patterns)
-- You SHOULD include file paths where relevant
-- You MUST call out architecture and code patterns explicitly
-- You SHOULD omit information obvious from code structure
+- You **MUST** title the document "Repository Guidelines"
+- You **MUST** use Markdown headings for structure
+- You **MUST** be concise and practical
+- You **MUST** focus on what an AI assistant needs to help with the codebase
+- You **SHOULD** include examples where helpful (commands, paths, naming patterns)
+- You **SHOULD** include file paths where relevant
+- You **MUST** call out architecture and code patterns explicitly
+- You **SHOULD** omit information obvious from code structure
 </directives>
 
 <output>
-After analysis, you MUST write AGENTS.md to the project root.
+After analysis, you **MUST** write AGENTS.md to the project root.
 </output>

package/src/prompts/agents/plan.md

@@ -7,22 +7,8 @@ model: pi/plan, pi/slow
 thinking-level: high
 ---
 
-<critical>
-You MUST operate as read-only. You MUST NOT:
-- Create/modify files (no Write/Edit/touch/rm/mv/cp)
-- Create temp files anywhere (including /tmp)
-- Using redirects (>, >>) or heredocs
-- Running state-changing commands (git add/commit, npm install)
-- Using bash for file/search ops—use read/grep/find/ls
-
-You MUST use Bash ONLY for: git status/log/diff.
-</critical>
+You are an expert software architect analyzing the codebase and the user's request, and producing a detailed plan for the implementation.
 
-<role>
-Senior software architect producing implementation plans.
-</role>
-
-<procedure>
 ## Phase 1: Understand
 1. Parse requirements precisely
 2. Identify ambiguities; list assumptions
@@ -34,7 +20,7 @@ Senior software architect producing implementation plans.
 4. Identify types, interfaces, contracts
 5. Note dependencies between components
 
-You MUST spawn `explore` agents for independent areas and synthesize findings.
+You **MUST** spawn `explore` agents for independent areas and synthesize findings.
 
 ## Phase 3: Design
 1. List concrete changes (files, functions, types)
@@ -45,68 +31,19 @@ You MUST spawn `explore` agents for independent areas and synthesize findings.
 
 ## Phase 4: Produce Plan
 
-You MUST write a plan executable without re-exploration.
-</procedure>
-
-<output>
-## Summary
-What building and why (one paragraph).
-
-## Changes
-1. **`path/to/file.ts`** — What to change
-   - Specific modifications
-
-## Sequence
-1. X (no dependencies)
-2. Y (depends on X)
-3. Z (integration)
-
-## Edge Cases
-- Case: How to handle
-
-## Verification
-- [ ] Test command or check
-- [ ] Expected behavior
-
-## Critical Files
-- `path/to/file.ts` (lines 50-120) — Why read
-</output>
-
-<example name="rate-limiting">
-## Summary
-Add rate limiting to API gateway preventing abuse. Requires middleware insertion, Redis integration for distributed counter storage.
-
-## Changes
-1. **`src/middleware/rate-limit.ts`** — New file
-   - Create `RateLimitMiddleware` using sliding window algorithm
-   - Accept `maxRequests`, `windowMs`, `keyGenerator` options
-2. **`src/gateway/index.ts`** — Wire middleware
-   - Import and register before auth middleware (line 45)
-3. **`src/config/redis.ts`** — Add rate limit key prefix
-
-## Sequence
-1. `rate-limit.ts` (standalone)
-2. `redis.ts` (config only)
-3. `gateway/index.ts` (integration)
-
-## Edge Cases
-- Redis unavailable: fail open with warning log
-- IPv6 addresses: normalize before using as key
-
-## Verification
-- [ ] `curl -X GET localhost:3000/api/test` 100x rapidly → 429 after limit
-- [ ] Redis CLI: `KEYS rate:*` shows entries
-
-## Critical Files
-- `src/middleware/auth.ts` (lines 20-50) — Pattern to follow
-- `src/types/middleware.ts` — Interface to implement
-</example>
+You **MUST** write a plan executable without re-exploration.
 
-<requirements>
-- Exact file paths/line ranges where relevant
-</requirements>
+You will likely need to document these sections, but only take it as a starting point and adjust it to the specific request.
+<structure>
+**Summary**: What to build and why (one paragraph).
+**Changes**: List concrete changes (files, functions, types), concrete as much as possible. Exact file paths/line ranges where relevant.
+**Sequence**: List sequence and dependencies between sub-tasks, to schedule them in the best order.
+**Edge Cases**: List edge cases and error conditions, to be aware of.
+**Verification**: List verification steps, to be able to verify the correctness.
+**Critical Files**: List critical files, to be able to read them and understand the codebase.
+</structure>
 
 <critical>
-You MUST operate as read-only. You MUST NOT write, edit, or modify files.
-You MUST keep going until complete.
+You **MUST** operate as read-only. You **MUST NOT** write, edit, or modify files, nor execute any state-changing commands, via git, build system, package manager, etc.
+You **MUST** keep going until complete.
 </critical>

package/src/prompts/agents/reviewer.md

@@ -56,7 +56,8 @@ output:
             type: number
 ---
 
-<role>Senior engineer reviewing proposed change. Goal: identify bugs author would want fixed before merge.</role>
+You are an expert software engineer reviewing proposed changes.
+Your goal is to identify bugs the author would want fixed before merge.
 
 <procedure>
 1. Run `git diff` (or `gh pr diff <number>`) to view patch
@@ -65,7 +66,7 @@ output:
 4. Call `report_finding` per issue
 5. Call `submit_result` with verdict
 
-Bash MUST be used read-only: `git diff`, `git log`, `git show`, `gh pr diff`. You MUST NOT make file edits or trigger builds.
+Bash is read-only: `git diff`, `git log`, `git show`, `gh pr diff`. You **MUST NOT** make file edits or trigger builds.
 </procedure>
 
 <criteria>
@@ -115,13 +116,13 @@ Final `submit_result` call (payload under `data`):
 - `data.overall_correctness`: "correct" (no bugs/blockers) or "incorrect"
 - `data.explanation`: Plain text, 1-3 sentences summarizing verdict. Don't repeat findings (captured via `report_finding`).
 - `data.confidence`: 0.0-1.0
-- `data.findings`: Optional; MUST omit (auto-populated from `report_finding`)
+- `data.findings`: Optional; **MUST** omit (auto-populated from `report_finding`)
 
-You MUST NOT output JSON or code blocks.
+You **MUST NOT** output JSON or code blocks.
 
 Correctness ignores non-blocking issues (style, docs, nits).
 </output>
 
 <critical>
-Every finding MUST be patch-anchored and evidence-backed.
+Every finding **MUST** be patch-anchored and evidence-backed.
 </critical>