@curdx/flow 2.0.17 → 2.0.18

package/cli/uninstall.js

@@ -9,7 +9,6 @@ import { homedir } from "node:os";
 import {
   color,
   log,
-  run,
   resultLastLine,
   resultOutput,
   confirm,
@@ -20,28 +19,15 @@ import {
 import { removeGlobalProtocols, GLOBAL_CLAUDE_MD } from "./protocols.js";
 import { REQUIRED_PLUGINS, RECOMMENDED_PLUGINS, BUNDLED_MCPS } from "./registry.js";
 import {
-  mcpRemoveArgs,
-  pluginMarketplaceRemoveArgs,
-  pluginUninstallArgs,
-} from "./lib/claude-commands.js";
+  removeMcp,
+  removePluginMarketplace,
+  uninstallPlugin,
+} from "./lib/claude-ops.js";
 
 const HOME = homedir();
 
-// Pull uninstall-relevant subset from the single registry. See registry.js.
-const RECOMMENDED = RECOMMENDED_PLUGINS.map(({ name, uninstallSpec, uninstallArgs, marketplaceId, scope }) => ({
-  name,
-  uninstallSpec,
-  uninstallArgs: uninstallArgs || [],
-  marketplaceId,
-  scope,
-}));
-const REQUIRED = REQUIRED_PLUGINS.map(({ name, uninstallSpec, uninstallArgs, marketplaceId, scope }) => ({
-  name,
-  uninstallSpec,
-  uninstallArgs: uninstallArgs || [],
-  marketplaceId,
-  scope,
-}));
+const RECOMMENDED = RECOMMENDED_PLUGINS.map(toUninstallTarget);
+const REQUIRED = REQUIRED_PLUGINS.map(toUninstallTarget);
 
 // Symlinks created by install.js (only cleaned with --purge)
 const MANAGED_SYMLINKS = [
@@ -56,164 +42,175 @@ export async function uninstall(args = []) {
 
   log.title("🗑️  CurdX-Flow Uninstaller");
 
-  // ---------- Step 1: claude CLI present? ----------
   const cv = claudeVersion();
   if (!cv) {
     log.err("claude CLI not found, cannot uninstall plugin.");
     process.exit(1);
   }
 
-  // ---------- Step 2: confirmation ----------
-  if (!yes) {
-    const ok = await confirm(
-      `This will uninstall the ${color.bold("curdx-flow")} plugin. Continue?`,
-      false
-    );
-    if (!ok) {
-      log.info("Cancelled");
-      return;
-    }
+  if (!(await confirmUninstall({ yes }))) {
+    log.info("Cancelled");
+    return;
   }
 
-  // ---------- Step 3: uninstall curdx-flow plugin ----------
+  await uninstallCurdxFlowPlugin();
+  await maybeUninstallRecommendedPlugins({ yes, keepRecommended });
+  await maybeRemoveBundledMcps({ yes, keepRecommended });
+  await maybeUninstallRequiredPlugins({ yes });
+  await maybePurgeRuntimeArtifacts({ purge });
+  removeProtocols();
+  await maybeRemoveProjectState({ yes });
+
+  printSummary({ purge });
+}
+
+async function confirmUninstall({ yes }) {
+  if (yes) return true;
+  return confirm(
+    `This will uninstall the ${color.bold("curdx-flow")} plugin. Continue?`,
+    false
+  );
+}
+
+async function uninstallCurdxFlowPlugin() {
   log.blank();
   log.step(1, 4, "Uninstalling curdx-flow plugin...");
-  const installed = listPlugins();
-  const curdx = installed.find((p) => p.name === "curdx-flow");
+  const curdx = listPlugins().find((plugin) => plugin.name === "curdx-flow");
   if (!curdx) {
     log.info("curdx-flow not installed, skipping");
-  } else {
-    const r = await run(
-      "claude",
-      pluginUninstallArgs({
-        scope: "user",
-        uninstallSpec: "curdx-flow@curdx-flow-marketplace",
-      }),
-      { silent: true }
-    );
-    if (r.code === 0) {
-      log.ok("curdx-flow uninstalled");
-    } else {
-      log.err(`Uninstall failed: ${resultOutput(r)}`);
-    }
+    return;
   }
 
-  // ---------- Step 4: optionally uninstall recommended ----------
+  const result = await uninstallPlugin({
+    scope: "user",
+    uninstallSpec: "curdx-flow@curdx-flow-marketplace",
+  });
+  if (result.code === 0) {
+    log.ok("curdx-flow uninstalled");
+    return;
+  }
+
+  log.err(`Uninstall failed: ${resultOutput(result)}`);
+}
+
+async function maybeUninstallRecommendedPlugins({ yes, keepRecommended }) {
   log.blank();
   log.step(2, 4, "Recommended plugins");
   if (keepRecommended) {
     log.info("Keeping recommended plugins (--keep-recommended)");
-  } else {
-    const currentlyInstalled = listPlugins();
-    const presentRecs = RECOMMENDED.filter((r) =>
-      currentlyInstalled.find((p) => p.name === r.name)
+    return;
+  }
+
+  const currentlyInstalled = listPlugins();
+  const present = RECOMMENDED.filter((entry) =>
+    currentlyInstalled.some((plugin) => plugin.name === entry.name)
+  );
+  if (present.length === 0) {
+    log.info("No installed recommended plugins");
+    return;
+  }
+
+  const selected = await selectPluginsToRemove({ yes, present });
+  for (const name of selected) {
+    const entry = present.find((plugin) => plugin.name === name);
+    if (!entry) continue;
+    await uninstallNamedPlugin(entry);
+  }
+}
+
+async function selectPluginsToRemove({ yes, present }) {
+  if (yes) {
+    log.info(
+      color.dim("--yes mode: keeping recommended plugins (use --purge to remove them)")
     );
+    return [];
+  }
 
-    if (presentRecs.length === 0) {
-      log.info("No installed recommended plugins");
-    } else {
-      let toRemove;
-      if (yes) {
-        toRemove = []; // Default to none — user must opt in explicitly
-        log.info(
-          color.dim("--yes mode: keeping recommended plugins (use --purge to remove them)")
-        );
-      } else {
-        const choices = presentRecs.map((r) => ({
-          label: color.bold(r.name),
-          value: r.name,
-          hint: "",
-        }));
-        toRemove = await multiSelect(
-          "Which recommended plugins to also uninstall? (default: none)",
-          choices,
-          [] // default: nothing checked
-        );
-      }
+  const choices = present.map((entry) => ({
+    label: color.bold(entry.name),
+    value: entry.name,
+    hint: "",
+  }));
+  return multiSelect(
+    "Which recommended plugins to also uninstall? (default: none)",
+    choices,
+    []
+  );
+}
 
-      for (const name of toRemove) {
-        const rec = presentRecs.find((r) => r.name === name);
-        log.blank();
-        console.log(`  ${color.cyan("▸")} Uninstalling ${color.bold(rec.name)}...`);
-        const r = await run(
-          "claude",
-          pluginUninstallArgs(rec),
-          { silent: true }
-        );
-        if (r.code === 0) {
-          console.log(`  ${color.green("✓")} ${rec.name} uninstalled`);
-        } else {
-          console.log(
-            `  ${color.red("✗")} ${rec.name} uninstall failed: ${resultLastLine(r)}`
-          );
-        }
-      }
-    }
+async function uninstallNamedPlugin(entry) {
+  log.blank();
+  console.log(`  ${color.cyan("▸")} Uninstalling ${color.bold(entry.name)}...`);
+  const result = await uninstallPlugin(entry);
+  if (result.code === 0) {
+    console.log(`  ${color.green("✓")} ${entry.name} uninstalled`);
+    return;
   }
 
-  // ---------- Step 4.5: optionally remove user-level MCPs ----------
-  // Starting beta.12, the install command registers context7 +
-  // sequential-thinking at user-level (not plugin-bundled). Ask before
-  // removing because the user may have customised args (e.g. --api-key)
-  // or still be using these MCPs outside curdx-flow.
+  console.log(
+    `  ${color.red("✗")} ${entry.name} uninstall failed: ${resultLastLine(result)}`
+  );
+}
+
+async function maybeRemoveBundledMcps({ yes, keepRecommended }) {
   log.blank();
   log.info("Required MCP servers (context7, sequential-thinking)");
   if (keepRecommended || yes) {
     log.info(
       color.dim("--yes or --keep-recommended: keeping user-level MCPs (remove manually with `claude mcp remove <name>`)")
     );
-  } else {
-    const removeMcps = await confirm(
-      `Remove user-level MCPs registered by install (${BUNDLED_MCPS.map((m) => m.name).join(", ")})? ${color.dim("(keeps them if other tools depend on them)")}`,
-      false
-    );
-    if (removeMcps) {
-      for (const mcp of BUNDLED_MCPS) {
-        const r = await run("claude", mcpRemoveArgs({ name: mcp.name }), {
-          silent: true,
-        });
-        if (r.code === 0) {
-          log.ok(`  ${mcp.name.padEnd(22)} removed`);
-        } else {
-          log.info(`  ${mcp.name.padEnd(22)} ${color.dim("not present or already removed")}`);
-        }
-      }
+    return;
+  }
+
+  const removeMcps = await confirm(
+    `Remove user-level MCPs registered by install (${BUNDLED_MCPS.map((mcp) => mcp.name).join(", ")})? ${color.dim("(keeps them if other tools depend on them)")}`,
+    false
+  );
+  if (!removeMcps) {
+    log.info("Keeping user-level MCPs");
+    return;
+  }
+
+  for (const mcp of BUNDLED_MCPS) {
+    const result = await removeMcp({ name: mcp.name });
+    if (result.code === 0) {
+      log.ok(`  ${mcp.name.padEnd(22)} removed`);
     } else {
-      log.info("Keeping user-level MCPs");
+      log.info(`  ${mcp.name.padEnd(22)} ${color.dim("not present or already removed")}`);
     }
   }
+}
 
-  // ---------- Step 4.75: uninstall required companion plugins ----------
+async function maybeUninstallRequiredPlugins({ yes }) {
   log.blank();
   log.info("Required companion plugins");
   if (yes) {
     log.info(
       color.dim("--yes mode: keeping required companion plugins (use --purge to remove them)")
     );
-  } else {
-    const removeRequired = await confirm(
-      `Remove required companion plugins (${REQUIRED.map((p) => p.name).join(", ")})? ${color.dim("(keeps shared tools available if other workflows depend on them)")}`,
-      false
-    );
-    if (removeRequired) {
-      for (const plugin of REQUIRED) {
-        const r = await run(
-          "claude",
-          pluginUninstallArgs(plugin),
-          { silent: true }
-        );
-        if (r.code === 0) {
-          log.ok(`  ${plugin.name.padEnd(22)} uninstalled`);
-        } else {
-          log.info(`  ${plugin.name.padEnd(22)} ${color.dim("not present or already removed")}`);
-        }
-      }
+    return;
+  }
+
+  const removeRequired = await confirm(
+    `Remove required companion plugins (${REQUIRED.map((plugin) => plugin.name).join(", ")})? ${color.dim("(keeps shared tools available if other workflows depend on them)")}`,
+    false
+  );
+  if (!removeRequired) {
+    log.info("Keeping required companion plugins");
+    return;
+  }
+
+  for (const plugin of REQUIRED) {
+    const result = await uninstallPlugin(plugin);
+    if (result.code === 0) {
+      log.ok(`  ${plugin.name.padEnd(22)} uninstalled`);
     } else {
-      log.info("Keeping required companion plugins");
+      log.info(`  ${plugin.name.padEnd(22)} ${color.dim("not present or already removed")}`);
     }
   }
+}
 
-  // ---------- Step 5: cleanup symlinks (only with --purge) ----------
+async function maybePurgeRuntimeArtifacts({ purge }) {
   log.blank();
   log.step(3, 4, "Runtime symlinks and marketplaces");
   if (!purge) {
@@ -223,116 +220,139 @@ export async function uninstall(args = []) {
     log.info(
       color.dim("Reason: these bun/uv binaries may be used by other tools — confirm before deleting")
     );
-  } else {
-    const marketplaceIds = [
-      ...new Set(
-        RECOMMENDED
-          .concat(REQUIRED)
-          .map((r) => r.marketplaceId)
-          .filter((id) => id && id !== "claude-plugins-official")
-      ),
-    ];
-    for (const marketplaceId of marketplaceIds) {
-      const r = await run(
-        "claude",
-        pluginMarketplaceRemoveArgs(marketplaceId),
-        { silent: true }
-      );
-      if (r.code === 0) {
-        log.ok(`Removed marketplace ${marketplaceId}`);
-      } else if (!r.stderr.includes("not found")) {
-        log.warn(`Failed to remove marketplace ${marketplaceId}: ${resultLastLine(r)}`);
-      }
+    return;
+  }
+
+  await purgeManagedMarketplaces();
+  removeManagedSymlinks();
+}
+
+async function purgeManagedMarketplaces() {
+  const marketplaceIds = [
+    ...new Set(
+      RECOMMENDED
+        .concat(REQUIRED)
+        .map((entry) => entry.marketplaceId)
+        .filter((id) => id && id !== "claude-plugins-official")
+    ),
+  ];
+
+  for (const marketplaceId of marketplaceIds) {
+    const result = await removePluginMarketplace(marketplaceId);
+    if (result.code === 0) {
+      log.ok(`Removed marketplace ${marketplaceId}`);
+    } else if (!result.stderr.includes("not found")) {
+      log.warn(`Failed to remove marketplace ${marketplaceId}: ${resultLastLine(result)}`);
     }
+  }
+}
 
-    for (const link of MANAGED_SYMLINKS) {
-      if (!existsSync(link) && !isBrokenSymlink(link)) {
+function removeManagedSymlinks() {
+  for (const link of MANAGED_SYMLINKS) {
+    if (!existsSync(link) && !isBrokenSymlink(link)) {
+      continue;
+    }
+    try {
+      const stat = lstatSync(link);
+      if (!stat.isSymbolicLink()) {
+        log.warn(
+          `${link} is not a symlink (likely a real file placed by the user), skipping`
+        );
         continue;
       }
-      try {
-        const stat = lstatSync(link);
-        if (!stat.isSymbolicLink()) {
-          log.warn(
-            `${link} is not a symlink (likely a real file placed by the user), skipping`
-          );
-          continue;
-        }
-        const target = readlinkSync(link);
-        unlinkSync(link);
-        log.ok(`Removed symlink ${link} ${color.dim(`(was → ${target})`)}`);
-      } catch (err) {
-        log.warn(`Failed to remove ${link}: ${err.message}`);
-      }
+      const target = readlinkSync(link);
+      unlinkSync(link);
+      log.ok(`Removed symlink ${link} ${color.dim(`(was → ${target})`)}`);
+    } catch (err) {
+      log.warn(`Failed to remove ${link}: ${err.message}`);
     }
   }
+}
 
-  // ---------- Step 5.5: remove global protocols block ----------
+function removeProtocols() {
   log.blank();
   console.log(color.dim("Removing global protocols from ~/.claude/CLAUDE.md..."));
   try {
-    const r = removeGlobalProtocols();
-    if (r.action === "removed") {
+    const result = removeGlobalProtocols();
+    if (result.action === "removed") {
       log.ok(`Global protocols removed ${color.dim(`(${GLOBAL_CLAUDE_MD})`)}`);
-    } else if (r.action === "not-present") {
-      log.info(`Global protocols not present, skipping`);
+    } else if (result.action === "not-present") {
+      log.info("Global protocols not present, skipping");
     } else {
-      log.info(`~/.claude/CLAUDE.md does not exist, skipping`);
+      log.info("~/.claude/CLAUDE.md does not exist, skipping");
     }
   } catch (err) {
     log.warn(`Protocol removal failed: ${err.message}`);
   }
+}
 
-  // ---------- Step 6: project .flow/ ----------
+async function maybeRemoveProjectState({ yes }) {
   log.blank();
   log.step(4, 4, "Project state directory");
   const flowDir = join(process.cwd(), ".flow");
   if (!existsSync(flowDir)) {
     log.info(".flow/ does not exist, skipping");
-  } else if (yes) {
+    return;
+  }
+
+  if (yes) {
     log.info(
       color.dim("--yes mode: keeping .flow/ (contains specs & decisions — confirm by hand before deleting)")
     );
-  } else {
-    const ok = await confirm(
-      `${color.red("DANGER:")} delete the ${color.bold(".flow/")} directory of the current project? ${color.dim("(includes all specs / decisions, not recoverable)")}`,
-      false
-    );
-    if (ok) {
-      try {
-        rmSync(flowDir, { recursive: true, force: true });
-        log.ok(`Removed ${flowDir}`);
-      } catch (err) {
-        log.err(`Removal failed: ${err.message}`);
-      }
-    } else {
-      log.info("Keeping .flow/");
-    }
+    return;
+  }
+
+  const ok = await confirm(
+    `${color.red("DANGER:")} delete the ${color.bold(".flow/")} directory of the current project? ${color.dim("(includes all specs / decisions, not recoverable)")}`,
+    false
+  );
+  if (!ok) {
+    log.info("Keeping .flow/");
+    return;
   }
 
-  // ---------- Summary ----------
+  try {
+    rmSync(flowDir, { recursive: true, force: true });
+    log.ok(`Removed ${flowDir}`);
+  } catch (err) {
+    log.err(`Removal failed: ${err.message}`);
+  }
+}
+
+function printSummary({ purge }) {
   log.blank();
   console.log(color.bold("✅ Uninstall complete"));
-  if (!purge) {
-    console.log(
-      color.dim(
-        `\nArtifacts kept:\n` +
-          `  - ~/.local/bin/bun, ~/.local/bin/uv (symlinks; use --purge to remove)\n` +
-          `  - bun/uv binaries themselves (~/.bun/bin/bun, ~/.local/bin/uv real installs)\n` +
-          `  - claude-mem data (~/.claude-mem/)\n` +
-          `  - claude marketplace cache`
-      )
-    );
-    console.log(
-      color.dim(
-        `\nFully purge: ${color.cyan("curdx-flow uninstall --purge")}`
-      )
-    );
-  }
+  if (purge) return;
+
+  console.log(
+    color.dim(
+      `\nArtifacts kept:\n` +
+        `  - ~/.local/bin/bun, ~/.local/bin/uv (symlinks; use --purge to remove)\n` +
+        `  - bun/uv binaries themselves (~/.bun/bin/bun, ~/.local/bin/uv real installs)\n` +
+        `  - claude-mem data (~/.claude-mem/)\n` +
+        `  - claude marketplace cache`
+    )
+  );
+  console.log(
+    color.dim(
+      `\nFully purge: ${color.cyan("curdx-flow uninstall --purge")}`
+    )
+  );
+}
+
+function toUninstallTarget(entry) {
+  return {
+    name: entry.name,
+    uninstallSpec: entry.uninstallSpec,
+    uninstallArgs: entry.uninstallArgs || [],
+    marketplaceId: entry.marketplaceId,
+    scope: entry.scope,
+  };
 }
 
-function isBrokenSymlink(p) {
+function isBrokenSymlink(pathname) {
   try {
-    return lstatSync(p).isSymbolicLink();
+    return lstatSync(pathname).isSymbolicLink();
   } catch {
     return false;
   }

package/cli/upgrade.js

@@ -2,15 +2,15 @@
  * upgrade command — update curdx-flow + recommended plugins to latest.
  */
 
-import { color, log, run, listPlugins, claudeVersion, resultLastLine } from "./utils.js";
+import { color, log, listPlugins, claudeVersion, resultLastLine } from "./utils.js";
 import {
   PLUGINS_TO_UPDATE,
   MARKETPLACES_TO_REFRESH,
 } from "./registry.js";
 import {
-  pluginMarketplaceUpdateArgs,
-  pluginUpdateArgs,
-} from "./lib/claude-commands.js";
+  updatePlugin,
+  updatePluginMarketplace,
+} from "./lib/claude-ops.js";
 
 export async function upgrade(args = []) {
   log.title("⬆️  CurdX-Flow upgrade");
@@ -23,11 +23,7 @@ export async function upgrade(args = []) {
   // Refresh marketplaces first (derived from cli/registry.js)
   log.step(1, 2, "Refreshing marketplaces...");
   for (const mp of MARKETPLACES_TO_REFRESH) {
-    const r = await run(
-      "claude",
-      pluginMarketplaceUpdateArgs(mp),
-      { silent: true }
-    );
+    const r = await updatePluginMarketplace(mp);
     if (r.code === 0) {
       log.ok(`   ${mp}`);
     } else {
@@ -51,7 +47,7 @@ export async function upgrade(args = []) {
       continue;
     }
 
-    const r = await run("claude", pluginUpdateArgs({ spec }), { silent: true });
+    const r = await updatePlugin(spec);
     if (r.code === 0) {
       const updated = r.stdout.includes("updated from");
       if (updated) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@curdx/flow",
-  "version": "2.0.17",
+  "version": "2.0.18",
   "description": "CLI installer for CurdX-Flow — AI engineering workflow meta-framework for Claude Code",
   "type": "module",
   "bin": {