@getmarrow/mcp 3.8.3 → 3.9.0

package/dist/cli.js

@@ -113,771 +113,861 @@ ${MARROW_BLOCK_END}`;
     process.exit(0);
 }
 const cliArgs = parseArgs();
-if (cliArgs.hook) {
-    void (0, hook_1.runHookCommand)();
+function formatKeyMaterialWarning() {
+    return 'Copy this key now. Marrow will only show the full plaintext key once.';
 }
-else if (cliArgs.contextHook) {
-    void (0, hook_context_1.runContextHookCommand)();
-}
-else if (cliArgs.setup) {
-    runSetup();
-}
-else {
+// ─── Standalone CLI: key management ───
+if (process.argv[2] === 'keys') {
+    const cmd = process.argv[3];
     const API_KEY = cliArgs.apiKey || process.env.MARROW_API_KEY || '';
-    // [SECURITY #3] Validate BASE_URL — require HTTPS to prevent SSRF / credential leakage
-    const rawBaseUrl = process.env.MARROW_BASE_URL || 'https://api.getmarrow.ai';
-    const BASE_URL = (0, index_1.validateBaseUrl)(rawBaseUrl);
-    const SESSION_ID = process.env.MARROW_SESSION_ID || undefined;
-    const FLEET_AGENT_ID = process.env.MARROW_FLEET_AGENT_ID || undefined; // V5: agent UUID for X-Marrow-Agent-Id header
-    const AUTO_ENROLL = process.env.MARROW_AUTO_ENROLL !== 'false'; // on by default
-    const AGENT_ID = process.env.MARROW_AGENT_ID || `${require('os').hostname()}-${Date.now().toString(36)}`;
     if (!API_KEY) {
-        process.stderr.write('Error: MARROW_API_KEY environment variable is required\n');
-        process.stderr.write('Usage: MARROW_API_KEY=mrw_yourkey npx @getmarrow/mcp\n');
-        process.stderr.write('   or: npx @getmarrow/mcp --key mrw_yourkey\n');
+        process.stderr.write('Error: MARROW_API_KEY required. Use --key or set MARROW_API_KEY env var.\n');
         process.exit(1);
     }
-    // [SECURITY #12] Warn if API key is visible in process args
-    if (cliArgs.apiKey) {
-        process.stderr.write('[marrow] Warning: --key flag exposes API key in process list. Use MARROW_API_KEY env var for production.\n');
-    }
-    // Auto-orient on startup — cache warnings, inject into EVERY marrow_think response
-    let cachedOrientWarnings = [];
-    let thinkCallCount = 0;
-    let orientCallCount = 0;
-    let initialized = false;
-    const pendingDecisions = new Map();
-    const PENDING_TTL_MS = 30 * 60 * 1000; // 30 min TTL
-    function actionHash(action) {
-        const normalized = action.toLowerCase().trim().replace(/\s+/g, ' ');
-        let h = 5381;
-        for (let i = 0; i < normalized.length; i++) {
-            h = ((h << 5) + h) ^ normalized.charCodeAt(i);
-            h = h >>> 0;
-        }
-        return h.toString(36) + '_' + normalized.slice(0, 32);
-    }
-    // [FIX #11] Actually call cleanupPending to prevent unbounded map growth
-    function cleanupPending() {
-        const now = Date.now();
-        for (const [key, val] of pendingDecisions) {
-            if (now - val.timestamp > PENDING_TTL_MS) {
-                pendingDecisions.delete(key);
+    const getFlag = (name, short) => {
+        const idx = process.argv.findIndex(a => a === `--${name}` || (short ? a === `-${short}` : false));
+        return idx >= 0 ? process.argv[idx + 1] : undefined;
+    };
+    const getFlagList = (name) => {
+        const val = getFlag(name);
+        return val ? val.split(',').map(s => s.trim()) : [];
+    };
+    const runCli = async () => {
+        try {
+            if (cmd === 'create') {
+                const name = getFlag('name', 'n');
+                if (!name) {
+                    process.stderr.write('Error: --name required\n');
+                    process.exit(1);
+                }
+                const result = await (0, index_1.marrowCreateKey)(API_KEY, 'https://api.getmarrow.ai', {
+                    name,
+                    key_type: (getFlag('type', 't') || 'live'),
+                    scopes: getFlagList('scopes'),
+                    agent_ids: getFlagList('agents'),
+                    expires_at: getFlag('expires'),
+                }, undefined, undefined);
+                process.stdout.write(JSON.stringify({ ...result, warning: formatKeyMaterialWarning() }, null, 2) + '\n');
+            }
+            else if (cmd === 'list') {
+                const result = await (0, index_1.marrowListKeys)(API_KEY, 'https://api.getmarrow.ai', undefined, undefined);
+                process.stdout.write(JSON.stringify(result, null, 2) + '\n');
+            }
+            else if (cmd === 'get') {
+                const id = getFlag('id', 'i') || process.argv[4];
+                if (!id) {
+                    process.stderr.write('Error: --id required\n');
+                    process.exit(1);
+                }
+                const result = await (0, index_1.marrowGetKey)(API_KEY, 'https://api.getmarrow.ai', id, undefined, undefined);
+                process.stdout.write(JSON.stringify(result, null, 2) + '\n');
+            }
+            else if (cmd === 'rotate') {
+                const id = getFlag('id', 'i') || process.argv[4];
+                if (!id) {
+                    process.stderr.write('Error: --id required\n');
+                    process.exit(1);
+                }
+                const result = await (0, index_1.marrowRotateKey)(API_KEY, 'https://api.getmarrow.ai', id, undefined, undefined);
+                process.stdout.write(JSON.stringify({ ...result, warning: formatKeyMaterialWarning() }, null, 2) + '\n');
+            }
+            else if (cmd === 'revoke') {
+                const id = getFlag('id', 'i') || process.argv[4];
+                if (!id) {
+                    process.stderr.write('Error: --id required\n');
+                    process.exit(1);
+                }
+                const result = await (0, index_1.marrowRevokeKey)(API_KEY, 'https://api.getmarrow.ai', id, undefined, undefined);
+                process.stdout.write(JSON.stringify(result, null, 2) + '\n');
+            }
+            else if (cmd === 'audit') {
+                const limit = parseInt(getFlag('limit', 'l') || '20', 10);
+                const result = await (0, index_1.marrowGetKeyAudit)(API_KEY, 'https://api.getmarrow.ai', { limit }, undefined, undefined);
+                process.stdout.write(JSON.stringify(result, null, 2) + '\n');
+            }
+            else {
+                process.stderr.write(`Usage: npx @getmarrow/mcp keys <create|list|get|rotate|revoke|audit> [options]\n\n`);
+                process.stderr.write(`  create  --name <name> [--type live|test] [--scopes scope1,scope2] [--agents id1,id2] [--expires ISO]\n`);
+                process.stderr.write(`  list\n`);
+                process.stderr.write(`  get     --id <key-id>\n`);
+                process.stderr.write(`  rotate  --id <key-id>\n`);
+                process.stderr.write(`  revoke  --id <key-id>\n`);
+                process.stderr.write(`  audit   [--limit <n>]\n`);
+                process.stderr.write(`\nOptions: --key <api-key>\n`);
+                process.exit(1);
             }
         }
+        catch (e) {
+            process.stderr.write(`Error: ${e.message || e}\n`);
+            process.exit(1);
+        }
+    };
+    void runCli().then(() => process.exit(0));
+}
+// Only start MCP server if not handling a CLI command
+if (process.argv[2] !== 'keys') {
+    if (cliArgs.hook) {
+        void (0, hook_1.runHookCommand)();
     }
-    function formatWarningActionably(w) {
-        const pct = Math.round(w.failureRate * 100);
-        return `⚠️ ${w.type} has ${pct}% failure rate — check what went wrong last time before proceeding`;
+    else if (cliArgs.contextHook) {
+        void (0, hook_context_1.runContextHookCommand)();
     }
-    // [FIX #4] Log orient refresh failures instead of silently ignoring
-    async function refreshOrientWarnings() {
-        try {
-            const r = await (0, index_1.marrowOrient)(API_KEY, BASE_URL, undefined, SESSION_ID, FLEET_AGENT_ID);
-            cachedOrientWarnings = r.warnings;
+    else if (cliArgs.setup) {
+        runSetup();
+    }
+    else {
+        const API_KEY = cliArgs.apiKey || process.env.MARROW_API_KEY || '';
+        // [SECURITY #3] Validate BASE_URL — require HTTPS to prevent SSRF / credential leakage
+        const rawBaseUrl = process.env.MARROW_BASE_URL || 'https://api.getmarrow.ai';
+        const BASE_URL = (0, index_1.validateBaseUrl)(rawBaseUrl);
+        const SESSION_ID = process.env.MARROW_SESSION_ID || undefined;
+        const FLEET_AGENT_ID = process.env.MARROW_FLEET_AGENT_ID || undefined; // V5: agent UUID for X-Marrow-Agent-Id header
+        const AUTO_ENROLL = process.env.MARROW_AUTO_ENROLL !== 'false'; // on by default
+        const AGENT_ID = process.env.MARROW_AGENT_ID || `${require('os').hostname()}-${Date.now().toString(36)}`;
+        if (!API_KEY) {
+            process.stderr.write('Error: MARROW_API_KEY environment variable is required\n');
+            process.stderr.write('Usage: MARROW_API_KEY=mrw_yourkey npx @getmarrow/mcp\n');
+            process.stderr.write('   or: npx @getmarrow/mcp --key mrw_yourkey\n');
+            process.exit(1);
         }
-        catch (err) {
-            const msg = err instanceof Error ? err.message : String(err);
-            process.stderr.write(`[marrow] Warning: failed to refresh orient warnings: ${msg}\n`);
+        // [SECURITY #12] Warn if API key is visible in process args
+        if (cliArgs.apiKey) {
+            process.stderr.write('[marrow] Warning: --key flag exposes API key in process list. Use MARROW_API_KEY env var for production.\n');
         }
-    }
-    // Initial orient
-    refreshOrientWarnings().then(() => {
-        if (cachedOrientWarnings.some((w) => w.failureRate > 0.4)) {
-            process.stderr.write(`[marrow] ⚠️ High failure rate detected on startup — call marrow_orient for details before acting\n`);
+        // Auto-orient on startup — cache warnings, inject into EVERY marrow_think response
+        let cachedOrientWarnings = [];
+        let thinkCallCount = 0;
+        let orientCallCount = 0;
+        let initialized = false;
+        const pendingDecisions = new Map();
+        const PENDING_TTL_MS = 30 * 60 * 1000; // 30 min TTL
+        function actionHash(action) {
+            const normalized = action.toLowerCase().trim().replace(/\s+/g, ' ');
+            let h = 5381;
+            for (let i = 0; i < normalized.length; i++) {
+                h = ((h << 5) + h) ^ normalized.charCodeAt(i);
+                h = h >>> 0;
+            }
+            return h.toString(36) + '_' + normalized.slice(0, 32);
         }
-    });
-    // Auto-commit tracking for session close
-    let lastDecisionId = null;
-    let lastCommitted = false;
-    // [FIX #5] Log auto-commit failures instead of silently ignoring; remove broken AbortController
-    async function autoCommitOnClose() {
-        if (lastDecisionId && !lastCommitted) {
+        // [FIX #11] Actually call cleanupPending to prevent unbounded map growth
+        function cleanupPending() {
+            const now = Date.now();
+            for (const [key, val] of pendingDecisions) {
+                if (now - val.timestamp > PENDING_TTL_MS) {
+                    pendingDecisions.delete(key);
+                }
+            }
+        }
+        function formatWarningActionably(w) {
+            const pct = Math.round(w.failureRate * 100);
+            return `⚠️ ${w.type} has ${pct}% failure rate — check what went wrong last time before proceeding`;
+        }
+        // [FIX #4] Log orient refresh failures instead of silently ignoring
+        async function refreshOrientWarnings() {
             try {
-                await (0, index_1.marrowCommit)(API_KEY, BASE_URL, {
-                    decision_id: lastDecisionId,
-                    success: false,
-                    outcome: 'Session ended without explicit commit',
-                }, SESSION_ID);
+                const r = await (0, index_1.marrowOrient)(API_KEY, BASE_URL, undefined, SESSION_ID, FLEET_AGENT_ID);
+                cachedOrientWarnings = r.warnings;
             }
             catch (err) {
                 const msg = err instanceof Error ? err.message : String(err);
-                process.stderr.write(`[marrow] Warning: auto-commit on close failed: ${msg}\n`);
+                process.stderr.write(`[marrow] Warning: failed to refresh orient warnings: ${msg}\n`);
             }
         }
-    }
-    // [FIX #10] Handle both SIGTERM and SIGINT for clean shutdown
-    async function gracefulShutdown() {
-        const forceExit = setTimeout(() => process.exit(0), 5000);
-        forceExit.unref();
-        await autoCommitOnClose();
-        process.exit(0);
-    }
-    process.on('SIGTERM', gracefulShutdown);
-    process.on('SIGINT', gracefulShutdown);
-    function send(response) {
-        process.stdout.write(JSON.stringify(response) + '\n');
-    }
-    function success(id, result) {
-        send({ jsonrpc: '2.0', id, result });
-    }
-    function error(id, code, message) {
-        send({ jsonrpc: '2.0', id, error: { code, message } });
-    }
-    // [FIX #9] Runtime validation helper for required string params
-    function requireString(args, name) {
-        const val = args[name];
-        if (typeof val !== 'string' || !val.trim()) {
-            throw new Error(`"${name}" is required and must be a non-empty string`);
+        // Initial orient
+        refreshOrientWarnings().then(() => {
+            if (cachedOrientWarnings.some((w) => w.failureRate > 0.4)) {
+                process.stderr.write(`[marrow] ⚠️ High failure rate detected on startup — call marrow_orient for details before acting\n`);
+            }
+        });
+        // Auto-commit tracking for session close
+        let lastDecisionId = null;
+        let lastCommitted = false;
+        // [FIX #5] Log auto-commit failures instead of silently ignoring; remove broken AbortController
+        async function autoCommitOnClose() {
+            if (lastDecisionId && !lastCommitted) {
+                try {
+                    await (0, index_1.marrowCommit)(API_KEY, BASE_URL, {
+                        decision_id: lastDecisionId,
+                        success: false,
+                        outcome: 'Session ended without explicit commit',
+                    }, SESSION_ID);
+                }
+                catch (err) {
+                    const msg = err instanceof Error ? err.message : String(err);
+                    process.stderr.write(`[marrow] Warning: auto-commit on close failed: ${msg}\n`);
+                }
+            }
         }
-        return val;
-    }
-    function formatKeyMaterialWarning() {
-        return 'Copy this key now. Marrow will only show the full plaintext key once.';
-    }
-    // [FIX #6 & #7] Safe JSON response helper for memory API functions
-    async function safeMemoryResponse(res) {
-        if (!res.ok) {
-            let detail = '';
-            try {
-                detail = await res.text();
+        // [FIX #10] Handle both SIGTERM and SIGINT for clean shutdown
+        async function gracefulShutdown() {
+            const forceExit = setTimeout(() => process.exit(0), 5000);
+            forceExit.unref();
+            await autoCommitOnClose();
+            process.exit(0);
+        }
+        process.on('SIGTERM', gracefulShutdown);
+        process.on('SIGINT', gracefulShutdown);
+        function send(response) {
+            process.stdout.write(JSON.stringify(response) + '\n');
+        }
+        function success(id, result) {
+            send({ jsonrpc: '2.0', id, result });
+        }
+        function error(id, code, message) {
+            send({ jsonrpc: '2.0', id, error: { code, message } });
+        }
+        // [FIX #9] Runtime validation helper for required string params
+        function requireString(args, name) {
+            const val = args[name];
+            if (typeof val !== 'string' || !val.trim()) {
+                throw new Error(`"${name}" is required and must be a non-empty string`);
             }
-            catch { /* ignore */ }
-            throw new Error(`API error ${res.status}: ${detail.slice(0, 200)}`);
+            return val;
         }
-        const json = await res.json();
-        if (json.error) {
-            throw new Error(json.error);
+        // [FIX #6 & #7] Safe JSON response helper for memory API functions
+        async function safeMemoryResponse(res) {
+            if (!res.ok) {
+                let detail = '';
+                try {
+                    detail = await res.text();
+                }
+                catch { /* ignore */ }
+                throw new Error(`API error ${res.status}: ${detail.slice(0, 200)}`);
+            }
+            const json = await res.json();
+            if (json.error) {
+                throw new Error(json.error);
+            }
+            return json;
         }
-        return json;
-    }
-    // Memory API functions — all patched with safeMemoryResponse and validatePathParam
-    async function marrowListMemories(apiKey, baseUrl, params, sessionId) {
-        const qs = new URLSearchParams();
-        if (params?.status)
-            qs.set('status', params.status);
-        if (params?.query)
-            qs.set('query', params.query);
-        if (params?.limit)
-            qs.set('limit', String(params.limit));
-        if (params?.agentId)
-            qs.set('agent_id', params.agentId);
-        const res = await fetch(`${baseUrl}/v1/memories?${qs.toString()}`, {
-            headers: {
-                Authorization: `Bearer ${apiKey}`,
-                ...(sessionId ? { 'X-Marrow-Session-Id': sessionId } : {}),
-            },
-        });
-        const json = await safeMemoryResponse(res);
-        return json.data?.memories || [];
-    }
-    async function marrowGetMemory(apiKey, baseUrl, id, sessionId) {
-        const safeId = (0, index_1.validatePathParam)(id, 'id');
-        const res = await fetch(`${baseUrl}/v1/memories/${safeId}`, {
-            headers: {
-                Authorization: `Bearer ${apiKey}`,
-                ...(sessionId ? { 'X-Marrow-Session-Id': sessionId } : {}),
-            },
-        });
-        const json = await safeMemoryResponse(res);
-        return json.data?.memory || null;
-    }
-    async function marrowUpdateMemory(apiKey, baseUrl, id, patch, sessionId) {
-        const safeId = (0, index_1.validatePathParam)(id, 'id');
-        const res = await fetch(`${baseUrl}/v1/memories/${safeId}`, {
-            method: 'PATCH',
-            headers: {
-                Authorization: `Bearer ${apiKey}`,
-                'Content-Type': 'application/json',
-                ...(sessionId ? { 'X-Marrow-Session-Id': sessionId } : {}),
-            },
-            body: JSON.stringify(patch),
-        });
-        const json = await safeMemoryResponse(res);
-        return json.data?.memory;
-    }
-    async function marrowDeleteMemory(apiKey, baseUrl, id, meta, sessionId) {
-        const safeId = (0, index_1.validatePathParam)(id, 'id');
-        const res = await fetch(`${baseUrl}/v1/memories/${safeId}`, {
-            method: 'DELETE',
-            headers: {
-                Authorization: `Bearer ${apiKey}`,
-                'Content-Type': 'application/json',
-                ...(sessionId ? { 'X-Marrow-Session-Id': sessionId } : {}),
-            },
-            body: JSON.stringify(meta || {}),
-        });
-        const json = await safeMemoryResponse(res);
-        return json.data?.memory;
-    }
-    async function marrowMarkOutdated(apiKey, baseUrl, id, meta, sessionId) {
-        const safeId = (0, index_1.validatePathParam)(id, 'id');
-        const res = await fetch(`${baseUrl}/v1/memories/${safeId}/outdated`, {
-            method: 'POST',
-            headers: {
-                Authorization: `Bearer ${apiKey}`,
-                'Content-Type': 'application/json',
-                ...(sessionId ? { 'X-Marrow-Session-Id': sessionId } : {}),
-            },
-            body: JSON.stringify(meta || {}),
-        });
-        const json = await safeMemoryResponse(res);
-        return json.data?.memory;
-    }
-    async function marrowSupersedeMemory(apiKey, baseUrl, id, replacement, sessionId) {
-        const safeId = (0, index_1.validatePathParam)(id, 'id');
-        const res = await fetch(`${baseUrl}/v1/memories/${safeId}/supersede`, {
-            method: 'POST',
-            headers: {
-                Authorization: `Bearer ${apiKey}`,
-                'Content-Type': 'application/json',
-                ...(sessionId ? { 'X-Marrow-Session-Id': sessionId } : {}),
-            },
-            body: JSON.stringify(replacement),
-        });
-        const json = await safeMemoryResponse(res);
-        return json.data;
-    }
-    async function marrowShareMemory(apiKey, baseUrl, id, agentIds, actor, sessionId) {
-        const safeId = (0, index_1.validatePathParam)(id, 'id');
-        const res = await fetch(`${baseUrl}/v1/memories/${safeId}/share`, {
-            method: 'POST',
-            headers: {
-                Authorization: `Bearer ${apiKey}`,
-                'Content-Type': 'application/json',
-                ...(sessionId ? { 'X-Marrow-Session-Id': sessionId } : {}),
-            },
-            body: JSON.stringify({ agent_ids: agentIds, actor }),
-        });
-        const json = await safeMemoryResponse(res);
-        return json.data?.memory;
-    }
-    async function marrowExportMemories(apiKey, baseUrl, params, sessionId) {
-        const qs = new URLSearchParams();
-        if (params?.format)
-            qs.set('format', params.format);
-        if (params?.status)
-            qs.set('status', params.status);
-        if (params?.tags)
-            qs.set('tags', params.tags);
-        const res = await fetch(`${baseUrl}/v1/memories/export?${qs.toString()}`, {
-            headers: {
-                Authorization: `Bearer ${apiKey}`,
-                ...(sessionId ? { 'X-Marrow-Session-Id': sessionId } : {}),
-            },
-        });
-        const json = await safeMemoryResponse(res);
-        return json.data;
-    }
-    async function marrowImportMemories(apiKey, baseUrl, memories, mode, sessionId) {
-        const res = await fetch(`${baseUrl}/v1/memories/import`, {
-            method: 'POST',
-            headers: {
-                Authorization: `Bearer ${apiKey}`,
-                'Content-Type': 'application/json',
-                ...(sessionId ? { 'X-Marrow-Session-Id': sessionId } : {}),
-            },
-            body: JSON.stringify({ memories, mode }),
-        });
-        const json = await safeMemoryResponse(res);
-        return json.data;
-    }
-    async function marrowRetrieveMemories(apiKey, baseUrl, query, params, sessionId) {
-        const qs = new URLSearchParams();
-        qs.set('q', query);
-        if (params?.limit)
-            qs.set('limit', String(params.limit));
-        if (params?.from)
-            qs.set('from', params.from);
-        if (params?.to)
-            qs.set('to', params.to);
-        if (params?.tags)
-            qs.set('tags', params.tags);
-        if (params?.source)
-            qs.set('source', params.source);
-        if (params?.status)
-            qs.set('status', params.status);
-        if (params?.shared !== undefined)
-            qs.set('shared', String(params.shared));
-        const res = await fetch(`${baseUrl}/v1/memories/retrieve?${qs.toString()}`, {
-            headers: {
-                Authorization: `Bearer ${apiKey}`,
-                ...(sessionId ? { 'X-Marrow-Session-Id': sessionId } : {}),
-            },
-        });
-        const json = await safeMemoryResponse(res);
-        return json.data;
-    }
-    // Tool definitions (unchanged)
-    const TOOLS = [
-        {
-            name: 'marrow_orient',
-            description: '⚡ CALL THIS FIRST — every session, before any other tool. ' +
-                'Returns failure warnings from your history so you avoid known mistakes immediately. ' +
-                'If shouldPause=true, review lessons before acting. ' +
-                'orient() reads from the hive. think() writes to it. Both are required — this is what makes Marrow compound.',
-            inputSchema: {
-                type: 'object',
-                properties: {
-                    taskType: {
-                        type: 'string',
-                        enum: ['implementation', 'security', 'architecture', 'process', 'general'],
-                        description: 'Optional: filter warnings to a specific task type you are about to perform',
-                    },
-                    autoWarn: {
-                        type: 'boolean',
-                        description: 'Enable active intervention: scans recent failures, returns HIGH/MEDIUM/LOW severity warnings with recommendations. Recommended: true.',
+        // Memory API functions — all patched with safeMemoryResponse and validatePathParam
+        async function marrowListMemories(apiKey, baseUrl, params, sessionId) {
+            const qs = new URLSearchParams();
+            if (params?.status)
+                qs.set('status', params.status);
+            if (params?.query)
+                qs.set('query', params.query);
+            if (params?.limit)
+                qs.set('limit', String(params.limit));
+            if (params?.agentId)
+                qs.set('agent_id', params.agentId);
+            const res = await fetch(`${baseUrl}/v1/memories?${qs.toString()}`, {
+                headers: {
+                    Authorization: `Bearer ${apiKey}`,
+                    ...(sessionId ? { 'X-Marrow-Session-Id': sessionId } : {}),
+                },
+            });
+            const json = await safeMemoryResponse(res);
+            return json.data?.memories || [];
+        }
+        async function marrowGetMemory(apiKey, baseUrl, id, sessionId) {
+            const safeId = (0, index_1.validatePathParam)(id, 'id');
+            const res = await fetch(`${baseUrl}/v1/memories/${safeId}`, {
+                headers: {
+                    Authorization: `Bearer ${apiKey}`,
+                    ...(sessionId ? { 'X-Marrow-Session-Id': sessionId } : {}),
+                },
+            });
+            const json = await safeMemoryResponse(res);
+            return json.data?.memory || null;
+        }
+        async function marrowUpdateMemory(apiKey, baseUrl, id, patch, sessionId) {
+            const safeId = (0, index_1.validatePathParam)(id, 'id');
+            const res = await fetch(`${baseUrl}/v1/memories/${safeId}`, {
+                method: 'PATCH',
+                headers: {
+                    Authorization: `Bearer ${apiKey}`,
+                    'Content-Type': 'application/json',
+                    ...(sessionId ? { 'X-Marrow-Session-Id': sessionId } : {}),
+                },
+                body: JSON.stringify(patch),
+            });
+            const json = await safeMemoryResponse(res);
+            return json.data?.memory;
+        }
+        async function marrowDeleteMemory(apiKey, baseUrl, id, meta, sessionId) {
+            const safeId = (0, index_1.validatePathParam)(id, 'id');
+            const res = await fetch(`${baseUrl}/v1/memories/${safeId}`, {
+                method: 'DELETE',
+                headers: {
+                    Authorization: `Bearer ${apiKey}`,
+                    'Content-Type': 'application/json',
+                    ...(sessionId ? { 'X-Marrow-Session-Id': sessionId } : {}),
+                },
+                body: JSON.stringify(meta || {}),
+            });
+            const json = await safeMemoryResponse(res);
+            return json.data?.memory;
+        }
+        async function marrowMarkOutdated(apiKey, baseUrl, id, meta, sessionId) {
+            const safeId = (0, index_1.validatePathParam)(id, 'id');
+            const res = await fetch(`${baseUrl}/v1/memories/${safeId}/outdated`, {
+                method: 'POST',
+                headers: {
+                    Authorization: `Bearer ${apiKey}`,
+                    'Content-Type': 'application/json',
+                    ...(sessionId ? { 'X-Marrow-Session-Id': sessionId } : {}),
+                },
+                body: JSON.stringify(meta || {}),
+            });
+            const json = await safeMemoryResponse(res);
+            return json.data?.memory;
+        }
+        async function marrowSupersedeMemory(apiKey, baseUrl, id, replacement, sessionId) {
+            const safeId = (0, index_1.validatePathParam)(id, 'id');
+            const res = await fetch(`${baseUrl}/v1/memories/${safeId}/supersede`, {
+                method: 'POST',
+                headers: {
+                    Authorization: `Bearer ${apiKey}`,
+                    'Content-Type': 'application/json',
+                    ...(sessionId ? { 'X-Marrow-Session-Id': sessionId } : {}),
+                },
+                body: JSON.stringify(replacement),
+            });
+            const json = await safeMemoryResponse(res);
+            return json.data;
+        }
+        async function marrowShareMemory(apiKey, baseUrl, id, agentIds, actor, sessionId) {
+            const safeId = (0, index_1.validatePathParam)(id, 'id');
+            const res = await fetch(`${baseUrl}/v1/memories/${safeId}/share`, {
+                method: 'POST',
+                headers: {
+                    Authorization: `Bearer ${apiKey}`,
+                    'Content-Type': 'application/json',
+                    ...(sessionId ? { 'X-Marrow-Session-Id': sessionId } : {}),
+                },
+                body: JSON.stringify({ agent_ids: agentIds, actor }),
+            });
+            const json = await safeMemoryResponse(res);
+            return json.data?.memory;
+        }
+        async function marrowExportMemories(apiKey, baseUrl, params, sessionId) {
+            const qs = new URLSearchParams();
+            if (params?.format)
+                qs.set('format', params.format);
+            if (params?.status)
+                qs.set('status', params.status);
+            if (params?.tags)
+                qs.set('tags', params.tags);
+            const res = await fetch(`${baseUrl}/v1/memories/export?${qs.toString()}`, {
+                headers: {
+                    Authorization: `Bearer ${apiKey}`,
+                    ...(sessionId ? { 'X-Marrow-Session-Id': sessionId } : {}),
+                },
+            });
+            const json = await safeMemoryResponse(res);
+            return json.data;
+        }
+        async function marrowImportMemories(apiKey, baseUrl, memories, mode, sessionId) {
+            const res = await fetch(`${baseUrl}/v1/memories/import`, {
+                method: 'POST',
+                headers: {
+                    Authorization: `Bearer ${apiKey}`,
+                    'Content-Type': 'application/json',
+                    ...(sessionId ? { 'X-Marrow-Session-Id': sessionId } : {}),
+                },
+                body: JSON.stringify({ memories, mode }),
+            });
+            const json = await safeMemoryResponse(res);
+            return json.data;
+        }
+        async function marrowRetrieveMemories(apiKey, baseUrl, query, params, sessionId) {
+            const qs = new URLSearchParams();
+            qs.set('q', query);
+            if (params?.limit)
+                qs.set('limit', String(params.limit));
+            if (params?.from)
+                qs.set('from', params.from);
+            if (params?.to)
+                qs.set('to', params.to);
+            if (params?.tags)
+                qs.set('tags', params.tags);
+            if (params?.source)
+                qs.set('source', params.source);
+            if (params?.status)
+                qs.set('status', params.status);
+            if (params?.shared !== undefined)
+                qs.set('shared', String(params.shared));
+            const res = await fetch(`${baseUrl}/v1/memories/retrieve?${qs.toString()}`, {
+                headers: {
+                    Authorization: `Bearer ${apiKey}`,
+                    ...(sessionId ? { 'X-Marrow-Session-Id': sessionId } : {}),
+                },
+            });
+            const json = await safeMemoryResponse(res);
+            return json.data;
+        }
+        // Tool definitions (unchanged)
+        const TOOLS = [
+            {
+                name: 'marrow_orient',
+                description: '⚡ CALL THIS FIRST — every session, before any other tool. ' +
+                    'Returns failure warnings from your history so you avoid known mistakes immediately. ' +
+                    'If shouldPause=true, review lessons before acting. ' +
+                    'orient() reads from the hive. think() writes to it. Both are required — this is what makes Marrow compound.',
+                inputSchema: {
+                    type: 'object',
+                    properties: {
+                        taskType: {
+                            type: 'string',
+                            enum: ['implementation', 'security', 'architecture', 'process', 'general'],
+                            description: 'Optional: filter warnings to a specific task type you are about to perform',
+                        },
+                        autoWarn: {
+                            type: 'boolean',
+                            description: 'Enable active intervention: scans recent failures, returns HIGH/MEDIUM/LOW severity warnings with recommendations. Recommended: true.',
+                        },
                     },
+                    required: [],
                 },
-                required: [],
             },
-        },
-        {
-            name: 'marrow_think',
-            description: 'Log intent and get collective intelligence before acting. ' +
-                'Call this before every meaningful action. ' +
-                'Returns pattern insights, similar past decisions, failure detection, and a recommendedNext field — follow it. ' +
-                'Pass previous_outcome to auto-commit the last decision and open a new one. ' +
-                'Response MAY include: onboarding_hint (new accounts), intelligence.collective (cross-account patterns), intelligence.team_context (recent decisions from other sessions).',
-            inputSchema: {
-                type: 'object',
-                properties: {
-                    action: { type: 'string', description: 'What the agent is about to do' },
-                    type: {
-                        type: 'string',
-                        enum: ['implementation', 'security', 'architecture', 'process', 'general'],
-                        description: 'Type of action (default: general)',
+            {
+                name: 'marrow_think',
+                description: 'Log intent and get collective intelligence before acting. ' +
+                    'Call this before every meaningful action. ' +
+                    'Returns pattern insights, similar past decisions, failure detection, and a recommendedNext field — follow it. ' +
+                    'Pass previous_outcome to auto-commit the last decision and open a new one. ' +
+                    'Response MAY include: onboarding_hint (new accounts), intelligence.collective (cross-account patterns), intelligence.team_context (recent decisions from other sessions).',
+                inputSchema: {
+                    type: 'object',
+                    properties: {
+                        action: { type: 'string', description: 'What the agent is about to do' },
+                        type: {
+                            type: 'string',
+                            enum: ['implementation', 'security', 'architecture', 'process', 'general'],
+                            description: 'Type of action (default: general)',
+                        },
+                        context: { type: 'object', description: 'Optional metadata about the current situation' },
+                        previous_decision_id: { type: 'string', description: 'decision_id from previous think() call — auto-commits that session' },
+                        previous_success: { type: 'boolean', description: 'Did the previous action succeed?' },
+                        previous_outcome: { type: 'string', description: 'What happened in the previous action (required if previous_decision_id provided)' },
+                        checkLoop: { type: 'boolean', description: 'Enable loop detection: warns if you are about to retry a failed approach. Recommended: true.' },
                     },
-                    context: { type: 'object', description: 'Optional metadata about the current situation' },
-                    previous_decision_id: { type: 'string', description: 'decision_id from previous think() call — auto-commits that session' },
-                    previous_success: { type: 'boolean', description: 'Did the previous action succeed?' },
-                    previous_outcome: { type: 'string', description: 'What happened in the previous action (required if previous_decision_id provided)' },
-                    checkLoop: { type: 'boolean', description: 'Enable loop detection: warns if you are about to retry a failed approach. Recommended: true.' },
+                    required: ['action'],
                 },
-                required: ['action'],
             },
-        },
-        {
-            name: 'marrow_commit',
-            description: 'Explicitly commit the result of an action to Marrow. ' +
-                'Optional — marrow_think() auto-commits if you pass previous_outcome. ' +
-                'Use when you need explicit control over commit timing.',
-            inputSchema: {
-                type: 'object',
-                properties: {
-                    decision_id: { type: 'string', description: 'decision_id from the marrow_think call' },
-                    success: { type: 'boolean', description: 'Did the action succeed?' },
-                    outcome: { type: 'string', description: 'What happened — be specific, this trains the hive' },
-                    caused_by: { type: 'string', description: 'Optional: what caused this action' },
+            {
+                name: 'marrow_commit',
+                description: 'Explicitly commit the result of an action to Marrow. ' +
+                    'Optional — marrow_think() auto-commits if you pass previous_outcome. ' +
+                    'Use when you need explicit control over commit timing.',
+                inputSchema: {
+                    type: 'object',
+                    properties: {
+                        decision_id: { type: 'string', description: 'decision_id from the marrow_think call' },
+                        success: { type: 'boolean', description: 'Did the action succeed?' },
+                        outcome: { type: 'string', description: 'What happened — be specific, this trains the hive' },
+                        caused_by: { type: 'string', description: 'Optional: what caused this action' },
+                    },
+                    required: ['decision_id', 'success', 'outcome'],
                 },
-                required: ['decision_id', 'success', 'outcome'],
             },
-        },
-        {
-            name: 'marrow_run',
-            description: 'Zero-ceremony memory logging. Single call handles orient → think → commit automatically. ' +
-                'Use this instead of chaining marrow_think + marrow_commit when you want Marrow to just work without managing the loop yourself.',
-            inputSchema: {
-                type: 'object',
-                properties: {
-                    description: { type: 'string', description: 'What the agent did' },
-                    success: { type: 'boolean', description: 'Whether it succeeded' },
-                    outcome: { type: 'string', description: 'One-line summary of what happened' },
-                    type: {
-                        type: 'string',
-                        enum: ['implementation', 'security', 'architecture', 'process', 'general'],
-                        description: 'Type of action (default: general)',
+            {
+                name: 'marrow_run',
+                description: 'Zero-ceremony memory logging. Single call handles orient → think → commit automatically. ' +
+                    'Use this instead of chaining marrow_think + marrow_commit when you want Marrow to just work without managing the loop yourself.',
+                inputSchema: {
+                    type: 'object',
+                    properties: {
+                        description: { type: 'string', description: 'What the agent did' },
+                        success: { type: 'boolean', description: 'Whether it succeeded' },
+                        outcome: { type: 'string', description: 'One-line summary of what happened' },
+                        type: {
+                            type: 'string',
+                            enum: ['implementation', 'security', 'architecture', 'process', 'general'],
+                            description: 'Type of action (default: general)',
+                        },
                     },
+                    required: ['description', 'success', 'outcome'],
                 },
-                required: ['description', 'success', 'outcome'],
             },
-        },
-        {
-            name: 'marrow_auto',
-            description: 'Zero-friction Marrow logging. One call for any action — Marrow handles everything in the background without blocking. ' +
-                'Pass what you are about to do. Optionally pass outcome if already done. ' +
-                'Use for ANY action: deploys, file writes, API calls, external sends. ' +
-                'If you only have time for one call: pass action + outcome + success together — done in one shot.',
-            inputSchema: {
-                type: 'object',
-                properties: {
-                    action: { type: 'string', description: 'What you are about to do or just did' },
-                    outcome: { type: 'string', description: 'What happened (if already done). Omit to log intent only.' },
-                    success: { type: 'boolean', description: 'Did it succeed (default: true)' },
-                    type: {
-                        type: 'string',
-                        enum: ['implementation', 'security', 'architecture', 'process', 'general'],
-                        description: 'Type of action (default: general)',
+            {
+                name: 'marrow_auto',
+                description: 'Zero-friction Marrow logging. One call for any action — Marrow handles everything in the background without blocking. ' +
+                    'Pass what you are about to do. Optionally pass outcome if already done. ' +
+                    'Use for ANY action: deploys, file writes, API calls, external sends. ' +
+                    'If you only have time for one call: pass action + outcome + success together — done in one shot.',
+                inputSchema: {
+                    type: 'object',
+                    properties: {
+                        action: { type: 'string', description: 'What you are about to do or just did' },
+                        outcome: { type: 'string', description: 'What happened (if already done). Omit to log intent only.' },
+                        success: { type: 'boolean', description: 'Did it succeed (default: true)' },
+                        type: {
+                            type: 'string',
+                            enum: ['implementation', 'security', 'architecture', 'process', 'general'],
+                            description: 'Type of action (default: general)',
+                        },
                     },
+                    required: ['action'],
                 },
-                required: ['action'],
             },
-        },
-        {
-            name: 'marrow_ask',
-            description: 'Query the collective hive in plain English. ' +
-                'Ask about failure patterns, what worked, what broke, or get a recommendation before acting. ' +
-                'Returns direct answer + supporting evidence.',
-            inputSchema: {
-                type: 'object',
-                properties: {
-                    query: { type: 'string', description: 'Plain English question about your decision history' },
+            {
+                name: 'marrow_ask',
+                description: 'Query the collective hive in plain English. ' +
+                    'Ask about failure patterns, what worked, what broke, or get a recommendation before acting. ' +
+                    'Returns direct answer + supporting evidence.',
+                inputSchema: {
+                    type: 'object',
+                    properties: {
+                        query: { type: 'string', description: 'Plain English question about your decision history' },
+                    },
+                    required: ['query'],
                 },
-                required: ['query'],
             },
-        },
-        {
-            name: 'marrow_status',
-            description: 'Check Marrow platform health and status.',
-            inputSchema: { type: 'object', properties: {}, required: [] },
-        },
-        {
-            name: 'marrow_create_key',
-            description: 'Create a new API key. Full plaintext key is returned once — copy it now.',
-            inputSchema: {
-                type: 'object',
-                properties: {
-                    name: { type: 'string', description: 'Human-readable key name' },
-                    key_type: { type: 'string', enum: ['live', 'test'], description: 'Key type (default: live)' },
-                    scopes: { type: 'array', items: { type: 'string' }, description: 'Allowed scopes' },
-                    agent_ids: { type: 'array', items: { type: 'string' }, description: 'Optional agent bindings' },
-                    expires_at: { type: 'string', description: 'Optional ISO-8601 expiry' },
+            {
+                name: 'marrow_status',
+                description: 'Check Marrow platform health and status.',
+                inputSchema: { type: 'object', properties: {}, required: [] },
+            },
+            {
+                name: 'marrow_create_key',
+                description: 'Create a new API key. Full plaintext key is returned once — copy it now.',
+                inputSchema: {
+                    type: 'object',
+                    properties: {
+                        name: { type: 'string', description: 'Human-readable key name' },
+                        key_type: { type: 'string', enum: ['live', 'test'], description: 'Key type (default: live)' },
+                        scopes: { type: 'array', items: { type: 'string' }, description: 'Allowed scopes' },
+                        agent_ids: { type: 'array', items: { type: 'string' }, description: 'Optional agent bindings' },
+                        expires_at: { type: 'string', description: 'Optional ISO-8601 expiry' },
+                    },
+                    required: ['name'],
                 },
-                required: ['name'],
             },
-        },
-        {
-            name: 'marrow_list_keys',
-            description: 'List API keys. Keys are masked here by design.',
-            inputSchema: { type: 'object', properties: {}, required: [] },
-        },
-        {
-            name: 'marrow_get_key',
-            description: 'Get a single API key by ID. The key value is masked after creation.',
-            inputSchema: {
-                type: 'object',
-                properties: {
-                    id: { type: 'string', description: 'API key ID' },
+            {
+                name: 'marrow_list_keys',
+                description: 'List API keys. Keys are masked here by design.',
+                inputSchema: { type: 'object', properties: {}, required: [] },
+            },
+            {
+                name: 'marrow_get_key',
+                description: 'Get a single API key by ID. The key value is masked after creation.',
+                inputSchema: {
+                    type: 'object',
+                    properties: {
+                        id: { type: 'string', description: 'API key ID' },
+                    },
+                    required: ['id'],
                 },
-                required: ['id'],
             },
-        },
-        {
-            name: 'marrow_revoke_key',
-            description: 'Revoke an API key by ID.',
-            inputSchema: {
-                type: 'object',
-                properties: {
-                    id: { type: 'string', description: 'API key ID' },
+            {
+                name: 'marrow_revoke_key',
+                description: 'Revoke an API key by ID.',
+                inputSchema: {
+                    type: 'object',
+                    properties: {
+                        id: { type: 'string', description: 'API key ID' },
+                    },
+                    required: ['id'],
                 },
-                required: ['id'],
             },
-        },
-        {
-            name: 'marrow_rotate_key',
-            description: 'Rotate an API key by ID. Full plaintext key is returned once — copy it now.',
-            inputSchema: {
-                type: 'object',
-                properties: {
-                    id: { type: 'string', description: 'API key ID' },
+            {
+                name: 'marrow_rotate_key',
+                description: 'Rotate an API key by ID. Full plaintext key is returned once — copy it now.',
+                inputSchema: {
+                    type: 'object',
+                    properties: {
+                        id: { type: 'string', description: 'API key ID' },
+                    },
+                    required: ['id'],
                 },
-                required: ['id'],
             },
-        },
-        {
-            name: 'marrow_list_memories',
-            description: 'List memories with optional filters (status, query, limit, agent_id for shared memories).',
-            inputSchema: {
-                type: 'object',
-                properties: {
-                    status: { type: 'string', enum: ['active', 'outdated', 'deleted'], description: 'Filter by status' },
-                    query: { type: 'string', description: 'Search query' },
-                    limit: { type: 'number', description: 'Max results (default: 20)' },
-                    agentId: { type: 'string', description: 'Agent ID for shared memories' },
+            {
+                name: 'marrow_list_memories',
+                description: 'List memories with optional filters (status, query, limit, agent_id for shared memories).',
+                inputSchema: {
+                    type: 'object',
+                    properties: {
+                        status: { type: 'string', enum: ['active', 'outdated', 'deleted'], description: 'Filter by status' },
+                        query: { type: 'string', description: 'Search query' },
+                        limit: { type: 'number', description: 'Max results (default: 20)' },
+                        agentId: { type: 'string', description: 'Agent ID for shared memories' },
+                    },
+                    required: [],
                 },
-                required: [],
             },
-        },
-        {
-            name: 'marrow_get_memory',
-            description: 'Get a single memory by ID.',
-            inputSchema: { type: 'object', properties: { id: { type: 'string', description: 'Memory ID' } }, required: ['id'] },
-        },
-        {
-            name: 'marrow_update_memory',
-            description: 'Update memory text, tags, or metadata.',
-            inputSchema: {
-                type: 'object',
-                properties: {
-                    id: { type: 'string', description: 'Memory ID' },
-                    text: { type: 'string', description: 'New text' },
-                    source: { type: 'string', description: 'Source' },
-                    tags: { type: 'array', items: { type: 'string' }, description: 'Tags' },
-                    actor: { type: 'string', description: 'Actor name' },
-                    note: { type: 'string', description: 'Audit note' },
+            {
+                name: 'marrow_get_memory',
+                description: 'Get a single memory by ID.',
+                inputSchema: { type: 'object', properties: { id: { type: 'string', description: 'Memory ID' } }, required: ['id'] },
+            },
+            {
+                name: 'marrow_update_memory',
+                description: 'Update memory text, tags, or metadata.',
+                inputSchema: {
+                    type: 'object',
+                    properties: {
+                        id: { type: 'string', description: 'Memory ID' },
+                        text: { type: 'string', description: 'New text' },
+                        source: { type: 'string', description: 'Source' },
+                        tags: { type: 'array', items: { type: 'string' }, description: 'Tags' },
+                        actor: { type: 'string', description: 'Actor name' },
+                        note: { type: 'string', description: 'Audit note' },
+                    },
+                    required: ['id'],
                 },
-                required: ['id'],
             },
-        },
-        {
-            name: 'marrow_delete_memory',
-            description: 'Soft delete a memory.',
-            inputSchema: {
-                type: 'object',
-                properties: {
-                    id: { type: 'string', description: 'Memory ID' },
-                    actor: { type: 'string', description: 'Actor name' },
-                    note: { type: 'string', description: 'Audit note' },
+            {
+                name: 'marrow_delete_memory',
+                description: 'Soft delete a memory.',
+                inputSchema: {
+                    type: 'object',
+                    properties: {
+                        id: { type: 'string', description: 'Memory ID' },
+                        actor: { type: 'string', description: 'Actor name' },
+                        note: { type: 'string', description: 'Audit note' },
+                    },
+                    required: ['id'],
                 },
-                required: ['id'],
             },
-        },
-        {
-            name: 'marrow_mark_outdated',
-            description: 'Mark a memory as outdated.',
-            inputSchema: {
-                type: 'object',
-                properties: {
-                    id: { type: 'string', description: 'Memory ID' },
-                    actor: { type: 'string', description: 'Actor name' },
-                    note: { type: 'string', description: 'Audit note' },
+            {
+                name: 'marrow_mark_outdated',
+                description: 'Mark a memory as outdated.',
+                inputSchema: {
+                    type: 'object',
+                    properties: {
+                        id: { type: 'string', description: 'Memory ID' },
+                        actor: { type: 'string', description: 'Actor name' },
+                        note: { type: 'string', description: 'Audit note' },
+                    },
+                    required: ['id'],
                 },
-                required: ['id'],
             },
-        },
-        {
-            name: 'marrow_supersede_memory',
-            description: 'Atomically replace a memory with a new version.',
-            inputSchema: {
-                type: 'object',
-                properties: {
-                    id: { type: 'string', description: 'Memory ID to supersede' },
-                    text: { type: 'string', description: 'New memory text' },
-                    source: { type: 'string', description: 'Source' },
-                    tags: { type: 'array', items: { type: 'string' }, description: 'Tags' },
-                    actor: { type: 'string', description: 'Actor name' },
-                    note: { type: 'string', description: 'Audit note' },
+            {
+                name: 'marrow_supersede_memory',
+                description: 'Atomically replace a memory with a new version.',
+                inputSchema: {
+                    type: 'object',
+                    properties: {
+                        id: { type: 'string', description: 'Memory ID to supersede' },
+                        text: { type: 'string', description: 'New memory text' },
+                        source: { type: 'string', description: 'Source' },
+                        tags: { type: 'array', items: { type: 'string' }, description: 'Tags' },
+                        actor: { type: 'string', description: 'Actor name' },
+                        note: { type: 'string', description: 'Audit note' },
+                    },
+                    required: ['id', 'text'],
                 },
-                required: ['id', 'text'],
             },
-        },
-        {
-            name: 'marrow_share_memory',
-            description: 'Share a memory with specific agents.',
-            inputSchema: {
-                type: 'object',
-                properties: {
-                    id: { type: 'string', description: 'Memory ID' },
-                    agentIds: { type: 'array', items: { type: 'string' }, description: 'Agent IDs to share with' },
-                    actor: { type: 'string', description: 'Actor name' },
+            {
+                name: 'marrow_share_memory',
+                description: 'Share a memory with specific agents.',
+                inputSchema: {
+                    type: 'object',
+                    properties: {
+                        id: { type: 'string', description: 'Memory ID' },
+                        agentIds: { type: 'array', items: { type: 'string' }, description: 'Agent IDs to share with' },
+                        actor: { type: 'string', description: 'Actor name' },
+                    },
+                    required: ['id', 'agentIds'],
                 },
-                required: ['id', 'agentIds'],
             },
-        },
-        {
-            name: 'marrow_export_memories',
-            description: 'Export memories to JSON or CSV.',
-            inputSchema: {
-                type: 'object',
-                properties: {
-                    format: { type: 'string', enum: ['json', 'csv'], description: 'Export format' },
-                    status: { type: 'string', enum: ['active', 'all'], description: 'Filter by status' },
-                    tags: { type: 'string', description: 'Comma-separated tags' },
+            {
+                name: 'marrow_export_memories',
+                description: 'Export memories to JSON or CSV.',
+                inputSchema: {
+                    type: 'object',
+                    properties: {
+                        format: { type: 'string', enum: ['json', 'csv'], description: 'Export format' },
+                        status: { type: 'string', enum: ['active', 'all'], description: 'Filter by status' },
+                        tags: { type: 'string', description: 'Comma-separated tags' },
+                    },
+                    required: [],
                 },
-                required: [],
             },
-        },
-        {
-            name: 'marrow_import_memories',
-            description: 'Import memories with merge (dedup) or replace mode.',
-            inputSchema: {
-                type: 'object',
-                properties: {
-                    memories: { type: 'array', items: { type: 'object', properties: { text: { type: 'string' }, source: { type: 'string' }, tags: { type: 'array', items: { type: 'string' } } } }, description: 'Memories to import' },
-                    mode: { type: 'string', enum: ['merge', 'replace'], description: 'Import mode' },
+            {
+                name: 'marrow_import_memories',
+                description: 'Import memories with merge (dedup) or replace mode.',
+                inputSchema: {
+                    type: 'object',
+                    properties: {
+                        memories: { type: 'array', items: { type: 'object', properties: { text: { type: 'string' }, source: { type: 'string' }, tags: { type: 'array', items: { type: 'string' } } } }, description: 'Memories to import' },
+                        mode: { type: 'string', enum: ['merge', 'replace'], description: 'Import mode' },
+                    },
+                    required: ['memories', 'mode'],
                 },
-                required: ['memories', 'mode'],
             },
-        },
-        {
-            name: 'marrow_retrieve_memories',
-            description: 'Full-text search memories with filters (from, to, tags, source, status, shared).',
-            inputSchema: {
-                type: 'object',
-                properties: {
-                    query: { type: 'string', description: 'Search query' },
-                    limit: { type: 'number', description: 'Max results' },
-                    from: { type: 'string', description: 'From date (ISO-8601)' },
-                    to: { type: 'string', description: 'To date (ISO-8601)' },
-                    tags: { type: 'string', description: 'Comma-separated tags' },
-                    source: { type: 'string', description: 'Source filter' },
-                    status: { type: 'string', enum: ['active', 'outdated', 'deleted'], description: 'Status filter' },
-                    shared: { type: 'boolean', description: 'Include shared memories' },
+            {
+                name: 'marrow_retrieve_memories',
+                description: 'Full-text search memories with filters (from, to, tags, source, status, shared).',
+                inputSchema: {
+                    type: 'object',
+                    properties: {
+                        query: { type: 'string', description: 'Search query' },
+                        limit: { type: 'number', description: 'Max results' },
+                        from: { type: 'string', description: 'From date (ISO-8601)' },
+                        to: { type: 'string', description: 'To date (ISO-8601)' },
+                        tags: { type: 'string', description: 'Comma-separated tags' },
+                        source: { type: 'string', description: 'Source filter' },
+                        status: { type: 'string', enum: ['active', 'outdated', 'deleted'], description: 'Status filter' },
+                        shared: { type: 'boolean', description: 'Include shared memories' },
+                    },
+                    required: ['query'],
                 },
-                required: ['query'],
             },
-        },
-        {
-            name: 'marrow_workflow',
-            description: 'Interact with Marrow Workflow Registry. Register, start, and advance multi-step workflows. ' +
-                'Actions: register (create workflow template), list (show all), get (details), start (begin instance), ' +
-                'advance (complete a step), instances (list runs).',
-            inputSchema: {
-                type: 'object',
-                properties: {
-                    action: { type: 'string', enum: ['register', 'list', 'get', 'update', 'start', 'advance', 'instances'], description: 'Workflow action to perform' },
-                    workflowId: { type: 'string', description: 'Workflow ID (required for get/start/advance/instances)' },
-                    instanceId: { type: 'string', description: 'Instance ID (required for advance)' },
-                    name: { type: 'string', description: 'Workflow name (for register)' },
-                    description: { type: 'string', description: 'Workflow description (for register/update)' },
-                    steps: { type: 'array', description: 'Step definitions (for register)', items: { type: 'object', properties: { step: { type: 'number', description: 'Step order (1, 2, 3...)' }, agent_role: { type: 'string', description: 'Expected agent role (e.g., "builder", "auditor")' }, action_type: { type: 'string', description: 'Action type (e.g., "build", "audit", "patch")' }, description: { type: 'string', description: 'Step description' } }, required: ['step', 'description'] } },
-                    tags: { type: 'array', items: { type: 'string' }, description: 'Tags (for register)' },
-                    agentId: { type: 'string', description: 'Agent ID starting the workflow (for start)' },
-                    context: { type: 'object', description: 'Workflow context (for start)' },
-                    inputs: { type: 'object', description: 'Workflow inputs (for start)' },
-                    stepCompleted: { type: 'number', description: 'Step number completed (for advance)' },
-                    outcome: { type: 'string', description: 'Step outcome (for advance)' },
-                    nextAgentId: { type: 'string', description: 'Next agent for the following step (for advance)' },
-                    contextUpdate: { type: 'object', description: 'Context changes (for advance)' },
-                    status: { type: 'string', enum: ['running', 'completed', 'failed', 'cancelled', 'active', 'archived'], description: 'Filter by status (for list/instances)' },
+            {
+                name: 'marrow_workflow',
+                description: 'Interact with Marrow Workflow Registry. Register, start, and advance multi-step workflows. ' +
+                    'Actions: register (create workflow template), list (show all), get (details), start (begin instance), ' +
+                    'advance (complete a step), instances (list runs).',
+                inputSchema: {
+                    type: 'object',
+                    properties: {
+                        action: { type: 'string', enum: ['register', 'list', 'get', 'update', 'start', 'advance', 'instances'], description: 'Workflow action to perform' },
+                        workflowId: { type: 'string', description: 'Workflow ID (required for get/start/advance/instances)' },
+                        instanceId: { type: 'string', description: 'Instance ID (required for advance)' },
+                        name: { type: 'string', description: 'Workflow name (for register)' },
+                        description: { type: 'string', description: 'Workflow description (for register/update)' },
+                        steps: { type: 'array', description: 'Step definitions (for register)', items: { type: 'object', properties: { step: { type: 'number', description: 'Step order (1, 2, 3...)' }, agent_role: { type: 'string', description: 'Expected agent role (e.g., "builder", "auditor")' }, action_type: { type: 'string', description: 'Action type (e.g., "build", "audit", "patch")' }, description: { type: 'string', description: 'Step description' } }, required: ['step', 'description'] } },
+                        tags: { type: 'array', items: { type: 'string' }, description: 'Tags (for register)' },
+                        agentId: { type: 'string', description: 'Agent ID starting the workflow (for start)' },
+                        context: { type: 'object', description: 'Workflow context (for start)' },
+                        inputs: { type: 'object', description: 'Workflow inputs (for start)' },
+                        stepCompleted: { type: 'number', description: 'Step number completed (for advance)' },
+                        outcome: { type: 'string', description: 'Step outcome (for advance)' },
+                        nextAgentId: { type: 'string', description: 'Next agent for the following step (for advance)' },
+                        contextUpdate: { type: 'object', description: 'Context changes (for advance)' },
+                        status: { type: 'string', enum: ['running', 'completed', 'failed', 'cancelled', 'active', 'archived'], description: 'Filter by status (for list/instances)' },
+                    },
+                    required: ['action'],
                 },
-                required: ['action'],
             },
-        },
-        {
-            name: 'marrow_dashboard',
-            description: 'Get operator dashboard — account health, top failures, workflow status, recent activity, Marrow\'s saves metric. ' +
-                'One call returns everything an operator needs to see.',
-            inputSchema: { type: 'object', properties: {}, required: [] },
-        },
-        {
-            name: 'marrow_digest',
-            description: 'Get periodic summary of agent activity and Marrow impact (default 7-day period). ' +
-                'Shows decision counts, success rate trend vs previous period, saves, top improvements and risks.',
-            inputSchema: {
-                type: 'object',
-                properties: {
-                    period: { type: 'string', description: 'Time period: 7d (default), 14d, or 30d' },
+            {
+                name: 'marrow_dashboard',
+                description: 'Get operator dashboard — account health, top failures, workflow status, recent activity, Marrow\'s saves metric. ' +
+                    'One call returns everything an operator needs to see.',
+                inputSchema: { type: 'object', properties: {}, required: [] },
+            },
+            {
+                name: 'marrow_digest',
+                description: 'Get periodic summary of agent activity and Marrow impact (default 7-day period). ' +
+                    'Shows decision counts, success rate trend vs previous period, saves, top improvements and risks.',
+                inputSchema: {
+                    type: 'object',
+                    properties: {
+                        period: { type: 'string', description: 'Time period: 7d (default), 14d, or 30d' },
+                    },
+                    required: [],
                 },
-                required: [],
             },
-        },
-        {
-            name: 'marrow_session_end',
-            description: 'Explicitly end the current session. Optionally auto-commits any open decision. ' +
-                'Prevents orphaned decisions when an agent finishes a task.',
-            inputSchema: {
-                type: 'object',
-                properties: {
-                    autoCommitOpen: { type: 'boolean', description: 'Whether to auto-commit any open decision (default: false)' },
+            {
+                name: 'marrow_session_end',
+                description: 'Explicitly end the current session. Optionally auto-commits any open decision. ' +
+                    'Prevents orphaned decisions when an agent finishes a task.',
+                inputSchema: {
+                    type: 'object',
+                    properties: {
+                        autoCommitOpen: { type: 'boolean', description: 'Whether to auto-commit any open decision (default: false)' },
+                    },
+                    required: [],
                 },
-                required: [],
             },
-        },
-        {
-            name: 'marrow_accept_detected',
-            description: 'Convert a detected decision pattern into an enforced workflow. ' +
-                'The pattern ID comes from suggested_workflows in the orient() response.',
-            inputSchema: {
-                type: 'object',
-                properties: {
-                    detectedId: { type: 'string', description: 'ID of the detected pattern to accept' },
+            {
+                name: 'marrow_accept_detected',
+                description: 'Convert a detected decision pattern into an enforced workflow. ' +
+                    'The pattern ID comes from suggested_workflows in the orient() response.',
+                inputSchema: {
+                    type: 'object',
+                    properties: {
+                        detectedId: { type: 'string', description: 'ID of the detected pattern to accept' },
+                    },
+                    required: ['detectedId'],
                 },
-                required: ['detectedId'],
             },
-        },
-        {
-            name: 'marrow_list_templates',
-            description: 'Browse pre-built workflow templates. Filter by industry (insurance, healthcare, ecommerce, legal, saas, fintech, media, enterprise) or category. ' +
-                'Use to discover available workflows before installing.',
-            inputSchema: {
-                type: 'object',
-                properties: {
-                    industry: { type: 'string', description: 'Filter by industry (e.g., insurance, healthcare, saas)' },
-                    category: { type: 'string', description: 'Filter by category (e.g., claims, engineering, support)' },
-                    limit: { type: 'number', description: 'Max results (default: 20)' },
+            {
+                name: 'marrow_list_templates',
+                description: 'Browse pre-built workflow templates. Filter by industry (insurance, healthcare, ecommerce, legal, saas, fintech, media, enterprise) or category. ' +
+                    'Use to discover available workflows before installing.',
+                inputSchema: {
+                    type: 'object',
+                    properties: {
+                        industry: { type: 'string', description: 'Filter by industry (e.g., insurance, healthcare, saas)' },
+                        category: { type: 'string', description: 'Filter by category (e.g., claims, engineering, support)' },
+                        limit: { type: 'number', description: 'Max results (default: 20)' },
+                    },
+                    required: [],
                 },
-                required: [],
             },
-        },
-        {
-            name: 'marrow_install_template',
-            description: 'Install a workflow template into your fleet as an active workflow. ' +
-                'Use after marrow_list_templates to pick one.',
-            inputSchema: {
-                type: 'object',
-                properties: {
-                    slug: { type: 'string', description: 'Template slug to install (e.g., code-review-deploy, claims-triage)' },
+            {
+                name: 'marrow_install_template',
+                description: 'Install a workflow template into your fleet as an active workflow. ' +
+                    'Use after marrow_list_templates to pick one.',
+                inputSchema: {
+                    type: 'object',
+                    properties: {
+                        slug: { type: 'string', description: 'Template slug to install (e.g., code-review-deploy, claims-triage)' },
+                    },
+                    required: ['slug'],
                 },
-                required: ['slug'],
             },
-        },
-    ];
-    // Request handler
-    async function handleRequest(req) {
-        const { id, method, params } = req;
-        // [FIX #15] Enforce initialize-first per MCP spec
-        if (!initialized && method !== 'initialize') {
-            error(id, -32002, 'Server not initialized. Send initialize first.');
-            return;
-        }
-        try {
-            if (method === 'initialize') {
-                initialized = true;
-                success(id, {
-                    protocolVersion: '2024-11-05',
-                    capabilities: { tools: {}, prompts: {} },
-                    serverInfo: { name: 'marrow', version: '3.8.0' },
-                });
-                // Auto-enroll: emit enrollment notification on connection
-                if (AUTO_ENROLL) {
-                    send({
-                        jsonrpc: '2.0',
-                        method: 'notifications/message',
-                        params: {
-                            level: 'info',
-                            logger: 'marrow',
-                            data: {
-                                type: 'auto_enroll',
-                                message: 'Marrow auto-enroll active. Call marrow_orient FIRST, then marrow_think before acting, marrow_commit after. Or use marrow_auto / marrow_run for one-call logging.',
-                                agentId: AGENT_ID || 'auto',
-                            },
-                        },
-                    });
-                }
+        ];
+        // Request handler
+        async function handleRequest(req) {
+            const { id, method, params } = req;
+            // [FIX #15] Enforce initialize-first per MCP spec
+            if (!initialized && method !== 'initialize') {
+                error(id, -32002, 'Server not initialized. Send initialize first.');
                 return;
             }
-            if (method === 'prompts/list') {
-                if (AUTO_ENROLL) {
+            try {
+                if (method === 'initialize') {
+                    initialized = true;
                     success(id, {
-                        prompts: [
-                            {
-                                name: 'marrow-always-on',
-                                description: 'Always-on Marrow memory loop. Instructs the agent to orient at session start, log intent before meaningful actions, and commit outcomes after completion. Install once — works automatically.',
-                                arguments: [],
-                            },
-                        ],
+                        protocolVersion: '2024-11-05',
+                        capabilities: { tools: {}, prompts: {} },
+                        serverInfo: { name: 'marrow', version: '3.8.0' },
                     });
+                    // Auto-enroll: emit enrollment notification on connection
+                    if (AUTO_ENROLL) {
+                        send({
+                            jsonrpc: '2.0',
+                            method: 'notifications/message',
+                            params: {
+                                level: 'info',
+                                logger: 'marrow',
+                                data: {
+                                    type: 'auto_enroll',
+                                    message: 'Marrow auto-enroll active. Call marrow_orient FIRST, then marrow_think before acting, marrow_commit after. Or use marrow_auto / marrow_run for one-call logging.',
+                                    agentId: AGENT_ID || 'auto',
+                                },
+                            },
+                        });
+                    }
+                    return;
                 }
-                else {
-                    success(id, { prompts: [] });
-                }
-                return;
-            }
-            if (method === 'prompts/get') {
-                const promptName = params?.name;
-                if (promptName !== 'marrow-always-on' || !AUTO_ENROLL) {
-                    error(id, -32602, 'Unknown prompt');
+                if (method === 'prompts/list') {
+                    if (AUTO_ENROLL) {
+                        success(id, {
+                            prompts: [
+                                {
+                                    name: 'marrow-always-on',
+                                    description: 'Always-on Marrow memory loop. Instructs the agent to orient at session start, log intent before meaningful actions, and commit outcomes after completion. Install once — works automatically.',
+                                    arguments: [],
+                                },
+                            ],
+                        });
+                    }
+                    else {
+                        success(id, { prompts: [] });
+                    }
                     return;
                 }
-                success(id, {
-                    description: 'Always-on Marrow memory loop — automatic, zero-config',
-                    messages: [
-                        {
-                            role: 'user',
-                            content: {
-                                type: 'text',
-                                text: `You have Marrow — a memory layer that tells you what went wrong last time before you do it again.
+                if (method === 'prompts/get') {
+                    const promptName = params?.name;
+                    if (promptName !== 'marrow-always-on' || !AUTO_ENROLL) {
+                        error(id, -32602, 'Unknown prompt');
+                        return;
+                    }
+                    success(id, {
+                        description: 'Always-on Marrow memory loop — automatic, zero-config',
+                        messages: [
+                            {
+                                role: 'user',
+                                content: {
+                                    type: 'text',
+                                    text: `You have Marrow — a memory layer that tells you what went wrong last time before you do it again.
 
 ## PRIMARY: Use marrow_auto for everything
 
@@ -943,468 +1033,469 @@ Every decision you log compounds. Failure rates drop. Patterns emerge. The next
 Marrow tells you what went wrong last time before you do it again. But only if you logged it.
 
 This is not optional overhead — it's how you stop repeating the same failures.`,
+                                },
                             },
-                        },
-                    ],
-                });
-                return;
-            }
-            if (method === 'tools/list') {
-                success(id, { tools: TOOLS });
-                return;
-            }
-            if (method === 'tools/call') {
-                const toolName = params?.name;
-                const args = (params?.arguments || {});
-                if (toolName === 'marrow_orient') {
-                    orientCallCount++;
-                    let result;
-                    const wantAutoWarn = args.autoWarn ?? true;
-                    try {
-                        result = await (0, index_1.marrowOrient)(API_KEY, BASE_URL, { taskType: args.taskType, autoWarn: wantAutoWarn }, SESSION_ID);
-                    }
-                    catch (e) {
-                        // autoWarn endpoint may not be deployed yet — fall back to legacy orient
-                        if (wantAutoWarn) {
-                            process.stderr.write(`[marrow] autoWarn orient not available, falling back to legacy\n`);
-                            result = await (0, index_1.marrowOrient)(API_KEY, BASE_URL, { taskType: args.taskType, autoWarn: false }, SESSION_ID);
+                        ],
+                    });
+                    return;
+                }
+                if (method === 'tools/list') {
+                    success(id, { tools: TOOLS });
+                    return;
+                }
+                if (method === 'tools/call') {
+                    const toolName = params?.name;
+                    const args = (params?.arguments || {});
+                    if (toolName === 'marrow_orient') {
+                        orientCallCount++;
+                        let result;
+                        const wantAutoWarn = args.autoWarn ?? true;
+                        try {
+                            result = await (0, index_1.marrowOrient)(API_KEY, BASE_URL, { taskType: args.taskType, autoWarn: wantAutoWarn }, SESSION_ID);
+                        }
+                        catch (e) {
+                            // autoWarn endpoint may not be deployed yet — fall back to legacy orient
+                            if (wantAutoWarn) {
+                                process.stderr.write(`[marrow] autoWarn orient not available, falling back to legacy\n`);
+                                result = await (0, index_1.marrowOrient)(API_KEY, BASE_URL, { taskType: args.taskType, autoWarn: false }, SESSION_ID);
+                            }
+                            else {
+                                throw e;
+                            }
+                        }
+                        if (AUTO_ENROLL && orientCallCount === 1) {
+                            const enrollmentText = `\n\n📋 **Marrow Auto-Enroll Active**\n\n` +
+                                `You have Marrow — a collective memory that tells you what went wrong last time before you do it again.\n\n` +
+                                `## How it works (2 tools max):\n\n` +
+                                `1. **Session start:** Call marrow_orient FIRST. You just did — it surfaces failure warnings.\n` +
+                                `2. **Before any action:** Call marrow_think({ action: "..." }) — returns pattern insights + recommendedNext.\n` +
+                                `3. **After acting:** Call marrow_commit({ decision_id, success, outcome }) — or pass previous_outcome to auto-commit.\n\n` +
+                                `## Quick mode (one tool):\n` +
+                                `- marrow_run({ description, success, outcome }) — handles orient → think → commit in one call.\n` +
+                                `- marrow_auto({ action, outcome?, success? }) — fire-and-forget background logging.\n\n` +
+                                `## Why you must not skip this:\n` +
+                                `Every decision you log compounds. Failure rates drop. The next session starts smarter.\n` +
+                                `Marrow tells you what went wrong last time — but only if you logged it.\n`;
+                            const orientText = JSON.stringify(result, null, 2);
+                            success(id, {
+                                content: [{ type: 'text', text: enrollmentText + orientText }],
+                            });
                         }
                         else {
-                            throw e;
+                            success(id, {
+                                content: [{ type: 'text', text: JSON.stringify(result, null, 2) }],
+                            });
                         }
+                        return;
                     }
-                    if (AUTO_ENROLL && orientCallCount === 1) {
-                        const enrollmentText = `\n\n📋 **Marrow Auto-Enroll Active**\n\n` +
-                            `You have Marrow — a collective memory that tells you what went wrong last time before you do it again.\n\n` +
-                            `## How it works (2 tools max):\n\n` +
-                            `1. **Session start:** Call marrow_orient FIRST. You just did — it surfaces failure warnings.\n` +
-                            `2. **Before any action:** Call marrow_think({ action: "..." }) — returns pattern insights + recommendedNext.\n` +
-                            `3. **After acting:** Call marrow_commit({ decision_id, success, outcome }) — or pass previous_outcome to auto-commit.\n\n` +
-                            `## Quick mode (one tool):\n` +
-                            `- marrow_run({ description, success, outcome }) — handles orient → think → commit in one call.\n` +
-                            `- marrow_auto({ action, outcome?, success? }) — fire-and-forget background logging.\n\n` +
-                            `## Why you must not skip this:\n` +
-                            `Every decision you log compounds. Failure rates drop. The next session starts smarter.\n` +
-                            `Marrow tells you what went wrong last time — but only if you logged it.\n`;
-                        const orientText = JSON.stringify(result, null, 2);
-                        success(id, {
-                            content: [{ type: 'text', text: enrollmentText + orientText }],
-                        });
-                    }
-                    else {
+                    if (toolName === 'marrow_think') {
+                        // [FIX #9] Validate required param
+                        const action = requireString(args, 'action');
+                        const result = await (0, index_1.marrowThink)(API_KEY, BASE_URL, {
+                            action,
+                            type: args.type,
+                            context: args.context,
+                            previous_decision_id: args.previous_decision_id,
+                            previous_success: args.previous_success,
+                            previous_outcome: args.previous_outcome,
+                            checkLoop: args.checkLoop ?? true,
+                        }, SESSION_ID);
+                        // Refresh orient warnings every 5th think call
+                        thinkCallCount++;
+                        if (thinkCallCount % 5 === 0) {
+                            refreshOrientWarnings();
+                        }
+                        // Inject cached orient warnings into intelligence.insights
+                        if (cachedOrientWarnings.length > 0) {
+                            const existingInsights = result.intelligence?.insights || [];
+                            result.intelligence.insights = [
+                                ...cachedOrientWarnings.map((w) => ({
+                                    type: 'failure_pattern',
+                                    summary: w.message,
+                                    action: `Review past ${w.type} failures before proceeding`,
+                                    severity: (w.failureRate > 0.4 ? 'critical' : 'warning'),
+                                    count: 0,
+                                })),
+                                ...existingInsights,
+                            ];
+                        }
+                        lastDecisionId = result.decision_id;
+                        lastCommitted = false;
                         success(id, {
                             content: [{ type: 'text', text: JSON.stringify(result, null, 2) }],
                         });
+                        return;
                     }
-                    return;
-                }
-                if (toolName === 'marrow_think') {
-                    // [FIX #9] Validate required param
-                    const action = requireString(args, 'action');
-                    const result = await (0, index_1.marrowThink)(API_KEY, BASE_URL, {
-                        action,
-                        type: args.type,
-                        context: args.context,
-                        previous_decision_id: args.previous_decision_id,
-                        previous_success: args.previous_success,
-                        previous_outcome: args.previous_outcome,
-                        checkLoop: args.checkLoop ?? true,
-                    }, SESSION_ID);
-                    // Refresh orient warnings every 5th think call
-                    thinkCallCount++;
-                    if (thinkCallCount % 5 === 0) {
-                        refreshOrientWarnings();
-                    }
-                    // Inject cached orient warnings into intelligence.insights
-                    if (cachedOrientWarnings.length > 0) {
-                        const existingInsights = result.intelligence?.insights || [];
-                        result.intelligence.insights = [
-                            ...cachedOrientWarnings.map((w) => ({
-                                type: 'failure_pattern',
-                                summary: w.message,
-                                action: `Review past ${w.type} failures before proceeding`,
-                                severity: (w.failureRate > 0.4 ? 'critical' : 'warning'),
-                                count: 0,
-                            })),
-                            ...existingInsights,
-                        ];
-                    }
-                    lastDecisionId = result.decision_id;
-                    lastCommitted = false;
-                    success(id, {
-                        content: [{ type: 'text', text: JSON.stringify(result, null, 2) }],
-                    });
-                    return;
-                }
-                if (toolName === 'marrow_commit') {
-                    // [FIX #9] Validate required params
-                    const decision_id = requireString(args, 'decision_id');
-                    const outcome = requireString(args, 'outcome');
-                    if (typeof args.success !== 'boolean') {
-                        throw new Error('"success" is required and must be a boolean');
-                    }
-                    const result = await (0, index_1.marrowCommit)(API_KEY, BASE_URL, {
-                        decision_id,
-                        success: args.success,
-                        outcome,
-                        caused_by: args.caused_by,
-                    }, SESSION_ID);
-                    const commitResult = { ...result, narrative: result.narrative ?? null };
-                    lastCommitted = true;
-                    lastDecisionId = null;
-                    success(id, {
-                        content: [{ type: 'text', text: JSON.stringify(commitResult, null, 2) }],
-                    });
-                    return;
-                }
-                if (toolName === 'marrow_run') {
-                    // [FIX #9] Validate required params
-                    const description = requireString(args, 'description');
-                    const outcome = requireString(args, 'outcome');
-                    // [FIX #16] Handle partial failures — return think result even if commit fails
-                    let thinkResult = null;
-                    try {
-                        await (0, index_1.marrowOrient)(API_KEY, BASE_URL, undefined, SESSION_ID, FLEET_AGENT_ID);
-                    }
-                    catch (err) {
-                        const msg = err instanceof Error ? err.message : String(err);
-                        process.stderr.write(`[marrow] marrow_run orient failed (continuing): ${msg}\n`);
-                    }
-                    thinkResult = await (0, index_1.marrowThink)(API_KEY, BASE_URL, {
-                        action: description,
-                        type: args.type || 'general',
-                    }, SESSION_ID);
-                    let commitResult = null;
-                    try {
-                        commitResult = await (0, index_1.marrowCommit)(API_KEY, BASE_URL, {
-                            decision_id: thinkResult.decision_id,
-                            success: args.success ?? true,
+                    if (toolName === 'marrow_commit') {
+                        // [FIX #9] Validate required params
+                        const decision_id = requireString(args, 'decision_id');
+                        const outcome = requireString(args, 'outcome');
+                        if (typeof args.success !== 'boolean') {
+                            throw new Error('"success" is required and must be a boolean');
+                        }
+                        const result = await (0, index_1.marrowCommit)(API_KEY, BASE_URL, {
+                            decision_id,
+                            success: args.success,
                             outcome,
+                            caused_by: args.caused_by,
                         }, SESSION_ID);
+                        const commitResult = { ...result, narrative: result.narrative ?? null };
+                        lastCommitted = true;
+                        lastDecisionId = null;
+                        success(id, {
+                            content: [{ type: 'text', text: JSON.stringify(commitResult, null, 2) }],
+                        });
+                        return;
                     }
-                    catch (err) {
-                        const msg = err instanceof Error ? err.message : String(err);
-                        process.stderr.write(`[marrow] marrow_run commit failed: ${msg}\n`);
+                    if (toolName === 'marrow_run') {
+                        // [FIX #9] Validate required params
+                        const description = requireString(args, 'description');
+                        const outcome = requireString(args, 'outcome');
+                        // [FIX #16] Handle partial failures — return think result even if commit fails
+                        let thinkResult = null;
+                        try {
+                            await (0, index_1.marrowOrient)(API_KEY, BASE_URL, undefined, SESSION_ID, FLEET_AGENT_ID);
+                        }
+                        catch (err) {
+                            const msg = err instanceof Error ? err.message : String(err);
+                            process.stderr.write(`[marrow] marrow_run orient failed (continuing): ${msg}\n`);
+                        }
+                        thinkResult = await (0, index_1.marrowThink)(API_KEY, BASE_URL, {
+                            action: description,
+                            type: args.type || 'general',
+                        }, SESSION_ID);
+                        let commitResult = null;
+                        try {
+                            commitResult = await (0, index_1.marrowCommit)(API_KEY, BASE_URL, {
+                                decision_id: thinkResult.decision_id,
+                                success: args.success ?? true,
+                                outcome,
+                            }, SESSION_ID);
+                        }
+                        catch (err) {
+                            const msg = err instanceof Error ? err.message : String(err);
+                            process.stderr.write(`[marrow] marrow_run commit failed: ${msg}\n`);
+                            success(id, {
+                                content: [{
+                                        type: 'text',
+                                        text: JSON.stringify({
+                                            think: thinkResult,
+                                            commit: null,
+                                            commit_error: msg,
+                                            decision_id: thinkResult.decision_id,
+                                        }, null, 2),
+                                    }],
+                            });
+                            return;
+                        }
                         success(id, {
                             content: [{
                                     type: 'text',
-                                    text: JSON.stringify({
-                                        think: thinkResult,
-                                        commit: null,
-                                        commit_error: msg,
-                                        decision_id: thinkResult.decision_id,
-                                    }, null, 2),
+                                    text: JSON.stringify({ think: thinkResult, commit: commitResult }, null, 2),
                                 }],
                         });
                         return;
                     }
-                    success(id, {
-                        content: [{
-                                type: 'text',
-                                text: JSON.stringify({ think: thinkResult, commit: commitResult }, null, 2),
-                            }],
-                    });
-                    return;
-                }
-                if (toolName === 'marrow_auto') {
-                    // [FIX #9] Validate required param
-                    const action = requireString(args, 'action');
-                    const outcome = args.outcome;
-                    const outcomeSuccess = args.success ?? true;
-                    const type = args.type || 'general';
-                    // [FIX #11] Cleanup pending decisions on each auto call
-                    cleanupPending();
-                    // [FIX #8] Include pending flag so agent knows logging is deferred
-                    const response = {
-                        action,
-                        outcome: outcome || 'pending',
-                        warnings: cachedOrientWarnings.map(formatWarningActionably),
-                        logging: 'deferred',
-                    };
-                    // Fire-and-forget the actual API calls
-                    (async () => {
-                        try {
-                            if (!outcome) {
-                                await (0, index_1.marrowThink)(API_KEY, BASE_URL, { action, type }, SESSION_ID, FLEET_AGENT_ID);
+                    if (toolName === 'marrow_auto') {
+                        // [FIX #9] Validate required param
+                        const action = requireString(args, 'action');
+                        const outcome = args.outcome;
+                        const outcomeSuccess = args.success ?? true;
+                        const type = args.type || 'general';
+                        // [FIX #11] Cleanup pending decisions on each auto call
+                        cleanupPending();
+                        // [FIX #8] Include pending flag so agent knows logging is deferred
+                        const response = {
+                            action,
+                            outcome: outcome || 'pending',
+                            warnings: cachedOrientWarnings.map(formatWarningActionably),
+                            logging: 'deferred',
+                        };
+                        // Fire-and-forget the actual API calls
+                        (async () => {
+                            try {
+                                if (!outcome) {
+                                    await (0, index_1.marrowThink)(API_KEY, BASE_URL, { action, type }, SESSION_ID, FLEET_AGENT_ID);
+                                }
+                                else {
+                                    const thinkResult = await (0, index_1.marrowThink)(API_KEY, BASE_URL, { action, type }, SESSION_ID, FLEET_AGENT_ID);
+                                    await (0, index_1.marrowCommit)(API_KEY, BASE_URL, { decision_id: thinkResult.decision_id, success: outcomeSuccess, outcome }, SESSION_ID);
+                                }
                             }
-                            else {
-                                const thinkResult = await (0, index_1.marrowThink)(API_KEY, BASE_URL, { action, type }, SESSION_ID, FLEET_AGENT_ID);
-                                await (0, index_1.marrowCommit)(API_KEY, BASE_URL, { decision_id: thinkResult.decision_id, success: outcomeSuccess, outcome }, SESSION_ID);
+                            catch (err) {
+                                const msg = err instanceof Error ? err.message : String(err);
+                                process.stderr.write(`[marrow] marrow_auto background logging failed: ${msg}\n`);
                             }
+                        })();
+                        success(id, {
+                            content: [{ type: 'text', text: JSON.stringify(response, null, 2) }],
+                        });
+                        return;
+                    }
+                    if (toolName === 'marrow_ask') {
+                        const query = requireString(args, 'query');
+                        const result = await (0, index_1.marrowAsk)(API_KEY, BASE_URL, { query }, SESSION_ID, FLEET_AGENT_ID);
+                        success(id, {
+                            content: [{ type: 'text', text: JSON.stringify(result, null, 2) }],
+                        });
+                        return;
+                    }
+                    if (toolName === 'marrow_status') {
+                        const result = await (0, index_1.marrowStatus)(API_KEY, BASE_URL, SESSION_ID, FLEET_AGENT_ID);
+                        success(id, {
+                            content: [{ type: 'text', text: JSON.stringify(result, null, 2) }],
+                        });
+                        return;
+                    }
+                    if (toolName === 'marrow_create_key') {
+                        const name = requireString(args, 'name');
+                        const result = await (0, index_1.marrowCreateKey)(API_KEY, BASE_URL, {
+                            name,
+                            key_type: args.key_type,
+                            scopes: args.scopes,
+                            agent_ids: args.agent_ids,
+                            expires_at: args.expires_at,
+                        }, SESSION_ID, FLEET_AGENT_ID);
+                        success(id, {
+                            content: [{ type: 'text', text: JSON.stringify({ ...result, warning: formatKeyMaterialWarning() }, null, 2) }],
+                        });
+                        return;
+                    }
+                    if (toolName === 'marrow_list_keys') {
+                        const result = await (0, index_1.marrowListKeys)(API_KEY, BASE_URL, SESSION_ID, FLEET_AGENT_ID);
+                        success(id, { content: [{ type: 'text', text: JSON.stringify(result, null, 2) }] });
+                        return;
+                    }
+                    if (toolName === 'marrow_get_key') {
+                        const keyId = requireString(args, 'id');
+                        const result = await (0, index_1.marrowGetKey)(API_KEY, BASE_URL, keyId, SESSION_ID, FLEET_AGENT_ID);
+                        success(id, { content: [{ type: 'text', text: JSON.stringify(result, null, 2) }] });
+                        return;
+                    }
+                    if (toolName === 'marrow_revoke_key') {
+                        const keyId = requireString(args, 'id');
+                        const result = await (0, index_1.marrowRevokeKey)(API_KEY, BASE_URL, keyId, SESSION_ID, FLEET_AGENT_ID);
+                        success(id, { content: [{ type: 'text', text: JSON.stringify(result, null, 2) }] });
+                        return;
+                    }
+                    if (toolName === 'marrow_rotate_key') {
+                        const keyId = requireString(args, 'id');
+                        const result = await (0, index_1.marrowRotateKey)(API_KEY, BASE_URL, keyId, SESSION_ID, FLEET_AGENT_ID);
+                        success(id, {
+                            content: [{ type: 'text', text: JSON.stringify({ ...result, warning: formatKeyMaterialWarning() }, null, 2) }],
+                        });
+                        return;
+                    }
+                    // Memory control tools — all use requireString for id validation
+                    if (toolName === 'marrow_list_memories') {
+                        const result = await marrowListMemories(API_KEY, BASE_URL, { status: args.status, query: args.query, limit: args.limit, agentId: args.agentId }, SESSION_ID);
+                        success(id, { content: [{ type: 'text', text: JSON.stringify(result, null, 2) }] });
+                        return;
+                    }
+                    if (toolName === 'marrow_get_memory') {
+                        const memId = requireString(args, 'id');
+                        const result = await marrowGetMemory(API_KEY, BASE_URL, memId, SESSION_ID);
+                        success(id, { content: [{ type: 'text', text: JSON.stringify(result, null, 2) }] });
+                        return;
+                    }
+                    if (toolName === 'marrow_update_memory') {
+                        const memId = requireString(args, 'id');
+                        const result = await marrowUpdateMemory(API_KEY, BASE_URL, memId, { text: args.text, source: args.source, tags: args.tags, actor: args.actor, note: args.note }, SESSION_ID);
+                        success(id, { content: [{ type: 'text', text: JSON.stringify(result, null, 2) }] });
+                        return;
+                    }
+                    if (toolName === 'marrow_delete_memory') {
+                        const memId = requireString(args, 'id');
+                        const result = await marrowDeleteMemory(API_KEY, BASE_URL, memId, { actor: args.actor, note: args.note }, SESSION_ID);
+                        success(id, { content: [{ type: 'text', text: JSON.stringify(result, null, 2) }] });
+                        return;
+                    }
+                    if (toolName === 'marrow_mark_outdated') {
+                        const memId = requireString(args, 'id');
+                        const result = await marrowMarkOutdated(API_KEY, BASE_URL, memId, { actor: args.actor, note: args.note }, SESSION_ID);
+                        success(id, { content: [{ type: 'text', text: JSON.stringify(result, null, 2) }] });
+                        return;
+                    }
+                    if (toolName === 'marrow_supersede_memory') {
+                        const memId = requireString(args, 'id');
+                        const newText = requireString(args, 'text');
+                        const result = await marrowSupersedeMemory(API_KEY, BASE_URL, memId, { text: newText, source: args.source, tags: args.tags, actor: args.actor, note: args.note }, SESSION_ID);
+                        success(id, { content: [{ type: 'text', text: JSON.stringify(result, null, 2) }] });
+                        return;
+                    }
+                    if (toolName === 'marrow_share_memory') {
+                        const memId = requireString(args, 'id');
+                        const result = await marrowShareMemory(API_KEY, BASE_URL, memId, args.agentIds || [], args.actor, SESSION_ID);
+                        success(id, { content: [{ type: 'text', text: JSON.stringify(result, null, 2) }] });
+                        return;
+                    }
+                    if (toolName === 'marrow_export_memories') {
+                        const result = await marrowExportMemories(API_KEY, BASE_URL, { format: args.format, status: args.status, tags: args.tags }, SESSION_ID);
+                        success(id, { content: [{ type: 'text', text: JSON.stringify(result, null, 2) }] });
+                        return;
+                    }
+                    if (toolName === 'marrow_import_memories') {
+                        const result = await marrowImportMemories(API_KEY, BASE_URL, args.memories || [], args.mode || 'merge', SESSION_ID);
+                        success(id, { content: [{ type: 'text', text: JSON.stringify(result, null, 2) }] });
+                        return;
+                    }
+                    if (toolName === 'marrow_retrieve_memories') {
+                        const query = requireString(args, 'query');
+                        const result = await marrowRetrieveMemories(API_KEY, BASE_URL, query, { limit: args.limit, from: args.from, to: args.to, tags: args.tags, source: args.source, status: args.status, shared: args.shared }, SESSION_ID);
+                        success(id, { content: [{ type: 'text', text: JSON.stringify(result, null, 2) }] });
+                        return;
+                    }
+                    if (toolName === 'marrow_workflow') {
+                        const result = await (0, index_1.marrowWorkflow)(API_KEY, BASE_URL, {
+                            action: args.action,
+                            workflowId: args.workflowId,
+                            instanceId: args.instanceId,
+                            name: args.name,
+                            description: args.description,
+                            steps: args.steps,
+                            tags: args.tags,
+                            agentId: args.agentId,
+                            context: args.context,
+                            inputs: args.inputs,
+                            stepCompleted: args.stepCompleted,
+                            outcome: args.outcome,
+                            nextAgentId: args.nextAgentId,
+                            contextUpdate: args.contextUpdate,
+                            status: args.status,
+                        }, SESSION_ID, FLEET_AGENT_ID);
+                        success(id, { content: [{ type: 'text', text: JSON.stringify(result, null, 2) }] });
+                        return;
+                    }
+                    if (toolName === 'marrow_dashboard') {
+                        const result = await (0, index_1.marrowDashboard)(API_KEY, BASE_URL, SESSION_ID, FLEET_AGENT_ID);
+                        success(id, { content: [{ type: 'text', text: JSON.stringify(result, null, 2) }] });
+                        return;
+                    }
+                    if (toolName === 'marrow_digest') {
+                        const result = await (0, index_1.marrowDigest)(API_KEY, BASE_URL, args.period || '7d', SESSION_ID, FLEET_AGENT_ID);
+                        success(id, { content: [{ type: 'text', text: JSON.stringify(result, null, 2) }] });
+                        return;
+                    }
+                    if (toolName === 'marrow_session_end') {
+                        const result = await (0, index_1.marrowSessionEnd)(API_KEY, BASE_URL, Boolean(args.autoCommitOpen), SESSION_ID, FLEET_AGENT_ID);
+                        success(id, { content: [{ type: 'text', text: JSON.stringify(result, null, 2) }] });
+                        return;
+                    }
+                    if (toolName === 'marrow_accept_detected') {
+                        const detectedId = args.detectedId;
+                        if (!detectedId) {
+                            error(id, -32602, 'detectedId is required');
+                            return;
                         }
-                        catch (err) {
-                            const msg = err instanceof Error ? err.message : String(err);
-                            process.stderr.write(`[marrow] marrow_auto background logging failed: ${msg}\n`);
-                        }
-                    })();
-                    success(id, {
-                        content: [{ type: 'text', text: JSON.stringify(response, null, 2) }],
-                    });
-                    return;
-                }
-                if (toolName === 'marrow_ask') {
-                    const query = requireString(args, 'query');
-                    const result = await (0, index_1.marrowAsk)(API_KEY, BASE_URL, { query }, SESSION_ID, FLEET_AGENT_ID);
-                    success(id, {
-                        content: [{ type: 'text', text: JSON.stringify(result, null, 2) }],
-                    });
-                    return;
-                }
-                if (toolName === 'marrow_status') {
-                    const result = await (0, index_1.marrowStatus)(API_KEY, BASE_URL, SESSION_ID, FLEET_AGENT_ID);
-                    success(id, {
-                        content: [{ type: 'text', text: JSON.stringify(result, null, 2) }],
-                    });
-                    return;
-                }
-                if (toolName === 'marrow_create_key') {
-                    const name = requireString(args, 'name');
-                    const result = await (0, index_1.marrowCreateKey)(API_KEY, BASE_URL, {
-                        name,
-                        key_type: args.key_type,
-                        scopes: args.scopes,
-                        agent_ids: args.agent_ids,
-                        expires_at: args.expires_at,
-                    }, SESSION_ID, FLEET_AGENT_ID);
-                    success(id, {
-                        content: [{ type: 'text', text: JSON.stringify({ ...result, warning: formatKeyMaterialWarning() }, null, 2) }],
-                    });
-                    return;
-                }
-                if (toolName === 'marrow_list_keys') {
-                    const result = await (0, index_1.marrowListKeys)(API_KEY, BASE_URL, SESSION_ID, FLEET_AGENT_ID);
-                    success(id, { content: [{ type: 'text', text: JSON.stringify(result, null, 2) }] });
-                    return;
-                }
-                if (toolName === 'marrow_get_key') {
-                    const keyId = requireString(args, 'id');
-                    const result = await (0, index_1.marrowGetKey)(API_KEY, BASE_URL, keyId, SESSION_ID, FLEET_AGENT_ID);
-                    success(id, { content: [{ type: 'text', text: JSON.stringify(result, null, 2) }] });
-                    return;
-                }
-                if (toolName === 'marrow_revoke_key') {
-                    const keyId = requireString(args, 'id');
-                    const result = await (0, index_1.marrowRevokeKey)(API_KEY, BASE_URL, keyId, SESSION_ID, FLEET_AGENT_ID);
-                    success(id, { content: [{ type: 'text', text: JSON.stringify(result, null, 2) }] });
-                    return;
-                }
-                if (toolName === 'marrow_rotate_key') {
-                    const keyId = requireString(args, 'id');
-                    const result = await (0, index_1.marrowRotateKey)(API_KEY, BASE_URL, keyId, SESSION_ID, FLEET_AGENT_ID);
-                    success(id, {
-                        content: [{ type: 'text', text: JSON.stringify({ ...result, warning: formatKeyMaterialWarning() }, null, 2) }],
-                    });
-                    return;
-                }
-                // Memory control tools — all use requireString for id validation
-                if (toolName === 'marrow_list_memories') {
-                    const result = await marrowListMemories(API_KEY, BASE_URL, { status: args.status, query: args.query, limit: args.limit, agentId: args.agentId }, SESSION_ID);
-                    success(id, { content: [{ type: 'text', text: JSON.stringify(result, null, 2) }] });
-                    return;
-                }
-                if (toolName === 'marrow_get_memory') {
-                    const memId = requireString(args, 'id');
-                    const result = await marrowGetMemory(API_KEY, BASE_URL, memId, SESSION_ID);
-                    success(id, { content: [{ type: 'text', text: JSON.stringify(result, null, 2) }] });
-                    return;
-                }
-                if (toolName === 'marrow_update_memory') {
-                    const memId = requireString(args, 'id');
-                    const result = await marrowUpdateMemory(API_KEY, BASE_URL, memId, { text: args.text, source: args.source, tags: args.tags, actor: args.actor, note: args.note }, SESSION_ID);
-                    success(id, { content: [{ type: 'text', text: JSON.stringify(result, null, 2) }] });
-                    return;
-                }
-                if (toolName === 'marrow_delete_memory') {
-                    const memId = requireString(args, 'id');
-                    const result = await marrowDeleteMemory(API_KEY, BASE_URL, memId, { actor: args.actor, note: args.note }, SESSION_ID);
-                    success(id, { content: [{ type: 'text', text: JSON.stringify(result, null, 2) }] });
-                    return;
-                }
-                if (toolName === 'marrow_mark_outdated') {
-                    const memId = requireString(args, 'id');
-                    const result = await marrowMarkOutdated(API_KEY, BASE_URL, memId, { actor: args.actor, note: args.note }, SESSION_ID);
-                    success(id, { content: [{ type: 'text', text: JSON.stringify(result, null, 2) }] });
-                    return;
-                }
-                if (toolName === 'marrow_supersede_memory') {
-                    const memId = requireString(args, 'id');
-                    const newText = requireString(args, 'text');
-                    const result = await marrowSupersedeMemory(API_KEY, BASE_URL, memId, { text: newText, source: args.source, tags: args.tags, actor: args.actor, note: args.note }, SESSION_ID);
-                    success(id, { content: [{ type: 'text', text: JSON.stringify(result, null, 2) }] });
-                    return;
-                }
-                if (toolName === 'marrow_share_memory') {
-                    const memId = requireString(args, 'id');
-                    const result = await marrowShareMemory(API_KEY, BASE_URL, memId, args.agentIds || [], args.actor, SESSION_ID);
-                    success(id, { content: [{ type: 'text', text: JSON.stringify(result, null, 2) }] });
-                    return;
-                }
-                if (toolName === 'marrow_export_memories') {
-                    const result = await marrowExportMemories(API_KEY, BASE_URL, { format: args.format, status: args.status, tags: args.tags }, SESSION_ID);
-                    success(id, { content: [{ type: 'text', text: JSON.stringify(result, null, 2) }] });
-                    return;
-                }
-                if (toolName === 'marrow_import_memories') {
-                    const result = await marrowImportMemories(API_KEY, BASE_URL, args.memories || [], args.mode || 'merge', SESSION_ID);
-                    success(id, { content: [{ type: 'text', text: JSON.stringify(result, null, 2) }] });
-                    return;
-                }
-                if (toolName === 'marrow_retrieve_memories') {
-                    const query = requireString(args, 'query');
-                    const result = await marrowRetrieveMemories(API_KEY, BASE_URL, query, { limit: args.limit, from: args.from, to: args.to, tags: args.tags, source: args.source, status: args.status, shared: args.shared }, SESSION_ID);
-                    success(id, { content: [{ type: 'text', text: JSON.stringify(result, null, 2) }] });
-                    return;
-                }
-                if (toolName === 'marrow_workflow') {
-                    const result = await (0, index_1.marrowWorkflow)(API_KEY, BASE_URL, {
-                        action: args.action,
-                        workflowId: args.workflowId,
-                        instanceId: args.instanceId,
-                        name: args.name,
-                        description: args.description,
-                        steps: args.steps,
-                        tags: args.tags,
-                        agentId: args.agentId,
-                        context: args.context,
-                        inputs: args.inputs,
-                        stepCompleted: args.stepCompleted,
-                        outcome: args.outcome,
-                        nextAgentId: args.nextAgentId,
-                        contextUpdate: args.contextUpdate,
-                        status: args.status,
-                    }, SESSION_ID, FLEET_AGENT_ID);
-                    success(id, { content: [{ type: 'text', text: JSON.stringify(result, null, 2) }] });
-                    return;
-                }
-                if (toolName === 'marrow_dashboard') {
-                    const result = await (0, index_1.marrowDashboard)(API_KEY, BASE_URL, SESSION_ID, FLEET_AGENT_ID);
-                    success(id, { content: [{ type: 'text', text: JSON.stringify(result, null, 2) }] });
-                    return;
-                }
-                if (toolName === 'marrow_digest') {
-                    const result = await (0, index_1.marrowDigest)(API_KEY, BASE_URL, args.period || '7d', SESSION_ID, FLEET_AGENT_ID);
-                    success(id, { content: [{ type: 'text', text: JSON.stringify(result, null, 2) }] });
-                    return;
-                }
-                if (toolName === 'marrow_session_end') {
-                    const result = await (0, index_1.marrowSessionEnd)(API_KEY, BASE_URL, Boolean(args.autoCommitOpen), SESSION_ID, FLEET_AGENT_ID);
-                    success(id, { content: [{ type: 'text', text: JSON.stringify(result, null, 2) }] });
-                    return;
-                }
-                if (toolName === 'marrow_accept_detected') {
-                    const detectedId = args.detectedId;
-                    if (!detectedId) {
-                        error(id, -32602, 'detectedId is required');
+                        const result = await (0, index_1.marrowAcceptDetected)(API_KEY, BASE_URL, detectedId, SESSION_ID, FLEET_AGENT_ID);
+                        success(id, { content: [{ type: 'text', text: JSON.stringify(result, null, 2) }] });
                         return;
                     }
-                    const result = await (0, index_1.marrowAcceptDetected)(API_KEY, BASE_URL, detectedId, SESSION_ID, FLEET_AGENT_ID);
-                    success(id, { content: [{ type: 'text', text: JSON.stringify(result, null, 2) }] });
-                    return;
-                }
-                if (toolName === 'marrow_list_templates') {
-                    const result = await (0, index_1.marrowListTemplates)(API_KEY, BASE_URL, {
-                        industry: args.industry,
-                        category: args.category,
-                        limit: args.limit,
-                    }, SESSION_ID, FLEET_AGENT_ID);
-                    success(id, { content: [{ type: 'text', text: JSON.stringify(result, null, 2) }] });
-                    return;
-                }
-                if (toolName === 'marrow_install_template') {
-                    const slug = args.slug;
-                    if (!slug) {
-                        error(id, -32602, 'slug is required');
+                    if (toolName === 'marrow_list_templates') {
+                        const result = await (0, index_1.marrowListTemplates)(API_KEY, BASE_URL, {
+                            industry: args.industry,
+                            category: args.category,
+                            limit: args.limit,
+                        }, SESSION_ID, FLEET_AGENT_ID);
+                        success(id, { content: [{ type: 'text', text: JSON.stringify(result, null, 2) }] });
+                        return;
+                    }
+                    if (toolName === 'marrow_install_template') {
+                        const slug = args.slug;
+                        if (!slug) {
+                            error(id, -32602, 'slug is required');
+                            return;
+                        }
+                        const result = await (0, index_1.marrowInstallTemplate)(API_KEY, BASE_URL, slug, SESSION_ID, FLEET_AGENT_ID);
+                        success(id, { content: [{ type: 'text', text: JSON.stringify(result, null, 2) }] });
                         return;
                     }
-                    const result = await (0, index_1.marrowInstallTemplate)(API_KEY, BASE_URL, slug, SESSION_ID, FLEET_AGENT_ID);
-                    success(id, { content: [{ type: 'text', text: JSON.stringify(result, null, 2) }] });
+                    error(id, -32601, `Method not found: ${toolName}`);
                     return;
                 }
-                error(id, -32601, `Method not found: ${toolName}`);
-                return;
+                error(id, -32601, `Method not found: ${method}`);
             }
-            error(id, -32601, `Method not found: ${method}`);
-        }
-        catch (err) {
-            const message = err instanceof Error ? err.message : String(err);
-            error(id, -32000, message);
-        }
-    }
-    // MCP stdio loop — raw stdin, no readline (readline writes prompts to stdout which breaks MCP)
-    let buffer = '';
-    let pendingRequests = 0;
-    let stdinEnded = false;
-    function checkExit() {
-        if (stdinEnded && pendingRequests === 0) {
-            autoCommitOnClose().then(() => process.exit(0));
-        }
-    }
-    process.stdin.setEncoding('utf8');
-    process.stdin.on('data', (chunk) => {
-        buffer += chunk;
-        const lines = buffer.split('\n');
-        buffer = lines.pop() || ''; // keep incomplete line in buffer
-        for (const line of lines) {
-            const trimmed = line.trim();
-            if (!trimmed)
-                continue;
-            // [FIX #1] Wrap JSON.parse in try-catch to prevent crash on malformed input
-            let msg;
-            try {
-                msg = JSON.parse(trimmed);
+            catch (err) {
+                const message = err instanceof Error ? err.message : String(err);
+                error(id, -32000, message);
             }
-            catch (parseErr) {
-                process.stderr.write(`[marrow] JSON parse error: ${parseErr}\n`);
-                send({ jsonrpc: '2.0', id: null, error: { code: -32700, message: 'Parse error' } });
-                continue;
+        }
+        // MCP stdio loop — raw stdin, no readline (readline writes prompts to stdout which breaks MCP)
+        let buffer = '';
+        let pendingRequests = 0;
+        let stdinEnded = false;
+        function checkExit() {
+            if (stdinEnded && pendingRequests === 0) {
+                autoCommitOnClose().then(() => process.exit(0));
             }
-            // MCP notifications (no id) must be silently ignored per spec
-            if (msg.id === undefined || msg.id === null)
-                continue;
-            pendingRequests++;
-            handleRequest(msg)
-                .catch((err) => {
-                process.stderr.write(`[marrow] Handler error: ${err}\n`);
-            })
-                .finally(() => {
-                pendingRequests--;
-                checkExit();
-            });
         }
-    });
-    process.stdin.on('end', () => {
-        stdinEnded = true;
-        if (buffer.trim()) {
-            let msg;
-            try {
-                msg = JSON.parse(buffer.trim());
+        process.stdin.setEncoding('utf8');
+        process.stdin.on('data', (chunk) => {
+            buffer += chunk;
+            const lines = buffer.split('\n');
+            buffer = lines.pop() || ''; // keep incomplete line in buffer
+            for (const line of lines) {
+                const trimmed = line.trim();
+                if (!trimmed)
+                    continue;
+                // [FIX #1] Wrap JSON.parse in try-catch to prevent crash on malformed input
+                let msg;
+                try {
+                    msg = JSON.parse(trimmed);
+                }
+                catch (parseErr) {
+                    process.stderr.write(`[marrow] JSON parse error: ${parseErr}\n`);
+                    send({ jsonrpc: '2.0', id: null, error: { code: -32700, message: 'Parse error' } });
+                    continue;
+                }
+                // MCP notifications (no id) must be silently ignored per spec
+                if (msg.id === undefined || msg.id === null)
+                    continue;
+                pendingRequests++;
+                handleRequest(msg)
+                    .catch((err) => {
+                    process.stderr.write(`[marrow] Handler error: ${err}\n`);
+                })
+                    .finally(() => {
+                    pendingRequests--;
+                    checkExit();
+                });
             }
-            catch (err) {
-                process.stderr.write(`[marrow] JSON parse error on remaining buffer: ${err}\n`);
-                checkExit();
-                return;
+        });
+        process.stdin.on('end', () => {
+            stdinEnded = true;
+            if (buffer.trim()) {
+                let msg;
+                try {
+                    msg = JSON.parse(buffer.trim());
+                }
+                catch (err) {
+                    process.stderr.write(`[marrow] JSON parse error on remaining buffer: ${err}\n`);
+                    checkExit();
+                    return;
+                }
+                if (msg.id === undefined || msg.id === null) {
+                    checkExit();
+                    return;
+                }
+                pendingRequests++;
+                handleRequest(msg)
+                    .catch((err) => {
+                    process.stderr.write(`[marrow] Handler error on remaining: ${err}\n`);
+                })
+                    .finally(() => {
+                    pendingRequests--;
+                    checkExit();
+                });
             }
-            if (msg.id === undefined || msg.id === null) {
+            else {
                 checkExit();
-                return;
             }
-            pendingRequests++;
-            handleRequest(msg)
-                .catch((err) => {
-                process.stderr.write(`[marrow] Handler error on remaining: ${err}\n`);
-            })
-                .finally(() => {
-                pendingRequests--;
-                checkExit();
-            });
-        }
-        else {
-            checkExit();
-        }
-    });
-    process.stdin.on('error', (err) => {
-        process.stderr.write(`[marrow] stdin error: ${err}\n`);
-        process.exit(1);
-    });
+        });
+        process.stdin.on('error', (err) => {
+            process.stderr.write(`[marrow] stdin error: ${err}\n`);
+            process.exit(1);
+        });
+    } // Close the if (process.argv[2] !== 'keys') block
 }
 //# sourceMappingURL=cli.js.map