cf-memory-mcp 3.18.0 → 3.20.0

package/bin/cf-memory-mcp.js

@@ -215,7 +215,8 @@ const TOOLS_LIST = [
                 branch: { type: 'string', description: 'Current git branch. Mismatch downgrades match_confidence but does not hide. Bridge auto-fills from git.' },
                 session_id_hint: { type: 'string', description: 'Resume a specific session by id (overrides repo/branch matching). Full UUID or short prefix (>=8 chars). Useful after seeing recent_handoffs.' },
                 max_age_minutes: { type: 'number', description: 'Hard cutoff: hide handoffs older than this many minutes. Without it, older handoffs surface with reduced confidence.' },
-                goal_contains: { type: 'string', description: 'Substring filter on handoff content (goal/notes/decisions). Case-insensitive. Lets agents find a specific thread by what it was about.' }
+                goal_contains: { type: 'string', description: 'Substring filter on handoff content (goal/notes/decisions). Case-insensitive. Lets agents find a specific thread by what it was about.' },
+                since: { type: 'string', description: 'Lower bound on handoff timestamp (ISO 8601). Scope resume to a time window.' }
             }
         }
     },
@@ -768,15 +769,25 @@ class CFMemoryMCP {
             // tools) recover prior chat state.
             if (message.method === 'resources/read') {
                 const uri = message.params?.uri;
-                if (uri === 'cfm://resume/current' || uri === 'cfm://resume/recent') {
+                const isCurrent = uri === 'cfm://resume/current';
+                const isRecent = uri === 'cfm://resume/recent';
+                // cfm://resume/session/<id-or-prefix>
+                const sessionMatch = typeof uri === 'string' && uri.startsWith('cfm://resume/session/')
+                    ? uri.slice('cfm://resume/session/'.length)
+                    : null;
+                if (isCurrent || isRecent || sessionMatch) {
                     try {
                         const meta = this.getRepoMetadata();
                         const args = { resume: true };
-                        if (meta.repo_path) args.repo_path = meta.repo_path;
-                        if (meta.branch) args.branch = meta.branch;
-                        const fake = { params: { name: 'retrieve_context', arguments: {} } };
-                        await this.maybeFillProjectId(fake);
-                        if (fake.params.arguments.project_id) args.project_id = fake.params.arguments.project_id;
+                        if (sessionMatch) {
+                            args.session_id_hint = sessionMatch;
+                        } else {
+                            if (meta.repo_path) args.repo_path = meta.repo_path;
+                            if (meta.branch) args.branch = meta.branch;
+                            const fake = { params: { name: 'retrieve_context', arguments: {} } };
+                            await this.maybeFillProjectId(fake);
+                            if (fake.params.arguments.project_id) args.project_id = fake.params.arguments.project_id;
+                        }
                         const bootstrap = await this.makeRequest({
                             jsonrpc: '2.0',
                             id: `resource-read-${Date.now()}`,
@@ -786,7 +797,7 @@ class CFMemoryMCP {
                         const text = bootstrap?.result?.content?.[0]?.text || '{}';
                         // For cfm://resume/recent, surface only the recent_handoffs summaries.
                         let payload = text;
-                        if (uri === 'cfm://resume/recent') {
+                        if (isRecent) {
                             try {
                                 const parsed = JSON.parse(text);
                                 payload = JSON.stringify({
@@ -817,19 +828,29 @@ class CFMemoryMCP {
                     id: message.id,
                     error: {
                         code: -32602,
-                        message: `Unknown resource URI: ${uri}. Supported: cfm://resume/current, cfm://resume/recent`,
+                        message: `Unknown resource URI: ${uri}. Supported: cfm://resume/current, cfm://resume/recent, cfm://resume/session/<id-or-prefix>`,
                     },
                 };
                 process.stdout.write(JSON.stringify(response) + '\n');
                 return;
             }
 
-            // Handle resources/templates/list locally (we have none)
+            // Handle resources/templates/list — advertise the parameterized
+            // per-session resume URI so clients can discover the template.
             if (message.method === 'resources/templates/list') {
                 const response = {
                     jsonrpc: '2.0',
                     id: message.id,
-                    result: { resourceTemplates: [] }
+                    result: {
+                        resourceTemplates: [
+                            {
+                                uriTemplate: 'cfm://resume/session/{session_id}',
+                                name: 'Specific session handoff',
+                                description: 'Fetch a specific session\'s handoff by full UUID or short prefix (>=8 chars).',
+                                mimeType: 'application/json',
+                            },
+                        ],
+                    },
                 };
                 process.stdout.write(JSON.stringify(response) + '\n');
                 return;
@@ -945,7 +966,27 @@ class CFMemoryMCP {
             // (try/catch'd), and the agent's hand-written list always wins.
             this.trackToolActivity(message);
 
-            let response = await this.makeRequest(message);
+            let response;
+            try {
+                response = await this.makeRequest(message);
+            } catch (err) {
+                // Network failure / worker unreachable. For resume bootstrap
+                // calls, serve from local disk so the agent isn't stuck
+                // when Cloudflare is down or the user is offline.
+                if (message.method === 'tools/call' &&
+                    message.params?.name === 'get_context_bootstrap' &&
+                    message.params.arguments?.resume) {
+                    const fallback = this.loadResumeFromDisk(message.id);
+                    if (fallback) {
+                        _mcpTrace('DISPATCH_DONE', `id=${message.id} method=${message.method} fallback=disk elapsed=${Date.now()-_t0}ms`);
+                        process.stdout.write(JSON.stringify(fallback) + '\n');
+                        return;
+                    }
+                }
+                // Not a resume call, or no disk fallback available: surface
+                // the original error to the client.
+                throw err;
+            }
             _mcpTrace('DISPATCH_DONE', `id=${message.id} method=${message.method} elapsed=${Date.now()-_t0}ms`);
 
             // Annotate retrieve_context results with local staleness when
@@ -988,14 +1029,21 @@ class CFMemoryMCP {
                 this.cacheImplicitSessionFromResponse(response);
             }
 
-            // Inject bridge-side git diff into resume responses. Lets the
-            // agent see what's changed in the repo since the handoff was
-            // written — files modified, commits added, branch moves —
-            // without having to call git themselves.
+            // Resume bootstrap: if the server returned an error envelope
+            // (not just a fetch failure), try the disk fallback. Then
+            // run the normal diff injection + disk persist for success.
             if (message.method === 'tools/call' &&
                 message.params?.name === 'get_context_bootstrap' &&
                 message.params.arguments?.resume) {
+                if (response?.error) {
+                    const fallback = this.loadResumeFromDisk(message.id);
+                    if (fallback) {
+                        response = fallback;
+                    }
+                }
                 this.injectRepoDiffIntoResume(response);
+                // Persist to disk for offline fallback on the next call.
+                this.saveResumeToDisk(response);
             }
 
             // Send response to stdout
@@ -2744,6 +2792,92 @@ class CFMemoryMCP {
             .join('\n');
     }
 
+    /**
+     * Local-disk cache for the resume packet. Path is
+     *   ~/.cf-memory/handoff-<sha256-prefix-of-cwd>.json
+     * Used as a fallback when the worker is unreachable (network down,
+     * Cloudflare outage). Refreshed on every successful resume fetch.
+     */
+    getDiskCachePath() {
+        try {
+            const cwd = process.env.CF_MEMORY_WATCH_PATH || process.cwd();
+            const crypto = require('crypto');
+            const hash = crypto.createHash('sha256').update(cwd).digest('hex').slice(0, 16);
+            const dir = path.join(os.homedir(), '.cf-memory');
+            return path.join(dir, `handoff-${hash}.json`);
+        } catch (_) { return null; }
+    }
+
+    /**
+     * Persist a resume bootstrap response to local disk. Called after
+     * a successful resume fetch (prewarm or live). Fire-and-forget;
+     * disk errors are non-fatal.
+     */
+    saveResumeToDisk(response) {
+        try {
+            const optOut = process.env.CF_MEMORY_DISK_CACHE;
+            if (optOut === '0' || optOut === 'false' || optOut === 'off') return;
+            const p = this.getDiskCachePath();
+            if (!p) return;
+            const text = response?.result?.content?.[0]?.text;
+            if (!text) return;
+            // Only persist when there's actually a handoff to cache.
+            try {
+                const parsed = JSON.parse(text);
+                if (!parsed?.resume_handoff) return;
+            } catch (_) { return; }
+            const dir = path.dirname(p);
+            if (!fs.existsSync(dir)) {
+                fs.mkdirSync(dir, { recursive: true });
+            }
+            const entry = {
+                cached_at: new Date().toISOString(),
+                cwd: process.env.CF_MEMORY_WATCH_PATH || process.cwd(),
+                response_text: text,
+            };
+            fs.writeFileSync(p, JSON.stringify(entry, null, 2));
+            _mcpTrace('DISK_CACHE', `saved resume packet to ${p}`);
+        } catch (err) {
+            this.logDebug(`saveResumeToDisk failed: ${err && err.message}`);
+        }
+    }
+
+    /**
+     * Load the most-recent disk-cached resume packet for the current cwd.
+     * Returns a response-shaped object the bridge can write to stdout, or
+     * null when nothing cached / disk unreadable. The returned envelope
+     * is tagged with a `from_disk_cache:true` marker + `disk_cache_age`
+     * so the agent knows this is a fallback, not a fresh fetch.
+     */
+    loadResumeFromDisk(messageId) {
+        try {
+            const p = this.getDiskCachePath();
+            if (!p || !fs.existsSync(p)) return null;
+            const entry = JSON.parse(fs.readFileSync(p, 'utf8'));
+            const parsed = JSON.parse(entry.response_text);
+            const cachedAt = entry.cached_at;
+            const ageMinutes = Math.round((Date.now() - new Date(cachedAt).getTime()) / 60000);
+            // Annotate the envelope so the agent knows it's fallback.
+            if (parsed.resume_handoff) {
+                parsed.resume_handoff.from_disk_cache = true;
+                parsed.resume_handoff.disk_cache_age_minutes = ageMinutes;
+                parsed.resume_handoff.disk_cache_cached_at = cachedAt;
+            }
+            // Replace empty_hint with one that explains the fallback.
+            parsed.empty_hint = `Worker unreachable; served from local disk cache (cached ${ageMinutes} min ago at ${cachedAt}). Refresh by calling get_context_bootstrap when the worker is back online.`;
+            const response = {
+                jsonrpc: '2.0',
+                id: messageId,
+                result: { content: [{ type: 'text', text: JSON.stringify(parsed) }] },
+            };
+            _mcpTrace('DISK_CACHE', `served resume from disk (age=${ageMinutes}min)`);
+            return response;
+        } catch (err) {
+            this.logDebug(`loadResumeFromDisk failed: ${err && err.message}`);
+            return null;
+        }
+    }
+
     /**
      * Pre-fetch the resume handoff for the current cwd at bridge startup.
      * The result is cached and surfaced when the agent's first call is
@@ -2785,6 +2919,8 @@ class CFMemoryMCP {
                 const parsed = JSON.parse(text || '{}');
                 handoff_present = !!parsed.resume_handoff;
             } catch (_) { /* ignore */ }
+            // Persist to disk for offline fallback. Best-effort.
+            if (handoff_present) this.saveResumeToDisk(response);
             _mcpTrace('RESUME_PREWARM', `elapsed=${elapsed}ms handoff_present=${handoff_present}`);
         } catch (err) {
             this.logDebug(`prewarmResumeContext failed: ${err && err.message}`);
@@ -3444,6 +3580,8 @@ A portable MCP (Model Context Protocol) server for AI memory storage using Cloud
 
 Usage:
   npx cf-memory-mcp                 Start the MCP server
+  npx cf-memory-mcp resume          Print the prior resume handoff for cwd (markdown)
+  npx cf-memory-mcp resume <id>     Print a specific handoff by session_id prefix
   npx cf-memory-mcp --version       Show version
   npx cf-memory-mcp --help          Show this help
   npx cf-memory-mcp --diagnose      Test connectivity and report issues
@@ -3460,6 +3598,70 @@ For more information, visit: https://github.com/johnlam90/cf-memory-mcp
     process.exit(0);
 }
 
+// Read-only inspection command: print the prior resume handoff to stdout.
+// Lets a human see what state is captured without involving an MCP client.
+async function runResumeCli() {
+    if (!API_KEY) {
+        console.error('Error: CF_MEMORY_API_KEY environment variable is required');
+        process.exit(1);
+    }
+    const server = new CFMemoryMCP();
+    server.logDebug = () => {};
+    server.logError = (...a) => process.stderr.write(a.join(' ') + '\n');
+    try {
+        const meta = server.getRepoMetadata();
+        const args = { resume: true };
+        if (meta.repo_path) args.repo_path = meta.repo_path;
+        if (meta.branch) args.branch = meta.branch;
+        // Optional positional session_id argument.
+        const sessionArg = process.argv[3];
+        if (sessionArg) args.session_id_hint = sessionArg;
+        const fake = { params: { name: 'retrieve_context', arguments: {} } };
+        await server.maybeFillProjectId(fake);
+        if (fake.params.arguments.project_id) args.project_id = fake.params.arguments.project_id;
+
+        const response = await server.makeRequest({
+            jsonrpc: '2.0',
+            id: `cli-resume-${Date.now()}`,
+            method: 'tools/call',
+            params: { name: 'get_context_bootstrap', arguments: args },
+        });
+        const text = response?.result?.content?.[0]?.text;
+        if (!text) {
+            console.error('No response from server.');
+            process.exit(2);
+        }
+        const payload = JSON.parse(text);
+        if (payload.resume_handoff?.handoff) {
+            if (payload.resume_prompt) {
+                process.stdout.write(payload.resume_prompt + '\n');
+            } else {
+                process.stdout.write(JSON.stringify(payload.resume_handoff, null, 2) + '\n');
+            }
+            if (Array.isArray(payload.recent_handoffs) && payload.recent_handoffs.length > 1) {
+                process.stdout.write('\n---\nOther recent handoffs:\n');
+                for (const h of payload.recent_handoffs.slice(0, 4)) {
+                    const shortId = (h.session_id || '').slice(0, 8);
+                    process.stdout.write(`  ${shortId} [${h.status || '?'}] ${h.goal || ''}\n`);
+                }
+                process.stdout.write(`(Pass any short id as: npx cf-memory-mcp resume <id>)\n`);
+            }
+            process.exit(0);
+        } else {
+            process.stdout.write((payload.empty_hint || 'No resume handoff available.') + '\n');
+            process.exit(0);
+        }
+    } catch (err) {
+        console.error('resume command failed:', err.message);
+        process.exit(1);
+    }
+}
+
+if (process.argv[2] === 'resume') {
+    runResumeCli();
+    return;
+}
+
 if (process.argv.includes('--diagnose')) {
     (async () => {
         console.log(`CF Memory MCP v${PACKAGE_VERSION} - Diagnostics`);

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "cf-memory-mcp",
-	"version": "3.18.0",
+	"version": "3.20.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": {