claude-flow 3.46.1 → 3.47.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "claude-flow",
-  "version": "3.46.1",
+  "version": "3.47.1",
   "workspaces": [
     "v3/@claude-flow/codex",
     "v3/@claude-flow/mcp",

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

@@ -1,8 +1,8 @@
 {
   "schemaVersion": 1,
   "generation": 6,
-  "generatedAt": "2026-09-26T23:25:25.296Z",
-  "gitSha": "a5adb5aa",
+  "generatedAt": "2026-09-28T15:44:58.000Z",
+  "gitSha": "bbbd7241",
   "catalog": {
     "agents": 167,
     "tools": 418,

package/v3/@claude-flow/cli/dist/src/commands/federation.js

@@ -13,6 +13,8 @@ async function run(ctx, tool, args, title) {
         // CLI flag --gateway takes precedence over the RUFLO_X_GATEWAY_URL env var (ADR-125).
         const data = await callMCPTool(tool, { gatewayUrl: ctx.flags.gateway, ...args });
         printJsonOrTable(ctx, data, title);
+        if (data && typeof data === 'object' && (('ok' in data && data.ok === false) || ('degraded' in data && data.degraded === true)))
+            return { success: false, exitCode: 1, data };
         return { success: true, data };
     }
     catch (e) {
@@ -28,8 +30,8 @@ export const federationCommand = {
         { name: 'gateway', description: 'Gateway base URL (takes precedence over RUFLO_X_GATEWAY_URL; default https://x.ruv.io)', type: 'string' },
     ],
     subcommands: [
-        { name: 'join', description: 'Join the open swarm with YOUR OWN key using an invite code (generates ~/.ruflo/nostr.key if absent, claims via NIP-98, verifies via NIP-42)',
-            options: [{ name: 'code', description: 'Invite code (v2.…) — a bearer secret, keep it private', type: 'string', required: true }],
+        { name: 'join', description: 'Join the open swarm with YOUR OWN key without an invite on open relays (generates ~/.ruflo/nostr.key if absent, registers via NIP-98, verifies via NIP-42)',
+            options: [{ name: 'code', description: 'Invite code (v2.…) — a bearer secret, keep it private', type: 'string' }],
             action: (ctx) => run(ctx, 'x_federation_join', { code: ctx.flags.code }, 'Join federation') },
         { name: 'sync', description: 'Fetch recent verified swarm messages',
             options: [{ name: 'since', description: 'Look-back seconds (default 3600)', type: 'number' }, { name: 'limit', description: 'Max messages', type: 'number' }, { name: 'type', description: 'Filter by message type', type: 'string' }],

package/v3/@claude-flow/cli/dist/src/commands/hive-mind-worker.d.ts

@@ -0,0 +1,88 @@
+/**
+ * Hive-mind worker execution: the MCP config handed to a spawned Claude, and
+ * `hive-mind work`, which actually runs a queued task.
+ *
+ * Before this, `hive-mind task` only wrote a `pending` row to the task store.
+ * Workers are records, not processes, and nothing ever claimed the row: the
+ * task stayed pending and the worker stayed idle forever. `work` is the missing
+ * consumer — claim one task, assign it to an idle hive worker, run it through
+ * `claude -p`, and record the outcome.
+ */
+import type { Command } from '../types.js';
+export interface WorkerMcpConfigOptions {
+    /** `--mcp-config` from the caller; used verbatim when given. */
+    explicit?: string;
+    cwd: string;
+    home: string;
+    /** Where the generated config is written (e.g. `.hive-mind/sessions`). */
+    outDir: string;
+    swarmId: string;
+    /** The ruflo MCP server to register when no source config provides one. */
+    rufloServer: {
+        command: string;
+        args: string[];
+    };
+}
+/**
+ * The MCP config file to pass to a spawned Claude.
+ *
+ * A source file is never passed through as-is. `~/.claude.json` is Claude
+ * Code's whole state file; on a machine where it has no top-level
+ * `mcpServers` (a fresh desktop), Claude exits at startup with "Invalid MCP
+ * configuration: mcpServers: Invalid input", before any task can run. And a
+ * config lacking a `ruflo` server leaves the worker without the tools its
+ * prompt names. So the servers are extracted, a `ruflo` server is guaranteed,
+ * and the result is written as a config Claude is known to accept.
+ */
+export declare function resolveWorkerMcpConfig(opts: WorkerMcpConfigOptions): string;
+/**
+ * The ruflo MCP server as launched by THIS cli, so a worker and the CLI that
+ * dispatched it share one version and one store format. `@latest` could
+ * resolve to a different release mid-session.
+ */
+export declare function currentRufloServer(): {
+    command: string;
+    args: string[];
+};
+export interface RunOutcome {
+    ok: boolean;
+    output: string;
+    exitCode: number | null;
+    sessionId?: string;
+    costUsd?: number;
+    durationMs: number;
+}
+export type TaskRunner = (prompt: string, opts: {
+    mcpConfig: string;
+    timeoutMs: number;
+    cwd: string;
+}) => Promise<RunOutcome>;
+/** Run one prompt through `claude -p` and parse its JSON result. */
+export declare const runWithClaude: TaskRunner;
+export interface WorkOnceOptions {
+    cwd: string;
+    mcpConfig: string;
+    runner: TaskRunner;
+    taskId?: string;
+    workerId?: string;
+    defaultTimeoutMs?: number;
+}
+export type WorkOnceResult = {
+    dispatched: false;
+    reason: string;
+} | {
+    dispatched: true;
+    taskId: string;
+    workerId: string;
+    status: 'completed' | 'failed';
+    outcome: RunOutcome;
+};
+/**
+ * One dispatch cycle: the oldest pending hive task goes to an idle hive worker,
+ * runs, and its outcome is recorded on the task. Every state change goes
+ * through the MCP task tools, so the store is the same one `hive-mind status`
+ * and `task status` read.
+ */
+export declare function workOnce(opts: WorkOnceOptions): Promise<WorkOnceResult>;
+export declare const workCommand: Command;
+//# sourceMappingURL=hive-mind-worker.d.ts.map

package/v3/@claude-flow/cli/dist/src/commands/hive-mind-worker.js

@@ -0,0 +1,242 @@
+/**
+ * Hive-mind worker execution: the MCP config handed to a spawned Claude, and
+ * `hive-mind work`, which actually runs a queued task.
+ *
+ * Before this, `hive-mind task` only wrote a `pending` row to the task store.
+ * Workers are records, not processes, and nothing ever claimed the row: the
+ * task stayed pending and the worker stayed idle forever. `work` is the missing
+ * consumer — claim one task, assign it to an idle hive worker, run it through
+ * `claude -p`, and record the outcome.
+ */
+import { output } from '../output.js';
+import { callMCPTool, MCPClientError } from '../mcp-client.js';
+import { spawn as childSpawn } from 'child_process';
+import { existsSync, mkdirSync, readFileSync, writeFileSync } from 'fs';
+import { join } from 'path';
+import { resolveClaudeLaunchCommand } from '../runtime/claude-command.js';
+/** The server key the hive-mind prompt addresses (`mcp__ruflo__*`). */
+const RUFLO_SERVER = 'ruflo';
+function readServers(path, cwd) {
+    try {
+        if (!existsSync(path))
+            return null;
+        const parsed = JSON.parse(readFileSync(path, 'utf-8'));
+        const isMap = (v) => !!v && typeof v === 'object' && !Array.isArray(v) && Object.keys(v).length > 0;
+        if (isMap(parsed.mcpServers))
+            return parsed.mcpServers;
+        // ~/.claude.json keeps project-scoped servers under projects[<cwd>].
+        const project = parsed.projects?.[cwd];
+        if (isMap(project?.mcpServers))
+            return project.mcpServers;
+    }
+    catch {
+        // Unreadable or not JSON: not a usable config.
+    }
+    return null;
+}
+/**
+ * The MCP config file to pass to a spawned Claude.
+ *
+ * A source file is never passed through as-is. `~/.claude.json` is Claude
+ * Code's whole state file; on a machine where it has no top-level
+ * `mcpServers` (a fresh desktop), Claude exits at startup with "Invalid MCP
+ * configuration: mcpServers: Invalid input", before any task can run. And a
+ * config lacking a `ruflo` server leaves the worker without the tools its
+ * prompt names. So the servers are extracted, a `ruflo` server is guaranteed,
+ * and the result is written as a config Claude is known to accept.
+ */
+export function resolveWorkerMcpConfig(opts) {
+    if (opts.explicit)
+        return opts.explicit;
+    const candidates = [join(opts.cwd, '.mcp.json')];
+    if (opts.home)
+        candidates.push(join(opts.home, '.claude.json'), join(opts.home, '.claude', 'mcp.json'));
+    let servers = {};
+    for (const c of candidates) {
+        const found = readServers(c, opts.cwd);
+        if (found) {
+            servers = found;
+            break;
+        }
+    }
+    if (!servers[RUFLO_SERVER]) {
+        servers = {
+            ...servers,
+            [RUFLO_SERVER]: {
+                command: opts.rufloServer.command,
+                args: opts.rufloServer.args,
+                // The MCP server keys its stores off this, so the worker's tool calls
+                // land in the same task/agent stores as the CLI that dispatched it.
+                env: { CLAUDE_FLOW_CWD: opts.cwd },
+            },
+        };
+    }
+    mkdirSync(opts.outDir, { recursive: true });
+    const path = join(opts.outDir, `mcp-${opts.swarmId}.json`);
+    writeFileSync(path, JSON.stringify({ mcpServers: servers }, null, 2), 'utf-8');
+    return path;
+}
+/**
+ * The ruflo MCP server as launched by THIS cli, so a worker and the CLI that
+ * dispatched it share one version and one store format. `@latest` could
+ * resolve to a different release mid-session.
+ */
+export function currentRufloServer() {
+    const entry = process.argv[1];
+    return entry
+        ? { command: process.execPath, args: [entry, 'mcp', 'start'] }
+        : { command: 'npx', args: ['-y', '@claude-flow/cli@latest', 'mcp', 'start'] };
+}
+/** Run one prompt through `claude -p` and parse its JSON result. */
+export const runWithClaude = (prompt, opts) => new Promise((resolve) => {
+    const started = Date.now();
+    const launch = resolveClaudeLaunchCommand();
+    if (!launch) {
+        resolve({ ok: false, output: 'Claude Code CLI not found in PATH', exitCode: null, durationMs: 0 });
+        return;
+    }
+    // The prompt goes on stdin, not argv: a task description has no length
+    // bound and `--mcp-config` is variadic (#1780).
+    const child = childSpawn(launch.command, [...launch.argsPrefix, '-p', '--output-format', 'json', `--mcp-config=${opts.mcpConfig}`], { cwd: opts.cwd, stdio: ['pipe', 'pipe', 'pipe'] });
+    let stdout = '';
+    let stderr = '';
+    child.stdout.on('data', (d) => (stdout += d));
+    child.stderr.on('data', (d) => (stderr += d));
+    const timer = setTimeout(() => child.kill('SIGTERM'), opts.timeoutMs);
+    child.on('error', (e) => {
+        clearTimeout(timer);
+        resolve({ ok: false, output: e.message, exitCode: null, durationMs: Date.now() - started });
+    });
+    child.on('close', (code, signal) => {
+        clearTimeout(timer);
+        const durationMs = Date.now() - started;
+        try {
+            const r = JSON.parse(stdout);
+            resolve({
+                ok: code === 0 && !r.is_error,
+                output: r.result ?? '',
+                exitCode: code,
+                sessionId: r.session_id,
+                costUsd: r.total_cost_usd,
+                durationMs,
+            });
+        }
+        catch {
+            const why = signal === 'SIGTERM' ? `timed out after ${opts.timeoutMs}ms` : (stderr || stdout).trim().slice(-2000);
+            resolve({ ok: false, output: why, exitCode: code, durationMs });
+        }
+    });
+    child.stdin.end(prompt);
+});
+function timeoutFromTags(tags, fallback) {
+    const tag = tags?.find((t) => /^timeout:\d+s$/.test(t));
+    return tag ? Number(tag.slice('timeout:'.length, -1)) * 1000 : fallback;
+}
+/**
+ * One dispatch cycle: the oldest pending hive task goes to an idle hive worker,
+ * runs, and its outcome is recorded on the task. Every state change goes
+ * through the MCP task tools, so the store is the same one `hive-mind status`
+ * and `task status` read.
+ */
+export async function workOnce(opts) {
+    let taskId = opts.taskId;
+    if (!taskId) {
+        const listed = await callMCPTool('task_list', { status: 'pending', type: 'hive-mind', limit: 1000 });
+        const oldest = [...(listed.tasks ?? [])].sort((a, b) => a.createdAt.localeCompare(b.createdAt))[0];
+        if (!oldest)
+            return { dispatched: false, reason: 'No pending hive-mind tasks' };
+        taskId = oldest.taskId;
+    }
+    const task = await callMCPTool('task_status', { taskId });
+    if (task.status !== 'pending') {
+        return { dispatched: false, reason: `Task ${taskId} is ${task.status}, not pending` };
+    }
+    let workerId = opts.workerId;
+    if (!workerId) {
+        const hive = await callMCPTool('hive-mind_status', {});
+        workerId = hive.workers?.find((w) => w.status === 'idle')?.id;
+        if (!workerId)
+            return { dispatched: false, reason: 'No idle hive worker — run "hive-mind spawn" first' };
+    }
+    await callMCPTool('task_assign', { taskId, agentIds: [workerId] });
+    const prompt = `You are hive-mind worker ${workerId}. Complete this task, then reply with ` +
+        `the result only.\n\nTask ${taskId}:\n${task.description}`;
+    const outcome = await opts.runner(prompt, {
+        mcpConfig: opts.mcpConfig,
+        timeoutMs: timeoutFromTags(task.tags, opts.defaultTimeoutMs ?? 300_000),
+        cwd: opts.cwd,
+    });
+    const result = {
+        worker: workerId,
+        output: outcome.output,
+        exitCode: outcome.exitCode,
+        durationMs: outcome.durationMs,
+        ...(outcome.sessionId ? { sessionId: outcome.sessionId } : {}),
+        ...(outcome.costUsd !== undefined ? { costUsd: outcome.costUsd } : {}),
+    };
+    if (outcome.ok) {
+        await callMCPTool('task_complete', { taskId, result });
+        return { dispatched: true, taskId, workerId, status: 'completed', outcome };
+    }
+    await callMCPTool('task_update', { taskId, status: 'failed', result });
+    return { dispatched: true, taskId, workerId, status: 'failed', outcome };
+}
+export const workCommand = {
+    name: 'work',
+    description: 'Run the next pending hive task on an idle worker via Claude Code and record the result',
+    options: [
+        { name: 'task', description: 'Run this task id instead of the oldest pending one', type: 'string' },
+        { name: 'worker', description: 'Assign to this worker id instead of the first idle one', type: 'string' },
+        { name: 'mcp-config', description: 'MCP config for the worker (default: generated, with the ruflo server)', type: 'string' },
+    ],
+    examples: [
+        { command: 'claude-flow hive-mind work', description: 'Run the oldest pending hive task' },
+        { command: 'claude-flow hive-mind work --task task-123', description: 'Run a specific task' },
+    ],
+    action: async (ctx) => {
+        const cwd = ctx.cwd || process.cwd();
+        try {
+            const mcpConfig = resolveWorkerMcpConfig({
+                explicit: ctx.flags.mcpConfig,
+                cwd,
+                home: process.env.HOME || process.env.USERPROFILE || '',
+                outDir: join(cwd, '.hive-mind', 'sessions'),
+                swarmId: 'worker',
+                rufloServer: currentRufloServer(),
+            });
+            const r = await workOnce({
+                cwd,
+                mcpConfig,
+                runner: runWithClaude,
+                taskId: ctx.flags.task,
+                workerId: ctx.flags.worker,
+            });
+            if (ctx.flags.format === 'json') {
+                output.printJson(r);
+            }
+            else if (!r.dispatched) {
+                output.printInfo(r.reason);
+            }
+            else {
+                output.printBox([
+                    `Task ID: ${r.taskId}`,
+                    `Worker: ${r.workerId}`,
+                    `Status: ${r.status}`,
+                    `Duration: ${r.outcome.durationMs}ms`,
+                    '',
+                    r.outcome.output.slice(0, 2000),
+                ].join('\n'), r.status === 'completed' ? 'Task Completed' : 'Task Failed');
+                output.writeln(output.dim(`  Full record: claude-flow task status ${r.taskId}`));
+            }
+            // Nothing to do is not an error; a task that ran and failed is.
+            const failed = r.dispatched && r.status === 'failed';
+            return { success: !failed, exitCode: failed ? 1 : 0, data: r };
+        }
+        catch (error) {
+            const msg = error instanceof MCPClientError ? error.message : String(error);
+            output.printError(`Work error: ${msg}`);
+            return { success: false, exitCode: 1 };
+        }
+    },
+};
+//# sourceMappingURL=hive-mind-worker.js.map

package/v3/@claude-flow/cli/dist/src/commands/hive-mind.js

@@ -10,7 +10,7 @@ import { select, confirm, input } from '../prompt.js';
 import { callMCPTool, MCPClientError } from '../mcp-client.js';
 import { spawn as childSpawn } from 'child_process';
 import { mkdir, writeFile } from 'fs/promises';
-import { existsSync } from 'fs';
+import { resolveWorkerMcpConfig, currentRufloServer, workCommand } from './hive-mind-worker.js';
 import { join } from 'path';
 import { resolveClaudeLaunchCommand } from '../runtime/claude-command.js';
 import { getHiveTokenForCli } from '../mcp-tools/hive-mind-tools.js';
@@ -202,44 +202,25 @@ async function spawnClaudeCodeInstance(swarmId, swarmName, objective, workers, f
             // Build arguments - flags first, then prompt
             const claudeArgs = [];
             // #1748 Issue 2 — pass --mcp-config so the spawned worker actually has
-            // mcp__ruflo__* tools registered. Before this, the coordination prompt
-            // referenced tools the worker didn't know about and exited silently.
-            // Resolution order:
-            //   1. explicit --mcp-config <path> flag passed by the caller
-            //   2. ./.mcp.json in cwd (project-local Ruflo MCP config)
-            //   3. ~/.claude.json or ~/.claude/mcp.json (user-global)
-            // If none found, we still spawn but warn — that's the pre-fix behavior
-            // and the user's debug log will surface the missing tools.
-            const explicitMcpConfig = flags['mcp-config'];
-            let mcpConfigPath = explicitMcpConfig;
-            if (!mcpConfigPath) {
-                const candidates = [
-                    join(process.cwd(), '.mcp.json'),
-                    join(process.env.HOME || process.env.USERPROFILE || '', '.claude.json'),
-                    join(process.env.HOME || process.env.USERPROFILE || '', '.claude', 'mcp.json'),
-                ];
-                for (const c of candidates) {
-                    try {
-                        if (c && existsSync(c)) {
-                            mcpConfigPath = c;
-                            break;
-                        }
-                    }
-                    catch { /* continue */ }
-                }
-            }
-            if (mcpConfigPath) {
-                // #1780 — Claude Code's `--mcp-config` is variadic; passing it as two
-                // argv tokens (`--mcp-config`, `<path>`) lets a later positional (the
-                // hive-mind prompt) be slurped as a second config file, producing
-                // `ENAMETOOLONG: name too long, open` once the prompt exceeds PATH_MAX.
-                // Use `=`-syntax so the flag stays attached to its single value.
-                claudeArgs.push(`--mcp-config=${mcpConfigPath}`);
-                output.printInfo(`Spawned worker MCP config: ${mcpConfigPath}`);
-            }
-            else {
-                output.printWarning('No .mcp.json or ~/.claude.json found — spawned worker will not have mcp__ruflo__* tools (#1748 Issue 2). Pass --mcp-config <path> or run "ruflo init" to generate one.');
-            }
+            // mcp__ruflo__* tools registered. The config is always a generated file
+            // that Claude accepts; see resolveWorkerMcpConfig for why a source
+            // config (notably ~/.claude.json) is never passed through as-is.
+            // The parser stores flags camelCased (#2269), so read both forms.
+            const mcpConfigPath = resolveWorkerMcpConfig({
+                explicit: (flags['mcp-config'] ?? flags.mcpConfig),
+                cwd: process.cwd(),
+                home: process.env.HOME || process.env.USERPROFILE || '',
+                outDir: sessionsDir,
+                swarmId,
+                rufloServer: currentRufloServer(),
+            });
+            // #1780 — Claude Code's `--mcp-config` is variadic; passing it as two
+            // argv tokens (`--mcp-config`, `<path>`) lets a later positional (the
+            // hive-mind prompt) be slurped as a second config file, producing
+            // `ENAMETOOLONG: name too long, open` once the prompt exceeds PATH_MAX.
+            // Use `=`-syntax so the flag stays attached to its single value.
+            claudeArgs.push(`--mcp-config=${mcpConfigPath}`);
+            output.printInfo(`Spawned worker MCP config: ${mcpConfigPath}`);
             // Check for non-interactive mode
             const isNonInteractive = flags['non-interactive'] || flags.nonInteractive;
             if (isNonInteractive) {
@@ -882,7 +863,8 @@ const taskCommand = {
             ].join('\n'), 'Task Submitted');
             output.writeln();
             output.printSuccess('Task submitted to hive');
-            output.writeln(output.dim(`  Track with: claude-flow hive-mind task-status ${result.taskId}`));
+            output.writeln(output.dim(`  Run it with: claude-flow hive-mind work --task ${result.taskId}`));
+            output.writeln(output.dim(`  Track with:  claude-flow task status ${result.taskId}`));
             return { success: true, data: result };
         }
         catch (error) {
@@ -1210,7 +1192,7 @@ export const hiveMindCommand = {
     name: 'hive-mind',
     aliases: ['hive'],
     description: 'Queen-led consensus-based multi-agent coordination',
-    subcommands: [initCommand, spawnCommand, statusCommand, taskCommand, joinCommand, leaveCommand, consensusCommand, broadcastCommand, memorySubCommand, optimizeMemoryCommand, shutdownCommand],
+    subcommands: [initCommand, spawnCommand, statusCommand, taskCommand, workCommand, joinCommand, leaveCommand, consensusCommand, broadcastCommand, memorySubCommand, optimizeMemoryCommand, shutdownCommand],
     options: [],
     examples: [
         { command: 'claude-flow hive-mind init -t hierarchical-mesh', description: 'Initialize hive' },
@@ -1230,6 +1212,7 @@ export const hiveMindCommand = {
             `${output.highlight('spawn')}           - Spawn worker agents (use --claude to launch Claude Code)`,
             `${output.highlight('status')}          - Show hive status`,
             `${output.highlight('task')}            - Submit task to hive`,
+            `${output.highlight('work')}            - Run the next pending task on an idle worker`,
             `${output.highlight('join')}            - Join an agent to the hive`,
             `${output.highlight('leave')}           - Remove an agent from the hive`,
             `${output.highlight('consensus')}       - Manage consensus proposals`,

package/v3/@claude-flow/cli/dist/src/mcp-tools/task-tools.js

@@ -40,6 +40,53 @@ function saveTaskStore(store) {
     ensureTaskDir();
     writeFileSync(getTaskPath(), JSON.stringify(store, null, 2), 'utf-8');
 }
+/**
+ * Apply an agent-state change to every store that holds the agent.
+ *
+ * `hive-mind_spawn` keeps its workers in `.claude-flow/agents.json`, not the
+ * canonical `.claude-flow/agents/store.json` (#1916). Syncing only the
+ * canonical store meant assigning a task to a hive worker never marked it
+ * busy, and completing one never counted it: `hive-mind status` showed the
+ * worker idle with 0 completed while its task sat in the queue.
+ */
+function updateAgents(agentIds, mutate) {
+    if (agentIds.length === 0)
+        return;
+    const paths = [
+        join(getProjectCwd(), STORAGE_DIR, 'agents', 'store.json'),
+        join(getProjectCwd(), STORAGE_DIR, 'agents.json'),
+    ];
+    for (const path of paths) {
+        try {
+            if (!existsSync(path))
+                continue;
+            const store = JSON.parse(readFileSync(path, 'utf-8'));
+            if (!store.agents)
+                continue;
+            let touched = false;
+            for (const id of agentIds) {
+                if (store.agents[id]) {
+                    mutate(store.agents[id]);
+                    touched = true;
+                }
+            }
+            if (touched)
+                writeFileSync(path, JSON.stringify(store, null, 2), 'utf-8');
+        }
+        catch {
+            // Best-effort agent sync: a corrupt agent store must not fail the task op.
+        }
+    }
+}
+/** Return agents still holding `taskId` to idle. */
+function releaseAgents(agentIds, taskId) {
+    updateAgents(agentIds, (agent) => {
+        if (agent.currentTask === taskId) {
+            agent.status = 'idle';
+            agent.currentTask = null;
+        }
+    });
+}
 export const taskTools = [
     {
         name: 'task_create',
@@ -214,33 +261,22 @@ export const taskTools = [
             const taskId = input.taskId;
             const task = store.tasks[taskId];
             if (task) {
+                if (task.status === 'completed') {
+                    return { taskId: task.taskId, status: task.status, completedAt: task.completedAt, result: task.result };
+                }
                 task.status = 'completed';
                 task.progress = 100;
                 task.completedAt = new Date().toISOString();
                 task.result = input.result || {};
                 saveTaskStore(store);
                 // Sync assigned agents back to idle and increment taskCount
-                if (task.assignedTo.length > 0) {
-                    const agentStorePath = join(getProjectCwd(), STORAGE_DIR, 'agents', 'store.json');
-                    try {
-                        let agentStore = { agents: {} };
-                        if (existsSync(agentStorePath)) {
-                            agentStore = JSON.parse(readFileSync(agentStorePath, 'utf-8'));
-                        }
-                        for (const agentId of task.assignedTo) {
-                            if (agentStore.agents[agentId]) {
-                                agentStore.agents[agentId].status = 'idle';
-                                agentStore.agents[agentId].currentTask = null;
-                                agentStore.agents[agentId].taskCount =
-                                    (agentStore.agents[agentId].taskCount || 0) + 1;
-                            }
-                        }
-                        writeFileSync(agentStorePath, JSON.stringify(agentStore, null, 2), 'utf-8');
-                    }
-                    catch {
-                        // Best-effort agent sync
+                updateAgents(task.assignedTo, (agent) => {
+                    if (agent.currentTask === taskId) {
+                        agent.status = 'idle';
+                        agent.currentTask = null;
                     }
-                }
+                    agent.taskCount = (agent.taskCount || 0) + 1;
+                });
                 return {
                     taskId: task.taskId,
                     status: task.status,
@@ -266,6 +302,7 @@ export const taskTools = [
                 status: { type: 'string', description: 'New status' },
                 progress: { type: 'number', description: 'Progress percentage (0-100)' },
                 assignTo: { type: 'array', items: { type: 'string' }, description: 'Agent IDs to assign' },
+                result: { type: 'object', description: 'Result data (e.g. the failure of a failed task)' },
             },
             required: ['taskId'],
         },
@@ -284,6 +321,12 @@ export const taskTools = [
                     if (newStatus === 'in_progress' && !task.startedAt) {
                         task.startedAt = new Date().toISOString();
                     }
+                    // A failed task frees its workers, as task_complete and task_cancel do;
+                    // otherwise a worker whose run failed stays `busy` forever.
+                    if (newStatus === 'failed') {
+                        task.completedAt = new Date().toISOString();
+                        releaseAgents(task.assignedTo, taskId);
+                    }
                 }
                 if (typeof input.progress === 'number') {
                     task.progress = Math.min(100, Math.max(0, input.progress));
@@ -291,6 +334,9 @@ export const taskTools = [
                 if (input.assignTo) {
                     task.assignedTo = input.assignTo;
                 }
+                if (input.result && typeof input.result === 'object') {
+                    task.result = input.result;
+                }
                 saveTaskStore(store);
                 return {
                     success: true,
@@ -332,41 +378,20 @@ export const taskTools = [
                 return { taskId, error: 'Task not found' };
             }
             const previouslyAssigned = [...task.assignedTo];
-            // Load agent store to sync worker state
-            const agentStorePath = join(getProjectCwd(), STORAGE_DIR, 'agents', 'store.json');
-            let agentStore = { agents: {} };
-            try {
-                if (existsSync(agentStorePath)) {
-                    agentStore = JSON.parse(readFileSync(agentStorePath, 'utf-8'));
-                }
-            }
-            catch { /* ignore */ }
             if (input.unassign) {
                 // Revert previously assigned agents to idle
-                for (const agentId of previouslyAssigned) {
-                    if (agentStore.agents[agentId]) {
-                        agentStore.agents[agentId].status = 'idle';
-                        agentStore.agents[agentId].currentTask = null;
-                    }
-                }
+                releaseAgents(previouslyAssigned, taskId);
                 task.assignedTo = [];
             }
             else {
                 const agentIds = input.agentIds || [];
                 // Revert old agents to idle
-                for (const agentId of previouslyAssigned) {
-                    if (!agentIds.includes(agentId) && agentStore.agents[agentId]) {
-                        agentStore.agents[agentId].status = 'idle';
-                        agentStore.agents[agentId].currentTask = null;
-                    }
-                }
+                releaseAgents(previouslyAssigned.filter((id) => !agentIds.includes(id)), taskId);
                 // Set new agents to active
-                for (const agentId of agentIds) {
-                    if (agentStore.agents[agentId]) {
-                        agentStore.agents[agentId].status = 'active';
-                        agentStore.agents[agentId].currentTask = taskId;
-                    }
-                }
+                updateAgents(agentIds, (agent) => {
+                    agent.status = 'busy';
+                    agent.currentTask = taskId;
+                });
                 task.assignedTo = agentIds;
                 // Auto-transition task to in_progress if pending
                 if (task.status === 'pending' && agentIds.length > 0) {
@@ -377,12 +402,6 @@ export const taskTools = [
                 }
             }
             saveTaskStore(store);
-            // Save agent store
-            const agentDir = join(getProjectCwd(), STORAGE_DIR, 'agents');
-            if (!existsSync(agentDir)) {
-                mkdirSync(agentDir, { recursive: true });
-            }
-            writeFileSync(agentStorePath, JSON.stringify(agentStore, null, 2), 'utf-8');
             return {
                 taskId: task.taskId,
                 assignedTo: task.assignedTo,
@@ -421,6 +440,7 @@ export const taskTools = [
                 task.completedAt = new Date().toISOString();
                 task.result = { cancelReason: input.reason || 'Cancelled by user' };
                 saveTaskStore(store);
+                releaseAgents(task.assignedTo, taskId);
                 return {
                     success: true,
                     taskId: task.taskId,

package/v3/@claude-flow/cli/dist/src/mcp-tools/x-federation-join.d.ts

@@ -1,8 +1,8 @@
 /**
- * Self-service join for the open swarm federation — the user-facing invite path.
+ * Self-service federation join with a local key: public registration or a private invite.
  *
  * Decentralized by design: the user generates/holds THEIR OWN Nostr key locally,
- * redeems an invite code with a NIP-98-signed claim (no admin in the loop), proves
+ * registers with a NIP-98-signed request (no admin in the user flow), proves
  * membership with NIP-42, and announces themselves. The gateway never signs for them.
  *
  * `nostr-tools` is an optional dependency (secp256k1/Schnorr is not in node:crypto):

package/v3/@claude-flow/cli/dist/src/mcp-tools/x-federation-join.js

@@ -36,49 +36,92 @@ export function nip98Header(nt, sk, url, method, body) {
 export async function verifyMembership(nt, sk, relayWs) {
     const { default: WebSocket } = await import('ws');
     return new Promise((resolve) => {
-        const ws = new WebSocket(relayWs, { perMessageDeflate: false });
-        let done = false;
+        const ws = new WebSocket(relayWs, { perMessageDeflate: false, maxPayload: 64 * 1024 });
+        let done = false, authId;
         const fin = (r) => { if (done)
-            return; done = true; try {
+            return; done = true; clearTimeout(timer); try {
             ws.close();
         }
         catch { /* */ } resolve(r); };
+        const timer = setTimeout(() => fin({ ok: false, reason: 'timeout' }), 15000);
         ws.on('message', (d) => {
-            const m = JSON.parse(d.toString());
-            if (m[0] === 'AUTH' && typeof m[1] === 'string')
-                ws.send(JSON.stringify(['AUTH', nt.finalizeEvent({ kind: 22242, created_at: Math.floor(Date.now() / 1000), tags: [['relay', relayWs], ['challenge', m[1]]], content: '' }, sk)]));
-            else if (m[0] === 'OK')
-                fin({ ok: !!m[2], reason: m[3] });
+            let m;
+            try {
+                m = JSON.parse(d.toString());
+            }
+            catch {
+                return;
+            }
+            if (!Array.isArray(m))
+                return;
+            if (m[0] === 'AUTH' && typeof m[1] === 'string' && m[1].length <= 1024 && !authId) {
+                const ev = nt.finalizeEvent({ kind: 22242, created_at: Math.floor(Date.now() / 1000), tags: [['relay', relayWs], ['challenge', m[1]]], content: '' }, sk);
+                authId = ev.id;
+                ws.send(JSON.stringify(['AUTH', ev]));
+            }
+            else if (m[0] === 'OK' && authId && m[1] === authId)
+                fin({ ok: m[2] === true, reason: m[3] });
         });
         ws.on('error', (e) => fin({ ok: false, reason: e.message }));
-        setTimeout(() => fin({ ok: false, reason: 'timeout' }), 15000);
+        ws.on('close', () => fin({ ok: false, reason: 'closed before authentication' }));
     });
 }
+function secureBase(value) {
+    const u = new URL(value);
+    if ((u.protocol !== 'https:' && !(u.protocol === 'http:' && ['127.0.0.1', 'localhost', '[::1]'].includes(u.hostname)))
+        || u.username || u.password || u.search || u.hash || u.pathname !== '/')
+        throw new Error('gateway must be an HTTPS origin (HTTP allowed only for loopback tests)');
+    return u.origin;
+}
 export const xFederationJoinTools = [{
         name: 'x_federation_join',
-        description: 'Join the open swarm federation with YOUR OWN key using an invite code: generates (or reuses) a local Nostr key at ~/.ruflo/nostr.key (0600), redeems the code with a NIP-98-signed claim directly against the relay, proves membership via NIP-42, and returns your pubkey. Use when you have been handed an invite code and want to participate as yourself. Asking an admin to `federation_admit` you instead is wrong for an open swarm because it centralizes onboarding and requires trusting a pubkey out of band; the invite claim binds membership to the key you hold. Never share the invite code publicly — it is a bearer secret.',
+        description: 'Join the federation with YOUR OWN local key, without an invite when public registration is enabled. Reuses ~/.ruflo/nostr.key (0600), proves key ownership with NIP-98, and verifies membership with NIP-42. Use when a user wants to join as themselves. Publishing as the gateway is wrong for personal identity. Optional private invite codes remain supported; never share keys or codes in chat.',
         inputSchema: { type: 'object', properties: {
-                code: { type: 'string', description: 'Invite code (v2.…) received privately from a member/admin.' },
+                code: { type: 'string', description: 'Optional private invite code (v2.…), for invite-only relays.' },
+                gatewayUrl: { type: 'string', description: 'Public registration gateway origin; defaults to https://x.ruv.io.' },
                 relayHttp: { type: 'string', description: 'Relay HTTPS base for the claim; takes precedence over RUFLO_X_RELAY_HTTP.' },
                 relayWs: { type: 'string', description: 'Relay wss URL for NIP-42; takes precedence over RUFLO_X_RELAY_WS.' },
                 keyFile: { type: 'string', description: 'Key file path; takes precedence over RUFLO_NOSTR_KEY_FILE (default ~/.ruflo/nostr.key).' }
-            }, required: ['code'] },
+            }, required: [] },
         handler: async (input) => {
             const i = input;
             const nt = await loadNostrTools();
             // Validate input before the optional-dependency check so a bad code fails fast and identically
             // whether or not nostr-tools is present.
-            if (!/^v2\.[A-Za-z0-9._-]{8,}$/.test(i.code))
+            if (i.code !== undefined && !/^v2\.[A-Za-z0-9._-]{8,}$/.test(i.code))
                 throw new Error('invite code must look like v2.<token>');
             if (!nt)
                 return { degraded: true, reason: 'nostr-tools not installed', hint: 'npm i -g nostr-tools  (secp256k1 signing is not in node:crypto)' };
+            const registrationBase = i.code ? undefined : secureBase(i.gatewayUrl || process.env.RUFLO_X_GATEWAY_URL || 'https://x.ruv.io');
             const { sk, pubkey, created } = loadOrCreateKey(nt, i.keyFile);
-            const url = `${HTTP_BASE(i.relayHttp)}/api/invites/claim`;
-            const body = JSON.stringify({ code: i.code });
-            const r = await fetch(url, { method: 'POST', headers: { Authorization: nip98Header(nt, sk, url, 'POST', body), 'Content-Type': 'application/json' }, body, signal: AbortSignal.timeout(20_000) });
+            // Existing members need no new grant. In particular never downgrade/re-admit
+            // their key just because they run join again.
+            if (!i.code) {
+                const existing = await verifyMembership(nt, sk, RELAY_WS(i.relayWs));
+                if (existing.ok)
+                    return { ok: true, pubkey, keyCreated: created, membershipVerified: true, alreadyMember: true };
+            }
+            const url = i.code ? `${secureBase(HTTP_BASE(i.relayHttp))}/api/invites/claim` : `${registrationBase}/api/registration`;
+            const body = i.code ? JSON.stringify({ code: i.code }) : '{}';
+            let r;
+            try {
+                r = await fetch(url, { method: 'POST', redirect: 'error', headers: { Authorization: nip98Header(nt, sk, url, 'POST', body), 'Content-Type': 'application/json' }, body, signal: AbortSignal.timeout(20_000) });
+            }
+            catch {
+                const check = await verifyMembership(nt, sk, RELAY_WS(i.relayWs));
+                if (check.ok)
+                    return { ok: true, pubkey, keyCreated: created, membershipVerified: true };
+                throw new Error('Admission response unavailable and relay membership unverified. Keep your local key and retry; do not create another identity.');
+            }
             const claim = (await r.json().catch(() => ({})));
-            if (!r.ok)
-                throw new Error(`claim rejected (${r.status}): ${claim.error ?? claim.message ?? 'unknown'}`);
+            if (!r.ok) {
+                // A lost acknowledgment can follow a successful grant. Check with the
+                // relay before declaring failure; never silently generate a second key.
+                const check = await verifyMembership(nt, sk, RELAY_WS(i.relayWs));
+                if (check.ok)
+                    return { ok: true, pubkey, keyCreated: created, membershipVerified: true };
+                throw new Error(`join rejected (${r.status}): ${claim.error ?? claim.message ?? 'unknown'}`);
+            }
             const auth = await verifyMembership(nt, sk, RELAY_WS(i.relayWs));
             return { ok: auth.ok, pubkey, keyCreated: created, role: claim.role ?? 'member', membershipVerified: auth.ok, ...(auth.ok ? {} : { reason: auth.reason }),
                 next: 'Publish kind-1 events tagged ["t","ruflo-swarm"] — or run `ruflo federation sync` to read the swarm.' };

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

@@ -1,6 +1,6 @@
 {
   "name": "@claude-flow/cli",
-  "version": "3.46.1",
+  "version": "3.47.1",
   "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",