@curdx/flow 2.0.0-beta.9 → 2.0.1

package/cli/registry.js

@@ -9,58 +9,107 @@
  * or removing a plugin is a one-file change.
  *
  * Every consumer pulls what it needs via property access:
- *   - install.js     → marketplace + installSpec + hint (+ optional postInstall)
- *   - uninstall.js   → uninstallSpec
- *   - upgrade.js     → installSpec (for `claude plugin update`) + marketplaceId
- *   - doctor.js      → name + installSpec (for manual recovery hints)
+ *   - install.js     → marketplaceSource + installSpec + hint (+ optional postInstall)
+ *   - uninstall.js   → uninstallSpec + uninstallArgs + marketplaceId
+ *   - upgrade.js     → updateSpec + marketplaceId
+ *   - doctor.js      → id + installSpec (for health checks and recovery hints)
  */
 
 export const RECOMMENDED_PLUGINS = [
   {
     name: "pua",
-    marketplace: "tanweai/pua",
-    marketplaceId: "pua",
+    id: "pua@pua-skills",
+    marketplaceSource: "tanweai/pua",
+    marketplaceId: "pua-skills",
     installSpec: "pua@pua-skills",
     uninstallSpec: "pua@pua-skills",
+    updateSpec: "pua@pua-skills",
+    scope: "user",
     hint: "no-give-up + three red lines",
   },
   {
     name: "claude-mem",
-    marketplace: "thedotmack/claude-mem",
+    id: "claude-mem@thedotmack",
+    marketplaceSource: "thedotmack/claude-mem",
     marketplaceId: "thedotmack",
     installSpec: "claude-mem@thedotmack",
     uninstallSpec: "claude-mem@thedotmack",
+    updateSpec: "claude-mem@thedotmack",
+    uninstallArgs: ["--keep-data"],
+    scope: "user",
     hint: "automatic cross-session memory",
     postInstall: "claude-mem-runtimes",
   },
   {
     name: "frontend-design",
-    // Already in default marketplace claude-plugins-official, no add needed
-    marketplace: null,
+    id: "frontend-design@claude-plugins-official",
+    marketplaceSource: "anthropics/claude-plugins-official",
     marketplaceId: "claude-plugins-official",
     installSpec: "frontend-design@claude-plugins-official",
     uninstallSpec: "frontend-design@claude-plugins-official",
+    updateSpec: "frontend-design@claude-plugins-official",
+    scope: "user",
     hint: "Anthropic official UI skill",
   },
   {
     name: "chrome-devtools-mcp",
-    marketplace: "ChromeDevTools/chrome-devtools-mcp",
+    id: "chrome-devtools-mcp@chrome-devtools-plugins",
+    marketplaceSource: "ChromeDevTools/chrome-devtools-mcp",
     marketplaceId: "chrome-devtools-plugins",
     installSpec: "chrome-devtools-mcp@chrome-devtools-plugins",
     uninstallSpec: "chrome-devtools-mcp@chrome-devtools-plugins",
+    updateSpec: "chrome-devtools-mcp@chrome-devtools-plugins",
+    scope: "user",
     hint: "Chrome DevTools + Puppeteer (Google official)",
   },
 ];
 
+export const REQUIRED_PLUGINS = [
+  {
+    name: "context7-plugin",
+    id: "context7-plugin@context7-marketplace",
+    marketplaceSource: "upstash/context7",
+    marketplaceId: "context7-marketplace",
+    installSpec: "context7-plugin@context7-marketplace",
+    uninstallSpec: "context7-plugin@context7-marketplace",
+    updateSpec: "context7-plugin@context7-marketplace",
+    scope: "user",
+    hint: "official Context7 plugin (MCP + skill + docs-researcher agent + /context7:docs)",
+    requiresConfig: true,
+    configType: "apiKey",
+  },
+];
+
+/**
+ * MCP servers that curdx-flow depends on for its core discipline rules and
+ * still registers directly. Starting beta.12 these are registered at
+ * USER-LEVEL via `claude mcp add` instead of plugin.json bundling, so:
+ *
+ *   - Tool names stay standard (mcp__sequential-thinking__*)
+ *     — matching every agent's and knowledge doc's hardcoded references.
+ *
+ * Context7 is installed via Upstash's official Claude Code plugin instead
+ * of direct `claude mcp add`: context7-plugin@context7-marketplace includes
+ * the MCP server, skill, docs-researcher agent, and /context7:docs command.
+ */
+export const BUNDLED_MCPS = [
+  {
+    name: "sequential-thinking",
+    command: "npx",
+    args: ["-y", "@modelcontextprotocol/server-sequential-thinking"],
+    purpose: "structured reasoning for design / review (L2 Mandatory Tool)",
+    preserveExisting: true,
+  },
+];
+
 /**
  * Marketplaces to refresh during `upgrade`. Derived from RECOMMENDED_PLUGINS
  * plus the curdx-flow marketplace itself.
  */
 export const MARKETPLACES_TO_REFRESH = [
   "curdx-flow-marketplace",
-  ...RECOMMENDED_PLUGINS
-    .filter((p) => p.marketplaceId && p.marketplaceId !== "claude-plugins-official")
-    .map((p) => p.marketplaceId),
+  ...REQUIRED_PLUGINS.map((p) => p.marketplaceId),
+  ...RECOMMENDED_PLUGINS.map((p) => p.marketplaceId),
 ];
 
 /**
@@ -69,5 +118,6 @@ export const MARKETPLACES_TO_REFRESH = [
  */
 export const PLUGINS_TO_UPDATE = [
   "curdx-flow@curdx-flow-marketplace",
-  ...RECOMMENDED_PLUGINS.map((p) => p.installSpec),
+  ...REQUIRED_PLUGINS.map((p) => p.updateSpec),
+  ...RECOMMENDED_PLUGINS.map((p) => p.updateSpec),
 ];

package/cli/uninstall.js

@@ -4,6 +4,7 @@
 
 import { existsSync, lstatSync, unlinkSync, rmSync, readlinkSync } from "node:fs";
 import { join } from "node:path";
+import { homedir } from "node:os";
 
 import {
   color,
@@ -15,14 +16,24 @@ import {
   listPlugins,
 } from "./utils.js";
 import { removeGlobalProtocols, GLOBAL_CLAUDE_MD } from "./protocols.js";
-import { RECOMMENDED_PLUGINS } from "./registry.js";
+import { REQUIRED_PLUGINS, RECOMMENDED_PLUGINS, BUNDLED_MCPS } from "./registry.js";
 
-const HOME = process.env.HOME || "";
+const HOME = homedir();
 
 // Pull uninstall-relevant subset from the single registry. See registry.js.
-const RECOMMENDED = RECOMMENDED_PLUGINS.map(({ name, uninstallSpec }) => ({
+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,
 }));
 
 // Symlinks created by install.js (only cleaned with --purge)
@@ -67,7 +78,7 @@ export async function uninstall(args = []) {
   } else {
     const r = await run(
       "claude",
-      ["plugin", "uninstall", "curdx-flow@curdx-flow-marketplace"],
+      ["plugin", "uninstall", "--scope", "user", "curdx-flow@curdx-flow-marketplace"],
       { silent: true }
     );
     if (r.code === 0) {
@@ -113,10 +124,10 @@ export async function uninstall(args = []) {
       for (const name of toRemove) {
         const rec = presentRecs.find((r) => r.name === name);
         log.blank();
-        console.log(`  ${color.cyan("⏳")} Uninstalling ${color.bold(rec.name)}...`);
+        console.log(`  ${color.cyan("▸")} Uninstalling ${color.bold(rec.name)}...`);
         const r = await run(
           "claude",
-          ["plugin", "uninstall", rec.uninstallSpec],
+          ["plugin", "uninstall", "--scope", rec.scope, ...rec.uninstallArgs, rec.uninstallSpec],
           { silent: true }
         );
         if (r.code === 0) {
@@ -130,9 +141,71 @@ export async function uninstall(args = []) {
     }
   }
 
+  // ---------- 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.
+  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", ["mcp", "remove", 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")}`);
+        }
+      }
+    } else {
+      log.info("Keeping user-level MCPs");
+    }
+  }
+
+  // ---------- Step 4.75: uninstall required companion plugins ----------
+  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",
+          ["plugin", "uninstall", "--scope", plugin.scope, ...plugin.uninstallArgs, plugin.uninstallSpec],
+          { 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")}`);
+        }
+      }
+    } else {
+      log.info("Keeping required companion plugins");
+    }
+  }
+
   // ---------- Step 5: cleanup symlinks (only with --purge) ----------
   log.blank();
-  log.step(3, 4, "Runtime symlinks");
+  log.step(3, 4, "Runtime symlinks and marketplaces");
   if (!purge) {
     log.info(
       color.dim("Keeping ~/.local/bin/bun, ~/.local/bin/uv (use --purge to remove)")
@@ -141,6 +214,27 @@ export async function uninstall(args = []) {
       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",
+        ["plugin", "marketplace", "remove", 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}: ${r.stderr.trim().split("\n").pop()}`);
+      }
+    }
+
     for (const link of MANAGED_SYMLINKS) {
       if (!existsSync(link) && !isBrokenSymlink(link)) {
         continue;

package/cli/upgrade.js

@@ -47,7 +47,7 @@ export async function upgrade(args = []) {
       continue;
     }
 
-    const r = await run("claude", ["plugin", "update", spec], { silent: true });
+    const r = await run("claude", ["plugin", "update", "--scope", "user", spec], { silent: true });
     if (r.code === 0) {
       const updated = r.stdout.includes("updated from");
       if (updated) {