@phi-code-admin/phi-code 0.85.0 → 0.87.0

package/docs/tui.md

@@ -1,4 +1,4 @@
-> pi can create TUI components. Ask it to build one for your use case.
+> phi can create TUI components. Ask it to build one for your use case.
 
 # TUI Components
 
@@ -425,7 +425,7 @@ renderResult(result, options, theme, context) {
 **For Markdown**, use `getMarkdownTheme()`:
 
 ```typescript
-import { getMarkdownTheme } from "@earendil-works/pi-coding-agent";
+import { getMarkdownTheme } from "@phi-code-admin/phi-code";
 import { Markdown } from "@earendil-works/pi-tui";
 
 renderResult(result, options, theme, context) {
@@ -590,8 +590,8 @@ These patterns cover the most common UI needs in extensions. **Copy these patter
 For letting users pick from a list of options. Use `SelectList` from `@earendil-works/pi-tui` with `DynamicBorder` for framing.
 
 ```typescript
-import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
-import { DynamicBorder } from "@earendil-works/pi-coding-agent";
+import type { ExtensionAPI } from "@phi-code-admin/phi-code";
+import { DynamicBorder } from "@phi-code-admin/phi-code";
 import { Container, type SelectItem, SelectList, Text } from "@earendil-works/pi-tui";
 
 pi.registerCommand("pick", {
@@ -650,7 +650,7 @@ pi.registerCommand("pick", {
 For operations that take time and should be cancellable. `BorderedLoader` shows a spinner and handles escape to cancel.
 
 ```typescript
-import { BorderedLoader } from "@earendil-works/pi-coding-agent";
+import { BorderedLoader } from "@phi-code-admin/phi-code";
 
 pi.registerCommand("fetch", {
   handler: async (_args, ctx) => {
@@ -682,7 +682,7 @@ pi.registerCommand("fetch", {
 For toggling multiple settings. Use `SettingsList` from `@earendil-works/pi-tui` with `getSettingsListTheme()`.
 
 ```typescript
-import { getSettingsListTheme } from "@earendil-works/pi-coding-agent";
+import { getSettingsListTheme } from "@phi-code-admin/phi-code";
 import { Container, type SettingItem, SettingsList, Text } from "@earendil-works/pi-tui";
 
 pi.registerCommand("settings", {
@@ -737,7 +737,7 @@ ctx.ui.setStatus("my-ext", undefined);
 
 ### Pattern 4b: Working Indicator Customization
 
-Customize the inline working indicator shown while pi is streaming a response.
+Customize the inline working indicator shown while phi is streaming a response.
 
 ```typescript
 // Static indicator
@@ -822,7 +822,7 @@ Token stats available via `ctx.sessionManager.getBranch()` and `ctx.model`.
 Replace the main input editor with a custom implementation. Useful for modal editing (vim), different keybindings (emacs), or specialized input handling.
 
 ```typescript
-import { CustomEditor, type ExtensionAPI } from "@earendil-works/pi-coding-agent";
+import { CustomEditor, type ExtensionAPI } from "@phi-code-admin/phi-code";
 import { matchesKey, truncateToWidth } from "@earendil-works/pi-tui";
 
 type Mode = "normal" | "insert";

package/docs/usage.md

@@ -1,4 +1,4 @@
-# Using Pi
+# Using phi
 
 This page collects day-to-day usage details that do not fit on the quickstart page.
 
@@ -53,7 +53,7 @@ Type `/` in the editor to open command completion. Extensions can register custo
 | `/reload` | Reload keybindings, extensions, skills, prompts, and context files |
 | `/hotkeys` | Show all keyboard shortcuts |
 | `/changelog` | Display version history |
-| `/quit` | Quit pi |
+| `/quit` | Quit phi |
 
 ## Message Queue
 
@@ -64,20 +64,20 @@ You can submit messages while the agent is still working:
 - **Escape** aborts and restores queued messages to the editor.
 - **Alt+Up** retrieves queued messages back to the editor.
 
-On Windows Terminal, Alt+Enter is fullscreen by default. Remap it as described in [Terminal setup](terminal-setup.md) if you want pi to receive the shortcut.
+On Windows Terminal, Alt+Enter is fullscreen by default. Remap it as described in [Terminal setup](terminal-setup.md) if you want phi to receive the shortcut.
 
 Configure delivery in [Settings](settings.md) with `steeringMode` and `followUpMode`.
 
 ## Sessions
 
-Sessions are saved automatically to `~/.pi/agent/sessions/`, organized by working directory.
+Sessions are saved automatically to `~/.phi/agent/sessions/`, organized by working directory.
 
 ```bash
-pi -c                  # Continue most recent session
-pi -r                  # Browse and select a session
-pi --no-session        # Ephemeral mode; do not save
-pi --session <path|id> # Use a specific session file or session ID
-pi --fork <path|id>    # Fork a session into a new session file
+phi -c                  # Continue most recent session
+phi -r                  # Browse and select a session
+phi --no-session        # Ephemeral mode; do not save
+phi --session <path|id> # Use a specific session file or session ID
+phi --fork <path|id>    # Fork a session into a new session file
 ```
 
 Useful session commands:
@@ -92,9 +92,9 @@ See [Sessions](sessions.md) and [Compaction](compaction.md) for details.
 
 ## Context Files
 
-Pi loads `AGENTS.md` or `CLAUDE.md` at startup from:
+phi loads `AGENTS.md` or `CLAUDE.md` at startup from:
 
-- `~/.pi/agent/AGENTS.md` for global instructions
+- `~/.phi/agent/AGENTS.md` for global instructions
 - parent directories, walking up from the current working directory
 - the current directory
 
@@ -104,8 +104,8 @@ Use context files for project conventions, commands, safety rules, and preferenc
 
 Replace the default system prompt with:
 
-- `.pi/SYSTEM.md` for a project
-- `~/.pi/agent/SYSTEM.md` globally
+- `.phi/SYSTEM.md` for a project
+- `~/.phi/agent/SYSTEM.md` globally
 
 Append to the default prompt without replacing it with `APPEND_SYSTEM.md` in either location.
 
@@ -120,24 +120,24 @@ If you use pi for open source work and want to publish sessions for model, promp
 ## CLI Reference
 
 ```bash
-pi [options] [@files...] [messages...]
+phi [options] [@files...] [messages...]
 ```
 
 ### Package Commands
 
 ```bash
-pi install <source> [-l]     # Install package, -l for project-local
-pi remove <source> [-l]      # Remove package
-pi uninstall <source> [-l]   # Alias for remove
-pi update [source|self|pi]   # Update pi and packages; skips pinned packages
-pi update --extensions       # Update packages only
-pi update --self             # Update pi only
-pi update --extension <src>  # Update one package
-pi list                      # List installed packages
-pi config                    # Enable/disable package resources
+phi install <source> [-l]     # Install package, -l for project-local
+phi remove <source> [-l]      # Remove package
+phi uninstall <source> [-l]   # Alias for remove
+phi update [source|self]   # Update phi and packages; skips pinned packages
+phi update --extensions       # Update packages only
+phi update --self             # Update phi only
+phi update --extension <src>  # Update one package
+phi list                      # List installed packages
+phi config                    # Enable/disable package resources
 ```
 
-See [Pi Packages](packages.md) for package sources and security notes.
+See [Phi Packages](packages.md) for package sources and security notes.
 
 ### Modes
 
@@ -149,10 +149,10 @@ See [Pi Packages](packages.md) for package sources and security notes.
 | `--mode rpc` | RPC mode over stdin/stdout; see [RPC mode](rpc.md) |
 | `--export <in> [out]` | Export a session to HTML |
 
-In print mode, pi also reads piped stdin and merges it into the initial prompt:
+In print mode, phi also reads piped stdin and merges it into the initial prompt:
 
 ```bash
-cat README.md | pi -p "Summarize this text"
+cat README.md | phi -p "Summarize this text"
 ```
 
 ### Model Options
@@ -204,7 +204,7 @@ Built-in tools: `read`, `bash`, `edit`, `write`, `grep`, `find`, `ls`.
 Combine `--no-*` with explicit flags to load exactly what you need, ignoring settings. Example:
 
 ```bash
-pi --no-extensions -e ./my-extension.ts
+phi --no-extensions -e ./my-extension.ts
 ```
 
 ### Other Options
@@ -223,7 +223,7 @@ Prefix files with `@` to include them in the message:
 
 ```bash
 pi @prompt.md "Answer this"
-pi -p @screenshot.png "What's in this image?"
+phi -p @screenshot.png "What's in this image?"
 pi @code.ts @test.ts "Review these files"
 ```
 
@@ -231,36 +231,36 @@ pi @code.ts @test.ts "Review these files"
 
 ```bash
 # Interactive with initial prompt
-pi "List all .ts files in src/"
+phi "List all .ts files in src/"
 
 # Non-interactive
-pi -p "Summarize this codebase"
+phi -p "Summarize this codebase"
 
 # Non-interactive with piped stdin
-cat README.md | pi -p "Summarize this text"
+cat README.md | phi -p "Summarize this text"
 
 # Different model
-pi --provider openai --model gpt-4o "Help me refactor"
+phi --provider openai --model gpt-4o "Help me refactor"
 
 # Model with provider prefix
-pi --model openai/gpt-4o "Help me refactor"
+phi --model openai/gpt-4o "Help me refactor"
 
 # Model with thinking level shorthand
-pi --model sonnet:high "Solve this complex problem"
+phi --model sonnet:high "Solve this complex problem"
 
 # Limit model cycling
-pi --models "claude-*,gpt-4o"
+phi --models "claude-*,gpt-4o"
 
 # Read-only mode
-pi --tools read,grep,find,ls -p "Review the code"
+phi --tools read,grep,find,ls -p "Review the code"
 ```
 
 ### Environment Variables
 
 | Variable | Description |
 |----------|-------------|
-| `PI_CODING_AGENT_DIR` | Override config directory; default is `~/.pi/agent` |
-| `PI_CODING_AGENT_SESSION_DIR` | Override session storage directory; overridden by `--session-dir` |
+| `PHI_CODING_AGENT_DIR` | Override config directory; default is `~/.phi/agent` |
+| `PHI_CODING_AGENT_SESSION_DIR` | Override session storage directory; overridden by `--session-dir` |
 | `PI_PACKAGE_DIR` | Override package directory, useful for Nix/Guix store paths |
 | `PI_OFFLINE` | Disable startup network operations, including update checks, package update checks, and install/update telemetry |
 | `PI_SKIP_VERSION_CHECK` | Skip the phi-code version update check at startup. This prevents the npm registry latest-version request |
@@ -270,7 +270,7 @@ pi --tools read,grep,find,ls -p "Review the code"
 
 ## Design Principles
 
-Pi keeps the core small and pushes workflow-specific behavior into extensions, skills, prompt templates, and packages.
+phi keeps the core small and pushes workflow-specific behavior into extensions, skills, prompt templates, and packages.
 
 It bundles MCP support (see the MCP extension) and sub-agents. It does not include permission popups, to-dos, or background bash by default: you can build or install those workflows as extensions or packages, or use external tools such as containers and tmux.
 

package/docs/windows.md

@@ -1,8 +1,8 @@
 # Windows Setup
 
-Pi requires a bash shell on Windows. Checked locations (in order):
+phi requires a bash shell on Windows. Checked locations (in order):
 
-1. Custom path from `~/.pi/agent/settings.json`
+1. Custom path from `~/.phi/agent/settings.json`
 2. Git Bash (`C:\Program Files\Git\bin\bash.exe`)
 3. `bash.exe` on PATH (Cygwin, MSYS2, WSL)
 

package/extensions/phi/agents.ts

@@ -4,123 +4,15 @@
  * Provides:
  * - /agents command to list all configured sub-agents
  * - /agents <name> to show detailed agent info
- * - Agent definitions loaded from ~/.phi/agent/agents/ and .phi/agents/
- * - Model assignment visibility
+ * - Agent definitions loaded from .phi/agents/, ~/.phi/agent/agents/ and the
+ *   bundled agents/ directory via the shared providers/agent-def module
+ *   (same parser and search order as the /plan orchestrator).
  */
 
 import type { ExtensionAPI } from "phi-code";
-import { readFileSync, readdirSync, existsSync, statSync } from "node:fs";
-import { join, basename } from "node:path";
-import { homedir } from "node:os";
-
-interface AgentDefinition {
-	name: string;
-	description: string;
-	tools: string[];
-	model: string;
-	source: string; // "global", "project", "bundled"
-	filePath: string;
-	systemPrompt: string;
-}
-
-/**
- * Parse YAML frontmatter from agent .md file
- */
-function parseAgentFile(filePath: string): AgentDefinition | null {
-	try {
-		const content = readFileSync(filePath, "utf-8");
-		const fmMatch = content.match(/^---\s*\n([\s\S]*?)\n---\s*\n([\s\S]*)$/);
-
-		if (!fmMatch) return null;
-
-		const frontmatter = fmMatch[1];
-		const body = fmMatch[2].trim();
-
-		// Simple YAML parser for our frontmatter
-		const fields: Record<string, string> = {};
-		for (const line of frontmatter.split("\n")) {
-			const match = line.match(/^(\w+):\s*(.*)$/);
-			if (match) {
-				fields[match[1]] = match[2].trim();
-			}
-		}
-
-		if (!fields.name) return null;
-
-		return {
-			name: fields.name,
-			description: fields.description || "No description",
-			tools: (fields.tools || "").split(",").map(t => t.trim()).filter(Boolean),
-			model: fields.model || "default",
-			source: "unknown",
-			filePath,
-			systemPrompt: body,
-		};
-	} catch {
-		return null;
-	}
-}
-
-/**
- * Scan a directory for agent .md files
- */
-function scanAgentDir(dir: string, source: string): AgentDefinition[] {
-	const agents: AgentDefinition[] = [];
-
-	if (!existsSync(dir)) return agents;
-
-	try {
-		const entries = readdirSync(dir);
-		for (const entry of entries) {
-			if (!entry.endsWith(".md")) continue;
-			const fullPath = join(dir, entry);
-			if (!statSync(fullPath).isFile()) continue;
-
-			const agent = parseAgentFile(fullPath);
-			if (agent) {
-				agent.source = source;
-				agents.push(agent);
-			}
-		}
-	} catch {
-		// Directory not readable
-	}
-
-	return agents;
-}
+import { type AgentDef, discoverAgents } from "./providers/agent-def.js";
 
 export default function agentsExtension(pi: ExtensionAPI) {
-	/**
-	 * Discover all agent definitions from all sources
-	 */
-	function discoverAgents(): AgentDefinition[] {
-		const seen = new Set<string>();
-		const allAgents: AgentDefinition[] = [];
-
-		const addAgents = (agents: AgentDefinition[]) => {
-			for (const agent of agents) {
-				if (!seen.has(agent.name)) {
-					seen.add(agent.name);
-					allAgents.push(agent);
-				}
-			}
-		};
-
-		// 1. Project-local agents
-		addAgents(scanAgentDir(join(process.cwd(), ".phi", "agents"), "project"));
-
-		// 2. Global agents
-		addAgents(scanAgentDir(join(homedir(), ".phi", "agent", "agents"), "global"));
-
-		// 3. Bundled agents (shipped with package)
-		const bundledDir = join(__dirname, "..", "..", "..", "agents");
-		if (existsSync(bundledDir)) {
-			addAgents(scanAgentDir(bundledDir, "bundled"));
-		}
-
-		return allAgents;
-	}
-
 	/**
 	 * /agents command
 	 */
@@ -131,15 +23,18 @@ export default function agentsExtension(pi: ExtensionAPI) {
 			const arg = args.trim().toLowerCase();
 
 			if (agents.length === 0) {
-				ctx.ui.notify("No agent definitions found.\n\nCreate agent files in:\n- `.phi/agents/` (project)\n- `~/.phi/agent/agents/` (global)\n\nFormat: Markdown with YAML frontmatter (name, description, tools, model).", "info");
+				ctx.ui.notify(
+					"No agent definitions found.\n\nCreate agent files in:\n- `.phi/agents/` (project)\n- `~/.phi/agent/agents/` (global)\n\nFormat: Markdown with YAML frontmatter (name, description, tools, model).",
+					"info",
+				);
 				return;
 			}
 
 			// Show specific agent details
 			if (arg && arg !== "list") {
-				const agent = agents.find(a => a.name.toLowerCase() === arg);
+				const agent = agents.find((a) => a.name.toLowerCase() === arg);
 				if (!agent) {
-					ctx.ui.notify(`Agent "${arg}" not found. Available: ${agents.map(a => a.name).join(", ")}`, "warning");
+					ctx.ui.notify(`Agent "${arg}" not found. Available: ${agents.map((a) => a.name).join(", ")}`, "warning");
 					return;
 				}
 
@@ -147,7 +42,7 @@ export default function agentsExtension(pi: ExtensionAPI) {
 
 📝 ${agent.description}
 🤖 Model: \`${agent.model}\`
-🔧 Tools: ${agent.tools.map(t => `\`${t}\``).join(", ")}
+🔧 Tools: ${agent.tools.map((t) => `\`${t}\``).join(", ")}
 📁 Source: ${agent.source} (\`${agent.filePath}\`)
 
 **System Prompt:**
@@ -163,7 +58,7 @@ ${agent.systemPrompt.substring(0, 800)}${agent.systemPrompt.length > 800 ? "\n..
 			let output = `**🤖 Sub-Agents (${agents.length})**\n\n`;
 
 			// Group by source
-			const bySource: Record<string, AgentDefinition[]> = {};
+			const bySource: Record<string, AgentDef[]> = {};
 			for (const agent of agents) {
 				const key = agent.source;
 				if (!bySource[key]) bySource[key] = [];