agdi 2.4.0 → 2.4.1

package/dist/index.js

@@ -8,8 +8,8 @@ var __require = /* @__PURE__ */ ((x) => typeof require !== "undefined" ? require
 
 // src/index.ts
 import { Command } from "commander";
-import chalk12 from "chalk";
-import ora4 from "ora";
+import chalk13 from "chalk";
+import ora5 from "ora";
 
 // src/core/llm/index.ts
 var PuterProvider = class {
@@ -574,6 +574,50 @@ var MALICIOUS_PATTERNS = [
     category: "dangerous",
     description: "Template literal with shell commands",
     severity: "medium"
+  },
+  // ==================== PROMPT INJECTION DEFENSE ====================
+  {
+    pattern: /ignore\s+(all\s+)?(previous|above|prior)\s+(instructions?|prompts?|rules?)/gi,
+    category: "suspicious",
+    description: "Prompt injection: instruction override attempt",
+    severity: "critical"
+  },
+  {
+    pattern: /\[SYSTEM\]|\[INST\]|<\|im_start\|>|<\|endoftext\|>/gi,
+    category: "suspicious",
+    description: "Prompt injection: model control tokens",
+    severity: "critical"
+  },
+  {
+    pattern: /you\s+are\s+(now\s+)?(a|an|the)\s+\w+\s+(that|who|which)/gi,
+    category: "suspicious",
+    description: "Prompt injection: role override attempt",
+    severity: "high"
+  },
+  {
+    pattern: /disregard\s+(all\s+)?safety|bypass\s+(all\s+)?security|disable\s+(all\s+)?restrictions/gi,
+    category: "suspicious",
+    description: "Prompt injection: safety bypass attempt",
+    severity: "critical"
+  },
+  {
+    pattern: /\bexec\s*\(\s*[`'"].*?\$\(.*?\)/g,
+    category: "dangerous",
+    description: "Command injection via exec with substitution",
+    severity: "critical"
+  },
+  // ==================== NETWORK EXFILTRATION ====================
+  {
+    pattern: /\bfetch\s*\(\s*['"`]https?:\/\/[^'"`]*\.(ru|cn|tk|ml|ga)\//gi,
+    category: "suspicious",
+    description: "Request to suspicious TLD",
+    severity: "high"
+  },
+  {
+    pattern: /\bnew\s+WebSocket\s*\(\s*['"`]wss?:\/\/(?!localhost|127\.0\.0\.1)/g,
+    category: "suspicious",
+    description: "WebSocket to external server",
+    severity: "medium"
   }
 ];
 function scanCode(code, filename) {
@@ -1370,9 +1414,9 @@ async function selectModel() {
 }
 
 // src/commands/agdi-dev.ts
-import { input as input4, confirm as confirm2 } from "@inquirer/prompts";
-import chalk11 from "chalk";
-import ora3 from "ora";
+import { input as input5, confirm as confirm3 } from "@inquirer/prompts";
+import chalk12 from "chalk";
+import ora4 from "ora";
 
 // src/actions/plan-executor.ts
 import { select as select4, confirm } from "@inquirer/prompts";
@@ -1430,6 +1474,40 @@ function summarizePlan(plan) {
     riskTier: maxRiskTier
   };
 }
+function validateAction(action) {
+  if (!action || typeof action !== "object") return null;
+  const obj = action;
+  const type = obj.type;
+  if (type === "mkdir") {
+    if (typeof obj.path !== "string" || !obj.path) return null;
+    if (obj.path.includes("..") || obj.path.startsWith("/") || /^[A-Z]:/i.test(obj.path)) return null;
+    return { type: "mkdir", path: obj.path };
+  }
+  if (type === "writeFile") {
+    if (typeof obj.path !== "string" || !obj.path) return null;
+    if (typeof obj.content !== "string") return null;
+    if (obj.path.includes("..") || obj.path.startsWith("/") || /^[A-Z]:/i.test(obj.path)) return null;
+    return { type: "writeFile", path: obj.path, content: obj.content };
+  }
+  if (type === "deleteFile") {
+    if (typeof obj.path !== "string" || !obj.path) return null;
+    if (obj.path.includes("..") || obj.path.startsWith("/") || /^[A-Z]:/i.test(obj.path)) return null;
+    return { type: "deleteFile", path: obj.path };
+  }
+  if (type === "exec") {
+    if (!Array.isArray(obj.argv) || obj.argv.length === 0) return null;
+    if (!obj.argv.every((a) => typeof a === "string")) return null;
+    const dangerous = ["sudo", "su", "rm -rf /", "format", "mkfs", "dd", ":(){"];
+    const cmdStr = obj.argv.join(" ").toLowerCase();
+    if (dangerous.some((d) => cmdStr.includes(d))) return null;
+    return {
+      type: "exec",
+      argv: obj.argv,
+      cwd: typeof obj.cwd === "string" ? obj.cwd : void 0
+    };
+  }
+  return null;
+}
 function parseActionPlan(response) {
   try {
     const jsonMatch = response.match(/\{[\s\S]*"actions"[\s\S]*\}/);
@@ -1440,10 +1518,23 @@ function parseActionPlan(response) {
     if (!parsed.actions || !Array.isArray(parsed.actions)) {
       return null;
     }
+    const validatedActions = [];
+    for (const action of parsed.actions) {
+      const validated = validateAction(action);
+      if (!validated) {
+        console.warn(`Invalid action rejected: ${JSON.stringify(action).slice(0, 100)}`);
+        continue;
+      }
+      validatedActions.push(validated);
+    }
+    if (validatedActions.length === 0) {
+      return null;
+    }
+    const projectName = typeof parsed.projectName === "string" ? parsed.projectName.replace(/[^a-zA-Z0-9-_]/g, "-").slice(0, 50) : "generated-app";
     return {
-      projectName: parsed.projectName || "generated-app",
-      actions: parsed.actions,
-      nextSteps: parsed.nextSteps
+      projectName,
+      actions: validatedActions,
+      nextSteps: typeof parsed.nextSteps === "string" ? parsed.nextSteps : void 0
     };
   } catch {
     return null;
@@ -1760,6 +1851,68 @@ async function deleteFileTool(path4) {
     return { success: false, error: msg };
   }
 }
+async function applyPatchTool(path4, unifiedDiff) {
+  const validation = validatePath(path4);
+  if (!validation.valid) {
+    return { success: false, error: validation.error };
+  }
+  try {
+    const current = existsSync3(validation.resolved) ? await readFile(validation.resolved, "utf-8") : "";
+    const patched = applySimplePatch(current, unifiedDiff);
+    if (patched === null) {
+      return { success: false, error: "Failed to apply patch" };
+    }
+    await writeFile(validation.resolved, patched, "utf-8");
+    logEvent({
+      eventType: "command_result",
+      command: `applyPatch ${path4}`,
+      result: { exitCode: 0 },
+      metadata: {
+        tool: "applyPatchTool",
+        path: validation.resolved,
+        patchLength: unifiedDiff.length
+      }
+    });
+    return { success: true };
+  } catch (error) {
+    const msg = error instanceof Error ? error.message : String(error);
+    return { success: false, error: msg };
+  }
+}
+function applySimplePatch(content, diff) {
+  const lines = content.split("\n");
+  const diffLines = diff.split("\n");
+  let lineIndex = 0;
+  const result = [];
+  for (const diffLine of diffLines) {
+    if (diffLine.startsWith("---") || diffLine.startsWith("+++") || diffLine.startsWith("@@")) {
+      continue;
+    }
+    if (diffLine.startsWith("-")) {
+      lineIndex++;
+    } else if (diffLine.startsWith("+")) {
+      result.push(diffLine.slice(1));
+    } else if (diffLine.startsWith(" ") || diffLine === "") {
+      if (lineIndex < lines.length) {
+        result.push(lines[lineIndex]);
+        lineIndex++;
+      }
+    }
+  }
+  while (lineIndex < lines.length) {
+    result.push(lines[lineIndex]);
+    lineIndex++;
+  }
+  return result.join("\n");
+}
+function resolvePath(path4) {
+  const env = getEnvironment();
+  return resolve(env.workspaceRoot, path4);
+}
+function fileExists(path4) {
+  const resolved = resolvePath(path4);
+  return existsSync3(resolved);
+}
 
 // src/security/permission-gate.ts
 import { resolve as resolve2, relative as relative2, isAbsolute as isAbsolute2 } from "path";
@@ -3455,6 +3608,204 @@ function clearConversation() {
   }
 }
 
+// src/core/file-editor.ts
+import { readFile as readFile2 } from "fs/promises";
+import { existsSync as existsSync9 } from "fs";
+import chalk11 from "chalk";
+import ora3 from "ora";
+import { input as input4, confirm as confirm2 } from "@inquirer/prompts";
+var EDIT_SYSTEM_PROMPT = `You are a surgical code editor. Given a file's content and an edit instruction, output ONLY a unified diff patch.
+
+## Output Format (STRICT)
+\`\`\`diff
+--- a/filename
++++ b/filename
+@@ -start,count +start,count @@
+ context line (unchanged)
+-removed line
++added line
+ context line (unchanged)
+\`\`\`
+
+## Rules
+1. Output ONLY the diff block, no explanation before or after
+2. Include 3 context lines around each change
+3. Use proper unified diff format with @@ hunk headers
+4. Preserve exact indentation (spaces/tabs)
+5. Multiple changes = multiple @@ hunks
+6. Line numbers in @@ must be accurate
+
+## Example
+Input: "Add a console.log at line 5"
+Output:
+\`\`\`diff
+--- a/index.ts
++++ b/index.ts
+@@ -3,6 +3,7 @@
+ import { foo } from './foo';
+ 
+ function main() {
++    console.log('Debug point');
+     const result = foo();
+     return result;
+ }
+\`\`\``;
+async function readFileForEdit(filePath) {
+  const resolved = resolvePath(filePath);
+  if (!existsSync9(resolved)) {
+    return null;
+  }
+  try {
+    const content = await readFile2(resolved, "utf-8");
+    const lines = content.split("\n");
+    const numbered = lines.map((line, i) => `${String(i + 1).padStart(4, " ")} \u2502 ${line}`).join("\n");
+    return { content, numbered };
+  } catch {
+    return null;
+  }
+}
+function extractDiff(response) {
+  const diffMatch = response.match(/```diff\n([\s\S]*?)```/);
+  if (diffMatch) {
+    return diffMatch[1].trim();
+  }
+  const codeMatch = response.match(/```\n([\s\S]*?)```/);
+  if (codeMatch && codeMatch[1].includes("@@")) {
+    return codeMatch[1].trim();
+  }
+  if (response.includes("@@") && (response.includes("---") || response.includes("+++"))) {
+    return response.trim();
+  }
+  return null;
+}
+function previewDiff(diff) {
+  console.log(chalk11.cyan.bold("\n\u{1F4DD} Proposed Changes:\n"));
+  const lines = diff.split("\n");
+  for (const line of lines) {
+    if (line.startsWith("+++") || line.startsWith("---")) {
+      console.log(chalk11.gray(line));
+    } else if (line.startsWith("@@")) {
+      console.log(chalk11.cyan(line));
+    } else if (line.startsWith("+")) {
+      console.log(chalk11.green(line));
+    } else if (line.startsWith("-")) {
+      console.log(chalk11.red(line));
+    } else {
+      console.log(chalk11.gray(line));
+    }
+  }
+  console.log("");
+}
+function countChanges(diff) {
+  const lines = diff.split("\n");
+  let added = 0;
+  let removed = 0;
+  for (const line of lines) {
+    if (line.startsWith("+") && !line.startsWith("+++")) {
+      added++;
+    } else if (line.startsWith("-") && !line.startsWith("---")) {
+      removed++;
+    }
+  }
+  return { added, removed };
+}
+async function handleFileEdit(filePath, llm) {
+  const env = getEnvironment();
+  if (!fileExists(filePath)) {
+    console.log(chalk11.red(`
+\u2717 File not found: ${filePath}
+`));
+    return { success: false, error: "File not found" };
+  }
+  const fileData = await readFileForEdit(filePath);
+  if (!fileData) {
+    console.log(chalk11.red(`
+\u2717 Could not read file: ${filePath}
+`));
+    return { success: false, error: "Could not read file" };
+  }
+  const previewLines = fileData.numbered.split("\n").slice(0, 20);
+  console.log(chalk11.cyan.bold(`
+\u{1F4C4} ${filePath}
+`));
+  console.log(chalk11.gray(previewLines.join("\n")));
+  if (fileData.content.split("\n").length > 20) {
+    console.log(chalk11.gray(`    ... (${fileData.content.split("\n").length - 20} more lines)`));
+  }
+  console.log("");
+  const instruction = await input4({
+    message: chalk11.yellow("Describe the edit:")
+  });
+  if (!instruction.trim()) {
+    console.log(chalk11.gray("\n(no instruction provided)\n"));
+    return { success: false, error: "No instruction" };
+  }
+  const spinner = ora3("Generating edit...").start();
+  try {
+    const prompt = `File: ${filePath}
+
+Content:
+\`\`\`
+${fileData.content}
+\`\`\`
+
+Edit instruction: ${instruction}
+
+Generate the unified diff to make this change.`;
+    const response = await llm.generate(prompt, EDIT_SYSTEM_PROMPT);
+    spinner.stop();
+    const diff = extractDiff(response.text);
+    if (!diff) {
+      console.log(chalk11.yellow("\n\u26A0\uFE0F  Could not generate a valid diff.\n"));
+      console.log(chalk11.gray("AI response:\n" + response.text.slice(0, 500)));
+      return { success: false, error: "Invalid diff generated" };
+    }
+    previewDiff(diff);
+    const changes = countChanges(diff);
+    console.log(chalk11.gray(`  ${chalk11.green(`+${changes.added}`)} additions, ${chalk11.red(`-${changes.removed}`)} deletions
+`));
+    const shouldApply = await confirm2({
+      message: "Apply these changes?",
+      default: true
+    });
+    if (!shouldApply) {
+      console.log(chalk11.gray("\n\u{1F44B} Edit cancelled.\n"));
+      return { success: false, error: "Cancelled by user" };
+    }
+    const applySpinner = ora3("Applying changes...").start();
+    const result = await applyPatchTool(filePath, diff);
+    applySpinner.stop();
+    if (result.success) {
+      console.log(chalk11.green(`
+\u2713 Successfully edited ${filePath}
+`));
+      logEvent({
+        eventType: "command_result",
+        command: `/edit ${filePath}`,
+        result: { exitCode: 0 },
+        metadata: {
+          instruction,
+          added: changes.added,
+          removed: changes.removed
+        }
+      });
+      return { success: true, linesChanged: changes.added + changes.removed };
+    } else {
+      console.log(chalk11.red(`
+\u2717 Failed to apply changes: ${result.error}
+`));
+      return { success: false, error: result.error };
+    }
+  } catch (error) {
+    spinner.stop();
+    const msg = error instanceof Error ? error.message : String(error);
+    console.log(chalk11.red(`
+\u2717 Error: ${msg}
+`));
+    return { success: false, error: msg };
+  }
+}
+
 // src/commands/agdi-dev.ts
 var BASE_CHAT_PROMPT = `You are Agdi dev, an elite AI coding assistant. You help developers write code, debug issues, and build applications.
 
@@ -3524,7 +3875,7 @@ Instead, output a single JSON object with this exact structure:
 async function startCodingMode() {
   const activeConfig = getActiveProvider();
   if (!activeConfig) {
-    console.log(chalk11.red("\u274C No API key configured. Run: agdi"));
+    console.log(chalk12.red("\u274C No API key configured. Run: agdi"));
     return;
   }
   const { provider, apiKey, model } = activeConfig;
@@ -3536,24 +3887,24 @@ async function startCodingMode() {
     process.exit(0);
   }
   logSessionStart(env.workspaceRoot, env.trustLevel);
-  console.log(chalk11.cyan.bold("\u26A1 Agdi dev\n"));
-  console.log(chalk11.gray(`Model: ${chalk11.cyan(model)}`));
-  console.log(chalk11.gray(`Workspace: ${chalk11.cyan(env.workspaceRoot)}`));
-  console.log(chalk11.gray("Commands: /status, /diff, /commit, /build, /clear, /history, /model, /help, /exit\n"));
-  console.log(chalk11.gray("\u2500".repeat(50) + "\n"));
+  console.log(chalk12.cyan.bold("\u26A1 Agdi dev\n"));
+  console.log(chalk12.gray(`Model: ${chalk12.cyan(model)}`));
+  console.log(chalk12.gray(`Workspace: ${chalk12.cyan(env.workspaceRoot)}`));
+  console.log(chalk12.gray("Commands: /status, /diff, /commit, /build, /clear, /history, /model, /help, /exit\n"));
+  console.log(chalk12.gray("\u2500".repeat(50) + "\n"));
   const pm = new ProjectManager();
   let llm = createLLMProvider(provider, { apiKey, model });
   const conversation = getConversation();
   conversation.setSystemPrompt(buildContextAwarePrompt());
   while (true) {
     try {
-      const userInput = await input4({
-        message: chalk11.green("\u2192")
+      const userInput = await input5({
+        message: chalk12.green("\u2192")
       });
       const trimmed = userInput.trim().toLowerCase();
       if (trimmed === "/exit" || trimmed === "exit" || trimmed === "quit") {
         logSessionEnd();
-        console.log(chalk11.gray("\n\u{1F44B} Goodbye!\n"));
+        console.log(chalk12.gray("\n\u{1F44B} Goodbye!\n"));
         break;
       }
       if (trimmed === "/help") {
@@ -3568,34 +3919,34 @@ async function startCodingMode() {
             apiKey: newConfig.apiKey,
             model: newConfig.model
           });
-          console.log(chalk11.gray(`Now using: ${chalk11.cyan(newConfig.model)}
+          console.log(chalk12.gray(`Now using: ${chalk12.cyan(newConfig.model)}
 `));
         }
         continue;
       }
       if (trimmed === "/chat") {
-        console.log(chalk11.gray("\nSwitching to chat mode. Type /code to return.\n"));
+        console.log(chalk12.gray("\nSwitching to chat mode. Type /code to return.\n"));
         await chatMode(llm);
         continue;
       }
       if (trimmed === "/clear") {
         clearConversation();
         conversation.setSystemPrompt(buildContextAwarePrompt());
-        console.log(chalk11.green("\n\u2713 Conversation cleared.\n"));
+        console.log(chalk12.green("\n\u2713 Conversation cleared.\n"));
         continue;
       }
       if (trimmed === "/history") {
         const messages = conversation.getMessages();
         if (messages.length === 0) {
-          console.log(chalk11.gray("\n(no conversation history)\n"));
+          console.log(chalk12.gray("\n(no conversation history)\n"));
         } else {
-          console.log(chalk11.cyan.bold("\n\u{1F4DC} Conversation History\n"));
-          console.log(chalk11.gray(conversation.getSummary()));
+          console.log(chalk12.cyan.bold("\n\u{1F4DC} Conversation History\n"));
+          console.log(chalk12.gray(conversation.getSummary()));
           console.log("");
           for (const msg of messages.slice(-6)) {
-            const role = msg.role === "user" ? chalk11.green("You") : chalk11.cyan("AI");
+            const role = msg.role === "user" ? chalk12.green("You") : chalk12.cyan("AI");
             const preview = msg.content.slice(0, 80) + (msg.content.length > 80 ? "..." : "");
-            console.log(`  ${role}: ${chalk11.gray(preview)}`);
+            console.log(`  ${role}: ${chalk12.gray(preview)}`);
           }
           console.log("");
         }
@@ -3613,12 +3964,21 @@ async function startCodingMode() {
         await handleGitCommit(llm);
         continue;
       }
+      if (trimmed.startsWith("/edit ")) {
+        const filePath = userInput.slice(6).trim();
+        if (filePath) {
+          await handleFileEdit(filePath, llm);
+        } else {
+          console.log(chalk12.yellow("\nUsage: /edit <file>\n"));
+        }
+        continue;
+      }
       if (trimmed.startsWith("/build ") || trimmed.startsWith("build ")) {
         const prompt = userInput.replace(/^\/?build\s+/i, "").trim();
         if (prompt) {
           await buildAppWithPlan(prompt, llm);
         } else {
-          console.log(chalk11.yellow("\nUsage: /build <description>\n"));
+          console.log(chalk12.yellow("\nUsage: /build <description>\n"));
         }
         continue;
       }
@@ -3630,7 +3990,7 @@ async function startCodingMode() {
         await buildAppWithPlan(userInput, llm);
         continue;
       }
-      const spinner = ora3("Thinking...").start();
+      const spinner = ora4("Thinking...").start();
       try {
         conversation.addUserMessage(userInput);
         let response;
@@ -3650,7 +4010,7 @@ async function startCodingMode() {
     } catch (error) {
       if (error.name === "ExitPromptError") {
         logSessionEnd();
-        console.log(chalk11.gray("\n\n\u{1F44B} Goodbye!\n"));
+        console.log(chalk12.gray("\n\n\u{1F44B} Goodbye!\n"));
         process.exit(0);
       }
       throw error;
@@ -3658,13 +4018,13 @@ async function startCodingMode() {
   }
 }
 async function buildAppWithPlan(prompt, llm) {
-  const spinner = ora3("Generating action plan...").start();
+  const spinner = ora4("Generating action plan...").start();
   try {
     const response = await llm.generate(prompt, BUILD_SYSTEM_PROMPT);
     spinner.stop();
     const result = await parseAndExecutePlan(response.text);
     if (!result) {
-      console.log(chalk11.yellow("\n\u26A0\uFE0F  Model did not return an action plan. Showing response:\n"));
+      console.log(chalk12.yellow("\n\u26A0\uFE0F  Model did not return an action plan. Showing response:\n"));
       console.log(formatResponse(response.text) + "\n");
     }
   } catch (error) {
@@ -3675,15 +4035,15 @@ async function buildAppWithPlan(prompt, llm) {
 async function chatMode(llm) {
   while (true) {
     try {
-      const userInput = await input4({
-        message: chalk11.blue("\u{1F4AC}")
+      const userInput = await input5({
+        message: chalk12.blue("\u{1F4AC}")
       });
       if (userInput.toLowerCase() === "/code" || userInput.toLowerCase() === "/exit") {
-        console.log(chalk11.gray("\nBack to Agdi dev mode.\n"));
+        console.log(chalk12.gray("\nBack to Agdi dev mode.\n"));
         return;
       }
       if (!userInput.trim()) continue;
-      const spinner = ora3("...").start();
+      const spinner = ora4("...").start();
       const response = await llm.generate(userInput, "You are a helpful assistant. Be friendly and concise.");
       spinner.stop();
       console.log("\n" + response.text + "\n");
@@ -3697,10 +4057,10 @@ async function chatMode(llm) {
 }
 async function handleGitStatus(llm) {
   if (!isGitRepo()) {
-    console.log(chalk11.yellow("\n\u26A0\uFE0F  Not a git repository\n"));
+    console.log(chalk12.yellow("\n\u26A0\uFE0F  Not a git repository\n"));
     return;
   }
-  const spinner = ora3("Analyzing git status...").start();
+  const spinner = ora4("Analyzing git status...").start();
   try {
     const status = getStatus();
     const statusText = formatStatusForPrompt(status);
@@ -3709,9 +4069,9 @@ async function handleGitStatus(llm) {
 ${statusText}`;
     const response = await llm.generate(prompt, BASE_CHAT_PROMPT);
     spinner.stop();
-    console.log(chalk11.cyan.bold("\n\u{1F4CA} Git Status Analysis\n"));
-    console.log(chalk11.gray(statusText));
-    console.log(chalk11.cyan("\n\u2500\u2500\u2500 AI Analysis \u2500\u2500\u2500\n"));
+    console.log(chalk12.cyan.bold("\n\u{1F4CA} Git Status Analysis\n"));
+    console.log(chalk12.gray(statusText));
+    console.log(chalk12.cyan("\n\u2500\u2500\u2500 AI Analysis \u2500\u2500\u2500\n"));
     console.log(formatResponse(response.text) + "\n");
   } catch (error) {
     spinner.fail("Error analyzing status");
@@ -3720,16 +4080,16 @@ ${statusText}`;
 }
 async function handleGitDiff(llm) {
   if (!isGitRepo()) {
-    console.log(chalk11.yellow("\n\u26A0\uFE0F  Not a git repository\n"));
+    console.log(chalk12.yellow("\n\u26A0\uFE0F  Not a git repository\n"));
     return;
   }
-  const spinner = ora3("Analyzing changes...").start();
+  const spinner = ora4("Analyzing changes...").start();
   try {
     const stagedDiff = getDiff(true);
     const unstagedDiff = getDiff(false);
     if (stagedDiff.files.length === 0 && unstagedDiff.files.length === 0) {
       spinner.stop();
-      console.log(chalk11.gray("\n(no changes to analyze)\n"));
+      console.log(chalk12.gray("\n(no changes to analyze)\n"));
       return;
     }
     let diffContext = "";
@@ -3744,7 +4104,7 @@ async function handleGitDiff(llm) {
 ${diffContext}`;
     const response = await llm.generate(prompt, BASE_CHAT_PROMPT);
     spinner.stop();
-    console.log(chalk11.cyan.bold("\n\u{1F50D} Diff Analysis\n"));
+    console.log(chalk12.cyan.bold("\n\u{1F50D} Diff Analysis\n"));
     console.log(formatResponse(response.text) + "\n");
   } catch (error) {
     spinner.fail("Error analyzing diff");
@@ -3753,15 +4113,15 @@ ${diffContext}`;
 }
 async function handleGitCommit(llm) {
   if (!isGitRepo()) {
-    console.log(chalk11.yellow("\n\u26A0\uFE0F  Not a git repository\n"));
+    console.log(chalk12.yellow("\n\u26A0\uFE0F  Not a git repository\n"));
     return;
   }
   const status = getStatus();
   if (status.staged.length === 0) {
-    console.log(chalk11.yellow("\n\u26A0\uFE0F  No staged changes. Stage some changes first with `git add`.\n"));
+    console.log(chalk12.yellow("\n\u26A0\uFE0F  No staged changes. Stage some changes first with `git add`.\n"));
     return;
   }
-  const spinner = ora3("Generating commit message...").start();
+  const spinner = ora4("Generating commit message...").start();
   try {
     const stagedDiff = getDiff(true);
     const diffText = formatDiffForPrompt(stagedDiff);
@@ -3776,10 +4136,10 @@ ${diffText}`;
     const response = await llm.generate(prompt, "You are a git commit message generator. Output ONLY the commit message, no explanation.");
     spinner.stop();
     const commitMessage = response.text.trim().split("\n")[0];
-    console.log(chalk11.cyan.bold("\n\u{1F4AC} Generated Commit Message\n"));
-    console.log(chalk11.white(`  ${commitMessage}
+    console.log(chalk12.cyan.bold("\n\u{1F4AC} Generated Commit Message\n"));
+    console.log(chalk12.white(`  ${commitMessage}
 `));
-    const shouldCommit = await confirm2({
+    const shouldCommit = await confirm3({
       message: "Commit with this message?",
       default: true
     });
@@ -3791,12 +4151,12 @@ ${diffText}`;
           cwd: env.workspaceRoot,
           stdio: "inherit"
         });
-        console.log(chalk11.green("\n\u2713 Committed successfully!\n"));
+        console.log(chalk12.green("\n\u2713 Committed successfully!\n"));
       } catch (gitError) {
-        console.log(chalk11.red("\n\u2717 Commit failed. Check git output above.\n"));
+        console.log(chalk12.red("\n\u2717 Commit failed. Check git output above.\n"));
       }
     } else {
-      console.log(chalk11.gray("\n\u{1F44B} Commit cancelled.\n"));
+      console.log(chalk12.gray("\n\u{1F44B} Commit cancelled.\n"));
     }
   } catch (error) {
     spinner.fail("Error generating commit");
@@ -3805,61 +4165,62 @@ ${diffText}`;
 }
 function formatResponse(text) {
   return text.replace(/```(\w+)?\n([\s\S]*?)```/g, (_, lang, code) => {
-    const header = lang ? chalk11.gray(`\u2500\u2500 ${lang} \u2500\u2500`) : chalk11.gray("\u2500\u2500 code \u2500\u2500");
+    const header = lang ? chalk12.gray(`\u2500\u2500 ${lang} \u2500\u2500`) : chalk12.gray("\u2500\u2500 code \u2500\u2500");
     return `
 ${header}
-${chalk11.white(code.trim())}
-${chalk11.gray("\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500")}
+${chalk12.white(code.trim())}
+${chalk12.gray("\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500")}
 `;
   });
 }
 function showHelp() {
-  console.log(chalk11.cyan.bold("\n\u{1F4D6} Commands\n"));
-  console.log(chalk11.cyan("  Git Commands:"));
-  console.log(chalk11.gray("  /status    ") + "AI analysis of git status");
-  console.log(chalk11.gray("  /diff      ") + "AI explanation of current changes");
-  console.log(chalk11.gray("  /commit    ") + "Generate and run git commit");
+  console.log(chalk12.cyan.bold("\n\u{1F4D6} Commands\n"));
+  console.log(chalk12.cyan("  Git Commands:"));
+  console.log(chalk12.gray("  /status    ") + "AI analysis of git status");
+  console.log(chalk12.gray("  /diff      ") + "AI explanation of current changes");
+  console.log(chalk12.gray("  /commit    ") + "Generate and run git commit");
   console.log("");
-  console.log(chalk11.cyan("  Build Commands:"));
-  console.log(chalk11.gray("  /build     ") + "Generate and execute an application");
+  console.log(chalk12.cyan("  Build Commands:"));
+  console.log(chalk12.gray("  /build     ") + "Generate and execute an application");
+  console.log(chalk12.gray("  /edit      ") + "AI-powered surgical file editing");
   console.log("");
-  console.log(chalk11.cyan("  Conversation:"));
-  console.log(chalk11.gray("  /clear     ") + "Clear conversation history");
-  console.log(chalk11.gray("  /history   ") + "Show recent conversation");
+  console.log(chalk12.cyan("  Conversation:"));
+  console.log(chalk12.gray("  /clear     ") + "Clear conversation history");
+  console.log(chalk12.gray("  /history   ") + "Show recent conversation");
   console.log("");
-  console.log(chalk11.cyan("  General:"));
-  console.log(chalk11.gray("  /model     ") + "Change AI model");
-  console.log(chalk11.gray("  /chat      ") + "Switch to chat mode");
-  console.log(chalk11.gray("  /help      ") + "Show this help");
-  console.log(chalk11.gray("  /exit      ") + "Exit Agdi");
-  console.log(chalk11.gray("\n  Or just type your coding question!\n"));
-  console.log(chalk11.gray('Tip: "Create a todo app" will generate & write files.\n'));
+  console.log(chalk12.cyan("  General:"));
+  console.log(chalk12.gray("  /model     ") + "Change AI model");
+  console.log(chalk12.gray("  /chat      ") + "Switch to chat mode");
+  console.log(chalk12.gray("  /help      ") + "Show this help");
+  console.log(chalk12.gray("  /exit      ") + "Exit Agdi");
+  console.log(chalk12.gray("\n  Or just type your coding question!\n"));
+  console.log(chalk12.gray('Tip: "Create a todo app" will generate & write files.\n'));
 }
 function handleError(error) {
   const msg = error instanceof Error ? error.message : String(error);
   if (msg.includes("429") || msg.includes("quota")) {
-    console.log(chalk11.yellow("\n\u26A0\uFE0F  Quota exceeded. Run /model to switch.\n"));
+    console.log(chalk12.yellow("\n\u26A0\uFE0F  Quota exceeded. Run /model to switch.\n"));
   } else if (msg.includes("401") || msg.includes("403")) {
-    console.log(chalk11.red("\n\u{1F511} Invalid API key. Run: agdi auth\n"));
+    console.log(chalk12.red("\n\u{1F511} Invalid API key. Run: agdi auth\n"));
   } else {
-    console.log(chalk11.red("\n" + msg + "\n"));
+    console.log(chalk12.red("\n" + msg + "\n"));
   }
 }
 
 // src/index.ts
 var BANNER = `
-${chalk12.cyan(`    ___              __ _  `)}
-${chalk12.cyan(`   /   |  ____ _____/ /(_) `)}
-${chalk12.cyan(`  / /| | / __ \`/ __  // /  `)}
-${chalk12.cyan(` / ___ |/ /_/ / /_/ // /   `)}
-${chalk12.cyan(`/_/  |_|\\_, /\\__,_//_/    `)}
-${chalk12.cyan(`       /____/              `)}
+${chalk13.cyan(`    ___              __ _  `)}
+${chalk13.cyan(`   /   |  ____ _____/ /(_) `)}
+${chalk13.cyan(`  / /| | / __ \`/ __  // /  `)}
+${chalk13.cyan(` / ___ |/ /_/ / /_/ // /   `)}
+${chalk13.cyan(`/_/  |_|\\_, /\\__,_//_/    `)}
+${chalk13.cyan(`       /____/              `)}
 `;
 var program = new Command();
-program.name("agdi").description(chalk12.cyan("\u{1F680} AI-powered coding assistant")).version("2.2.2").configureHelp({
+program.name("agdi").description(chalk13.cyan("\u{1F680} AI-powered coding assistant")).version("2.2.2").configureHelp({
   // Show banner only when help is requested
   formatHelp: (cmd, helper) => {
-    return BANNER + "\n" + chalk12.gray("  The Open Source AI Architect") + "\n" + chalk12.gray("  \u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\n") + "\n" + helper.formatHelp(cmd, helper);
+    return BANNER + "\n" + chalk13.gray("  The Open Source AI Architect") + "\n" + chalk13.gray("  \u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\n") + "\n" + helper.formatHelp(cmd, helper);
   }
 });
 program.action(async () => {
@@ -3870,7 +4231,7 @@ program.action(async () => {
     await startCodingMode();
   } catch (error) {
     if (error.name === "ExitPromptError") {
-      console.log(chalk12.gray("\n\n\u{1F44B} Goodbye!\n"));
+      console.log(chalk13.gray("\n\n\u{1F44B} Goodbye!\n"));
       process.exit(0);
     }
     throw error;
@@ -3885,7 +4246,7 @@ program.command("auth").description("Configure API keys").option("--status", "Sh
     }
   } catch (error) {
     if (error.name === "ExitPromptError") {
-      console.log(chalk12.gray("\n\n\u{1F44B} Cancelled.\n"));
+      console.log(chalk13.gray("\n\n\u{1F44B} Cancelled.\n"));
       process.exit(0);
     }
     throw error;
@@ -3896,7 +4257,7 @@ program.command("model").alias("models").description("Change AI model").action(a
     await selectModel();
   } catch (error) {
     if (error.name === "ExitPromptError") {
-      console.log(chalk12.gray("\n\n\u{1F44B} Cancelled.\n"));
+      console.log(chalk13.gray("\n\n\u{1F44B} Cancelled.\n"));
       process.exit(0);
     }
     throw error;
@@ -3910,7 +4271,7 @@ program.command("chat").description("Start a chat session").action(async () => {
     await startChat();
   } catch (error) {
     if (error.name === "ExitPromptError") {
-      console.log(chalk12.gray("\n\n\u{1F44B} Goodbye!\n"));
+      console.log(chalk13.gray("\n\n\u{1F44B} Goodbye!\n"));
       process.exit(0);
     }
     throw error;
@@ -3921,7 +4282,7 @@ program.command("run [directory]").description("Run a generated project").action
     await runProject(directory);
   } catch (error) {
     if (error.name === "ExitPromptError") {
-      console.log(chalk12.gray("\n\n\u{1F44B} Cancelled.\n"));
+      console.log(chalk13.gray("\n\n\u{1F44B} Cancelled.\n"));
       process.exit(0);
     }
     throw error;
@@ -3934,10 +4295,10 @@ program.command("build <prompt>").alias("b").description("Generate an app from a
     }
     const activeConfig = getActiveProvider();
     if (!activeConfig) {
-      console.log(chalk12.red("\u274C No API key configured. Run: agdi auth"));
+      console.log(chalk13.red("\u274C No API key configured. Run: agdi auth"));
       return;
     }
-    const spinner = ora4("Generating application...").start();
+    const spinner = ora5("Generating application...").start();
     try {
       const llm = createLLMProvider(activeConfig.provider, {
         apiKey: activeConfig.apiKey,
@@ -3946,30 +4307,30 @@ program.command("build <prompt>").alias("b").description("Generate an app from a
       const pm = new ProjectManager();
       pm.create(options.output.replace("./", ""), prompt);
       const { plan, files } = await generateApp(prompt, llm, (step, file) => {
-        spinner.text = file ? `${step} ${chalk12.gray(file)}` : step;
+        spinner.text = file ? `${step} ${chalk13.gray(file)}` : step;
       });
       pm.updateFiles(files);
       pm.updateDependencies(plan.dependencies);
       await writeProject(pm.get(), options.output);
-      spinner.succeed(chalk12.green("App generated!"));
-      console.log(chalk12.gray(`
-\u{1F4C1} Created ${files.length} files in ${chalk12.cyan(options.output)}`));
-      console.log(chalk12.gray("\nNext: cd " + options.output + " && npm install && npm run dev\n"));
+      spinner.succeed(chalk13.green("App generated!"));
+      console.log(chalk13.gray(`
+\u{1F4C1} Created ${files.length} files in ${chalk13.cyan(options.output)}`));
+      console.log(chalk13.gray("\nNext: cd " + options.output + " && npm install && npm run dev\n"));
     } catch (error) {
       spinner.fail("Generation failed");
       const msg = error instanceof Error ? error.message : String(error);
       if (msg.includes("429") || msg.includes("quota")) {
-        console.log(chalk12.yellow("\n\u26A0\uFE0F  Quota exceeded. Run: agdi model\n"));
+        console.log(chalk13.yellow("\n\u26A0\uFE0F  Quota exceeded. Run: agdi model\n"));
       } else if (msg.includes("401") || msg.includes("403")) {
-        console.log(chalk12.red("\n\u{1F511} Invalid API key. Run: agdi auth\n"));
+        console.log(chalk13.red("\n\u{1F511} Invalid API key. Run: agdi auth\n"));
       } else {
-        console.error(chalk12.red("\n" + msg + "\n"));
+        console.error(chalk13.red("\n" + msg + "\n"));
       }
       process.exit(1);
     }
   } catch (error) {
     if (error.name === "ExitPromptError") {
-      console.log(chalk12.gray("\n\n\u{1F44B} Cancelled.\n"));
+      console.log(chalk13.gray("\n\n\u{1F44B} Cancelled.\n"));
       process.exit(0);
     }
     throw error;
@@ -3978,11 +4339,11 @@ program.command("build <prompt>").alias("b").description("Generate an app from a
 program.command("config").description("Show configuration").action(async () => {
   const config = loadConfig();
   const active = getActiveProvider();
-  console.log(chalk12.cyan.bold("\n\u2699\uFE0F  Configuration\n"));
-  console.log(chalk12.gray("  Provider: ") + chalk12.cyan(config.defaultProvider || "not set"));
-  console.log(chalk12.gray("  Model:    ") + chalk12.cyan(config.defaultModel || "not set"));
-  console.log(chalk12.gray("  Config:   ") + chalk12.gray("~/.agdi/config.json"));
-  console.log(chalk12.cyan.bold("\n\u{1F510} API Keys\n"));
+  console.log(chalk13.cyan.bold("\n\u2699\uFE0F  Configuration\n"));
+  console.log(chalk13.gray("  Provider: ") + chalk13.cyan(config.defaultProvider || "not set"));
+  console.log(chalk13.gray("  Model:    ") + chalk13.cyan(config.defaultModel || "not set"));
+  console.log(chalk13.gray("  Config:   ") + chalk13.gray("~/.agdi/config.json"));
+  console.log(chalk13.cyan.bold("\n\u{1F510} API Keys\n"));
   const keys = [
     ["Gemini", config.geminiApiKey],
     ["OpenRouter", config.openrouterApiKey],
@@ -3991,7 +4352,7 @@ program.command("config").description("Show configuration").action(async () => {
     ["DeepSeek", config.deepseekApiKey]
   ];
   for (const [name, key] of keys) {
-    const status = key ? chalk12.green("\u2713") : chalk12.gray("\u2717");
+    const status = key ? chalk13.green("\u2713") : chalk13.gray("\u2717");
     console.log(`  ${status} ${name}`);
   }
   console.log("");