@supatest/cli 0.0.18 → 0.0.20

package/dist/index.js

@@ -3899,18 +3899,187 @@ var init_setup = __esm({
   }
 });
 
+// src/utils/command-discovery.ts
+import { existsSync, readdirSync, readFileSync, statSync } from "fs";
+import { join, relative } from "path";
+function parseMarkdownFrontmatter(content) {
+  const frontmatterRegex = /^---\r?\n([\s\S]*?)\r?\n---\r?\n?([\s\S]*)$/;
+  const match = content.match(frontmatterRegex);
+  if (!match) {
+    return { frontmatter: {}, body: content };
+  }
+  const [, frontmatterStr, body] = match;
+  const frontmatter = {};
+  for (const line of frontmatterStr.split("\n")) {
+    const colonIndex = line.indexOf(":");
+    if (colonIndex > 0) {
+      const key = line.slice(0, colonIndex).trim();
+      const value = line.slice(colonIndex + 1).trim();
+      frontmatter[key] = value;
+    }
+  }
+  return { frontmatter, body };
+}
+function discoverMarkdownFiles(dir, baseDir, files = []) {
+  if (!existsSync(dir)) {
+    return files;
+  }
+  const entries = readdirSync(dir);
+  for (const entry of entries) {
+    const fullPath = join(dir, entry);
+    const stat = statSync(fullPath);
+    if (stat.isDirectory()) {
+      discoverMarkdownFiles(fullPath, baseDir, files);
+    } else if (entry.endsWith(".md")) {
+      files.push(fullPath);
+    }
+  }
+  return files;
+}
+function discoverCommands(cwd) {
+  const commandsDir = join(cwd, ".supatest", "commands");
+  if (!existsSync(commandsDir)) {
+    return [];
+  }
+  const files = discoverMarkdownFiles(commandsDir, commandsDir);
+  const commands = [];
+  for (const filePath of files) {
+    try {
+      const content = readFileSync(filePath, "utf-8");
+      const { frontmatter } = parseMarkdownFrontmatter(content);
+      const relativePath = relative(commandsDir, filePath);
+      const name = relativePath.replace(/\.md$/, "").replace(/\//g, ".").replace(/\\/g, ".");
+      commands.push({
+        name,
+        description: frontmatter.description,
+        filePath
+      });
+    } catch {
+    }
+  }
+  return commands.sort((a, b2) => a.name.localeCompare(b2.name));
+}
+function expandCommand(cwd, commandName, args) {
+  const commandsDir = join(cwd, ".supatest", "commands");
+  const relativePath = commandName.replace(/\./g, "/") + ".md";
+  const filePath = join(commandsDir, relativePath);
+  if (!existsSync(filePath)) {
+    return null;
+  }
+  try {
+    const content = readFileSync(filePath, "utf-8");
+    const { body } = parseMarkdownFrontmatter(content);
+    let expanded = body;
+    if (args) {
+      expanded = expanded.replace(/\$ARGUMENTS/g, args);
+      const argParts = args.split(/\s+/);
+      for (let i = 0; i < argParts.length; i++) {
+        expanded = expanded.replace(new RegExp(`\\$${i + 1}`, "g"), argParts[i]);
+      }
+    } else {
+      expanded = expanded.replace(/\$ARGUMENTS/g, "");
+    }
+    return expanded.trim();
+  } catch {
+    return null;
+  }
+}
+function discoverAgents(cwd) {
+  const agentsDir = join(cwd, ".supatest", "agents");
+  if (!existsSync(agentsDir)) {
+    return [];
+  }
+  const files = discoverMarkdownFiles(agentsDir, agentsDir);
+  const agents = [];
+  for (const filePath of files) {
+    try {
+      const content = readFileSync(filePath, "utf-8");
+      const { frontmatter } = parseMarkdownFrontmatter(content);
+      const relativePath = relative(agentsDir, filePath);
+      const defaultName = relativePath.replace(/\.md$/, "").replace(/\//g, "-").replace(/\\/g, "-");
+      agents.push({
+        name: frontmatter.name || defaultName,
+        description: frontmatter.description,
+        model: frontmatter.model,
+        filePath
+      });
+    } catch {
+    }
+  }
+  return agents.sort((a, b2) => a.name.localeCompare(b2.name));
+}
+var init_command_discovery = __esm({
+  "src/utils/command-discovery.ts"() {
+    "use strict";
+  }
+});
+
+// src/utils/mcp-loader.ts
+import { existsSync as existsSync2, readFileSync as readFileSync2 } from "fs";
+import { join as join2 } from "path";
+function expandEnvVar(value) {
+  return value.replace(/\$\{([^}]+)\}/g, (_2, expr) => {
+    const [varName, defaultValue] = expr.split(":-");
+    return process.env[varName] ?? defaultValue ?? "";
+  });
+}
+function expandServerConfig(config2) {
+  const expanded = {
+    command: expandEnvVar(config2.command)
+  };
+  if (config2.args) {
+    expanded.args = config2.args.map(expandEnvVar);
+  }
+  if (config2.env) {
+    expanded.env = {};
+    for (const [key, value] of Object.entries(config2.env)) {
+      expanded.env[key] = expandEnvVar(value);
+    }
+  }
+  return expanded;
+}
+function loadMcpServers(cwd) {
+  const mcpPath = join2(cwd, ".supatest", "mcp.json");
+  if (!existsSync2(mcpPath)) {
+    return {};
+  }
+  try {
+    const content = readFileSync2(mcpPath, "utf-8");
+    const config2 = JSON.parse(content);
+    if (!config2.mcpServers) {
+      return {};
+    }
+    const expanded = {};
+    for (const [name, serverConfig] of Object.entries(config2.mcpServers)) {
+      expanded[name] = expandServerConfig(serverConfig);
+    }
+    return expanded;
+  } catch (error) {
+    console.warn(
+      `Warning: Failed to load MCP servers from ${mcpPath}:`,
+      error instanceof Error ? error.message : String(error)
+    );
+    return {};
+  }
+}
+var init_mcp_loader = __esm({
+  "src/utils/mcp-loader.ts"() {
+    "use strict";
+  }
+});
+
 // src/utils/project-instructions.ts
-import { existsSync, readFileSync } from "fs";
-import { join } from "path";
+import { existsSync as existsSync3, readFileSync as readFileSync3 } from "fs";
+import { join as join3 } from "path";
 function loadProjectInstructions(cwd) {
   const paths = [
-    join(cwd, "SUPATEST.md"),
-    join(cwd, ".supatest", "SUPATEST.md")
+    join3(cwd, "SUPATEST.md"),
+    join3(cwd, ".supatest", "SUPATEST.md")
   ];
   for (const path5 of paths) {
-    if (existsSync(path5)) {
+    if (existsSync3(path5)) {
       try {
-        return readFileSync(path5, "utf-8");
+        return readFileSync3(path5, "utf-8");
       } catch {
       }
     }
@@ -3926,13 +4095,15 @@ var init_project_instructions = __esm({
 // src/core/agent.ts
 import { createRequire } from "module";
 import { homedir } from "os";
-import { dirname, join as join2 } from "path";
+import { dirname, join as join4 } from "path";
 import { query } from "@anthropic-ai/claude-agent-sdk";
 var CoreAgent;
 var init_agent = __esm({
   "src/core/agent.ts"() {
     "use strict";
     init_config();
+    init_command_discovery();
+    init_mcp_loader();
     init_project_instructions();
     CoreAgent = class {
       presenter;
@@ -3965,13 +4136,29 @@ ${config2.logs}
         const isPlanMode = config2.mode === "plan";
         const cwd = config2.cwd || process.cwd();
         const projectInstructions = loadProjectInstructions(cwd);
+        const customAgents = discoverAgents(cwd);
+        let customAgentsPrompt;
+        if (customAgents.length > 0) {
+          const agentList = customAgents.map((agent) => {
+            const modelInfo = agent.model ? ` (model: ${agent.model})` : "";
+            return `- **${agent.name}**${modelInfo}: ${agent.description || "No description"}`;
+          }).join("\n");
+          customAgentsPrompt = `
+
+# Custom Sub-Agents (from .supatest/agents/)
+
+The following custom sub-agents are available via the Task tool. Use them by setting subagent_type to the agent name:
+
+${agentList}`;
+        }
         const systemPromptAppend = [
           config2.systemPromptAppend,
           projectInstructions && `
 
 # Project Instructions (from SUPATEST.md)
 
-${projectInstructions}`
+${projectInstructions}`,
+          customAgentsPrompt
         ].filter(Boolean).join("\n") || void 0;
         const cleanEnv = {};
         const excludeKeys = /* @__PURE__ */ new Set([
@@ -3986,8 +4173,8 @@ ${projectInstructions}`
             cleanEnv[key] = value;
           }
         }
-        const claudeConfigDir = process.env.CLAUDE_CONFIG_DIR || join2(homedir(), ".supatest", "claude-config");
-        cleanEnv.CLAUDE_CONFIG_DIR = claudeConfigDir;
+        const internalConfigDir = join4(homedir(), ".supatest", "claude-internal");
+        cleanEnv.CLAUDE_CONFIG_DIR = internalConfigDir;
         cleanEnv.ANTHROPIC_API_KEY = config2.supatestApiKey || "";
         cleanEnv.ANTHROPIC_BASE_URL = process.env.ANTHROPIC_BASE_URL || "";
         cleanEnv.ANTHROPIC_AUTH_TOKEN = "";
@@ -4005,12 +4192,21 @@ ${projectInstructions}`
           includePartialMessages: true,
           executable: "node",
           // MCP servers for enhanced capabilities
-          mcpServers: {
-            playwright: {
-              command: "npx",
-              args: ["-y", "@playwright/mcp@latest"]
-            }
-          },
+          // User-defined servers from .supatest/mcp.json can override defaults
+          mcpServers: (() => {
+            const userServers = loadMcpServers(cwd);
+            const allServers = {
+              // Default Playwright MCP server for browser automation
+              playwright: {
+                command: "npx",
+                args: ["-y", "@playwright/mcp@latest"]
+              },
+              // User-defined servers override defaults (spread after)
+              ...userServers
+            };
+            this.presenter.onLog(`MCP servers loaded: ${Object.keys(allServers).join(", ")}`);
+            return allServers;
+          })(),
           // Resume from previous session if providerSessionId is provided
           // This allows the agent to continue conversations with full context
           // Note: Sessions expire after ~30 days due to Anthropic's data retention policy
@@ -4198,7 +4394,7 @@ ${projectInstructions}`
       async resolveClaudeCodePath() {
         const fs4 = await import("fs/promises");
         let claudeCodePath;
-        const bundledPath = join2(dirname(import.meta.url.replace("file://", "")), "claude-code-cli.js");
+        const bundledPath = join4(dirname(import.meta.url.replace("file://", "")), "claude-code-cli.js");
         try {
           await fs4.access(bundledPath);
           claudeCodePath = bundledPath;
@@ -4206,7 +4402,7 @@ ${projectInstructions}`
         } catch {
           const require2 = createRequire(import.meta.url);
           const sdkPath = require2.resolve("@anthropic-ai/claude-agent-sdk/sdk.mjs");
-          claudeCodePath = join2(dirname(sdkPath), "cli.js");
+          claudeCodePath = join4(dirname(sdkPath), "cli.js");
           this.presenter.onLog(`Development mode: ${claudeCodePath}`);
         }
         if (config.claudeCodeExecutablePath) {
@@ -4745,7 +4941,7 @@ var CLI_VERSION;
 var init_version = __esm({
   "src/version.ts"() {
     "use strict";
-    CLI_VERSION = "0.0.18";
+    CLI_VERSION = "0.0.20";
   }
 });
 
@@ -4819,21 +5015,21 @@ var init_encryption = __esm({
 });
 
 // src/utils/token-storage.ts
-import { existsSync as existsSync2, mkdirSync, readFileSync as readFileSync2, unlinkSync, writeFileSync } from "fs";
+import { existsSync as existsSync4, mkdirSync, readFileSync as readFileSync4, unlinkSync, writeFileSync } from "fs";
 import { homedir as homedir2 } from "os";
-import { join as join4 } from "path";
+import { join as join6 } from "path";
 function getTokenFilePath() {
   const apiUrl = process.env.SUPATEST_API_URL || PRODUCTION_API_URL;
   if (apiUrl === PRODUCTION_API_URL) {
-    return join4(CONFIG_DIR, "token.json");
+    return join6(CONFIG_DIR, "token.json");
   }
-  return join4(CONFIG_DIR, "token.local.json");
+  return join6(CONFIG_DIR, "token.local.json");
 }
 function isV2Format(stored) {
   return "version" in stored && stored.version === 2;
 }
 function ensureConfigDir() {
-  if (!existsSync2(CONFIG_DIR)) {
+  if (!existsSync4(CONFIG_DIR)) {
     mkdirSync(CONFIG_DIR, { recursive: true, mode: 448 });
   }
 }
@@ -4853,11 +5049,11 @@ function saveToken(token, expiresAt) {
 }
 function loadToken() {
   const tokenFile = getTokenFilePath();
-  if (!existsSync2(tokenFile)) {
+  if (!existsSync4(tokenFile)) {
     return null;
   }
   try {
-    const data = readFileSync2(tokenFile, "utf8");
+    const data = readFileSync4(tokenFile, "utf8");
     const stored = JSON.parse(data);
     let payload;
     if (isV2Format(stored)) {
@@ -4886,7 +5082,7 @@ function loadToken() {
 }
 function removeToken() {
   const tokenFile = getTokenFilePath();
-  if (existsSync2(tokenFile)) {
+  if (existsSync4(tokenFile)) {
     unlinkSync(tokenFile);
   }
 }
@@ -4895,10 +5091,10 @@ var init_token_storage = __esm({
   "src/utils/token-storage.ts"() {
     "use strict";
     init_encryption();
-    CONFIG_DIR = join4(homedir2(), ".supatest");
+    CONFIG_DIR = join6(homedir2(), ".supatest");
     PRODUCTION_API_URL = "https://code-api.supatest.ai";
     STORAGE_VERSION = 2;
-    TOKEN_FILE = join4(CONFIG_DIR, "token.json");
+    TOKEN_FILE = join6(CONFIG_DIR, "token.json");
   }
 });
 
@@ -5056,6 +5252,10 @@ var init_react = __esm({
               todos
             });
           }
+        } else if (tool === "ExitPlanMode") {
+          this.callbacks.onExitPlanMode?.();
+        } else if (tool === "EnterPlanMode") {
+          this.callbacks.onEnterPlanMode?.();
         }
         const toolUseEvent = {
           type: "tool_use",
@@ -6562,13 +6762,20 @@ var init_FeedbackDialog = __esm({
 
 // src/ui/components/HelpMenu.tsx
 import { Box as Box4, Text as Text4, useInput as useInput2 } from "ink";
-import React5 from "react";
+import React5, { useEffect as useEffect4, useState as useState3 } from "react";
 var HelpMenu;
 var init_HelpMenu = __esm({
   "src/ui/components/HelpMenu.tsx"() {
     "use strict";
+    init_command_discovery();
     init_theme();
-    HelpMenu = ({ isAuthenticated, onClose }) => {
+    HelpMenu = ({ isAuthenticated, onClose, cwd }) => {
+      const [customCommands, setCustomCommands] = useState3([]);
+      useEffect4(() => {
+        const projectDir = cwd || process.cwd();
+        const commands = discoverCommands(projectDir);
+        setCustomCommands(commands);
+      }, [cwd]);
       useInput2((input, key) => {
         if (key.escape || input === "q" || input === "?" || key.ctrl && input === "h") {
           onClose();
@@ -6587,15 +6794,16 @@ var init_HelpMenu = __esm({
         /* @__PURE__ */ React5.createElement(Box4, { marginTop: 1 }),
         /* @__PURE__ */ React5.createElement(Text4, { bold: true, color: theme.text.secondary }, "Slash Commands:"),
         /* @__PURE__ */ React5.createElement(Box4, { flexDirection: "column", marginLeft: 2, marginTop: 0 }, /* @__PURE__ */ React5.createElement(Text4, null, /* @__PURE__ */ React5.createElement(Text4, { color: theme.text.accent }, "/help"), /* @__PURE__ */ React5.createElement(Text4, { color: theme.text.dim }, " or "), /* @__PURE__ */ React5.createElement(Text4, { color: theme.text.accent }, "/?"), /* @__PURE__ */ React5.createElement(Text4, { color: theme.text.dim }, " - Toggle this help menu")), /* @__PURE__ */ React5.createElement(Text4, null, /* @__PURE__ */ React5.createElement(Text4, { color: theme.text.accent }, "/resume"), /* @__PURE__ */ React5.createElement(Text4, { color: theme.text.dim }, " - Resume a previous session")), /* @__PURE__ */ React5.createElement(Text4, null, /* @__PURE__ */ React5.createElement(Text4, { color: theme.text.accent }, "/clear"), /* @__PURE__ */ React5.createElement(Text4, { color: theme.text.dim }, " - Clear message history")), /* @__PURE__ */ React5.createElement(Text4, null, /* @__PURE__ */ React5.createElement(Text4, { color: theme.text.accent }, "/model"), /* @__PURE__ */ React5.createElement(Text4, { color: theme.text.dim }, " - Cycle through available models")), /* @__PURE__ */ React5.createElement(Text4, null, /* @__PURE__ */ React5.createElement(Text4, { color: theme.text.accent }, "/setup"), /* @__PURE__ */ React5.createElement(Text4, { color: theme.text.dim }, " - Initial setup for Supatest CLI")), /* @__PURE__ */ React5.createElement(Text4, null, /* @__PURE__ */ React5.createElement(Text4, { color: theme.text.accent }, "/feedback"), /* @__PURE__ */ React5.createElement(Text4, { color: theme.text.dim }, " - Report an issue or request a feature")), isAuthenticated ? /* @__PURE__ */ React5.createElement(Text4, null, /* @__PURE__ */ React5.createElement(Text4, { color: theme.text.accent }, "/logout"), /* @__PURE__ */ React5.createElement(Text4, { color: theme.text.dim }, " - Log out of Supatest")) : /* @__PURE__ */ React5.createElement(Text4, null, /* @__PURE__ */ React5.createElement(Text4, { color: theme.text.accent }, "/login"), /* @__PURE__ */ React5.createElement(Text4, { color: theme.text.dim }, " - Authenticate with Supatest")), /* @__PURE__ */ React5.createElement(Text4, null, /* @__PURE__ */ React5.createElement(Text4, { color: theme.text.accent }, "/exit"), /* @__PURE__ */ React5.createElement(Text4, { color: theme.text.dim }, " - Exit the CLI"))),
+        customCommands.length > 0 && /* @__PURE__ */ React5.createElement(React5.Fragment, null, /* @__PURE__ */ React5.createElement(Box4, { marginTop: 1 }), /* @__PURE__ */ React5.createElement(Text4, { bold: true, color: theme.text.secondary }, "Project Commands:"), /* @__PURE__ */ React5.createElement(Box4, { flexDirection: "column", marginLeft: 2, marginTop: 0 }, customCommands.slice(0, 5).map((cmd) => /* @__PURE__ */ React5.createElement(Text4, { key: cmd.name }, /* @__PURE__ */ React5.createElement(Text4, { color: theme.text.accent }, "/", cmd.name), /* @__PURE__ */ React5.createElement(Text4, { color: theme.text.dim }, cmd.description ? ` - ${cmd.description}` : ""))), customCommands.length > 5 && /* @__PURE__ */ React5.createElement(Text4, { color: theme.text.dim }, "...and ", customCommands.length - 5, " more (use Tab to autocomplete)"))),
         /* @__PURE__ */ React5.createElement(Box4, { marginTop: 1 }),
         /* @__PURE__ */ React5.createElement(Text4, { bold: true, color: theme.text.secondary }, "Keyboard Shortcuts:"),
-        /* @__PURE__ */ React5.createElement(Box4, { flexDirection: "column", marginLeft: 2, marginTop: 0 }, /* @__PURE__ */ React5.createElement(Text4, null, /* @__PURE__ */ React5.createElement(Text4, { color: theme.text.accent }, "?"), /* @__PURE__ */ React5.createElement(Text4, { color: theme.text.dim }, " ", "- Toggle help (when input is empty)")), /* @__PURE__ */ React5.createElement(Text4, null, /* @__PURE__ */ React5.createElement(Text4, { color: theme.text.accent }, "Ctrl+H"), /* @__PURE__ */ React5.createElement(Text4, { color: theme.text.dim }, " - Toggle help")), /* @__PURE__ */ React5.createElement(Text4, null, /* @__PURE__ */ React5.createElement(Text4, { color: theme.text.accent }, "Ctrl+C"), /* @__PURE__ */ React5.createElement(Text4, { color: theme.text.dim }, " ", "- Exit (or clear input if not empty)")), /* @__PURE__ */ React5.createElement(Text4, null, /* @__PURE__ */ React5.createElement(Text4, { color: theme.text.accent }, "Ctrl+D"), /* @__PURE__ */ React5.createElement(Text4, { color: theme.text.dim }, " - Exit immediately")), /* @__PURE__ */ React5.createElement(Text4, null, /* @__PURE__ */ React5.createElement(Text4, { color: theme.text.accent }, "Ctrl+L"), /* @__PURE__ */ React5.createElement(Text4, { color: theme.text.dim }, " - Clear terminal screen")), /* @__PURE__ */ React5.createElement(Text4, null, /* @__PURE__ */ React5.createElement(Text4, { color: theme.text.accent }, "Ctrl+U"), /* @__PURE__ */ React5.createElement(Text4, { color: theme.text.dim }, " - Clear current input line")), /* @__PURE__ */ React5.createElement(Text4, null, /* @__PURE__ */ React5.createElement(Text4, { color: theme.text.accent }, "ESC"), /* @__PURE__ */ React5.createElement(Text4, { color: theme.text.dim }, " - Interrupt running agent")), /* @__PURE__ */ React5.createElement(Text4, null, /* @__PURE__ */ React5.createElement(Text4, { color: theme.text.accent }, "Shift+Up/Down"), /* @__PURE__ */ React5.createElement(Text4, { color: theme.text.dim }, " - Scroll through messages")), /* @__PURE__ */ React5.createElement(Text4, null, /* @__PURE__ */ React5.createElement(Text4, { color: theme.text.accent }, "Shift+Enter"), /* @__PURE__ */ React5.createElement(Text4, { color: theme.text.dim }, " - Add new line in input")), /* @__PURE__ */ React5.createElement(Text4, null, /* @__PURE__ */ React5.createElement(Text4, { color: theme.text.accent }, "ctrl+o"), /* @__PURE__ */ React5.createElement(Text4, { color: theme.text.dim }, " - Toggle tool outputs"))),
+        /* @__PURE__ */ React5.createElement(Box4, { flexDirection: "column", marginLeft: 2, marginTop: 0 }, /* @__PURE__ */ React5.createElement(Text4, null, /* @__PURE__ */ React5.createElement(Text4, { color: theme.text.accent }, "?"), /* @__PURE__ */ React5.createElement(Text4, { color: theme.text.dim }, " ", "- Toggle help (when input is empty)")), /* @__PURE__ */ React5.createElement(Text4, null, /* @__PURE__ */ React5.createElement(Text4, { color: theme.text.accent }, "Ctrl+H"), /* @__PURE__ */ React5.createElement(Text4, { color: theme.text.dim }, " - Toggle help")), /* @__PURE__ */ React5.createElement(Text4, null, /* @__PURE__ */ React5.createElement(Text4, { color: theme.text.accent }, "Ctrl+C"), /* @__PURE__ */ React5.createElement(Text4, { color: theme.text.dim }, " ", "- Exit (or clear input if not empty)")), /* @__PURE__ */ React5.createElement(Text4, null, /* @__PURE__ */ React5.createElement(Text4, { color: theme.text.accent }, "Ctrl+D"), /* @__PURE__ */ React5.createElement(Text4, { color: theme.text.dim }, " - Exit immediately")), /* @__PURE__ */ React5.createElement(Text4, null, /* @__PURE__ */ React5.createElement(Text4, { color: theme.text.accent }, "Ctrl+L"), /* @__PURE__ */ React5.createElement(Text4, { color: theme.text.dim }, " - Clear terminal screen")), /* @__PURE__ */ React5.createElement(Text4, null, /* @__PURE__ */ React5.createElement(Text4, { color: theme.text.accent }, "Ctrl+U"), /* @__PURE__ */ React5.createElement(Text4, { color: theme.text.dim }, " - Clear current input line")), /* @__PURE__ */ React5.createElement(Text4, null, /* @__PURE__ */ React5.createElement(Text4, { color: theme.text.accent }, "ESC"), /* @__PURE__ */ React5.createElement(Text4, { color: theme.text.dim }, " - Interrupt running agent")), /* @__PURE__ */ React5.createElement(Text4, null, /* @__PURE__ */ React5.createElement(Text4, { color: theme.text.accent }, "Shift+Enter"), /* @__PURE__ */ React5.createElement(Text4, { color: theme.text.dim }, " - Add new line in input")), /* @__PURE__ */ React5.createElement(Text4, null, /* @__PURE__ */ React5.createElement(Text4, { color: theme.text.accent }, "ctrl+o"), /* @__PURE__ */ React5.createElement(Text4, { color: theme.text.dim }, " - Toggle tool outputs")), /* @__PURE__ */ React5.createElement(Text4, null, /* @__PURE__ */ React5.createElement(Text4, { color: theme.text.accent }, "Ctrl+M"), /* @__PURE__ */ React5.createElement(Text4, { color: theme.text.dim }, " - Cycle through models"))),
         /* @__PURE__ */ React5.createElement(Box4, { marginTop: 1 }),
         /* @__PURE__ */ React5.createElement(Text4, { bold: true, color: theme.text.secondary }, "File References:"),
         /* @__PURE__ */ React5.createElement(Box4, { flexDirection: "column", marginLeft: 2, marginTop: 0 }, /* @__PURE__ */ React5.createElement(Text4, null, /* @__PURE__ */ React5.createElement(Text4, { color: theme.text.accent }, "@filename"), /* @__PURE__ */ React5.createElement(Text4, { color: theme.text.dim }, " ", "- Reference a file (autocomplete with Tab)")), /* @__PURE__ */ React5.createElement(Text4, { color: theme.text.dim }, 'Example: "Fix the bug in @src/app.ts"')),
         /* @__PURE__ */ React5.createElement(Box4, { marginTop: 1 }),
         /* @__PURE__ */ React5.createElement(Text4, { bold: true, color: theme.text.secondary }, "Tips:"),
-        /* @__PURE__ */ React5.createElement(Box4, { flexDirection: "column", marginLeft: 2, marginTop: 0 }, /* @__PURE__ */ React5.createElement(Text4, { color: theme.text.dim }, "\u2022 Press Enter to submit your task"), /* @__PURE__ */ React5.createElement(Text4, { color: theme.text.dim }, "\u2022 Use Shift+Enter to write multi-line prompts"), /* @__PURE__ */ React5.createElement(Text4, { color: theme.text.dim }, "\u2022 Drag and drop files into the terminal to add file paths"), /* @__PURE__ */ React5.createElement(Text4, { color: theme.text.dim }, "\u2022 The agent will automatically run tools and fix issues")),
+        /* @__PURE__ */ React5.createElement(Box4, { flexDirection: "column", marginLeft: 2, marginTop: 0 }, /* @__PURE__ */ React5.createElement(Text4, { color: theme.text.dim }, "\u2022 Press Enter to submit your task"), /* @__PURE__ */ React5.createElement(Text4, { color: theme.text.dim }, "\u2022 Use Shift+Enter to write multi-line prompts"), /* @__PURE__ */ React5.createElement(Text4, { color: theme.text.dim }, "\u2022 Drag and drop files into the terminal to add file paths"), /* @__PURE__ */ React5.createElement(Text4, { color: theme.text.dim }, "\u2022 The agent will automatically run tools and fix issues"), /* @__PURE__ */ React5.createElement(Text4, { color: theme.text.dim }, "\u2022 Use Ctrl+L to clear the terminal screen without clearing the messages history")),
         /* @__PURE__ */ React5.createElement(Box4, { marginTop: 1 }, /* @__PURE__ */ React5.createElement(Text4, { color: theme.text.dim }, "Press ", /* @__PURE__ */ React5.createElement(Text4, { bold: true }, "ESC"), " or ", /* @__PURE__ */ React5.createElement(Text4, { bold: true }, "?"), " to close"))
       );
     };
@@ -6603,7 +6811,7 @@ var init_HelpMenu = __esm({
 });
 
 // src/ui/contexts/SessionContext.tsx
-import React6, { createContext as createContext2, useCallback as useCallback2, useContext as useContext2, useState as useState3 } from "react";
+import React6, { createContext as createContext2, useCallback as useCallback2, useContext as useContext2, useState as useState4 } from "react";
 var SessionContext, SessionProvider, useSession;
 var init_SessionContext = __esm({
   "src/ui/contexts/SessionContext.tsx"() {
@@ -6614,24 +6822,24 @@ var init_SessionContext = __esm({
       children,
       initialModel
     }) => {
-      const [messages, setMessages] = useState3([]);
-      const [todos, setTodos] = useState3([]);
-      const [stats, setStats] = useState3({
+      const [messages, setMessages] = useState4([]);
+      const [todos, setTodos] = useState4([]);
+      const [stats, setStats] = useState4({
         filesModified: /* @__PURE__ */ new Set(),
         commandsRun: [],
         iterations: 0,
         startTime: Date.now()
       });
-      const [isAgentRunning, setIsAgentRunning] = useState3(false);
-      const [shouldInterruptAgent, setShouldInterruptAgent] = useState3(false);
-      const [usageStats, setUsageStats] = useState3(null);
-      const [sessionId, setSessionId] = useState3();
-      const [webUrl, setWebUrl] = useState3();
-      const [agentMode, setAgentMode] = useState3("build");
-      const [planFilePath, setPlanFilePath] = useState3();
-      const [selectedModel, setSelectedModel] = useState3(initialModel || Mt);
-      const [allToolsExpanded, setAllToolsExpanded] = useState3(true);
-      const [staticRemountKey, setStaticRemountKey] = useState3(0);
+      const [isAgentRunning, setIsAgentRunning] = useState4(false);
+      const [shouldInterruptAgent, setShouldInterruptAgent] = useState4(false);
+      const [usageStats, setUsageStats] = useState4(null);
+      const [sessionId, setSessionId] = useState4();
+      const [webUrl, setWebUrl] = useState4();
+      const [agentMode, setAgentMode] = useState4("build");
+      const [planFilePath, setPlanFilePath] = useState4();
+      const [selectedModel, setSelectedModel] = useState4(initialModel || Mt);
+      const [allToolsExpanded, setAllToolsExpanded] = useState4(true);
+      const [staticRemountKey, setStaticRemountKey] = useState4(0);
       const addMessage = useCallback2(
         (message) => {
           const expandableTools = ["Bash", "BashOutput", "Command Output"];
@@ -6838,7 +7046,7 @@ var init_file_completion = __esm({
 
 // src/ui/components/ModelSelector.tsx
 import { Box as Box5, Text as Text5, useInput as useInput3 } from "ink";
-import React7, { useState as useState4 } from "react";
+import React7, { useState as useState5 } from "react";
 function getNextModel(currentModel) {
   const currentIndex = ke.findIndex((m2) => m2.id === currentModel);
   const nextIndex = (currentIndex + 1) % ke.length;
@@ -6861,7 +7069,7 @@ var init_ModelSelector = __esm({
       onCancel
     }) => {
       const currentIndex = ke.findIndex((m2) => m2.id === currentModel);
-      const [selectedIndex, setSelectedIndex] = useState4(currentIndex >= 0 ? currentIndex : 0);
+      const [selectedIndex, setSelectedIndex] = useState5(currentIndex >= 0 ? currentIndex : 0);
       useInput3((input, key) => {
         if (key.upArrow) {
           setSelectedIndex((prev) => prev > 0 ? prev - 1 : ke.length - 1);
@@ -6903,12 +7111,13 @@ var init_ModelSelector = __esm({
 import path4 from "path";
 import chalk5 from "chalk";
 import { Box as Box6, Text as Text6 } from "ink";
-import React8, { forwardRef, useEffect as useEffect4, useImperativeHandle, useState as useState5 } from "react";
+import React8, { forwardRef, useEffect as useEffect5, useImperativeHandle, useState as useState6 } from "react";
 var InputPrompt;
 var init_InputPrompt = __esm({
   "src/ui/components/InputPrompt.tsx"() {
     "use strict";
     init_shared_es();
+    init_command_discovery();
     init_SessionContext();
     init_useKeypress();
     init_file_completion();
@@ -6919,19 +7128,20 @@ var init_InputPrompt = __esm({
       placeholder = "Enter your task (press Enter to submit, Shift+Enter for new line)...",
       disabled = false,
       onHelpToggle,
+      cwd,
       currentFolder,
       gitBranch,
       onInputChange
     }, ref) => {
       const { messages, agentMode, selectedModel, setSelectedModel, isAgentRunning, usageStats } = useSession();
-      const [value, setValue] = useState5("");
-      const [cursorOffset, setCursorOffset] = useState5(0);
-      const [allFiles, setAllFiles] = useState5([]);
-      const [suggestions, setSuggestions] = useState5([]);
-      const [activeSuggestion, setActiveSuggestion] = useState5(0);
-      const [showSuggestions, setShowSuggestions] = useState5(false);
-      const [mentionStartIndex, setMentionStartIndex] = useState5(-1);
-      const SLASH_COMMANDS = [
+      const [value, setValue] = useState6("");
+      const [cursorOffset, setCursorOffset] = useState6(0);
+      const [allFiles, setAllFiles] = useState6([]);
+      const [suggestions, setSuggestions] = useState6([]);
+      const [activeSuggestion, setActiveSuggestion] = useState6(0);
+      const [showSuggestions, setShowSuggestions] = useState6(false);
+      const [mentionStartIndex, setMentionStartIndex] = useState6(-1);
+      const BUILTIN_SLASH_COMMANDS = [
         { name: "/help", desc: "Show help" },
         { name: "/resume", desc: "Resume session" },
         { name: "/clear", desc: "Clear history" },
@@ -6942,7 +7152,21 @@ var init_InputPrompt = __esm({
         { name: "/logout", desc: "Log out" },
         { name: "/exit", desc: "Exit CLI" }
       ];
-      const [isSlashCommand, setIsSlashCommand] = useState5(false);
+      const [customCommands, setCustomCommands] = useState6([]);
+      const [isSlashCommand, setIsSlashCommand] = useState6(false);
+      useEffect5(() => {
+        try {
+          const projectDir = cwd || process.cwd();
+          const discovered = discoverCommands(projectDir);
+          const formatted = discovered.map((cmd) => ({
+            name: `/${cmd.name}`,
+            desc: cmd.description || ""
+          }));
+          setCustomCommands(formatted);
+        } catch {
+        }
+      }, [cwd]);
+      const allSlashCommands = [...BUILTIN_SLASH_COMMANDS, ...customCommands];
       useImperativeHandle(ref, () => ({
         clear: () => {
           setValue("");
@@ -6951,7 +7175,7 @@ var init_InputPrompt = __esm({
           onInputChange?.("");
         }
       }));
-      useEffect4(() => {
+      useEffect5(() => {
         setTimeout(() => {
           try {
             const files = getFiles();
@@ -6969,7 +7193,18 @@ var init_InputPrompt = __esm({
       const checkSuggestions = (text, cursor) => {
         if (text.startsWith("/") && cursor <= text.length && !text.includes(" ", 1)) {
           const query2 = text.slice(1);
-          const matches = SLASH_COMMANDS.filter((cmd) => cmd.name.slice(1).startsWith(query2.toLowerCase())).map((cmd) => `${cmd.name}  ${cmd.desc}`);
+          const builtinMatches = BUILTIN_SLASH_COMMANDS.filter((cmd) => cmd.name.slice(1).toLowerCase().startsWith(query2.toLowerCase())).map((cmd) => cmd.desc ? `${cmd.name}  ${cmd.desc}` : cmd.name);
+          const customMatches = customCommands.filter((cmd) => cmd.name.slice(1).toLowerCase().startsWith(query2.toLowerCase())).map((cmd) => cmd.desc ? `${cmd.name}  ${cmd.desc}` : cmd.name);
+          const matches = [];
+          if (builtinMatches.length > 0) {
+            matches.push(...builtinMatches);
+          }
+          if (customMatches.length > 0) {
+            if (builtinMatches.length > 0) {
+              matches.push("\u2500\u2500\u2500\u2500\u2500 custom commands \u2500\u2500\u2500\u2500\u2500");
+            }
+            matches.push(...customMatches);
+          }
           if (matches.length > 0) {
             setSuggestions(matches);
             setShowSuggestions(true);
@@ -7035,8 +7270,8 @@ var init_InputPrompt = __esm({
             cleanPath = cleanPath.replace(/\\ /g, " ");
             if (path4.isAbsolute(cleanPath)) {
               try {
-                const cwd = process.cwd();
-                const rel = path4.relative(cwd, cleanPath);
+                const cwd2 = process.cwd();
+                const rel = path4.relative(cwd2, cleanPath);
                 if (!rel.startsWith("..") && !path4.isAbsolute(rel)) {
                   cleanPath = rel;
                 }
@@ -7055,20 +7290,31 @@ var init_InputPrompt = __esm({
             return;
           }
           if (showSuggestions && !key.shift) {
+            const isSeparator = (idx) => suggestions[idx]?.startsWith("\u2500\u2500\u2500\u2500\u2500");
             if (key.name === "up") {
-              setActiveSuggestion(
-                (prev) => prev > 0 ? prev - 1 : suggestions.length - 1
-              );
+              setActiveSuggestion((prev) => {
+                let next = prev > 0 ? prev - 1 : suggestions.length - 1;
+                while (isSeparator(next) && next !== prev) {
+                  next = next > 0 ? next - 1 : suggestions.length - 1;
+                }
+                return next;
+              });
               return;
             }
             if (key.name === "down") {
-              setActiveSuggestion(
-                (prev) => prev < suggestions.length - 1 ? prev + 1 : 0
-              );
+              setActiveSuggestion((prev) => {
+                let next = prev < suggestions.length - 1 ? prev + 1 : 0;
+                while (isSeparator(next) && next !== prev) {
+                  next = next < suggestions.length - 1 ? next + 1 : 0;
+                }
+                return next;
+              });
               return;
             }
             if (key.name === "tab" || key.name === "return") {
-              completeSuggestion(key.name === "return");
+              if (!isSeparator(activeSuggestion)) {
+                completeSuggestion(key.name === "return");
+              }
               return;
             }
             if (key.name === "escape") {
@@ -7100,14 +7346,13 @@ var init_InputPrompt = __esm({
             setCursorOffset(Math.min(value.length, cursorOffset + 1));
           } else if (key.ctrl && input === "u") {
             updateValue("", 0);
-          } else if (key.name === "tab" && !showSuggestions) {
-            if (value.length === 0 && !isAgentRunning) {
-              if (key.shift) {
-                setSelectedModel(getPreviousModel(selectedModel));
-              } else {
-                setSelectedModel(getNextModel(selectedModel));
-              }
+          } else if (key.ctrl && key.name === "m" && !isAgentRunning) {
+            if (key.shift) {
+              setSelectedModel(getPreviousModel(selectedModel));
+            } else {
+              setSelectedModel(getNextModel(selectedModel));
             }
+          } else if (key.name === "tab" && !showSuggestions) {
           } else if (key.paste) {
             const newValue = value.slice(0, cursorOffset) + input + value.slice(cursorOffset);
             updateValue(newValue, cursorOffset + input.length);
@@ -7141,7 +7386,13 @@ var init_InputPrompt = __esm({
           marginBottom: 0,
           paddingX: 1
         },
-        suggestions.map((file, idx) => /* @__PURE__ */ React8.createElement(Text6, { color: idx === activeSuggestion ? theme.text.accent : theme.text.dim, key: file }, idx === activeSuggestion ? "\u276F " : "  ", " ", file))
+        suggestions.map((item, idx) => {
+          const isSeparator = item.startsWith("\u2500\u2500\u2500\u2500\u2500");
+          if (isSeparator) {
+            return /* @__PURE__ */ React8.createElement(Text6, { color: theme.text.dim, key: item }, "  ", item);
+          }
+          return /* @__PURE__ */ React8.createElement(Text6, { color: idx === activeSuggestion ? theme.text.accent : theme.text.dim, key: item }, idx === activeSuggestion ? "\u276F " : "  ", item);
+        })
       ), /* @__PURE__ */ React8.createElement(
         Box6,
         {
@@ -7162,7 +7413,7 @@ var init_InputPrompt = __esm({
           }
           return /* @__PURE__ */ React8.createElement(Text6, { color: theme.text.primary, key: idx }, line);
         })), !hasContent && disabled && /* @__PURE__ */ React8.createElement(Text6, { color: theme.text.dim, italic: true }, "Waiting for agent to complete...")))
-      ), /* @__PURE__ */ React8.createElement(Box6, { justifyContent: "space-between", paddingX: 1 }, /* @__PURE__ */ React8.createElement(Box6, { gap: 2 }, /* @__PURE__ */ React8.createElement(Box6, null, /* @__PURE__ */ React8.createElement(Text6, { color: agentMode === "plan" ? theme.status.inProgress : theme.text.dim }, agentMode === "plan" ? "\u23F8 plan" : "\u25B6 build"), /* @__PURE__ */ React8.createElement(Text6, { color: theme.text.dim }, " (shift+tab)")), /* @__PURE__ */ React8.createElement(Box6, null, /* @__PURE__ */ React8.createElement(Text6, { color: theme.text.dim }, "model:"), /* @__PURE__ */ React8.createElement(Text6, { color: theme.text.info }, St(selectedModel)), /* @__PURE__ */ React8.createElement(Text6, { color: theme.text.dim }, " (tab)"))), /* @__PURE__ */ React8.createElement(Box6, null, /* @__PURE__ */ React8.createElement(Text6, { color: usageStats && usageStats.contextPct >= 90 ? theme.text.error : usageStats && usageStats.contextPct >= 75 ? theme.text.warning : theme.text.dim }, usageStats?.contextPct ?? 0, "% context used"), /* @__PURE__ */ React8.createElement(Text6, { color: theme.text.dim }, " ", "(", usageStats ? usageStats.inputTokens >= 1e3 ? `${(usageStats.inputTokens / 1e3).toFixed(1)}K` : usageStats.inputTokens : 0, " / ", usageStats ? usageStats.contextWindow >= 1e3 ? `${(usageStats.contextWindow / 1e3).toFixed(0)}K` : usageStats.contextWindow : "200K", ")"))));
+      ), /* @__PURE__ */ React8.createElement(Box6, { justifyContent: "space-between", paddingX: 1 }, /* @__PURE__ */ React8.createElement(Box6, { gap: 2 }, /* @__PURE__ */ React8.createElement(Box6, null, /* @__PURE__ */ React8.createElement(Text6, { color: agentMode === "plan" ? theme.status.inProgress : theme.text.dim }, agentMode === "plan" ? "\u23F8 plan" : "\u25B6 build"), /* @__PURE__ */ React8.createElement(Text6, { color: theme.text.dim }, " (shift+tab)")), /* @__PURE__ */ React8.createElement(Box6, null, /* @__PURE__ */ React8.createElement(Text6, { color: theme.text.dim }, "model:"), /* @__PURE__ */ React8.createElement(Text6, { color: theme.text.info }, St(selectedModel)), /* @__PURE__ */ React8.createElement(Text6, { color: theme.text.dim }, " (ctrl+m)"))), /* @__PURE__ */ React8.createElement(Box6, null, /* @__PURE__ */ React8.createElement(Text6, { color: usageStats && usageStats.contextPct >= 90 ? theme.text.error : usageStats && usageStats.contextPct >= 75 ? theme.text.warning : theme.text.dim }, usageStats?.contextPct ?? 0, "% context used"), /* @__PURE__ */ React8.createElement(Text6, { color: theme.text.dim }, " ", "(", usageStats ? usageStats.inputTokens >= 1e3 ? `${(usageStats.inputTokens / 1e3).toFixed(1)}K` : usageStats.inputTokens : 0, " / ", usageStats ? usageStats.contextWindow >= 1e3 ? `${(usageStats.contextWindow / 1e3).toFixed(0)}K` : usageStats.contextWindow : "200K", ")"))));
     });
     InputPrompt.displayName = "InputPrompt";
   }
@@ -7212,7 +7463,7 @@ var init_Header = __esm({
 import chalk6 from "chalk";
 import { Box as Box8, Text as Text8 } from "ink";
 import { all, createLowlight } from "lowlight";
-import React10, { useMemo as useMemo2 } from "react";
+import React10, { useMemo } from "react";
 function parseMarkdownSections(text) {
   const sections = [];
   const lines = text.split(/\r?\n/);
@@ -7372,7 +7623,7 @@ var init_markdown = __esm({
       text,
       isPending = false
     }) => {
-      const sections = useMemo2(() => parseMarkdownSections(text), [text]);
+      const sections = useMemo(() => parseMarkdownSections(text), [text]);
       const elements = sections.map((section, index) => {
         if (section.type === "table" && section.tableRows) {
           return /* @__PURE__ */ React10.createElement(Table, { key: `table-${index}`, rows: section.tableRows });
@@ -7622,7 +7873,7 @@ var init_ErrorMessage = __esm({
 // src/ui/components/messages/LoadingMessage.tsx
 import { Box as Box11, Text as Text11 } from "ink";
 import Spinner2 from "ink-spinner";
-import React13, { useEffect as useEffect5, useState as useState6 } from "react";
+import React13, { useEffect as useEffect6, useState as useState7 } from "react";
 var LOADING_MESSAGES, SHIMMER_INTERVAL_MS, TEXT_ROTATION_INTERVAL_MS, LoadingMessage;
 var init_LoadingMessage = __esm({
   "src/ui/components/messages/LoadingMessage.tsx"() {
@@ -7639,10 +7890,10 @@ var init_LoadingMessage = __esm({
     SHIMMER_INTERVAL_MS = 80;
     TEXT_ROTATION_INTERVAL_MS = 2e3;
     LoadingMessage = () => {
-      const [messageIndex, setMessageIndex] = useState6(0);
-      const [shimmerPosition, setShimmerPosition] = useState6(0);
+      const [messageIndex, setMessageIndex] = useState7(0);
+      const [shimmerPosition, setShimmerPosition] = useState7(0);
       const message = LOADING_MESSAGES[messageIndex];
-      useEffect5(() => {
+      useEffect6(() => {
         const rotationInterval = setInterval(() => {
           setMessageIndex((prev) => (prev + 1) % LOADING_MESSAGES.length);
           setShimmerPosition(0);
@@ -7651,7 +7902,7 @@ var init_LoadingMessage = __esm({
           clearInterval(rotationInterval);
         };
       }, []);
-      useEffect5(() => {
+      useEffect6(() => {
         const shimmerInterval = setInterval(() => {
           setShimmerPosition((prev) => (prev + 1) % (message.length + 1));
         }, SHIMMER_INTERVAL_MS);
@@ -7695,16 +7946,38 @@ var init_TodoMessage = __esm({
     "use strict";
     init_theme();
     TodoMessage = ({ todos }) => {
-      const completed = todos.filter((t) => t.status === "completed");
-      const inProgress = todos.filter((t) => t.status === "in_progress");
-      const pending = todos.filter((t) => t.status === "pending");
+      const completedCount = todos.filter((t) => t.status === "completed").length;
       const total = todos.length;
-      const completedCount = completed.length;
       const progress = total > 0 ? Math.round(completedCount / total * 100) : 0;
       const barLength = 20;
       const filledLength = Math.round(barLength * completedCount / total);
       const bar = "\u2588".repeat(filledLength) + "\u2591".repeat(barLength - filledLength);
-      return /* @__PURE__ */ React15.createElement(Box13, { flexDirection: "column", marginY: 0 }, /* @__PURE__ */ React15.createElement(Box13, { flexDirection: "row" }, /* @__PURE__ */ React15.createElement(Text13, { color: theme.text.info }, "\u{1F4DD} "), /* @__PURE__ */ React15.createElement(Text13, { color: theme.text.dim }, "Todo Progress: "), /* @__PURE__ */ React15.createElement(Text13, { color: theme.text.accent }, bar), /* @__PURE__ */ React15.createElement(Text13, { color: theme.text.primary }, " ", progress, "%"), /* @__PURE__ */ React15.createElement(Text13, { color: theme.text.dim }, " ", "(", completedCount, "/", total, ")")), inProgress.length > 0 && /* @__PURE__ */ React15.createElement(Box13, { flexDirection: "column", marginLeft: 2 }, inProgress.map((todo, idx) => /* @__PURE__ */ React15.createElement(Box13, { flexDirection: "row", key: `in-progress-${idx}` }, /* @__PURE__ */ React15.createElement(Text13, { color: theme.status.inProgress }, "\u2192 "), /* @__PURE__ */ React15.createElement(Text13, { color: theme.text.primary }, todo.activeForm || todo.content)))), completed.length > 0 && completed.length <= 2 && /* @__PURE__ */ React15.createElement(Box13, { flexDirection: "column", marginLeft: 2 }, completed.map((todo, idx) => /* @__PURE__ */ React15.createElement(Box13, { flexDirection: "row", key: `completed-${idx}` }, /* @__PURE__ */ React15.createElement(Text13, { color: theme.status.completed }, "\u2713 "), /* @__PURE__ */ React15.createElement(Text13, { color: theme.text.dim }, todo.content)))), pending.length > 0 && pending.length <= 3 && /* @__PURE__ */ React15.createElement(Box13, { flexDirection: "column", marginLeft: 2 }, pending.map((todo, idx) => /* @__PURE__ */ React15.createElement(Box13, { flexDirection: "row", key: `pending-${idx}` }, /* @__PURE__ */ React15.createElement(Text13, { color: theme.status.pending }, "\u23F3 "), /* @__PURE__ */ React15.createElement(Text13, { color: theme.text.secondary }, todo.content)))));
+      const getStatusIcon = (status) => {
+        switch (status) {
+          case "completed":
+            return { icon: "\u2713", color: theme.status.completed };
+          case "in_progress":
+            return { icon: "\u2192", color: theme.status.inProgress };
+          case "pending":
+            return { icon: "\u25CB", color: theme.status.pending };
+        }
+      };
+      const getTextColor = (status) => {
+        switch (status) {
+          case "completed":
+            return theme.text.dim;
+          case "in_progress":
+            return theme.text.primary;
+          case "pending":
+            return theme.text.secondary;
+        }
+      };
+      return /* @__PURE__ */ React15.createElement(Box13, { flexDirection: "column", marginY: 0 }, /* @__PURE__ */ React15.createElement(Box13, { flexDirection: "row" }, /* @__PURE__ */ React15.createElement(Text13, { color: theme.text.info }, "\u{1F4DD} "), /* @__PURE__ */ React15.createElement(Text13, { color: theme.text.dim }, "Todo Progress: "), /* @__PURE__ */ React15.createElement(Text13, { color: theme.text.accent }, bar), /* @__PURE__ */ React15.createElement(Text13, { color: theme.text.primary }, " ", progress, "%"), /* @__PURE__ */ React15.createElement(Text13, { color: theme.text.dim }, " ", "(", completedCount, "/", total, ")")), /* @__PURE__ */ React15.createElement(Box13, { flexDirection: "column", marginLeft: 2 }, todos.map((todo, idx) => {
+        const { icon, color } = getStatusIcon(todo.status);
+        const textColor = getTextColor(todo.status);
+        const displayText = todo.status === "in_progress" ? todo.activeForm || todo.content : todo.content;
+        return /* @__PURE__ */ React15.createElement(Box13, { flexDirection: "row", key: `todo-${idx}` }, /* @__PURE__ */ React15.createElement(Text13, { color }, icon, " "), /* @__PURE__ */ React15.createElement(Text13, { color: textColor }, displayText));
+      })));
     };
   }
 });
@@ -7886,11 +8159,11 @@ var init_UserMessage = __esm({
     "use strict";
     init_theme();
     UserMessage = ({ text }) => {
-      return /* @__PURE__ */ React17.createElement(Box15, { flexDirection: "row", marginTop: 1, alignItems: "center" }, /* @__PURE__ */ React17.createElement(Text15, { color: theme.text.info }, "\u{1F464} "), /* @__PURE__ */ React17.createElement(
+      return /* @__PURE__ */ React17.createElement(Box15, { alignItems: "center", flexDirection: "row", marginTop: 1 }, /* @__PURE__ */ React17.createElement(Text15, { color: theme.text.info }, "\u{1F464} "), /* @__PURE__ */ React17.createElement(
         Box15,
         {
-          borderStyle: "round",
           borderColor: theme.text.dim,
+          borderStyle: "round",
           paddingLeft: 1,
           paddingRight: 1
         },
@@ -7902,7 +8175,7 @@ var init_UserMessage = __esm({
 
 // src/ui/components/MessageList.tsx
 import { Box as Box16, Static } from "ink";
-import React18, { useMemo as useMemo4 } from "react";
+import React18, { useMemo as useMemo3 } from "react";
 var MessageList;
 var init_MessageList = __esm({
   "src/ui/components/MessageList.tsx"() {
@@ -7972,7 +8245,7 @@ var init_MessageList = __esm({
             return null;
         }
       };
-      const { completedMessages, pendingMessages } = useMemo4(() => {
+      const { completedMessages, pendingMessages } = useMemo3(() => {
         const completed = [];
         const pending = [];
         for (const msg of messages) {
@@ -7984,7 +8257,7 @@ var init_MessageList = __esm({
         }
         return { completedMessages: completed, pendingMessages: pending };
       }, [messages]);
-      const staticItems = useMemo4(() => [
+      const staticItems = useMemo3(() => [
         { id: "header", type: "header" },
         ...completedMessages.map((msg) => ({ ...msg, _isMessage: true }))
       ], [completedMessages]);
@@ -8036,7 +8309,7 @@ var init_QueuedMessageDisplay = __esm({
 
 // src/ui/components/SessionSelector.tsx
 import { Box as Box18, Text as Text17, useInput as useInput4 } from "ink";
-import React20, { useEffect as useEffect6, useState as useState7 } from "react";
+import React20, { useEffect as useEffect7, useState as useState8 } from "react";
 function getSessionPrefix(authMethod) {
   return authMethod === "api-key" ? "[Team]" : "[Me]";
 }
@@ -8051,13 +8324,13 @@ var init_SessionSelector = __esm({
       onSelect,
       onCancel
     }) => {
-      const [allSessions, setAllSessions] = useState7([]);
-      const [selectedIndex, setSelectedIndex] = useState7(0);
-      const [isLoading, setIsLoading] = useState7(false);
-      const [hasMore, setHasMore] = useState7(true);
-      const [totalSessions, setTotalSessions] = useState7(0);
-      const [error, setError] = useState7(null);
-      useEffect6(() => {
+      const [allSessions, setAllSessions] = useState8([]);
+      const [selectedIndex, setSelectedIndex] = useState8(0);
+      const [isLoading, setIsLoading] = useState8(false);
+      const [hasMore, setHasMore] = useState8(true);
+      const [totalSessions, setTotalSessions] = useState8(0);
+      const [error, setError] = useState8(null);
+      useEffect7(() => {
         loadMoreSessions();
       }, []);
       const loadMoreSessions = async () => {
@@ -8164,11 +8437,11 @@ var init_SessionSelector = __esm({
 });
 
 // src/ui/hooks/useModeToggle.ts
-import { useEffect as useEffect7 } from "react";
+import { useEffect as useEffect8 } from "react";
 function useModeToggle() {
   const { subscribe, unsubscribe } = useKeypressContext();
   const { agentMode, setAgentMode, isAgentRunning } = useSession();
-  useEffect7(() => {
+  useEffect8(() => {
     const handleKeypress = (key) => {
       if (key.name === "tab" && key.shift && !isAgentRunning) {
         const newMode = agentMode === "plan" ? "build" : "plan";
@@ -8189,7 +8462,7 @@ var init_useModeToggle = __esm({
 });
 
 // src/ui/hooks/useOverlayEscapeGuard.ts
-import { useCallback as useCallback3, useMemo as useMemo5, useRef as useRef2 } from "react";
+import { useCallback as useCallback3, useMemo as useMemo4, useRef as useRef2 } from "react";
 var useOverlayEscapeGuard;
 var init_useOverlayEscapeGuard = __esm({
   "src/ui/hooks/useOverlayEscapeGuard.ts"() {
@@ -8200,7 +8473,7 @@ var init_useOverlayEscapeGuard = __esm({
         suppressUntilRef.current = Date.now() + suppressionMs;
       }, [suppressionMs]);
       const isCancelSuppressed = useCallback3(() => Date.now() < suppressUntilRef.current, []);
-      const isOverlayOpen = useMemo5(() => overlays.some(Boolean), [overlays]);
+      const isOverlayOpen = useMemo4(() => overlays.some(Boolean), [overlays]);
       return { isOverlayOpen, isCancelSuppressed, markOverlayClosed };
     };
   }
@@ -8211,7 +8484,7 @@ import { execSync as execSync3 } from "child_process";
 import { homedir as homedir3 } from "os";
 import { Box as Box19, Text as Text18, useApp } from "ink";
 import Spinner3 from "ink-spinner";
-import React21, { useEffect as useEffect8, useRef as useRef3, useState as useState8 } from "react";
+import React21, { useEffect as useEffect9, useRef as useRef3, useState as useState9 } from "react";
 var getGitBranch, getCurrentFolder, AppContent, App;
 var init_App = __esm({
   "src/ui/App.tsx"() {
@@ -8219,6 +8492,7 @@ var init_App = __esm({
     init_shared_es();
     init_login();
     init_setup();
+    init_command_discovery();
     init_stdio();
     init_token_storage();
     init_version();
@@ -8244,43 +8518,43 @@ var init_App = __esm({
         return "";
       }
     };
-    getCurrentFolder = () => {
-      const cwd = process.cwd();
+    getCurrentFolder = (configCwd) => {
+      const cwd = configCwd || process.cwd();
       const home = homedir3();
       if (cwd.startsWith(home)) {
         return `~${cwd.slice(home.length)}`;
       }
       return cwd;
     };
-    AppContent = ({ config: config2, sessionId, webUrl, queuedTasks = [], onExit, onSubmitTask, apiClient, onResumeSession }) => {
+    AppContent = ({ config: config2, sessionId, webUrl, queuedTasks = [], onExit, onSubmitTask, apiClient, onResumeSession, onClearSession }) => {
       const { exit } = useApp();
       const { addMessage, clearMessages, isAgentRunning, messages, setSessionId, setWebUrl, setShouldInterruptAgent, setIsAgentRunning, toggleAllToolOutputs, allToolsExpanded, selectedModel, setSelectedModel } = useSession();
       useModeToggle();
-      const [terminalWidth, setTerminalWidth] = useState8(process.stdout.columns || 80);
-      const [showHelp, setShowHelp] = useState8(false);
-      const [showInput, setShowInput] = useState8(true);
-      const [gitBranch] = useState8(() => getGitBranch());
-      const [currentFolder] = useState8(() => getCurrentFolder());
-      const [hasInputContent, setHasInputContent] = useState8(false);
-      const [exitWarning, setExitWarning] = useState8(null);
+      const [terminalWidth, setTerminalWidth] = useState9(process.stdout.columns || 80);
+      const [showHelp, setShowHelp] = useState9(false);
+      const [showInput, setShowInput] = useState9(true);
+      const [gitBranch] = useState9(() => getGitBranch());
+      const [currentFolder] = useState9(() => getCurrentFolder(config2.cwd));
+      const [hasInputContent, setHasInputContent] = useState9(false);
+      const [exitWarning, setExitWarning] = useState9(null);
       const inputPromptRef = useRef3(null);
-      const [showSessionSelector, setShowSessionSelector] = useState8(false);
-      const [showModelSelector, setShowModelSelector] = useState8(false);
-      const [showFeedbackDialog, setShowFeedbackDialog] = useState8(false);
-      const [isLoadingSession, setIsLoadingSession] = useState8(false);
-      const [authState, setAuthState] = useState8(
+      const [showSessionSelector, setShowSessionSelector] = useState9(false);
+      const [showModelSelector, setShowModelSelector] = useState9(false);
+      const [showFeedbackDialog, setShowFeedbackDialog] = useState9(false);
+      const [isLoadingSession, setIsLoadingSession] = useState9(false);
+      const [authState, setAuthState] = useState9(
         () => config2.supatestApiKey ? "authenticated" /* Authenticated */ : "unauthenticated" /* Unauthenticated */
       );
-      const [showAuthDialog, setShowAuthDialog] = useState8(false);
+      const [showAuthDialog, setShowAuthDialog] = useState9(false);
       const { isOverlayOpen, isCancelSuppressed, markOverlayClosed } = useOverlayEscapeGuard({
         overlays: [showHelp, showSessionSelector, showAuthDialog, showModelSelector, showFeedbackDialog]
       });
-      useEffect8(() => {
+      useEffect9(() => {
         if (!config2.supatestApiKey) {
           setShowAuthDialog(true);
         }
       }, [config2.supatestApiKey]);
-      useEffect8(() => {
+      useEffect9(() => {
         if (sessionId) {
           setSessionId(sessionId);
         }
@@ -8322,6 +8596,7 @@ var init_App = __esm({
           if (command === "/clear") {
             clearTerminalViewportAndScrollback();
             clearMessages();
+            onClearSession?.();
             return;
           }
           if (command === "/exit") {
@@ -8420,6 +8695,25 @@ var init_App = __esm({
             }
             return;
           }
+          const projectDir = config2.cwd || process.cwd();
+          const spaceIndex = trimmedTask.indexOf(" ");
+          const commandName = spaceIndex > 0 ? trimmedTask.slice(1, spaceIndex) : trimmedTask.slice(1);
+          const commandArgs = spaceIndex > 0 ? trimmedTask.slice(spaceIndex + 1) : void 0;
+          const expandedContent = expandCommand(projectDir, commandName, commandArgs);
+          if (expandedContent) {
+            addMessage({
+              type: "user",
+              content: trimmedTask
+            });
+            onSubmitTask?.(expandedContent);
+            return;
+          }
+          addMessage({
+            type: "error",
+            content: `Unknown command: ${trimmedTask}. Type /help for available commands.`,
+            errorType: "warning"
+          });
+          return;
         }
         if (authState !== "authenticated" /* Authenticated */) {
           addMessage({
@@ -8509,7 +8803,7 @@ var init_App = __esm({
         markOverlayClosed();
         setShowHelp(false);
       };
-      useEffect8(() => {
+      useEffect9(() => {
         const handleResize = () => {
           setTerminalWidth(process.stdout.columns || 80);
         };
@@ -8569,7 +8863,7 @@ var init_App = __esm({
         },
         { isActive: !isOverlayOpen }
       );
-      useEffect8(() => {
+      useEffect9(() => {
         if (config2.task) {
           addMessage({
             type: "user",
@@ -8625,6 +8919,7 @@ var init_App = __esm({
           InputPrompt,
           {
             currentFolder,
+            cwd: config2.cwd,
             gitBranch,
             onHelpToggle: () => setShowHelp((prev) => !prev),
             onInputChange: (val) => setHasInputContent(val.trim().length > 0),
@@ -8642,7 +8937,7 @@ var init_App = __esm({
 });
 
 // src/ui/hooks/useBracketedPaste.ts
-import { useEffect as useEffect9 } from "react";
+import { useEffect as useEffect10 } from "react";
 var ENABLE_BRACKETED_PASTE, DISABLE_BRACKETED_PASTE, useBracketedPaste;
 var init_useBracketedPaste = __esm({
   "src/ui/hooks/useBracketedPaste.ts"() {
@@ -8651,7 +8946,7 @@ var init_useBracketedPaste = __esm({
     ENABLE_BRACKETED_PASTE = "\x1B[?2004h";
     DISABLE_BRACKETED_PASTE = "\x1B[?2004l";
     useBracketedPaste = () => {
-      useEffect9(() => {
+      useEffect10(() => {
         writeToStdout(ENABLE_BRACKETED_PASTE);
         const cleanup = () => {
           writeToStdout(DISABLE_BRACKETED_PASTE);
@@ -8672,7 +8967,7 @@ __export(interactive_exports, {
   runInteractive: () => runInteractive
 });
 import { render } from "ink";
-import React22, { useEffect as useEffect10, useRef as useRef4 } from "react";
+import React22, { useEffect as useEffect11, useRef as useRef4 } from "react";
 function getToolDescription2(toolName, input) {
   switch (toolName) {
     case "Read":
@@ -8874,17 +9169,18 @@ var init_interactive = __esm({
         shouldInterruptAgent,
         setShouldInterruptAgent,
         agentMode,
+        setAgentMode,
         planFilePath,
         selectedModel
       } = useSession();
       const agentRef = useRef4(null);
-      useEffect10(() => {
+      useEffect11(() => {
         if (shouldInterruptAgent && agentRef.current) {
           agentRef.current.abort();
           setShouldInterruptAgent(false);
         }
       }, [shouldInterruptAgent, setShouldInterruptAgent]);
-      useEffect10(() => {
+      useEffect11(() => {
         let isMounted = true;
         const runAgent2 = async () => {
           setIsAgentRunning(true);
@@ -8917,6 +9213,12 @@ var init_interactive = __esm({
                 // Note: onComplete is now called after agent.run() returns
                 // to capture the providerSessionId from the result
                 onComplete: () => {
+                },
+                onExitPlanMode: () => {
+                  if (isMounted) setAgentMode("build");
+                },
+                onEnterPlanMode: () => {
+                  if (isMounted) setAgentMode("plan");
                 }
               },
               apiClient,
@@ -9033,11 +9335,18 @@ var init_interactive = __esm({
           setShouldRunAgent(true);
         }
       }, [shouldRunAgent, taskQueue, addMessage]);
+      const handleClearSession = React22.useCallback(() => {
+        setSessionId(void 0);
+        setContextSessionId(void 0);
+        setProviderSessionId(void 0);
+        setTaskQueue([]);
+      }, [setContextSessionId]);
       return /* @__PURE__ */ React22.createElement(React22.Fragment, null, /* @__PURE__ */ React22.createElement(
         App,
         {
           apiClient,
           config: { ...config2, task: currentTask },
+          onClearSession: handleClearSession,
           onExit,
           onResumeSession: async (session) => {
             try {