@claude-flow/cli 3.56.3 → 3.56.4

package/dist/src/init/settings-generator.js

@@ -3,6 +3,7 @@
  * Creates .claude/settings.json with V3-optimized hook configurations
  */
 import { detectPlatform } from './types.js';
+import { helperHookCommand, helperScopeFor, helperStatusLineCommand } from './helper-commands.js';
 /**
  * Generate the complete settings.json content
  */
@@ -15,7 +16,7 @@ export function generateSettings(options) {
     // fails to find its handler. Either bundle the helpers OR drop the hooks —
     // the option this fix takes is the latter (minimal stays minimal).
     if (options.components.settings && options.components.helpers) {
-        settings.hooks = generateHooksConfig(options.hooks);
+        settings.hooks = generateHooksConfig(options.hooks, helperScopeFor(options.targetDir));
     }
     // Add statusLine configuration if enabled
     if (options.statusline.enabled) {
@@ -160,102 +161,34 @@ export function generateSettings(options) {
     return settings;
 }
 /**
- * Detect if we're on Windows for platform-aware hook commands.
+ * Build a hook command that resolves to the right helpers dir for where the
+ * settings live (#1943). Project-level settings probe the project's helpers
+ * first and fall back to `$HOME/.claude/helpers`; user-level settings
+ * (`~/.claude/settings.json`) apply to every opened project, so they are
+ * pinned to `$HOME/.claude/helpers`. See helper-commands.ts.
  */
-const IS_WINDOWS = process.platform === 'win32';
-/**
- * Build a hook command that resolves to the right helpers dir on every
- * install layout. `ruflo init` can land helpers either project-locally
- * (`<project>/.claude/helpers/…`, when run from a project root) or globally
- * (`$HOME/.claude/helpers/…`, when settings.json gets merged into the
- * user-level Claude Code config). The earlier `${CLAUDE_PROJECT_DIR:-.}`
- * form assumed project-local — so any global-install user hit
- * `MODULE_NOT_FOUND` on every Bash/Edit/Session hook (#1943).
- *
- * The fix is a tiny POSIX `sh` probe: try `$CLAUDE_PROJECT_DIR/.claude/...`
- * first, fall back to `$HOME/.claude/...` if it's missing. Both modes work,
- * the global install never crashes, and project-local overrides still take
- * precedence when present. On Windows, the same probe via `cmd /c` (the %~%
- * fallback uses `IF EXIST`).
- */
-function hookCmd(script, subcommand) {
-    if (IS_WINDOWS) {
-        // cmd.exe equivalent of the sh probe below. `IF EXIST` checks the
-        // project-local path; falls back to %USERPROFILE% if missing.
-        return `cmd /c "IF EXIST \"%CLAUDE_PROJECT_DIR%\\${script.replace(/\//g, '\\')}\" (node \"%CLAUDE_PROJECT_DIR%\\${script.replace(/\//g, '\\')}\" ${subcommand}) ELSE (node \"%USERPROFILE%\\${script.replace(/\//g, '\\')}\" ${subcommand})"`;
-    }
-    // POSIX sh: prefer project-local helpers, fall back to $HOME/.claude/.
-    // The fallback handles `ruflo init`'s global-install path where helpers
-    // live at `$HOME/.claude/helpers/` but Claude Code still sets
-    // `CLAUDE_PROJECT_DIR` to the *project* root (which has no helpers).
-    // eslint-disable-next-line no-template-curly-in-string
-    const projVar = '${CLAUDE_PROJECT_DIR:-.}';
-    // eslint-disable-next-line no-template-curly-in-string
-    const homeVar = '${HOME}';
-    return `sh -c 'D="${projVar}"; [ -f "$D/${script}" ] || D="${homeVar}"; exec node "$D/${script}" ${subcommand}'`;
+function hookCmd(script, subcommand, scope) {
+    return helperHookCommand(script, subcommand, scope);
 }
 /** Shorthand for CJS hook-handler commands */
-function hookHandlerCmd(subcommand) {
-    return hookCmd('.claude/helpers/hook-handler.cjs', subcommand);
+function hookHandlerCmd(subcommand, scope) {
+    return hookCmd('.claude/helpers/hook-handler.cjs', subcommand, scope);
 }
 /** Shorthand for ESM auto-memory-hook commands */
-function autoMemoryCmd(subcommand) {
-    return hookCmd('.claude/helpers/auto-memory-hook.mjs', subcommand);
+function autoMemoryCmd(subcommand, scope) {
+    return hookCmd('.claude/helpers/auto-memory-hook.mjs', subcommand, scope);
 }
 /**
  * Generate statusLine configuration for Claude Code
- * Uses local helper script for cross-platform compatibility (no npx cold-start)
+ * Uses local helper script for cross-platform compatibility (no npx cold-start).
+ * Claude Code pipes JSON session data to the script via stdin; valid fields
+ * are type, command and padding. Platform handling (#1948, #1973) lives in
+ * helperStatusLineCommand().
  */
-function generateStatusLineConfig(_options) {
-    // Claude Code pipes JSON session data to the script via stdin.
-    // Valid fields: type, command, padding (optional).
-    // The script runs after each assistant message (debounced 300ms).
-    //
-    // ruflo#1948 + #1973: the previous `sh -c 'D="${CLAUDE_PROJECT_DIR:-.}"; …'`
-    // form requires a POSIX shell on PATH. On native Windows (no
-    // Git-Bash / WSL), `sh` either isn't found or its quoting gets
-    // mangled, producing weird artifacts like files named `0)` or
-    // `toastr.error('ESD...` from misparsed tokens leaking back into
-    // the file system. NEVER use `cmd /c` for statusline — Claude Code
-    // manages stdin directly for statusline commands and `cmd /c`
-    // blocks the stdin forwarding.
-    //
-    // Solution: emit a platform-appropriate command at init time.
-    //   POSIX:   `sh -c 'D="…"; … exec node "$D/<script>"'` (existing)
-    //   Windows: a Node.js one-liner that resolves the path internally
-    //            using `process.env.CLAUDE_PROJECT_DIR` with a HOME
-    //            fallback — no shell-quoting hazards because the
-    //            resolution happens inside node, not in the shell.
-    const script = '.claude/helpers/statusline.cjs';
-    if (process.platform === 'win32') {
-        // The Node CLI's `-e` flag avoids all shell-quoting pitfalls.
-        // We write the path resolution in JS:
-        //   const fs = require('fs'); const p = require('path');
-        //   const d = process.env.CLAUDE_PROJECT_DIR || '.';
-        //   const f = p.join(d, '.claude/helpers/statusline.cjs');
-        //   const home = process.env.USERPROFILE || process.env.HOME || '.';
-        //   const h = p.join(home, '.claude/helpers/statusline.cjs');
-        //   require(fs.existsSync(f) ? f : h);
-        // …compressed onto one line. Double-quotes around the -e arg are
-        // safe on cmd.exe; the inner JS uses single-quotes for strings.
-        const js = "const fs=require('fs'),p=require('path');" +
-            `const d=process.env.CLAUDE_PROJECT_DIR||'.';` +
-            `const f=p.join(d,'${script}');` +
-            `const h=p.join(process.env.USERPROFILE||process.env.HOME||'.', '${script}');` +
-            'require(fs.existsSync(f)?f:h);';
-        return {
-            type: 'command',
-            command: `node -e "${js}"`,
-        };
-    }
-    // Same project-local / $HOME fallback as `hookCmd()` (see #1943).
-    // eslint-disable-next-line no-template-curly-in-string
-    const projVar = '${CLAUDE_PROJECT_DIR:-.}';
-    // eslint-disable-next-line no-template-curly-in-string
-    const homeVar = '${HOME}';
+function generateStatusLineConfig(options) {
     return {
         type: 'command',
-        command: `sh -c 'D="${projVar}"; [ -f "$D/${script}" ] || D="${homeVar}"; exec node "$D/${script}"'`,
+        command: helperStatusLineCommand(helperScopeFor(options.targetDir)),
     };
 }
 /**
@@ -264,7 +197,7 @@ function generateStatusLineConfig(_options) {
  * All hooks invoke scripts directly via `node <script> <subcommand>`,
  * working identically on Windows, macOS, and Linux.
  */
-function generateHooksConfig(config) {
+function generateHooksConfig(config, scope) {
     const hooks = {};
     // Node.js scripts handle errors internally via try/catch.
     // No shell-level error suppression needed (2>/dev/null || true breaks Windows).
@@ -276,7 +209,7 @@ function generateHooksConfig(config) {
                 hooks: [
                     {
                         type: 'command',
-                        command: hookHandlerCmd('pre-bash'),
+                        command: hookHandlerCmd('pre-bash', scope),
                         timeout: config.timeout,
                     },
                 ],
@@ -286,7 +219,7 @@ function generateHooksConfig(config) {
                 hooks: [
                     {
                         type: 'command',
-                        command: hookHandlerCmd('pre-edit'),
+                        command: hookHandlerCmd('pre-edit', scope),
                         timeout: config.timeout,
                     },
                 ],
@@ -301,7 +234,7 @@ function generateHooksConfig(config) {
                 hooks: [
                     {
                         type: 'command',
-                        command: hookHandlerCmd('post-edit'),
+                        command: hookHandlerCmd('post-edit', scope),
                         timeout: 10000,
                     },
                 ],
@@ -311,7 +244,7 @@ function generateHooksConfig(config) {
                 hooks: [
                     {
                         type: 'command',
-                        command: hookHandlerCmd('post-bash'),
+                        command: hookHandlerCmd('post-bash', scope),
                         timeout: config.timeout,
                     },
                 ],
@@ -325,7 +258,7 @@ function generateHooksConfig(config) {
                 hooks: [
                     {
                         type: 'command',
-                        command: hookHandlerCmd('route'),
+                        command: hookHandlerCmd('route', scope),
                         timeout: 10000,
                     },
                 ],
@@ -339,12 +272,12 @@ function generateHooksConfig(config) {
                 hooks: [
                     {
                         type: 'command',
-                        command: hookHandlerCmd('session-restore'),
+                        command: hookHandlerCmd('session-restore', scope),
                         timeout: 15000,
                     },
                     {
                         type: 'command',
-                        command: autoMemoryCmd('import'),
+                        command: autoMemoryCmd('import', scope),
                         timeout: 8000,
                     },
                 ],
@@ -358,7 +291,7 @@ function generateHooksConfig(config) {
                 hooks: [
                     {
                         type: 'command',
-                        command: hookHandlerCmd('session-end'),
+                        command: hookHandlerCmd('session-end', scope),
                         timeout: 10000,
                     },
                 ],
@@ -372,7 +305,7 @@ function generateHooksConfig(config) {
                 hooks: [
                     {
                         type: 'command',
-                        command: autoMemoryCmd('sync'),
+                        command: autoMemoryCmd('sync', scope),
                         timeout: 10000,
                     },
                 ],
@@ -387,11 +320,11 @@ function generateHooksConfig(config) {
                 hooks: [
                     {
                         type: 'command',
-                        command: hookHandlerCmd('compact-manual'),
+                        command: hookHandlerCmd('compact-manual', scope),
                     },
                     {
                         type: 'command',
-                        command: hookHandlerCmd('session-end'),
+                        command: hookHandlerCmd('session-end', scope),
                         timeout: 5000,
                     },
                 ],
@@ -401,11 +334,11 @@ function generateHooksConfig(config) {
                 hooks: [
                     {
                         type: 'command',
-                        command: hookHandlerCmd('compact-auto'),
+                        command: hookHandlerCmd('compact-auto', scope),
                     },
                     {
                         type: 'command',
-                        command: hookHandlerCmd('session-end'),
+                        command: hookHandlerCmd('session-end', scope),
                         timeout: 6000,
                     },
                 ],
@@ -418,7 +351,7 @@ function generateHooksConfig(config) {
             hooks: [
                 {
                     type: 'command',
-                    command: hookHandlerCmd('status'),
+                    command: hookHandlerCmd('status', scope),
                     timeout: 3000,
                 },
             ],
@@ -431,7 +364,7 @@ function generateHooksConfig(config) {
             hooks: [
                 {
                     type: 'command',
-                    command: hookHandlerCmd('post-task'),
+                    command: hookHandlerCmd('post-task', scope),
                     timeout: 5000,
                 },
             ],
@@ -444,7 +377,7 @@ function generateHooksConfig(config) {
                 hooks: [
                     {
                         type: 'command',
-                        command: hookHandlerCmd('notify'),
+                        command: hookHandlerCmd('notify', scope),
                         timeout: 3000,
                     },
                 ],

package/dist/src/mcp-tools/metaharness-tools.js

@@ -51,6 +51,8 @@ import { spawn } from 'node:child_process';
 import { existsSync, readFileSync } from 'node:fs';
 import { join, dirname, resolve } from 'node:path';
 import { fileURLToPath } from 'node:url';
+import { homedir } from 'node:os';
+import { ownPluginDirs } from '../plugins/own-install.js';
 import { runFlywheelWorker } from '../services/harness-flywheel-runtime.js';
 import { evaluatePolicyRequest } from '../services/policy-runtime.js';
 import { listFlywheelReceipts, promoteFlywheelCandidate, readFlywheelTransactionState, resetSequentialEvidence, verifyFlywheelLedger, } from '../services/flywheel-transaction.js';
@@ -66,16 +68,11 @@ const __dirname = dirname(fileURLToPath(import.meta.url));
  * script.
  */
 function locatePluginScripts(requiredScript) {
-    const candidates = [];
-    let p = resolve(__dirname);
-    for (let i = 0; i < 8; i++) {
-        candidates.push(join(p, 'plugins', 'ruflo-metaharness', 'scripts'));
-        candidates.push(join(p, '..', 'plugins', 'ruflo-metaharness', 'scripts'));
-        p = dirname(p);
-    }
-    const cwd = getProjectCwd();
-    candidates.push(join(cwd, 'plugins', 'ruflo-metaharness', 'scripts'));
-    candidates.push(join(cwd, 'node_modules', '@claude-flow', 'cli', 'plugins', 'ruflo-metaharness', 'scripts'));
+    // Bounded at node_modules: a project-local install must not reach the project.
+    const candidates = ownPluginDirs(__dirname, 'ruflo-metaharness', 'scripts');
+    // Scripts found here are executed, so they come from this CLI's own install
+    // (or the user's marketplace checkout), never from the project's cwd.
+    candidates.push(join(homedir(), '.claude', 'plugins', 'marketplaces', 'ruflo', 'plugins', 'ruflo-metaharness', 'scripts'));
     for (const c of candidates) {
         if (!existsSync(join(c, '_harness.mjs')))
             continue;

package/dist/src/mcp-tools/task-tools.js

@@ -71,7 +71,7 @@ function updateAgents(agentIds, mutate) {
                 continue;
             let touched = false;
             for (const id of agentIds) {
-                if (store.agents[id]) {
+                if (Object.prototype.hasOwnProperty.call(store.agents, id) && store.agents[id]) {
                     mutate(store.agents[id]);
                     touched = true;
                 }
@@ -325,6 +325,10 @@ export const taskTools = [
             if (status === null) {
                 return { success: false, error: `status must be one of ${TASK_STATUSES.join(', ')}` };
             }
+            if (input.assignTo !== undefined && (!Array.isArray(input.assignTo)
+                || !input.assignTo.every(id => validateIdentifier(id, 'assignTo').valid))) {
+                return { success: false, error: 'assignTo must be an array of agent ids' };
+            }
             const store = loadTaskStore();
             const taskId = input.taskId;
             const task = store.tasks[taskId];
@@ -332,6 +336,7 @@ export const taskTools = [
                 // Worker effects run AFTER the task store is saved, as task_complete does: a failed save must not leave
                 // workers freed and counted against a task that still reads unfinished.
                 let afterSave;
+                const previouslyAssigned = Array.isArray(task.assignedTo) ? [...task.assignedTo] : [];
                 if (status !== undefined) {
                     const newStatus = status;
                     const wasCompleted = task.status === 'completed';
@@ -344,13 +349,13 @@ export const taskTools = [
                     // returns early because the status already reads completed.
                     if (newStatus === 'failed' || newStatus === 'cancelled') {
                         task.completedAt = new Date().toISOString();
-                        afterSave = () => releaseAgents(task.assignedTo, taskId);
+                        afterSave = () => releaseAgents(previouslyAssigned, taskId);
                     }
                     if (newStatus === 'completed' && !wasCompleted) {
                         task.completedAt = new Date().toISOString();
                         // Credited only to a worker still holding this task, so complete -> pending -> complete
                         // (no reassignment in between) never counts the same work twice.
-                        afterSave = () => updateAgents(task.assignedTo, (agent) => {
+                        afterSave = () => updateAgents(previouslyAssigned, (agent) => {
                             if (agent.currentTask === taskId) {
                                 agent.status = 'idle';
                                 agent.currentTask = null;
@@ -367,6 +372,22 @@ export const taskTools = [
                     task.progress = 100;
                 if (input.assignTo) {
                     task.assignedTo = input.assignTo;
+                    // Reassignment must update the same worker stores as task_assign.
+                    // Terminal transitions release/credit the workers that held the task
+                    // before this update; replacement assignees did not perform that work.
+                    if (!['completed', 'failed', 'cancelled'].includes(task.status)) {
+                        afterSave = () => {
+                            releaseAgents(previouslyAssigned.filter(id => !task.assignedTo.includes(id)), taskId);
+                            // Echoing retained assignees must not take them from another task or re-credit completed work.
+                            updateAgents(task.assignedTo.filter(id => !previouslyAssigned.includes(id)), agent => {
+                                agent.status = 'busy';
+                                agent.currentTask = taskId;
+                            });
+                        };
+                    }
+                    else if (!afterSave) {
+                        afterSave = () => releaseAgents(previouslyAssigned, taskId);
+                    }
                 }
                 if (input.result && typeof input.result === 'object') {
                     task.result = input.result;

package/dist/src/mcp-tools/testgen-tools.js

@@ -23,9 +23,10 @@
  */
 import { spawn } from 'node:child_process';
 import { existsSync } from 'node:fs';
-import { dirname, join, resolve } from 'node:path';
+import { dirname, join } from 'node:path';
 import { fileURLToPath } from 'node:url';
-import { getProjectCwd } from './types.js';
+import { homedir } from 'node:os';
+import { ownPluginDirs } from '../plugins/own-install.js';
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = dirname(__filename);
 /**
@@ -38,16 +39,11 @@ const __dirname = dirname(__filename);
  * today) — when that lands at a candidate path, we've found the dir.
  */
 function locateTestgenScripts() {
-    const candidates = [];
-    let p = resolve(__dirname);
-    for (let i = 0; i < 8; i++) {
-        candidates.push(join(p, 'plugins', 'ruflo-testgen', 'scripts'));
-        candidates.push(join(p, '..', 'plugins', 'ruflo-testgen', 'scripts'));
-        p = dirname(p);
-    }
-    const cwd = getProjectCwd();
-    candidates.push(join(cwd, 'plugins', 'ruflo-testgen', 'scripts'));
-    candidates.push(join(cwd, 'node_modules', '@claude-flow', 'cli', 'plugins', 'ruflo-testgen', 'scripts'));
+    // Bounded at node_modules: a project-local install must not reach the project.
+    const candidates = ownPluginDirs(__dirname, 'ruflo-testgen', 'scripts');
+    // Scripts found here are executed, so they come from this CLI's own install
+    // (or the user's marketplace checkout), never from the project's cwd.
+    candidates.push(join(homedir(), '.claude', 'plugins', 'marketplaces', 'ruflo', 'plugins', 'ruflo-testgen', 'scripts'));
     for (const c of candidates) {
         if (existsSync(join(c, 'tdd-repair', 'tdd-repair.mjs')))
             return c;

package/dist/src/mcp-tools/transfer-tools.js

@@ -331,7 +331,7 @@ export const transferTools = [
                     return createResult({ error: v.error }, true);
             }
             try {
-                const { createPluginDiscoveryService, searchPlugins } = await import('../plugins/store/index.js');
+                const { createPluginDiscoveryService, searchPlugins, registryStatus } = await import('../plugins/store/index.js');
                 const discovery = createPluginDiscoveryService();
                 const result = await discovery.discoverRegistry();
                 if (!result.success || !result.registry) {
@@ -339,7 +339,7 @@ export const transferTools = [
                 }
                 const opts = input;
                 const searchResult = searchPlugins(result.registry, opts);
-                return createResult(searchResult);
+                return createResult({ ...searchResult, registry: registryStatus(result) });
             }
             catch (error) {
                 return createResult({ error: error.message }, true);
@@ -368,7 +368,7 @@ export const transferTools = [
                     return createResult({ error: v.error }, true);
             }
             try {
-                const { createPluginDiscoveryService } = await import('../plugins/store/index.js');
+                const { createPluginDiscoveryService, registryStatus } = await import('../plugins/store/index.js');
                 const discovery = createPluginDiscoveryService();
                 const result = await discovery.discoverRegistry();
                 if (!result.success || !result.registry) {
@@ -379,7 +379,7 @@ export const transferTools = [
                 if (!plugin) {
                     return createResult({ error: 'Plugin not found' }, true);
                 }
-                return createResult(plugin);
+                return createResult({ ...plugin, registry: registryStatus(result) });
             }
             catch (error) {
                 return createResult({ error: error.message }, true);
@@ -402,7 +402,7 @@ export const transferTools = [
         },
         handler: async (input) => {
             try {
-                const { createPluginDiscoveryService, getFeaturedPlugins } = await import('../plugins/store/index.js');
+                const { createPluginDiscoveryService, getFeaturedPlugins, registryStatus } = await import('../plugins/store/index.js');
                 const discovery = createPluginDiscoveryService();
                 const result = await discovery.discoverRegistry();
                 if (!result.success || !result.registry) {
@@ -410,7 +410,7 @@ export const transferTools = [
                 }
                 const featured = getFeaturedPlugins(result.registry);
                 const limit = input.limit || 10;
-                return createResult(featured.slice(0, limit));
+                return createResult({ plugins: featured.slice(0, limit), registry: registryStatus(result) });
             }
             catch (error) {
                 return createResult({ error: error.message }, true);
@@ -428,14 +428,15 @@ export const transferTools = [
         },
         handler: async () => {
             try {
-                const { createPluginDiscoveryService, getOfficialPlugins } = await import('../plugins/store/index.js');
+                const { createPluginDiscoveryService, getOfficialPlugins, registryStatus } = await import('../plugins/store/index.js');
                 const discovery = createPluginDiscoveryService();
                 const result = await discovery.discoverRegistry();
                 if (!result.success || !result.registry) {
                     return createResult({ error: result.error || 'Failed to discover registry' }, true);
                 }
+                // Empty when the registry is unverified: an unsigned "official" list proves nothing.
                 const official = getOfficialPlugins(result.registry);
-                return createResult(official);
+                return createResult({ plugins: official, registry: registryStatus(result) });
             }
             catch (error) {
                 return createResult({ error: error.message }, true);

package/dist/src/mcp-tools/workflow-tools.js

@@ -863,7 +863,7 @@ export const workflowTools = [
         // `workflow_validate` tool. Structural sanity check (JSON workflow files);
         // a full schema validator is a follow-up.
         name: 'workflow_validate',
-        description: 'Structurally validate a workflow definition file (JSON) — checks it has a steps/stages/tasks array and that each step names an agent. Use when native Read is wrong because you want a parsed, structured pass/fail with error/warning lists and step/agent counts rather than eyeballing the file. For just reading the file, native Read is fine. (Basic checks today — a full workflow-schema validator is a tracked follow-up.)',
+        description: 'Structurally validate a workflow definition file (JSON) — checks it has a steps/stages/tasks array and that task steps resolve an agent. Use when native Read is wrong because you want a parsed, structured pass/fail with error/warning lists and step/agent counts rather than eyeballing the file. For just reading the file, native Read is fine. (Basic checks today — a full workflow-schema validator is a tracked follow-up.)',
         category: 'workflow',
         inputSchema: {
             type: 'object',
@@ -906,10 +906,16 @@ export const workflowTools = [
                         const agentSet = new Set();
                         steps.forEach((s, i) => {
                             const step = (s ?? {});
-                            const a = (step.agent ?? step.agentType ?? step.agent_type);
-                            if (a)
+                            // Match workflow_execute: control steps do not dispatch agents,
+                            // and task steps use config.agentId or the workflow default.
+                            const config = step.config;
+                            const variables = d.variables;
+                            const a = config?.agentId || variables?.defaultAgentId
+                                || step.agent || step.agentType || step.agent_type;
+                            const needsAgent = !['wait', 'condition', 'parallel', 'loop'].includes(String(step.type));
+                            if (needsAgent && a)
                                 agentSet.add(String(a));
-                            else
+                            else if (needsAgent)
                                 warnings.push({ line: i + 1, message: `step ${i + 1} ("${step.name ?? step.id ?? i + 1}") names no agent` });
                         });
                         agents = agentSet.size;

package/dist/src/memory/memory-initializer.js

@@ -2179,25 +2179,8 @@ async function loadLocalEmbeddingChain(verbose = false, startTime = Date.now())
                 // ruvector ONNX init failed, continue to next fallback
             }
         }
-        // Legacy fallback: Check for agentic-flow core embeddings
-        const agenticFlow = await import('agentic-flow').catch(() => null);
-        if (agenticFlow && agenticFlow.embeddings) {
-            if (verbose) {
-                console.log('Loading agentic-flow embedding model...');
-            }
-            embeddingModelState = {
-                loaded: true,
-                model: agenticFlow.embeddings,
-                tokenizer: null,
-                dimensions: 768
-            };
-            return {
-                success: true,
-                dimensions: 768,
-                modelName: 'agentic-flow',
-                loadTime: Date.now() - startTime
-            };
-        }
+        // No agentic-flow root-entry fallback: no published root exports
+        // `embeddings`, and importing it runs its CLI main() in 3.0.0-alpha.x.
         // No ONNX model available - use fallback
         embeddingModelState = {
             loaded: true,

package/dist/src/memory/shared-sqlite.d.ts

@@ -1,4 +1,10 @@
 type DbCtor = new (path: string, opts?: Record<string, unknown>) => any;
+/**
+ * Entry file whose better-sqlite3 AgentDB's handle uses: @claude-flow/memory
+ * when it routes AgentDB through its own driver, else agentdb.
+ * Test seam: `memoryEntry` stands in for the resolved @claude-flow/memory entry.
+ */
+export declare function resolveSqliteOwnerEntry(memoryEntry?: string): string | null;
 /** Test seam: pass `from` to resolve relative to another entry file. */
 export declare function resolveAgentdbBetterSqlite3(from?: string): DbCtor | null;
 /** Constructor shared with AgentDB when possible, else the CLI's own copy. */

package/dist/src/memory/shared-sqlite.js

@@ -10,22 +10,50 @@
  * like "last connection" to that copy and deletes the -wal/-shm sidecars out
  * from under AgentDB's still-open handle.
  *
- * Resolve the constructor from the same place AgentDB resolves it, so both
- * share one SQLite instance (and its connection bookkeeping). Falls back to the
- * CLI's own copy when agentdb cannot be resolved.
+ * Resolve the constructor from the same place AgentDB's handle is opened with,
+ * so both share one SQLite instance (and its connection bookkeeping):
+ *  - @claude-flow/memory >= 3.0.4 opens AgentDB with its own better-sqlite3
+ *    (agentdb-native-driver.js, getHostSqliteDriver) to keep agentdb's nested
+ *    11.x — compiled from source on Node 24, which aborts in Statement GC —
+ *    out of the process. Resolve from memory's location then.
+ *  - Older memory lets AgentDB load its own copy: resolve from agentdb.
+ * Falls back to the CLI's own copy when neither can be resolved.
  */
 import { createRequire } from 'node:module';
+import { existsSync } from 'node:fs';
+import { dirname, join } from 'node:path';
 let cached;
+/**
+ * Entry file whose better-sqlite3 AgentDB's handle uses: @claude-flow/memory
+ * when it routes AgentDB through its own driver, else agentdb.
+ * Test seam: `memoryEntry` stands in for the resolved @claude-flow/memory entry.
+ */
+export function resolveSqliteOwnerEntry(memoryEntry) {
+    const own = createRequire(import.meta.url);
+    try {
+        const entry = memoryEntry ?? own.resolve('@claude-flow/memory');
+        if (existsSync(join(dirname(entry), 'agentdb-native-driver.js')))
+            return entry;
+    }
+    catch { /* memory not installed */ }
+    try {
+        return own.resolve('agentdb');
+    }
+    catch {
+        return null;
+    }
+}
 /** Test seam: pass `from` to resolve relative to another entry file. */
 export function resolveAgentdbBetterSqlite3(from) {
     if (!from && cached !== undefined)
         return cached;
     let found = null;
     try {
-        const own = createRequire(import.meta.url);
-        const agentdbEntry = from ?? own.resolve('agentdb');
-        const mod = createRequire(agentdbEntry)('better-sqlite3');
-        found = (mod?.default ?? mod);
+        const ownerEntry = from ?? resolveSqliteOwnerEntry();
+        if (ownerEntry) {
+            const mod = createRequire(ownerEntry)('better-sqlite3');
+            found = (mod?.default ?? mod);
+        }
     }
     catch {
         found = null;