cf-memory-mcp 3.52.0 → 3.53.0

package/bin/cf-memory-mcp.js

@@ -4095,6 +4095,10 @@ function parseCliArgs(rest) {
             flags.project_id = rest[++i];
         } else if (a.startsWith('--project-id=')) {
             flags.project_id = a.slice('--project-id='.length);
+        } else if (a === '--branch') {
+            flags.branch = rest[++i];
+        } else if (a.startsWith('--branch=')) {
+            flags.branch = a.slice('--branch='.length);
         } else if (a === '--since') {
             flags.since = rest[++i];
         } else if (a.startsWith('--since=')) {
@@ -4908,7 +4912,13 @@ async function runHistoryCli() {
         });
         const text = response?.result?.content?.[0]?.text;
         const payload = JSON.parse(text || '{}');
-        const all = (payload.recent_handoffs || []).slice();
+        let all = (payload.recent_handoffs || []).slice();
+        // Client-side branch filter: server doesn't filter recent_handoffs
+        // by branch (only uses it for confidence scoring on the primary
+        // match), so we apply the filter here.
+        if (flags.branch) {
+            all = all.filter(h => h.branch === flags.branch);
+        }
         // Chronological order (oldest first).
         all.sort((a, b) => {
             const ta = new Date(a.ended_at || a.started_at).getTime();
@@ -5388,12 +5398,13 @@ const PER_COMMAND_HELP = {
   Print all CF_MEMORY_* env vars the bridge reads, with their current
   values + descriptions. Useful for discovering knobs.
     --json, -j            Emit JSON for scripts.`,
-    history: `cf-memory-mcp history [--limit N] [--repo PATH] [--since ISO] [--json]
+    history: `cf-memory-mcp history [--limit N] [--repo PATH] [--branch BR] [--since ISO] [--json]
   Print all handoffs for the current cwd in chronological order (oldest
   first). Unlike 'list' (status-ranked, default 5), this is a flat
   timeline view.
     --limit N             Max number of handoffs (default 25, max 50).
     --repo PATH           Override the cwd's repo.
+    --branch BR           Filter to a specific branch.
     --since ISO           Lower bound on handoff timestamp.
     --json, -j            Emit JSON.`,
     link: `cf-memory-mcp link <child-id-or-prefix> --parent <parent-id-or-prefix> [--json]
@@ -5470,6 +5481,7 @@ async function runDoctorCli() {
     if (diskWritable) add('disk cache writable', true, path.dirname(cachePath));
 
     // 4. Worker reachable?
+    let handoffStatsForHint = null;
     if (API_KEY) {
         const t0 = Date.now();
         let workerReachable = false;
@@ -5486,6 +5498,19 @@ async function runDoctorCli() {
             workerReachable ? `${workerMs}ms` : `failed`,
             `curl -I ${BASE_URL}/health  # check the worker URL and your network`);
 
+        // Pre-fetch handoff stats so the "resume handoff available" check
+        // can suggest cross-laptop workflows when relevant.
+        if (workerReachable) {
+            try {
+                const statsRes = await server.makeRequestOnce({
+                    jsonrpc: '2.0', id: `doctor-stats-pre-${Date.now()}`,
+                    method: 'tools/call', params: { name: 'get_stats', arguments: {} },
+                });
+                const statsText = statsRes?.result?.content?.[0]?.text;
+                if (statsText) handoffStatsForHint = JSON.parse(statsText)?.handoffs || null;
+            } catch (_) { /* skip */ }
+        }
+
         // 5. Project indexed?
         if (workerReachable) {
             const fake = { params: { name: 'retrieve_context', arguments: {} } };
@@ -5507,33 +5532,36 @@ async function runDoctorCli() {
                     });
                     const probeText = probeRes?.result?.content?.[0]?.text;
                     const probePayload = JSON.parse(probeText || '{}');
-                    const hasHandoff = !!probePayload.resume_handoff;
-                    add('resume handoff available', hasHandoff,
-                        hasHandoff
-                            ? `${(probePayload.resume_handoff.session_id||'').slice(0,8)} (${probePayload.resume_handoff.handoff_age_minutes}m old)`
-                            : 'none for this context',
-                        'cf-memory-mcp checkpoint "what you are working on"  # or end_session({handoff:...}) in your MCP client');
+                    const handoff = probePayload.resume_handoff;
+                    const hasHandoff = !!handoff;
+                    // Cross-laptop / wrong-repo detection: the returned
+                    // handoff is for a DIFFERENT repo than cwd's. Most
+                    // commonly this is a tier-4 fallback or repo_path_prefix
+                    // hit. Either way the user is probably resuming the
+                    // "wrong" thread by accident.
+                    const handoffRepo = handoff?.handoff?.repo_path;
+                    const seemsCrossLaptop = hasHandoff
+                        && handoffRepo
+                        && handoffRepo !== meta.repo_path;
+                    let fixHint = 'cf-memory-mcp checkpoint "what you are working on"  # or end_session({handoff:...}) in your MCP client';
+                    let ok = hasHandoff;
+                    let detail = hasHandoff
+                        ? `${(handoff.session_id||'').slice(0,8)} (${handoff.handoff_age_minutes}m old)`
+                        : 'none for this context';
+                    if (seemsCrossLaptop) {
+                        // Soft warning — we matched, but cross-repo.
+                        ok = false;
+                        detail = `cross-repo match (cwd=${meta.repo_path}, handoff repo=${handoffRepo}); confidence ${handoff.match_confidence}`;
+                        fixHint = `Cross-laptop or path-mismatch case. Try: cf-memory-mcp resume --repo "${handoffRepo}"  # or use --project-id from "cfm list"`;
+                    }
+                    add('resume handoff available', ok, detail, fixHint);
                 } catch (_) { /* skip */ }
             }
         }
     }
 
-    // Optional: handoff stats summary at the bottom (visibility into
-    // how much resume context is captured for the current user).
-    let handoffStats = null;
-    if (API_KEY) {
-        try {
-            const statsRes = await server.makeRequestOnce({
-                jsonrpc: '2.0', id: `doctor-stats-${Date.now()}`,
-                method: 'tools/call', params: { name: 'get_stats', arguments: {} },
-            });
-            const statsText = statsRes?.result?.content?.[0]?.text;
-            if (statsText) {
-                const statsPayload = JSON.parse(statsText);
-                if (statsPayload?.handoffs) handoffStats = statsPayload.handoffs;
-            }
-        } catch (_) { /* skip on failure */ }
-    }
+    // Reuse the stats already fetched for the cross-laptop hint above.
+    const handoffStats = handoffStatsForHint;
 
     if (flags.json) {
         process.stdout.write(JSON.stringify({ checks, ...(handoffStats ? { handoffs: handoffStats } : {}) }, null, 2) + '\n');

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "cf-memory-mcp",
-	"version": "3.52.0",
+	"version": "3.53.0",
 	"description": "Cloudflare-hosted MCP server for code indexing, retrieval, and assistant memory with a direct remote MCP endpoint and local stdio bridge.",
 	"main": "bin/cf-memory-mcp.js",
 	"bin": {