@oh-my-pi/pi-coding-agent 2.3.1337 → 3.1.1337

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

@@ -6,6 +6,7 @@
 import * as fs from "node:fs";
 import * as os from "node:os";
 import * as path from "node:path";
+import { basename } from "node:path";
 import type { AgentMessage, ThinkingLevel } from "@oh-my-pi/pi-agent-core";
 import type { AssistantMessage, ImageContent, Message, OAuthProvider } from "@oh-my-pi/pi-ai";
 import type { SlashCommand } from "@oh-my-pi/pi-tui";
@@ -23,6 +24,10 @@ import {
 	TUI,
 	visibleWidth,
 } from "@oh-my-pi/pi-tui";
+import { contextFileCapability } from "../../capability/context-file";
+import { instructionCapability } from "../../capability/instruction";
+import { promptCapability } from "../../capability/prompt";
+import { ruleCapability } from "../../capability/rule";
 import { getAuthPath, getDebugLogPath } from "../../config";
 import type { AgentSession, AgentSessionEvent } from "../../core/agent-session";
 import type { CustomToolSessionEvent, LoadedCustomTool } from "../../core/custom-tools/index";
@@ -30,9 +35,17 @@ import type { HookUIContext } from "../../core/hooks/index";
 import { createCompactionSummaryMessage } from "../../core/messages";
 import { getRecentSessions, type SessionContext, SessionManager } from "../../core/session-manager";
 import { loadSkills } from "../../core/skills";
-import { loadProjectContextFiles } from "../../core/system-prompt";
 import { generateSessionTitle, setTerminalTitle } from "../../core/title-generator";
 import type { TruncationResult } from "../../core/tools/truncate";
+import {
+	type ContextFile,
+	disableProvider,
+	enableProvider,
+	type Instruction,
+	loadSync,
+	type Prompt,
+	type Rule,
+} from "../../discovery";
 import { getChangelogPath, parseChangelog } from "../../utils/changelog";
 import { copyToClipboard, readImageFromClipboard } from "../../utils/clipboard";
 import { ArminComponent } from "./components/armin";
@@ -1535,7 +1548,7 @@ export class InteractiveMode {
 		}
 
 		const currentText = this.editor.getText();
-		const tmpFile = path.join(os.tmpdir(), `pi-editor-${Date.now()}.pi.md`);
+		const tmpFile = path.join(os.tmpdir(), `omp-editor-${Date.now()}.omp.md`);
 
 		try {
 			// Write current content to temp file
@@ -1729,6 +1742,17 @@ export class InteractiveMode {
 	 * This handles side effects and session-specific settings.
 	 */
 	private handleSettingChange(id: string, value: string | boolean): void {
+		// Discovery provider toggles
+		if (id.startsWith("discovery.")) {
+			const providerId = id.replace("discovery.", "");
+			if (value) {
+				enableProvider(providerId);
+			} else {
+				disableProvider(providerId);
+			}
+			return;
+		}
+
 		switch (id) {
 			// Session-managed settings (not in SettingsManager)
 			case "autoCompact":
@@ -2369,13 +2393,113 @@ export class InteractiveMode {
 	private handleStatusCommand(): void {
 		const sections: string[] = [];
 
+		type StatusSource =
+			| { provider: string; level: string }
+			| { mcpServer: string; provider?: string }
+			| "builtin"
+			| "unknown";
+
+		const capitalize = (value: string): string => value.charAt(0).toUpperCase() + value.slice(1);
+
+		const resolveSourceText = (source: StatusSource): string => {
+			if (source === "builtin") return "builtin";
+			if (source === "unknown") return "unknown";
+			if ("mcpServer" in source) {
+				if (!source.provider) return `mcp:${source.mcpServer}`;
+				return `${source.mcpServer} via ${source.provider}`;
+			}
+			const levelLabel = capitalize(source.level);
+			return `via ${source.provider} (${levelLabel})`;
+		};
+
+		const renderSourceText = (text: string): string => text.replace(/\bvia\b/, theme.italic("via"));
+
+		const truncateText = (text: string, maxWidth: number): string => {
+			const textWidth = visibleWidth(text);
+			if (textWidth <= maxWidth) return text;
+			if (maxWidth <= 3) {
+				let acc = "";
+				let width = 0;
+				for (const char of text) {
+					const charWidth = visibleWidth(char);
+					if (width + charWidth > maxWidth) break;
+					width += charWidth;
+					acc += char;
+				}
+				return acc;
+			}
+			const targetWidth = maxWidth - 3;
+			let acc = "";
+			let width = 0;
+			for (const char of text) {
+				const charWidth = visibleWidth(char);
+				if (width + charWidth > targetWidth) break;
+				width += charWidth;
+				acc += char;
+			}
+			return `${acc}...`;
+		};
+
+		// Helper to format a section with consistent column alignment
+		const formatSection = <T>(
+			title: string,
+			items: readonly T[],
+			getName: (item: T) => string,
+			getDesc: (item: T) => string | undefined,
+			getSource: (item: T) => StatusSource,
+		): string => {
+			if (items.length === 0) return "";
+
+			const lineItems = items.map((item) => {
+				const name = getName(item);
+				const desc = getDesc(item);
+				const sourceText = resolveSourceText(getSource(item));
+				const nameWithSource = sourceText ? `${name} ${sourceText}` : name;
+				return { name, sourceText, nameWithSource, desc };
+			});
+
+			const maxNameWidth = Math.min(
+				60,
+				Math.max(...lineItems.map((line) => visibleWidth(line.nameWithSource))),
+			);
+			const formattedLines = lineItems.map((line) => {
+				let nameText = line.name;
+				let sourceText = line.sourceText;
+
+				if (sourceText) {
+					const maxSourceWidth = Math.max(0, maxNameWidth - 2);
+					sourceText = truncateText(sourceText, maxSourceWidth);
+				}
+				const sourceWidth = sourceText ? visibleWidth(sourceText) : 0;
+				const availableForName = sourceText
+					? Math.max(1, maxNameWidth - sourceWidth - 1)
+					: maxNameWidth;
+				nameText = truncateText(nameText, availableForName);
+
+				const nameWithSourcePlain = sourceText ? `${nameText} ${sourceText}` : nameText;
+				const sourceRendered = sourceText ? renderSourceText(sourceText) : "";
+				const nameRendered = sourceText ? `${theme.bold(nameText)} ${sourceRendered}` : theme.bold(nameText);
+				const pad = Math.max(0, maxNameWidth - visibleWidth(nameWithSourcePlain));
+				const desc = line.desc?.trim();
+				const descPart = desc ? `  ${theme.fg("dim", desc.slice(0, 50) + (desc.length > 50 ? "..." : ""))}` : "";
+				return `  ${nameRendered}${" ".repeat(pad)}${descPart}`;
+			});
+
+			return `${theme.bold(theme.fg("accent", title))}\n${formattedLines.join("\n")}`;
+		};
+
 		// Loaded context files
-		const contextFiles = loadProjectContextFiles();
+		const contextFilesResult = loadSync(contextFileCapability.id, { cwd: process.cwd() });
+		const contextFiles = contextFilesResult.items as ContextFile[];
 		if (contextFiles.length > 0) {
 			sections.push(
-				theme.bold(theme.fg("accent", "Context Files")) +
-					"\n" +
-					contextFiles.map((f) => theme.fg("dim", `  ${f.path}`)).join("\n"),
+				formatSection(
+					"Context Files",
+					contextFiles,
+					(f) => basename(f.path),
+					() => undefined,
+					(f) => ({ provider: f._source.providerName, level: f.level }),
+				),
 			);
 		}
 
@@ -2385,9 +2509,13 @@ export class InteractiveMode {
 			const { skills, warnings: skillWarnings } = loadSkills(skillsSettings ?? {});
 			if (skills.length > 0) {
 				sections.push(
-					theme.bold(theme.fg("accent", "Skills")) +
-						"\n" +
-						skills.map((s) => theme.fg("dim", `  ${s.filePath}`)).join("\n"),
+					formatSection(
+						"Skills",
+						skills,
+						(s) => s.name,
+						(s) => s.description,
+						(s) => (s._source ? { provider: s._source.providerName, level: s._source.level } : "unknown"),
+					),
 				);
 			}
 			if (skillWarnings.length > 0) {
@@ -2399,14 +2527,103 @@ export class InteractiveMode {
 			}
 		}
 
-		// Loaded custom tools
+		// Loaded rules
+		const rulesResult = loadSync<Rule>(ruleCapability.id, { cwd: process.cwd() });
+		if (rulesResult.items.length > 0) {
+			sections.push(
+				formatSection(
+					"Rules",
+					rulesResult.items,
+					(r) => r.name,
+					(r) => r.description,
+					(r) => ({ provider: r._source.providerName, level: r._source.level }),
+				),
+			);
+		}
+
+		// Loaded prompts
+		const promptsResult = loadSync<Prompt>(promptCapability.id, { cwd: process.cwd() });
+		if (promptsResult.items.length > 0) {
+			sections.push(
+				formatSection(
+					"Prompts",
+					promptsResult.items,
+					(p) => p.name,
+					() => undefined,
+					(p) => ({ provider: p._source.providerName, level: p._source.level }),
+				),
+			);
+		}
+
+		// Loaded instructions
+		const instructionsResult = loadSync<Instruction>(instructionCapability.id, { cwd: process.cwd() });
+		if (instructionsResult.items.length > 0) {
+			sections.push(
+				formatSection(
+					"Instructions",
+					instructionsResult.items,
+					(i) => i.name,
+					(i) => (i.applyTo ? `applies to: ${i.applyTo}` : undefined),
+					(i) => ({ provider: i._source.providerName, level: i._source.level }),
+				),
+			);
+		}
+
+		// Loaded custom tools - split MCP from non-MCP
 		if (this.customTools.size > 0) {
+			const allTools = Array.from(this.customTools.values());
+			const mcpTools = allTools.filter((ct) => ct.path.startsWith("mcp:"));
+			const customTools = allTools.filter((ct) => !ct.path.startsWith("mcp:"));
+
+			// MCP Tools section
+			if (mcpTools.length > 0) {
+				sections.push(
+					formatSection(
+						"MCP Tools",
+						mcpTools,
+						(ct) => ct.tool.label || ct.tool.name,
+						() => undefined,
+						(ct) => {
+							const match = ct.path.match(/^mcp:(.+?) via (.+)$/);
+							if (match) {
+								const [, serverName, providerName] = match;
+								return { mcpServer: serverName, provider: providerName };
+							}
+							return ct.path.startsWith("mcp:") ? { mcpServer: ct.path.slice(4) } : "unknown";
+						},
+					),
+				);
+			}
+
+			// Custom Tools section
+			if (customTools.length > 0) {
+				sections.push(
+					formatSection(
+						"Custom Tools",
+						customTools,
+						(ct) => ct.tool.label || ct.tool.name,
+						(ct) => ct.tool.description,
+						(ct) => {
+							if (ct.source?.provider === "builtin") return "builtin";
+							if (ct.path === "<exa>") return "builtin";
+							return ct.source ? { provider: ct.source.providerName, level: ct.source.level } : "unknown";
+						},
+					),
+				);
+			}
+		}
+
+		// Loaded slash commands (file-based)
+		const fileCommands = this.session.fileCommands;
+		if (fileCommands.length > 0) {
 			sections.push(
-				theme.bold(theme.fg("accent", "Custom Tools")) +
-					"\n" +
-					Array.from(this.customTools.values())
-						.map((ct) => theme.fg("dim", `  ${ct.tool.name} (${ct.path})`))
-						.join("\n"),
+				formatSection(
+					"Slash Commands",
+					fileCommands,
+					(cmd) => `/${cmd.name}`,
+					(cmd) => cmd.description,
+					(cmd) => (cmd._source ? { provider: cmd._source.providerName, level: cmd._source.level } : "unknown"),
+				),
 			);
 		}
 
@@ -2416,7 +2633,7 @@ export class InteractiveMode {
 			const hookPaths = hookRunner.getHookPaths();
 			if (hookPaths.length > 0) {
 				sections.push(
-					`${theme.bold(theme.fg("accent", "Hooks"))}\n${hookPaths.map((p) => theme.fg("dim", `  ${p}`)).join("\n")}`,
+					`${theme.bold(theme.fg("accent", "Hooks"))}\n${hookPaths.map((p) => `  ${theme.bold(basename(p))} ${theme.fg("dim", "hook")}`).join("\n")}`,
 				);
 			}
 		}

package/src/modes/interactive/theme/theme-schema.json

@@ -1,7 +1,7 @@
 {
 	"$schema": "http://json-schema.org/draft-07/schema#",
 	"title": "Pi Coding Agent Theme",
-	"description": "Theme schema for Pi coding agent",
+	"description": "Theme schema for OMP coding agent",
 	"type": "object",
 	"required": ["name", "colors"],
 	"properties": {

package/src/utils/clipboard.ts

@@ -199,7 +199,7 @@ async function readImageMacOS(timeout: number): Promise<ClipboardImage | null> {
 
 	// Read the actual image data using a temp file approach
 	// osascript can't output binary directly, so we write to a temp file
-	const tempFile = `/tmp/pi-clipboard-${Date.now()}.${imageType === "png" ? "png" : "jpg"}`;
+	const tempFile = `/tmp/omp-clipboard-${Date.now()}.${imageType === "png" ? "png" : "jpg"}`;
 	const clipboardClass = imageType === "png" ? "«class PNGf»" : "«class JPEG»";
 
 	const readScript = `

package/src/utils/shell-snapshot.ts

@@ -77,7 +77,7 @@ SNAPSHOT_FILE='${escapedPath}'
 ${hasRcFile ? `source "${rcFile}" < /dev/null 2>/dev/null` : "# No user config file to source"}
 
 # Create/clear the snapshot file
-echo "# Shell snapshot - generated by pi agent" >| "$SNAPSHOT_FILE"
+echo "# Shell snapshot - generated by omp agent" >| "$SNAPSHOT_FILE"
 
 # Unalias everything first to avoid conflicts when sourced
 echo "unalias -a 2>/dev/null || true" >> "$SNAPSHOT_FILE"
@@ -127,7 +127,7 @@ export async function getOrCreateSnapshot(
 	const rcFile = getShellConfigFile(shell);
 
 	// Create snapshot directory
-	const snapshotDir = join(tmpdir(), "pi-shell-snapshots");
+	const snapshotDir = join(tmpdir(), "omp-shell-snapshots");
 	try {
 		mkdirSync(snapshotDir, { recursive: true });
 	} catch {

package/src/utils/shell.ts

@@ -26,13 +26,13 @@ function isExecutable(path: string): boolean {
  * Build the spawn environment (cached).
  */
 function buildSpawnEnv(shell: string): Record<string, string | undefined> {
-	const noCI = process.env.PI_BASH_NO_CI || process.env.CLAUDE_BASH_NO_CI;
+	const noCI = process.env.OMP_BASH_NO_CI || process.env.CLAUDE_BASH_NO_CI;
 	return {
 		...process.env,
 		SHELL: shell,
 		GIT_EDITOR: "true",
 		GPG_TTY: "not a tty",
-		PICODE: "1",
+		OMPCODE: "1",
 		CLAUDECODE: "1",
 		...(noCI ? {} : { CI: "true" }),
 	};
@@ -40,10 +40,10 @@ function buildSpawnEnv(shell: string): Record<string, string | undefined> {
 
 /**
  * Get shell args, optionally including login shell flag.
- * Supports PI_BASH_NO_LOGIN and CLAUDE_BASH_NO_LOGIN to skip -l.
+ * Supports OMP_BASH_NO_LOGIN and CLAUDE_BASH_NO_LOGIN to skip -l.
  */
 function getShellArgs(): string[] {
-	const noLogin = process.env.PI_BASH_NO_LOGIN || process.env.CLAUDE_BASH_NO_LOGIN;
+	const noLogin = process.env.OMP_BASH_NO_LOGIN || process.env.CLAUDE_BASH_NO_LOGIN;
 	return noLogin ? ["-c"] : ["-l", "-c"];
 }
 
@@ -51,7 +51,7 @@ function getShellArgs(): string[] {
  * Get shell prefix for wrapping commands (profilers, strace, etc.).
  */
 function getShellPrefix(): string | undefined {
-	return process.env.PI_SHELL_PREFIX || process.env.CLAUDE_CODE_SHELL_PREFIX;
+	return process.env.OMP_SHELL_PREFIX || process.env.CLAUDE_CODE_SHELL_PREFIX;
 }
 
 /**
@@ -107,7 +107,7 @@ export function getShellConfig(): ShellConfig {
 			return cachedShellConfig;
 		}
 		throw new Error(
-			`Custom shell path not found: ${customShellPath}\nPlease update shellPath in ~/.pi/agent/settings.json`,
+			`Custom shell path not found: ${customShellPath}\nPlease update shellPath in ~/.omp/agent/settings.json`,
 		);
 	}
 
@@ -141,7 +141,7 @@ export function getShellConfig(): ShellConfig {
 			`No bash shell found. Options:\n` +
 				`  1. Install Git for Windows: https://git-scm.com/download/win\n` +
 				`  2. Add your bash to PATH (Cygwin, MSYS2, etc.)\n` +
-				`  3. Set shellPath in ~/.pi/agent/settings.json\n\n` +
+				`  3. Set shellPath in ~/.omp/agent/settings.json\n\n` +
 				`Searched Git Bash in:\n${paths.map((p) => `  ${p}`).join("\n")}`,
 		);
 	}