@cachly-dev/mcp-server 0.9.13 → 0.9.14

package/dist/index.js

@@ -9091,6 +9091,7 @@ server.setRequestHandler(ListToolsRequestSchema, async () => ({ tools: TOOLS }))
 // session_start/session_end manually.
 let _autoSessionInstanceId = null;
 let _autoSessionStarted = false;
+let _autoSessionStarting = null; // guard against double-start race
 let _autoSessionToolCount = 0;
 // ── brain_from_git concurrency limiter ────────────────────────────────────────
 // Spawning many `git log` subprocesses in parallel can fork-bomb the host.
@@ -9117,12 +9118,21 @@ function _gitSemRelease() {
 async function autoStartSession(instanceId) {
     if (_autoSessionStarted)
         return;
-    _autoSessionStarted = true;
-    _autoSessionInstanceId = instanceId;
-    try {
-        await handleTool('session_start', { instance_id: instanceId, focus: 'auto (MCP session)' });
+    // If another call already started the session, await it instead of double-starting.
+    if (_autoSessionStarting) {
+        await _autoSessionStarting;
+        return;
     }
-    catch { /* non-fatal — session tracking is a best-effort feature */ }
+    _autoSessionStarting = (async () => {
+        _autoSessionStarted = true;
+        _autoSessionInstanceId = instanceId;
+        try {
+            await handleTool('session_start', { instance_id: instanceId, focus: 'auto (MCP session)' });
+        }
+        catch { /* non-fatal — session tracking is a best-effort feature */ }
+        _autoSessionStarting = null;
+    })();
+    await _autoSessionStarting;
     // Auto-index the project if it hasn't been indexed in the last 24h.
     // This is the main lever for growing token savings: more indexed code →
     // more semantic cache hits → fewer LLM calls for repeated questions.
@@ -9167,12 +9177,16 @@ server.setRequestHandler(CallToolRequestSchema, async (request) => {
     // Auto-start brain session on first tool call that has an instance_id.
     // Skip session management tools to avoid recursion.
     const sessionTools = new Set(['session_start', 'session_end', 'auto_learn_session']);
-    if (!sessionTools.has(name) && !_autoSessionStarted) {
+    if (!sessionTools.has(name) && !_autoSessionStarted && !_autoSessionStarting) {
         const instanceId = args?.instance_id;
         if (instanceId) {
             await autoStartSession(instanceId).catch(() => undefined);
         }
     }
+    else if (_autoSessionStarting) {
+        // Another concurrent call is mid-start — wait for it before proceeding.
+        await _autoSessionStarting.catch(() => undefined);
+    }
     if (!sessionTools.has(name))
         _autoSessionToolCount++;
     try {