@oh-my-pi/pi-coding-agent 15.1.2 → 15.1.3

package/src/internal-urls/index.ts

@@ -15,8 +15,8 @@ export * from "./json-query";
 export * from "./local-protocol";
 export * from "./mcp-protocol";
 export * from "./memory-protocol";
+export * from "./omp-protocol";
 export * from "./parse";
-export * from "./pi-protocol";
 export * from "./router";
 export * from "./rule-protocol";
 export * from "./skill-protocol";

package/src/internal-urls/{pi-protocol.ts → omp-protocol.ts}

@@ -1,23 +1,23 @@
 /**
- * Protocol handler for pi:// URLs.
+ * Protocol handler for omp:// URLs.
  *
  * Serves statically embedded documentation files bundled at build time.
  *
  * URL forms:
- * - pi:// - Lists all available documentation files
- * - pi://<file>.md - Reads a specific documentation file
+ * - omp:// - Lists all available documentation files
+ * - omp://<file>.md - Reads a specific documentation file
  */
 import * as path from "node:path";
 import { EMBEDDED_DOC_FILENAMES, EMBEDDED_DOCS } from "./docs-index.generated";
 import type { InternalResource, InternalUrl, ProtocolHandler } from "./types";
 
 /**
- * Handler for pi:// URLs.
+ * Handler for omp:// URLs.
  *
  * Resolves documentation file names to their content, or lists available docs.
  */
-export class PiProtocolHandler implements ProtocolHandler {
-	readonly scheme = "pi";
+export class OmpProtocolHandler implements ProtocolHandler {
+	readonly scheme = "omp";
 	readonly immutable = true;
 
 	async resolve(url: InternalUrl): Promise<InternalResource> {
@@ -38,7 +38,7 @@ export class PiProtocolHandler implements ProtocolHandler {
 			throw new Error("No documentation files found");
 		}
 
-		const listing = EMBEDDED_DOC_FILENAMES.map(f => `- [${f}](pi://${f})`).join("\n");
+		const listing = EMBEDDED_DOC_FILENAMES.map(f => `- [${f}](omp://${f})`).join("\n");
 		const content = `# Documentation\n\n${EMBEDDED_DOC_FILENAMES.length} files available:\n\n${listing}\n`;
 
 		return {
@@ -52,12 +52,12 @@ export class PiProtocolHandler implements ProtocolHandler {
 	async #readDoc(filename: string, url: InternalUrl): Promise<InternalResource> {
 		// Validate: no traversal, no absolute paths
 		if (path.isAbsolute(filename)) {
-			throw new Error("Absolute paths are not allowed in pi:// URLs");
+			throw new Error("Absolute paths are not allowed in omp:// URLs");
 		}
 
 		const normalized = path.posix.normalize(filename.replaceAll("\\", "/"));
 		if (normalized === ".." || normalized.startsWith("../") || normalized.includes("/../")) {
-			throw new Error("Path traversal (..) is not allowed in pi:// URLs");
+			throw new Error("Path traversal (..) is not allowed in omp:// URLs");
 		}
 
 		const content = EMBEDDED_DOCS[normalized];
@@ -69,7 +69,7 @@ export class PiProtocolHandler implements ProtocolHandler {
 			const suffix =
 				suggestions.length > 0
 					? `\nDid you mean: ${suggestions.join(", ")}`
-					: "\nUse pi:// to list available files.";
+					: "\nUse omp:// to list available files.";
 			throw new Error(`Documentation file not found: ${filename}${suffix}`);
 		}
 

package/src/internal-urls/router.ts

@@ -1,5 +1,5 @@
 /**
- * Internal URL router for internal protocols (agent://, artifact://, memory://, skill://, rule://, mcp://, pi://, local://).
+ * Internal URL router for internal protocols (agent://, artifact://, memory://, skill://, rule://, mcp://, omp://, local://).
  *
  * One process-global router with one handler per scheme. Access via
  * `InternalUrlRouter.instance()`. Handlers are stateless; per-session and
@@ -11,8 +11,8 @@ import { IssueProtocolHandler, PrProtocolHandler } from "./issue-pr-protocol";
 import { LocalProtocolHandler } from "./local-protocol";
 import { McpProtocolHandler } from "./mcp-protocol";
 import { MemoryProtocolHandler } from "./memory-protocol";
+import { OmpProtocolHandler } from "./omp-protocol";
 import { parseInternalUrl } from "./parse";
-import { PiProtocolHandler } from "./pi-protocol";
 import { RuleProtocolHandler } from "./rule-protocol";
 import { SkillProtocolHandler } from "./skill-protocol";
 import type { InternalResource, InternalUrl, ProtocolHandler, ResolveContext } from "./types";
@@ -23,7 +23,7 @@ export class InternalUrlRouter {
 	#handlers = new Map<string, ProtocolHandler>();
 
 	constructor() {
-		this.register(new PiProtocolHandler());
+		this.register(new OmpProtocolHandler());
 		this.register(new AgentProtocolHandler());
 		this.register(new ArtifactProtocolHandler());
 		this.register(new MemoryProtocolHandler());

package/src/internal-urls/types.ts

@@ -1,7 +1,7 @@
 /**
  * Types for the internal URL routing system.
  *
- * Internal URLs (agent://, artifact://, memory://, skill://, rule://, mcp://, pi://, local://) are resolved by tools like read,
+ * Internal URLs (agent://, artifact://, memory://, skill://, rule://, mcp://, omp://, local://) are resolved by tools like read,
  * providing access to agent outputs and server resources without exposing filesystem paths.
  */
 

package/src/lsp/types.ts

@@ -22,17 +22,14 @@ export const lspSchema = z.object({
 		"capabilities",
 		"request",
 	]),
-	file: z.string().describe("File path or source path for rename_file").optional(),
-	line: z.number().describe("Line number (1-indexed)").optional(),
-	symbol: z.string().describe("Symbol/substring to locate on the line").optional(),
-	query: z.string().describe("Search query, code-action selector, or LSP method name for action=request").optional(),
-	new_name: z.string().describe("New name for rename, or destination path for rename_file").optional(),
-	apply: z.boolean().describe("Apply edits (default: true for rename/rename_file)").optional(),
-	timeout: z.number().describe("Request timeout in seconds").optional(),
-	payload: z
-		.string()
-		.describe("JSON-encoded params for action=request. When omitted, params are auto-built from file/line/symbol.")
-		.optional(),
+	file: z.string().describe("file path or source path for rename_file").optional(),
+	line: z.number().describe("line number (1-indexed)").optional(),
+	symbol: z.string().describe("symbol substring on the line").optional(),
+	query: z.string().describe("search query or code-action selector").optional(),
+	new_name: z.string().describe("new symbol name or destination path").optional(),
+	apply: z.boolean().describe("apply edits").optional(),
+	timeout: z.number().describe("request timeout in seconds").optional(),
+	payload: z.string().describe("json-encoded request params").optional(),
 });
 
 export type LspParams = z.infer<typeof lspSchema>;

package/src/main.ts

@@ -940,6 +940,9 @@ export async function runRootCommand(parsed: Args, rawArgs: string[]): Promise<v
 			initialMessage,
 			initialImages,
 		});
+		if ($env.PI_TIMING) {
+			logger.printTimings();
+		}
 		await session.dispose();
 		stopThemeWatcher();
 		await postmortem.quit(0);

package/src/mcp/tool-bridge.ts

@@ -5,7 +5,7 @@
  */
 import type { AgentToolUpdateCallback } from "@oh-my-pi/pi-agent-core";
 import type { TSchema } from "@oh-my-pi/pi-ai";
-import { sanitizeSchemaForMCP } from "@oh-my-pi/pi-ai/utils/schema";
+import { normalizeSchemaForMCP } from "@oh-my-pi/pi-ai/utils/schema";
 import { untilAborted } from "@oh-my-pi/pi-utils";
 import type { SourceMeta } from "../capability/types";
 import type {
@@ -231,7 +231,7 @@ export class MCPTool implements CustomTool<TSchema, MCPToolDetails> {
 		this.name = createMCPToolName(connection.name, tool.name);
 		this.label = `${connection.name}/${tool.name}`;
 		this.description = tool.description ?? `MCP tool from ${connection.name}`;
-		this.parameters = sanitizeSchemaForMCP(tool.inputSchema) as TSchema;
+		this.parameters = normalizeSchemaForMCP(tool.inputSchema) as TSchema;
 		this.mcpToolName = tool.name;
 		this.mcpServerName = connection.name;
 	}
@@ -324,7 +324,7 @@ export class DeferredMCPTool implements CustomTool<TSchema, MCPToolDetails> {
 		this.name = createMCPToolName(serverName, tool.name);
 		this.label = `${serverName}/${tool.name}`;
 		this.description = tool.description ?? `MCP tool from ${serverName}`;
-		this.parameters = sanitizeSchemaForMCP(tool.inputSchema) as TSchema;
+		this.parameters = normalizeSchemaForMCP(tool.inputSchema) as TSchema;
 		this.mcpToolName = tool.name;
 		this.mcpServerName = serverName;
 		this.#fallbackProvider = source?.provider;

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

@@ -86,6 +86,7 @@ const SESSION_PAGE_SIZE = 50;
  * wait past this guard without hard-coding the literal.
  */
 export const ACP_BOOTSTRAP_RACE_GUARD_MS = 50;
+const ACP_CANCEL_CLEANUP_TIMEOUT_MS = 5_000;
 
 type AgentImageContent = {
 	type: "image";
@@ -102,6 +103,13 @@ type PromptTurnState = {
 	userMessageId: string;
 	cancelRequested: boolean;
 	settled: boolean;
+	/**
+	 * `abort()` is in-flight (or its bounded-timeout race). `undefined` while the turn is
+	 * running normally and after cleanup completes. The turn occupies `record.promptTurn`
+	 * for as long as either `!settled` or `cleanup` is set — that combined window is the
+	 * "turn in flight" predicate (`isPromptTurnInFlight`) every consumer gates on.
+	 */
+	cleanup: Promise<void> | undefined;
 	usageBaseline: UsageStatistics;
 	unsubscribe: (() => void) | undefined;
 	resolve: (value: PromptResponse) => void;
@@ -109,6 +117,16 @@ type PromptTurnState = {
 	promise: Promise<PromptResponse>;
 };
 
+/**
+ * A turn is "in flight" from the moment `prompt()` reserves the slot until `settled` is
+ * true AND any cancel cleanup has completed. Fork/queue/event gating all depend on this
+ * combined window — a settled-but-still-aborting turn is not safe to fork from, queue
+ * onto, or forward late events for.
+ */
+function isPromptTurnInFlight(turn: PromptTurnState | undefined): turn is PromptTurnState {
+	return turn !== undefined && (!turn.settled || turn.cleanup !== undefined);
+}
+
 type ManagedSessionRecord = {
 	session: AgentSession;
 	mcpManager: MCPManager | undefined;
@@ -337,6 +355,7 @@ export class AcpAgent implements Agent {
 	#disposePromise: Promise<void> | undefined;
 	#cleanupRegistered = false;
 	#clientCapabilities: ClientCapabilities | undefined;
+	#cancelCleanupTimeoutMs = ACP_CANCEL_CLEANUP_TIMEOUT_MS;
 
 	constructor(connection: AgentSideConnection, initialSession: AgentSession, createSession: CreateAcpSession) {
 		this.#connection = connection;
@@ -344,6 +363,10 @@ export class AcpAgent implements Agent {
 		this.#createSession = createSession;
 	}
 
+	setCancelCleanupTimeoutForTesting(timeoutMs: number): void {
+		this.#cancelCleanupTimeoutMs = Math.max(1, timeoutMs);
+	}
+
 	async initialize(params: InitializeRequest): Promise<InitializeResponse> {
 		this.#registerConnectionCleanup();
 		this.#clientCapabilities = params.clientCapabilities;
@@ -546,9 +569,15 @@ export class AcpAgent implements Agent {
 			throw new Error("ACP prompt already in progress for this session");
 		}
 		return await this.#queuePrompt(record, async () => {
-			const queuedTurn = record.promptTurn;
-			if (queuedTurn && !queuedTurn.settled) {
-				await queuedTurn.promise.catch(() => undefined);
+			const previousTurn = record.promptTurn;
+			if (previousTurn) {
+				// Wait for any prompt that's still settling or whose cancel cleanup is
+				// still in flight. We deliberately swallow the prompt rejection (the
+				// owning caller already received it) but let cleanup rejections
+				// propagate — a timed-out cancel must fail this queued prompt instead
+				// of letting it run on a session that is about to be closed.
+				await previousTurn.promise.catch(() => undefined);
+				await previousTurn.cleanup;
 			}
 
 			const converted = this.#convertPromptBlocks(params.prompt);
@@ -557,6 +586,7 @@ export class AcpAgent implements Agent {
 				userMessageId: params.messageId ?? crypto.randomUUID(),
 				cancelRequested: false,
 				settled: false,
+				cleanup: undefined,
 				usageBaseline: this.#cloneUsageStatistics(record.session.sessionManager.getUsageStatistics()),
 				unsubscribe: undefined,
 				resolve: pendingPrompt.resolve,
@@ -676,16 +706,53 @@ export class AcpAgent implements Agent {
 		if (!promptTurn || promptTurn.settled) {
 			return;
 		}
-		promptTurn.cancelRequested = true;
+		const cleanup = this.#beginCancelCleanup(record, promptTurn);
 		try {
-			await record.session.abort();
-			this.#finishPrompt(record, {
-				stopReason: "cancelled",
-				usage: this.#buildTurnUsage(promptTurn.usageBaseline, record.session.sessionManager.getUsageStatistics()),
-				userMessageId: promptTurn.userMessageId,
-			});
+			await cleanup;
 		} catch (error: unknown) {
-			this.#finishPrompt(record, undefined, error);
+			logger.warn("ACP cancel cleanup timed out; closing session", { sessionId: record.session.sessionId, error });
+			await this.#closeManagedSession(record.session.sessionId, record);
+		}
+	}
+
+	/**
+	 * Transition a still-running turn into cancellation: mark intent, drop the live-event
+	 * subscription, start the bounded `abort()` race, and resolve the ACP prompt response
+	 * with `stopReason: "cancelled"` so the client sees acceptance immediately. The
+	 * returned promise is the cleanup barrier — it resolves when `abort()` completes and
+	 * rejects when the timeout fires. Idempotent: a second call returns the same barrier.
+	 */
+	#beginCancelCleanup(record: ManagedSessionRecord, promptTurn: PromptTurnState): Promise<void> {
+		if (promptTurn.cleanup) {
+			return promptTurn.cleanup;
+		}
+		promptTurn.cancelRequested = true;
+		promptTurn.unsubscribe?.();
+		const cleanup = this.#runCancelCleanup(record, promptTurn);
+		promptTurn.cleanup = cleanup;
+		this.#finishPrompt(record, {
+			stopReason: "cancelled",
+			usage: this.#buildTurnUsage(promptTurn.usageBaseline, record.session.sessionManager.getUsageStatistics()),
+			userMessageId: promptTurn.userMessageId,
+		});
+		return cleanup;
+	}
+
+	async #runCancelCleanup(record: ManagedSessionRecord, promptTurn: PromptTurnState): Promise<void> {
+		let timer: NodeJS.Timeout | undefined;
+		const timeout = new Promise<never>((_, reject) => {
+			timer = setTimeout(() => reject(new Error("ACP cancel cleanup timed out")), this.#cancelCleanupTimeoutMs);
+		});
+		try {
+			await Promise.race([record.session.abort(), timeout]);
+		} finally {
+			if (timer) clearTimeout(timer);
+			// Order matters: clear `cleanup` before evicting the slot so the slot-eviction
+			// branch matches what `#finishPrompt` saw if it ran first.
+			promptTurn.cleanup = undefined;
+			if (promptTurn.settled && record.promptTurn === promptTurn) {
+				record.promptTurn = undefined;
+			}
 		}
 	}
 
@@ -929,8 +996,7 @@ export class AcpAgent implements Agent {
 	async #resolveForkSourceSessionPath(sessionId: string): Promise<string> {
 		const loaded = this.#sessions.get(sessionId);
 		if (loaded) {
-			const promptTurn = loaded.promptTurn;
-			if (promptTurn && !promptTurn.settled) {
+			if (isPromptTurnInFlight(loaded.promptTurn)) {
 				throw new Error(`ACP session fork is unavailable while a prompt is in progress: ${sessionId}`);
 			}
 			await loaded.session.sessionManager.flush();
@@ -950,7 +1016,7 @@ export class AcpAgent implements Agent {
 
 	async #handlePromptEvent(record: ManagedSessionRecord, event: AgentSessionEvent): Promise<void> {
 		const promptTurn = record.promptTurn;
-		if (!promptTurn || promptTurn.settled) {
+		if (!promptTurn || promptTurn.settled || promptTurn.cancelRequested) {
 			return;
 		}
 
@@ -1019,7 +1085,11 @@ export class AcpAgent implements Agent {
 		}
 		promptTurn.settled = true;
 		promptTurn.unsubscribe?.();
-		record.promptTurn = undefined;
+		// Keep the slot occupied until cancel cleanup finishes — `#runCancelCleanup`
+		// evicts the slot in its finally block once both flags say it's safe.
+		if (!promptTurn.cleanup && record.promptTurn === promptTurn) {
+			record.promptTurn = undefined;
+		}
 		if (error !== undefined) {
 			promptTurn.reject(error);
 			return;
@@ -1887,22 +1957,15 @@ export class AcpAgent implements Agent {
 
 	async #cancelPromptForClose(record: ManagedSessionRecord): Promise<void> {
 		const promptTurn = record.promptTurn;
-		if (!promptTurn || promptTurn.settled) {
+		if (!isPromptTurnInFlight(promptTurn)) {
 			return;
 		}
-
-		promptTurn.cancelRequested = true;
-		promptTurn.unsubscribe?.();
+		const cleanup = promptTurn.cleanup ?? this.#beginCancelCleanup(record, promptTurn);
 		try {
-			await record.session.abort();
+			await cleanup;
 		} catch (error) {
 			logger.warn("Failed to abort ACP prompt during session close", { error });
 		}
-		this.#finishPrompt(record, {
-			stopReason: "cancelled",
-			usage: this.#buildTurnUsage(promptTurn.usageBaseline, record.session.sessionManager.getUsageStatistics()),
-			userMessageId: promptTurn.userMessageId,
-		});
 	}
 
 	async #disposeSessionRecord(record: ManagedSessionRecord): Promise<void> {

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

@@ -2,7 +2,6 @@
  * Component for displaying bash command execution with streaming output.
  */
 
-import { sanitizeText } from "@oh-my-pi/pi-natives";
 import {
 	Container,
 	Ellipsis,
@@ -14,6 +13,7 @@ import {
 	truncateToWidth,
 	visibleWidth,
 } from "@oh-my-pi/pi-tui";
+import { sanitizeText } from "@oh-my-pi/pi-utils";
 import { theme } from "../../modes/theme/theme";
 import type { TruncationMeta } from "../../tools/output-meta";
 import { getSixelLineMask, isSixelPassthroughEnabled, sanitizeWithOptionalSixelPassthrough } from "../../utils/sixel";

package/src/modes/components/diff.ts

@@ -1,5 +1,4 @@
-import { sanitizeText } from "@oh-my-pi/pi-natives";
-import { getIndentation } from "@oh-my-pi/pi-utils";
+import { getIndentation, sanitizeText } from "@oh-my-pi/pi-utils";
 import * as Diff from "diff";
 import { getLanguageFromPath, highlightCode, theme } from "../../modes/theme/theme";
 import { type CodeFrameMarker, formatCodeFrameLine, replaceTabs } from "../../tools/render-utils";

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

@@ -3,8 +3,8 @@
  * Shares the same kernel session as the agent's eval tool.
  */
 
-import { sanitizeText } from "@oh-my-pi/pi-natives";
 import { Container, type Loader, Text, type TUI } from "@oh-my-pi/pi-tui";
+import { sanitizeText } from "@oh-my-pi/pi-utils";
 import { highlightCode, theme } from "../../modes/theme/theme";
 import type { TruncationMeta } from "../../tools/output-meta";
 import {

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

@@ -5,6 +5,8 @@ import { theme } from "../../modes/theme/theme";
 import { matchesSelectCancel } from "../../modes/utils/keybinding-matchers";
 import type { AuthStorage } from "../../session/auth-storage";
 import { DynamicBorder } from "./dynamic-border";
+
+const OAUTH_SELECTOR_MAX_VISIBLE = 10;
 /**
  * Component that renders an OAuth provider selector.
  */
@@ -144,7 +146,16 @@ export class OAuthSelectorComponent extends Container {
 	}
 	#updateList(): void {
 		this.#listContainer.clear();
-		for (let i = 0; i < this.#allProviders.length; i++) {
+
+		const total = this.#allProviders.length;
+		const maxVisible = OAUTH_SELECTOR_MAX_VISIBLE;
+		const startIndex =
+			total <= maxVisible
+				? 0
+				: Math.max(0, Math.min(this.#selectedIndex - Math.floor(maxVisible / 2), total - maxVisible));
+		const endIndex = Math.min(startIndex + maxVisible, total);
+
+		for (let i = startIndex; i < endIndex; i++) {
 			const provider = this.#allProviders[i];
 			if (!provider) continue;
 			const isSelected = i === this.#selectedIndex;
@@ -163,8 +174,14 @@ export class OAuthSelectorComponent extends Container {
 			this.#listContainer.addChild(new TruncatedText(line, 0, 0));
 		}
 
+		// Scroll indicator when list is windowed
+		if (startIndex > 0 || endIndex < total) {
+			const scrollInfo = theme.fg("muted", `  (${this.#selectedIndex + 1}/${total})`);
+			this.#listContainer.addChild(new TruncatedText(scrollInfo, 0, 0));
+		}
+
 		// Show "no providers" if empty
-		if (this.#allProviders.length === 0) {
+		if (total === 0) {
 			const message =
 				this.#mode === "login" ? "No OAuth providers available" : "No OAuth providers logged in. Use /login first.";
 			this.#listContainer.addChild(new TruncatedText(theme.fg("muted", `  ${message}`), 0, 0));
@@ -191,6 +208,25 @@ export class OAuthSelectorComponent extends Container {
 			this.#statusMessage = undefined;
 			this.#updateList();
 		}
+		// Page up - jump up by one visible page
+		else if (matchesKey(keyData, "pageUp")) {
+			if (this.#allProviders.length > 0) {
+				this.#selectedIndex = Math.max(0, this.#selectedIndex - OAUTH_SELECTOR_MAX_VISIBLE);
+			}
+			this.#statusMessage = undefined;
+			this.#updateList();
+		}
+		// Page down - jump down by one visible page
+		else if (matchesKey(keyData, "pageDown")) {
+			if (this.#allProviders.length > 0) {
+				this.#selectedIndex = Math.min(
+					this.#allProviders.length - 1,
+					this.#selectedIndex + OAUTH_SELECTOR_MAX_VISIBLE,
+				);
+			}
+			this.#statusMessage = undefined;
+			this.#updateList();
+		}
 		// Enter
 		else if (matchesKey(keyData, "enter") || matchesKey(keyData, "return") || keyData === "\n") {
 			const selectedProvider = this.#allProviders[this.#selectedIndex];

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

@@ -1,5 +1,4 @@
 import type { AgentTool } from "@oh-my-pi/pi-agent-core";
-import { sanitizeText } from "@oh-my-pi/pi-natives";
 import {
 	Box,
 	type Component,
@@ -13,7 +12,7 @@ import {
 	Text,
 	type TUI,
 } from "@oh-my-pi/pi-tui";
-import { getProjectDir, logger } from "@oh-my-pi/pi-utils";
+import { getProjectDir, logger, sanitizeText } from "@oh-my-pi/pi-utils";
 import { EDIT_MODE_STRATEGIES, type EditMode, type PerFileDiffPreview } from "../../edit";
 import type { Theme } from "../../modes/theme/theme";
 import { theme } from "../../modes/theme/theme";