@oh-my-pi/pi-coding-agent 15.3.1 → 15.4.1

package/src/lsp/config.ts

@@ -1,10 +1,10 @@
 import * as fs from "node:fs";
 import * as os from "node:os";
 import * as path from "node:path";
-import { $which, isRecord, logger } from "@oh-my-pi/pi-utils";
+import { $which, isRecord, logger, pathIsWithin } from "@oh-my-pi/pi-utils";
 import { YAML } from "bun";
 import { getConfigDirPaths } from "../config";
-import { getPreloadedPluginRoots } from "../discovery/helpers";
+import { type ClaudePluginRoot, getPreloadedPluginRoots } from "../discovery/helpers";
 import { BiomeClient } from "./clients/biome-client";
 import { SwiftLintClient } from "./clients/swiftlint-client";
 import DEFAULTS from "./defaults.json" with { type: "json" };
@@ -22,8 +22,13 @@ export interface LspConfig {
 
 const PID_TOKEN = "$PID";
 
+interface RawServerConfig extends Partial<ServerConfig> {
+	extensionToLanguage?: unknown;
+	initializationOptions?: unknown;
+}
+
 interface NormalizedConfig {
-	servers: Record<string, Partial<ServerConfig>>;
+	servers: Record<string, RawServerConfig>;
 	idleTimeoutMs?: number;
 }
 
@@ -42,12 +47,12 @@ function normalizeConfig(value: unknown): NormalizedConfig | null {
 	const rawServers = value.servers;
 
 	if (isRecord(rawServers)) {
-		return { servers: rawServers as Record<string, Partial<ServerConfig>>, idleTimeoutMs };
+		return { servers: rawServers as Record<string, RawServerConfig>, idleTimeoutMs };
 	}
 
 	const servers = Object.fromEntries(Object.entries(value).filter(([key]) => key !== "idleTimeoutMs")) as Record<
 		string,
-		Partial<ServerConfig>
+		RawServerConfig
 	>;
 
 	return { servers, idleTimeoutMs };
@@ -58,11 +63,17 @@ function normalizeStringArray(value: unknown): string[] | null {
 	const items = value.filter((entry): entry is string => typeof entry === "string" && entry.length > 0);
 	return items.length > 0 ? items : null;
 }
+function normalizeExtensionToFileTypes(value: unknown): string[] | null {
+	if (!isRecord(value)) return null;
+	const extensions = Object.keys(value).filter(extension => extension.length > 0);
+	return extensions.length > 0 ? extensions : null;
+}
 
-function normalizeServerConfig(name: string, config: Partial<ServerConfig>): ServerConfig | null {
+function normalizeServerConfig(name: string, config: RawServerConfig): ServerConfig | null {
 	const command = typeof config.command === "string" && config.command.length > 0 ? config.command : null;
-	const fileTypes = normalizeStringArray(config.fileTypes);
-	const rootMarkers = normalizeStringArray(config.rootMarkers);
+	const fileTypes =
+		normalizeStringArray(config.fileTypes) ?? normalizeExtensionToFileTypes(config.extensionToLanguage);
+	const rootMarkers = normalizeStringArray(config.rootMarkers) ?? (config.extensionToLanguage ? ["."] : null);
 
 	if (!command || !fileTypes || !rootMarkers) {
 		logger.warn("Ignoring invalid LSP server config (missing required fields).", { name });
@@ -72,6 +83,11 @@ function normalizeServerConfig(name: string, config: Partial<ServerConfig>): Ser
 	const args = Array.isArray(config.args)
 		? config.args.filter((entry): entry is string => typeof entry === "string")
 		: undefined;
+	const initOptions = isRecord(config.initOptions)
+		? config.initOptions
+		: isRecord(config.initializationOptions)
+			? config.initializationOptions
+			: undefined;
 
 	return {
 		...config,
@@ -79,6 +95,7 @@ function normalizeServerConfig(name: string, config: Partial<ServerConfig>): Ser
 		args,
 		fileTypes,
 		rootMarkers,
+		...(initOptions ? { initOptions } : {}),
 	};
 }
 
@@ -92,7 +109,7 @@ function readConfigFile(filePath: string): NormalizedConfig | null {
 	}
 }
 
-function coerceServerConfigs(servers: Record<string, Partial<ServerConfig>>): Record<string, ServerConfig> {
+function coerceServerConfigs(servers: Record<string, RawServerConfig>): Record<string, ServerConfig> {
 	const result: Record<string, ServerConfig> = {};
 	for (const [name, config] of Object.entries(servers)) {
 		const normalized = normalizeServerConfig(name, config);
@@ -105,7 +122,7 @@ function coerceServerConfigs(servers: Record<string, Partial<ServerConfig>>): Re
 
 function mergeServers(
 	base: Record<string, ServerConfig>,
-	overrides: Record<string, Partial<ServerConfig>>,
+	overrides: Record<string, RawServerConfig>,
 ): Record<string, ServerConfig> {
 	const merged: Record<string, ServerConfig> = { ...base };
 	for (const [name, config] of Object.entries(overrides)) {
@@ -245,24 +262,71 @@ export function resolveCommand(command: string, cwd: string): string | null {
 	return $which(command);
 }
 
+interface ConfigSource {
+	read(): NormalizedConfig | null;
+}
+
+function fileConfigSource(filePath: string): ConfigSource {
+	return {
+		read: () => readConfigFile(filePath),
+	};
+}
+
+function readMarketplaceLspConfig(root: ClaudePluginRoot): NormalizedConfig | null {
+	const catalogPaths = [
+		path.resolve(root.path, "..", "..", "marketplace.json"),
+		path.resolve(root.path, "..", "..", ".claude-plugin", "marketplace.json"),
+	];
+
+	for (const catalogPath of catalogPaths) {
+		try {
+			const catalog = JSON.parse(fs.readFileSync(catalogPath, "utf-8")) as unknown;
+			if (!isRecord(catalog) || !Array.isArray(catalog.plugins)) continue;
+
+			for (const plugin of catalog.plugins) {
+				if (!isRecord(plugin) || plugin.name !== root.plugin) continue;
+
+				const lspServers = plugin.lspServers;
+				if (typeof lspServers === "string") {
+					const configPath = path.resolve(root.path, lspServers);
+					if (!pathIsWithin(root.path, configPath)) return null;
+					return readConfigFile(configPath);
+				}
+				if (isRecord(lspServers)) {
+					return normalizeConfig({ servers: lspServers });
+				}
+				return null;
+			}
+		} catch {}
+	}
+
+	return null;
+}
+
+function marketplaceConfigSource(root: ClaudePluginRoot): ConfigSource {
+	return {
+		read: () => readMarketplaceLspConfig(root),
+	};
+}
+
 /**
- * Configuration file search paths (in priority order).
+ * Configuration sources in priority order.
  * Supports both visible and hidden variants at each config location.
  */
-function getConfigPaths(cwd: string): string[] {
+function getConfigSources(cwd: string): ConfigSource[] {
 	const filenames = ["lsp.json", ".lsp.json", "lsp.yaml", ".lsp.yaml", "lsp.yml", ".lsp.yml"];
-	const paths: string[] = [];
+	const sources: ConfigSource[] = [];
 
 	// Project root files (highest priority)
 	for (const filename of filenames) {
-		paths.push(path.join(cwd, filename));
+		sources.push(fileConfigSource(path.join(cwd, filename)));
 	}
 
 	// Project config directories (.omp/, .pi/, .claude/)
 	const projectDirs = getConfigDirPaths("", { user: false, project: true, cwd });
 	for (const dir of projectDirs) {
 		for (const filename of filenames) {
-			paths.push(path.join(dir, filename));
+			sources.push(fileConfigSource(path.join(dir, filename)));
 		}
 	}
 
@@ -270,7 +334,7 @@ function getConfigPaths(cwd: string): string[] {
 	const userDirs = getConfigDirPaths("", { user: true, project: false });
 	for (const dir of userDirs) {
 		for (const filename of filenames) {
-			paths.push(path.join(dir, filename));
+			sources.push(fileConfigSource(path.join(dir, filename)));
 		}
 	}
 
@@ -278,16 +342,17 @@ function getConfigPaths(cwd: string): string[] {
 	const pluginRoots = getPreloadedPluginRoots();
 	for (const root of pluginRoots) {
 		for (const filename of filenames) {
-			paths.push(path.join(root.path, filename));
+			sources.push(fileConfigSource(path.join(root.path, filename)));
 		}
+		sources.push(marketplaceConfigSource(root));
 	}
 
 	// User home root files (lowest priority fallback)
 	for (const filename of filenames) {
-		paths.push(path.join(os.homedir(), filename));
+		sources.push(fileConfigSource(path.join(os.homedir(), filename)));
 	}
 
-	return paths;
+	return sources;
 }
 
 /**
@@ -324,12 +389,12 @@ function getConfigPaths(cwd: string): string[] {
 export function loadConfig(cwd: string): LspConfig {
 	let mergedServers = coerceServerConfigs(DEFAULTS);
 
-	const configPaths = getConfigPaths(cwd).reverse();
+	const configSources = getConfigSources(cwd).reverse();
 	let hasOverrides = false;
 
 	let idleTimeoutMs: number | undefined;
-	for (const configPath of configPaths) {
-		const parsed = readConfigFile(configPath);
+	for (const source of configSources) {
+		const parsed = source.read();
 		if (!parsed) continue;
 		const hasServerOverrides = Object.keys(parsed.servers).length > 0;
 		if (hasServerOverrides) {

package/src/modes/components/extensions/types.ts

@@ -143,11 +143,6 @@ export interface DashboardState {
 	selected: Extension | null;
 }
 
-/**
- * @deprecated Use FocusRegion instead
- */
-export type FocusPane = "sidebar" | "main" | "inspector";
-
 /**
  * Callbacks from dashboard to parent.
  */

package/src/modes/components/session-observer-overlay.ts

@@ -22,6 +22,7 @@ import { isSilentAbort } from "../../session/messages";
 import type { SessionMessageEntry } from "../../session/session-manager";
 import { parseSessionEntries } from "../../session/session-manager";
 import { PREVIEW_LIMITS, replaceTabs, TRUNCATE_LENGTHS, truncateToWidth } from "../../tools/render-utils";
+import { toPathList } from "../../tools/search";
 import type { ObservableSession, SessionObserverRegistry } from "../session-observer-registry";
 import { getMarkdownTheme, theme } from "../theme/theme";
 import { DynamicBorder } from "./dynamic-border";
@@ -533,13 +534,21 @@ export class SessionObserverOverlayComponent extends Container {
 			case "write":
 			case "edit":
 				return args.path ? `path: ${args.path}` : "";
-			case "search":
+			case "search": {
+				const searchPathsInput =
+					typeof args.paths === "string" || Array.isArray(args.paths)
+						? args.paths
+						: typeof args.path === "string"
+							? args.path
+							: undefined;
+				const searchPaths = toPathList(searchPathsInput);
 				return [
 					args.pattern ? `pattern: ${args.pattern}` : "",
-					Array.isArray(args.paths) ? `paths: ${args.paths.join(", ")}` : "",
+					searchPaths.length > 0 ? `paths: ${searchPaths.join(", ")}` : "",
 				]
 					.filter(Boolean)
 					.join(", ");
+			}
 			case "find":
 				return Array.isArray(args.paths) ? `paths: ${args.paths.join(", ")}` : "";
 			case "bash": {

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

@@ -15,6 +15,7 @@ import { theme } from "../../modes/theme/theme";
 import { matchesAppInterrupt } from "../../modes/utils/keybinding-matchers";
 import type { SessionTreeNode } from "../../session/session-manager";
 import { shortenPath } from "../../tools/render-utils";
+import { toPathList } from "../../tools/search";
 import { DynamicBorder } from "./dynamic-border";
 
 /** Gutter info: position (displayIndent where connector was) and whether to show │ */
@@ -690,8 +691,15 @@ class TreeList implements Component {
 			}
 			case "search": {
 				const pattern = String(args.pattern || "");
-				const paths = Array.isArray(args.paths) ? args.paths.join(", ") : String(args.path || ".");
-				return `[search: /${pattern}/ in ${shortenPath(paths)}]`;
+				const searchPathsInput =
+					typeof args.paths === "string" || Array.isArray(args.paths)
+						? args.paths
+						: typeof args.path === "string"
+							? args.path
+							: undefined;
+				const paths = toPathList(searchPathsInput);
+				const scope = paths.length > 0 ? paths.join(", ") : ".";
+				return `[search: /${pattern}/ in ${shortenPath(scope)}]`;
 			}
 			case "find": {
 				const paths = Array.isArray(args.paths) ? args.paths.join(", ") : String(args.pattern || ".");

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

@@ -894,8 +894,6 @@ export class CommandController {
 		this.ctx.statusLine.setSessionStartTime(Date.now());
 		this.ctx.updateEditorTopBorder();
 		this.ctx.updateEditorBorderColor();
-		this.ctx.ui.requestRender();
-
 		this.ctx.chatContainer.clear();
 		this.ctx.pendingMessagesContainer.clear();
 		this.ctx.compactionQueuedMessages = [];
@@ -906,7 +904,7 @@ export class CommandController {
 		this.ctx.chatContainer.addChild(new Spacer(1));
 		this.ctx.chatContainer.addChild(new Text(`${theme.fg("accent", `${theme.status.success} ${label}`)}`, 1, 1));
 		await this.ctx.reloadTodos();
-		this.ctx.ui.requestRender();
+		this.ctx.ui.requestRender(true, { clearScrollback: true });
 	}
 
 	async handleClearCommand(): Promise<void> {

package/src/modes/controllers/extension-ui-controller.ts

@@ -135,7 +135,7 @@ export class ExtensionUiController {
 			reload: async () => {
 				await this.ctx.session.reload();
 				this.ctx.chatContainer.clear();
-				this.ctx.renderInitialMessages();
+				this.ctx.renderInitialMessages(undefined, { clearTerminalHistory: true });
 				await this.ctx.reloadTodos();
 				this.ctx.showStatus("Reloaded session");
 			},
@@ -180,7 +180,7 @@ export class ExtensionUiController {
 					new Text(`${theme.fg("accent", `${theme.status.success} New session started`)}`, 1, 1),
 				);
 				await this.ctx.reloadTodos();
-				this.ctx.ui.requestRender();
+				this.ctx.ui.requestRender(true, { clearScrollback: true });
 
 				return { cancelled: false };
 			},
@@ -192,7 +192,7 @@ export class ExtensionUiController {
 
 				// Update UI
 				this.ctx.chatContainer.clear();
-				this.ctx.renderInitialMessages();
+				this.ctx.renderInitialMessages(undefined, { clearTerminalHistory: true });
 				await this.ctx.reloadTodos();
 				this.ctx.editor.setText(result.selectedText);
 				this.ctx.showStatus("Branched to new session");
@@ -207,7 +207,7 @@ export class ExtensionUiController {
 
 				// Update UI
 				this.ctx.chatContainer.clear();
-				this.ctx.renderInitialMessages();
+				this.ctx.renderInitialMessages(undefined, { clearTerminalHistory: true });
 				await this.ctx.reloadTodos();
 				if (result.editorText && !this.ctx.editor.getText().trim()) {
 					this.ctx.editor.setText(result.editorText);
@@ -225,7 +225,7 @@ export class ExtensionUiController {
 				}
 				setSessionTerminalTitle(this.ctx.sessionManager.getSessionName(), this.ctx.sessionManager.getCwd());
 				this.ctx.chatContainer.clear();
-				this.ctx.renderInitialMessages();
+				this.ctx.renderInitialMessages(undefined, { clearTerminalHistory: true });
 				await this.ctx.reloadTodos();
 				return { cancelled: false };
 			},
@@ -378,7 +378,7 @@ export class ExtensionUiController {
 				}
 				await this.ctx.session.reload();
 				this.ctx.chatContainer.clear();
-				this.ctx.renderInitialMessages();
+				this.ctx.renderInitialMessages(undefined, { clearTerminalHistory: true });
 				await this.ctx.reloadTodos();
 				this.ctx.showStatus("Reloaded session");
 			},
@@ -419,7 +419,7 @@ export class ExtensionUiController {
 					new Text(`${theme.fg("accent", `${theme.status.success} New session started`)}`, 1, 1),
 				);
 				await this.ctx.reloadTodos();
-				this.ctx.ui.requestRender();
+				this.ctx.ui.requestRender(true, { clearScrollback: true });
 
 				return { cancelled: false };
 			},
@@ -434,7 +434,7 @@ export class ExtensionUiController {
 
 				// Update UI
 				this.ctx.chatContainer.clear();
-				this.ctx.renderInitialMessages();
+				this.ctx.renderInitialMessages(undefined, { clearTerminalHistory: true });
 				await this.ctx.reloadTodos();
 				this.ctx.editor.setText(result.selectedText);
 				this.ctx.showStatus("Branched to new session");
@@ -452,7 +452,7 @@ export class ExtensionUiController {
 
 				// Update UI
 				this.ctx.chatContainer.clear();
-				this.ctx.renderInitialMessages();
+				this.ctx.renderInitialMessages(undefined, { clearTerminalHistory: true });
 				await this.ctx.reloadTodos();
 				if (result.editorText && !this.ctx.editor.getText().trim()) {
 					this.ctx.editor.setText(result.editorText);
@@ -472,7 +472,7 @@ export class ExtensionUiController {
 					return { cancelled: true };
 				}
 				this.ctx.chatContainer.clear();
-				this.ctx.renderInitialMessages();
+				this.ctx.renderInitialMessages(undefined, { clearTerminalHistory: true });
 				await this.ctx.reloadTodos();
 				return { cancelled: false };
 			},
@@ -537,7 +537,6 @@ export class ExtensionUiController {
 						model: this.ctx.session.model,
 						isIdle: () => !this.ctx.session.isStreaming,
 						hasPendingMessages: () => this.ctx.session.queuedMessageCount > 0,
-						hasQueuedMessages: () => this.ctx.session.queuedMessageCount > 0,
 						abort: () => {
 							this.ctx.session.abort();
 						},

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

@@ -553,7 +553,7 @@ export class SelectorController {
 					}
 
 					this.ctx.chatContainer.clear();
-					this.ctx.renderInitialMessages();
+					this.ctx.renderInitialMessages(undefined, { clearTerminalHistory: true });
 					this.ctx.editor.setText(result.selectedText);
 					done();
 					this.ctx.showStatus("Branched to new session");
@@ -664,7 +664,7 @@ export class SelectorController {
 
 						// Update UI — pass the context built by navigateTree to skip a second O(N) walk.
 						this.ctx.chatContainer.clear();
-						this.ctx.renderInitialMessages(result.sessionContext);
+						this.ctx.renderInitialMessages(result.sessionContext, { clearTerminalHistory: true });
 						await this.ctx.reloadTodos();
 						if (result.editorText && !this.ctx.editor.getText().trim()) {
 							this.ctx.editor.setText(result.editorText);
@@ -772,9 +772,9 @@ export class SelectorController {
 		this.ctx.statusLine.setSessionStartTime(Date.now());
 		this.ctx.updateEditorTopBorder();
 		this.ctx.updateEditorBorderColor();
-		this.ctx.renderInitialMessages();
+		this.ctx.renderInitialMessages(undefined, { clearTerminalHistory: true });
 		await this.ctx.reloadTodos();
-		this.ctx.ui.requestRender();
+		this.ctx.ui.requestRender(true, { clearScrollback: true });
 		return true;
 	}
 
@@ -788,7 +788,7 @@ export class SelectorController {
 
 		// Clear and re-render the chat
 		this.ctx.chatContainer.clear();
-		this.ctx.renderInitialMessages();
+		this.ctx.renderInitialMessages(undefined, { clearTerminalHistory: true });
 		await this.ctx.reloadTodos();
 		this.ctx.showStatus("Resumed session");
 	}

package/src/modes/types.ts

@@ -186,7 +186,10 @@ export interface InteractiveModeContext {
 		sessionContext: SessionContext,
 		options?: { updateFooter?: boolean; populateHistory?: boolean },
 	): void;
-	renderInitialMessages(prebuiltContext?: SessionContext, options?: { preserveExistingChat?: boolean }): void;
+	renderInitialMessages(
+		prebuiltContext?: SessionContext,
+		options?: { preserveExistingChat?: boolean; clearTerminalHistory?: boolean },
+	): void;
 	getUserMessageText(message: Message): string;
 	findLastAssistantMessage(): AssistantMessage | undefined;
 	extractAssistantText(message: AssistantMessage): string;

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

@@ -31,6 +31,7 @@ import { formatBytes, formatDuration } from "../../tools/render-utils";
 type TextBlock = { type: "text"; text: string };
 interface RenderInitialMessagesOptions {
 	preserveExistingChat?: boolean;
+	clearTerminalHistory?: boolean;
 }
 
 type QueuedMessages = {
@@ -490,6 +491,9 @@ export class UiHelpers {
 			const times = compactionCount === 1 ? "1 time" : `${compactionCount} times`;
 			this.ctx.showStatus(`Session compacted ${times}`);
 		}
+		if (options.clearTerminalHistory) {
+			this.ctx.ui.requestRender(true, { clearScrollback: true });
+		}
 		if (preservedChatChildren && preservedChatChildren.length > 0) {
 			for (const child of preservedChatChildren) {
 				this.ctx.chatContainer.addChild(child);

package/src/prompts/agents/explore.md

@@ -15,7 +15,7 @@ output:
         description: Files examined with relevant code references
       elements:
         properties:
-          ref:
+          path:
             metadata:
               description: Project-relative path or paths to the most relevant code reference(s), optionally suffixed with line ranges like `:12-34` when relevant
             type: string

package/src/prompts/tools/ast-edit.md

@@ -14,7 +14,7 @@ Performs structural AST-aware rewrites via native ast-grep.
 </instruction>
 
 <output>
-- Replacement summary, per-file replacement counts, and change diffs as `-LINE+ID|before` / `+LINE+ID|after` lines
+- Replacement summary, per-file replacement counts, and change diffs as `¶src/foo.ts#1a2b`, `-12:before`, `+12:after` lines in hashline mode
 - Parse issues when files cannot be processed
 </output>
 

package/src/prompts/tools/ast-grep.md

@@ -18,7 +18,7 @@ Performs structural code search using AST matching via native ast-grep.
 
 <output>
 - Grouped matches with file path, byte range, line/column ranges, metavariable captures
-- Match lines are anchor-prefixed: `*LINE+ID|content` for the matched line and ` LINE+ID|content` (leading space) for surrounding context
+- Match lines are numbered under a file-hash header in hashline mode: `¶src/foo.ts#1a2b`, `*42:content` for the matched line, ` 43:content` for context
 - Summary counts (`totalMatches`, `filesWithMatches`, `filesSearched`) and parse issues when present
 </output>
 

package/src/prompts/tools/eval.md

@@ -1,7 +1,7 @@
 Run code in a persistent kernel using a list of cells.
 
 <instruction>
-Each call submits one or more cells. Cells run in array order. State persists within each language across cells **and across tool calls**.
+Each call submits one or more cells. Cells run in array order. State persists within each language across cells, tool calls, and subagents spawned with `task`; variables a parent or subagent declares are visible to the other on the same shared executor.
 
 Cell fields: