@cachly-dev/mcp-server 0.10.48 → 0.10.50

package/dist/{index.js → src/index.js}

@@ -1,5 +1,7 @@
 #!/usr/bin/env node
 import { jwtExpiryMs, checkJwt, handleApiError } from './auth.js';
+import { handleTcoTool } from './handlers/tco.js';
+import { notify } from './notifier.js';
 import { readFile } from 'node:fs/promises';
 import { fileURLToPath } from 'node:url';
 // True only when this file is the entry point (not imported by tests or other modules).
@@ -34,26 +36,40 @@ const _isMain = process.argv[1] != null &&
  * ── Auth & Status ────────────────────────────────────────────────────────────
  *   • get_api_status        – check API health + JWT auth info (Keycloak)
  *
+ * ── Travel Chaos Organizer (TCO) ────────────────────────────────────────────
+ *   • tco_list_trips    – list all trips
+ *   • tco_create_trip   – create a new trip
+ *   • tco_get_timeline  – get timeline items for a trip
+ *   • tco_delete_trip   – delete a trip
+ *   • tco_inbox_list    – list Chaos Inbox items
+ *   • tco_inbox_assign  – assign inbox item to a trip
+ *   • tco_inbox_reject  – reject/discard an inbox item
+ *   • tco_parse_url     – fetch a URL and parse with Ollama
+ *   • tco_import_email  – import raw email text
+ *   (Requires TCO_API_URL env var; auth forwarded from CACHLY_JWT — same Keycloak realm)
+ *
  * Configuration (env vars):
  *   CACHLY_API_URL      – default https://api.cachly.dev
  *   CACHLY_JWT          – your JWT (Keycloak access token)
  *   CACHLY_EMBED_PROVIDER – embedding backend: openai (default), gemini, mistral, cohere, ollama, cachly (server fallback)
  *   CACHLY_EMBED_MODEL  – override embedding model (optional)
+ *   TCO_API_URL         – Travel Chaos Organizer backend URL (optional, enables tco_* tools)
  */
 import { Server } from '@modelcontextprotocol/sdk/server/index.js';
 import { StdioServerTransport } from '@modelcontextprotocol/sdk/server/stdio.js';
 import { StreamableHTTPServerTransport } from '@modelcontextprotocol/sdk/server/streamableHttp.js';
 import { CallToolRequestSchema, ErrorCode, ListToolsRequestSchema, McpError, } from '@modelcontextprotocol/sdk/types.js';
 import { Redis } from 'ioredis';
-import { AsyncLocalStorage } from 'node:async_hooks';
 // ── Config ────────────────────────────────────────────────────────────────────
 const API_URL = process.env.CACHLY_API_URL ?? 'https://api.cachly.dev';
 let JWT = process.env.CACHLY_JWT ?? '';
 const EMBED_MODEL = process.env.CACHLY_EMBED_MODEL ?? '';
-const CURRENT_VERSION = '0.10.47';
-const reqCtx = new AsyncLocalStorage();
-function getJWT() { return reqCtx.getStore()?.jwt || JWT; }
-function getDefaultInstanceId() { return reqCtx.getStore()?.instanceId || _defaultInstanceId; }
+const CURRENT_VERSION = '0.10.49';
+// Max time to wait for a freshly-provisioned instance to become "running" before
+// giving up. Free-tier provisioning in high-latency regions can take 45–90s, so the
+// old hard-coded 25s caused spurious "instance_not_reachable" on first run.
+// Override via CACHLY_PROVISION_TIMEOUT_MS.
+const PROVISION_TIMEOUT_MS = Number(process.env.CACHLY_PROVISION_TIMEOUT_MS ?? 90_000);
 // ── Default Instance Resolution (for Smithery & single-credential setups) ────
 // When CACHLY_BRAIN_INSTANCE_ID is set, tools can omit the instance_id parameter.
 // When neither is set, we auto-fetch the first running instance once per process.
@@ -61,13 +77,9 @@ let _defaultInstanceId = process.env.CACHLY_BRAIN_INSTANCE_ID ?? '';
 // Timestamp of last failed fetch — retries after 30 s (not permanently blocked).
 let _defaultInstanceLastAttempt = 0;
 async function resolveDefaultInstanceId() {
-    // In an HTTP request scope the instance ID is fixed by the caller's header.
-    const scopedId = reqCtx.getStore()?.instanceId;
-    if (scopedId)
-        return scopedId;
     if (_defaultInstanceId)
         return _defaultInstanceId;
-    if (!getJWT())
+    if (!JWT)
         return '';
     // Cooldown: don't hammer the API on every tool call after a transient failure.
     const now = Date.now();
@@ -76,7 +88,7 @@ async function resolveDefaultInstanceId() {
     _defaultInstanceLastAttempt = now;
     try {
         const res = await fetch(`${API_URL}/api/v1/instances`, {
-            headers: { Authorization: `Bearer ${getJWT()}`, Accept: 'application/json' },
+            headers: { Authorization: `Bearer ${JWT}`, Accept: 'application/json' },
             signal: AbortSignal.timeout(5000),
         });
         if (!res.ok)
@@ -155,6 +167,42 @@ async function pollDeviceFlow(flow) {
             setEmbedJwt(apiKey); // keep embeddings.ts in sync
             _deviceFlow = null;
             sendFunnelEvent('device_flow_completed');
+            // Persist the API key to ~/.claude/mcp.json so subsequent MCP server restarts
+            // keep the token. Without this, JWT is lost on restart and brain_recall_count
+            // is never incremented (telemetry has no api_key → no tenant resolution).
+            void (async () => {
+                try {
+                    const { writeFile, mkdir, readFile } = await import('node:fs/promises');
+                    const { existsSync } = await import('node:fs');
+                    const { resolve, dirname } = await import('node:path');
+                    const home = process.env.HOME ?? process.env.USERPROFILE ?? '';
+                    if (!home)
+                        return;
+                    const configPath = resolve(home, '.claude', 'mcp.json');
+                    let cfg = {};
+                    if (existsSync(configPath)) {
+                        try {
+                            cfg = JSON.parse(await readFile(configPath, 'utf-8'));
+                        }
+                        catch { /* corrupt — start fresh */ }
+                    }
+                    cfg.mcpServers ??= {};
+                    const existing = cfg.mcpServers['cachly'];
+                    if (existing) {
+                        existing.env ??= {};
+                        existing.env['CACHLY_JWT'] = apiKey;
+                    }
+                    else {
+                        cfg.mcpServers['cachly'] = {
+                            command: 'npx', args: ['-y', '@cachly-dev/mcp-server@latest'],
+                            env: { CACHLY_JWT: apiKey },
+                        };
+                    }
+                    await mkdir(dirname(configPath), { recursive: true });
+                    await writeFile(configPath, JSON.stringify(cfg, null, 2), 'utf-8');
+                }
+                catch { /* non-critical — don't break the flow on filesystem errors */ }
+            })();
             // Auto-provision: find or create the user's brain instance.
             _defaultInstanceLastAttempt = 0;
             await resolveDefaultInstanceId();
@@ -162,7 +210,7 @@ async function pollDeviceFlow(flow) {
                 try {
                     const autoRes = await fetch(`${API_URL}/api/v1/instances/auto`, {
                         method: 'POST',
-                        headers: { Authorization: `Bearer ${getJWT()}`, 'Content-Type': 'application/json' },
+                        headers: { Authorization: `Bearer ${JWT}`, 'Content-Type': 'application/json' },
                         signal: AbortSignal.timeout(12000),
                     });
                     if (autoRes.ok) {
@@ -175,7 +223,7 @@ async function pollDeviceFlow(flow) {
                         // Log so telemetry can detect free-tier auto-provision failures
                         void fetch(`${API_URL}/api/v1/telemetry/mcp`, {
                             method: 'POST',
-                            headers: { 'Content-Type': 'application/json', Authorization: `Bearer ${getJWT()}` },
+                            headers: { 'Content-Type': 'application/json', Authorization: `Bearer ${JWT}` },
                             body: JSON.stringify({ event: 'auto_provision_failed', status: autoRes.status, version: CURRENT_VERSION }),
                             signal: AbortSignal.timeout(3000),
                         }).catch(() => { });
@@ -188,7 +236,7 @@ async function pollDeviceFlow(flow) {
             if (_defaultInstanceId) {
                 try {
                     const checkRes = await fetch(`${API_URL}/api/v1/instances/${_defaultInstanceId}`, {
-                        headers: { Authorization: `Bearer ${getJWT()}`, Accept: 'application/json' },
+                        headers: { Authorization: `Bearer ${JWT}`, Accept: 'application/json' },
                         signal: AbortSignal.timeout(4000),
                     });
                     if (checkRes.ok) {
@@ -199,7 +247,7 @@ async function pollDeviceFlow(flow) {
                             while (checkInst.status === 'provisioning' && Date.now() < pDeadline) {
                                 await new Promise(r => setTimeout(r, 3000));
                                 const rr = await fetch(`${API_URL}/api/v1/instances/${_defaultInstanceId}`, {
-                                    headers: { Authorization: `Bearer ${getJWT()}`, Accept: 'application/json' },
+                                    headers: { Authorization: `Bearer ${JWT}`, Accept: 'application/json' },
                                     signal: AbortSignal.timeout(4000),
                                 }).catch(() => null);
                                 if (rr?.ok) {
@@ -215,6 +263,37 @@ async function pollDeviceFlow(flow) {
                 }
                 catch { /* non-fatal — getConnection will handle the wait if still provisioning */ }
             }
+            // Persist instance_id to ~/.claude/mcp.json after it's known.
+            // Without this, every restart loses CACHLY_BRAIN_INSTANCE_ID → resolveDefaultInstanceId
+            // makes an extra API call on every startup (with 30s cooldown on failure).
+            if (_defaultInstanceId) {
+                void (async () => {
+                    try {
+                        const { writeFile, readFile } = await import('node:fs/promises');
+                        const { existsSync } = await import('node:fs');
+                        const { resolve } = await import('node:path');
+                        const home = process.env.HOME ?? process.env.USERPROFILE ?? '';
+                        if (!home)
+                            return;
+                        const configPath = resolve(home, '.claude', 'mcp.json');
+                        if (!existsSync(configPath))
+                            return;
+                        let cfg = {};
+                        try {
+                            cfg = JSON.parse(await readFile(configPath, 'utf-8'));
+                        }
+                        catch {
+                            return;
+                        }
+                        const entry = cfg.mcpServers?.['cachly'];
+                        if (entry?.env) {
+                            entry.env['CACHLY_BRAIN_INSTANCE_ID'] = _defaultInstanceId;
+                            await writeFile(configPath, JSON.stringify(cfg, null, 2), 'utf-8');
+                        }
+                    }
+                    catch { /* non-critical */ }
+                })();
+            }
             return 'done';
         }
         if (data.error === 'slow_down')
@@ -241,25 +320,14 @@ async function getConnection(instance_id) {
             '• Pass instance_id explicitly to the tool, or\n' +
             '• Run `list_instances` to see your available instances.');
     }
-    if (pool.has(instance_id)) {
-        const cached = pool.get(instance_id);
-        // Verify the pooled connection is still alive before reusing it.
-        // ioredis 'error' eviction is async — a connection can be in the pool
-        // but already internally broken (status 'reconnecting' or 'end').
-        const status = cached.status;
-        if (status === 'ready' || status === 'connect') {
-            return cached;
-        }
-        // Stale — evict and fall through to reconnect.
-        pool.delete(instance_id);
-        cached.disconnect();
-    }
-    // Fetch instance, waiting up to 25 s if it is still provisioning.
+    if (pool.has(instance_id))
+        return pool.get(instance_id);
+    // Fetch instance, waiting up to PROVISION_TIMEOUT_MS if it is still provisioning.
     // This covers the zero-friction path: device-flow auth → auto-provision → first tool call
     // all happen in quick succession and the instance isn't running yet.
     let inst = await apiFetch(`/api/v1/instances/${instance_id}`);
     if (inst.status === 'provisioning') {
-        const deadline = Date.now() + 25_000;
+        const deadline = Date.now() + PROVISION_TIMEOUT_MS;
         while (inst.status === 'provisioning' && Date.now() < deadline) {
             await new Promise(r => setTimeout(r, 3000));
             inst = await apiFetch(`/api/v1/instances/${instance_id}`);
@@ -269,7 +337,7 @@ async function getConnection(instance_id) {
         // Telemetry: unreachable instance so the team can proactively investigate
         void fetch(`${API_URL}/api/v1/telemetry/mcp`, {
             method: 'POST',
-            headers: { 'Content-Type': 'application/json', ...(getJWT() ? { Authorization: `Bearer ${getJWT()}` } : {}) },
+            headers: { 'Content-Type': 'application/json', ...(JWT ? { Authorization: `Bearer ${JWT}` } : {}) },
             body: JSON.stringify({ event: 'instance_not_reachable', instance_id, status: inst.status, version: CURRENT_VERSION }),
             signal: AbortSignal.timeout(3000),
         }).catch(() => { });
@@ -321,6 +389,7 @@ async function getConnection(instance_id) {
         host: inst.host,
         port: inst.port,
         password: password || undefined,
+        commandTimeout: 8000,
         ...(tlsEnabled ? { tls: {} } : {}),
         lazyConnect: true,
         enableReadyCheck: true,
@@ -330,45 +399,15 @@ async function getConnection(instance_id) {
     const evict = () => pool.delete(instance_id);
     client.on('error', evict);
     client.on('end', evict);
-    // Retry up to 3 times with 2s backoff. Covers the window between K8s PodReady
-    // and Valkey actually accepting connections (RDB/AOF load, ~1-3s on cold start).
-    let connectErr;
-    for (let attempt = 0; attempt < 3; attempt++) {
-        try {
-            if (attempt > 0) {
-                await new Promise(r => setTimeout(r, 2000 * attempt));
-                // Fresh client on retry — ioredis doesn't allow reconnect after explicit disconnect.
-                client.disconnect();
-                const retryClient = new Redis({
-                    host: inst.host,
-                    port: inst.port,
-                    password: password || undefined,
-                    ...(tlsEnabled ? { tls: {} } : {}),
-                    lazyConnect: true,
-                    enableReadyCheck: true,
-                    connectTimeout: 8000,
-                    retryStrategy: () => null,
-                });
-                retryClient.on('error', () => pool.delete(instance_id));
-                retryClient.on('end', () => pool.delete(instance_id));
-                await retryClient.connect();
-                pool.set(instance_id, retryClient);
-                return retryClient;
-            }
-            await client.connect();
-            connectErr = undefined;
-            break;
-        }
-        catch (err) {
-            connectErr = err;
-        }
+    try {
+        await client.connect();
     }
-    if (connectErr) {
+    catch (err) {
         client.disconnect();
-        const msg = connectErr instanceof Error ? connectErr.message : String(connectErr);
+        const msg = err instanceof Error ? err.message : String(err);
         void fetch(`${API_URL}/api/v1/telemetry/mcp`, {
             method: 'POST',
-            headers: { 'Content-Type': 'application/json', ...(getJWT() ? { Authorization: `Bearer ${getJWT()}` } : {}) },
+            headers: { 'Content-Type': 'application/json', ...(JWT ? { Authorization: `Bearer ${JWT}` } : {}) },
             body: JSON.stringify({ event: 'redis_connect_failed', instance_id, host: inst.host, port: inst.port, error: msg, version: CURRENT_VERSION }),
             signal: AbortSignal.timeout(3000),
         }).catch(() => { });
@@ -382,14 +421,14 @@ async function getConnection(instance_id) {
 }
 // ── API helper ────────────────────────────────────────────────────────────────
 async function apiFetch(path, options = {}) {
-    checkJwt(getJWT());
+    checkJwt(JWT);
     const timeoutMs = Number(process.env.CACHLY_API_TIMEOUT_MS ?? 15_000);
     const res = await fetch(`${API_URL}${path}`, {
         ...options,
         signal: AbortSignal.timeout(timeoutMs),
         headers: {
             'Content-Type': 'application/json',
-            Authorization: `Bearer ${getJWT()}`,
+            Authorization: `Bearer ${JWT}`,
             ...options.headers,
         },
     });
@@ -410,7 +449,7 @@ import { handleTeamTool } from './handlers/team.js';
 import { handleRoadmapTool } from './handlers/roadmap.js';
 import { handleAdvancedTool } from './handlers/advanced.js';
 import { handleSyndicateTool } from './handlers/syndicate.js';
-import { handleFedbrainTool } from './handlers/fedbrain.js';
+import { handleFedbrainTool, _lastBrainFromGitCounts } from './handlers/fedbrain.js';
 // ── Tools (imported from tools.ts) ─────────────────────────────────────────
 import { TOOLS } from './tools.js';
 // ── Handlers ──────────────────────────────────────────────────────────────────
@@ -433,7 +472,7 @@ function sendFunnelEvent(event, extra) {
         headers: { 'Content-Type': 'application/json' },
         body: JSON.stringify({
             event, version: CURRENT_VERSION, editor: detectEditor(),
-            ...(getJWT() ? { jwt: getJWT() } : {}),
+            ...(JWT ? { jwt: JWT } : {}),
             ...extra,
         }),
         signal: AbortSignal.timeout(3000),
@@ -457,7 +496,7 @@ async function sendAnonymousTelemetry(toolName) {
 }
 async function handleTool(name, args) {
     // Guard: if no JWT, return actionable onboarding message instead of HTTP 401
-    if (!getJWT()) {
+    if (!JWT) {
         void sendAnonymousTelemetry(name);
         // ── Zero-credential device flow ─────────────────────────────────────
         // 1st call: start device flow, return code + URL
@@ -534,14 +573,14 @@ async function handleTool(name, args) {
     // Delegate brain tools (learn, recall, session, etc.)
     const brainResult = await handleBrainTool(name, args, getConnection, apiFetch);
     if (brainResult !== null) {
-        if (!_firstCallSuccessSent && getJWT()) {
+        if (!_firstCallSuccessSent && JWT) {
             _firstCallSuccessSent = true;
-            sendFunnelEvent('first_call_success', { tool: name, instance_id: args.instance_id ?? getDefaultInstanceId() ?? '' });
+            sendFunnelEvent('first_call_success', { tool: name, instance_id: args.instance_id ?? _defaultInstanceId ?? '' });
         }
         // Per-tool telemetry — fires after every successful brain tool call.
         // api_key carries the cky_live_... token so the backend can resolve tenant + increment counters.
-        const instanceId = args.instance_id ?? getDefaultInstanceId() ?? '';
-        const telemetryExtra = getJWT() ? { api_key: getJWT(), instance_id: instanceId } : { instance_id: instanceId };
+        const instanceId = args.instance_id ?? _defaultInstanceId ?? '';
+        const telemetryExtra = JWT ? { api_key: JWT, instance_id: instanceId } : { instance_id: instanceId };
         if (name === 'recall_best_solution') {
             // recall_best_solution → increments BrainRecallCount + triggers level-up logic
             sendFunnelEvent('recall_best_solution', telemetryExtra);
@@ -569,17 +608,14 @@ async function handleTool(name, args) {
                         limit: 50,
                     }, getConnection, apiFetch);
                     if (gitBootstrap !== null) {
-                        sendFunnelEvent('brain_from_git', telemetryExtra);
+                        const gitCounts = _lastBrainFromGitCounts;
+                        sendFunnelEvent('brain_from_git', { ...telemetryExtra, ...(gitCounts ?? {}) });
                         sendFunnelEvent('recall_best_solution', telemetryExtra);
                         // Append bootstrap summary to the session_start briefing.
-                        const bootstrapText = typeof gitBootstrap === 'object' && gitBootstrap !== null && 'content' in gitBootstrap
-                            ? gitBootstrap.content.map((c) => c.text ?? '').join('\n')
-                            : String(gitBootstrap);
-                        if (typeof brainResult === 'object' && brainResult !== null && 'content' in brainResult) {
-                            brainResult.content.push({
-                                type: 'text',
-                                text: '\n---\n' + bootstrapText,
-                            });
+                        // brainResult is always a string here (handleBrainTool returns string for session_start).
+                        const bootstrapText = String(gitBootstrap);
+                        if (bootstrapText) {
+                            return String(brainResult) + '\n---\n' + bootstrapText;
                         }
                     }
                 }
@@ -597,7 +633,7 @@ async function handleTool(name, args) {
             const srText = typeof brainResult === 'object' && brainResult !== null && 'content' in brainResult
                 ? JSON.stringify(brainResult)
                 : String(brainResult ?? '');
-            if (srText.length > 50 && !srText.includes('No lessons found') && !srText.includes('no lessons')) {
+            if (srText.length > 50 && !srText.includes('No lessons found') && !srText.includes('no lessons') && !srText.includes('No matches found')) {
                 sendFunnelEvent('recall_best_solution', telemetryExtra);
             }
         }
@@ -606,9 +642,9 @@ async function handleTool(name, args) {
     // Delegate context tools (remember/recall/list/forget)
     const contextResult = await handleContextTool(name, args, getConnection, apiFetch);
     if (contextResult !== null) {
-        if (!_firstCallSuccessSent && getJWT()) {
+        if (!_firstCallSuccessSent && JWT) {
             _firstCallSuccessSent = true;
-            sendFunnelEvent('first_call_success', { tool: name, instance_id: args.instance_id ?? getDefaultInstanceId() ?? '' });
+            sendFunnelEvent('first_call_success', { tool: name, instance_id: args.instance_id ?? _defaultInstanceId ?? '' });
         }
         return contextResult;
     }
@@ -633,8 +669,8 @@ async function handleTool(name, args) {
     if (syndicateResult !== null) {
         // brain_predict is in syndicate handler — track telemetry here.
         if (name === 'brain_predict') {
-            const instanceId = args.instance_id ?? getDefaultInstanceId() ?? '';
-            const telemetryExtra = getJWT() ? { api_key: getJWT(), instance_id: instanceId } : { instance_id: instanceId };
+            const instanceId = args.instance_id ?? _defaultInstanceId ?? '';
+            const telemetryExtra = JWT ? { api_key: JWT, instance_id: instanceId } : { instance_id: instanceId };
             sendFunnelEvent('brain_predict', telemetryExtra);
         }
         return syndicateResult;
@@ -642,16 +678,21 @@ async function handleTool(name, args) {
     const fedbrainResult = await handleFedbrainTool(name, args, getConnection, apiFetch);
     if (fedbrainResult !== null) {
         // brain_from_git and brain_predict_failures are in fedbrain handler.
-        const instanceId = args.instance_id ?? getDefaultInstanceId() ?? '';
-        const telemetryExtra = getJWT() ? { api_key: getJWT(), instance_id: instanceId } : { instance_id: instanceId };
+        const instanceId = args.instance_id ?? _defaultInstanceId ?? '';
+        const telemetryExtra = JWT ? { api_key: JWT, instance_id: instanceId } : { instance_id: instanceId };
         if (name === 'brain_from_git') {
-            sendFunnelEvent('brain_from_git', telemetryExtra);
+            const gitCounts = _lastBrainFromGitCounts;
+            sendFunnelEvent('brain_from_git', { ...telemetryExtra, ...(gitCounts ?? {}) });
         }
         else if (name === 'brain_predict_failures') {
             sendFunnelEvent('brain_predict_failures', telemetryExtra);
         }
         return fedbrainResult;
     }
+    // Delegate Travel Chaos Organizer tools (requires TCO_API_URL env var)
+    const tcoResult = await handleTcoTool(name, args, JWT ?? '');
+    if (tcoResult !== null)
+        return tcoResult;
     switch (name) {
         // ── Instance management ──────────────────────────────────────────────
         case 'get_api_status': {
@@ -671,7 +712,7 @@ async function handleTool(name, args) {
                 healthStatus = `unreachable: ${e.message}`;
             }
             // Check JWT / auth
-            if (!getJWT()) {
+            if (!JWT) {
                 return [
                     `📡 **cachly API Status**`,
                     ``,
@@ -685,7 +726,7 @@ async function handleTool(name, args) {
             // Decode JWT claims (inspection only, no verification)
             let authInfo = '❌ invalid JWT format';
             try {
-                const parts = getJWT().split('.');
+                const parts = JWT.split('.');
                 if (parts.length === 3) {
                     const payload = JSON.parse(Buffer.from(parts[1], 'base64url').toString('utf-8'));
                     const sub = payload.sub ?? '(unknown)';
@@ -717,7 +758,7 @@ async function handleTool(name, args) {
                     const lines = ['\n\n🧠 **Brain Instances:**'];
                     for (const inst of instances) {
                         const badge = inst.status === 'running' ? '🟢' : inst.status === 'provisioning' ? '🟡' : '🔴';
-                        const defaultMark = inst.id === getDefaultInstanceId() ? ' ← active' : '';
+                        const defaultMark = inst.id === _defaultInstanceId ? ' ← active' : '';
                         lines.push(`  ${badge} **${inst.name}** (\`${inst.id}\`) · ${inst.status}${defaultMark}`);
                         if (inst.status === 'running' && inst.host) {
                             // Try a quick ping on the cached connection
@@ -861,7 +902,9 @@ server.setRequestHandler(CallToolRequestSchema, async (request) => {
     catch (err) {
         if (err instanceof McpError)
             throw err;
-        throw new McpError(ErrorCode.InternalError, err.message);
+        const msg = err.message ?? String(err);
+        notify('cachly', 'tool_error', { tool: name, error: msg }).catch(() => undefined);
+        throw new McpError(ErrorCode.InternalError, msg);
     }
 });
 // Graceful shutdown – close all Redis connections + auto-end brain session
@@ -2071,6 +2114,7 @@ if (process.argv[2] === 'setup') {
         const AUTH_BASE = 'https://auth.cachly.dev/realms/cachly/protocol/openid-connect';
         const CLIENT_ID = 'cachly-cli';
         console.log('Step 1: Sign in to cachly (free, no credit card)\n');
+        sendFunnelEvent('setup_auth_started');
         // Start device flow
         let deviceCode = '', userCode = '', verifyUri = '', pollInterval = 5000;
         try {
@@ -2096,6 +2140,7 @@ if (process.argv[2] === 'setup') {
                 rl.close();
                 process.exit(1);
             }
+            sendFunnelEvent('setup_auth_completed');
             console.log('');
             deviceCode = ''; // mark as fallback so we skip polling
         }
@@ -2128,6 +2173,7 @@ if (process.argv[2] === 'setup') {
                     if (tokenData.access_token) {
                         token = tokenData.access_token;
                         console.log(' \x1b[32m✓ Authorized!\x1b[0m\n');
+                        sendFunnelEvent('setup_auth_completed');
                         break;
                     }
                     // authorization_pending = keep polling; slow_down = increase interval
@@ -2221,9 +2267,10 @@ if (process.argv[2] === 'setup') {
                 // Newly created — poll until running or give up after 30 s.
                 const newId = autoBody.instance_id;
                 console.log(` ✓ created (${newId.slice(0, 8)}…)\n`);
+                // 45 attempts × 3s = 135s — generous for free-tier in slow regions.
                 process.stdout.write('⏳ Waiting for instance to start');
-                for (let attempt = 0; attempt < 15; attempt++) {
-                    await new Promise(r => setTimeout(r, 2000));
+                for (let attempt = 0; attempt < 45; attempt++) {
+                    await new Promise(r => setTimeout(r, 3000));
                     process.stdout.write('.');
                     try {
                         const checkRes = await fetch(`${API_URL}/api/v1/instances/${newId}`, { headers: { Authorization: `Bearer ${token}` } });
@@ -2262,6 +2309,7 @@ if (process.argv[2] === 'setup') {
         console.log(`   (Run with --instance-id <id> to use a different one)\n`);
     }
     console.log(`✓  Instance: ${instance.name} (${instance.id.slice(0, 8)}…)\n`);
+    sendFunnelEvent('setup_instance_ready', { instance_id: instance.id });
     // ── Step 3: Detect editors ────────────────────────────────────────────────
     const cwd = process.cwd();
     const detected = [];
@@ -2510,7 +2558,7 @@ if (process.argv[2] === 'index') {
     const instanceId = flag('instance-id') ?? process.env.CACHLY_BRAIN_INSTANCE_ID;
     const maxFiles = parseInt(flag('max-files') ?? '500', 10);
     const namespace = flag('namespace') ?? 'cachly:sem:code';
-    if (!instanceId || !getJWT()) {
+    if (!instanceId || !JWT) {
         console.error('\n❌  CACHLY_BRAIN_INSTANCE_ID and CACHLY_JWT must be set\n');
         console.error('   export CACHLY_BRAIN_INSTANCE_ID=<uuid>');
         console.error('   export CACHLY_JWT=<cky_live_...>');
@@ -2547,7 +2595,7 @@ if (process.argv[2] === 'learn-git') {
     const repoDir = resolve(flag('dir') ?? argv.find(a => !a.startsWith('--')) ?? '.');
     const instanceId = flag('instance-id') ?? process.env.CACHLY_BRAIN_INSTANCE_ID;
     const maxCommits = parseInt(flag('max-commits') ?? '50', 10);
-    if (!instanceId || !getJWT()) {
+    if (!instanceId || !JWT) {
         console.error('\n❌  CACHLY_BRAIN_INSTANCE_ID and CACHLY_JWT must be set\n');
         console.error('   export CACHLY_BRAIN_INSTANCE_ID=<uuid>');
         console.error('   export CACHLY_JWT=<cky_live_...>');
@@ -2579,8 +2627,7 @@ if (process.argv[2] === 'learn-git') {
 // actionable message in their editor's MCP log instead of silent failures.
 // Skip for CLI commands that intentionally run without credentials.
 const _cliNoAuthCommands = ['demo', 'share', 'health', 'setup', 'init', 'digest', 'invite', 'badge', 'join', 'upgrade'];
-// In multi-tenant HTTP mode (PORT set) we never need a startup JWT — per-request auth.
-if (!JWT && !process.env.PORT && !_cliNoAuthCommands.includes(process.argv[2] ?? '') && !(!process.argv[2] && process.stdout.isTTY)) {
+if (!JWT && !_cliNoAuthCommands.includes(process.argv[2] ?? '') && !(!process.argv[2] && process.stdout.isTTY)) {
     // No args + no JWT in a non-TTY context = running as MCP server without credentials.
     // Print actionable setup banner to stdout so it's captured by callers/tests.
     const banner = '\n' +
@@ -2644,79 +2691,12 @@ if (!process.env.CACHLY_NO_UPDATE_CHECK) {
     })();
 }
 const httpPort = process.env.PORT ? parseInt(process.env.PORT, 10) : undefined;
-// ── Per-request MCP Server factory (HTTP / Smithery stateless mode) ──────────
-// SDK ≥1.9 forbids reusing a stateless transport across requests.
-// Solution: create a fresh Server+Transport per /mcp request.
-// The module-level `server` below is used for stdio mode only.
-function createHttpMcpServer() {
-    const srv = new Server({ name: 'cachly-mcp', version: CURRENT_VERSION }, { capabilities: { tools: {} } });
-    srv.setRequestHandler(ListToolsRequestSchema, async () => ({ tools: TOOLS }));
-    srv.setRequestHandler(CallToolRequestSchema, async (request) => {
-        const { name, arguments: args } = request.params;
-        try {
-            const text = await handleTool(name, (args ?? {}));
-            return { content: [{ type: 'text', text }] };
-        }
-        catch (err) {
-            if (err instanceof McpError)
-                throw err;
-            throw new McpError(ErrorCode.InternalError, err.message);
-        }
-    });
-    return srv;
-}
 if (httpPort) {
     // ── HTTP mode (Streamable HTTP transport) ───────────────────────────────
     // Used for Smithery URL deployment: PORT=3000 node dist/index.js
-    // Multi-tenant: per-request JWT + instance ID resolved via:
-    //   1. Authorization: Bearer <jwt>  +  X-Cachly-Instance-Id: <uuid>
-    //   2. Smithery config: ?config=base64url({CACHLY_JWT, CACHLY_BRAIN_INSTANCE_ID, ...})
-    // Falls back to module-level env-derived values when neither is provided.
     const { createServer } = await import('node:http');
-    function extractReqCtx(req, url) {
-        let jwtVal = '';
-        let instId = '';
-        const auth = req.headers['authorization'];
-        if (typeof auth === 'string' && auth.trim()) {
-            const a = auth.trim();
-            jwtVal = a.toLowerCase().startsWith('bearer ') ? a.slice(7).trim() : a;
-        }
-        // Fallback: raw JWT in custom header (Smithery "header" transport without Bearer prefix)
-        if (!jwtVal) {
-            const rawJwt = req.headers['cachly_jwt'] ?? req.headers['cachly-jwt'] ?? req.headers['x-cachly-jwt'] ?? req.headers['x-api-key'];
-            if (typeof rawJwt === 'string')
-                jwtVal = rawJwt.trim();
-        }
-        const hdrInst = req.headers['x-cachly-instance-id'];
-        if (typeof hdrInst === 'string')
-            instId = hdrInst.trim();
-        // Smithery passes user config as a base64url-encoded JSON blob in ?config=
-        const cfgParam = url.searchParams.get('config');
-        if (cfgParam && (!jwtVal || !instId)) {
-            try {
-                const b64 = cfgParam.replace(/-/g, '+').replace(/_/g, '/');
-                const padded = b64 + '='.repeat((4 - b64.length % 4) % 4);
-                const json = JSON.parse(Buffer.from(padded, 'base64').toString('utf8'));
-                if (!jwtVal && typeof json.CACHLY_JWT === 'string')
-                    jwtVal = json.CACHLY_JWT;
-                if (!instId && typeof json.CACHLY_BRAIN_INSTANCE_ID === 'string')
-                    instId = json.CACHLY_BRAIN_INSTANCE_ID;
-            }
-            catch { /* malformed config — ignore, fall back to globals */ }
-        }
-        // Direct query params (Smithery "query" transport, manual clients, etc.)
-        if (!jwtVal) {
-            const q = url.searchParams.get('CACHLY_JWT') ?? url.searchParams.get('cachly_jwt') ?? url.searchParams.get('api_key');
-            if (q)
-                jwtVal = q.trim();
-        }
-        if (!instId) {
-            const q = url.searchParams.get('CACHLY_BRAIN_INSTANCE_ID') ?? url.searchParams.get('cachly_brain_instance_id') ?? url.searchParams.get('instance_id');
-            if (q)
-                instId = q.trim();
-        }
-        return { jwt: jwtVal, instanceId: instId };
-    }
+    const transport = new StreamableHTTPServerTransport({ sessionIdGenerator: undefined });
+    await server.connect(transport);
     const httpServer = createServer((req, res) => {
         const url = new URL(req.url ?? '/', `http://localhost:${httpPort}`);
         if (url.pathname === '/health') {
@@ -2724,8 +2704,6 @@ if (httpPort) {
             res.end(JSON.stringify({
                 status: 'ok',
                 version: CURRENT_VERSION,
-                transport: 'streamable-http',
-                multiTenant: true,
                 zeroResults: {
                     total: zeroResultsTotal,
                     last10: ZERO_RESULTS_LOG.slice(-10).map(e => ({ query: e.query, ts: new Date(e.ts).toISOString() })),
@@ -2733,52 +2711,8 @@ if (httpPort) {
             }));
             return;
         }
-        // Static server card — lets Smithery skip live scanning (avoids auth complexity).
-        if (url.pathname === '/.well-known/mcp/server-card.json') {
-            const card = {
-                name: 'cachly AI Brain',
-                version: CURRENT_VERSION,
-                description: 'Persistent AI memory for Claude Code, Cursor, Copilot, Windsurf & friends. Remembers every lesson, fix, and architecture decision forever.',
-                transport: { type: 'streamable-http', url: 'https://mcp.cachly.dev/mcp' },
-                capabilities: { tools: {} },
-            };
-            res.writeHead(200, { 'Content-Type': 'application/json', 'Access-Control-Allow-Origin': '*' });
-            res.end(JSON.stringify(card));
-            return;
-        }
         if (url.pathname === '/mcp' || url.pathname === '/') {
-            // Handle CORS preflight
-            if (req.method === 'OPTIONS') {
-                res.writeHead(204, {
-                    'Access-Control-Allow-Origin': '*',
-                    'Access-Control-Allow-Methods': 'GET, POST, DELETE, OPTIONS',
-                    'Access-Control-Allow-Headers': 'Authorization, Content-Type, Mcp-Session-Id, X-Cachly-Instance-Id, cachly_jwt, cachly-jwt, x-cachly-jwt, x-api-key',
-                });
-                res.end();
-                return;
-            }
-            const ctx = extractReqCtx(req, url);
-            // Create a fresh Server+Transport for each request (stateless multi-tenant mode).
-            // SDK ≥1.9 throws if a stateless transport is reused across requests.
-            const reqServer = createHttpMcpServer();
-            const reqTransport = new StreamableHTTPServerTransport({ sessionIdGenerator: undefined });
-            reqServer.connect(reqTransport).then(() => {
-                reqCtx.run(ctx, () => {
-                    reqTransport.handleRequest(req, res).catch((err) => {
-                        process.stderr.write(`cachly-mcp HTTP handler error: ${err.message}\n`);
-                        if (!res.headersSent) {
-                            res.writeHead(500, { 'Content-Type': 'application/json' });
-                            res.end(JSON.stringify({ error: 'internal_error' }));
-                        }
-                    });
-                });
-            }).catch((err) => {
-                process.stderr.write(`cachly-mcp connect error: ${err.message}\n`);
-                if (!res.headersSent) {
-                    res.writeHead(500, { 'Content-Type': 'application/json' });
-                    res.end(JSON.stringify({ error: 'internal_error' }));
-                }
-            });
+            transport.handleRequest(req, res);
             return;
         }
         res.writeHead(404);
@@ -2793,4 +2727,5 @@ else {
     const transport = new StdioServerTransport();
     await server.connect(transport);
 }
+notify('cachly', 'startup', { version: CURRENT_VERSION, mode: process.env.MCP_HTTP_PORT ? 'http' : 'stdio' }).catch(() => undefined);
 //# sourceMappingURL=index.js.map