@oh-my-pi/pi-coding-agent 13.18.0 → 14.0.2

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

@@ -8,6 +8,10 @@ import type {
 import type { AgentSessionEvent } from "../../session/agent-session";
 import type { TodoStatus } from "../../tools/todo-write";
 
+interface AcpEventMapperOptions {
+	getMessageId?: (message: unknown) => string | undefined;
+}
+
 interface ContentArrayContainer {
 	content?: unknown;
 }
@@ -118,10 +122,11 @@ export function mapToolKind(toolName: string): ToolKind {
 export function mapAgentSessionEventToAcpSessionUpdates(
 	event: AgentSessionEvent,
 	sessionId: string,
+	options: AcpEventMapperOptions = {},
 ): SessionNotification[] {
 	switch (event.type) {
 		case "message_update":
-			return mapAssistantMessageUpdate(event, sessionId);
+			return mapAssistantMessageUpdate(event, sessionId, options);
 		case "tool_execution_start": {
 			const update: SessionUpdate = {
 				sessionUpdate: "tool_call",
@@ -181,6 +186,7 @@ export function mapAgentSessionEventToAcpSessionUpdates(
 function mapAssistantMessageUpdate(
 	event: Extract<AgentSessionEvent, { type: "message_update" }>,
 	sessionId: string,
+	options: AcpEventMapperOptions,
 ): SessionNotification[] {
 	if (!isAssistantMessage(event.message)) {
 		return [];
@@ -208,10 +214,12 @@ function mapAssistantMessageUpdate(
 		return [];
 	}
 
+	const messageId = options.getMessageId?.(event.message);
 	return [
 		toSessionNotification(sessionId, {
 			sessionUpdate,
 			content: { type: "text", text },
+			messageId,
 		}),
 	];
 }

package/src/modes/acp/acp-mode.ts

@@ -3,11 +3,13 @@ import { AgentSideConnection, ndJsonStream } from "@agentclientprotocol/sdk";
 import type { AgentSession } from "../../session/agent-session";
 import { AcpAgent } from "./acp-agent";
 
-export async function runAcpMode(session: AgentSession): Promise<never> {
+export type AcpSessionFactory = (cwd: string) => Promise<AgentSession>;
+
+export async function runAcpMode(session: AgentSession, createSession: AcpSessionFactory): Promise<never> {
 	const input = stream.Writable.toWeb(process.stdout);
 	const output = stream.Readable.toWeb(process.stdin);
 	const transport = ndJsonStream(input, output);
-	const connection = new AgentSideConnection(conn => new AcpAgent(conn, session), transport);
+	const connection = new AgentSideConnection(conn => new AcpAgent(conn, session, createSession), transport);
 	await connection.closed;
 	process.exit(0);
 }

package/src/modes/components/agent-dashboard.ts

@@ -31,7 +31,7 @@ import {
 	visibleWidth,
 	wrapTextWithAnsi,
 } from "@oh-my-pi/pi-tui";
-import { isEnoent } from "@oh-my-pi/pi-utils";
+import { isEnoent, prompt } from "@oh-my-pi/pi-utils";
 import { YAML } from "bun";
 import { getConfigDirs } from "../../config";
 import type { ModelRegistry } from "../../config/model-registry";
@@ -41,7 +41,6 @@ import {
 	resolveConfiguredModelPatterns,
 	resolveModelOverride,
 } from "../../config/model-resolver";
-import { renderPromptTemplate } from "../../config/prompt-templates";
 import { Settings } from "../../config/settings";
 import agentCreationArchitectPrompt from "../../prompts/system/agent-creation-architect.md" with { type: "text" };
 import agentCreationUserPrompt from "../../prompts/system/agent-creation-user.md" with { type: "text" };
@@ -627,8 +626,8 @@ export class AgentDashboard extends Container {
 			throw new Error("No available model to generate agent specification.");
 		}
 
-		const systemPrompt = renderPromptTemplate(agentCreationArchitectPrompt, { TASK_TOOL_NAME: "task" });
-		const userPrompt = renderPromptTemplate(agentCreationUserPrompt, { request: description });
+		const systemPrompt = prompt.render(agentCreationArchitectPrompt, { TASK_TOOL_NAME: "task" });
+		const userPrompt = prompt.render(agentCreationUserPrompt, { request: description });
 
 		const { session } = await createAgentSession({
 			cwd: this.cwd,

package/src/modes/components/diff.ts

@@ -1,4 +1,4 @@
-import { getIndentation } from "@oh-my-pi/pi-utils";
+import { getIndentation } from "@oh-my-pi/pi-natives";
 import * as Diff from "diff";
 import { theme } from "../../modes/theme/theme";
 import { replaceTabs } from "../../tools/render-utils";
@@ -15,11 +15,10 @@ const DIM_OFF = "\x1b[22m";
  */
 function visualizeIndent(text: string, filePath?: string): string {
 	const match = text.match(/^([ \t]+)/);
-	if (!match) return replaceTabs(text, filePath);
+	if (!match) return replaceTabs(text);
 	const indent = match[1];
 	const rest = text.slice(indent.length);
-	const indentation = getIndentation(filePath);
-	const tabWidth = indentation.length;
+	const tabWidth = getIndentation(filePath);
 	const leftPadding = Math.floor(tabWidth / 2);
 	const rightPadding = Math.max(0, tabWidth - leftPadding - 1);
 	const tabMarker = `${DIM}${" ".repeat(leftPadding)}→${" ".repeat(rightPadding)}${DIM_OFF}`;
@@ -31,7 +30,7 @@ function visualizeIndent(text: string, filePath?: string): string {
 			visible += `${DIM}·${DIM_OFF}`;
 		}
 	}
-	return `${visible}${replaceTabs(rest, filePath)}`;
+	return `${visible}${replaceTabs(rest)}`;
 }
 
 /**
@@ -154,8 +153,8 @@ export function renderDiff(diffText: string, options: RenderDiffOptions = {}): s
 				const added = addedLines[0];
 
 				const { removedLine, addedLine } = renderIntraLineDiff(
-					replaceTabs(removed.content, options.filePath),
-					replaceTabs(added.content, options.filePath),
+					replaceTabs(removed.content),
+					replaceTabs(added.content),
 				);
 
 				result.push(

package/src/modes/components/footer.ts

@@ -5,7 +5,8 @@ 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";
-import { findGitHeadPathAsync, sanitizeStatusText } from "../shared";
+import * as git from "../../utils/git";
+import { sanitizeStatusText } from "../shared";
 import { getContextUsageLevel, getContextUsageThemeColor } from "./status-line/context-thresholds";
 
 /**
@@ -55,13 +56,13 @@ export class FooterComponent implements Component {
 			this.#gitWatcher = null;
 		}
 
-		findGitHeadPathAsync().then(result => {
-			if (!result) {
+		git.head.resolve(getProjectDir()).then(head => {
+			if (!head) {
 				return;
 			}
 
 			try {
-				this.#gitWatcher = fs.watch(result.path, () => {
+				this.#gitWatcher = fs.watch(head.headPath, () => {
 					this.#cachedBranch = undefined; // Invalidate cache
 					if (this.#onBranchChange) {
 						this.#onBranchChange();
@@ -93,35 +94,14 @@ export class FooterComponent implements Component {
 	 * Returns null if not in a git repo, branch name otherwise.
 	 */
 	#getCurrentBranch(): string | null {
-		// Return cached value if available
 		if (this.#cachedBranch !== undefined) {
 			return this.#cachedBranch;
 		}
 
-		// Note: fire-and-forget async call - will return undefined on first call
-		// This is acceptable since it's a cached value that will update on next render
-		findGitHeadPathAsync().then(result => {
-			if (!result) {
-				this.#cachedBranch = null;
-				if (this.#onBranchChange) {
-					this.#onBranchChange();
-				}
-				return;
-			}
-			const content = result.content.trim();
-
-			if (content.startsWith("ref: refs/heads/")) {
-				this.#cachedBranch = content.slice(16);
-			} else {
-				this.#cachedBranch = "detached";
-			}
-			if (this.#onBranchChange) {
-				this.#onBranchChange();
-			}
-		});
-
-		// Return undefined while loading (will show on next render once loaded)
-		return null;
+		const headState = git.head.resolveSync(getProjectDir());
+		this.#cachedBranch =
+			headState === null ? null : headState.kind === "ref" ? (headState.branchName ?? headState.ref) : "detached";
+		return this.#cachedBranch;
 	}
 
 	render(width: number): string[] {

package/src/modes/components/hook-editor.ts

@@ -8,7 +8,7 @@
  */
 import { Container, Editor, matchesKey, Spacer, Text, type TUI } from "@oh-my-pi/pi-tui";
 import { getEditorTheme, theme } from "../../modes/theme/theme";
-import { matchesAppInterrupt } from "../../modes/utils/keybinding-matchers";
+import { matchesAppExternalEditor, matchesAppInterrupt } from "../../modes/utils/keybinding-matchers";
 import { getEditorCommand, openInEditor } from "../../utils/external-editor";
 import { DynamicBorder } from "./dynamic-border";
 
@@ -87,7 +87,7 @@ export class HookEditorComponent extends Container {
 		}
 
 		// Ctrl+G for external editor
-		if (matchesKey(keyData, "ctrl+g")) {
+		if (matchesAppExternalEditor(keyData)) {
 			void this.#openExternalEditor();
 			return;
 		}
@@ -123,7 +123,7 @@ export class HookEditorComponent extends Container {
 		}
 
 		// Ctrl+G for external editor
-		if (matchesKey(keyData, "ctrl+g")) {
+		if (matchesAppExternalEditor(keyData)) {
 			void this.#openExternalEditor();
 			return;
 		}

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

@@ -16,7 +16,7 @@ import {
 	visibleWidth,
 } from "@oh-my-pi/pi-tui";
 import { getMarkdownTheme, theme } from "../../modes/theme/theme";
-import { matchesSelectCancel } from "../../modes/utils/keybinding-matchers";
+import { matchesAppExternalEditor, matchesSelectCancel } from "../../modes/utils/keybinding-matchers";
 import { CountdownTimer } from "./countdown-timer";
 import { DynamicBorder } from "./dynamic-border";
 
@@ -29,6 +29,7 @@ export interface HookSelectorOptions {
 	maxVisible?: number;
 	onLeft?: () => void;
 	onRight?: () => void;
+	onExternalEditor?: () => void;
 	helpText?: string;
 }
 
@@ -67,6 +68,7 @@ export class HookSelectorComponent extends Container {
 	#countdown: CountdownTimer | undefined;
 	#onLeftCallback: (() => void) | undefined;
 	#onRightCallback: (() => void) | undefined;
+	#onExternalEditorCallback: (() => void) | undefined;
 	constructor(
 		title: string,
 		options: string[],
@@ -84,6 +86,7 @@ export class HookSelectorComponent extends Container {
 		this.#baseTitle = title;
 		this.#onLeftCallback = opts?.onLeft;
 		this.#onRightCallback = opts?.onRight;
+		this.#onExternalEditorCallback = opts?.onExternalEditor;
 
 		this.addChild(new DynamicBorder());
 		this.addChild(new Spacer(1));
@@ -174,6 +177,8 @@ export class HookSelectorComponent extends Container {
 			this.#onLeftCallback?.();
 		} else if (matchesKey(keyData, "right")) {
 			this.#onRightCallback?.();
+		} else if (this.#onExternalEditorCallback && matchesAppExternalEditor(keyData)) {
+			this.#onExternalEditorCallback();
 		} else if (matchesSelectCancel(keyData)) {
 			this.#onCancelCallback();
 		}

package/src/modes/components/read-tool-group.ts

@@ -7,8 +7,7 @@ import type { ToolExecutionHandle } from "./tool-execution";
 type ReadRenderArgs = {
 	path?: string;
 	file_path?: string;
-	offset?: number;
-	limit?: number;
+	sel?: string;
 };
 
 type ReadToolSuffixResolution = {
@@ -33,8 +32,7 @@ function getSuffixResolution(details: ReadToolResultDetails | undefined): ReadTo
 type ReadEntry = {
 	toolCallId: string;
 	path: string;
-	offset?: number;
-	limit?: number;
+	sel?: string;
 	status: "pending" | "success" | "warning" | "error";
 	correctedFrom?: string;
 };
@@ -56,13 +54,11 @@ export class ReadToolGroupComponent extends Container implements ToolExecutionHa
 		const entry: ReadEntry = this.#entries.get(toolCallId) ?? {
 			toolCallId,
 			path: rawPath,
-			offset: args.offset,
-			limit: args.limit,
+			sel: args.sel,
 			status: "pending",
 		};
 		entry.path = rawPath;
-		entry.offset = args.offset;
-		entry.limit = args.limit;
+		entry.sel = args.sel;
 		this.#entries.set(toolCallId, entry);
 		this.#updateDisplay();
 	}
@@ -132,10 +128,8 @@ export class ReadToolGroupComponent extends Container implements ToolExecutionHa
 	#formatPath(entry: ReadEntry): string {
 		const filePath = shortenPath(entry.path);
 		let pathDisplay = filePath ? theme.fg("accent", filePath) : theme.fg("toolOutput", "…");
-		if (entry.offset !== undefined || entry.limit !== undefined) {
-			const startLine = entry.offset ?? 1;
-			const endLine = entry.limit !== undefined ? startLine + entry.limit - 1 : "";
-			pathDisplay += theme.fg("warning", `:${startLine}${endLine ? `-${endLine}` : ""}`);
+		if (entry.sel) {
+			pathDisplay += theme.fg("warning", `:${entry.sel}`);
 		}
 		if (entry.correctedFrom) {
 			pathDisplay += theme.fg("dim", ` (corrected from ${shortenPath(entry.correctedFrom)})`);