coding-friend-cli 1.40.2 → 1.40.4

package/dist/{init-ORERNRR7.js → init-GL353JQR.js}

@@ -7,14 +7,14 @@ import {
   getExistingRules,
   getMissingRules,
   logPluginScriptWarning
-} from "./chunk-KG6HYBGD.js";
+} from "./chunk-SKEWZ2ET.js";
 import {
   ensureMemoryBuilt,
   isMemoryInitialized,
   memoryInitWizard
-} from "./chunk-KT5RLAFH.js";
-import "./chunk-TFF47F7P.js";
-import "./chunk-CGZNFAOB.js";
+} from "./chunk-DVWCO7K4.js";
+import "./chunk-HEVK3OYL.js";
+import "./chunk-ZEOWTLWI.js";
 import {
   findStatuslineHookPath,
   getCurrentAccountEmail,
@@ -41,7 +41,7 @@ import {
   isMemoryMcpRegistered,
   memoryConfigMenu,
   registerMemoryMcp
-} from "./chunk-CZW36H3D.js";
+} from "./chunk-BQ4E66ZV.js";
 import {
   deployCodexAgents,
   findCodexAgentSourceDir,
@@ -55,16 +55,22 @@ import {
 } from "./chunk-KCBMCHSA.js";
 import {
   BACK,
+  BackError,
   applyDocsDirChange,
   askScope,
   ensureDocsFolders,
+  escCheckbox,
+  escConfirm,
+  escInput,
+  escSelect,
   formatScopeLabel,
   getMergedValue,
   getScopeLabel,
   injectBackChoice,
   resolveHostFlags,
+  setEscArmed,
   showConfigHint
-} from "./chunk-Z5XTSF7L.js";
+} from "./chunk-XLB2UAKL.js";
 import {
   getLibPath
 } from "./chunk-TN3Y75WG.js";
@@ -94,7 +100,6 @@ import {
 } from "./chunk-NREZK463.js";
 
 // src/commands/init.ts
-import { checkbox, confirm, input, select } from "@inquirer/prompts";
 import { existsSync, mkdirSync, readFileSync, writeFileSync } from "fs";
 import { homedir } from "os";
 import { join } from "path";
@@ -118,6 +123,33 @@ function printStepHeader(label, description) {
     console.log(`     ${chalk.dim(description)}`);
   }
   console.log(`${line}`);
+  console.log(chalk.dim("     (esc: back to previous step)"));
+}
+async function runSteps(steps) {
+  setEscArmed(Boolean(process.stdin.isTTY));
+  try {
+    let i = 0;
+    while (i < steps.length) {
+      _stepIndex = i;
+      try {
+        await steps[i]();
+        i++;
+      } catch (err) {
+        if (!(err instanceof BackError)) throw err;
+        console.log();
+        if (i === 0) log.dim("Already at the first step.");
+        else i--;
+      }
+    }
+  } finally {
+    setEscArmed(false);
+  }
+}
+function readCfgs() {
+  return {
+    globalCfg: readJson(globalConfigPath()),
+    localCfg: readJson(localConfigPath())
+  };
 }
 function isGitRepo() {
   return run("git", ["rev-parse", "--is-inside-work-tree"]) === "true";
@@ -235,7 +267,7 @@ function getDocsDir(globalCfg, localCfg) {
   return localCfg?.docsDir ?? globalCfg?.docsDir ?? DEFAULT_CONFIG.docsDir;
 }
 async function offerGlobalShortcut(globalDisplay) {
-  const choice = await select({
+  const choice = await escSelect({
     message: "How to configure?",
     choices: injectBackChoice(
       [
@@ -275,7 +307,7 @@ async function stepDocsDir(globalCfg, localCfg) {
     ensureDocsFolders(globalValue, DOCS_SUBFOLDERS2);
     return;
   }
-  const value = await input({
+  const value = await escInput({
     message: "Docs folder name:",
     default: currentValue ?? DEFAULT_CONFIG.docsDir,
     validate: (val) => {
@@ -315,7 +347,7 @@ async function stepGitignore(docsDir) {
     "Configure .gitignore",
     "Keeps Coding Friend's AI-generated docs and config out of your git history. You can edit it later in .gitignore."
   );
-  const choice = await select({
+  const choice = await escSelect({
     message: "Add coding-friend artifacts to .gitignore?",
     choices: injectBackChoice(
       [
@@ -343,7 +375,7 @@ async function stepGitignore(docsDir) {
   ];
   let entries = allEntries;
   if (choice === "partial") {
-    entries = await checkbox({
+    entries = await escCheckbox({
       message: "Which folders to ignore?",
       choices: allEntries.map((e) => ({ name: e, value: e }))
     });
@@ -393,7 +425,7 @@ async function stepDocsLanguage(globalCfg, localCfg) {
   writeToScope(scope, { language: lang });
 }
 async function selectLanguage(message) {
-  const choice = await select({
+  const choice = await escSelect({
     message,
     choices: injectBackChoice(
       [
@@ -406,7 +438,7 @@ async function selectLanguage(message) {
   });
   handleBack(choice);
   if (choice === "_other") {
-    const lang = await input({ message: "Enter language name:" });
+    const lang = await escInput({ message: "Enter language name:" });
     return lang || "en";
   }
   return choice;
@@ -435,7 +467,7 @@ async function stepLearnConfig(globalCfg) {
     value: "default"
   });
   locationChoices.push({ name: "Custom path\u2026", value: "custom" });
-  const locationChoice = await select({
+  const locationChoice = await escSelect({
     message: `Current learn folder: ${currentOutputDir}`,
     choices: injectBackChoice(locationChoices, "Cancel init")
   });
@@ -444,7 +476,7 @@ async function stepLearnConfig(globalCfg) {
   if (locationChoice === "current") {
     outputDir = currentOutputDir;
   } else if (locationChoice === "custom") {
-    outputDir = await input({
+    outputDir = await escInput({
       message: "Enter path (absolute or ~/...):",
       default: currentOutputDir !== defaultLearnDir ? currentOutputDir : void 0,
       validate: (val) => {
@@ -456,7 +488,7 @@ async function stepLearnConfig(globalCfg) {
     });
     const resolved = resolvePath(outputDir);
     if (!existsSync(resolved)) {
-      const create = await confirm({
+      const create = await escConfirm({
         message: `Folder ${resolved} doesn't exist. Create it?`,
         default: true
       });
@@ -480,7 +512,7 @@ async function stepLearnConfig(globalCfg) {
     });
   }
   catChoices.push({ name: "Customize", value: "custom" });
-  const catChoice = await select({
+  const catChoice = await escSelect({
     message: "Categories for organizing learning docs?",
     choices: injectBackChoice(catChoices, "Cancel init")
   });
@@ -507,7 +539,7 @@ async function stepLearnConfig(globalCfg) {
     const customCats = [];
     let keepGoing = true;
     while (keepGoing) {
-      const line = await input({
+      const line = await escInput({
         message: `Category ${customCats.length + 1}:`
       });
       if (!line) {
@@ -532,12 +564,12 @@ async function stepLearnConfig(globalCfg) {
   ]);
   const learnDirIsGit = gitInLearnDir !== null;
   if (learnDirIsGit) {
-    autoCommit = await confirm({
+    autoCommit = await escConfirm({
       message: "Auto-commit learning docs to git after each /cf-learn?",
       default: globalLearn?.autoCommit ?? false
     });
   }
-  const indexChoice = await select({
+  const indexChoice = await escSelect({
     message: "How should learning docs be indexed?",
     choices: injectBackChoice(
       [
@@ -644,7 +676,7 @@ async function stepMemory(docsDir, opts) {
     "CF Memory",
     "Persistent project knowledge across sessions \u2014 search tier, embeddings, MCP."
   );
-  const choice = await select({
+  const choice = await escSelect({
     message: "Set up CF Memory?",
     choices: injectBackChoice(
       [
@@ -682,7 +714,7 @@ async function stepTdd(globalCfg, localCfg) {
     `TDD ${formatScopeLabel(scopeLabel)}${currentValue !== void 0 ? ` (${currentValue})` : ""}`,
     "Enable TDD (RED\u2192GREEN\u2192REFACTOR) by default for all implementations."
   );
-  const tddChoice = await confirm({
+  const tddChoice = await escConfirm({
     message: "Enable TDD by default? (writes failing tests before code \u2014 RED \u2192 GREEN \u2192 REFACTOR)",
     default: currentValue ?? false
   });
@@ -702,7 +734,7 @@ async function stepAutoApprove(globalCfg, localCfg) {
     `Auto-approve ${formatScopeLabel(scopeLabel)}${currentValue !== void 0 ? ` (${currentValue})` : ""}`,
     "Same `autoApprove` key for Claude (LLM classifier), Antigravity, and Codex (deterministic)."
   );
-  const autoApproveChoice = await confirm({
+  const autoApproveChoice = await escConfirm({
     message: "Enable auto-approve? (Claude: LLM classifier; Antigravity/Codex: deterministic rules, no LLM)",
     default: currentValue ?? false
   });
@@ -717,7 +749,7 @@ async function stepAutoApprove(globalCfg, localCfg) {
   if (autoApproveChoice) {
     await afterAutoApproveEnabled(
       log,
-      (message) => confirm({ message, default: true })
+      (message) => escConfirm({ message, default: true })
     );
   }
 }
@@ -733,13 +765,13 @@ async function stepPlanDocs(globalCfg, localCfg) {
     `Plan docs ${formatScopeLabel(scopeLabel)}`,
     "The human overview doc /cf-plan writes next to the agent plan \u2014 enable/disable and choose format."
   );
-  const disableChoice = await confirm({
+  const disableChoice = await escConfirm({
     message: "Disable the /cf-plan human overview doc? (off by default)",
     default: currentDisable ?? true
   });
   let formatChoice;
   if (!disableChoice) {
-    const fmt = await select({
+    const fmt = await escSelect({
       message: "Format for the human overview doc?",
       choices: injectBackChoice(
         [
@@ -769,7 +801,7 @@ async function stepPlanDocs(globalCfg, localCfg) {
   log.success(`Saved to ${targetPath}`);
 }
 async function stepClaudePermissions(externalLearnDir, autoCommit) {
-  const scope = await select({
+  const scope = await escSelect({
     message: "Where should permissions be saved?",
     choices: [
       {
@@ -813,7 +845,7 @@ async function stepClaudePermissions(externalLearnDir, autoCommit) {
     logPluginScriptWarning(log, chalk);
   }
   console.log();
-  const ok = await confirm({
+  const ok = await escConfirm({
     message: `Add all ${missing.length} recommended rules?`,
     default: true
   });
@@ -933,7 +965,7 @@ async function initMenu(gitAvailable) {
         description: "  Grant Coding Friend skills/hooks the permissions they need"
       }
     ];
-    const choice = await select({
+    const choice = await escSelect({
       message: "Which setting to configure?",
       choices: injectBackChoice(choices, "Exit")
     });
@@ -942,104 +974,113 @@ async function initMenu(gitAvailable) {
       return;
     }
     _suppressStepHeaders = true;
-    switch (choice) {
-      case "docsDir":
-        await stepDocsDir(globalCfg, localCfg);
-        break;
-      case "gitignore":
-        await stepGitignore(docsDir);
-        break;
-      case "language":
-        await stepDocsLanguage(globalCfg, localCfg);
-        break;
-      case "learn":
-        await stepLearnConfig(globalCfg);
-        break;
-      case "completion":
-        await stepShellCompletion();
-        break;
-      case "statusline":
-        await stepStatusline();
-        break;
-      case "memory":
-        await stepMemory(docsDir, { menuMode: true });
-        break;
-      case "tdd": {
-        const tddChoice = await confirm({
-          message: "Enable TDD by default? (writes failing tests before code \u2014 RED \u2192 GREEN \u2192 REFACTOR)",
-          default: tddVal ?? false
-        });
-        const tddTargetScope = await askScope();
-        if (tddTargetScope !== "back") {
-          const targetPath = tddTargetScope === "global" ? globalConfigPath() : localConfigPath();
-          mergeJson(targetPath, { tdd: tddChoice });
-          log.success(`Saved to ${targetPath}`);
-        }
-        break;
-      }
-      case "autoApprove": {
-        const autoApproveChoice = await confirm({
-          message: "Enable auto-approve? (Claude: LLM classifier; Antigravity/Codex: deterministic rules, no LLM)",
-          default: autoApproveVal ?? false
-        });
-        const autoApproveTargetScope = await askScope();
-        if (autoApproveTargetScope !== "back") {
-          const targetPath = autoApproveTargetScope === "global" ? globalConfigPath() : localConfigPath();
-          mergeJson(targetPath, { autoApprove: autoApproveChoice });
-          log.success(`Saved to ${targetPath}`);
-        }
-        if (autoApproveChoice) {
-          await afterAutoApproveEnabled(
-            log,
-            (message) => confirm({ message, default: true })
-          );
+    setEscArmed(Boolean(process.stdin.isTTY));
+    try {
+      switch (choice) {
+        case "docsDir":
+          await stepDocsDir(globalCfg, localCfg);
+          break;
+        case "gitignore":
+          await stepGitignore(docsDir);
+          break;
+        case "language":
+          await stepDocsLanguage(globalCfg, localCfg);
+          break;
+        case "learn":
+          await stepLearnConfig(globalCfg);
+          break;
+        case "completion":
+          await stepShellCompletion();
+          break;
+        case "statusline":
+          await stepStatusline();
+          break;
+        case "memory":
+          await stepMemory(docsDir, { menuMode: true });
+          break;
+        case "tdd": {
+          const tddChoice = await escConfirm({
+            message: "Enable TDD by default? (writes failing tests before code \u2014 RED \u2192 GREEN \u2192 REFACTOR)",
+            default: tddVal ?? false
+          });
+          const tddTargetScope = await askScope();
+          if (tddTargetScope !== "back") {
+            const targetPath = tddTargetScope === "global" ? globalConfigPath() : localConfigPath();
+            mergeJson(targetPath, { tdd: tddChoice });
+            log.success(`Saved to ${targetPath}`);
+          }
+          break;
         }
-        break;
-      }
-      case "planDocs": {
-        const planDocsDisableChoice = await confirm({
-          message: "Disable the /cf-plan human overview doc? (off by default)",
-          default: planDocsDisableVal ?? true
-        });
-        let planDocsFormatChoice;
-        if (!planDocsDisableChoice) {
-          const fmt = await select({
-            message: "Format for the human overview doc?",
-            choices: injectBackChoice(
-              [
-                { name: "HTML", value: "html" },
-                { name: "Markdown", value: "md" }
-              ],
-              "Skip plan docs config"
-            ),
-            default: planDocsFormatVal ?? "html"
+        case "autoApprove": {
+          const autoApproveChoice = await escConfirm({
+            message: "Enable auto-approve? (Claude: LLM classifier; Antigravity/Codex: deterministic rules, no LLM)",
+            default: autoApproveVal ?? false
           });
-          if (fmt === BACK) {
-            log.dim("Skipped plan docs config.");
-            break;
+          const autoApproveTargetScope = await askScope();
+          if (autoApproveTargetScope !== "back") {
+            const targetPath = autoApproveTargetScope === "global" ? globalConfigPath() : localConfigPath();
+            mergeJson(targetPath, { autoApprove: autoApproveChoice });
+            log.success(`Saved to ${targetPath}`);
+          }
+          if (autoApproveChoice) {
+            await afterAutoApproveEnabled(
+              log,
+              (message) => escConfirm({ message, default: true })
+            );
           }
-          planDocsFormatChoice = fmt;
+          break;
         }
-        const planDocsTargetScope = await askScope();
-        if (planDocsTargetScope !== "back") {
-          const targetPath = planDocsTargetScope === "global" ? globalConfigPath() : localConfigPath();
-          mergeJson(targetPath, {
-            disableGUIPlan: planDocsDisableChoice,
-            ...planDocsFormatChoice !== void 0 ? { guiPlanFormat: planDocsFormatChoice } : {}
+        case "planDocs": {
+          const planDocsDisableChoice = await escConfirm({
+            message: "Disable the /cf-plan human overview doc? (off by default)",
+            default: planDocsDisableVal ?? true
           });
-          log.success(`Saved to ${targetPath}`);
+          let planDocsFormatChoice;
+          if (!planDocsDisableChoice) {
+            const fmt = await escSelect({
+              message: "Format for the human overview doc?",
+              choices: injectBackChoice(
+                [
+                  { name: "HTML", value: "html" },
+                  { name: "Markdown", value: "md" }
+                ],
+                "Skip plan docs config"
+              ),
+              default: planDocsFormatVal ?? "html"
+            });
+            if (fmt === BACK) {
+              log.dim("Skipped plan docs config.");
+              break;
+            }
+            planDocsFormatChoice = fmt;
+          }
+          const planDocsTargetScope = await askScope();
+          if (planDocsTargetScope !== "back") {
+            const targetPath = planDocsTargetScope === "global" ? globalConfigPath() : localConfigPath();
+            mergeJson(targetPath, {
+              disableGUIPlan: planDocsDisableChoice,
+              ...planDocsFormatChoice !== void 0 ? { guiPlanFormat: planDocsFormatChoice } : {}
+            });
+            log.success(`Saved to ${targetPath}`);
+          }
+          break;
+        }
+        case "permissions": {
+          const learnCfg = globalCfg?.learn;
+          const learnOutputDir = learnCfg?.outputDir ?? DEFAULT_CONFIG.learn.outputDir;
+          const learnAutoCommit = learnCfg?.autoCommit || false;
+          await stepClaudePermissions(learnOutputDir, learnAutoCommit);
+          break;
         }
-        break;
-      }
-      case "permissions": {
-        const learnCfg = globalCfg?.learn;
-        const learnOutputDir = learnCfg?.outputDir ?? DEFAULT_CONFIG.learn.outputDir;
-        const learnAutoCommit = learnCfg?.autoCommit || false;
-        await stepClaudePermissions(learnOutputDir, learnAutoCommit);
-        break;
       }
+    } catch (err) {
+      if (!(err instanceof BackError)) throw err;
+      console.log();
+      log.dim("Back to menu.");
+    } finally {
+      setEscArmed(false);
+      _suppressStepHeaders = false;
     }
-    _suppressStepHeaders = false;
     console.log();
   }
 }
@@ -1115,7 +1156,7 @@ async function initCommand(opts = {}) {
     }
     log.success("All settings configured!");
     console.log();
-    const proceed = await confirm({
+    const proceed = await escConfirm({
       message: "Modify settings?",
       default: false
     });
@@ -1138,7 +1179,7 @@ async function initCommand(opts = {}) {
       console.log(`  ${chalk.yellow("\u26A0")} ${parts.join(" \xB7 ")}`);
       console.log();
     }
-    const proceed = await confirm({
+    const proceed = await escConfirm({
       message: "Run setup wizard?",
       default: true
     });
@@ -1147,67 +1188,100 @@ async function initCommand(opts = {}) {
       return;
     }
   }
-  await stepDocsDir(globalCfg, localCfg);
-  const updatedGlobal = readJson(globalConfigPath());
-  const updatedLocal = readJson(localConfigPath());
-  const docsDir = getDocsDir(updatedGlobal, updatedLocal);
-  if (gitAvailable) {
-    await stepGitignore(docsDir);
-  } else {
-    printStepHeader(
-      `Configure .gitignore ${chalk.dim("[skipped]")}`,
-      "Keeps AI-generated docs and config out of your git history."
-    );
-    log.dim("Skipped \u2014 not inside a git repo.");
-  }
-  await stepDocsLanguage(globalCfg, localCfg);
-  const { outputDir, autoCommit } = await stepLearnConfig(updatedGlobal);
-  if (isLearnMcpRegistered()) {
-    log.dim("coding-friend-learn: already registered");
-    log.dim(
-      "  (If it points to an old path, run: claude mcp remove --scope user coding-friend-learn && cf mcp)"
-    );
-  } else {
-    const registered = registerLearnMcp(outputDir);
-    if (registered) {
-      log.success(
-        "Registered CF Learn MCP (user scope). Restart Claude Code to activate."
-      );
-    }
-  }
-  if (isMemoryMcpRegistered()) {
-    log.dim("coding-friend-memory: already registered (user scope)");
-    log.dim(
-      "  (If it points to an old path, run: claude mcp remove --scope user coding-friend-memory && cf mcp)"
-    );
-  } else {
-    const registered = registerMemoryMcp();
-    if (registered) {
-      log.success(
-        "Registered coding-friend-memory (user scope). Restart Claude Code to activate."
+  const learnCfg = globalCfg?.learn;
+  let learn = {
+    outputDir: learnCfg?.outputDir ?? DEFAULT_CONFIG.learn.outputDir,
+    autoCommit: learnCfg?.autoCommit ?? false
+  };
+  await runSteps([
+    // Step 1: docsDir
+    async () => {
+      const { globalCfg: g, localCfg: l } = readCfgs();
+      await stepDocsDir(g, l);
+    },
+    // Step 2: .gitignore (only in git repos)
+    async () => {
+      if (!gitAvailable) {
+        printStepHeader(
+          `Configure .gitignore ${chalk.dim("[skipped]")}`,
+          "Keeps AI-generated docs and config out of your git history."
+        );
+        log.dim("Skipped \u2014 not inside a git repo.");
+        return;
+      }
+      const { globalCfg: g, localCfg: l } = readCfgs();
+      await stepGitignore(getDocsDir(g, l));
+    },
+    // Step 3: Docs language
+    async () => {
+      const { globalCfg: g, localCfg: l } = readCfgs();
+      await stepDocsLanguage(g, l);
+    },
+    // Step 4: /cf-learn config + MCP registration
+    async () => {
+      const { globalCfg: g } = readCfgs();
+      learn = await stepLearnConfig(g);
+      if (isLearnMcpRegistered()) {
+        log.dim("coding-friend-learn: already registered");
+        log.dim(
+          "  (If it points to an old path, run: claude mcp remove --scope user coding-friend-learn && cf mcp)"
+        );
+      } else if (registerLearnMcp(learn.outputDir)) {
+        log.success(
+          "Registered CF Learn MCP (user scope). Restart Claude Code to activate."
+        );
+      }
+      if (isMemoryMcpRegistered()) {
+        log.dim("coding-friend-memory: already registered (user scope)");
+        log.dim(
+          "  (If it points to an old path, run: claude mcp remove --scope user coding-friend-memory && cf mcp)"
+        );
+      } else if (registerMemoryMcp()) {
+        log.success(
+          "Registered coding-friend-memory (user scope). Restart Claude Code to activate."
+        );
+      }
+    },
+    // Step 5: Shell completion
+    stepShellCompletion,
+    // Step 6: Statusline
+    stepStatusline,
+    // Step 7: CF Memory
+    async () => {
+      const { globalCfg: g, localCfg: l } = readCfgs();
+      await stepMemory(getDocsDir(g, l));
+    },
+    // Step 8: TDD
+    async () => {
+      const { globalCfg: g, localCfg: l } = readCfgs();
+      await stepTdd(g, l);
+    },
+    // Step 9: Auto-approve
+    async () => {
+      const { globalCfg: g, localCfg: l } = readCfgs();
+      await stepAutoApprove(g, l);
+    },
+    // Step 10: Plan docs
+    async () => {
+      const { globalCfg: g, localCfg: l } = readCfgs();
+      await stepPlanDocs(g, l);
+    },
+    // Step 11: Claude permissions
+    async () => {
+      printStepHeader(
+        "Configure Claude permissions",
+        "Grants Coding Friend skills/hooks the permissions they need, so you get fewer prompts."
       );
+      await stepClaudePermissions(learn.outputDir, learn.autoCommit);
     }
-  }
-  await stepShellCompletion();
-  await stepStatusline();
-  await stepMemory(docsDir);
-  const finalGlobal = readJson(globalConfigPath());
-  const finalLocal = readJson(localConfigPath());
-  await stepTdd(finalGlobal, finalLocal);
-  await stepAutoApprove(finalGlobal, finalLocal);
-  await stepPlanDocs(finalGlobal, finalLocal);
-  printStepHeader(
-    "Configure Claude permissions",
-    "Grants Coding Friend skills/hooks the permissions they need, so you get fewer prompts."
-  );
-  await stepClaudePermissions(outputDir, autoCommit);
+  ]);
   if (!existsSync(localConfigPath())) {
     writeJson(localConfigPath(), {});
   }
   console.log();
   log.congrats("Setup complete!");
   log.dim(
-    "Available commands: /cf-ask, /cf-plan, /cf-later-do, /cf-design, /cf-fix, /cf-commit, /cf-review, /cf-review-out, /cf-review-in, /cf-ship, /cf-optimize, /cf-scan, /cf-remember, /cf-learn, /cf-teach, /cf-research, /cf-session, /cf-warm, /cf-checkpoint, /cf-checkpoint-from, /cf-help"
+    "Available commands: /cf-ask, /cf-plan, /cf-plan-review, /cf-later-do, /cf-design, /cf-fix, /cf-commit, /cf-review, /cf-review-out, /cf-review-in, /cf-ship, /cf-optimize, /cf-scan, /cf-remember, /cf-learn, /cf-teach, /cf-research, /cf-session, /cf-warm, /cf-checkpoint, /cf-checkpoint-from, /cf-help"
   );
 }
 async function initCodexCommand(opts) {
@@ -1221,7 +1295,7 @@ async function initCodexCommand(opts) {
     log.warn("Not inside a git repo -- git-related steps will be skipped.");
     console.log();
   }
-  const proceed = await confirm({
+  const proceed = await escConfirm({
     message: "Run Codex setup wizard?",
     default: true
   });
@@ -1229,42 +1303,53 @@ async function initCodexCommand(opts) {
     log.dim("Init cancelled. Run `cf init --agent codex` anytime to resume.");
     return;
   }
-  let globalCfg = readJson(globalConfigPath());
-  let localCfg = readJson(localConfigPath());
-  await stepDocsDir(globalCfg, localCfg);
-  globalCfg = readJson(globalConfigPath());
-  localCfg = readJson(localConfigPath());
-  const docsDir = getDocsDir(globalCfg, localCfg);
-  ensureDocsFolders(docsDir, [
-    "plans",
-    "memory",
-    "research",
-    "sessions",
-    "reviews",
-    "warm"
+  await runSteps([
+    async () => {
+      const { globalCfg, localCfg } = readCfgs();
+      await stepDocsDir(globalCfg, localCfg);
+      const cfgs = readCfgs();
+      ensureDocsFolders(getDocsDir(cfgs.globalCfg, cfgs.localCfg), [
+        "plans",
+        "memory",
+        "research",
+        "sessions",
+        "reviews",
+        "warm"
+      ]);
+    },
+    async () => {
+      if (!gitAvailable) {
+        printStepHeader(
+          `Configure .gitignore ${chalk.dim("[skipped]")}`,
+          "Keeps AI-generated docs and config out of your git history."
+        );
+        log.dim("Skipped \u2014 not inside a git repo.");
+        return;
+      }
+      const { globalCfg, localCfg } = readCfgs();
+      await stepGitignore(getDocsDir(globalCfg, localCfg));
+    },
+    async () => {
+      const { globalCfg, localCfg } = readCfgs();
+      await stepDocsLanguage(globalCfg, localCfg);
+    },
+    async () => {
+      await stepLearnConfig(readCfgs().globalCfg);
+      log.dim(
+        "Learn MCP is not registered into Codex config (no dedicated Codex writer). Settings are saved to Coding Friend config."
+      );
+    },
+    async () => {
+      const { globalCfg, localCfg } = readCfgs();
+      await stepAutoApprove(globalCfg, localCfg);
+    },
+    async () => {
+      const { globalCfg, localCfg } = readCfgs();
+      await stepPrivacyBlock(globalCfg, localCfg);
+    }
   ]);
-  if (gitAvailable) {
-    await stepGitignore(docsDir);
-  } else {
-    printStepHeader(
-      `Configure .gitignore ${chalk.dim("[skipped]")}`,
-      "Keeps AI-generated docs and config out of your git history."
-    );
-    log.dim("Skipped \u2014 not inside a git repo.");
-  }
-  await stepDocsLanguage(globalCfg, localCfg);
-  globalCfg = readJson(globalConfigPath());
-  localCfg = readJson(localConfigPath());
-  await stepLearnConfig(globalCfg);
-  log.dim(
-    "Learn MCP is not registered into Codex config (no dedicated Codex writer). Settings are saved to Coding Friend config."
-  );
-  globalCfg = readJson(globalConfigPath());
-  localCfg = readJson(localConfigPath());
-  await stepAutoApprove(globalCfg, localCfg);
-  globalCfg = readJson(globalConfigPath());
-  localCfg = readJson(localConfigPath());
-  await stepPrivacyBlock(globalCfg, localCfg);
+  const codexCfgs = readCfgs();
+  const docsDir = getDocsDir(codexCfgs.globalCfg, codexCfgs.localCfg);
   if (!existsSync(localConfigPath())) {
     writeJson(localConfigPath(), {});
   }
@@ -1329,7 +1414,7 @@ async function initAgyCommand() {
     log.warn("Not inside a git repo -- git-related steps will be skipped.");
     console.log();
   }
-  const proceed = await confirm({
+  const proceed = await escConfirm({
     message: "Run Antigravity setup wizard?",
     default: true
   });
@@ -1337,65 +1422,74 @@ async function initAgyCommand() {
     log.dim("Init cancelled. Run `cf init --agent agy` anytime to resume.");
     return;
   }
-  let globalCfg = readJson(globalConfigPath());
-  let localCfg = readJson(localConfigPath());
-  await stepDocsDir(globalCfg, localCfg);
-  globalCfg = readJson(globalConfigPath());
-  localCfg = readJson(localConfigPath());
-  const docsDir = getDocsDir(globalCfg, localCfg);
-  ensureDocsFolders(docsDir, [
-    "plans",
-    "memory",
-    "research",
-    "sessions",
-    "reviews",
-    "warm"
-  ]);
-  if (gitAvailable) {
-    await stepGitignore(docsDir);
-  } else {
-    printStepHeader(
-      `Configure .gitignore ${chalk.dim("[skipped]")}`,
-      "Keeps AI-generated docs and config out of your git history."
-    );
-    log.dim("Skipped \u2014 not inside a git repo.");
-  }
-  await stepDocsLanguage(globalCfg, localCfg);
-  globalCfg = readJson(globalConfigPath());
-  localCfg = readJson(localConfigPath());
-  const { outputDir } = await stepLearnConfig(globalCfg);
-  if (isAgyPluginInstalled()) {
-    if (isLearnMcpRegistered("agy")) {
-      log.dim(
-        "coding-friend-learn: already registered in plugin mcp_config.json"
-      );
-    } else {
-      const registered = registerLearnMcp(outputDir, "agy");
-      if (registered) {
-        log.success(
-          "Registered CF Learn MCP in the Antigravity plugin mcp_config.json."
+  await runSteps([
+    async () => {
+      const { globalCfg, localCfg } = readCfgs();
+      await stepDocsDir(globalCfg, localCfg);
+      const cfgs = readCfgs();
+      ensureDocsFolders(getDocsDir(cfgs.globalCfg, cfgs.localCfg), [
+        "plans",
+        "memory",
+        "research",
+        "sessions",
+        "reviews",
+        "warm"
+      ]);
+    },
+    async () => {
+      if (!gitAvailable) {
+        printStepHeader(
+          `Configure .gitignore ${chalk.dim("[skipped]")}`,
+          "Keeps AI-generated docs and config out of your git history."
         );
+        log.dim("Skipped \u2014 not inside a git repo.");
+        return;
       }
-    }
-    if (isMemoryMcpRegistered("agy")) {
-      log.dim(
-        "coding-friend-memory: already registered in plugin mcp_config.json"
-      );
-    } else {
-      const registered = registerMemoryMcp("agy");
-      if (registered) {
-        log.success(
-          "Registered coding-friend-memory in the Antigravity plugin mcp_config.json."
-        );
+      const { globalCfg, localCfg } = readCfgs();
+      await stepGitignore(getDocsDir(globalCfg, localCfg));
+    },
+    async () => {
+      const { globalCfg, localCfg } = readCfgs();
+      await stepDocsLanguage(globalCfg, localCfg);
+    },
+    async () => {
+      const { outputDir } = await stepLearnConfig(readCfgs().globalCfg);
+      if (isAgyPluginInstalled()) {
+        if (isLearnMcpRegistered("agy")) {
+          log.dim(
+            "coding-friend-learn: already registered in plugin mcp_config.json"
+          );
+        } else {
+          const registered = registerLearnMcp(outputDir, "agy");
+          if (registered) {
+            log.success(
+              "Registered CF Learn MCP in the Antigravity plugin mcp_config.json."
+            );
+          }
+        }
+        if (isMemoryMcpRegistered("agy")) {
+          log.dim(
+            "coding-friend-memory: already registered in plugin mcp_config.json"
+          );
+        } else {
+          const registered = registerMemoryMcp("agy");
+          if (registered) {
+            log.success(
+              "Registered coding-friend-memory in the Antigravity plugin mcp_config.json."
+            );
+          }
+        }
       }
+    },
+    async () => {
+      const { globalCfg, localCfg } = readCfgs();
+      await stepAutoApprove(globalCfg, localCfg);
+    },
+    async () => {
+      const { globalCfg, localCfg } = readCfgs();
+      await stepPrivacyBlock(globalCfg, localCfg);
     }
-  }
-  globalCfg = readJson(globalConfigPath());
-  localCfg = readJson(localConfigPath());
-  await stepAutoApprove(globalCfg, localCfg);
-  globalCfg = readJson(globalConfigPath());
-  localCfg = readJson(localConfigPath());
-  await stepPrivacyBlock(globalCfg, localCfg);
+  ]);
   if (!existsSync(localConfigPath())) {
     writeJson(localConfigPath(), {});
   }
@@ -1425,7 +1519,7 @@ async function stepPrivacyBlock(globalCfg, localCfg) {
     `Privacy-block ${formatScopeLabel(scopeLabel)}${currentValue !== void 0 ? ` (${currentValue})` : ""}`,
     "Deny reads of .env, keys, and similar secrets on PreToolUse."
   );
-  const enabled = await confirm({
+  const enabled = await escConfirm({
     message: "Keep privacy-block enabled? (deny .env / credentials / keys)",
     default: enabledByDefault
   });
@@ -1465,6 +1559,7 @@ function initOmpCommand(_opts) {
 var AGENTS_MD_SKILLS = [
   "cf-ask",
   "cf-plan",
+  "cf-plan-review",
   "cf-later-do",
   "cf-review",
   "cf-review-out",