@caliber-ai/cli 0.19.0 → 0.20.0

package/dist/bin.js

@@ -1503,6 +1503,7 @@ function stageFiles(files, projectDir) {
   cleanupStaging();
   let newFiles = 0;
   let modifiedFiles = 0;
+  const stagedFiles = [];
   for (const file of files) {
     const proposedPath = path14.join(PROPOSED_DIR, file.path);
     fs15.mkdirSync(path14.dirname(proposedPath), { recursive: true });
@@ -1513,14 +1514,13 @@ function stageFiles(files, projectDir) {
       fs15.mkdirSync(path14.dirname(currentPath), { recursive: true });
       fs15.copyFileSync(originalPath, currentPath);
       modifiedFiles++;
+      stagedFiles.push({ relativePath: file.path, proposedPath, currentPath, isNew: false });
     } else {
       newFiles++;
+      stagedFiles.push({ relativePath: file.path, proposedPath, isNew: true });
     }
   }
-  return { newFiles, modifiedFiles };
-}
-function getStagedProposedDir() {
-  return PROPOSED_DIR;
+  return { newFiles, modifiedFiles, stagedFiles };
 }
 function cleanupStaging() {
   if (fs15.existsSync(STAGED_DIR)) {
@@ -1529,7 +1529,7 @@ function cleanupStaging() {
 }
 
 // src/utils/editor.ts
-import { execSync as execSync2 } from "child_process";
+import { execSync as execSync2, spawnSync } from "child_process";
 function commandExists(cmd) {
   try {
     execSync2(`which ${cmd}`, { stdio: "ignore" });
@@ -1538,40 +1538,31 @@ function commandExists(cmd) {
     return false;
   }
 }
-function openInEditor(dirPath) {
-  const editors = ["cursor", "code"];
-  for (const editor of editors) {
-    if (commandExists(editor)) {
-      try {
-        execSync2(`${editor} --diff "${dirPath}" "${dirPath}"`, { stdio: "ignore" });
-        return true;
-      } catch {
-        try {
-          execSync2(`${editor} "${dirPath}"`, { stdio: "ignore" });
-          return true;
-        } catch {
-          continue;
-        }
-      }
-    }
-  }
-  const envEditor = process.env.EDITOR;
-  if (envEditor && commandExists(envEditor)) {
+function detectAvailableEditors() {
+  const methods = [];
+  if (commandExists("cursor")) methods.push("cursor");
+  if (commandExists("code")) methods.push("vscode");
+  methods.push("terminal");
+  return methods;
+}
+function openDiffsInEditor(editor, files) {
+  const cmd = editor === "cursor" ? "cursor" : "code";
+  for (const file of files) {
     try {
-      execSync2(`${envEditor} "${dirPath}"`, { stdio: "ignore" });
-      return true;
+      if (file.currentPath) {
+        spawnSync(cmd, ["--diff", file.currentPath, file.proposedPath], { stdio: "ignore" });
+      } else {
+        spawnSync(cmd, [file.proposedPath], { stdio: "ignore" });
+      }
     } catch {
+      continue;
     }
   }
-  try {
-    const openCmd = process.platform === "darwin" ? "open" : "xdg-open";
-    execSync2(`${openCmd} "${dirPath}"`, { stdio: "ignore" });
-    return true;
-  } catch {
-    return false;
-  }
 }
 
+// src/commands/init.ts
+import { createTwoFilesPatch } from "diff";
+
 // src/lib/hooks.ts
 import fs16 from "fs";
 import path15 from "path";
@@ -1949,16 +1940,11 @@ async function initCommand(options) {
   printSetupSummary(generatedSetup);
   console.log(chalk3.hex("#6366f1").bold("  Step 5/6 \u2014 Review\n"));
   const setupFiles = collectSetupFiles(generatedSetup);
-  const { newFiles, modifiedFiles } = stageFiles(setupFiles, process.cwd());
-  const stagedDir = getStagedProposedDir();
-  const editorOpened = openInEditor(stagedDir);
-  if (editorOpened) {
-    console.log(chalk3.dim("  Proposed files opened in your editor for review."));
-  } else {
-    console.log(chalk3.dim("  Staged files written to .caliber/staged/proposed/ for review."));
-  }
-  console.log(chalk3.dim(`  ${chalk3.green(`${newFiles} new`)} / ${chalk3.yellow(`${modifiedFiles} modified`)} file${newFiles + modifiedFiles !== 1 ? "s" : ""}
+  const staged = stageFiles(setupFiles, process.cwd());
+  console.log(chalk3.dim(`  ${chalk3.green(`${staged.newFiles} new`)} / ${chalk3.yellow(`${staged.modifiedFiles} modified`)} file${staged.newFiles + staged.modifiedFiles !== 1 ? "s" : ""}
 `));
+  const reviewMethod = await promptReviewMethod();
+  openReview(reviewMethod, staged.stagedFiles);
   let action = await promptReviewAction();
   while (action === "refine") {
     generatedSetup = await refineLoop(generatedSetup, targetAgent);
@@ -1970,11 +1956,9 @@ async function initCommand(options) {
     }
     const updatedFiles = collectSetupFiles(generatedSetup);
     const restaged = stageFiles(updatedFiles, process.cwd());
-    if (editorOpened) {
-      console.log(chalk3.dim("  Updated files re-staged. Check your editor for changes."));
-    }
     console.log(chalk3.dim(`  ${chalk3.green(`${restaged.newFiles} new`)} / ${chalk3.yellow(`${restaged.modifiedFiles} modified`)} file${restaged.newFiles + restaged.modifiedFiles !== 1 ? "s" : ""}
 `));
+    openReview(reviewMethod, restaged.stagedFiles);
     printSetupSummary(generatedSetup);
     action = await promptReviewAction();
   }
@@ -2133,6 +2117,51 @@ async function promptAgent() {
     ]
   });
 }
+async function promptReviewMethod() {
+  const available = detectAvailableEditors();
+  if (available.length === 1) return "terminal";
+  const choices = available.map((method) => {
+    switch (method) {
+      case "cursor":
+        return { name: "Cursor (diff view)", value: "cursor" };
+      case "vscode":
+        return { name: "VS Code (diff view)", value: "vscode" };
+      case "terminal":
+        return { name: "Terminal", value: "terminal" };
+    }
+  });
+  return select({ message: "How would you like to review the changes?", choices });
+}
+function openReview(method, stagedFiles) {
+  if (method === "cursor" || method === "vscode") {
+    openDiffsInEditor(method, stagedFiles.map((f) => ({
+      currentPath: f.currentPath,
+      proposedPath: f.proposedPath
+    })));
+    console.log(chalk3.dim("  Diffs opened in your editor.\n"));
+  } else {
+    for (const file of stagedFiles) {
+      console.log(chalk3.bold(`  ${file.relativePath}`));
+      if (file.currentPath) {
+        const current = fs18.readFileSync(file.currentPath, "utf-8");
+        const proposed = fs18.readFileSync(file.proposedPath, "utf-8");
+        const patch = createTwoFilesPatch(file.relativePath, file.relativePath, current, proposed, "current", "proposed");
+        for (const line of patch.split("\n").slice(2)) {
+          if (line.startsWith("+")) console.log(chalk3.green(`    ${line}`));
+          else if (line.startsWith("-")) console.log(chalk3.red(`    ${line}`));
+          else console.log(chalk3.dim(`    ${line}`));
+        }
+      } else {
+        console.log(chalk3.green("    (new file)"));
+        const content = fs18.readFileSync(file.proposedPath, "utf-8");
+        const preview = content.split("\n").slice(0, 20);
+        for (const line of preview) console.log(chalk3.green(`    +${line}`));
+        if (content.split("\n").length > 20) console.log(chalk3.dim(`    ... ${content.split("\n").length - 20} more lines`));
+      }
+      console.log("");
+    }
+  }
+}
 async function promptReviewAction() {
   return select({
     message: "What would you like to do?",