@curdx/flow 2.3.9 → 2.3.11

package/.claude-plugin/marketplace.json

@@ -6,7 +6,7 @@
   },
   "metadata": {
     "description": "Claude Code Discipline Layer — spec-driven workflow + goal-backward verification + Karpathy 4 principles enforced via gates. Stops Claude from faking \"done\" on non-trivial features.",
-    "version": "2.3.9"
+    "version": "2.3.11"
   },
   "allowCrossMarketplaceDependenciesOn": [
     "context7-marketplace"
@@ -16,7 +16,7 @@
       "name": "curdx-flow",
       "source": "./",
       "description": "Claude Code Discipline Layer — spec-driven workflow + goal-backward verification + Karpathy 4 principles enforced via gates. Stops Claude from faking \"done\" on non-trivial features.",
-      "version": "2.3.9",
+      "version": "2.3.11",
       "author": {
         "name": "wdx",
         "email": "bydongxin@gmail.com"

package/.claude-plugin/plugin.json

@@ -1,6 +1,6 @@
 {
   "name": "curdx-flow",
-  "version": "2.3.9",
+  "version": "2.3.11",
   "description": "Claude Code Discipline Layer — spec-driven workflow + goal-backward verification + Karpathy 4 principles enforced via gates. Stops Claude from faking \"done\" on non-trivial features.",
   "author": {
     "name": "wdx",

package/cli/README.md

@@ -63,9 +63,14 @@ This keeps the CLI scoped to install-time and lifecycle operations only — anyt
 
 `claude plugin marketplace update` + `claude plugin update --scope user` for every installed curdx-flow-related plugin.
 
+After updating, `upgrade` also reconciles retired Context7 install artifacts:
+
+- removes the old user-level `context7` MCP if the official `context7-plugin` already owns it
+- removes any stale `context7ApiKey` entry from `~/.claude/curdx-flow-config.json`
+
 ### `uninstall [-y] [--keep-recommended] [--purge]`
 
-Inverse of `install`. By default removes only the curdx-flow plugin. Recommended plugins are kept unless selected interactively. With `--purge`, also removes third-party marketplaces and the `~/.local/bin/bun` / `~/.local/bin/uv` symlinks created by install.
+Inverse of `install`. By default removes only the curdx-flow plugin. Recommended plugins are kept unless selected interactively. With `--purge`, also removes third-party marketplaces, the `~/.local/bin/bun` / `~/.local/bin/uv` symlinks created by install, and any retired Context7 user-level MCP / stored API key left behind by older CurDX-Flow releases.
 
 ## Why a CLI?
 

package/cli/doctor-workflow.js

@@ -2,7 +2,9 @@ import fs from "node:fs/promises";
 import path from "node:path";
 import { fileURLToPath } from "node:url";
 
+import { removeMcp } from "./lib/claude-ops.js";
 import { readProjectClaudeSettings } from "./lib/doctor-claude-settings.js";
+import { CONFIG_FILE, readConfig, writeConfig } from "./lib/config.js";
 import { inspectRuntimeEnvironment } from "./lib/doctor-runtime-environment.js";
 import {
   claudeVersion,
@@ -310,6 +312,7 @@ export async function collectDoctorData(
     readProjectTeamConfigImpl = readProjectTeamConfig,
     readProjectClaudeSettingsImpl = readProjectClaudeSettings,
     readBundledPluginRuntimeDefaultsImpl = readBundledPluginRuntimeDefaults,
+    readConfigImpl = readConfig,
   } = {}
 ) {
   const claudeVersionValue = claudeVersionImpl();
@@ -338,6 +341,10 @@ export async function collectDoctorData(
     projectTeamConfig: await readProjectTeamConfigImpl(cwd),
     projectClaudeSettings: await readProjectClaudeSettingsImpl(cwd),
     bundledPluginRuntimeDefaults: await readBundledPluginRuntimeDefaultsImpl(),
+    legacyInstallState: {
+      configPath: CONFIG_FILE,
+      hasLegacyContext7ApiKey: Object.prototype.hasOwnProperty.call(readConfigImpl(), "context7ApiKey"),
+    },
   };
 }
 
@@ -345,9 +352,47 @@ export async function applyDoctorFixes(
   doctorData,
   {
     ensureClaudeMemRuntimesImpl = ensureClaudeMemRuntimes,
+    removeMcpImpl = removeMcp,
+    readConfigImpl = readConfig,
+    writeConfigImpl = writeConfig,
   } = {}
 ) {
   const fixes = [];
+  const context7PluginOwnsMcp = doctorData.mcps.some(
+    (entry) => entry.name === "context7" && entry.plugin === "context7-plugin"
+  );
+  const hasLegacyUserContext7Mcp =
+    doctorData.userMcpConfig instanceof Map && doctorData.userMcpConfig.has("context7");
+
+  if (context7PluginOwnsMcp && hasLegacyUserContext7Mcp) {
+    const result = await removeMcpImpl({ name: "context7" });
+    if (result.code === 0) {
+      doctorData.userMcpConfig.delete("context7");
+      doctorData.mcps = doctorData.mcps.filter(
+        (entry) => !(entry.name === "context7" && entry.plugin == null)
+      );
+      fixes.push({
+        kind: "legacy-context7-user-mcp-removed",
+      });
+    }
+  }
+
+  if (doctorData.legacyInstallState?.hasLegacyContext7ApiKey) {
+    const config = readConfigImpl();
+    if (Object.prototype.hasOwnProperty.call(config, "context7ApiKey")) {
+      delete config.context7ApiKey;
+      writeConfigImpl(config);
+      doctorData.legacyInstallState = {
+        ...doctorData.legacyInstallState,
+        hasLegacyContext7ApiKey: false,
+      };
+      fixes.push({
+        kind: "legacy-context7-api-key-removed",
+        configPath: CONFIG_FILE,
+      });
+    }
+  }
+
   const claudeMemEnabled = doctorData.plugins.some(
     (plugin) => plugin.name === "claude-mem" && plugin.status === "enabled"
   );

package/cli/install-companions.js

@@ -8,7 +8,7 @@
  *   install-required-plugins.js    — required Claude Code companion plugins
  *   install-bundled-mcps.js        — user-level MCP registration
  *   install-recommended-plugins.js — optional recommended plugins
- *   install-context7-config.js     — context7 API-key prompt (private to required)
+ *   install-context7-config.js     — legacy Context7 state reconciliation (private to required)
  */
 
 export {

package/cli/install-context7-config.js

@@ -1,7 +1,7 @@
 /**
  * Reconcile legacy Context7 install state after the official plugin is
- * installed. Private to the required-plugins concern; not re-exported from
- * install-companions.js.
+ * installed or refreshed. Private to the required-plugins concern; not
+ * re-exported from install-companions.js.
  */
 
 import { removeMcp } from "./lib/claude-ops.js";
@@ -13,7 +13,7 @@ import {
   writeConfig,
 } from "./utils.js";
 
-export async function installContext7Config(
+export async function reconcileLegacyContext7InstallState(
   plugin,
   language,
   config,
@@ -76,3 +76,5 @@ export async function installContext7Config(
     removedStoredApiKey,
   };
 }
+
+export const installContext7Config = reconcileLegacyContext7InstallState;

package/cli/install-required-plugins.js

@@ -6,7 +6,7 @@
 import { addPluginMarketplace, installPlugin } from "./lib/claude-ops.js";
 import { REQUIRED_PLUGINS } from "./registry.js";
 import { color, log, resultLastLine } from "./utils.js";
-import { installContext7Config } from "./install-context7-config.js";
+import { reconcileLegacyContext7InstallState } from "./install-context7-config.js";
 
 export async function addRequiredPluginMarketplaces({ logWarnings = true } = {}) {
   for (const plugin of REQUIRED_PLUGINS) {
@@ -36,7 +36,7 @@ export async function installRequiredPlugins({
       console.log(`  ${color.green("✓")} ${plugin.name} installed`);
 
       if (plugin.name === "context7-plugin") {
-        await installContext7Config(plugin, language, config);
+        await reconcileLegacyContext7InstallState(plugin, language, config);
       }
     } else {
       console.log(

package/cli/lib/config.js

@@ -3,7 +3,7 @@ import { homedir } from "node:os";
 import { join } from "node:path";
 
 const CONFIG_DIR = join(homedir(), ".claude");
-const CONFIG_FILE = join(CONFIG_DIR, "curdx-flow-config.json");
+export const CONFIG_FILE = join(CONFIG_DIR, "curdx-flow-config.json");
 
 export function readConfig() {
   if (!existsSync(CONFIG_FILE)) {

package/cli/lib/doctor-report.js

@@ -224,6 +224,7 @@ export function buildDoctorReport({
   projectTeamConfig,
   projectClaudeSettings,
   bundledPluginRuntimeDefaults,
+  legacyInstallState,
 }) {
   const lines = [];
   const sections = [];
@@ -402,6 +403,12 @@ export function buildDoctorReport({
           "migration: claude plugin update curdx-flow@curdx-flow-marketplace",
           "then restart Claude Code",
         ]
+        : duplicate.pluginEntry.plugin === "context7-plugin" && duplicate.name === "context7"
+          ? [
+            "official Context7 plugin already owns the context7 MCP server",
+            "run: npx @curdx/flow doctor --fix",
+            `or run manually: claude mcp remove --scope user ${duplicate.name}`,
+          ]
         : [
           `remove the duplicate user-level server if plugin:${duplicate.pluginEntry.plugin} should own it`,
           `run: claude mcp remove --scope user ${duplicate.name}`,
@@ -415,6 +422,20 @@ export function buildDoctorReport({
     }
   }
 
+  if (legacyInstallState?.hasLegacyContext7ApiKey) {
+    const legacySection = createSection("Legacy installer state:");
+    pushSectionLine(
+      legacySection,
+      "warn",
+      "legacy Context7 API key stored in curdx-flow install config",
+      [
+        `path: ${legacyInstallState.configPath}`,
+        "this key belonged to the retired user-level Context7 MCP install flow and is no longer used by the official context7-plugin",
+        "run: npx @curdx/flow doctor --fix",
+      ]
+    );
+  }
+
   if (claudeMemEnabled && runtimeStatus) {
     const runtimeSection = createSection("Runtime (claude-mem dependencies):");
     for (const [name, status] of Object.entries(runtimeStatus)) {

package/cli/uninstall-actions.js

@@ -3,6 +3,7 @@ import { join } from "node:path";
 import { homedir } from "node:os";
 
 import { REQUIRED_PLUGINS, RECOMMENDED_PLUGINS, BUNDLED_MCPS } from "./registry.js";
+import { readConfig, writeConfig } from "./lib/config.js";
 import {
   removeMcp,
   removePluginMarketplace,
@@ -16,6 +17,7 @@ import {
   resultLastLine,
   resultOutput,
 } from "./utils.js";
+import { reconcileLegacyContext7InstallState } from "./install-context7-config.js";
 import {
   UNINSTALL_STEP_COUNT,
   getInstalledTargets,
@@ -124,7 +126,7 @@ export async function maybeRemoveBundledMcps(
   } = {}
 ) {
   logImpl.blank();
-  logImpl.info("Required MCP servers (context7, sequential-thinking)");
+  logImpl.info("Required user-level MCP servers (sequential-thinking)");
   if (shouldKeepBundledMcpsImpl({ yes, keepRecommended })) {
     logImpl.info(
       color.dim("--yes or --keep-recommended: keeping user-level MCPs (remove manually with `claude mcp remove <name>`)")
@@ -193,6 +195,10 @@ export async function maybePurgeRuntimeArtifacts(
   {
     purgeManagedMarketplacesImpl = purgeManagedMarketplaces,
     removeManagedSymlinksImpl = removeManagedSymlinks,
+    readConfigImpl = readConfig,
+    writeConfigImpl = writeConfig,
+    removeMcpImpl = removeMcp,
+    readUserMcpConfigImpl,
     logImpl = log,
   } = {}
 ) {
@@ -210,6 +216,13 @@ export async function maybePurgeRuntimeArtifacts(
 
   await purgeManagedMarketplacesImpl();
   removeManagedSymlinksImpl();
+  await purgeLegacyContext7InstallState({
+    readConfigImpl,
+    writeConfigImpl,
+    removeMcpImpl,
+    readUserMcpConfigImpl,
+    logImpl,
+  });
 }
 
 export async function maybeRemoveProjectState(
@@ -304,6 +317,30 @@ function removeManagedSymlinks(
   }
 }
 
+async function purgeLegacyContext7InstallState(
+  {
+    readConfigImpl = readConfig,
+    writeConfigImpl = writeConfig,
+    removeMcpImpl = removeMcp,
+    readUserMcpConfigImpl,
+    logImpl = log,
+  } = {}
+) {
+  const config = readConfigImpl();
+  const language = config?.language === "zh" ? "zh" : "en";
+  await reconcileLegacyContext7InstallState(
+    { name: "context7-plugin" },
+    language,
+    config,
+    {
+      writeConfigImpl,
+      removeMcpImpl,
+      readUserMcpConfigImpl,
+      logImpl,
+    }
+  );
+}
+
 function toUninstallTarget(entry) {
   return {
     name: entry.name,

package/cli/upgrade-workflow.js

@@ -1,6 +1,6 @@
 import { claudeVersion, color, listPlugins, log, resultLastLine } from "./utils.js";
 
-export const UPGRADE_STEP_COUNT = 2;
+export const UPGRADE_STEP_COUNT = 3;
 
 export function ensureClaudeCliAvailableForUpgrade(
   { claudeVersionImpl = claudeVersion, logImpl = log, exitImpl = process.exit } = {}

package/cli/upgrade.js

@@ -2,7 +2,8 @@
  * upgrade command — update curdx-flow + recommended plugins to latest.
  */
 
-import { log } from "./utils.js";
+import { log, readConfig } from "./utils.js";
+import { reconcileLegacyContext7InstallState } from "./install-context7-config.js";
 import {
   PLUGINS_TO_UPDATE,
   MARKETPLACES_TO_REFRESH,
@@ -21,43 +22,70 @@ import {
   UPGRADE_STEP_COUNT,
 } from "./upgrade-workflow.js";
 
-export async function upgrade(args = []) {
-  log.title("⬆️  CurdX-Flow upgrade");
+export async function upgrade(
+  args = [],
+  {
+    updatePluginImpl = updatePlugin,
+    updatePluginMarketplaceImpl = updatePluginMarketplace,
+    ensureClaudeCliAvailableForUpgradeImpl = ensureClaudeCliAvailableForUpgrade,
+    getInstalledPluginNamesImpl = getInstalledPluginNames,
+    readConfigImpl = readConfig,
+    reconcileLegacyContext7InstallStateImpl = reconcileLegacyContext7InstallState,
+    logImpl = log,
+  } = {}
+) {
+  logImpl.title("⬆️  CurdX-Flow upgrade");
 
-  ensureClaudeCliAvailableForUpgrade();
+  ensureClaudeCliAvailableForUpgradeImpl({ logImpl });
 
   // Refresh marketplaces first (derived from cli/registry.js)
   await refreshMarketplaces(MARKETPLACES_TO_REFRESH, {
-    updatePluginMarketplaceImpl: updatePluginMarketplace,
+    updatePluginMarketplaceImpl,
+    logImpl,
   });
 
   // Update each plugin
-  log.blank();
-  log.step(2, UPGRADE_STEP_COUNT, "Updating installed plugins...");
-  const installedNames = getInstalledPluginNames();
+  logImpl.blank();
+  logImpl.step(2, UPGRADE_STEP_COUNT, "Updating installed plugins...");
+  const installedNames = getInstalledPluginNamesImpl();
 
   for (const spec of PLUGINS_TO_UPDATE) {
     const pluginName = getPluginNameFromSpec(spec);
     if (!installedNames.has(pluginName)) {
-      log.info(`   ${pluginName.padEnd(22)} not installed, skipping`);
+      logImpl.info(`   ${pluginName.padEnd(22)} not installed, skipping`);
       continue;
     }
 
-    const result = await updatePlugin(spec);
+    const result = await updatePluginImpl(spec);
     const status = classifyPluginUpdateResult(result);
 
     if (status.status === "updated") {
-      log.ok(`   ${pluginName.padEnd(22)} ${status.message}`);
+      logImpl.ok(`   ${pluginName.padEnd(22)} ${status.message}`);
       continue;
     }
 
     if (status.status === "unchanged") {
-      log.info(`   ${pluginName.padEnd(22)} ${status.message}`);
+      logImpl.info(`   ${pluginName.padEnd(22)} ${status.message}`);
       continue;
     }
 
-    log.warn(`   ${pluginName.padEnd(22)} ${status.message}`);
+    logImpl.warn(`   ${pluginName.padEnd(22)} ${status.message}`);
   }
 
-  printUpgradeSummary();
+  logImpl.blank();
+  logImpl.step(3, UPGRADE_STEP_COUNT, "Reconciling legacy Context7 state...");
+  if (installedNames.has("context7-plugin")) {
+    const config = readConfigImpl();
+    const language = config?.language === "zh" ? "zh" : "en";
+    await reconcileLegacyContext7InstallStateImpl(
+      { name: "context7-plugin" },
+      language,
+      config,
+      { logImpl }
+    );
+  } else {
+    logImpl.info("   context7-plugin          not installed, skipping");
+  }
+
+  printUpgradeSummary({ logImpl });
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@curdx/flow",
-  "version": "2.3.9",
+  "version": "2.3.11",
   "description": "Skill-first discipline layer and CLI installer for Claude Code",
   "type": "module",
   "bin": {