claude-flow 3.10.4 → 3.10.5

package/v3/@claude-flow/cli/dist/src/init/executor.js

@@ -744,16 +744,22 @@ function detectExistingRufloMCP(targetDir) {
             const parsed = JSON.parse(fs.readFileSync(candidate, 'utf-8'));
             if (!parsed || typeof parsed !== 'object')
                 continue;
-            // (a) Top-level mcpServers (legacy / global form)
+            // (a) Top-level mcpServers (legacy / global form).
+            // #2207: accept BOTH the old 'ruflo' key AND the new 'claude-flow' key so that
+            // a prior install with either key is correctly detected as already-initialized.
+            // This also avoids the reverse problem: after #2206 fixed the generator to write
+            // 'claude-flow', a second `ruflo init` must still recognise the existing install.
             if (parsed.mcpServers && typeof parsed.mcpServers === 'object') {
-                if ('ruflo' in parsed.mcpServers)
+                const servers = parsed.mcpServers;
+                if ('claude-flow' in servers || 'ruflo' in servers)
                     return candidate;
             }
             // (b) #1840: Claude Code project-scoped registrations under
-            //     parsed.projects[<projectPath>].mcpServers.ruflo. Match by
+            //     parsed.projects[<projectPath>].mcpServers. Match by
             //     normalized path against targetDir or any of its ancestors so
-            //     a `claude mcp add ruflo` in this repo is detected even when
-            //     Claude stored the key with different casing/slash style.
+            //     a `claude mcp add claude-flow` (or legacy `ruflo`) in this repo is
+            //     detected even when Claude stored the key with different casing/slash style.
+            // #2207: accept both keys here too.
             if (parsed.projects && typeof parsed.projects === 'object') {
                 for (const [projectKey, projectVal] of Object.entries(parsed.projects)) {
                     if (!projectVal || typeof projectVal !== 'object')
@@ -761,7 +767,8 @@ function detectExistingRufloMCP(targetDir) {
                     const projectMcp = projectVal.mcpServers;
                     if (!projectMcp || typeof projectMcp !== 'object')
                         continue;
-                    if (!('ruflo' in projectMcp))
+                    const mcp = projectMcp;
+                    if (!('claude-flow' in mcp) && !('ruflo' in mcp))
                         continue;
                     if (targetAncestors.has(normalizeProjectKey(projectKey))) {
                         return `${candidate} (projects[${projectKey}])`;
@@ -1810,6 +1817,18 @@ async function writeClaudeMd(targetDir, options, result) {
         result.skipped.push('CLAUDE.md');
     }
     else {
+        // #2208: if overwriting an existing CLAUDE.md (force mode), back it up first so
+        // users don't silently lose curated project context.
+        if (fs.existsSync(claudeMdPath)) {
+            const backupBase = `${claudeMdPath}.pre-ruflo`;
+            // Don't clobber an existing backup — append a timestamp if one already exists.
+            const backupPath = fs.existsSync(backupBase)
+                ? `${backupBase}.${Date.now()}`
+                : backupBase;
+            fs.copyFileSync(claudeMdPath, backupPath);
+            result.created.files.push(path.basename(backupPath));
+            console.warn(`[ruflo init] Existing CLAUDE.md backed up to ${path.basename(backupPath)} before overwrite`);
+        }
         // Determine template: explicit option > infer from components > 'standard'
         const inferredTemplate = (!options.components.commands && !options.components.agents) ? 'minimal' : undefined;
         const content = generateClaudeMd(options, inferredTemplate);

package/v3/@claude-flow/cli/dist/src/init/mcp-generator.js

@@ -40,9 +40,12 @@ export function generateMCPConfig(options) {
     const npmEnv = {
         npm_config_update_notifier: 'false',
     };
-    // Ruflo MCP server (core) — uses ruflo wrapper for portable npm-resolved invocation
+    // Ruflo MCP server (core) — uses ruflo wrapper for portable npm-resolved invocation.
+    // #2206: key MUST be 'claude-flow' so all plugins resolve as mcp__claude-flow__*.
+    // The command args (ruflo@latest mcp start) are the correct wrapper invocation — only the
+    // registration KEY changes here.
     if (config.claudeFlow) {
-        mcpServers['ruflo'] = createMCPServerEntry(['ruflo@latest', 'mcp', 'start'], {
+        mcpServers['claude-flow'] = createMCPServerEntry(['ruflo@latest', 'mcp', 'start'], {
             ...npmEnv,
             CLAUDE_FLOW_MODE: 'v3',
             CLAUDE_FLOW_HOOKS_ENABLED: 'true',
@@ -76,7 +79,8 @@ export function generateMCPCommands(options) {
     const config = options.mcp;
     if (isWindows()) {
         if (config.claudeFlow) {
-            commands.push('claude mcp add ruflo -- cmd /c npx -y ruflo@latest mcp start');
+            // #2206: registration name must be 'claude-flow' to match mcp__claude-flow__* tool naming
+            commands.push('claude mcp add claude-flow -- cmd /c npx -y ruflo@latest mcp start');
         }
         if (config.ruvSwarm) {
             commands.push('claude mcp add ruv-swarm -- cmd /c npx -y ruv-swarm mcp start');
@@ -87,7 +91,8 @@ export function generateMCPCommands(options) {
     }
     else {
         if (config.claudeFlow) {
-            commands.push("claude mcp add ruflo -- npx -y ruflo@latest mcp start");
+            // #2206: registration name must be 'claude-flow' to match mcp__claude-flow__* tool naming
+            commands.push("claude mcp add claude-flow -- npx -y ruflo@latest mcp start");
         }
         if (config.ruvSwarm) {
             commands.push("claude mcp add ruv-swarm -- npx -y ruv-swarm mcp start");

package/v3/@claude-flow/cli/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@claude-flow/cli",
-  "version": "3.10.4",
+  "version": "3.10.5",
   "type": "module",
   "description": "Ruflo CLI - Enterprise AI agent orchestration with 60+ specialized agents, swarm coordination, MCP server, self-learning hooks, and vector memory for Claude Code",
   "main": "dist/src/index.js",