@a3t/rapid 0.1.12 → 0.1.14

package/dist/{chunk-52NWSTTE.js → chunk-COGUXZI3.js}

@@ -1,18 +1,18 @@
 // src/index.ts
-import { Command as Command13 } from "commander";
-import { setLogLevel, logger as logger14 } from "@a3t/rapid-core";
+import { Command as Command14 } from "commander";
+import { setLogLevel, logger as logger16 } from "@a3t/rapid-core";
 import { readFileSync as readFileSync2 } from "fs";
 import { fileURLToPath as fileURLToPath3 } from "url";
-import { dirname as dirname4, join as join7 } from "path";
+import { dirname as dirname4, join as join8 } from "path";
 
 // src/commands/init.ts
 import { Command } from "commander";
-import { writeFile, access, readFile, readdir, mkdir } from "fs/promises";
-import { join } from "path";
+import { writeFile as writeFile2, access, readFile, readdir, mkdir as mkdir2 } from "fs/promises";
+import { join as join2 } from "path";
 import { existsSync } from "fs";
 import {
   getDefaultConfig,
-  logger,
+  logger as logger2,
   MCP_SERVER_TEMPLATES,
   addMcpServerFromTemplate,
   getSecretReferences,
@@ -20,9 +20,203 @@ import {
   writeOpenCodeConfig,
   RAPID_METHODOLOGY,
   MCP_USAGE_GUIDELINES,
-  GIT_GUIDELINES
+  GIT_GUIDELINES,
+  formatJson as formatJson2
 } from "@a3t/rapid-core";
 import ora from "ora";
+
+// src/templates/claude-plugin.ts
+import { mkdir, writeFile } from "fs/promises";
+import { join } from "path";
+import { formatJson, logger } from "@a3t/rapid-core";
+function getPluginManifest(projectName) {
+  return {
+    name: `${projectName}-rapid`,
+    version: "1.0.0",
+    description: `RAPID plugin for ${projectName}`,
+    commands: [
+      "commands/rapid-status.md",
+      "commands/rapid-worktree.md",
+      "commands/rapid-context.md",
+      "commands/rapid-mcp.md"
+    ],
+    skills: ["skills/rapid-methodology.md", "skills/mcp-usage.md"]
+  };
+}
+var COMMAND_RAPID_STATUS = `---
+description: Check RAPID environment status
+allowed-tools: Bash(rapid:*)
+argument-hint: [--json]
+---
+
+Check the current RAPID environment status.
+
+Run: \`rapid status $ARGUMENTS\`
+
+This command shows:
+- Container status (running/stopped)
+- Configured agents
+- MCP server status
+- Secrets status
+`;
+var COMMAND_RAPID_WORKTREE = `---
+description: Manage git worktrees for branch isolation
+allowed-tools: Bash(rapid:*, git:*)
+argument-hint: <create|list|remove> [branch]
+---
+
+Manage git worktrees for isolated feature branch development.
+
+## Usage
+
+- \`/rapid-worktree list\` - List all worktrees
+- \`/rapid-worktree create <branch>\` - Create a worktree for a branch
+- \`/rapid-worktree remove <path>\` - Remove a worktree
+
+Run: \`rapid worktree $ARGUMENTS\`
+`;
+var COMMAND_RAPID_CONTEXT = `---
+description: Show or inject project context
+allowed-tools: Bash(rapid:*)
+argument-hint: [show|inject]
+---
+
+Show or inject project context from rapid.json configuration.
+
+## Usage
+
+- \`/rapid-context show\` - Display current context configuration
+- \`/rapid-context inject\` - Output assembled context (for hooks)
+
+Run: \`rapid context $ARGUMENTS\`
+`;
+var COMMAND_RAPID_MCP = `---
+description: Manage MCP servers
+allowed-tools: Bash(rapid:*)
+argument-hint: <add|remove|list> [server]
+---
+
+Manage Model Context Protocol (MCP) servers.
+
+## Usage
+
+- \`/rapid-mcp list\` - List configured MCP servers
+- \`/rapid-mcp add <server>\` - Add an MCP server from templates
+- \`/rapid-mcp remove <server>\` - Remove an MCP server
+
+Run: \`rapid mcp $ARGUMENTS\`
+`;
+var SKILL_RAPID_METHODOLOGY = `---
+description: Apply the RAPID 5-phase development methodology
+---
+
+# RAPID Methodology
+
+When working on this project, follow the RAPID 5-phase approach:
+
+## 1. Research Phase
+- Understand the codebase structure and existing patterns
+- Use grep, find, and read tools to explore before making changes
+- Identify dependencies and potential impacts
+
+## 2. Augment Phase
+- Gather additional context from documentation and MCP servers
+- Use Context7 for library documentation
+- Use Tavily for web searches when needed
+
+## 3. Plan Phase
+- Break down the task into concrete steps
+- Identify files that need to be created or modified
+- Consider edge cases and error handling
+
+## 4. Integrate Phase
+- Make changes incrementally, testing each step
+- Follow existing code patterns and conventions
+- Run tests after each significant change
+
+## 5. Develop Phase
+- Complete the implementation
+- Write or update tests as needed
+- Document changes in code comments where helpful
+`;
+var SKILL_MCP_USAGE = `---
+description: Guidelines for using MCP servers effectively
+---
+
+# MCP Server Usage Guidelines
+
+## Available Servers
+
+Check configured MCP servers with: \`rapid mcp list\`
+
+## Common Servers
+
+### Context7
+Use for up-to-date library documentation:
+1. First resolve library ID: \`mcp__context7__resolve-library-id\`
+2. Then query docs: \`mcp__context7__query-docs\`
+
+### Tavily
+Use for web searches and content extraction:
+- \`mcp__tavily__tavily_search\` - Search the web
+- \`mcp__tavily__tavily_extract\` - Extract content from URLs
+
+## Best Practices
+
+1. Always check if an MCP server is available before using it
+2. Prefer MCP servers over manual web searches
+3. Cache relevant documentation locally when possible
+4. Use specific queries for better results
+`;
+function getHooksConfig() {
+  return {
+    // SessionStart hook is not currently supported via JSON config
+    // This is a placeholder for future hook support
+  };
+}
+async function createClaudePlugin(rootDir, projectName, _options = {}) {
+  const pluginDir = join(rootDir, ".claude-plugin");
+  const commandsDir = join(pluginDir, "commands");
+  const skillsDir = join(pluginDir, "skills");
+  const hooksDir = join(pluginDir, "hooks");
+  try {
+    await mkdir(pluginDir, { recursive: true });
+    await mkdir(commandsDir, { recursive: true });
+    await mkdir(skillsDir, { recursive: true });
+    await mkdir(hooksDir, { recursive: true });
+    await writeFile(
+      join(pluginDir, "plugin.json"),
+      await formatJson(getPluginManifest(projectName))
+    );
+    await writeFile(join(commandsDir, "rapid-status.md"), COMMAND_RAPID_STATUS);
+    await writeFile(join(commandsDir, "rapid-worktree.md"), COMMAND_RAPID_WORKTREE);
+    await writeFile(join(commandsDir, "rapid-context.md"), COMMAND_RAPID_CONTEXT);
+    await writeFile(join(commandsDir, "rapid-mcp.md"), COMMAND_RAPID_MCP);
+    await writeFile(join(skillsDir, "rapid-methodology.md"), SKILL_RAPID_METHODOLOGY);
+    await writeFile(join(skillsDir, "mcp-usage.md"), SKILL_MCP_USAGE);
+    await writeFile(join(hooksDir, "hooks.json"), await formatJson(getHooksConfig()));
+    return true;
+  } catch (error) {
+    logger.debug(
+      `Failed to create Claude plugin: ${error instanceof Error ? error.message : String(error)}`
+    );
+    return false;
+  }
+}
+function getClaudePluginFiles() {
+  return [
+    ".claude-plugin/plugin.json",
+    ".claude-plugin/commands/rapid-status.md",
+    ".claude-plugin/commands/rapid-worktree.md",
+    ".claude-plugin/commands/rapid-context.md",
+    ".claude-plugin/commands/rapid-mcp.md",
+    ".claude-plugin/skills/rapid-methodology.md",
+    ".claude-plugin/skills/mcp-usage.md",
+    ".claude-plugin/hooks/hooks.json"
+  ];
+}
+
+// src/commands/init.ts
 async function detectProjectType(dir) {
   const files = await readdir(dir).catch(() => []);
   const fileSet = new Set(files);
@@ -33,7 +227,7 @@ async function detectProjectType(dir) {
     return { language: "go", confidence: "high" };
   }
   if (fileSet.has("pyproject.toml")) {
-    const content = await readFile(join(dir, "pyproject.toml"), "utf-8").catch(() => "");
+    const content = await readFile(join2(dir, "pyproject.toml"), "utf-8").catch(() => "");
     const framework = content.includes("fastapi") ? "fastapi" : content.includes("django") ? "django" : content.includes("flask") ? "flask" : void 0;
     if (framework) {
       return { language: "python", framework, confidence: "high" };
@@ -53,7 +247,7 @@ async function detectProjectType(dir) {
     const pkgManager = fileSet.has("pnpm-lock.yaml") ? "pnpm" : fileSet.has("yarn.lock") ? "yarn" : fileSet.has("bun.lockb") || fileSet.has("bun.lock") ? "bun" : "npm";
     let framework;
     if (fileSet.has("package.json")) {
-      const pkg = await readFile(join(dir, "package.json"), "utf-8").catch(() => "{}");
+      const pkg = await readFile(join2(dir, "package.json"), "utf-8").catch(() => "{}");
       try {
         const parsed = JSON.parse(pkg);
         const deps = { ...parsed.dependencies, ...parsed.devDependencies };
@@ -80,7 +274,11 @@ async function detectProjectType(dir) {
   }
   if (fileSet.has("package.json")) {
     const pkgManager = fileSet.has("pnpm-lock.yaml") ? "pnpm" : fileSet.has("yarn.lock") ? "yarn" : "npm";
-    return { language: "javascript", packageManager: pkgManager, confidence: "medium" };
+    return {
+      language: "javascript",
+      packageManager: pkgManager,
+      confidence: "medium"
+    };
   }
   return { language: "unknown", confidence: "low" };
 }
@@ -190,7 +388,7 @@ async function downloadRemoteTemplate(parsed, destDir, spinner) {
     });
     return true;
   } catch (error) {
-    logger.debug(
+    logger2.debug(
       `Failed to download template: ${error instanceof Error ? error.message : String(error)}`
     );
     return false;
@@ -458,21 +656,21 @@ function getDevContainerConfig(detected, usePrebuilt = false) {
   }
 }
 async function createDevContainer(dir, detected, force = false, usePrebuilt = false) {
-  const devcontainerDir = join(dir, ".devcontainer");
-  const devcontainerJsonPath = join(devcontainerDir, "devcontainer.json");
+  const devcontainerDir = join2(dir, ".devcontainer");
+  const devcontainerJsonPath = join2(devcontainerDir, "devcontainer.json");
   if (!force && existsSync(devcontainerJsonPath)) {
     return false;
   }
-  await mkdir(devcontainerDir, { recursive: true });
+  await mkdir2(devcontainerDir, { recursive: true });
   const config = getDevContainerConfig(detected, usePrebuilt);
-  await writeFile(devcontainerJsonPath, JSON.stringify(config, null, 2) + "\n");
+  await writeFile2(devcontainerJsonPath, await formatJson2(config));
   return true;
 }
-var initCommand = new Command("init").description("Initialize RAPID in a project").argument("[template]", "Template: builtin name, github:user/repo, npm:package, or URL").option("--force", "Overwrite existing files", false).option("--agent <name>", "Default agent to configure", "claude").option("--no-devcontainer", "Skip devcontainer creation").option("--prebuilt", "Use pre-built devcontainer images from ghcr.io (faster startup)", false).option("--mcp <servers>", "MCP servers to enable (comma-separated)", "context7,tavily").option("--no-mcp", "Skip MCP server configuration").option("--no-detect", "Skip auto-detection of project type").action(async (templateArg, options) => {
+var initCommand = new Command("init").description("Initialize RAPID in a project").argument("[template]", "Template: builtin name, github:user/repo, npm:package, or URL").option("--force", "Overwrite existing files", false).option("--agent <name>", "Default agent to configure", "claude").option("--no-devcontainer", "Skip devcontainer creation").option("--prebuilt", "Use pre-built devcontainer images from ghcr.io (faster startup)", false).option("--mcp <servers>", "MCP servers to enable (comma-separated)", "context7,tavily").option("--no-mcp", "Skip MCP server configuration").option("--no-detect", "Skip auto-detection of project type").option("--no-claude-plugin", "Skip Claude Code plugin generation").action(async (templateArg, options) => {
   const spinner = ora("Initializing RAPID...").start();
   try {
     const cwd = process.cwd();
-    const configPath = join(cwd, "rapid.json");
+    const configPath = join2(cwd, "rapid.json");
     if (!options.force) {
       try {
         await access(configPath);
@@ -492,7 +690,7 @@ var initCommand = new Command("init").description("Initialize RAPID in a project
           `Detected ${detectedProject.language}${detectedProject.framework ? ` (${detectedProject.framework})` : ""} project`
         );
         templateSource = suggested;
-        logger.info(`Using ${logger.brand(suggested)} template`);
+        logger2.info(`Using ${logger2.brand(suggested)} template`);
       } else {
         spinner.info("Could not detect project type, using universal template");
         templateSource = "universal";
@@ -509,16 +707,16 @@ var initCommand = new Command("init").description("Initialize RAPID in a project
       const downloaded = await downloadRemoteTemplate(parsed, cwd, spinner);
       if (!downloaded) {
         spinner.fail(`Failed to download template from ${parsed.source}`);
-        logger.info("Make sure the repository exists and is accessible.");
-        logger.info("For private repos, set GIGET_AUTH environment variable.");
+        logger2.info("Make sure the repository exists and is accessible.");
+        logger2.info("For private repos, set GIGET_AUTH environment variable.");
         process.exit(1);
       }
       spinner.succeed(`Downloaded template from ${parsed.source}`);
       try {
-        await access(join(cwd, "rapid.json"));
-        logger.blank();
-        logger.info("Template includes rapid.json configuration.");
-        logger.info("Run `rapid dev` to start coding!");
+        await access(join2(cwd, "rapid.json"));
+        logger2.blank();
+        logger2.info("Template includes rapid.json configuration.");
+        logger2.info("Run `rapid dev` to start coding!");
         return;
       } catch {
         spinner.start("Creating RAPID configuration...");
@@ -532,7 +730,7 @@ var initCommand = new Command("init").description("Initialize RAPID in a project
         if (MCP_SERVER_TEMPLATES[serverName]) {
           config = addMcpServerFromTemplate(config, serverName);
         } else {
-          logger.warn(`Unknown MCP server template: ${serverName}`);
+          logger2.warn(`Unknown MCP server template: ${serverName}`);
         }
       }
       const secretRefs = getSecretReferences(mcpServers);
@@ -549,7 +747,7 @@ var initCommand = new Command("init").description("Initialize RAPID in a project
       }
     }
     spinner.text = "Writing rapid.json...";
-    await writeFile(configPath, JSON.stringify(config, null, 2) + "\n");
+    await writeFile2(configPath, await formatJson2(config));
     if (mcpServers.length > 0) {
       spinner.text = "Generating MCP configuration files...";
       await writeMcpConfig(cwd, config);
@@ -557,12 +755,12 @@ var initCommand = new Command("init").description("Initialize RAPID in a project
     }
     if (config.agents.available.claude) {
       spinner.text = "Creating CLAUDE.md...";
-      const claudeMdPath = join(cwd, "CLAUDE.md");
-      await writeFile(claudeMdPath, getClaudeMdTemplate(cwd, detectedProject));
+      const claudeMdPath = join2(cwd, "CLAUDE.md");
+      await writeFile2(claudeMdPath, getClaudeMdTemplate(cwd, detectedProject));
     }
     spinner.text = "Creating AGENTS.md...";
-    const agentsMdPath = join(cwd, "AGENTS.md");
-    await writeFile(agentsMdPath, getAgentsMdTemplate(cwd, detectedProject));
+    const agentsMdPath = join2(cwd, "AGENTS.md");
+    await writeFile2(agentsMdPath, getAgentsMdTemplate(cwd, detectedProject));
     let devcontainerCreated = false;
     const usePrebuilt = options.prebuilt === true;
     if (options.devcontainer !== false) {
@@ -574,63 +772,75 @@ var initCommand = new Command("init").description("Initialize RAPID in a project
         usePrebuilt
       );
     }
+    let claudePluginCreated = false;
+    if (options.claudePlugin !== false && config.agents.available.claude) {
+      spinner.text = "Creating Claude Code plugin...";
+      const projectName = cwd.split("/").pop() || "project";
+      claudePluginCreated = await createClaudePlugin(cwd, projectName, { force: options.force });
+    }
     spinner.succeed("RAPID initialized successfully!");
     if (detectedProject && detectedProject.language !== "unknown") {
-      logger.blank();
-      logger.info("Project detected:");
-      console.log(`  ${logger.dim("Language:")}  ${detectedProject.language}`);
+      logger2.blank();
+      logger2.info("Project detected:");
+      console.log(`  ${logger2.dim("Language:")}  ${detectedProject.language}`);
       if (detectedProject.framework) {
-        console.log(`  ${logger.dim("Framework:")} ${detectedProject.framework}`);
+        console.log(`  ${logger2.dim("Framework:")} ${detectedProject.framework}`);
       }
       if (detectedProject.packageManager) {
-        console.log(`  ${logger.dim("Package Mgr:")} ${detectedProject.packageManager}`);
+        console.log(`  ${logger2.dim("Package Mgr:")} ${detectedProject.packageManager}`);
       }
     }
-    logger.blank();
-    logger.info("Created files:");
-    console.log(`  ${logger.dim("\u2022")} rapid.json`);
+    logger2.blank();
+    logger2.info("Created files:");
+    console.log(`  ${logger2.dim("\u2022")} rapid.json`);
     if (mcpServers.length > 0) {
-      console.log(`  ${logger.dim("\u2022")} .mcp.json`);
-      console.log(`  ${logger.dim("\u2022")} opencode.json`);
+      console.log(`  ${logger2.dim("\u2022")} .mcp.json`);
+      console.log(`  ${logger2.dim("\u2022")} opencode.json`);
     }
     if (devcontainerCreated) {
-      console.log(`  ${logger.dim("\u2022")} .devcontainer/devcontainer.json`);
+      console.log(`  ${logger2.dim("\u2022")} .devcontainer/devcontainer.json`);
+    }
+    if (claudePluginCreated) {
+      console.log(`  ${logger2.dim("\u2022")} .claude-plugin/`);
+      for (const file of getClaudePluginFiles()) {
+        console.log(`    ${logger2.dim("\u2022")} ${file.replace(".claude-plugin/", "")}`);
+      }
     }
-    console.log(`  ${logger.dim("\u2022")} CLAUDE.md`);
-    console.log(`  ${logger.dim("\u2022")} AGENTS.md`);
+    console.log(`  ${logger2.dim("\u2022")} CLAUDE.md`);
+    console.log(`  ${logger2.dim("\u2022")} AGENTS.md`);
     if (mcpServers.length > 0) {
-      logger.blank();
-      logger.info("MCP servers configured:");
+      logger2.blank();
+      logger2.info("MCP servers configured:");
       for (const serverName of mcpServers) {
         const template = MCP_SERVER_TEMPLATES[serverName];
         if (template) {
-          console.log(`  ${logger.brand("\u2022")} ${serverName} - ${template.description}`);
+          console.log(`  ${logger2.brand("\u2022")} ${serverName} - ${template.description}`);
         }
       }
     }
-    logger.blank();
-    logger.info("Next steps:");
+    logger2.blank();
+    logger2.info("Next steps:");
     let stepNum = 1;
     console.log(
-      `  ${logger.dim(`${stepNum++}.`)} Run ${logger.brand("rapid dev")} to start coding`
+      `  ${logger2.dim(`${stepNum++}.`)} Run ${logger2.brand("rapid dev")} to start coding`
     );
     console.log(
-      `  ${logger.dim(`${stepNum++}.`)} Edit ${logger.dim("rapid.json")} to customize your setup`
+      `  ${logger2.dim(`${stepNum++}.`)} Edit ${logger2.dim("rapid.json")} to customize your setup`
     );
     if (mcpServers.length > 0) {
       console.log(
-        `  ${logger.dim(`${stepNum++}.`)} Add API keys to ${logger.dim("secrets.items")} in rapid.json`
+        `  ${logger2.dim(`${stepNum++}.`)} Add API keys to ${logger2.dim("secrets.items")} in rapid.json`
       );
     }
     if (devcontainerCreated) {
       console.log(
-        `  ${logger.dim(`${stepNum++}.`)} Set ${logger.dim("OP_SERVICE_ACCOUNT_TOKEN")} env var for 1Password secrets`
+        `  ${logger2.dim(`${stepNum++}.`)} Set ${logger2.dim("OP_SERVICE_ACCOUNT_TOKEN")} env var for 1Password secrets`
       );
     }
-    logger.blank();
+    logger2.blank();
   } catch (error) {
     spinner.fail("Failed to initialize RAPID");
-    logger.error(error instanceof Error ? error.message : String(error));
+    logger2.error(error instanceof Error ? error.message : String(error));
     process.exit(1);
   }
 });
@@ -746,13 +956,13 @@ ${GIT_GUIDELINES}
 
 // src/commands/dev.ts
 import { Command as Command2 } from "commander";
-import { writeFile as writeFile3 } from "fs/promises";
-import { isAbsolute, join as join4 } from "path";
+import { writeFile as writeFile4 } from "fs/promises";
+import { isAbsolute, join as join5 } from "path";
 import {
   loadConfig,
   getAgent,
   checkAgentAvailable,
-  logger as logger2,
+  logger as logger3,
   getContainerStatus,
   startContainer,
   execInContainer,
@@ -763,14 +973,17 @@ import {
   hasVaultCli,
   isVaultAuthenticated,
   buildAgentArgs,
-  agentSupportsRuntimeInjection
+  agentSupportsRuntimeInjection,
+  formatJson as formatJson3,
+  assembleContext,
+  generateMcpConfig
 } from "@a3t/rapid-core";
 import ora2 from "ora";
 
 // src/utils/worktree.ts
 import { execa } from "execa";
 import { access as access2 } from "fs/promises";
-import { basename, dirname, join as join2, resolve } from "path";
+import { basename, dirname, join as join3, resolve } from "path";
 function getErrorMessage(err) {
   if (typeof err.stderr === "string" && err.stderr) {
     return err.stderr;
@@ -880,7 +1093,7 @@ function generateWorktreePath(repoRoot, branchName) {
   const projectName = basename(repoRoot);
   const parentDir = dirname(repoRoot);
   const safeBranchName = branchName.replace(/\//g, "-").replace(/[^a-zA-Z0-9-_]/g, "").toLowerCase();
-  return join2(parentDir, `${projectName}-${safeBranchName}`);
+  return join3(parentDir, `${projectName}-${safeBranchName}`);
 }
 async function createWorktree(repoRoot, worktreePath, branch, options = {}) {
   try {
@@ -991,9 +1204,9 @@ async function cleanupMergedWorktrees(repoRoot) {
 
 // src/isolation/lima.ts
 import { execa as execa2 } from "execa";
-import { readFile as readFile2, writeFile as writeFile2, mkdir as mkdir2, access as access3 } from "fs/promises";
+import { readFile as readFile2, writeFile as writeFile3, mkdir as mkdir3, access as access3 } from "fs/promises";
 import { homedir, platform } from "os";
-import { join as join3, dirname as dirname2 } from "path";
+import { join as join4, dirname as dirname2 } from "path";
 import { fileURLToPath } from "url";
 function getErrorMessage2(err) {
   if (typeof err.stderr === "string" && err.stderr) {
@@ -1008,7 +1221,7 @@ function getOutputString(output) {
   return void 0;
 }
 var RAPID_LIMA_INSTANCE = "rapid";
-var RAPID_LIMA_DIR = join3(homedir(), ".rapid", "lima");
+var RAPID_LIMA_DIR = join4(homedir(), ".rapid", "lima");
 async function hasLima() {
   try {
     await execa2("limactl", ["--version"]);
@@ -1023,11 +1236,11 @@ function isMacOS() {
 function getLimaTemplatePath() {
   const __dirname3 = dirname2(fileURLToPath(import.meta.url));
   const possiblePaths = [
-    join3(__dirname3, "../../../../templates/lima.yaml"),
+    join4(__dirname3, "../../../../templates/lima.yaml"),
     // From dist/isolation/
-    join3(__dirname3, "../../../templates/lima.yaml"),
+    join4(__dirname3, "../../../templates/lima.yaml"),
     // From src/isolation/
-    join3(homedir(), ".rapid", "lima.yaml")
+    join4(homedir(), ".rapid", "lima.yaml")
     // User config
   ];
   return possiblePaths[0];
@@ -1067,7 +1280,7 @@ async function instanceExists(name = RAPID_LIMA_INSTANCE) {
   return instanceDirExists(name);
 }
 async function instanceDirExists(name = RAPID_LIMA_INSTANCE) {
-  const instanceDir = join3(homedir(), ".lima", name);
+  const instanceDir = join4(homedir(), ".lima", name);
   try {
     await access3(instanceDir);
     return true;
@@ -1092,8 +1305,8 @@ ${homeMount}${projectMount}`;
 async function createLimaConfig(projectDir, options = {}) {
   const templatePath = getLimaTemplatePath();
   const configDir = RAPID_LIMA_DIR;
-  const configPath = join3(configDir, "lima.yaml");
-  await mkdir2(configDir, { recursive: true });
+  const configPath = join4(configDir, "lima.yaml");
+  await mkdir3(configDir, { recursive: true });
   let template;
   try {
     template = await readFile2(templatePath, "utf-8");
@@ -1117,7 +1330,11 @@ async function createLimaConfig(projectDir, options = {}) {
 ${envLines}
 `);
   }
-  await writeFile2(configPath, config);
+  if (options.installGh === false) {
+    const ghInstallPattern = /\s*# Install GitHub CLI\n\s*curl -fsSL https:\/\/cli\.github\.com\/packages\/githubcli-archive-keyring\.gpg \| dd of=\/usr\/share\/keyrings\/githubcli-archive-keyring\.gpg\n\s*chmod go\+r \/usr\/share\/keyrings\/githubcli-archive-keyring\.gpg\n\s*echo "deb \[arch=\$\(dpkg --print-architecture\) signed-by=\/usr\/share\/keyrings\/githubcli-archive-keyring\.gpg\] https:\/\/cli\.github\.com\/packages stable main" \| tee \/etc\/apt\/sources\.list\.d\/github-cli\.list > \/dev\/null\n\s*apt-get update\n\s*apt-get install -y gh\n/;
+    config = config.replace(ghInstallPattern, "\n");
+  }
+  await writeFile3(configPath, config);
   return configPath;
 }
 function getMinimalLimaConfig() {
@@ -1298,6 +1515,56 @@ async function shellInLima(options = {}) {
   }
   await execa2("limactl", args, { stdio: "inherit" });
 }
+var AGENT_INSTALL_COMMANDS = {
+  claude: ["sudo", "npm", "install", "-g", "@anthropic-ai/claude-code"],
+  opencode: ["bash", "-c", "curl -fsSL https://opencode.ai/install | bash"],
+  aider: ["pip3", "install", "--user", "aider-chat"]
+};
+async function isAgentInstalled(agentCli, name = RAPID_LIMA_INSTANCE) {
+  try {
+    const result = await execInLima(["which", agentCli], { name });
+    return result.success && !!result.stdout?.trim();
+  } catch {
+    return false;
+  }
+}
+async function installAgent(agentCli, name = RAPID_LIMA_INSTANCE) {
+  const installCmd = AGENT_INSTALL_COMMANDS[agentCli];
+  if (!installCmd) {
+    return {
+      success: false,
+      error: `Unknown agent "${agentCli}". No install command available.`
+    };
+  }
+  try {
+    const result = await execInLima(installCmd, { name });
+    if (!result.success) {
+      return {
+        success: false,
+        error: result.error || result.stderr || `Failed to install ${agentCli}`
+      };
+    }
+    const installed = await isAgentInstalled(agentCli, name);
+    if (!installed) {
+      return {
+        success: false,
+        error: `Installation command succeeded but ${agentCli} is not in PATH`
+      };
+    }
+    return { success: true };
+  } catch (err) {
+    return {
+      success: false,
+      error: err instanceof Error ? err.message : String(err)
+    };
+  }
+}
+async function ensureAgentInstalled(agentCli, name = RAPID_LIMA_INSTANCE) {
+  if (await isAgentInstalled(agentCli, name)) {
+    return { success: true };
+  }
+  return installAgent(agentCli, name);
+}
 async function setupGitSsh(name = RAPID_LIMA_INSTANCE) {
   try {
     const result = await execInLima(["ssh-add", "-l"], { name });
@@ -1352,7 +1619,7 @@ var devCommand = new Command2("dev").description("Launch AI coding session in th
           }
         } catch (err) {
           spinner.warn("Could not create worktree, using main directory");
-          logger2.debug(err instanceof Error ? err.message : String(err));
+          logger3.debug(err instanceof Error ? err.message : String(err));
         }
       }
     }
@@ -1363,8 +1630,8 @@ var devCommand = new Command2("dev").description("Launch AI coding session in th
     const agentName = options.agent || config.agents.default;
     const agent = getAgent(config, agentName);
     if (!agent) {
-      logger2.error(`Agent "${agentName}" not found in configuration`);
-      logger2.info("Available agents:");
+      logger3.error(`Agent "${agentName}" not found in configuration`);
+      logger3.info("Available agents:");
       Object.keys(config.agents.available).forEach((name) => {
         const isDefault = name === config.agents.default;
         console.log(`  ${isDefault ? "* " : "  "}${name}${isDefault ? " (default)" : ""}`);
@@ -1372,18 +1639,18 @@ var devCommand = new Command2("dev").description("Launch AI coding session in th
       process.exit(1);
     }
     if (options.local) {
-      logger2.warn("Running locally instead of in container");
-      logger2.dim("This bypasses the isolated dev environment");
-      logger2.blank();
+      logger3.warn("Running locally instead of in container");
+      logger3.dim("This bypasses the isolated dev environment");
+      logger3.blank();
       await runLocally(agent, agentName, rootDir, config);
       return;
     }
     const hasDevCli = await hasDevcontainerCli();
     if (!hasDevCli) {
-      logger2.error("devcontainer CLI not found");
-      logger2.info("Install with: npm install -g @devcontainers/cli");
-      logger2.blank();
-      logger2.info("Or use --local to run without container (not recommended)");
+      logger3.error("devcontainer CLI not found");
+      logger3.info("Install with: npm install -g @devcontainers/cli");
+      logger3.blank();
+      logger3.info("Or use --local to run without container (not recommended)");
       process.exit(1);
     }
     spinner.start("Checking container status...");
@@ -1397,12 +1664,12 @@ var devCommand = new Command2("dev").description("Launch AI coding session in th
       spinner.stopAndPersist({ symbol: "\u{1F433}", text: "Starting container..." });
       const result = await startContainer(rootDir, config, { quiet: false });
       if (!result.success) {
-        logger2.blank();
-        logger2.error("Failed to start container");
-        logger2.error(result.error || "Unknown error");
+        logger3.blank();
+        logger3.error("Failed to start container");
+        logger3.error(result.error || "Unknown error");
         process.exit(1);
       }
-      logger2.blank();
+      logger3.blank();
     } else {
       spinner.succeed(`Container running (${status.containerName})`);
     }
@@ -1415,12 +1682,12 @@ var devCommand = new Command2("dev").description("Launch AI coding session in th
         const hasOp = await hasOpCli();
         if (!hasOp) {
           spinner.warn("1Password CLI not found - secrets will not be loaded");
-          logger2.info("Install with: brew install 1password-cli");
+          logger3.info("Install with: brew install 1password-cli");
         } else {
           const authenticated = await isOpAuthenticated();
           if (!authenticated) {
             spinner.warn("1Password not authenticated - secrets will not be loaded");
-            logger2.info("Run: eval $(op signin)");
+            logger3.info("Run: eval $(op signin)");
           } else {
             try {
               secrets = await loadSecrets(secretsConfig);
@@ -1428,7 +1695,7 @@ var devCommand = new Command2("dev").description("Launch AI coding session in th
               spinner.succeed(`Loaded ${count} secret${count !== 1 ? "s" : ""} from 1Password`);
             } catch (err) {
               spinner.warn("Failed to load secrets from 1Password");
-              logger2.debug(err instanceof Error ? err.message : String(err));
+              logger3.debug(err instanceof Error ? err.message : String(err));
             }
           }
         }
@@ -1437,12 +1704,12 @@ var devCommand = new Command2("dev").description("Launch AI coding session in th
         const hasVault = await hasVaultCli();
         if (!hasVault) {
           spinner.warn("Vault CLI not found - secrets will not be loaded");
-          logger2.info("Install from: https://developer.hashicorp.com/vault/docs/install");
+          logger3.info("Install from: https://developer.hashicorp.com/vault/docs/install");
         } else {
           const authenticated = await isVaultAuthenticated();
           if (!authenticated) {
             spinner.warn("Vault not authenticated - secrets will not be loaded");
-            logger2.info("Run: vault login");
+            logger3.info("Run: vault login");
           } else {
             try {
               secrets = await loadSecrets(secretsConfig);
@@ -1450,7 +1717,7 @@ var devCommand = new Command2("dev").description("Launch AI coding session in th
               spinner.succeed(`Loaded ${count} secret${count !== 1 ? "s" : ""} from Vault`);
             } catch (err) {
               spinner.warn("Failed to load secrets from Vault");
-              logger2.debug(err instanceof Error ? err.message : String(err));
+              logger3.debug(err instanceof Error ? err.message : String(err));
             }
           }
         }
@@ -1466,17 +1733,44 @@ var devCommand = new Command2("dev").description("Launch AI coding session in th
           }
         } catch (err) {
           spinner.warn("Failed to load secrets from environment");
-          logger2.debug(err instanceof Error ? err.message : String(err));
+          logger3.debug(err instanceof Error ? err.message : String(err));
         }
       }
     }
-    logger2.blank();
-    logger2.info(`Launching ${logger2.brand(agentName)} in container...`);
-    const builtArgs = buildAgentArgs(agent, { injectSystemPrompt: true });
+    let contextContent;
+    if (config.context?.files?.length || config.context?.dirs?.length) {
+      const spinner2 = ora2("Assembling context files...").start();
+      try {
+        const assembled = await assembleContext(rootDir, config.context);
+        if (assembled.files.length > 0) {
+          contextContent = assembled.content;
+          spinner2.succeed(
+            `Assembled ${assembled.files.length} context file${assembled.files.length !== 1 ? "s" : ""} (${Math.round(assembled.totalSize / 1024)}KB)`
+          );
+          if (assembled.skippedFiles.length > 0) {
+            logger3.dim(`  Skipped ${assembled.skippedFiles.length} file(s)`);
+          }
+        } else {
+          spinner2.warn("No context files found");
+        }
+      } catch (err) {
+        spinner2.warn("Failed to assemble context files");
+        logger3.debug(err instanceof Error ? err.message : String(err));
+      }
+    }
+    logger3.blank();
+    logger3.info(`Launching ${logger3.brand(agentName)} in container...`);
+    const builtArgs = buildAgentArgs(agent, {
+      injectSystemPrompt: true,
+      ...contextContent && { contextContent }
+    });
     if (agentSupportsRuntimeInjection(agent)) {
-      logger2.dim("Injecting RAPID methodology via CLI args");
+      logger3.dim("Injecting RAPID methodology via CLI args");
+      if (contextContent) {
+        logger3.dim("Injecting context files via CLI args");
+      }
     }
-    logger2.blank();
+    logger3.blank();
     const agentArgs = [agent.cli, ...builtArgs];
     const mcpEnv = await prepareMcpEnv(rootDir, config.mcp);
     const mergedEnv = { ...secrets, ...mcpEnv ?? {} };
@@ -1486,7 +1780,7 @@ var devCommand = new Command2("dev").description("Launch AI coding session in th
       env: mergedEnv
     });
   } catch (error) {
-    logger2.error(error instanceof Error ? error.message : String(error));
+    logger3.error(error instanceof Error ? error.message : String(error));
     process.exit(1);
   }
 });
@@ -1495,24 +1789,16 @@ async function prepareMcpEnv(rootDir, mcp) {
     return void 0;
   }
   const configFile = mcp.configFile ?? ".mcp.json";
-  const configPath = isAbsolute(configFile) ? configFile : join4(rootDir, configFile);
-  const mcpServers = {};
-  for (const [name, serverConfig] of Object.entries(mcp.servers)) {
-    if (!serverConfig || typeof serverConfig !== "object") {
-      continue;
-    }
-    const { enabled, type, ...rest } = serverConfig;
-    if (enabled === false) {
-      continue;
-    }
-    const outputType = type === "remote" ? "http" : type;
-    mcpServers[name] = { type: outputType, ...rest };
-  }
-  if (Object.keys(mcpServers).length === 0) {
+  const configPath = isAbsolute(configFile) ? configFile : join5(rootDir, configFile);
+  const mcpConfig = generateMcpConfig({
+    version: "1.0",
+    agents: { default: "", available: {} },
+    mcp
+  });
+  if (Object.keys(mcpConfig.mcpServers).length === 0) {
     return void 0;
   }
-  await writeFile3(configPath, `${JSON.stringify({ mcpServers }, null, 2)}
-`, "utf-8");
+  await writeFile4(configPath, await formatJson3(mcpConfig), "utf-8");
   return {
     MCP_CONFIG_FILE: configFile
   };
@@ -1521,7 +1807,7 @@ async function runLocally(agent, agentName, rootDir, config) {
   const { execa: execa4 } = await import("execa");
   const status = await checkAgentAvailable(agent);
   if (!status.available) {
-    logger2.error(`${agentName} CLI not found locally`);
+    logger3.error(`${agentName} CLI not found locally`);
     process.exit(1);
   }
   let secrets = {};
@@ -1534,12 +1820,12 @@ async function runLocally(agent, agentName, rootDir, config) {
       const hasOp = await hasOpCli();
       if (!hasOp) {
         spinner.warn("1Password CLI not found - secrets will not be loaded");
-        logger2.info("Install with: brew install 1password-cli");
+        logger3.info("Install with: brew install 1password-cli");
       } else {
         const authenticated = await isOpAuthenticated();
         if (!authenticated) {
           spinner.warn("1Password not authenticated - secrets will not be loaded");
-          logger2.info("Run: eval $(op signin)");
+          logger3.info("Run: eval $(op signin)");
         } else {
           try {
             secrets = await loadSecrets(secretsConfig);
@@ -1547,7 +1833,7 @@ async function runLocally(agent, agentName, rootDir, config) {
             spinner.succeed(`Loaded ${count} secret${count !== 1 ? "s" : ""} from 1Password`);
           } catch (err) {
             spinner.warn("Failed to load secrets from 1Password");
-            logger2.debug(err instanceof Error ? err.message : String(err));
+            logger3.debug(err instanceof Error ? err.message : String(err));
           }
         }
       }
@@ -1556,12 +1842,12 @@ async function runLocally(agent, agentName, rootDir, config) {
       const hasVault = await hasVaultCli();
       if (!hasVault) {
         spinner.warn("Vault CLI not found - secrets will not be loaded");
-        logger2.info("Install from: https://developer.hashicorp.com/vault/docs/install");
+        logger3.info("Install from: https://developer.hashicorp.com/vault/docs/install");
       } else {
         const authenticated = await isVaultAuthenticated();
         if (!authenticated) {
           spinner.warn("Vault not authenticated - secrets will not be loaded");
-          logger2.info("Run: vault login");
+          logger3.info("Run: vault login");
         } else {
           try {
             secrets = await loadSecrets(secretsConfig);
@@ -1569,7 +1855,7 @@ async function runLocally(agent, agentName, rootDir, config) {
             spinner.succeed(`Loaded ${count} secret${count !== 1 ? "s" : ""} from Vault`);
           } catch (err) {
             spinner.warn("Failed to load secrets from Vault");
-            logger2.debug(err instanceof Error ? err.message : String(err));
+            logger3.debug(err instanceof Error ? err.message : String(err));
           }
         }
       }
@@ -1585,23 +1871,50 @@ async function runLocally(agent, agentName, rootDir, config) {
         }
       } catch (err) {
         spinner.warn("Failed to load secrets from environment");
-        logger2.debug(err instanceof Error ? err.message : String(err));
+        logger3.debug(err instanceof Error ? err.message : String(err));
       }
     }
   }
   const mcpEnv = await prepareMcpEnv(rootDir, config.mcp);
   const mergedEnv = { ...secrets, ...mcpEnv ?? {} };
-  const builtArgs = buildAgentArgs(agent, { injectSystemPrompt: true });
+  let contextContent;
+  if (config.context?.files?.length || config.context?.dirs?.length) {
+    const spinner = ora2("Assembling context files...").start();
+    try {
+      const assembled = await assembleContext(rootDir, config.context);
+      if (assembled.files.length > 0) {
+        contextContent = assembled.content;
+        spinner.succeed(
+          `Assembled ${assembled.files.length} context file${assembled.files.length !== 1 ? "s" : ""} (${Math.round(assembled.totalSize / 1024)}KB)`
+        );
+        if (assembled.skippedFiles.length > 0) {
+          logger3.dim(`  Skipped ${assembled.skippedFiles.length} file(s)`);
+        }
+      } else {
+        spinner.warn("No context files found");
+      }
+    } catch (err) {
+      spinner.warn("Failed to assemble context files");
+      logger3.debug(err instanceof Error ? err.message : String(err));
+    }
+  }
+  const builtArgs = buildAgentArgs(agent, {
+    injectSystemPrompt: true,
+    ...contextContent && { contextContent }
+  });
   if (isMacOS() && await hasLima()) {
-    await runInLimaVm(agent, agentName, rootDir, builtArgs, mergedEnv);
+    await runInLimaVm(agent, agentName, rootDir, builtArgs, mergedEnv, config.lima);
     return;
   }
-  logger2.info(`Launching ${logger2.brand(agentName)}...`);
-  logger2.dim(`Working directory: ${rootDir}`);
+  logger3.info(`Launching ${logger3.brand(agentName)}...`);
+  logger3.dim(`Working directory: ${rootDir}`);
   if (agentSupportsRuntimeInjection(agent)) {
-    logger2.dim("Injecting RAPID methodology via CLI args");
+    logger3.dim("Injecting RAPID methodology via CLI args");
+    if (contextContent) {
+      logger3.dim("Injecting context files via CLI args");
+    }
   }
-  logger2.blank();
+  logger3.blank();
   await execa4(agent.cli, builtArgs, {
     cwd: rootDir,
     stdio: "inherit",
@@ -1611,21 +1924,22 @@ async function runLocally(agent, agentName, rootDir, config) {
     }
   });
 }
-async function runInLimaVm(agent, agentName, rootDir, args, env) {
+async function runInLimaVm(agent, agentName, rootDir, args, env, limaConfig) {
   const spinner = ora2();
   if (!await isRunning()) {
     spinner.start(`Starting Lima VM (${RAPID_LIMA_INSTANCE})...`);
     const result = await startInstance(rootDir, {
       env,
-      timeout: 600
+      timeout: 600,
       // 10 minutes for first-time setup
+      ...limaConfig?.installGh !== void 0 && { installGh: limaConfig.installGh }
     });
     if (!result.success) {
       spinner.fail("Failed to start Lima VM");
-      logger2.error(result.error ?? "Unknown error");
-      logger2.blank();
-      logger2.info("Falling back to running directly on host...");
-      logger2.blank();
+      logger3.error(result.error ?? "Unknown error");
+      logger3.blank();
+      logger3.info("Falling back to running directly on host...");
+      logger3.blank();
       const { execa: execa4 } = await import("execa");
       await execa4(agent.cli, args, {
         cwd: rootDir,
@@ -1639,12 +1953,32 @@ async function runInLimaVm(agent, agentName, rootDir, args, env) {
     }
     spinner.succeed("Lima VM started");
   } else {
-    logger2.info(`Lima VM (${RAPID_LIMA_INSTANCE}) is running`);
+    logger3.info(`Lima VM (${RAPID_LIMA_INSTANCE}) is running`);
+  }
+  spinner.start(`Checking if ${agentName} is installed in Lima VM...`);
+  const installResult = await ensureAgentInstalled(agent.cli);
+  if (!installResult.success) {
+    spinner.fail(`Failed to install ${agentName} in Lima VM`);
+    logger3.error(installResult.error ?? "Unknown error");
+    logger3.blank();
+    logger3.info("Falling back to running directly on host...");
+    logger3.blank();
+    const { execa: execa4 } = await import("execa");
+    await execa4(agent.cli, args, {
+      cwd: rootDir,
+      stdio: "inherit",
+      env: {
+        ...process.env,
+        ...env
+      }
+    });
+    return;
   }
-  logger2.info(`Launching ${logger2.brand(agentName)} in Lima VM...`);
-  logger2.dim(`Working directory: ${rootDir}`);
-  logger2.dim("SSH agent forwarded for commit signing");
-  logger2.blank();
+  spinner.succeed(`${agentName} is available in Lima VM`);
+  logger3.info(`Launching ${logger3.brand(agentName)} in Lima VM...`);
+  logger3.dim(`Working directory: ${rootDir}`);
+  logger3.dim("SSH agent forwarded for commit signing");
+  logger3.blank();
   await execInLima([agent.cli, ...args], {
     cwd: rootDir,
     env,
@@ -1653,20 +1987,20 @@ async function runInLimaVm(agent, agentName, rootDir, args, env) {
   });
 }
 function listAgents(config) {
-  logger2.header("Available Agents");
+  logger3.header("Available Agents");
   Object.keys(config.agents.available).forEach((name) => {
     const isDefault = name === config.agents.default;
     console.log(
-      `  ${isDefault ? logger2.brand("*") : " "} ${name}${isDefault ? logger2.dim(" (default)") : ""}`
+      `  ${isDefault ? logger3.brand("*") : " "} ${name}${isDefault ? logger3.dim(" (default)") : ""}`
     );
   });
-  logger2.blank();
-  logger2.dim("Use --agent <name> to select a specific agent");
+  logger3.blank();
+  logger3.dim("Use --agent <name> to select a specific agent");
 }
 async function runMultiAgent(config, rootDir, options) {
   const availableAgents = Object.keys(config.agents.available);
   if (availableAgents.length === 0) {
-    logger2.error("No agents configured");
+    logger3.error("No agents configured");
     process.exit(1);
   }
   let selectedAgents;
@@ -1674,48 +2008,48 @@ async function runMultiAgent(config, rootDir, options) {
     selectedAgents = options.multi.split(",").map((a) => a.trim()).filter(Boolean);
     for (const name of selectedAgents) {
       if (!config.agents.available[name]) {
-        logger2.error(`Agent "${name}" not found in configuration`);
-        logger2.info("Available agents: " + availableAgents.join(", "));
+        logger3.error(`Agent "${name}" not found in configuration`);
+        logger3.info("Available agents: " + availableAgents.join(", "));
         process.exit(1);
       }
     }
   } else {
-    logger2.header("Multi-Agent Mode");
+    logger3.header("Multi-Agent Mode");
     console.log();
     console.log("  Available agents:");
     for (const name of availableAgents) {
       const isDefault = name === config.agents.default;
-      console.log(`    ${logger2.brand("\u2022")} ${name}${isDefault ? logger2.dim(" (default)") : ""}`);
+      console.log(`    ${logger3.brand("\u2022")} ${name}${isDefault ? logger3.dim(" (default)") : ""}`);
     }
     console.log();
-    logger2.info("To run multiple agents, specify them with:");
-    console.log(`  ${logger2.brand("rapid dev --multi claude,aider")}`);
+    logger3.info("To run multiple agents, specify them with:");
+    console.log(`  ${logger3.brand("rapid dev --multi claude,aider")}`);
     console.log();
-    logger2.info("Or run agents in separate terminals:");
+    logger3.info("Or run agents in separate terminals:");
     for (const name of availableAgents) {
-      console.log(`  ${logger2.dim("$")} rapid dev --agent ${name}`);
+      console.log(`  ${logger3.dim("$")} rapid dev --agent ${name}`);
     }
     console.log();
-    logger2.warn("Note: Running multiple agents simultaneously requires separate terminal windows.");
-    logger2.info("Each agent maintains its own session and context.");
+    logger3.warn("Note: Running multiple agents simultaneously requires separate terminal windows.");
+    logger3.info("Each agent maintains its own session and context.");
     console.log();
     return;
   }
   if (selectedAgents.length === 0) {
-    logger2.error("No agents specified");
+    logger3.error("No agents specified");
     process.exit(1);
   }
   if (selectedAgents.length === 1) {
-    logger2.info(
-      `Only one agent specified. Use ${logger2.brand("rapid dev --agent " + selectedAgents[0])} instead.`
+    logger3.info(
+      `Only one agent specified. Use ${logger3.brand("rapid dev --agent " + selectedAgents[0])} instead.`
     );
     process.exit(0);
   }
-  logger2.header("Multi-Agent Session");
+  logger3.header("Multi-Agent Session");
   console.log();
   console.log("  Selected agents:");
   for (const name of selectedAgents) {
-    console.log(`    ${logger2.brand("\u2022")} ${name}`);
+    console.log(`    ${logger3.brand("\u2022")} ${name}`);
   }
   console.log();
   const { execa: execa4 } = await import("execa");
@@ -1727,7 +2061,7 @@ async function runMultiAgent(config, rootDir, options) {
     hasTmux = false;
   }
   if (hasTmux) {
-    logger2.info("Launching agents in tmux panes...");
+    logger3.info("Launching agents in tmux panes...");
     console.log();
     const sessionName = `rapid-${Date.now()}`;
     const firstAgent = selectedAgents[0];
@@ -1743,29 +2077,29 @@ async function runMultiAgent(config, rootDir, options) {
       });
       await execa4("tmux", ["select-layout", "-t", sessionName, "tiled"]);
     }
-    logger2.success(`Started ${selectedAgents.length} agents in tmux session: ${sessionName}`);
+    logger3.success(`Started ${selectedAgents.length} agents in tmux session: ${sessionName}`);
     console.log();
-    logger2.info("Attaching to tmux session...");
-    logger2.dim("Press Ctrl+B then D to detach, or Ctrl+B then arrow keys to switch panes");
+    logger3.info("Attaching to tmux session...");
+    logger3.dim("Press Ctrl+B then D to detach, or Ctrl+B then arrow keys to switch panes");
     console.log();
     await execa4("tmux", ["attach-session", "-t", sessionName], {
       stdio: "inherit"
     });
   } else {
-    logger2.warn("tmux not found. Multi-agent mode works best with tmux installed.");
+    logger3.warn("tmux not found. Multi-agent mode works best with tmux installed.");
     console.log();
-    logger2.info("To run multiple agents, open separate terminal windows and run:");
+    logger3.info("To run multiple agents, open separate terminal windows and run:");
     console.log();
     for (const name of selectedAgents) {
       const cmd = options.local ? `--local` : "";
       console.log(
-        `  ${logger2.dim("Terminal " + (selectedAgents.indexOf(name) + 1) + ":")} rapid dev --agent ${name} ${cmd}`.trim()
+        `  ${logger3.dim("Terminal " + (selectedAgents.indexOf(name) + 1) + ":")} rapid dev --agent ${name} ${cmd}`.trim()
       );
     }
     console.log();
-    logger2.info("Install tmux for integrated multi-pane support:");
-    console.log(`  ${logger2.dim("macOS:")}  brew install tmux`);
-    console.log(`  ${logger2.dim("Ubuntu:")} sudo apt install tmux`);
+    logger3.info("Install tmux for integrated multi-pane support:");
+    console.log(`  ${logger3.dim("macOS:")}  brew install tmux`);
+    console.log(`  ${logger3.dim("Ubuntu:")} sudo apt install tmux`);
     console.log();
   }
 }
@@ -1775,7 +2109,7 @@ import { Command as Command3 } from "commander";
 import {
   loadConfig as loadConfig2,
   checkAllAgents,
-  logger as logger3,
+  logger as logger4,
   getContainerStatus as getContainerStatus2,
   hasDevcontainerCli as hasDevcontainerCli2,
   hasDocker,
@@ -1871,39 +2205,39 @@ var statusCommand = new Command3("status").description("Show environment status"
       return;
     }
     console.log();
-    console.log(`  ${logger3.brand("RAPID")} Status`);
-    console.log(`  ${logger3.dim("\u2500".repeat(24))}`);
+    console.log(`  ${logger4.brand("RAPID")} Status`);
+    console.log(`  ${logger4.dim("\u2500".repeat(24))}`);
     console.log();
-    console.log(`  ${logger3.dim("Config:")}      ${filepath}`);
-    console.log(`  ${logger3.dim("Root:")}        ${rootDir}`);
+    console.log(`  ${logger4.dim("Config:")}      ${filepath}`);
+    console.log(`  ${logger4.dim("Root:")}        ${rootDir}`);
     console.log();
-    console.log(`  ${logger3.dim("Container:")}`);
+    console.log(`  ${logger4.dim("Container:")}`);
     if (!devcontainerConfig) {
-      console.log(`    ${logger3.dim("\u25CB")} ${logger3.dim("No devcontainer.json configured")}`);
+      console.log(`    ${logger4.dim("\u25CB")} ${logger4.dim("No devcontainer.json configured")}`);
     } else if (!dockerRunning) {
-      console.log(`    ${logger3.dim("\u25CB")} ${logger3.dim("Docker not running")}`);
+      console.log(`    ${logger4.dim("\u25CB")} ${logger4.dim("Docker not running")}`);
     } else if (!hasDevCli) {
-      console.log(`    ${logger3.dim("\u25CB")} ${logger3.dim("devcontainer CLI not installed")}`);
+      console.log(`    ${logger4.dim("\u25CB")} ${logger4.dim("devcontainer CLI not installed")}`);
     } else if (containerStatus.running) {
       console.log(
-        `    ${logger3.brand("\u25CF")} Running ${logger3.dim(`(${containerStatus.containerName})`)}`
+        `    ${logger4.brand("\u25CF")} Running ${logger4.dim(`(${containerStatus.containerName})`)}`
       );
     } else if (containerStatus.exists) {
       console.log(
-        `    ${logger3.dim("\u25CB")} Stopped ${logger3.dim(`(${containerStatus.containerName})`)}`
+        `    ${logger4.dim("\u25CB")} Stopped ${logger4.dim(`(${containerStatus.containerName})`)}`
       );
     } else {
-      console.log(`    ${logger3.dim("\u25CB")} Not started`);
+      console.log(`    ${logger4.dim("\u25CB")} Not started`);
     }
     console.log();
     console.log(
-      `  ${logger3.dim("Agents:")}      ${logger3.dim(`(default: ${config.agents.default})`)}`
+      `  ${logger4.dim("Agents:")}      ${logger4.dim(`(default: ${config.agents.default})`)}`
     );
     agentStatuses.forEach((status) => {
       const isDefault = status.name === config.agents.default;
-      const icon = status.available ? logger3.brand("\u2713") : logger3.dim("\u25CB");
-      const name = isDefault ? logger3.bold(status.name) : status.name;
-      const version = status.version ? logger3.dim(` (${status.version})`) : "";
+      const icon = status.available ? logger4.brand("\u2713") : logger4.dim("\u25CB");
+      const name = isDefault ? logger4.bold(status.name) : status.name;
+      const version = status.version ? logger4.dim(` (${status.version})`) : "";
       console.log(`    ${icon} ${name}${version}`);
     });
     console.log();
@@ -1911,38 +2245,38 @@ var statusCommand = new Command3("status").description("Show environment status"
       const providerInfo = getProviderInfo(
         secretsStatus.provider
       );
-      console.log(`  ${logger3.dim("Secrets:")}     ${logger3.dim(`(${providerInfo.name})`)}`);
+      console.log(`  ${logger4.dim("Secrets:")}     ${logger4.dim(`(${providerInfo.name})`)}`);
       if (providerInfo.cliRequired) {
-        const cliIcon = secretsStatus.cliInstalled ? logger3.brand("\u2713") : logger3.dim("\u25CB");
+        const cliIcon = secretsStatus.cliInstalled ? logger4.brand("\u2713") : logger4.dim("\u25CB");
         console.log(
           `    ${cliIcon} CLI ${secretsStatus.cliInstalled ? "installed" : "not installed"}`
         );
         if (secretsStatus.cliInstalled) {
-          const authIcon = secretsStatus.authenticated ? logger3.brand("\u2713") : logger3.dim("\u25CB");
+          const authIcon = secretsStatus.authenticated ? logger4.brand("\u2713") : logger4.dim("\u25CB");
           console.log(
             `    ${authIcon} ${secretsStatus.authenticated ? "Authenticated" : "Not authenticated"}`
           );
         }
       }
       if (secretsStatus.secretsCount > 0) {
-        const allIcon = secretsStatus.allAvailable ? logger3.brand("\u2713") : logger3.dim("\u25CB");
+        const allIcon = secretsStatus.allAvailable ? logger4.brand("\u2713") : logger4.dim("\u25CB");
         console.log(
           `    ${allIcon} ${secretsStatus.secretsCount} secret${secretsStatus.secretsCount !== 1 ? "s" : ""} ${secretsStatus.allAvailable ? "available" : "configured"}`
         );
       }
-      const envrcIcon = secretsStatus.envrcExists ? logger3.brand("\u2713") : logger3.dim("\u25CB");
+      const envrcIcon = secretsStatus.envrcExists ? logger4.brand("\u2713") : logger4.dim("\u25CB");
       console.log(
         `    ${envrcIcon} .envrc ${secretsStatus.envrcExists ? "exists" : "not generated"}`
       );
       console.log();
     }
-    console.log(`  ${logger3.dim("Auth:")}`);
+    console.log(`  ${logger4.dim("Auth:")}`);
     if (!authStatus.authenticated) {
-      console.log(`    ${logger3.dim("\u25CB")} ${logger3.dim("No authentication detected")}`);
-      console.log(`    ${logger3.dim("  Run `rapid auth` for options")}`);
+      console.log(`    ${logger4.dim("\u25CB")} ${logger4.dim("No authentication detected")}`);
+      console.log(`    ${logger4.dim("  Run `rapid auth` for options")}`);
     } else {
       for (const cred of authStatus.sources) {
-        const icon = cred.authType === "oauth" ? logger3.brand("\u25CF") : logger3.dim("\u25CB");
+        const icon = cred.authType === "oauth" ? logger4.brand("\u25CF") : logger4.dim("\u25CB");
         const authType = cred.authType === "oauth" ? "OAuth" : "API Key";
         let info = `${cred.source} (${cred.provider}, ${authType})`;
         if (cred.accountInfo?.email) {
@@ -1953,32 +2287,32 @@ var statusCommand = new Command3("status").description("Show environment status"
     }
     console.log();
     if (!containerStatus.running && devcontainerConfig && dockerRunning && hasDevCli) {
-      logger3.info("Run `rapid start` to start the container");
+      logger4.info("Run `rapid start` to start the container");
     } else if (containerStatus.running) {
-      logger3.info("Run `rapid dev` to start coding");
+      logger4.info("Run `rapid dev` to start coding");
     }
     console.log();
   } catch (error) {
-    logger3.error(error instanceof Error ? error.message : String(error));
+    logger4.error(error instanceof Error ? error.message : String(error));
     process.exit(1);
   }
 });
 
 // src/commands/agent.ts
-import { writeFile as writeFile4 } from "fs/promises";
+import { writeFile as writeFile5 } from "fs/promises";
 import { Command as Command4 } from "commander";
-import { loadConfig as loadConfig3, checkAllAgents as checkAllAgents2, logger as logger4 } from "@a3t/rapid-core";
+import { loadConfig as loadConfig3, checkAllAgents as checkAllAgents2, logger as logger5, formatJson as formatJson4 } from "@a3t/rapid-core";
 var agentCommand = new Command4("agent").description("Manage AI agents");
 agentCommand.command("list").description("List available agents").action(async () => {
   try {
     const loaded = await loadConfig3();
     if (!loaded) {
-      logger4.error("No rapid.json found. Run `rapid init` first.");
+      logger5.error("No rapid.json found. Run `rapid init` first.");
       process.exit(1);
     }
     const { config } = loaded;
     const statuses = await checkAllAgents2(config);
-    logger4.header("Available Agents");
+    logger5.header("Available Agents");
     statuses.forEach((status) => {
       const isDefault = status.name === config.agents.default;
       const icon = status.available ? "\u2713" : "\u25CB";
@@ -1986,17 +2320,17 @@ agentCommand.command("list").description("List available agents").action(async (
       const versionTag = status.version ? ` - ${status.version}` : "";
       if (status.available) {
         console.log(
-          `  ${logger4.brand(icon)} ${status.name}${defaultTag}${logger4.dim(versionTag)}`
+          `  ${logger5.brand(icon)} ${status.name}${defaultTag}${logger5.dim(versionTag)}`
         );
       } else {
         console.log(
-          `  ${logger4.dim(icon)} ${logger4.dim(status.name)}${defaultTag} ${logger4.dim("[not installed]")}`
+          `  ${logger5.dim(icon)} ${logger5.dim(status.name)}${defaultTag} ${logger5.dim("[not installed]")}`
         );
       }
     });
-    logger4.blank();
+    logger5.blank();
   } catch (error) {
-    logger4.error(error instanceof Error ? error.message : String(error));
+    logger5.error(error instanceof Error ? error.message : String(error));
     process.exit(1);
   }
 });
@@ -2004,7 +2338,7 @@ agentCommand.command("default [name]").description("Get or set default agent").a
   try {
     const loaded = await loadConfig3();
     if (!loaded) {
-      logger4.error("No rapid.json found. Run `rapid init` first.");
+      logger5.error("No rapid.json found. Run `rapid init` first.");
       process.exit(1);
     }
     const { config } = loaded;
@@ -2013,18 +2347,18 @@ agentCommand.command("default [name]").description("Get or set default agent").a
       return;
     }
     if (!config.agents.available[name]) {
-      logger4.error(`Agent "${name}" not found in configuration`);
-      logger4.info("Available agents:");
+      logger5.error(`Agent "${name}" not found in configuration`);
+      logger5.info("Available agents:");
       Object.keys(config.agents.available).forEach((n) => {
         console.log(`  - ${n}`);
       });
       process.exit(1);
     }
     config.agents.default = name;
-    await writeFile4(loaded.filepath, JSON.stringify(config, null, 2) + "\n");
-    logger4.success(`Default agent set to "${name}"`);
+    await writeFile5(loaded.filepath, await formatJson4(config));
+    logger5.success(`Default agent set to "${name}"`);
   } catch (error) {
-    logger4.error(error instanceof Error ? error.message : String(error));
+    logger5.error(error instanceof Error ? error.message : String(error));
     process.exit(1);
   }
 });
@@ -2032,14 +2366,14 @@ agentCommand.command("yolo [name]").description("Enable YOLO mode (skip all perm
   try {
     const loaded = await loadConfig3();
     if (!loaded) {
-      logger4.error("No rapid.json found. Run `rapid init` first.");
+      logger5.error("No rapid.json found. Run `rapid init` first.");
       process.exit(1);
     }
     const { config } = loaded;
     const agentName = name || config.agents.default;
     if (!config.agents.available[agentName]) {
-      logger4.error(`Agent "${agentName}" not found in configuration`);
-      logger4.info("Available agents:");
+      logger5.error(`Agent "${agentName}" not found in configuration`);
+      logger5.info("Available agents:");
       Object.keys(config.agents.available).forEach((n) => {
         console.log(`  - ${n}`);
       });
@@ -2048,19 +2382,19 @@ agentCommand.command("yolo [name]").description("Enable YOLO mode (skip all perm
     const agent = config.agents.available[agentName];
     const enabling = !options.off;
     if (enabling && agent.cli !== "claude") {
-      logger4.warn(`YOLO mode is only supported for Claude (${agentName} uses ${agent.cli})`);
-      logger4.info("Continuing anyway...");
+      logger5.warn(`YOLO mode is only supported for Claude (${agentName} uses ${agent.cli})`);
+      logger5.info("Continuing anyway...");
     }
     agent.yolo = enabling;
-    await writeFile4(loaded.filepath, JSON.stringify(config, null, 2) + "\n");
+    await writeFile5(loaded.filepath, await formatJson4(config));
     if (enabling) {
-      logger4.success(`YOLO mode enabled for "${agentName}"`);
-      logger4.dim("Permission prompts will be skipped (--dangerously-skip-permissions)");
+      logger5.success(`YOLO mode enabled for "${agentName}"`);
+      logger5.dim("Permission prompts will be skipped (--dangerously-skip-permissions)");
     } else {
-      logger4.success(`YOLO mode disabled for "${agentName}"`);
+      logger5.success(`YOLO mode disabled for "${agentName}"`);
     }
   } catch (error) {
-    logger4.error(error instanceof Error ? error.message : String(error));
+    logger5.error(error instanceof Error ? error.message : String(error));
     process.exit(1);
   }
 });
@@ -2069,7 +2403,7 @@ agentCommand.command("yolo [name]").description("Enable YOLO mode (skip all perm
 import { Command as Command5 } from "commander";
 import {
   loadConfig as loadConfig4,
-  logger as logger5,
+  logger as logger6,
   hasDevcontainerCli as hasDevcontainerCli3,
   hasDocker as hasDocker2,
   loadDevcontainerConfig as loadDevcontainerConfig2,
@@ -2091,36 +2425,36 @@ var startCommand = new Command5("start").description("Start the development cont
     const hasDevCli = await hasDevcontainerCli3();
     if (!hasDevCli) {
       spinner.fail("devcontainer CLI not found");
-      logger5.blank();
-      logger5.info("Install with:");
+      logger6.blank();
+      logger6.info("Install with:");
       console.log("  npm install -g @devcontainers/cli");
-      logger5.blank();
+      logger6.blank();
       process.exit(1);
     }
     spinner.text = "Checking Docker...";
     const dockerAvailable = await hasDocker2();
     if (!dockerAvailable) {
       spinner.fail("Docker is not running");
-      logger5.info("Please start Docker Desktop and try again.");
+      logger6.info("Please start Docker Desktop and try again.");
       process.exit(1);
     }
     spinner.text = "Checking devcontainer configuration...";
     const devcontainerConfig = await loadDevcontainerConfig2(rootDir, config);
     if (!devcontainerConfig) {
       spinner.fail("No devcontainer.json found");
-      logger5.blank();
-      logger5.info("Create a .devcontainer/devcontainer.json or run:");
+      logger6.blank();
+      logger6.info("Create a .devcontainer/devcontainer.json or run:");
       console.log("  rapid init --template <template>");
-      logger5.blank();
+      logger6.blank();
       process.exit(1);
     }
     spinner.text = "Checking container status...";
     const status = await getContainerStatus3(rootDir, config);
     if (status.running && !options.rebuild) {
       spinner.succeed("Container already running");
-      logger5.info(`Container: ${status.containerName}`);
-      logger5.blank();
-      logger5.info("Run `rapid dev` to start coding");
+      logger6.info(`Container: ${status.containerName}`);
+      logger6.blank();
+      logger6.info("Run `rapid dev` to start coding");
       return;
     }
     spinner.text = options.rebuild ? "Rebuilding container..." : "Starting container...";
@@ -2130,28 +2464,28 @@ var startCommand = new Command5("start").description("Start the development cont
       quiet: false
     });
     if (!result.success) {
-      logger5.blank();
-      logger5.error("Failed to start container");
-      logger5.error(result.error || "Unknown error");
+      logger6.blank();
+      logger6.error("Failed to start container");
+      logger6.error(result.error || "Unknown error");
       process.exit(1);
     }
-    logger5.blank();
-    logger5.success("Development environment ready!");
-    logger5.blank();
-    logger5.info("Next steps:");
-    console.log(`  ${logger5.dim("\u2022")} Run ${logger5.brand("rapid dev")} to start coding`);
-    console.log(`  ${logger5.dim("\u2022")} Run ${logger5.brand("rapid stop")} when done`);
-    logger5.blank();
+    logger6.blank();
+    logger6.success("Development environment ready!");
+    logger6.blank();
+    logger6.info("Next steps:");
+    console.log(`  ${logger6.dim("\u2022")} Run ${logger6.brand("rapid dev")} to start coding`);
+    console.log(`  ${logger6.dim("\u2022")} Run ${logger6.brand("rapid stop")} when done`);
+    logger6.blank();
   } catch (error) {
     spinner.fail("Failed to start environment");
-    logger5.error(error instanceof Error ? error.message : String(error));
+    logger6.error(error instanceof Error ? error.message : String(error));
     process.exit(1);
   }
 });
 
 // src/commands/stop.ts
 import { Command as Command6 } from "commander";
-import { loadConfig as loadConfig5, logger as logger6, getContainerStatus as getContainerStatus4, stopContainer } from "@a3t/rapid-core";
+import { loadConfig as loadConfig5, logger as logger7, getContainerStatus as getContainerStatus4, stopContainer } from "@a3t/rapid-core";
 import ora5 from "ora";
 var stopCommand = new Command6("stop").description("Stop the development container").option("--remove", "Remove container after stopping", false).action(async (options) => {
   const spinner = ora5("Stopping development environment...").start();
@@ -2182,13 +2516,13 @@ var stopCommand = new Command6("stop").description("Stop the development contain
     const result = await stopContainer(rootDir, config, { remove: options.remove });
     if (!result.success) {
       spinner.fail("Failed to stop container");
-      logger6.error(result.error || "Unknown error");
+      logger7.error(result.error || "Unknown error");
       process.exit(1);
     }
     spinner.succeed(options.remove ? "Container stopped and removed" : "Container stopped");
   } catch (error) {
     spinner.fail("Failed to stop environment");
-    logger6.error(error instanceof Error ? error.message : String(error));
+    logger7.error(error instanceof Error ? error.message : String(error));
     process.exit(1);
   }
 });
@@ -2197,7 +2531,7 @@ var stopCommand = new Command6("stop").description("Stop the development contain
 import { Command as Command7 } from "commander";
 import {
   loadConfig as loadConfig6,
-  logger as logger7,
+  logger as logger8,
   verifySecrets as verifySecrets2,
   loadSecrets as loadSecrets2,
   hasOpCli as hasOpCli3,
@@ -2234,15 +2568,15 @@ secretsCommand.command("verify").description("Verify all secrets are accessible"
       if (!hasOp) {
         spinner.fail("1Password CLI (op) not found");
         console.log();
-        logger7.info("Install with: brew install 1password-cli");
-        logger7.info("More info: https://developer.1password.com/docs/cli/get-started/");
+        logger8.info("Install with: brew install 1password-cli");
+        logger8.info("More info: https://developer.1password.com/docs/cli/get-started/");
         process.exit(1);
       }
       const authenticated = await isOpAuthenticated3();
       if (!authenticated) {
         spinner.fail("1Password CLI not authenticated");
         console.log();
-        logger7.info("Run: eval $(op signin)");
+        logger8.info("Run: eval $(op signin)");
         process.exit(1);
       }
     } else if (provider === "vault") {
@@ -2250,14 +2584,14 @@ secretsCommand.command("verify").description("Verify all secrets are accessible"
       if (!hasVault) {
         spinner.fail("Vault CLI not found");
         console.log();
-        logger7.info("Install from: https://developer.hashicorp.com/vault/docs/install");
+        logger8.info("Install from: https://developer.hashicorp.com/vault/docs/install");
         process.exit(1);
       }
       const authenticated = await isVaultAuthenticated3();
       if (!authenticated) {
         spinner.fail("Vault CLI not authenticated");
         console.log();
-        logger7.info("Run: vault login");
+        logger8.info("Run: vault login");
         process.exit(1);
       }
     }
@@ -2269,37 +2603,37 @@ secretsCommand.command("verify").description("Verify all secrets are accessible"
       return;
     }
     console.log();
-    console.log(`  ${logger7.brand("Secrets")} Verification`);
-    console.log(`  ${logger7.dim("\u2500".repeat(24))}`);
+    console.log(`  ${logger8.brand("Secrets")} Verification`);
+    console.log(`  ${logger8.dim("\u2500".repeat(24))}`);
     console.log();
-    console.log(`  ${logger7.dim("Provider:")}  ${getProviderInfo2(provider).name}`);
+    console.log(`  ${logger8.dim("Provider:")}  ${getProviderInfo2(provider).name}`);
     console.log(
-      `  ${logger7.dim("Auth:")}      ${status.authenticated ? logger7.brand("\u2713") : logger7.dim("\u25CB")} ${status.authenticated ? "Authenticated" : "Not authenticated"}`
+      `  ${logger8.dim("Auth:")}      ${status.authenticated ? logger8.brand("\u2713") : logger8.dim("\u25CB")} ${status.authenticated ? "Authenticated" : "Not authenticated"}`
     );
     console.log();
     if (status.secrets.length === 0) {
-      console.log(`  ${logger7.dim("No secrets configured in rapid.json")}`);
+      console.log(`  ${logger8.dim("No secrets configured in rapid.json")}`);
       console.log();
       return;
     }
-    console.log(`  ${logger7.dim("Secrets:")}`);
+    console.log(`  ${logger8.dim("Secrets:")}`);
     for (const secret of status.secrets) {
-      const icon = secret.available ? logger7.brand("\u2713") : "\u2717";
-      const ref = logger7.dim(`(${provider})`);
-      const error = secret.error ? logger7.dim(` - ${secret.error}`) : "";
+      const icon = secret.available ? logger8.brand("\u2713") : "\u2717";
+      const ref = logger8.dim(`(${provider})`);
+      const error = secret.error ? logger8.dim(` - ${secret.error}`) : "";
       console.log(`    ${icon} ${secret.name} ${ref}${error}`);
     }
     console.log();
     if (status.allAvailable) {
-      logger7.info("All secrets verified successfully!");
+      logger8.info("All secrets verified successfully!");
     } else {
-      logger7.error("Some secrets are not available");
+      logger8.error("Some secrets are not available");
       process.exit(1);
     }
     console.log();
   } catch (error) {
     spinner.fail("Failed to verify secrets");
-    logger7.error(error instanceof Error ? error.message : String(error));
+    logger8.error(error instanceof Error ? error.message : String(error));
     process.exit(1);
   }
 });
@@ -2307,7 +2641,7 @@ secretsCommand.command("list").description("List configured secrets (names only,
   try {
     const loaded = await loadConfig6();
     if (!loaded) {
-      logger7.error("No rapid.json found");
+      logger8.error("No rapid.json found");
       process.exit(1);
     }
     const { config } = loaded;
@@ -2316,7 +2650,7 @@ secretsCommand.command("list").description("List configured secrets (names only,
       if (options.json) {
         console.log(JSON.stringify({ secrets: [] }, null, 2));
       } else {
-        logger7.info("No secrets configured");
+        logger8.info("No secrets configured");
       }
       return;
     }
@@ -2331,19 +2665,19 @@ secretsCommand.command("list").description("List configured secrets (names only,
       return;
     }
     console.log();
-    console.log(`  ${logger7.brand("Configured Secrets")}`);
-    console.log(`  ${logger7.dim("\u2500".repeat(24))}`);
+    console.log(`  ${logger8.brand("Configured Secrets")}`);
+    console.log(`  ${logger8.dim("\u2500".repeat(24))}`);
     console.log();
-    console.log(`  ${logger7.dim("Provider:")} ${getProviderInfo2(provider).name}`);
+    console.log(`  ${logger8.dim("Provider:")} ${getProviderInfo2(provider).name}`);
     console.log();
     const maxNameLen = Math.max(...Object.keys(secretsConfig.items).map((n) => n.length));
     for (const [name, reference] of Object.entries(secretsConfig.items)) {
       const paddedName = name.padEnd(maxNameLen);
-      console.log(`  ${logger7.brand("\u2022")} ${paddedName}  ${logger7.dim(reference)}`);
+      console.log(`  ${logger8.brand("\u2022")} ${paddedName}  ${logger8.dim(reference)}`);
     }
     console.log();
   } catch (error) {
-    logger7.error(error instanceof Error ? error.message : String(error));
+    logger8.error(error instanceof Error ? error.message : String(error));
     process.exit(1);
   }
 });
@@ -2351,13 +2685,13 @@ secretsCommand.command("generate").description("Generate .envrc file from rapid.
   try {
     const loaded = await loadConfig6();
     if (!loaded) {
-      logger7.error("No rapid.json found");
+      logger8.error("No rapid.json found");
       process.exit(1);
     }
     const { config, rootDir } = loaded;
     const secretsConfig = config.secrets;
     if (!secretsConfig) {
-      logger7.error("No secrets configuration in rapid.json");
+      logger8.error("No secrets configuration in rapid.json");
       process.exit(1);
     }
     const content = generateEnvrc(secretsConfig);
@@ -2367,21 +2701,21 @@ secretsCommand.command("generate").description("Generate .envrc file from rapid.
     }
     const envrcExists = await hasEnvrc2(rootDir, secretsConfig);
     if (envrcExists && !options.force) {
-      logger7.error(".envrc already exists. Use --force to overwrite.");
+      logger8.error(".envrc already exists. Use --force to overwrite.");
       process.exit(1);
     }
     const spinner = ora6("Generating .envrc...").start();
     const filepath = await writeEnvrc(rootDir, secretsConfig);
     spinner.succeed("Generated .envrc");
     console.log();
-    console.log(`  ${logger7.dim("File:")} ${filepath}`);
+    console.log(`  ${logger8.dim("File:")} ${filepath}`);
     console.log();
     const itemCount = secretsConfig.items ? Object.keys(secretsConfig.items).length : 0;
-    logger7.info(`Generated .envrc with ${itemCount} secret${itemCount !== 1 ? "s" : ""}`);
-    logger7.info(`Run ${logger7.brand("direnv allow")} to activate`);
+    logger8.info(`Generated .envrc with ${itemCount} secret${itemCount !== 1 ? "s" : ""}`);
+    logger8.info(`Run ${logger8.brand("direnv allow")} to activate`);
     console.log();
   } catch (error) {
-    logger7.error(error instanceof Error ? error.message : String(error));
+    logger8.error(error instanceof Error ? error.message : String(error));
     process.exit(1);
   }
 });
@@ -2433,59 +2767,59 @@ secretsCommand.command("info").description("Show secrets provider information an
       return;
     }
     console.log();
-    console.log(`  ${logger7.brand("Secrets")} Provider Info`);
-    console.log(`  ${logger7.dim("\u2500".repeat(24))}`);
+    console.log(`  ${logger8.brand("Secrets")} Provider Info`);
+    console.log(`  ${logger8.dim("\u2500".repeat(24))}`);
     console.log();
-    console.log(`  ${logger7.dim("Provider:")}      ${info.name}`);
+    console.log(`  ${logger8.dim("Provider:")}      ${info.name}`);
     if (info.cliRequired) {
-      const cliIcon = cliInstalled ? logger7.brand("\u2713") : "\u2717";
+      const cliIcon = cliInstalled ? logger8.brand("\u2713") : "\u2717";
       console.log(
-        `  ${logger7.dim("CLI:")}          ${cliIcon} ${info.cliRequired} ${cliInstalled ? "" : logger7.dim("(not installed)")}`
+        `  ${logger8.dim("CLI:")}          ${cliIcon} ${info.cliRequired} ${cliInstalled ? "" : logger8.dim("(not installed)")}`
       );
       if (cliInstalled && provider === "1password" && opAuthStatus) {
-        const authIcon = authenticated ? logger7.brand("\u2713") : "\u2717";
+        const authIcon = authenticated ? logger8.brand("\u2713") : "\u2717";
         const methodLabel = opAuthStatus.method === "service-account" ? "Service Account" : opAuthStatus.method === "user" ? "User" : "Not authenticated";
         const accountLabel = opAuthStatus.accountInfo ? ` (${opAuthStatus.accountInfo})` : "";
-        console.log(`  ${logger7.dim("Auth:")}         ${authIcon} ${methodLabel}${accountLabel}`);
+        console.log(`  ${logger8.dim("Auth:")}         ${authIcon} ${methodLabel}${accountLabel}`);
         if (hasServiceToken) {
           console.log(
-            `  ${logger7.dim("Token:")}        ${logger7.brand("\u2713")} OP_SERVICE_ACCOUNT_TOKEN set`
+            `  ${logger8.dim("Token:")}        ${logger8.brand("\u2713")} OP_SERVICE_ACCOUNT_TOKEN set`
           );
         }
       } else if (cliInstalled) {
-        const authIcon = authenticated ? logger7.brand("\u2713") : "\u2717";
+        const authIcon = authenticated ? logger8.brand("\u2713") : "\u2717";
         console.log(
-          `  ${logger7.dim("Auth:")}         ${authIcon} ${authenticated ? "Authenticated" : "Not authenticated"}`
+          `  ${logger8.dim("Auth:")}         ${authIcon} ${authenticated ? "Authenticated" : "Not authenticated"}`
         );
       }
       if (info.installUrl && !cliInstalled) {
         console.log();
-        console.log(`  ${logger7.dim("Install:")}      ${info.installUrl}`);
+        console.log(`  ${logger8.dim("Install:")}      ${info.installUrl}`);
       }
       if (info.authCommand && cliInstalled && !authenticated) {
         console.log();
-        console.log(`  ${logger7.dim("Authenticate:")} ${info.authCommand}`);
+        console.log(`  ${logger8.dim("Authenticate:")} ${info.authCommand}`);
         if (provider === "1password") {
           console.log(
-            `  ${logger7.dim("Or set:")}       OP_SERVICE_ACCOUNT_TOKEN for non-interactive auth`
+            `  ${logger8.dim("Or set:")}       OP_SERVICE_ACCOUNT_TOKEN for non-interactive auth`
           );
         }
       }
     }
     console.log();
-    const envrcIcon = envrcExists ? logger7.brand("\u2713") : logger7.dim("\u25CB");
+    const envrcIcon = envrcExists ? logger8.brand("\u2713") : logger8.dim("\u25CB");
     console.log(
-      `  ${logger7.dim(".envrc:")}       ${envrcIcon} ${envrcExists ? "Exists" : "Not generated"}`
+      `  ${logger8.dim(".envrc:")}       ${envrcIcon} ${envrcExists ? "Exists" : "Not generated"}`
     );
-    console.log(`  ${logger7.dim("Secrets:")}      ${status.secretsCount} configured`);
+    console.log(`  ${logger8.dim("Secrets:")}      ${status.secretsCount} configured`);
     console.log();
     if (!envrcExists && status.secretsCount > 0) {
-      logger7.info(`Run ${logger7.brand("rapid secrets generate")} to create .envrc`);
+      logger8.info(`Run ${logger8.brand("rapid secrets generate")} to create .envrc`);
       console.log();
     }
   } catch (error) {
     spinner.fail("Failed to get provider info");
-    logger7.error(error instanceof Error ? error.message : String(error));
+    logger8.error(error instanceof Error ? error.message : String(error));
     process.exit(1);
   }
 });
@@ -2493,45 +2827,45 @@ secretsCommand.command("run").description("Run a command with secrets loaded int
   try {
     const loaded = await loadConfig6();
     if (!loaded) {
-      logger7.error("No rapid.json found");
+      logger8.error("No rapid.json found");
       process.exit(1);
     }
     const { config } = loaded;
     const secretsConfig = config.secrets;
     if (!secretsConfig || !secretsConfig.items) {
-      logger7.error("No secrets configured in rapid.json");
+      logger8.error("No secrets configured in rapid.json");
       process.exit(1);
     }
     const provider = secretsConfig.provider || "env";
     if (provider === "1password") {
       const hasOp = await hasOpCli3();
       if (!hasOp) {
-        logger7.error("1Password CLI (op) not found");
-        logger7.info("Install with: brew install 1password-cli");
+        logger8.error("1Password CLI (op) not found");
+        logger8.info("Install with: brew install 1password-cli");
         process.exit(1);
       }
       const authenticated = await isOpAuthenticated3();
       if (!authenticated) {
-        logger7.error("1Password not authenticated");
-        logger7.info("Run: eval $(op signin)");
+        logger8.error("1Password not authenticated");
+        logger8.info("Run: eval $(op signin)");
         process.exit(1);
       }
     }
     const secrets = await loadSecrets2(secretsConfig);
     const secretCount = Object.keys(secrets).length;
     if (secretCount === 0) {
-      logger7.warn("No secrets were loaded");
+      logger8.warn("No secrets were loaded");
     } else if (options.show) {
-      logger7.info(`Loaded ${secretCount} secret${secretCount !== 1 ? "s" : ""}:`);
+      logger8.info(`Loaded ${secretCount} secret${secretCount !== 1 ? "s" : ""}:`);
       for (const name of Object.keys(secrets)) {
-        console.log(`  ${logger7.brand("\u2022")} ${name}`);
+        console.log(`  ${logger8.brand("\u2022")} ${name}`);
       }
       console.log();
     }
     const { execa: execa4 } = await import("execa");
     const [cmd, ...args] = commandArgs;
     if (!cmd) {
-      logger7.error("No command specified");
+      logger8.error("No command specified");
       process.exit(1);
     }
     await execa4(cmd, args, {
@@ -2545,7 +2879,7 @@ secretsCommand.command("run").description("Run a command with secrets loaded int
     if (error.exitCode !== void 0) {
       process.exit(error.exitCode);
     }
-    logger7.error(error instanceof Error ? error.message : String(error));
+    logger8.error(error instanceof Error ? error.message : String(error));
     process.exit(1);
   }
 });
@@ -2553,7 +2887,7 @@ secretsCommand.command("run").description("Run a command with secrets loaded int
 // src/commands/auth.ts
 import { Command as Command8 } from "commander";
 import {
-  logger as logger8,
+  logger as logger9,
   getAuthStatus as getAuthStatus2,
   detectAllCredentials
 } from "@a3t/rapid-core";
@@ -2597,24 +2931,24 @@ var authCommand = new Command8("auth").description("Show authentication status f
       return;
     }
     console.log();
-    console.log(`  ${logger8.brand("RAPID")} Authentication`);
-    console.log(`  ${logger8.dim("\u2500".repeat(24))}`);
+    console.log(`  ${logger9.brand("RAPID")} Authentication`);
+    console.log(`  ${logger9.dim("\u2500".repeat(24))}`);
     console.log();
     if (!status.authenticated) {
-      console.log(`  ${logger8.dim("No authentication detected")}`);
+      console.log(`  ${logger9.dim("No authentication detected")}`);
       console.log();
       console.log("  To authenticate, use one of these methods:");
       console.log();
-      console.log(`    ${logger8.brand("Claude Pro/Max:")}`);
+      console.log(`    ${logger9.brand("Claude Pro/Max:")}`);
       console.log("      Run `claude` and sign in with your Anthropic account");
       console.log();
-      console.log(`    ${logger8.brand("OpenAI (ChatGPT Plus/Pro):")}`);
+      console.log(`    ${logger9.brand("OpenAI (ChatGPT Plus/Pro):")}`);
       console.log("      Run `codex` and sign in with ChatGPT");
       console.log();
-      console.log(`    ${logger8.brand("Gemini:")}`);
+      console.log(`    ${logger9.brand("Gemini:")}`);
       console.log("      Run `gemini` and sign in with your Google account");
       console.log();
-      console.log(`    ${logger8.brand("API Keys:")}`);
+      console.log(`    ${logger9.brand("API Keys:")}`);
       console.log("      Set ANTHROPIC_API_KEY, OPENAI_API_KEY, or GEMINI_API_KEY");
       console.log();
       return;
@@ -2623,9 +2957,9 @@ var authCommand = new Command8("auth").description("Show authentication status f
       if (options.source && cred.source !== options.source) continue;
       if (options.provider && cred.provider !== options.provider) continue;
       const isPrimary = cred === status.preferredSource;
-      const icon = isPrimary ? logger8.brand("\u25CF") : logger8.dim("\u25CB");
-      const authIcon = cred.authType === "oauth" ? logger8.brand("OAuth") : logger8.dim("API Key");
-      console.log(`  ${icon} ${logger8.bold(cred.source)}`);
+      const icon = isPrimary ? logger9.brand("\u25CF") : logger9.dim("\u25CB");
+      const authIcon = cred.authType === "oauth" ? logger9.brand("OAuth") : logger9.dim("API Key");
+      console.log(`  ${icon} ${logger9.bold(cred.source)}`);
       console.log(`    Provider: ${cred.provider}`);
       console.log(`    Auth: ${authIcon}`);
       if (cred.accountInfo?.email) {
@@ -2635,7 +2969,7 @@ var authCommand = new Command8("auth").description("Show authentication status f
         console.log(`    Org: ${cred.accountInfo.organization}`);
       }
       if (cred.accountInfo?.plan) {
-        console.log(`    Plan: ${logger8.brand(cred.accountInfo.plan)}`);
+        console.log(`    Plan: ${logger9.brand(cred.accountInfo.plan)}`);
       }
       if (cred.expiresAt) {
         const now = /* @__PURE__ */ new Date();
@@ -2643,32 +2977,32 @@ var authCommand = new Command8("auth").description("Show authentication status f
         if (expiresIn > 0) {
           console.log(`    Expires: in ${expiresIn} minutes`);
         } else {
-          console.log(`    Expires: ${logger8.dim("EXPIRED")}`);
+          console.log(`    Expires: ${logger9.dim("EXPIRED")}`);
         }
       }
       if (cred.configPath) {
-        console.log(`    Config: ${logger8.dim(cred.configPath)}`);
+        console.log(`    Config: ${logger9.dim(cred.configPath)}`);
       }
       if (cred.envVar) {
-        console.log(`    Env: ${logger8.dim(cred.envVar)}`);
+        console.log(`    Env: ${logger9.dim(cred.envVar)}`);
       }
       if (isPrimary) {
-        console.log(`    ${logger8.brand("\u2192 Primary source")}`);
+        console.log(`    ${logger9.brand("\u2192 Primary source")}`);
       }
       console.log();
     }
     if (status.warnings && status.warnings.length > 0) {
-      console.log(`  ${logger8.dim("Warnings:")}`);
+      console.log(`  ${logger9.dim("Warnings:")}`);
       for (const warning of status.warnings) {
         console.log(`    ! ${warning}`);
       }
       console.log();
     }
-    console.log(`  ${logger8.dim("Tip:")} RAPID will automatically use detected`);
-    console.log(`  ${logger8.dim("     ")} credentials when launching AI agents.`);
+    console.log(`  ${logger9.dim("Tip:")} RAPID will automatically use detected`);
+    console.log(`  ${logger9.dim("     ")} credentials when launching AI agents.`);
     console.log();
   } catch (error) {
-    logger8.error(error instanceof Error ? error.message : String(error));
+    logger9.error(error instanceof Error ? error.message : String(error));
     process.exit(1);
   }
 });
@@ -2714,34 +3048,34 @@ authCommand.command("env").description("Show environment variables for detected
       return;
     }
     console.log();
-    console.log(`  ${logger8.brand("RAPID")} Auth Environment`);
-    console.log(`  ${logger8.dim("\u2500".repeat(24))}`);
+    console.log(`  ${logger9.brand("RAPID")} Auth Environment`);
+    console.log(`  ${logger9.dim("\u2500".repeat(24))}`);
     console.log();
     if (byProvider.size === 0) {
-      console.log(`  ${logger8.dim("No credentials detected")}`);
+      console.log(`  ${logger9.dim("No credentials detected")}`);
       console.log();
       return;
     }
     for (const [provider, { envVar, masked }] of byProvider) {
-      console.log(`  ${logger8.brand(provider)}`);
+      console.log(`  ${logger9.brand(provider)}`);
       console.log(`    ${envVar}=${masked}`);
       console.log();
     }
-    console.log(`  ${logger8.dim("These will be automatically injected when running agents.")}`);
+    console.log(`  ${logger9.dim("These will be automatically injected when running agents.")}`);
     console.log();
   } catch (error) {
-    logger8.error(error instanceof Error ? error.message : String(error));
+    logger9.error(error instanceof Error ? error.message : String(error));
     process.exit(1);
   }
 });
 
 // src/commands/mcp.ts
 import { Command as Command9 } from "commander";
-import { writeFile as writeFile5 } from "fs/promises";
-import { join as join5 } from "path";
+import { writeFile as writeFile6 } from "fs/promises";
+import { join as join6 } from "path";
 import {
   loadConfig as loadConfig7,
-  logger as logger9,
+  logger as logger10,
   getMcpServers,
   getMcpServerStatus,
   addMcpServerFromTemplate as addMcpServerFromTemplate2,
@@ -2752,15 +3086,16 @@ import {
   writeMcpConfig as writeMcpConfig2,
   writeOpenCodeConfig as writeOpenCodeConfig2,
   MCP_SERVER_TEMPLATES as MCP_SERVER_TEMPLATES2,
-  getMcpTemplate
+  getMcpTemplate,
+  formatJson as formatJson5
 } from "@a3t/rapid-core";
 import ora8 from "ora";
 var mcpCommand = new Command9("mcp").description(
   "Manage MCP (Model Context Protocol) servers"
 );
 async function saveConfig(rootDir, config) {
-  const configPath = join5(rootDir, "rapid.json");
-  await writeFile5(configPath, JSON.stringify(config, null, 2) + "\n", "utf-8");
+  const configPath = join6(rootDir, "rapid.json");
+  await writeFile6(configPath, await formatJson5(config), "utf-8");
 }
 mcpCommand.command("list").description("List configured MCP servers").option("--json", "Output as JSON").option("--templates", "Show available templates instead of configured servers").action(async (options) => {
   try {
@@ -2770,23 +3105,23 @@ mcpCommand.command("list").description("List configured MCP servers").option("--
         return;
       }
       console.log();
-      console.log(`  ${logger9.brand("Available MCP Server Templates")}`);
-      console.log(`  ${logger9.dim("\u2500".repeat(40))}`);
+      console.log(`  ${logger10.brand("Available MCP Server Templates")}`);
+      console.log(`  ${logger10.dim("\u2500".repeat(40))}`);
       console.log();
       for (const [name, template] of Object.entries(MCP_SERVER_TEMPLATES2)) {
-        const typeLabel = template.type === "remote" ? logger9.dim("(remote)") : logger9.dim("(stdio)");
-        const secretsLabel = template.requiredSecrets.length > 0 ? logger9.dim(` - requires: ${template.requiredSecrets.join(", ")}`) : logger9.dim(" - no secrets required");
-        console.log(`  ${logger9.brand("\u2022")} ${name} ${typeLabel}`);
+        const typeLabel = template.type === "remote" ? logger10.dim("(remote)") : logger10.dim("(stdio)");
+        const secretsLabel = template.requiredSecrets.length > 0 ? logger10.dim(` - requires: ${template.requiredSecrets.join(", ")}`) : logger10.dim(" - no secrets required");
+        console.log(`  ${logger10.brand("\u2022")} ${name} ${typeLabel}`);
         console.log(`    ${template.description}${secretsLabel}`);
         console.log();
       }
-      logger9.info(`Use ${logger9.brand("rapid mcp add <name>")} to add a server`);
+      logger10.info(`Use ${logger10.brand("rapid mcp add <name>")} to add a server`);
       console.log();
       return;
     }
     const loaded = await loadConfig7();
     if (!loaded) {
-      logger9.error("No rapid.json found. Run `rapid init` first.");
+      logger10.error("No rapid.json found. Run `rapid init` first.");
       process.exit(1);
     }
     const { config } = loaded;
@@ -2796,22 +3131,22 @@ mcpCommand.command("list").description("List configured MCP servers").option("--
       return;
     }
     console.log();
-    console.log(`  ${logger9.brand("MCP Servers")}`);
-    console.log(`  ${logger9.dim("\u2500".repeat(40))}`);
+    console.log(`  ${logger10.brand("MCP Servers")}`);
+    console.log(`  ${logger10.dim("\u2500".repeat(40))}`);
     console.log();
     if (servers.length === 0) {
-      console.log(`  ${logger9.dim("No MCP servers configured")}`);
+      console.log(`  ${logger10.dim("No MCP servers configured")}`);
       console.log();
-      logger9.info(`Use ${logger9.brand("rapid mcp add <name>")} to add a server`);
-      logger9.info(`Use ${logger9.brand("rapid mcp list --templates")} to see available templates`);
+      logger10.info(`Use ${logger10.brand("rapid mcp add <name>")} to add a server`);
+      logger10.info(`Use ${logger10.brand("rapid mcp list --templates")} to see available templates`);
       console.log();
       return;
     }
     for (const server of servers) {
-      const icon = server.enabled ? logger9.brand("\u2713") : logger9.dim("\u25CB");
-      const typeLabel = server.type === "remote" ? logger9.dim("(remote)") : logger9.dim("(stdio)");
-      const statusLabel = server.enabled ? "" : logger9.dim(" [disabled]");
-      const location = server.type === "remote" ? logger9.dim(server.url || "") : logger9.dim(server.command || "");
+      const icon = server.enabled ? logger10.brand("\u2713") : logger10.dim("\u25CB");
+      const typeLabel = server.type === "remote" ? logger10.dim("(remote)") : logger10.dim("(stdio)");
+      const statusLabel = server.enabled ? "" : logger10.dim(" [disabled]");
+      const location = server.type === "remote" ? logger10.dim(server.url || "") : logger10.dim(server.command || "");
       console.log(`  ${icon} ${server.name} ${typeLabel}${statusLabel}`);
       if (location) {
         console.log(`    ${location}`);
@@ -2819,7 +3154,7 @@ mcpCommand.command("list").description("List configured MCP servers").option("--
       console.log();
     }
   } catch (error) {
-    logger9.error(error instanceof Error ? error.message : String(error));
+    logger10.error(error instanceof Error ? error.message : String(error));
     process.exit(1);
   }
 });
@@ -2836,7 +3171,7 @@ mcpCommand.command("add").description("Add an MCP server").argument("<name>", "S
     const existingServers = getMcpServers(config);
     if (existingServers.some((s) => s.name === name)) {
       spinner.fail(`MCP server '${name}' already exists`);
-      logger9.info(`Use ${logger9.brand(`rapid mcp remove ${name}`)} to remove it first`);
+      logger10.info(`Use ${logger10.brand(`rapid mcp remove ${name}`)} to remove it first`);
       process.exit(1);
     }
     const template = getMcpTemplate(name);
@@ -2869,8 +3204,8 @@ mcpCommand.command("add").description("Add an MCP server").argument("<name>", "S
       config = addMcpServerFromTemplate2(config, name);
     } else {
       spinner.fail(`Unknown MCP server template: ${name}`);
-      logger9.info(`Use ${logger9.brand("rapid mcp list --templates")} to see available templates`);
-      logger9.info("Or specify --type, --url, or --command for a custom server");
+      logger10.info(`Use ${logger10.brand("rapid mcp list --templates")} to see available templates`);
+      logger10.info("Or specify --type, --url, or --command for a custom server");
       process.exit(1);
     }
     await saveConfig(rootDir, config);
@@ -2879,18 +3214,18 @@ mcpCommand.command("add").description("Add an MCP server").argument("<name>", "S
     spinner.succeed(`Added MCP server '${name}'`);
     console.log();
     if (template?.requiredSecrets.length) {
-      logger9.info("Required secrets:");
+      logger10.info("Required secrets:");
       for (const secret of template.requiredSecrets) {
         const ref = template.secretReferences?.[secret];
-        console.log(`  ${logger9.brand("\u2022")} ${secret}${ref ? logger9.dim(` (${ref})`) : ""}`);
+        console.log(`  ${logger10.brand("\u2022")} ${secret}${ref ? logger10.dim(` (${ref})`) : ""}`);
       }
       console.log();
-      logger9.info(`Add these to ${logger9.brand("rapid.json")} secrets.items section`);
+      logger10.info(`Add these to ${logger10.brand("rapid.json")} secrets.items section`);
       console.log();
     }
   } catch (error) {
     spinner.fail("Failed to add MCP server");
-    logger9.error(error instanceof Error ? error.message : String(error));
+    logger10.error(error instanceof Error ? error.message : String(error));
     process.exit(1);
   }
 });
@@ -2912,7 +3247,7 @@ mcpCommand.command("remove").description("Remove an MCP server").argument("<name
     console.log();
   } catch (error) {
     spinner.fail("Failed to remove MCP server");
-    logger9.error(error instanceof Error ? error.message : String(error));
+    logger10.error(error instanceof Error ? error.message : String(error));
     process.exit(1);
   }
 });
@@ -2934,7 +3269,7 @@ mcpCommand.command("enable").description("Enable a disabled MCP server").argumen
     console.log();
   } catch (error) {
     spinner.fail("Failed to enable MCP server");
-    logger9.error(error instanceof Error ? error.message : String(error));
+    logger10.error(error instanceof Error ? error.message : String(error));
     process.exit(1);
   }
 });
@@ -2956,7 +3291,7 @@ mcpCommand.command("disable").description("Disable an MCP server (without removi
     console.log();
   } catch (error) {
     spinner.fail("Failed to disable MCP server");
-    logger9.error(error instanceof Error ? error.message : String(error));
+    logger10.error(error instanceof Error ? error.message : String(error));
     process.exit(1);
   }
 });
@@ -2964,7 +3299,7 @@ mcpCommand.command("status").description("Show MCP server status").option("--jso
   try {
     const loaded = await loadConfig7();
     if (!loaded) {
-      logger9.error("No rapid.json found. Run `rapid init` first.");
+      logger10.error("No rapid.json found. Run `rapid init` first.");
       process.exit(1);
     }
     const { config } = loaded;
@@ -2974,11 +3309,11 @@ mcpCommand.command("status").description("Show MCP server status").option("--jso
       return;
     }
     console.log();
-    console.log(`  ${logger9.brand("MCP Server Status")}`);
-    console.log(`  ${logger9.dim("\u2500".repeat(40))}`);
+    console.log(`  ${logger10.brand("MCP Server Status")}`);
+    console.log(`  ${logger10.dim("\u2500".repeat(40))}`);
     console.log();
     if (servers.length === 0) {
-      console.log(`  ${logger9.dim("No MCP servers configured")}`);
+      console.log(`  ${logger10.dim("No MCP servers configured")}`);
       console.log();
       return;
     }
@@ -2990,24 +3325,24 @@ mcpCommand.command("status").description("Show MCP server status").option("--jso
       } else {
         disabledCount++;
       }
-      const icon = server.status === "enabled" ? logger9.brand("\u2713") : server.status === "disabled" ? logger9.dim("\u25CB") : "\u2717";
-      const statusLabel = server.status === "enabled" ? "enabled" : server.status === "disabled" ? logger9.dim("disabled") : logger9.dim(`error: ${server.error}`);
+      const icon = server.status === "enabled" ? logger10.brand("\u2713") : server.status === "disabled" ? logger10.dim("\u25CB") : "\u2717";
+      const statusLabel = server.status === "enabled" ? "enabled" : server.status === "disabled" ? logger10.dim("disabled") : logger10.dim(`error: ${server.error}`);
       const typeLabel = server.type === "remote" ? "remote" : "stdio";
       console.log(`  ${icon} ${server.name}`);
-      console.log(`    ${logger9.dim("Type:")}   ${typeLabel}`);
-      console.log(`    ${logger9.dim("Status:")} ${statusLabel}`);
+      console.log(`    ${logger10.dim("Type:")}   ${typeLabel}`);
+      console.log(`    ${logger10.dim("Status:")} ${statusLabel}`);
       if (server.url) {
-        console.log(`    ${logger9.dim("URL:")}    ${server.url}`);
+        console.log(`    ${logger10.dim("URL:")}    ${server.url}`);
       }
       if (server.command) {
-        console.log(`    ${logger9.dim("Cmd:")}    ${server.command}`);
+        console.log(`    ${logger10.dim("Cmd:")}    ${server.command}`);
       }
       console.log();
     }
-    console.log(`  ${logger9.dim("Summary:")} ${enabledCount} enabled, ${disabledCount} disabled`);
+    console.log(`  ${logger10.dim("Summary:")} ${enabledCount} enabled, ${disabledCount} disabled`);
     console.log();
   } catch (error) {
-    logger9.error(error instanceof Error ? error.message : String(error));
+    logger10.error(error instanceof Error ? error.message : String(error));
     process.exit(1);
   }
 });
@@ -3026,15 +3361,15 @@ mcpCommand.command("sync").description("Regenerate .mcp.json and opencode.json f
     const enabledCount = servers.filter((s) => s.enabled).length;
     spinner.succeed("MCP configuration synced");
     console.log();
-    console.log(`  ${logger9.dim("Files updated:")}`);
-    console.log(`    ${logger9.brand("\u2022")} .mcp.json`);
-    console.log(`    ${logger9.brand("\u2022")} opencode.json`);
+    console.log(`  ${logger10.dim("Files updated:")}`);
+    console.log(`    ${logger10.brand("\u2022")} .mcp.json`);
+    console.log(`    ${logger10.brand("\u2022")} opencode.json`);
     console.log();
-    console.log(`  ${logger9.dim("Servers:")} ${enabledCount} enabled`);
+    console.log(`  ${logger10.dim("Servers:")} ${enabledCount} enabled`);
     console.log();
   } catch (error) {
     spinner.fail("Failed to sync MCP configuration");
-    logger9.error(error instanceof Error ? error.message : String(error));
+    logger10.error(error instanceof Error ? error.message : String(error));
     process.exit(1);
   }
 });
@@ -3046,25 +3381,143 @@ function collectHeaders(value, previous) {
   return previous;
 }
 
-// src/commands/update.ts
+// src/commands/context.ts
 import { Command as Command10 } from "commander";
+import { loadConfig as loadConfig8, assembleContext as assembleContext2, logger as logger11 } from "@a3t/rapid-core";
+import ora9 from "ora";
+var contextCommand = new Command10("context").description("Show or inject project context from rapid.json").argument("[action]", "Action: show (default) or inject", "show").option("--json", "Output as JSON").action(async (action, options) => {
+  try {
+    const spinner = ora9("Loading configuration...").start();
+    const loaded = await loadConfig8();
+    if (!loaded) {
+      spinner.fail("No rapid.json found. Run `rapid init` first.");
+      process.exit(1);
+    }
+    const { config, rootDir } = loaded;
+    spinner.stop();
+    if (!config.context?.files?.length && !config.context?.dirs?.length) {
+      if (action === "inject") {
+        return;
+      }
+      logger11.info("No context files or directories configured.");
+      logger11.blank();
+      logger11.dim("Add files or directories to rapid.json:");
+      logger11.dim('  "context": {');
+      logger11.dim('    "files": ["README.md", "docs/architecture.md"],');
+      logger11.dim('    "dirs": ["docs/"]');
+      logger11.dim("  }");
+      return;
+    }
+    const assembled = await assembleContext2(rootDir, config.context);
+    if (action === "inject") {
+      if (assembled.content) {
+        console.log(assembled.content);
+      }
+      return;
+    }
+    if (options.json) {
+      console.log(
+        JSON.stringify(
+          {
+            files: assembled.files.map((f) => ({
+              path: f.relativePath,
+              size: f.size,
+              truncated: f.truncated
+            })),
+            totalSize: assembled.totalSize,
+            skippedFiles: assembled.skippedFiles.map((f) => ({
+              path: f.path,
+              reason: f.reason
+            }))
+          },
+          null,
+          2
+        )
+      );
+      return;
+    }
+    logger11.header("Context Configuration");
+    logger11.blank();
+    if (config.context.files?.length) {
+      logger11.info("Configured files:");
+      for (const file of config.context.files) {
+        console.log(`  ${logger11.dim("\u2022")} ${file}`);
+      }
+      logger11.blank();
+    }
+    if (config.context.dirs?.length) {
+      logger11.info("Configured directories:");
+      for (const dir of config.context.dirs) {
+        console.log(`  ${logger11.dim("\u2022")} ${dir}`);
+      }
+      logger11.blank();
+    }
+    if (config.context.exclude?.length) {
+      logger11.info("Exclude patterns:");
+      for (const pattern of config.context.exclude) {
+        console.log(`  ${logger11.dim("\u2022")} ${pattern}`);
+      }
+      logger11.blank();
+    }
+    logger11.info(`Assembled ${assembled.files.length} file(s):`);
+    for (const file of assembled.files) {
+      const sizeKb = (file.size / 1024).toFixed(1);
+      console.log(`  ${logger11.brand("\u2022")} ${file.relativePath} ${logger11.dim(`(${sizeKb}KB)`)}`);
+    }
+    const totalKb = (assembled.totalSize / 1024).toFixed(1);
+    logger11.blank();
+    logger11.dim(`Total size: ${totalKb}KB`);
+    if (assembled.skippedFiles.length > 0) {
+      logger11.blank();
+      logger11.info(`Skipped ${assembled.skippedFiles.length} file(s):`);
+      for (const skipped of assembled.skippedFiles) {
+        const reasonText = getSkipReasonText(skipped.reason);
+        console.log(`  ${logger11.dim("\u2022")} ${skipped.path} ${logger11.dim(`(${reasonText})`)}`);
+      }
+    }
+  } catch (error) {
+    logger11.error(error instanceof Error ? error.message : String(error));
+    process.exit(1);
+  }
+});
+function getSkipReasonText(reason) {
+  switch (reason) {
+    case "missing":
+      return "file not found";
+    case "binary":
+      return "binary file";
+    case "too-large":
+      return "exceeds size limit";
+    case "excluded":
+      return "excluded by pattern";
+    case "directory":
+      return "is a directory";
+    case "error":
+      return "read error";
+    default:
+      return reason;
+  }
+}
+
+// src/commands/update.ts
+import { Command as Command11 } from "commander";
 
 // src/utils/update-checker.ts
 import updateNotifier from "update-notifier";
 import semver from "semver";
 import { execa as execa3 } from "execa";
-import { logger as logger10 } from "@a3t/rapid-core";
+import { logger as logger12 } from "@a3t/rapid-core";
 import chalk from "chalk";
 import { readFileSync, existsSync as existsSync2 } from "fs";
 import { fileURLToPath as fileURLToPath2 } from "url";
-import { dirname as dirname3, join as join6 } from "path";
+import { dirname as dirname3, join as join7 } from "path";
 import prompts from "prompts";
 var __dirname = dirname3(fileURLToPath2(import.meta.url));
 function loadPackageJson() {
   const paths = [
-    join6(__dirname, "../package.json"),
+    join7(__dirname, "../package.json"),
     // bundled: dist/ -> package root
-    join6(__dirname, "../../package.json")
+    join7(__dirname, "../../package.json")
     // source: src/utils/ -> package root
   ];
   for (const p of paths) {
@@ -3120,9 +3573,9 @@ var UpdateChecker = class {
     if (!this.notifier.update) return;
     const { current, latest } = this.notifier.update;
     const updateType = this.getUpdateType(current, latest);
-    logger10.info(`Update available: ${logger10.dim(current)} \u2192 ${chalk.green(latest)}`);
+    logger12.info(`Update available: ${logger12.dim(current)} \u2192 ${chalk.green(latest)}`);
     if (updateType === "major") {
-      logger10.warn("This is a major version update with breaking changes.");
+      logger12.warn("This is a major version update with breaking changes.");
     }
   }
   /**
@@ -3130,20 +3583,20 @@ var UpdateChecker = class {
    */
   async verifySignatures() {
     try {
-      logger10.info("Verifying package signatures...");
+      logger12.info("Verifying package signatures...");
       const result = await execa3("npm", ["audit", "signatures"], {
         reject: false
       });
       if (result.exitCode === 0) {
-        logger10.success("Package signatures verified successfully");
+        logger12.success("Package signatures verified successfully");
         return true;
       } else {
-        logger10.warn("Package signature verification returned warnings");
-        logger10.debug(result.stdout || result.stderr);
+        logger12.warn("Package signature verification returned warnings");
+        logger12.debug(result.stdout || result.stderr);
         return true;
       }
     } catch {
-      logger10.debug("Signature verification not available (requires npm >= 9)");
+      logger12.debug("Signature verification not available (requires npm >= 9)");
       return true;
     }
   }
@@ -3152,16 +3605,16 @@ var UpdateChecker = class {
    */
   async performUpdate() {
     try {
-      logger10.info("Updating RAPID CLI...");
+      logger12.info("Updating RAPID CLI...");
       await execa3("npm", ["install", "-g", `${this.packageName}@latest`], {
         stdio: "inherit"
       });
       await this.verifySignatures();
-      logger10.success("RAPID CLI updated successfully!");
-      logger10.info("Package published with npm provenance - cryptographically verified");
+      logger12.success("RAPID CLI updated successfully!");
+      logger12.info("Package published with npm provenance - cryptographically verified");
       return true;
     } catch (error) {
-      logger10.error("Failed to update RAPID CLI:", error);
+      logger12.error("Failed to update RAPID CLI:", error);
       return false;
     }
   }
@@ -3174,7 +3627,7 @@ var UpdateChecker = class {
     if (!updateInfo) return;
     this.showNotification();
     if (updateInfo.type === "major") {
-      logger10.warn(
+      logger12.warn(
         `This is a major version update (${updateInfo.current} \u2192 ${updateInfo.latest}) that may contain breaking changes.`
       );
       try {
@@ -3185,20 +3638,20 @@ var UpdateChecker = class {
           initial: false
         });
         if (response.shouldUpdate) {
-          logger10.info(`Updating to ${updateInfo.latest} (major version)...`);
+          logger12.info(`Updating to ${updateInfo.latest} (major version)...`);
           await this.performUpdate();
         } else {
-          logger10.info("Skipping major version update.");
-          logger10.info('You can update later with "rapid update --force"');
+          logger12.info("Skipping major version update.");
+          logger12.info('You can update later with "rapid update --force"');
         }
       } catch {
-        logger10.info(
+        logger12.info(
           'Run "rapid update" to update manually, or use "rapid update --force" to update automatically.'
         );
       }
       return;
     }
-    logger10.info(`Auto-updating to ${updateInfo.latest} (${updateInfo.type} version)...`);
+    logger12.info(`Auto-updating to ${updateInfo.latest} (${updateInfo.type} version)...`);
     await this.performUpdate();
   }
   /**
@@ -3206,7 +3659,7 @@ var UpdateChecker = class {
    */
   async forceUpdate() {
     if (!this.hasUpdate()) {
-      logger10.info("No updates available.");
+      logger12.info("No updates available.");
       return;
     }
     const updateInfo = this.getUpdateInfo();
@@ -3219,68 +3672,68 @@ var UpdateChecker = class {
 var updateChecker = new UpdateChecker();
 
 // src/commands/update.ts
-import { logger as logger11 } from "@a3t/rapid-core";
-var updateCommand = new Command10("update").description("Check for and apply updates").option("--check", "Check for updates only").option("--force", "Force update even for major versions").action(async (options) => {
+import { logger as logger13 } from "@a3t/rapid-core";
+var updateCommand = new Command11("update").description("Check for and apply updates").option("--check", "Check for updates only").option("--force", "Force update even for major versions").action(async (options) => {
   try {
     if (options.check) {
-      logger11.header("Checking for updates...");
+      logger13.header("Checking for updates...");
       if (!updateChecker.hasUpdate()) {
-        logger11.success("You are using the latest version!");
+        logger13.success("You are using the latest version!");
         return;
       }
       const updateInfo2 = updateChecker.getUpdateInfo();
       if (updateInfo2) {
         updateChecker.showNotification();
         if (updateInfo2.type === "major") {
-          logger11.warn("This is a major version update with breaking changes.");
-          logger11.info('Use "rapid update --force" to update.');
+          logger13.warn("This is a major version update with breaking changes.");
+          logger13.info('Use "rapid update --force" to update.');
         } else {
-          logger11.info('Use "rapid update" to apply the update.');
+          logger13.info('Use "rapid update" to apply the update.');
         }
       }
       return;
     }
     if (!updateChecker.hasUpdate()) {
-      logger11.success("You are already using the latest version!");
+      logger13.success("You are already using the latest version!");
       return;
     }
     const updateInfo = updateChecker.getUpdateInfo();
     if (updateInfo && updateInfo.type === "major" && !options.force) {
-      logger11.warn("This is a major version update with breaking changes.");
-      logger11.info("Use --force to update anyway.");
+      logger13.warn("This is a major version update with breaking changes.");
+      logger13.info("Use --force to update anyway.");
       return;
     }
     await updateChecker.forceUpdate();
   } catch (error) {
-    logger11.error("Update failed:", error);
+    logger13.error("Update failed:", error);
     process.exit(1);
   }
 });
 
 // src/commands/worktree.ts
-import { Command as Command11 } from "commander";
-import { logger as logger12 } from "@a3t/rapid-core";
-import ora9 from "ora";
+import { Command as Command12 } from "commander";
+import { logger as logger14 } from "@a3t/rapid-core";
+import ora10 from "ora";
 function formatWorktree(wt, currentPath) {
   const isCurrent = wt.path === currentPath;
-  const marker = isCurrent ? logger12.brand("*") : " ";
+  const marker = isCurrent ? logger14.brand("*") : " ";
   const status = [];
   if (wt.isMain) status.push("main");
   if (wt.locked) status.push("locked");
   if (wt.prunable) status.push("prunable");
   if (!wt.exists) status.push("missing");
-  const statusStr = status.length > 0 ? logger12.dim(` (${status.join(", ")})`) : "";
-  const branchStr = wt.branch ? logger12.brand(wt.branch) : logger12.dim("detached");
+  const statusStr = status.length > 0 ? logger14.dim(` (${status.join(", ")})`) : "";
+  const branchStr = wt.branch ? logger14.brand(wt.branch) : logger14.dim("detached");
   const headShort = wt.head?.substring(0, 7) ?? "";
   return `${marker} ${branchStr}${statusStr}
-    ${logger12.dim(wt.path)}
-    ${logger12.dim(`HEAD: ${headShort}`)}`;
+    ${logger14.dim(wt.path)}
+    ${logger14.dim(`HEAD: ${headShort}`)}`;
 }
-var listCommand = new Command11("list").alias("ls").description("List all git worktrees").option("--json", "Output as JSON").action(async (options) => {
+var listCommand = new Command12("list").alias("ls").description("List all git worktrees").option("--json", "Output as JSON").action(async (options) => {
   try {
     const cwd = process.cwd();
     if (!await isGitRepo(cwd)) {
-      logger12.error("Not a git repository");
+      logger14.error("Not a git repository");
       process.exit(1);
     }
     const gitRoot = await getGitRoot(cwd);
@@ -3290,10 +3743,10 @@ var listCommand = new Command11("list").alias("ls").description("List all git wo
       return;
     }
     if (worktrees.length === 0) {
-      logger12.info("No worktrees found");
+      logger14.info("No worktrees found");
       return;
     }
-    logger12.header("Git Worktrees");
+    logger14.header("Git Worktrees");
     console.log();
     for (const wt of worktrees) {
       console.log(formatWorktree(wt, gitRoot));
@@ -3301,15 +3754,15 @@ var listCommand = new Command11("list").alias("ls").description("List all git wo
     }
     const prunable = worktrees.filter((wt) => wt.prunable);
     if (prunable.length > 0) {
-      logger12.warn(`${prunable.length} worktree(s) can be pruned. Run: rapid worktree prune`);
+      logger14.warn(`${prunable.length} worktree(s) can be pruned. Run: rapid worktree prune`);
     }
   } catch (error) {
-    logger12.error(error instanceof Error ? error.message : String(error));
+    logger14.error(error instanceof Error ? error.message : String(error));
     process.exit(1);
   }
 });
-var pruneCommand = new Command11("prune").description("Remove stale worktree references").option("--dry-run", "Show what would be pruned without removing").action(async (options) => {
-  const spinner = ora9("Checking worktrees...").start();
+var pruneCommand = new Command12("prune").description("Remove stale worktree references").option("--dry-run", "Show what would be pruned without removing").action(async (options) => {
+  const spinner = ora10("Checking worktrees...").start();
   try {
     const cwd = process.cwd();
     if (!await isGitRepo(cwd)) {
@@ -3326,7 +3779,7 @@ var pruneCommand = new Command11("prune").description("Remove stale worktree ref
     if (options.dryRun) {
       spinner.info(`Would prune ${prunable.length} worktree(s):`);
       for (const wt of prunable) {
-        console.log(`  ${logger12.dim("\u2022")} ${wt.path}`);
+        console.log(`  ${logger14.dim("\u2022")} ${wt.path}`);
       }
       return;
     }
@@ -3335,7 +3788,7 @@ var pruneCommand = new Command11("prune").description("Remove stale worktree ref
     if (result.success) {
       spinner.succeed(`Pruned ${result.pruned.length} worktree(s)`);
       for (const path of result.pruned) {
-        console.log(`  ${logger12.dim("\u2022")} ${path}`);
+        console.log(`  ${logger14.dim("\u2022")} ${path}`);
       }
     } else {
       spinner.fail(`Failed to prune: ${result.error}`);
@@ -3346,8 +3799,8 @@ var pruneCommand = new Command11("prune").description("Remove stale worktree ref
     process.exit(1);
   }
 });
-var removeCommand = new Command11("remove").alias("rm").description("Remove a worktree").argument("<path-or-branch>", "Worktree path or branch name").option("-f, --force", "Force removal even if worktree is dirty").action(async (pathOrBranch, options) => {
-  const spinner = ora9("Finding worktree...").start();
+var removeCommand = new Command12("remove").alias("rm").description("Remove a worktree").argument("<path-or-branch>", "Worktree path or branch name").option("-f, --force", "Force removal even if worktree is dirty").action(async (pathOrBranch, options) => {
+  const spinner = ora10("Finding worktree...").start();
   try {
     const cwd = process.cwd();
     if (!await isGitRepo(cwd)) {
@@ -3361,7 +3814,7 @@ var removeCommand = new Command11("remove").alias("rm").description("Remove a wo
     );
     if (!worktree) {
       spinner.fail(`Worktree not found: ${pathOrBranch}`);
-      logger12.info("Available worktrees:");
+      logger14.info("Available worktrees:");
       for (const wt of worktrees) {
         console.log(`  ${wt.branch || wt.path}`);
       }
@@ -3388,8 +3841,8 @@ var removeCommand = new Command11("remove").alias("rm").description("Remove a wo
     process.exit(1);
   }
 });
-var cleanupCommand = new Command11("cleanup").description("Remove worktrees for branches that have been merged").option("--dry-run", "Show what would be removed without removing").action(async (options) => {
-  const spinner = ora9("Analyzing worktrees...").start();
+var cleanupCommand = new Command12("cleanup").description("Remove worktrees for branches that have been merged").option("--dry-run", "Show what would be removed without removing").action(async (options) => {
+  const spinner = ora10("Analyzing worktrees...").start();
   try {
     const cwd = process.cwd();
     if (!await isGitRepo(cwd)) {
@@ -3406,10 +3859,10 @@ var cleanupCommand = new Command11("cleanup").description("Remove worktrees for
       } else {
         console.log("  Feature branch worktrees:");
         for (const wt of nonMain) {
-          console.log(`    ${logger12.dim("\u2022")} ${wt.branch} - ${wt.path}`);
+          console.log(`    ${logger14.dim("\u2022")} ${wt.branch} - ${wt.path}`);
         }
         console.log();
-        logger12.info("Run without --dry-run to remove worktrees for merged branches");
+        logger14.info("Run without --dry-run to remove worktrees for merged branches");
       }
       return;
     }
@@ -3421,13 +3874,13 @@ var cleanupCommand = new Command11("cleanup").description("Remove worktrees for
     }
     spinner.succeed(`Cleaned up ${result.removed.length} worktree(s)`);
     for (const path of result.removed) {
-      console.log(`  ${logger12.dim("\u2022")} ${path}`);
+      console.log(`  ${logger14.dim("\u2022")} ${path}`);
     }
     if (result.errors.length > 0) {
       console.log();
-      logger12.warn("Some worktrees could not be removed:");
+      logger14.warn("Some worktrees could not be removed:");
       for (const err of result.errors) {
-        console.log(`  ${logger12.dim("\u2022")} ${err}`);
+        console.log(`  ${logger14.dim("\u2022")} ${err}`);
       }
     }
   } catch (error) {
@@ -3435,32 +3888,32 @@ var cleanupCommand = new Command11("cleanup").description("Remove worktrees for
     process.exit(1);
   }
 });
-var worktreeCommand = new Command11("worktree").alias("wt").description("Manage git worktrees for isolated development").addCommand(listCommand).addCommand(pruneCommand).addCommand(removeCommand).addCommand(cleanupCommand);
+var worktreeCommand = new Command12("worktree").alias("wt").description("Manage git worktrees for isolated development").addCommand(listCommand).addCommand(pruneCommand).addCommand(removeCommand).addCommand(cleanupCommand);
 worktreeCommand.action(async () => {
   await listCommand.parseAsync([], { from: "user" });
 });
 
 // src/commands/lima.ts
-import { Command as Command12 } from "commander";
-import { logger as logger13 } from "@a3t/rapid-core";
-import ora10 from "ora";
+import { Command as Command13 } from "commander";
+import { logger as logger15 } from "@a3t/rapid-core";
+import ora11 from "ora";
 async function checkLimaAvailable() {
   if (!isMacOS()) {
-    logger13.error("Lima is only available on macOS");
+    logger15.error("Lima is only available on macOS");
     return false;
   }
   if (!await hasLima()) {
-    logger13.error("Lima is not installed");
-    logger13.blank();
-    logger13.info("Install Lima with:");
-    console.log(`  ${logger13.dim("$")} brew install lima`);
-    logger13.blank();
-    logger13.info("For more information: https://lima-vm.io");
+    logger15.error("Lima is not installed");
+    logger15.blank();
+    logger15.info("Install Lima with:");
+    console.log(`  ${logger15.dim("$")} brew install lima`);
+    logger15.blank();
+    logger15.info("For more information: https://lima-vm.io");
     return false;
   }
   return true;
 }
-var statusCommand2 = new Command12("status").description("Show Lima VM status").option("--json", "Output as JSON").action(async (options) => {
+var statusCommand2 = new Command13("status").description("Show Lima VM status").option("--json", "Output as JSON").action(async (options) => {
   if (!await checkLimaAvailable()) {
     process.exit(1);
   }
@@ -3470,43 +3923,43 @@ var statusCommand2 = new Command12("status").description("Show Lima VM status").
     return;
   }
   if (!instance) {
-    logger13.info(`Lima VM (${RAPID_LIMA_INSTANCE}) is not created`);
-    logger13.blank();
-    logger13.info("Start the VM with:");
-    console.log(`  ${logger13.dim("$")} rapid lima start`);
-    logger13.blank();
-    logger13.info("Or use:");
-    console.log(`  ${logger13.dim("$")} rapid dev --local`);
+    logger15.info(`Lima VM (${RAPID_LIMA_INSTANCE}) is not created`);
+    logger15.blank();
+    logger15.info("Start the VM with:");
+    console.log(`  ${logger15.dim("$")} rapid lima start`);
+    logger15.blank();
+    logger15.info("Or use:");
+    console.log(`  ${logger15.dim("$")} rapid dev --local`);
     return;
   }
-  logger13.header("Lima VM Status");
+  logger15.header("Lima VM Status");
   console.log();
-  console.log(`  ${logger13.dim("Name:")}     ${instance.name}`);
+  console.log(`  ${logger15.dim("Name:")}     ${instance.name}`);
   console.log(
-    `  ${logger13.dim("Status:")}   ${instance.status === "Running" ? logger13.brand(instance.status) : instance.status}`
+    `  ${logger15.dim("Status:")}   ${instance.status === "Running" ? logger15.brand(instance.status) : instance.status}`
   );
-  console.log(`  ${logger13.dim("Arch:")}     ${instance.arch}`);
-  console.log(`  ${logger13.dim("CPUs:")}     ${instance.cpus}`);
-  console.log(`  ${logger13.dim("Memory:")}   ${instance.memory}`);
-  console.log(`  ${logger13.dim("Disk:")}     ${instance.disk}`);
+  console.log(`  ${logger15.dim("Arch:")}     ${instance.arch}`);
+  console.log(`  ${logger15.dim("CPUs:")}     ${instance.cpus}`);
+  console.log(`  ${logger15.dim("Memory:")}   ${instance.memory}`);
+  console.log(`  ${logger15.dim("Disk:")}     ${instance.disk}`);
   if (instance.sshLocalPort) {
-    console.log(`  ${logger13.dim("SSH Port:")} ${instance.sshLocalPort}`);
+    console.log(`  ${logger15.dim("SSH Port:")} ${instance.sshLocalPort}`);
   }
   console.log();
   if (instance.status === "Running") {
-    logger13.info("To open a shell:");
-    console.log(`  ${logger13.dim("$")} rapid lima shell`);
+    logger15.info("To open a shell:");
+    console.log(`  ${logger15.dim("$")} rapid lima shell`);
   } else {
-    logger13.info("To start the VM:");
-    console.log(`  ${logger13.dim("$")} rapid lima start`);
+    logger15.info("To start the VM:");
+    console.log(`  ${logger15.dim("$")} rapid lima start`);
   }
   console.log();
 });
-var startCommand2 = new Command12("start").description("Start the Lima VM").option("--cpus <n>", "Number of CPUs", "4").option("--memory <size>", "Memory size", "8GiB").option("--disk <size>", "Disk size", "50GiB").action(async (options) => {
+var startCommand2 = new Command13("start").description("Start the Lima VM").option("--cpus <n>", "Number of CPUs", "4").option("--memory <size>", "Memory size", "8GiB").option("--disk <size>", "Disk size", "50GiB").action(async (options) => {
   if (!await checkLimaAvailable()) {
     process.exit(1);
   }
-  const spinner = ora10("Starting Lima VM...").start();
+  const spinner = ora11("Starting Lima VM...").start();
   const projectDir = process.cwd();
   const result = await startInstance(projectDir, {
     cpus: parseInt(options.cpus, 10),
@@ -3516,56 +3969,56 @@ var startCommand2 = new Command12("start").description("Start the Lima VM").opti
   });
   if (!result.success) {
     spinner.fail("Failed to start Lima VM");
-    logger13.error(result.error ?? "Unknown error");
+    logger15.error(result.error ?? "Unknown error");
     process.exit(1);
   }
   spinner.succeed("Lima VM started");
-  logger13.blank();
-  const sshSpinner = ora10("Checking SSH agent forwarding...").start();
+  logger15.blank();
+  const sshSpinner = ora11("Checking SSH agent forwarding...").start();
   const sshResult = await setupGitSsh();
   if (sshResult.success) {
     sshSpinner.succeed("SSH agent forwarding is working");
   } else {
     sshSpinner.warn("SSH agent forwarding may not be working");
-    logger13.dim(sshResult.error ?? "Make sure ssh-agent is running on the host");
+    logger15.dim(sshResult.error ?? "Make sure ssh-agent is running on the host");
   }
-  logger13.blank();
-  logger13.info("To open a shell:");
-  console.log(`  ${logger13.dim("$")} rapid lima shell`);
+  logger15.blank();
+  logger15.info("To open a shell:");
+  console.log(`  ${logger15.dim("$")} rapid lima shell`);
   console.log();
 });
-var stopCommand2 = new Command12("stop").description("Stop the Lima VM").option("-f, --force", "Force stop").action(async (options) => {
+var stopCommand2 = new Command13("stop").description("Stop the Lima VM").option("-f, --force", "Force stop").action(async (options) => {
   if (!await checkLimaAvailable()) {
     process.exit(1);
   }
   const instance = await getInstance();
   if (!instance) {
-    logger13.info("Lima VM is not created");
+    logger15.info("Lima VM is not created");
     return;
   }
   if (instance.status !== "Running") {
-    logger13.info("Lima VM is already stopped");
+    logger15.info("Lima VM is already stopped");
     return;
   }
-  const spinner = ora10("Stopping Lima VM...").start();
+  const spinner = ora11("Stopping Lima VM...").start();
   const result = await stopInstance(RAPID_LIMA_INSTANCE, {
     force: options.force
   });
   if (!result.success) {
     spinner.fail("Failed to stop Lima VM");
-    logger13.error(result.error ?? "Unknown error");
+    logger15.error(result.error ?? "Unknown error");
     process.exit(1);
   }
   spinner.succeed("Lima VM stopped");
 });
-var shellCommand = new Command12("shell").description("Open a shell in the Lima VM").option("-c, --command <cmd>", "Command to run instead of interactive shell").action(async (options) => {
+var shellCommand = new Command13("shell").description("Open a shell in the Lima VM").option("-c, --command <cmd>", "Command to run instead of interactive shell").action(async (options) => {
   if (!await checkLimaAvailable()) {
     process.exit(1);
   }
   const instance = await getInstance();
   if (!instance || instance.status !== "Running") {
-    logger13.error("Lima VM is not running");
-    logger13.info("Start with: rapid lima start");
+    logger15.error("Lima VM is not running");
+    logger15.info("Start with: rapid lima start");
     process.exit(1);
   }
   await shellInLima({
@@ -3573,30 +4026,30 @@ var shellCommand = new Command12("shell").description("Open a shell in the Lima
     command: options.command
   });
 });
-var deleteCommand = new Command12("delete").description("Delete the Lima VM").option("-f, --force", "Force delete without confirmation").action(async (options) => {
+var deleteCommand = new Command13("delete").description("Delete the Lima VM").option("-f, --force", "Force delete without confirmation").action(async (options) => {
   if (!await checkLimaAvailable()) {
     process.exit(1);
   }
   const instance = await getInstance();
   if (!instance) {
-    logger13.info("Lima VM does not exist");
+    logger15.info("Lima VM does not exist");
     return;
   }
   if (!options.force) {
-    logger13.warn("This will permanently delete the Lima VM and all its data.");
-    logger13.info(`Use ${logger13.brand("--force")} to confirm deletion.`);
+    logger15.warn("This will permanently delete the Lima VM and all its data.");
+    logger15.info(`Use ${logger15.brand("--force")} to confirm deletion.`);
     return;
   }
-  const spinner = ora10("Deleting Lima VM...").start();
+  const spinner = ora11("Deleting Lima VM...").start();
   const result = await deleteInstance(RAPID_LIMA_INSTANCE, { force: true });
   if (!result.success) {
     spinner.fail("Failed to delete Lima VM");
-    logger13.error(result.error ?? "Unknown error");
+    logger15.error(result.error ?? "Unknown error");
     process.exit(1);
   }
   spinner.succeed("Lima VM deleted");
 });
-var listCommand2 = new Command12("list").alias("ls").description("List all Lima instances").option("--json", "Output as JSON").action(async (options) => {
+var listCommand2 = new Command13("list").alias("ls").description("List all Lima instances").option("--json", "Output as JSON").action(async (options) => {
   if (!await checkLimaAvailable()) {
     process.exit(1);
   }
@@ -3606,31 +4059,31 @@ var listCommand2 = new Command12("list").alias("ls").description("List all Lima
     return;
   }
   if (instances.length === 0) {
-    logger13.info("No Lima instances found");
+    logger15.info("No Lima instances found");
     return;
   }
-  logger13.header("Lima Instances");
+  logger15.header("Lima Instances");
   console.log();
   for (const inst of instances) {
     const isRapid = inst.name === RAPID_LIMA_INSTANCE;
-    const statusColor = inst.status === "Running" ? logger13.brand : logger13.dim;
+    const statusColor = inst.status === "Running" ? logger15.brand : logger15.dim;
     console.log(
-      `  ${isRapid ? logger13.brand("*") : " "} ${inst.name} ${statusColor(`(${inst.status})`)}`
+      `  ${isRapid ? logger15.brand("*") : " "} ${inst.name} ${statusColor(`(${inst.status})`)}`
     );
-    console.log(`    ${logger13.dim(`${inst.cpus} CPUs, ${inst.memory}, ${inst.disk}`)}`);
+    console.log(`    ${logger15.dim(`${inst.cpus} CPUs, ${inst.memory}, ${inst.disk}`)}`);
   }
   console.log();
 });
-var limaCommand = new Command12("lima").description("Manage Lima VM for local development (macOS)").addCommand(statusCommand2).addCommand(startCommand2).addCommand(stopCommand2).addCommand(shellCommand).addCommand(deleteCommand).addCommand(listCommand2);
+var limaCommand = new Command13("lima").description("Manage Lima VM for local development (macOS)").addCommand(statusCommand2).addCommand(startCommand2).addCommand(stopCommand2).addCommand(shellCommand).addCommand(deleteCommand).addCommand(listCommand2);
 limaCommand.action(async () => {
   await statusCommand2.parseAsync([], { from: "user" });
 });
 
 // src/index.ts
 var __dirname2 = dirname4(fileURLToPath3(import.meta.url));
-var packageJson2 = JSON.parse(readFileSync2(join7(__dirname2, "../package.json"), "utf-8"));
+var packageJson2 = JSON.parse(readFileSync2(join8(__dirname2, "../package.json"), "utf-8"));
 var VERSION = packageJson2.version;
-var program = new Command13();
+var program = new Command14();
 program.name("rapid").description("AI-assisted development with dev containers").version(VERSION, "-v, --version", "Show version").option("--verbose", "Verbose output").option("-q, --quiet", "Minimal output").option("--config <path>", "Path to rapid.json").hook("preAction", async (thisCommand) => {
   const opts = thisCommand.opts();
   if (opts.verbose) {
@@ -3644,7 +4097,7 @@ program.name("rapid").description("AI-assisted development with dev containers")
   try {
     await updateChecker.checkAndUpdate();
   } catch (error) {
-    logger14.debug("Update check failed:", error);
+    logger16.debug("Update check failed:", error);
   }
 });
 program.addCommand(initCommand);
@@ -3656,13 +4109,14 @@ program.addCommand(agentCommand);
 program.addCommand(secretsCommand);
 program.addCommand(authCommand);
 program.addCommand(mcpCommand);
+program.addCommand(contextCommand);
 program.addCommand(updateCommand);
 program.addCommand(worktreeCommand);
 program.addCommand(limaCommand);
 program.action(() => {
   console.log();
-  console.log(`  ${logger14.brand("RAPID")} ${logger14.dim(`v${VERSION}`)}`);
-  console.log(`  ${logger14.dim("AI-assisted development with dev containers")}`);
+  console.log(`  ${logger16.brand("RAPID")} ${logger16.dim(`v${VERSION}`)}`);
+  console.log(`  ${logger16.dim("AI-assisted development with dev containers")}`);
   console.log();
   program.help();
 });
@@ -3670,4 +4124,4 @@ program.action(() => {
 export {
   program
 };
-//# sourceMappingURL=chunk-52NWSTTE.js.map
+//# sourceMappingURL=chunk-COGUXZI3.js.map