@fuzeelogik/myflo 1.0.1 → 1.1.0

package/lib/memory-backend-agentdb.js

@@ -1,4 +1,4 @@
-// AgentDB-backed memory adapter. Wraps @myflo/memory's UnifiedMemoryService
+// AgentDB-backed memory adapter. Wraps @fuzeelogik/myflo-memory's UnifiedMemoryService
 // + SqlJsBackend to expose the same API as memory-store.js's JSONL backend:
 //   storeEntry, searchEntries, listEntries, getEntry, deleteEntry,
 //   listNamespaces, namespaceStats
@@ -21,12 +21,12 @@ let _backend = null;
 async function locateSqlJsWasm() {
   // sql.js ships its WASM as a file. By default it tries to fetch from
   // sql.js.org which fails offline. Point it at the bundled file.
-  // sql.js is a transitive dep of @myflo/memory, so we resolve via that
+  // sql.js is a transitive dep of @fuzeelogik/myflo-memory, so we resolve via that
   // package's location (createRequire from the memory module URL).
   const { createRequire } = await import('node:module');
   try {
-    // Resolve @myflo/memory's package.json to find its location
-    const memoryPkgUrl = import.meta.resolve('@myflo/memory/package.json');
+    // Resolve @fuzeelogik/myflo-memory's package.json to find its location
+    const memoryPkgUrl = import.meta.resolve('@fuzeelogik/myflo-memory/package.json');
     const req = createRequire(memoryPkgUrl);
     const sqlJsMain = req.resolve('sql.js');
     return sqlJsMain.replace(/sql-wasm\.js$/, 'sql-wasm.wasm');
@@ -39,18 +39,17 @@ async function getBackend() {
   if (_backend) return _backend;
   if (!existsSync(FLO_HOME)) await mkdir(FLO_HOME, { recursive: true });
   // Dynamic import keeps the heavy module out of the load path for the JSONL
-  // codepath. @myflo/memory is not yet published to npm — the agentdb backend
-  // only works when myflo is run from the monorepo (pnpm workspace resolves
-  // the package locally). For standalone `npx @fuzeelogik/myflo` installs,
-  // stick with the default jsonl backend.
+  // codepath. @fuzeelogik/myflo-memory is an optionalDependency — npm installs
+  // it by default but doesn't fail the install if e.g. better-sqlite3 native
+  // compile fails. If it's missing entirely, fall back gracefully.
   let SqlJsBackend;
   try {
-    ({ SqlJsBackend } = await import('@myflo/memory'));
+    ({ SqlJsBackend } = await import('@fuzeelogik/myflo-memory'));
   } catch (err) {
     throw new Error(
-      `agentdb backend requires @myflo/memory, which is not yet published to npm. ` +
-      `It currently resolves only inside the myflo monorepo. ` +
-      `Stick with the default jsonl backend (unset FLO_MEMORY_BACKEND). ` +
+      `agentdb backend requires @fuzeelogik/myflo-memory to be installed. ` +
+      `Install it: npm install @fuzeelogik/myflo-memory. ` +
+      `Or stick with the default jsonl backend (unset FLO_MEMORY_BACKEND). ` +
       `Underlying error: ${err.message}`
     );
   }
@@ -71,7 +70,7 @@ function newId() {
   return `${Date.now()}-${randomBytes(3).toString('hex')}`;
 }
 
-// Map flo-shape entry to @myflo/memory MemoryEntry. SqlJsBackend binds every
+// Map flo-shape entry to @fuzeelogik/myflo-memory MemoryEntry. SqlJsBackend binds every
 // field via positional ?-params, so undefined is fatal — we provide every
 // expected field with a sensible default.
 function toBackendEntry({ namespace = 'default', key, value, tags = [], metadata = {} }) {

package/lib/memory-store.js

@@ -1,7 +1,7 @@
 // Memory store with two backends:
 //   - jsonl  (default) — file-backed JSONL per namespace under ~/.flo/memory/<ns>.jsonl
 //                        Pure JS, no native deps, BM25 ranking. Zero install cost.
-//   - agentdb         — SQLite-backed via @myflo/memory's SqlJsBackend. FTS5
+//   - agentdb         — SQLite-backed via @fuzeelogik/myflo-memory's SqlJsBackend. FTS5
 //                        keyword search, optional vector embeddings, scales further.
 //
 // Select via FLO_MEMORY_BACKEND env var or { backend } option on each call.

package/lib/replace-ruflo.js

@@ -1,12 +1,15 @@
 // `flo replace ruflo` — cutover script.
 // Removes ruflo / claude-flow entries from ~/.claude/mcp.json and project
-// .claude/settings.json mcpServers blocks, leaving only flo. Idempotent.
-// Backs up both files before writing.
+// .claude/settings.json mcpServers blocks, AND shells out to
+// `claude mcp remove <name>` for entries the Claude CLI itself manages
+// (e.g. ones registered via `claude mcp add` that don't live in those files).
+// Idempotent. Backs up json files before writing.
 
 import { readFile, writeFile, copyFile, mkdir } from 'node:fs/promises';
 import { existsSync } from 'node:fs';
 import { homedir } from 'node:os';
 import { join } from 'node:path';
+import { spawn } from 'node:child_process';
 
 const USER_MCP = join(homedir(), '.claude', 'mcp.json');
 const PROJECT_SETTINGS = join(process.cwd(), '.claude', 'settings.json');
@@ -57,11 +60,72 @@ export async function replaceCommand(args) {
     console.log(`✓ ${label}: removed [${result.removed.join(', ')}] from ${path} (backup: ${backup})`);
   }
 
+  // Phase 2: ask Claude CLI itself to remove any ruflo/claude-flow servers it
+  // tracks. This catches entries registered via `claude mcp add` that don't
+  // live in mcp.json or settings.json (e.g. user/local scope state the CLI
+  // keeps elsewhere). The flo replace ruflo command was previously a no-op
+  // for users in this state — see #1 on the v1.0.1 premortem.
+  const claudePath = await whichClaudeCli();
+  if (!claudePath) {
+    console.log('');
+    console.log('- claude CLI not on PATH — skipping `claude mcp remove` step.');
+    console.log('  (Files were cleaned above; that is usually enough.)');
+  } else {
+    console.log('');
+    console.log(`Running \`claude mcp remove\` for each known ruflo name...`);
+    for (const name of RUFLO_KEYS) {
+      if (opts.dryRun) {
+        console.log(`# would run: claude mcp remove "${name}"`);
+        continue;
+      }
+      const res = await runClaudeMcpRemove(claudePath, name);
+      if (res.removed) {
+        console.log(`✓ claude mcp remove "${name}" — removed from ${res.scope || 'config'}`);
+      } else if (res.notFound) {
+        console.log(`= claude mcp remove "${name}" — not registered, skipping`);
+      } else {
+        console.log(`× claude mcp remove "${name}" — failed: ${res.error}`);
+      }
+    }
+  }
+
   console.log('');
   console.log('Done. Restart Claude Code to pick up the change.');
   console.log("If you need to roll back, the .flo-bak.* file is your snapshot.");
 }
 
+async function whichClaudeCli() {
+  return new Promise((resolve) => {
+    const p = spawn('which', ['claude'], { stdio: ['ignore', 'pipe', 'ignore'] });
+    let out = '';
+    p.stdout.on('data', (b) => { out += b.toString(); });
+    p.on('close', (code) => resolve(code === 0 ? out.trim() : null));
+    p.on('error', () => resolve(null));
+  });
+}
+
+async function runClaudeMcpRemove(claudePath, name) {
+  return new Promise((resolve) => {
+    const p = spawn(claudePath, ['mcp', 'remove', name], { stdio: ['ignore', 'pipe', 'pipe'] });
+    let stdout = '';
+    let stderr = '';
+    p.stdout.on('data', (b) => { stdout += b.toString(); });
+    p.stderr.on('data', (b) => { stderr += b.toString(); });
+    p.on('close', (code) => {
+      const combined = (stdout + stderr).toLowerCase();
+      if (code === 0) {
+        const scopeMatch = stdout.match(/from\s+(\w+)\s+config/i);
+        resolve({ removed: true, scope: scopeMatch?.[1] || null });
+      } else if (/no.*server.*found|not.*found|does not exist/.test(combined)) {
+        resolve({ notFound: true });
+      } else {
+        resolve({ error: (stderr || stdout).trim().slice(0, 200) || `exit ${code}` });
+      }
+    });
+    p.on('error', (err) => resolve({ error: err.message }));
+  });
+}
+
 function removeRufloFrom(obj) {
   const removed = [];
   // mcpServers block
@@ -115,6 +179,10 @@ Specifically removes:
 
 Both files are backed up to <path>.flo-bak.<ts> before being rewritten.
 
+Also runs \`claude mcp remove ruflo\` and \`claude mcp remove claude-flow\`
+to catch entries the Claude CLI tracks outside those files (registered via
+\`claude mcp add\`). Silently skipped if the claude CLI isn't on PATH.
+
 Idempotent. Re-running on a clean config is a no-op.
 
 This complements 'flo migrate', which only ADDED the flo entry. Run that first

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fuzeelogik/myflo",
-  "version": "1.0.1",
+  "version": "1.1.0",
   "description": "myflo — local-first developer workbench. CLI + MCP server + Next.js dashboard. Forked from ruflo for the runtime substrate; flo CLI on top is ours.",
   "type": "module",
   "bin": {
@@ -14,8 +14,8 @@
     "README.md"
   ],
   "dependencies": {},
-  "devDependencies": {
-    "@myflo/memory": "workspace:*"
+  "optionalDependencies": {
+    "@fuzeelogik/myflo-memory": "^1.0.0"
   },
   "engines": {
     "node": ">=20.0.0"

package/tests/smoke.sh

@@ -387,6 +387,32 @@ for line in sys.stdin:
 if [ "$TOOLCOUNT" = "22" ]; then echo "  PASS  mcp tools/list count (22)"; PASS=$((PASS+1))
 else echo "  FAIL  mcp tools/list count (got $TOOLCOUNT)"; FAIL=$((FAIL+1)); fi
 
+# `flo replace ruflo` against a fixture project — file rewrites + graceful
+# skip when claude CLI is unavailable (PATH hidden to avoid mutating real config).
+REPLACE_DIR="$TMP/replace-ruflo-test"
+mkdir -p "$REPLACE_DIR/.claude"
+cat > "$REPLACE_DIR/.claude/settings.json" <<'JSON'
+{
+  "mcpServers": {
+    "ruflo": {"command": "npx", "args": ["-y", "ruflo@latest", "mcp", "start"]},
+    "flo": {"command": "node", "args": ["/x.js"]}
+  },
+  "enabledMcpjsonServers": ["ruflo", "flo"],
+  "permissions": {"allow": ["mcp__ruflo__foo", "Bash(ls:*)", "mcp__claude-flow__bar"]}
+}
+JSON
+NODE_BIN=$(which node)
+REPLACE_OUT=$(cd "$REPLACE_DIR" && PATH="/usr/bin:/bin" $NODE_BIN "$REPO_ROOT/apps/cli/bin/flo.js" replace ruflo 2>&1)
+if echo "$REPLACE_OUT" | grep -q "claude CLI not on PATH"; then
+  if python3 -c "import json; d=json.load(open('$REPLACE_DIR/.claude/settings.json')); assert list(d['mcpServers'].keys())==['flo'] and d['enabledMcpjsonServers']==['flo'] and d['permissions']['allow']==['Bash(ls:*)']" 2>/dev/null; then
+    echo "  PASS  replace ruflo (file rewrite + graceful claude-cli skip)"; PASS=$((PASS+1))
+  else
+    echo "  FAIL  replace ruflo: file content unexpected"; FAIL=$((FAIL+1))
+  fi
+else
+  echo "  FAIL  replace ruflo: expected 'claude CLI not on PATH' message"; FAIL=$((FAIL+1))
+fi
+
 echo "--------------"
 echo "$PASS passed, $FAIL failed."
 if [ "$FAIL" -gt 0 ]; then exit 1; fi