@oh-my-pi/pi-coding-agent 13.11.0 → 13.12.0

package/src/modes/theme/theme.ts

@@ -177,16 +177,14 @@ export type SymbolKey =
 	| "lang.archive"
 	| "lang.binary"
 	// Settings tab icons
-	| "tab.display"
-	| "tab.agent"
-	| "tab.input"
+	| "tab.appearance"
+	| "tab.model"
+	| "tab.interaction"
+	| "tab.context"
+	| "tab.editing"
 	| "tab.tools"
-	| "tab.config"
-	| "tab.services"
-	| "tab.bash"
-	| "tab.lsp"
-	| "tab.ttsr"
-	| "tab.status";
+	| "tab.tasks"
+	| "tab.providers";
 
 type SymbolMap = Record<SymbolKey, string>;
 
@@ -338,16 +336,14 @@ const UNICODE_SYMBOLS: SymbolMap = {
 	"lang.archive": "🗜",
 	"lang.binary": "⚙",
 	// Settings tabs
-	"tab.display": "🎨",
-	"tab.agent": "🤖",
-	"tab.input": "⌨",
+	"tab.appearance": "🎨",
+	"tab.model": "🤖",
+	"tab.interaction": "⌨",
+	"tab.context": "📋",
+	"tab.editing": "💻",
 	"tab.tools": "🔧",
-	"tab.config": "⚙",
-	"tab.services": "🌐",
-	"tab.bash": "💻",
-	"tab.lsp": "📝",
-	"tab.ttsr": "⏱",
-	"tab.status": "📊",
+	"tab.tasks": "📦",
+	"tab.providers": "🌐",
 };
 
 const NERD_SYMBOLS: SymbolMap = {
@@ -591,16 +587,14 @@ const NERD_SYMBOLS: SymbolMap = {
 	"lang.archive": "\u{F187}",
 	"lang.binary": "\u{F019A}",
 	// Settings tab icons
-	"tab.display": "󰃣",
-	"tab.agent": "󰚩",
-	"tab.input": "󰌌",
+	"tab.appearance": "󰃣",
+	"tab.model": "󰚩",
+	"tab.interaction": "󰌌",
+	"tab.context": "󰘸",
+	"tab.editing": "",
 	"tab.tools": "󰠭",
-	"tab.config": "󰒓",
-	"tab.services": "󰖟",
-	"tab.bash": "",
-	"tab.lsp": "󰌌",
-	"tab.ttsr": "󱎫",
-	"tab.status": "󰄪",
+	"tab.tasks": "󰐱",
+	"tab.providers": "󰖟",
 };
 
 const ASCII_SYMBOLS: SymbolMap = {
@@ -750,16 +744,14 @@ const ASCII_SYMBOLS: SymbolMap = {
 	"lang.archive": "zip",
 	"lang.binary": "bin",
 	// Settings tab icons
-	"tab.display": "[D]",
-	"tab.agent": "[A]",
-	"tab.input": "[I]",
+	"tab.appearance": "[A]",
+	"tab.model": "[M]",
+	"tab.interaction": "[I]",
+	"tab.context": "[X]",
+	"tab.editing": "[E]",
 	"tab.tools": "[T]",
-	"tab.config": "[C]",
-	"tab.services": "[S]",
-	"tab.bash": "[B]",
-	"tab.lsp": "[L]",
-	"tab.ttsr": "[R]",
-	"tab.status": "[=]",
+	"tab.tasks": "[K]",
+	"tab.providers": "[P]",
 };
 
 const SYMBOL_PRESETS: Record<SymbolPreset, SymbolMap> = {

package/src/modes/types.ts

@@ -56,6 +56,7 @@ export interface InteractiveModeContext {
 	pendingMessagesContainer: Container;
 	statusContainer: Container;
 	todoContainer: Container;
+	btwContainer: Container;
 	editor: CustomEditor;
 	editorContainer: Container;
 	statusLine: StatusLineComponent;
@@ -205,6 +206,9 @@ export interface InteractiveModeContext {
 	handleDequeue(): void;
 	handleBackgroundCommand(): void;
 	handleImagePaste(): Promise<boolean>;
+	handleBtwCommand(question: string): Promise<void>;
+	hasActiveBtw(): boolean;
+	handleBtwEscape(): boolean;
 	cycleThinkingLevel(): void;
 	cycleRoleModel(options?: { temporary?: boolean }): Promise<void>;
 	toggleToolOutputExpansion(): void;

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

@@ -232,6 +232,9 @@ export class UiHelpers {
 				this.ctx.addMessageToChat(message);
 				const lastChild = this.ctx.chatContainer.children[this.ctx.chatContainer.children.length - 1];
 				const assistantComponent = lastChild instanceof AssistantMessageComponent ? lastChild : undefined;
+				if (assistantComponent) {
+					assistantComponent.setUsageInfo(message.usage);
+				}
 				readGroup = null;
 				const hasErrorStop = message.stopReason === "aborted" || message.stopReason === "error";
 				const errorMessage = hasErrorStop

package/src/patch/hashline.ts

@@ -744,11 +744,130 @@ export interface CompactHashlineDiffOptions {
 	maxOutputLines?: number;
 }
 
-const NUMBERED_DIFF_LINE_RE = /^([ +-])(\d+)\|(.*)$/;
+const NUMBERED_DIFF_LINE_RE = /^([ +-])(\s*\d+)\|(.*)$/;
+const HASHLINE_PREVIEW_PLACEHOLDER = "   ";
 
 type DiffRunKind = " " | "+" | "-" | "meta";
 type DiffRun = { kind: DiffRunKind; lines: string[] };
 
+interface ParsedNumberedDiffLine {
+	kind: " " | "+" | "-";
+	lineNumber: number;
+	lineWidth: number;
+	content: string;
+	raw: string;
+}
+
+interface CompactPreviewCounters {
+	oldLine?: number;
+	newLine?: number;
+}
+
+function parseNumberedDiffLine(line: string): ParsedNumberedDiffLine | undefined {
+	const match = NUMBERED_DIFF_LINE_RE.exec(line);
+	if (!match) return undefined;
+
+	const kind = match[1];
+	if (kind !== " " && kind !== "+" && kind !== "-") return undefined;
+
+	const lineField = match[2];
+	const lineNumber = Number(lineField.trim());
+	if (!Number.isInteger(lineNumber)) return undefined;
+
+	return { kind, lineNumber, lineWidth: lineField.length, content: match[3], raw: line };
+}
+
+function syncOldLineCounters(counters: CompactPreviewCounters, lineNumber: number): void {
+	if (counters.oldLine === undefined || counters.newLine === undefined) {
+		counters.oldLine = lineNumber;
+		counters.newLine = lineNumber;
+		return;
+	}
+
+	const delta = lineNumber - counters.oldLine;
+	counters.oldLine = lineNumber;
+	counters.newLine += delta;
+}
+
+function syncNewLineCounters(counters: CompactPreviewCounters, lineNumber: number): void {
+	if (counters.oldLine === undefined || counters.newLine === undefined) {
+		counters.oldLine = lineNumber;
+		counters.newLine = lineNumber;
+		return;
+	}
+
+	const delta = lineNumber - counters.newLine;
+	counters.oldLine += delta;
+	counters.newLine = lineNumber;
+}
+
+function formatCompactHashlineLine(kind: " " | "+", lineNumber: number, width: number, content: string): string {
+	const padded = String(lineNumber).padStart(width, " ");
+	return `${kind}${padded}#${computeLineHash(lineNumber, content)}|${content}`;
+}
+
+function formatCompactRemovedLine(lineNumber: number, width: number, content: string): string {
+	const padded = String(lineNumber).padStart(width, " ");
+	return `-${padded}${HASHLINE_PREVIEW_PLACEHOLDER}|${content}`;
+}
+
+function formatCompactPreviewLine(line: string, counters: CompactPreviewCounters): { kind: DiffRunKind; text: string } {
+	const parsed = parseNumberedDiffLine(line);
+	if (!parsed) return { kind: "meta", text: line };
+
+	if (parsed.content === "...") {
+		if (parsed.kind === "+") {
+			syncNewLineCounters(counters, parsed.lineNumber);
+		} else {
+			syncOldLineCounters(counters, parsed.lineNumber);
+		}
+		return { kind: parsed.kind, text: parsed.raw };
+	}
+
+	switch (parsed.kind) {
+		case "+": {
+			syncNewLineCounters(counters, parsed.lineNumber);
+			const newLine = counters.newLine;
+			if (newLine === undefined) return { kind: "+", text: parsed.raw };
+			const text = formatCompactHashlineLine("+", newLine, parsed.lineWidth, parsed.content);
+			counters.newLine = newLine + 1;
+			return { kind: "+", text };
+		}
+		case "-": {
+			syncOldLineCounters(counters, parsed.lineNumber);
+			const text = formatCompactRemovedLine(parsed.lineNumber, parsed.lineWidth, parsed.content);
+			counters.oldLine = parsed.lineNumber + 1;
+			return { kind: "-", text };
+		}
+		case " ": {
+			syncOldLineCounters(counters, parsed.lineNumber);
+			const newLine = counters.newLine;
+			if (newLine === undefined) return { kind: " ", text: parsed.raw };
+			const text = formatCompactHashlineLine(" ", newLine, parsed.lineWidth, parsed.content);
+			counters.oldLine = parsed.lineNumber + 1;
+			counters.newLine = newLine + 1;
+			return { kind: " ", text };
+		}
+	}
+}
+
+function splitDiffRuns(lines: string[]): DiffRun[] {
+	const runs: DiffRun[] = [];
+	const counters: CompactPreviewCounters = {};
+
+	for (const line of lines) {
+		const formatted = formatCompactPreviewLine(line, counters);
+		const prev = runs[runs.length - 1];
+		if (prev && prev.kind === formatted.kind) {
+			prev.lines.push(formatted.text);
+			continue;
+		}
+		runs.push({ kind: formatted.kind, lines: [formatted.text] });
+	}
+
+	return runs;
+}
+
 function collapseFromStart(lines: string[], maxLines: number, label: string): string[] {
 	if (lines.length <= maxLines) return lines;
 	const hidden = lines.length - maxLines;
@@ -767,21 +886,6 @@ function collapseFromMiddle(lines: string[], maxLines: number, label: string): s
 	return [...lines.slice(0, maxLines), ` ... ${hidden} more ${label} lines`, ...lines.slice(-maxLines)];
 }
 
-function splitDiffRuns(lines: string[]): DiffRun[] {
-	const runs: DiffRun[] = [];
-	for (const line of lines) {
-		const match = NUMBERED_DIFF_LINE_RE.exec(line);
-		const kind = (match?.[1] as " " | "+" | "-" | undefined) ?? "meta";
-		const prev = runs[runs.length - 1];
-		if (prev && prev.kind === kind) {
-			prev.lines.push(line);
-			continue;
-		}
-		runs.push({ kind, lines: [line] });
-	}
-	return runs;
-}
-
 /**
  * Build a compact diff preview suitable for model-visible tool responses.
  *

package/src/prompts/system/btw-user.md

@@ -0,0 +1,8 @@
+<btw>
+This is an ephemeral side question for the current interactive session.
+Answer briefly and directly using the conversation context already provided.
+Do not use tools.
+Do not ask follow-up questions.
+Question:
+{{question}}
+</btw>

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

@@ -54,5 +54,5 @@ You **MUST** read `rule://<name>` when working in that domain.
 {{/list}}
 </rules>
 {{/if}}
-Current date and time: {{dateTime}}
+Current date: {{date}}
 Current working directory: {{cwd}}

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

@@ -297,6 +297,7 @@ When a tool call fails, read the full error before doing anything else. When a f
 - You **MUST** exhaust tools/context/files first — explore.
 ## 7. Verification
 - Test everything rigorously → Future contributor cannot break behavior without failure. Prefer unit/e2e.
+- You **MUST NOT** rely on mocks — they invent behaviors that never happen in production and hide real bugs.
 - You **SHOULD** run only tests you added/modified unless asked otherwise.
 - You **MUST NOT** yield without proof when non-trivial work, self-assessment is deceptive: tests, linters, type checks, repro steps… exhaust all external verification.
 

package/src/prompts/tools/code-search.md

@@ -0,0 +1,45 @@
+Search code snippets, and technical content.
+This tool behaves more like grep than natural-language web search.
+
+<instruction>
+- Query with exact symbols, identifiers, error strings, CLI flags, filenames, import paths, and short code fragments
+- Start with the smallest distinctive token; widen or add one nearby token only if the first query is too broad
+- Prefer exact syntax when punctuation carries meaning, such as `Promise.withResolvers`, `useEffect(`, `--watch`, or `"direnv loading"`
+- Keep `query` terse; remove filler words, prose, and request framing
+- Use `code_context` only for a few disambiguating tokens such as language, library, framework, repo, runtime, or API name
+- If a multi-word literal matters exactly, quote the shortest stable phrase first, then refine
+- When looking for usage examples of a specific API, search the symbol first; add surrounding call syntax only when needed
+</instruction>
+
+<parameters>
+- query: Grep-style code search query; use exact tokens, short fragments, or short quoted phrases
+- code_context: Optional disambiguation tokens only, not a sentence
+</parameters>
+
+<examples>
+Good queries:
+- `Promise.withResolvers`
+- `DIRENV_LOG_FORMAT`
+- `"direnv loading"`
+- `useState` with `code_context: react hooks`
+- `app.get(` with `code_context: express`
+- `ERR_REQUIRE_ESM` with `code_context: node`
+
+Bad queries:
+- `Need the official or source-backed way to silence direnv loading output`
+- `How do I use Promise.withResolvers in Bun?`
+- `find examples of React state hooks in TypeScript projects`
+- `search GitHub for express routing docs`
+</examples>
+
+<avoid>
+- Do not use this tool for broad conceptual research, comparisons, or authoritative sourcing; use `web_search`, `web_search_deep`, or `fetch` instead
+- Do not put full-sentence instructions into `query` or `code_context`
+- Do not pack many weak terms into one query; one strong token plus minimal context usually works better
+</avoid>
+
+<critical>
+- `query` should be grep-style code search, not a natural-language request
+- `code_context` is optional and should stay short
+- If you need explanations, best practices, or comprehensive answers, use broader web search tools instead of this one
+</critical>

package/src/prompts/tools/hashline.md

@@ -184,4 +184,7 @@ Use a trailing `""` to preserve the blank line between sibling declarations.
 - **Never target shared boundary lines.** Do not use `replace` spans that start, end, or pivot on a line that closes one construct and opens/separates another, such as `},{`, `}),`, `} else {`, or `} catch (err) {`. Those lines are not owned by a single block. Move the range inward to body-only lines, or widen it to consume one whole owned construct including its true trailing delimiter.
 - **`lines` must not extend past `end`.** `lines` replaces exactly `pos..end`. Content after `end` survives. If you include lines in `lines` that exist after `end`, they will appear twice. Either extend `end` to cover all lines you are re-emitting, or remove the extra lines from `lines`.
 - `lines` entries **MUST** be literal file content with indentation copied exactly from the `read` output. If the file uses tabs, use a real tab character.
+- After any successful `edit` call on a file, the next change to that same file **MUST** start with a fresh `read`. Do not chain a second `edit` call off stale mental state, even if the intended range is nearby.
+- If you need a second change in the same local region, default to one wider `replace` over the whole owned block instead of a sequence of micro-edits on adjacent lines. Repeated small patches in a moving region are unstable.
+- If a local region is already malformed or a prior patch partially landed, stop nibbling at it. Re-read the file and replace the full owned block from a stable boundary; for a small file, prefer rewriting the file over stacking more tiny repairs.
 </critical>

package/src/prompts/tools/read.md

@@ -4,10 +4,10 @@ Reads files from local filesystem or internal URLs.
 - Reads up to {{DEFAULT_LIMIT}} lines default
 - Use `offset` and `limit` for large files; max {{DEFAULT_MAX_LINES}} lines per call
 {{#if IS_HASHLINE_MODE}}
-- Text output is CID prefixed: `LINE#ID:content`
+- Filesystem output is CID prefixed: `LINE#ID:content`
 {{else}}
 {{#if IS_LINE_NUMBER_MODE}}
-- Text output is line-number-prefixed
+- Filesystem output is line-number-prefixed
 {{/if}}
 {{/if}}
 - Supports images (PNG, JPG) and PDFs

package/src/sdk.ts

@@ -89,10 +89,13 @@ import {
 	GrepTool,
 	getSearchTools,
 	HIDDEN_TOOLS,
+	isCodeSearchProviderId,
+	isSearchProviderPreference,
 	loadSshTool,
 	PythonTool,
 	ReadTool,
 	ResolveTool,
+	setPreferredCodeSearchProvider,
 	setPreferredImageProvider,
 	setPreferredSearchProvider,
 	type Tool,
@@ -224,17 +227,17 @@ export {
 	BashTool,
 	// Tool classes and factories
 	BUILTIN_TOOLS,
-	HIDDEN_TOOLS,
 	createTools,
 	EditTool,
 	FindTool,
 	GrepTool,
+	HIDDEN_TOOLS,
 	loadSshTool,
 	PythonTool,
 	ReadTool,
 	ResolveTool,
-	WriteTool,
 	type ToolSession,
+	WriteTool,
 };
 
 // Helper Functions
@@ -628,8 +631,20 @@ export async function createAgentSession(options: CreateAgentSessionOptions = {}
 		options.skills === undefined ? discoverSkills(cwd, agentDir, skillsSettings) : undefined;
 
 	// Initialize provider preferences from settings
-	setPreferredSearchProvider(settings.get("providers.webSearch") ?? "auto");
-	setPreferredImageProvider(settings.get("providers.image") ?? "auto");
+	const webSearchProvider = settings.get("providers.webSearch");
+	if (typeof webSearchProvider === "string" && isSearchProviderPreference(webSearchProvider)) {
+		setPreferredSearchProvider(webSearchProvider);
+	}
+
+	const codeSearchProvider = settings.get("providers.codeSearch");
+	if (typeof codeSearchProvider === "string" && isCodeSearchProviderId(codeSearchProvider)) {
+		setPreferredCodeSearchProvider(codeSearchProvider);
+	}
+
+	const imageProvider = settings.get("providers.image");
+	if (imageProvider === "auto" || imageProvider === "gemini" || imageProvider === "openrouter") {
+		setPreferredImageProvider(imageProvider);
+	}
 
 	const sessionManager = options.sessionManager ?? logger.time("sessionManager", SessionManager.create, cwd);
 	const sessionId = sessionManager.getSessionId();
@@ -687,19 +702,7 @@ export async function createAgentSession(options: CreateAgentSessionOptions = {}
 		}
 	}
 
-	// For subagent sessions using GitHub Copilot, add X-Initiator header
-	// to ensure proper billing (agent-initiated vs user-initiated)
 	const taskDepth = options.taskDepth ?? 0;
-	const forceCopilotAgentInitiator = taskDepth > 0;
-	if (forceCopilotAgentInitiator && model?.provider === "github-copilot") {
-		model = {
-			...model,
-			headers: {
-				...model.headers,
-				"X-Initiator": "agent",
-			},
-		};
-	}
 
 	let thinkingLevel = options.thinkingLevel;
 
@@ -962,19 +965,8 @@ export async function createAgentSession(options: CreateAgentSessionOptions = {}
 		customTools.push(...(geminiImageTools as unknown as CustomTool[]));
 	}
 
-	// Add specialized Exa web search tools if EXA_API_KEY is available
-	const exaSettings = settings.getGroup("exa");
-	if (exaSettings.enabled && exaSettings.enableSearch) {
-		const exaSearchTools = await logger.timeAsync("getSearchTools", getSearchTools, {
-			enableLinkedin: exaSettings.enableLinkedin as boolean,
-			enableCompany: exaSettings.enableCompany as boolean,
-		});
-		// Filter out the base web_search (already in built-in tools), add specialized Exa tools
-		const specializedTools = exaSearchTools.filter(t => t.name !== "web_search");
-		if (specializedTools.length > 0) {
-			customTools.push(...specializedTools);
-		}
-	}
+	// Add web search tools
+	customTools.push(...getSearchTools());
 
 	// Discover and load custom tools from .omp/tools/, .claude/tools/, etc.
 	const builtInToolNames = builtinTools.map(t => t.name);
@@ -1336,6 +1328,16 @@ export async function createAgentSession(options: CreateAgentSessionOptions = {}
 		if (!obfuscator?.hasSecrets()) return converted;
 		return obfuscateMessages(obfuscator, converted);
 	};
+	const transformContext = extensionRunner
+		? async (messages: AgentMessage[], _signal?: AbortSignal) => {
+				return await extensionRunner.emitContext(messages);
+			}
+		: undefined;
+	const onPayload = extensionRunner
+		? async (payload: unknown, _model?: Model) => {
+				return await extensionRunner.emitBeforeProviderRequest(payload);
+			}
+		: undefined;
 
 	const setToolUIContext = (uiContext: ExtensionUIContext, hasUI: boolean) => {
 		toolContextStore.setUIContext(uiContext, hasUI);
@@ -1358,17 +1360,9 @@ export async function createAgentSession(options: CreateAgentSessionOptions = {}
 			tools: initialTools,
 		},
 		convertToLlm: convertToLlmFinal,
-		onPayload: extensionRunner
-			? async (payload, _model) => {
-					return extensionRunner.emitBeforeProviderRequest(payload);
-				}
-			: undefined,
+		onPayload,
 		sessionId: sessionManager.getSessionId(),
-		transformContext: extensionRunner
-			? async messages => {
-					return extensionRunner.emitContext(messages);
-				}
-			: undefined,
+		transformContext,
 		steeringMode: settings.get("steeringMode") ?? "one-at-a-time",
 		followUpMode: settings.get("followUpMode") ?? "one-at-a-time",
 		interruptMode: settings.get("interruptMode") ?? "immediate",
@@ -1443,9 +1437,11 @@ export async function createAgentSession(options: CreateAgentSessionOptions = {}
 		skillsSettings: settings.getGroup("skills") as Required<SkillsSettings>,
 		modelRegistry,
 		toolRegistry,
+		transformContext,
+		onPayload,
+		convertToLlm: convertToLlmFinal,
 		rebuildSystemPrompt,
 		ttsrManager,
-		forceCopilotAgentInitiator,
 		obfuscator,
 		asyncJobManager,
 		pendingActionStore,