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

package/src/core/slash-commands.ts

@@ -1,8 +1,7 @@
-import { existsSync, readdirSync, readFileSync } from "node:fs";
-import { homedir } from "node:os";
-import { join, resolve } from "node:path";
-import { CONFIG_DIR_NAME, getCommandsDir } from "../config";
-import { logger } from "./logger";
+import { slashCommandCapability } from "../capability/slash-command";
+import type { SlashCommand } from "../discovery";
+import { loadSync } from "../discovery";
+import { parseFrontmatter } from "../discovery/helpers";
 
 /**
  * Represents a custom slash command loaded from a file
@@ -11,37 +10,9 @@ export interface FileSlashCommand {
 	name: string;
 	description: string;
 	content: string;
-	source: string; // e.g., "(user)", "(project)", "(project:frontend)"
-}
-
-/**
- * Parse YAML frontmatter from markdown content
- * Returns { frontmatter, content } where content has frontmatter stripped
- */
-function parseFrontmatter(content: string): { frontmatter: Record<string, string>; content: string } {
-	const frontmatter: Record<string, string> = {};
-
-	if (!content.startsWith("---")) {
-		return { frontmatter, content };
-	}
-
-	const endIndex = content.indexOf("\n---", 3);
-	if (endIndex === -1) {
-		return { frontmatter, content };
-	}
-
-	const frontmatterBlock = content.slice(4, endIndex);
-	const remainingContent = content.slice(endIndex + 4).trim();
-
-	// Simple YAML parsing - just key: value pairs
-	for (const line of frontmatterBlock.split("\n")) {
-		const match = line.match(/^(\w+):\s*(.*)$/);
-		if (match) {
-			frontmatter[match[1]] = match[2].trim();
-		}
-	}
-
-	return { frontmatter, content: remainingContent };
+	source: string; // e.g., "via Claude Code (User)"
+	/** Source metadata for display */
+	_source?: { providerName: string; level: "user" | "project" | "native" };
 }
 
 /**
@@ -100,146 +71,44 @@ export function substituteArgs(content: string, args: string[]): string {
 	return result;
 }
 
-type CommandSource = "builtin" | "claude-user" | "claude-project" | "user" | "project";
-
-/**
- * Recursively scan a directory for .md files (and symlinks to .md files) and load them as slash commands
- */
-function loadCommandsFromDir(dir: string, source: CommandSource, subdir: string = ""): FileSlashCommand[] {
-	const commands: FileSlashCommand[] = [];
-
-	if (!existsSync(dir)) {
-		return commands;
-	}
-
-	try {
-		const entries = readdirSync(dir, { withFileTypes: true });
-
-		for (const entry of entries) {
-			const fullPath = join(dir, entry.name);
-
-			if (entry.isDirectory()) {
-				// Recurse into subdirectory
-				const newSubdir = subdir ? `${subdir}:${entry.name}` : entry.name;
-				commands.push(...loadCommandsFromDir(fullPath, source, newSubdir));
-			} else if ((entry.isFile() || entry.isSymbolicLink()) && entry.name.endsWith(".md")) {
-				try {
-					const rawContent = readFileSync(fullPath, "utf-8");
-					const { frontmatter, content } = parseFrontmatter(rawContent);
-
-					const name = entry.name.slice(0, -3); // Remove .md extension
-
-					// Build source string based on source type
-					const sourceLabel =
-						source === "builtin"
-							? "builtin"
-							: source === "claude-user"
-								? "claude-user"
-								: source === "claude-project"
-									? "claude-project"
-									: source === "user"
-										? "user"
-										: "project";
-					const sourceStr = subdir ? `(${sourceLabel}:${subdir})` : `(${sourceLabel})`;
-
-					// Get description from frontmatter or first non-empty line
-					let description = frontmatter.description || "";
-					if (!description) {
-						const firstLine = content.split("\n").find((line) => line.trim());
-						if (firstLine) {
-							// Truncate if too long
-							description = firstLine.slice(0, 60);
-							if (firstLine.length > 60) description += "...";
-						}
-					}
-
-					// Append source to description
-					description = description ? `${description} ${sourceStr}` : sourceStr;
-
-					commands.push({
-						name,
-						description,
-						content,
-						source: sourceStr,
-					});
-				} catch (err) {
-					logger.debug("Failed to read slash command file", { error: String(err) });
-				}
-			}
-		}
-	} catch (err) {
-		logger.debug("Failed to read slash command directory", { error: String(err) });
-	}
-
-	return commands;
-}
-
 export interface LoadSlashCommandsOptions {
 	/** Working directory for project-local commands. Default: process.cwd() */
 	cwd?: string;
-	/** Agent config directory for global commands. Default: from getCommandsDir() */
-	agentDir?: string;
-	/** Enable loading from ~/.claude/commands/. Default: true */
-	enableClaudeUser?: boolean;
-	/** Enable loading from .claude/commands/. Default: true */
-	enableClaudeProject?: boolean;
 }
 
 /**
- * Load all custom slash commands from:
- * 1. Builtin: package commands/
- * 2. Claude user: ~/.claude/commands/
- * 3. Claude project: .claude/commands/
- * 4. Pi user: agentDir/commands/
- * 5. Pi project: cwd/{CONFIG_DIR_NAME}/commands/
- *
- * First occurrence wins (earlier sources have priority).
+ * Load all custom slash commands using the capability API.
+ * Loads from all registered providers (builtin, user, project).
  */
 export function loadSlashCommands(options: LoadSlashCommandsOptions = {}): FileSlashCommand[] {
-	const resolvedCwd = options.cwd ?? process.cwd();
-	const resolvedAgentDir = options.agentDir ?? getCommandsDir();
-	const enableClaudeUser = options.enableClaudeUser ?? true;
-	const enableClaudeProject = options.enableClaudeProject ?? true;
-
-	const commands: FileSlashCommand[] = [];
-	const seenNames = new Set<string>();
-
-	const addCommands = (newCommands: FileSlashCommand[]) => {
-		for (const cmd of newCommands) {
-			if (!seenNames.has(cmd.name)) {
-				commands.push(cmd);
-				seenNames.add(cmd.name);
+	const result = loadSync<SlashCommand>(slashCommandCapability.id, { cwd: options.cwd });
+
+	return result.items.map((cmd) => {
+		const { frontmatter, body } = parseFrontmatter(cmd.content);
+		const frontmatterDesc = typeof frontmatter.description === "string" ? frontmatter.description.trim() : "";
+
+		// Get description from frontmatter or first non-empty line
+		let description = frontmatterDesc;
+		if (!description) {
+			const firstLine = body.split("\n").find((line) => line.trim());
+			if (firstLine) {
+				description = firstLine.slice(0, 60);
+				if (firstLine.length > 60) description += "...";
 			}
 		}
-	};
-
-	// 1. Builtin commands (from package)
-	const builtinDir = join(import.meta.dir, "../commands");
-	if (existsSync(builtinDir)) {
-		addCommands(loadCommandsFromDir(builtinDir, "builtin"));
-	}
-
-	// 2. Claude user commands (~/.claude/commands/)
-	if (enableClaudeUser) {
-		const claudeUserDir = join(homedir(), ".claude", "commands");
-		addCommands(loadCommandsFromDir(claudeUserDir, "claude-user"));
-	}
 
-	// 3. Claude project commands (.claude/commands/)
-	if (enableClaudeProject) {
-		const claudeProjectDir = resolve(resolvedCwd, ".claude", "commands");
-		addCommands(loadCommandsFromDir(claudeProjectDir, "claude-project"));
-	}
-
-	// 4. Pi user commands (agentDir/commands/)
-	const globalCommandsDir = options.agentDir ? join(options.agentDir, "commands") : resolvedAgentDir;
-	addCommands(loadCommandsFromDir(globalCommandsDir, "user"));
-
-	// 5. Pi project commands (cwd/{CONFIG_DIR_NAME}/commands/)
-	const projectCommandsDir = resolve(resolvedCwd, CONFIG_DIR_NAME, "commands");
-	addCommands(loadCommandsFromDir(projectCommandsDir, "project"));
-
-	return commands;
+		// Format source label: "via ProviderName Level"
+		const capitalizedLevel = cmd.level.charAt(0).toUpperCase() + cmd.level.slice(1);
+		const sourceStr = `via ${cmd._source.providerName} ${capitalizedLevel}`;
+
+		return {
+			name: cmd.name,
+			description,
+			content: body,
+			source: sourceStr,
+			_source: { providerName: cmd._source.providerName, level: cmd.level },
+		};
+	});
 }
 
 /**

package/src/core/system-prompt.ts

@@ -3,9 +3,11 @@
  */
 
 import { existsSync, readFileSync } from "node:fs";
-import { join, resolve } from "node:path";
 import chalk from "chalk";
-import { getAgentDir, getDocsPath, getExamplesPath, getReadmePath } from "../config";
+import { contextFileCapability } from "../capability/context-file";
+import { systemPromptCapability } from "../capability/system-prompt";
+import { getDocsPath, getExamplesPath, getReadmePath } from "../config";
+import { type ContextFile, loadSync, type SystemPrompt as SystemPromptFile } from "../discovery/index";
 import type { SkillsSettings } from "./settings-manager";
 import { formatSkillsForPrompt, loadSkills, type Skill } from "./skills";
 import type { ToolName } from "./tools/index";
@@ -160,81 +162,65 @@ export function resolvePromptInput(input: string | undefined, description: strin
 	return input;
 }
 
-/** Look for AGENTS.md or CLAUDE.md in a directory (prefers AGENTS.md) */
-function loadContextFileFromDir(dir: string): { path: string; content: string } | null {
-	const candidates = ["AGENTS.md", "CLAUDE.md"];
-	for (const filename of candidates) {
-		const filePath = join(dir, filename);
-		if (existsSync(filePath)) {
-			try {
-				return {
-					path: filePath,
-					content: readFileSync(filePath, "utf-8"),
-				};
-			} catch (error) {
-				console.error(chalk.yellow(`Warning: Could not read ${filePath}: ${error}`));
-			}
-		}
-	}
-	return null;
-}
-
 export interface LoadContextFilesOptions {
 	/** Working directory to start walking up from. Default: process.cwd() */
 	cwd?: string;
-	/** Agent config directory for global context. Default: from getAgentDir() */
-	agentDir?: string;
 }
 
 /**
- * Load all project context files in order:
- * 1. Global: agentDir/AGENTS.md or CLAUDE.md
- * 2. Parent directories (top-most first) down to cwd
- * Each returns {path, content} for separate messages
+ * Load all project context files using the capability API.
+ * Returns {path, content, depth} entries for all discovered context files.
+ * Files are sorted by depth (descending) so files closer to cwd appear last/more prominent.
  */
 export function loadProjectContextFiles(
 	options: LoadContextFilesOptions = {},
-): Array<{ path: string; content: string }> {
+): Array<{ path: string; content: string; depth?: number }> {
 	const resolvedCwd = options.cwd ?? process.cwd();
-	const resolvedAgentDir = options.agentDir ?? getAgentDir();
 
-	const contextFiles: Array<{ path: string; content: string }> = [];
-	const seenPaths = new Set<string>();
+	const result = loadSync(contextFileCapability.id, { cwd: resolvedCwd });
 
-	// 1. Load global context from agentDir
-	const globalContext = loadContextFileFromDir(resolvedAgentDir);
-	if (globalContext) {
-		contextFiles.push(globalContext);
-		seenPaths.add(globalContext.path);
-	}
+	// Convert ContextFile items and preserve depth info
+	const files = result.items.map((item) => {
+		const contextFile = item as ContextFile;
+		return {
+			path: contextFile.path,
+			content: contextFile.content,
+			depth: contextFile.depth,
+		};
+	});
 
-	// 2. Walk up from cwd to root, collecting all context files
-	const ancestorContextFiles: Array<{ path: string; content: string }> = [];
+	// Sort by depth (descending): higher depth (farther from cwd) comes first,
+	// so files closer to cwd appear later and are more prominent
+	files.sort((a, b) => {
+		const depthA = a.depth ?? -1;
+		const depthB = b.depth ?? -1;
+		return depthB - depthA;
+	});
 
-	let currentDir = resolvedCwd;
-	const root = resolve("/");
+	return files;
+}
 
-	while (true) {
-		const contextFile = loadContextFileFromDir(currentDir);
-		if (contextFile && !seenPaths.has(contextFile.path)) {
-			// Add to beginning so we get top-most parent first
-			ancestorContextFiles.unshift(contextFile);
-			seenPaths.add(contextFile.path);
-		}
+/**
+ * Load system prompt customization files (SYSTEM.md).
+ * Returns combined content from all discovered SYSTEM.md files.
+ */
+export function loadSystemPromptFiles(options: LoadContextFilesOptions = {}): string | null {
+	const resolvedCwd = options.cwd ?? process.cwd();
 
-		// Stop if we've reached root
-		if (currentDir === root) break;
+	const result = loadSync<SystemPromptFile>(systemPromptCapability.id, { cwd: resolvedCwd });
 
-		// Move up one directory
-		const parentDir = resolve(currentDir, "..");
-		if (parentDir === currentDir) break; // Safety check
-		currentDir = parentDir;
-	}
+	if (result.items.length === 0) return null;
 
-	// Add ancestor files in order (top-most → cwd)
-	contextFiles.push(...ancestorContextFiles);
+	// Combine all SYSTEM.md contents (user-level first, then project-level)
+	const userLevel = result.items.filter((item) => item.level === "user");
+	const projectLevel = result.items.filter((item) => item.level === "project");
 
-	return contextFiles;
+	const parts: string[] = [];
+	for (const item of [...userLevel, ...projectLevel]) {
+		parts.push(item.content);
+	}
+
+	return parts.join("\n\n");
 }
 
 export interface BuildSystemPromptOptions {
@@ -248,10 +234,8 @@ export interface BuildSystemPromptOptions {
 	skillsSettings?: SkillsSettings;
 	/** Working directory. Default: process.cwd() */
 	cwd?: string;
-	/** Agent config directory. Default: from getAgentDir() */
-	agentDir?: string;
 	/** Pre-loaded context files (skips discovery if provided). */
-	contextFiles?: Array<{ path: string; content: string }>;
+	contextFiles?: Array<{ path: string; content: string; depth?: number }>;
 	/** Pre-loaded skills (skips discovery if provided). */
 	skills?: Skill[];
 }
@@ -264,7 +248,6 @@ export function buildSystemPrompt(options: BuildSystemPromptOptions = {}): strin
 		appendSystemPrompt,
 		skillsSettings,
 		cwd,
-		agentDir,
 		contextFiles: providedContextFiles,
 		skills: providedSkills,
 	} = options;
@@ -272,6 +255,9 @@ export function buildSystemPrompt(options: BuildSystemPromptOptions = {}): strin
 	const resolvedCustomPrompt = resolvePromptInput(customPrompt, "system prompt");
 	const resolvedAppendPrompt = resolvePromptInput(appendSystemPrompt, "append system prompt");
 
+	// Load SYSTEM.md customization (prepended to prompt)
+	const systemPromptCustomization = loadSystemPromptFiles({ cwd: resolvedCwd });
+
 	const now = new Date();
 	const dateTime = now.toLocaleString("en-US", {
 		weekday: "long",
@@ -287,15 +273,17 @@ export function buildSystemPrompt(options: BuildSystemPromptOptions = {}): strin
 	const appendSection = resolvedAppendPrompt ? `\n\n${resolvedAppendPrompt}` : "";
 
 	// Resolve context files: use provided or discover
-	const contextFiles = providedContextFiles ?? loadProjectContextFiles({ cwd: resolvedCwd, agentDir });
+	const contextFiles = providedContextFiles ?? loadProjectContextFiles({ cwd: resolvedCwd });
 
 	// Resolve skills: use provided or discover
 	const skills =
 		providedSkills ??
-		(skillsSettings?.enabled !== false ? loadSkills({ ...skillsSettings, cwd: resolvedCwd, agentDir }).skills : []);
+		(skillsSettings?.enabled !== false ? loadSkills({ ...skillsSettings, cwd: resolvedCwd }).skills : []);
 
 	if (resolvedCustomPrompt) {
-		let prompt = resolvedCustomPrompt;
+		let prompt = systemPromptCustomization
+			? `${systemPromptCustomization}\n\n${resolvedCustomPrompt}`
+			: resolvedCustomPrompt;
 
 		if (appendSection) {
 			prompt += appendSection;
@@ -435,5 +423,10 @@ Documentation:
 	prompt += `\nCurrent date and time: ${dateTime}`;
 	prompt += `\nCurrent working directory: ${resolvedCwd}`;
 
+	// Prepend SYSTEM.md customization if present
+	if (systemPromptCustomization) {
+		prompt = `${systemPromptCustomization}\n\n${prompt}`;
+	}
+
 	return prompt;
 }

package/src/core/timings.ts

@@ -1,9 +1,9 @@
 /**
  * Central timing instrumentation for startup profiling.
- * Enable with PI_TIMING=1 environment variable.
+ * Enable with OMP_TIMING=1 or PI_TIMING=1 environment variable.
  */
 
-const ENABLED = process.env.PI_TIMING === "1";
+const ENABLED = process.env.OMP_TIMING === "1" || process.env.PI_TIMING === "1";
 const timings: Array<{ label: string; ms: number }> = [];
 let lastTime = Date.now();
 

package/src/core/tools/lsp/config.ts

@@ -1,6 +1,7 @@
 import { existsSync, readFileSync } from "node:fs";
 import { homedir } from "node:os";
 import { extname, join } from "node:path";
+import { getConfigDirPaths } from "../../../config.js";
 import type { ServerConfig } from "./types";
 
 export interface LspConfig {
@@ -94,7 +95,7 @@ export const SERVERS: Record<string, ServerConfig> = {
 		fileTypes: [".ts", ".tsx", ".js", ".jsx", ".mjs", ".cjs"],
 		rootMarkers: ["package.json", "tsconfig.json", "jsconfig.json"],
 		initOptions: {
-			hostInfo: "pi-coding-agent",
+			hostInfo: "omp-coding-agent",
 			preferences: {
 				includeInlayParameterNameHints: "all",
 				includeInlayVariableTypeHints: true,
@@ -673,30 +674,50 @@ export function resolveCommand(command: string, cwd: string): string | null {
 
 /**
  * Configuration file search paths (in priority order).
- * Supports both visible and hidden variants, and both .pi subdirectory and root.
+ * Supports both visible and hidden variants at each config location.
  */
 function getConfigPaths(cwd: string): string[] {
-	return [
-		// Project-level configs (highest priority)
-		join(cwd, "lsp.json"),
-		join(cwd, ".lsp.json"),
-		join(cwd, ".pi", "lsp.json"),
-		join(cwd, ".pi", ".lsp.json"),
-		// User-level configs (fallback)
-		join(homedir(), ".pi", "lsp.json"),
-		join(homedir(), ".pi", ".lsp.json"),
-		join(homedir(), "lsp.json"),
-		join(homedir(), ".lsp.json"),
-	];
+	const filenames = ["lsp.json", ".lsp.json"];
+	const paths: string[] = [];
+
+	// Project root files (highest priority)
+	for (const filename of filenames) {
+		paths.push(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(join(dir, filename));
+		}
+	}
+
+	// User config directories (~/.omp/agent/, ~/.pi/agent/, ~/.claude/)
+	const userDirs = getConfigDirPaths("", { user: true, project: false });
+	for (const dir of userDirs) {
+		for (const filename of filenames) {
+			paths.push(join(dir, filename));
+		}
+	}
+
+	// User home root files (lowest priority fallback)
+	for (const filename of filenames) {
+		paths.push(join(homedir(), filename));
+	}
+
+	return paths;
 }
 
 /**
  * Load LSP configuration.
  *
  * Priority:
- * 1. Project-level config: lsp.json, .lsp.json, .pi/lsp.json, .pi/.lsp.json
- * 2. User-level config: ~/.pi/lsp.json, ~/.pi/.lsp.json, ~/lsp.json, ~/.lsp.json
- * 3. Auto-detect from project markers + available binaries
+ * 1. Project root: lsp.json, .lsp.json
+ * 2. Project config dirs: .omp/lsp.json, .pi/lsp.json, .claude/lsp.json (+ hidden variants)
+ * 3. User config dirs: ~/.omp/agent/lsp.json, ~/.pi/agent/lsp.json, ~/.claude/lsp.json (+ hidden variants)
+ * 4. User home root: ~/lsp.json, ~/.lsp.json
+ * 5. Auto-detect from project markers + available binaries
  *
  * Config file format:
  * ```json

package/src/core/tools/task/agents.ts

@@ -68,6 +68,26 @@ function parseAgent(fileName: string, content: string, source: AgentSource): Age
 		.map((t) => t.trim())
 		.filter(Boolean);
 
+	// Parse spawns field
+	let spawns: string[] | "*" | undefined;
+	if (frontmatter.spawns !== undefined) {
+		const spawnsRaw = frontmatter.spawns.trim();
+		if (spawnsRaw === "*") {
+			spawns = "*";
+		} else if (spawnsRaw) {
+			spawns = spawnsRaw
+				.split(",")
+				.map((s) => s.trim())
+				.filter(Boolean);
+			if (spawns.length === 0) spawns = undefined;
+		}
+	}
+
+	// Backward compat: infer spawns: "*" when tools includes "task"
+	if (spawns === undefined && tools?.includes("task")) {
+		spawns = "*";
+	}
+
 	const recursive =
 		frontmatter.recursive === undefined ? false : frontmatter.recursive === "true" || frontmatter.recursive === "1";
 
@@ -75,6 +95,7 @@ function parseAgent(fileName: string, content: string, source: AgentSource): Age
 		name: frontmatter.name,
 		description: frontmatter.description,
 		tools: tools && tools.length > 0 ? tools : undefined,
+		spawns,
 		model: frontmatter.model,
 		recursive,
 		systemPrompt: body,

package/src/core/tools/task/artifacts.ts

@@ -84,7 +84,7 @@ export async function writeArtifacts(
  */
 export function createTempArtifactsDir(runId?: string): string {
 	const id = runId || `${Date.now()}-${Math.random().toString(36).slice(2)}`;
-	const dir = path.join(os.tmpdir(), `pi-task-${id}`);
+	const dir = path.join(os.tmpdir(), `omp-task-${id}`);
 	ensureArtifactsDir(dir);
 	return dir;
 }

package/src/core/tools/task/bundled-agents/reviewer.md

@@ -1,7 +1,8 @@
 ---
 name: reviewer
 description: Code review specialist for quality and security analysis
-tools: read, grep, find, ls, bash, task, report_finding, submit_review
+tools: read, grep, find, ls, bash, report_finding, submit_review
+spawns: explore
 model: pi/slow, gpt-5.2-codex, gpt-5.2, codex, gpt
 ---
 

package/src/core/tools/task/bundled-agents/task.md

@@ -1,6 +1,7 @@
 ---
 name: task
 description: General-purpose subagent with full capabilities for delegated multi-step tasks
+spawns: explore
 model: default
 ---