clay-server 2.23.1-beta.1 → 2.23.1

package/lib/project-debate.js

@@ -358,18 +358,20 @@ function attachDebate(ctx) {
         console.log("[debate] Restoring debate (preparing). topic:", debate.topic, "briefPath:", briefPath);
         startDebateBriefWatcher(session, debate, briefPath);
 
-        // Send preparing sticky to the connected client
-        ctx.sendTo(ws, {
-          type: "debate_preparing",
-          topic: debate.topic,
-          moderatorId: debate.moderatorId,
-          moderatorName: moderatorProfile.name,
-          setupSessionId: debate.setupSessionId,
-          panelists: debate.panelists.map(function (p) {
-            var prof = ctx.getMateProfile(mateCtx, p.mateId);
-            return { mateId: p.mateId, name: prof.name };
-          }),
-        });
+        // Only show preparing indicator for quick start (standard setup shows skill in real-time)
+        if (debate.quickStart) {
+          ctx.sendTo(ws, {
+            type: "debate_preparing",
+            topic: debate.topic,
+            moderatorId: debate.moderatorId,
+            moderatorName: moderatorProfile.name,
+            setupSessionId: debate.setupSessionId,
+            panelists: debate.panelists.map(function (p) {
+              var prof = ctx.getMateProfile(mateCtx, p.mateId);
+              return { mateId: p.mateId, name: prof.name };
+            }),
+          });
+        }
       } else if (phase === "reviewing") {
         console.log("[debate] Restoring debate (reviewing). topic:", debate.topic);
         ctx.sendTo(ws, {
@@ -559,6 +561,7 @@ function attachDebate(ctx) {
 
   // Quick start: moderator mate uses DM conversation context to generate the debate brief directly
   function handleDebateQuickStart(ws, session, debate, msg, mateCtx, moderatorProfile, briefPath) {
+    debate.quickStart = true;
     var debateId = debate.debateId;
 
     // Create setup session (still needed for session grouping)
@@ -720,23 +723,8 @@ function attachDebate(ctx) {
     // Watch for brief.json in the debate-specific directory
     startDebateBriefWatcher(session, debate, briefPath);
 
-    // Notify clients that we are in preparing phase (send to both original and setup session)
-    var preparingMsg = {
-      type: "debate_preparing",
-      topic: debate.topic,
-      moderatorId: debate.moderatorId,
-      moderatorName: moderatorProfile.name,
-      setupSessionId: setupSession.localId,
-      panelists: debate.panelists.map(function (p) {
-        var prof = ctx.getMateProfile(mateCtx, p.mateId);
-        return { mateId: p.mateId, name: prof.name };
-      }),
-    };
-    // Send directly to the requesting ws (session switch may not have propagated yet)
-    ctx.sendTo(ws, preparingMsg);
-    // Also broadcast to any other clients on either session
-    ctx.sendToSession(session.localId, preparingMsg);
-    ctx.sendToSession(setupSession.localId, preparingMsg);
+    // Standard setup: no preparing indicator needed because the user
+    // sees the skill working in real-time in the setup session.
 
     // Start the setup skill session
     setupSession.history.push({ type: "user_message", text: craftingPrompt });

package/lib/project.js

@@ -3786,7 +3786,8 @@ function createProjectContext(opts) {
       onProcessingChanged();
       session.sentToolResults = {};
       sendToSession(session.localId, { type: "status", status: "processing" });
-      if (!session.queryInstance && !session.worker) {
+      if (!session.queryInstance && (!session.worker || session.messageQueue !== "worker")) {
+        // No active query (or worker idle between queries): start a new query
         sdk.startQuery(session, fullText, msg.images, getLinuxUserForSession(session));
       } else {
         sdk.pushMessage(session, fullText, msg.images);
@@ -5505,6 +5506,10 @@ function createProjectContext(opts) {
       if (session.messageQueue) {
         try { session.messageQueue.end(); } catch (e) {}
       }
+      if (session.worker) {
+        try { session.worker.kill(); } catch (e) {}
+        session.worker = null;
+      }
       // Close all mention SDK sessions to prevent zombie processes
       if (session._mentionSessions) {
         var mateIds = Object.keys(session._mentionSessions);

package/lib/public/app.js

@@ -31,7 +31,7 @@ import { initMateWizard, openMateWizard, closeMateWizard, handleMateCreated } fr
 import { initCommandPalette, handlePaletteSessionSwitch, setPaletteVersion } from './modules/command-palette.js';
 import { initLongPress } from './modules/longpress.js';
 import { initMention, handleMentionStart, handleMentionStream, handleMentionDone, handleMentionError, handleMentionActivity, renderMentionUser, renderMentionResponse } from './modules/mention.js';
-import { initDebate, handleDebatePreparing, handleDebateStarted, handleDebateResumed, handleDebateTurn, handleDebateActivity, handleDebateStream, handleDebateTurnDone, handleDebateCommentQueued, handleDebateCommentInjected, handleDebateEnded, handleDebateError, renderDebateStarted, renderDebateTurnDone, renderDebateEnded, renderDebateCommentInjected, renderDebateUserResume, openDebateModal, closeDebateModal, openQuickDebateModal, handleDebateBriefReady, renderDebateBriefReady, isDebateActive, resetDebateState } from './modules/debate.js';
+import { initDebate, handleDebatePreparing, handleDebateStarted, handleDebateResumed, handleDebateTurn, handleDebateActivity, handleDebateStream, handleDebateTurnDone, handleDebateCommentQueued, handleDebateCommentInjected, handleDebateEnded, handleDebateError, renderDebateStarted, renderDebateTurnDone, renderDebateEnded, renderDebateCommentInjected, renderDebateUserResume, openDebateModal, closeDebateModal, handleDebateBriefReady, renderDebateBriefReady, isDebateActive, resetDebateState } from './modules/debate.js';
 
 // --- Base path for multi-project routing ---
   var slugMatch = location.pathname.match(/^\/p\/([a-z0-9_-]+)/);
@@ -5413,6 +5413,7 @@ import { initDebate, handleDebatePreparing, handleDebateStarted, handleDebateRes
     matesList: function () { return cachedMatesList || []; },
     availableBuiltins: function () { return cachedAvailableBuiltins || []; },
     currentMateId: function () { return (dmTargetUser && dmTargetUser.isMate) ? dmTargetUser.id : null; },
+    requireSkills: requireSkills,
   });
 
   // --- STT module (voice input via Web Speech API) ---
@@ -6168,30 +6169,15 @@ import { initDebate, handleDebatePreparing, handleDebateStarted, handleDebateRes
     }, cb);
   }
 
-  function requireClayDebateSetup(cb) {
-    requireSkills({
-      title: "Skill Installation Required",
-      reason: "The Debate Setup skill is required to start a debate.",
-      skills: [{ name: "clay-debate-setup", url: "https://github.com/chadbyte/clay-debate-setup", scope: "global" }]
-    }, cb);
-  }
 
-  // Debate button in mate sidebar
+  // Debate button in mate sidebar (only visible in DM mode)
   var debateBtn = document.getElementById("mate-debate-btn");
   if (debateBtn) {
     debateBtn.addEventListener("click", function () {
-      if (dmMode && dmTargetUser && dmTargetUser.isMate) {
-        // Quick debate: moderator is the current DM mate, uses conversation context
-        // Build messages with isMate flag for context extraction
-        var contextMessages = dmMessageCache.map(function (m) {
-          return { text: m.text, isMate: m.from !== myUserId };
-        });
-        openQuickDebateModal(contextMessages);
-      } else {
-        requireClayDebateSetup(function () {
-          openDebateModal();
-        });
-      }
+      var contextMessages = dmMessageCache.map(function (m) {
+        return { text: m.text, isMate: m.from !== myUserId };
+      });
+      openDebateModal({ dmContext: contextMessages });
     });
   }
 

package/lib/public/css/debate.css

@@ -910,6 +910,31 @@
   line-height: 1.4;
 }
 
+.debate-skip-setup-row {
+  margin-top: 12px;
+  padding: 8px 0;
+}
+
+.debate-toggle-label {
+  display: flex;
+  align-items: center;
+  gap: 8px;
+  font-size: 13px;
+  color: var(--text-secondary);
+  cursor: pointer;
+}
+
+.debate-toggle-label input[type="checkbox"] {
+  margin: 0;
+  cursor: pointer;
+}
+
+.debate-skip-setup-hint {
+  font-size: 11px;
+  color: var(--text-muted);
+  margin-left: 4px;
+}
+
 .debate-modal-footer {
   display: flex;
   justify-content: flex-end;

package/lib/public/index.html

@@ -1433,6 +1433,13 @@
       <textarea id="debate-topic-input" rows="2" placeholder="e.g. Should AI development be regulated?"></textarea>
       <label class="debate-field-label" for="debate-panel-list">Select panelists</label>
       <div id="debate-panel-list" class="debate-panel-list"></div>
+      <div id="debate-skip-setup-row" class="debate-skip-setup-row hidden">
+        <label class="debate-toggle-label">
+          <input type="checkbox" id="debate-skip-setup-toggle">
+          <span>Skip setup</span>
+          <span class="debate-skip-setup-hint">Moderator generates the brief automatically from conversation context</span>
+        </label>
+      </div>
     </div>
     <div class="debate-modal-footer">
       <button id="debate-modal-cancel" class="debate-btn-cancel">Cancel</button>

package/lib/public/modules/debate.js

@@ -535,7 +535,8 @@ export function isDebateActive() {
 var modalEl = null;
 var selectedPanelists = [];
 
-export function openDebateModal() {
+export function openDebateModal(opts) {
+  opts = opts || {};
   modalEl = document.getElementById("debate-modal");
   if (!modalEl) return;
 
@@ -547,6 +548,46 @@ export function openDebateModal() {
     topicInput.focus();
   }
 
+  // Show/hide skip-setup toggle (only when dmContext is available)
+  var skipSetupRow = document.getElementById("debate-skip-setup-row");
+  var skipSetupToggle = document.getElementById("debate-skip-setup-toggle");
+  if (skipSetupRow) {
+    if (opts.dmContext) {
+      skipSetupRow.classList.remove("hidden");
+    } else {
+      skipSetupRow.classList.add("hidden");
+    }
+  }
+  if (skipSetupToggle) {
+    skipSetupToggle.checked = false;
+    skipSetupToggle.onchange = function () {
+      var topicLabel = modalEl.querySelector('.debate-field-label[for="debate-topic-input"]');
+      var reqSpan = topicLabel ? topicLabel.querySelector(".debate-field-req") : null;
+      if (skipSetupToggle.checked) {
+        if (topicInput) topicInput.placeholder = "Leave blank to auto-detect from conversation...";
+        if (reqSpan) reqSpan.style.display = "none";
+      } else {
+        if (topicInput) topicInput.placeholder = "e.g. Should AI development be regulated?";
+        if (reqSpan) reqSpan.style.display = "";
+      }
+    };
+  }
+
+  // Build DM context string for quick start
+  var dmContextStr = "";
+  if (opts.dmContext && opts.dmContext.length) {
+    var recent = opts.dmContext.slice(-20);
+    var parts = [];
+    for (var i = 0; i < recent.length; i++) {
+      var m = recent[i];
+      var speaker = m.isMate ? "Mate" : "User";
+      var text = m.text || "";
+      if (text.length > 500) text = text.substring(0, 500) + "...";
+      parts.push(speaker + ": " + text);
+    }
+    dmContextStr = parts.join("\n");
+  }
+
   // Populate panelist list from mates (exclude current mate = moderator)
   var panelList = document.getElementById("debate-panel-list");
   if (panelList) {
@@ -584,7 +625,9 @@ export function openDebateModal() {
   if (startBtn) {
     startBtn.onclick = function () {
       var topic = topicInput ? topicInput.value.trim() : "";
-      if (!topic) {
+      var skipSetup = skipSetupToggle && skipSetupToggle.checked;
+
+      if (!skipSetup && !topic) {
         topicInput.focus();
         return;
       }
@@ -593,32 +636,54 @@ export function openDebateModal() {
       var currentMateId = ctx.currentMateId ? ctx.currentMateId() : null;
       if (!currentMateId) return;
 
-      // Create a new session first, then send debate_start after switch
-      if (ctx.ws) {
-        var debatePayload = {
-          type: "debate_start",
-          moderatorId: currentMateId,
-          topic: topic,
-          panelists: selectedPanelists.map(function (id) {
-            return { mateId: id, role: "", brief: "" };
-          }),
-        };
-
-        // Listen for session_switched once, then send debate_start
-        var onMessage = function (evt) {
-          try {
-            var data = JSON.parse(evt.data);
-            if (data.type === "session_switched") {
-              ctx.ws.removeEventListener("message", onMessage);
-              ctx.ws.send(JSON.stringify(debatePayload));
-            }
-          } catch (e) {}
-        };
-        ctx.ws.addEventListener("message", onMessage);
-        ctx.ws.send(JSON.stringify({ type: "new_session" }));
+      var debatePayload = {
+        type: "debate_start",
+        moderatorId: currentMateId,
+        topic: topic || (skipSetup ? "(auto-detect from conversation)" : ""),
+        panelists: selectedPanelists.map(function (id) {
+          return { mateId: id, role: "", brief: "" };
+        }),
+      };
+
+      // When skip setup is toggled, send as quick start with DM context
+      if (skipSetup) {
+        debatePayload.quickStart = true;
+        debatePayload.dmContext = dmContextStr;
+      }
+
+      function sendDebate() {
+        // Create a new session first, then send debate_start after switch
+        if (ctx.ws) {
+          var onMessage = function (evt) {
+            try {
+              var data = JSON.parse(evt.data);
+              if (data.type === "session_switched") {
+                ctx.ws.removeEventListener("message", onMessage);
+                ctx.ws.send(JSON.stringify(debatePayload));
+              }
+            } catch (e) {}
+          };
+          ctx.ws.addEventListener("message", onMessage);
+          ctx.ws.send(JSON.stringify({ type: "new_session" }));
+        }
+        closeDebateModal();
       }
 
-      closeDebateModal();
+      if (skipSetup) {
+        // Quick start: no skill needed
+        sendDebate();
+      } else {
+        // Standard: require clay-debate-setup skill first
+        if (ctx.requireSkills) {
+          ctx.requireSkills({
+            title: "Skill Installation Required",
+            reason: "The Debate Setup skill is required to start a debate.",
+            skills: [{ name: "clay-debate-setup", url: "https://github.com/chadbyte/clay-debate-setup", scope: "global" }]
+          }, sendDebate);
+        } else {
+          sendDebate();
+        }
+      }
     };
   }
 
@@ -696,6 +761,10 @@ export function closeDebateModal() {
     modalEl.classList.add("hidden");
   }
   selectedPanelists = [];
+  var skipSetupToggle = document.getElementById("debate-skip-setup-toggle");
+  if (skipSetupToggle) skipSetupToggle.checked = false;
+  var skipSetupRow = document.getElementById("debate-skip-setup-row");
+  if (skipSetupRow) skipSetupRow.classList.add("hidden");
 }
 
 // --- Quick Debate: start debate from DM context ---

package/lib/sdk-bridge.js

@@ -748,6 +748,13 @@ function createSDKBridge(opts) {
       worker._readyResolve = resolve;
     });
 
+    // Resolves when the worker process actually exits.
+    // Used to prevent spawning a new worker before the old one finishes
+    // flushing SDK session state to disk (race condition on resume).
+    worker.exitPromise = new Promise(function(resolve) {
+      worker._exitResolve = resolve;
+    });
+
     // Create Unix socket server
     worker.server = net.createServer(function(connection) {
       worker.connection = connection;
@@ -827,6 +834,7 @@ function createSDKBridge(opts) {
         // guards against stale workers. This covers all exit cases including
         // signal kills (code=null) and normal exits where the IPC query_error
         // was lost due to connection timing.
+        console.log("[sdk-bridge] Exit handler: pid=" + (worker.process ? worker.process.pid : "?") + " ready=" + worker.ready + " _queryEnded=" + worker._queryEnded + " _abortSent=" + worker._abortSent + " handlers=" + worker.messageHandlers.length);
         if (code === 0 && !worker.ready) {
           // Worker exited cleanly before sending "ready"
           for (var h = 0; h < worker.messageHandlers.length; h++) {
@@ -868,6 +876,10 @@ function createSDKBridge(opts) {
           }
         }
         cleanupWorker(worker);
+        if (worker._exitResolve) {
+          worker._exitResolve();
+          worker._exitResolve = null;
+        }
       });
     });
 
@@ -885,6 +897,7 @@ function createSDKBridge(opts) {
     };
 
     worker.kill = function() {
+      console.log("[sdk-bridge] worker.kill() called, pid=" + (worker.process ? worker.process.pid : "?") + " stack=" + new Error().stack.split("\n").slice(1, 4).join(" | "));
       worker.send({ type: "shutdown" });
       // Force kill after 5 seconds if still alive (gives SDK time to save session)
       setTimeout(function() {
@@ -903,6 +916,7 @@ function createSDKBridge(opts) {
   }
 
   function cleanupWorker(worker) {
+    console.log("[sdk-bridge] cleanupWorker() called, pid=" + (worker.process ? worker.process.pid : "?") + " stack=" + new Error().stack.split("\n").slice(1, 4).join(" | "));
     if (worker.connection && !worker.connection.destroyed) {
       try { worker.connection.end(); } catch (e) {}
     }
@@ -919,6 +933,53 @@ function createSDKBridge(opts) {
    * Mirrors the in-process startQuery flow but delegates SDK execution to the worker.
    */
   async function startQueryViaWorker(session, text, images, linuxUser) {
+    // Wait for the previous worker to fully exit before spawning a new one.
+    // Without this, the new worker may try to resume the SDK session file
+    // while the old worker is still flushing it to disk (800ms grace period),
+    // causing "no conversation found" and losing all prior context.
+    if (session._workerExitPromise) {
+      console.log("[sdk-bridge] startQueryViaWorker: waiting for old worker exit, localId=" + session.localId);
+      var exitWait = session._workerExitPromise;
+      session._workerExitPromise = null;
+      await Promise.race([
+        exitWait,
+        new Promise(function(resolve) { setTimeout(resolve, 3000); }),
+      ]);
+      console.log("[sdk-bridge] startQueryViaWorker: old worker exit wait done");
+    }
+
+    // Ensure the linux user's .claude directories are writable.
+    // The daemon runs as root, so any dirs it creates (mkdirSync) will be
+    // root-owned. The SDK (running as the linux user) needs write access
+    // to create session files, otherwise resume silently fails.
+    if (linuxUser) {
+      try {
+        var osUsersMod0 = require("./os-users");
+        var linuxUserHome0 = osUsersMod0.getLinuxUserHome(linuxUser);
+        var uid0 = osUsersMod0.getLinuxUserUid(linuxUser);
+        if (uid0 != null) {
+          var claudeDir = path.join(linuxUserHome0, ".claude");
+          var projectSlug0 = (cwd || "").replace(/\//g, "-");
+          var projDir = path.join(claudeDir, "projects", projectSlug0);
+          // Create the project directory if missing and chown the whole tree
+          if (!fs.existsSync(projDir)) {
+            fs.mkdirSync(projDir, { recursive: true });
+            try { require("child_process").execSync("chown -R " + uid0 + " " + JSON.stringify(claudeDir)); } catch (e) {}
+          } else {
+            // Fix existing directory if root-owned
+            try {
+              var pstat = fs.statSync(projDir);
+              if (pstat.uid !== uid0) {
+                require("child_process").execSync("chown " + uid0 + " " + JSON.stringify(projDir));
+              }
+            } catch (e) {}
+          }
+        }
+      } catch (e) {
+        console.log("[sdk-bridge] Dir ownership fix skipped:", e.message);
+      }
+    }
+
     // Pre-copy CLI session file BEFORE spawning worker.
     // Must happen before spawn so execSync doesn't block the event loop
     // while worker is alive (which causes ready/exit race conditions).
@@ -934,10 +995,26 @@ function createSDKBridge(opts) {
           var srcFile = path.join(originalHome, ".claude", "projects", projectSlug, sessionFileName);
           var dstDir = path.join(linuxUserHome, ".claude", "projects", projectSlug);
           var dstFile = path.join(dstDir, sessionFileName);
-          if (fs.existsSync(srcFile) && !fs.existsSync(dstFile)) {
+          var uid = osUsersMod.getLinuxUserUid(linuxUser);
+          // Ensure the projects directory is owned by the linux user so the
+          // SDK can create new session files. Without this, mkdirSync creates
+          // root-owned directories and the SDK silently fails to save sessions.
+          if (!fs.existsSync(dstDir)) {
             fs.mkdirSync(dstDir, { recursive: true });
+            if (uid != null) {
+              try { require("child_process").execSync("chown -R " + uid + " " + JSON.stringify(dstDir)); } catch (e2) {}
+            }
+          } else {
+            // Fix ownership of existing directories created by root
+            try {
+              var dirStat = fs.statSync(dstDir);
+              if (uid != null && dirStat.uid !== uid) {
+                require("child_process").execSync("chown " + uid + " " + JSON.stringify(dstDir));
+              }
+            } catch (e2) {}
+          }
+          if (fs.existsSync(srcFile) && !fs.existsSync(dstFile)) {
             fs.copyFileSync(srcFile, dstFile);
-            var uid = osUsersMod.getLinuxUserUid(linuxUser);
             if (uid != null) {
               try { require("child_process").execSync("chown " + uid + " " + JSON.stringify(dstFile)); } catch (e2) {}
             }
@@ -949,17 +1026,31 @@ function createSDKBridge(opts) {
       }
     }
 
+    // Reuse existing worker if alive, otherwise spawn a new one.
+    // Keeping the worker alive between queries lets the SDK maintain session
+    // state in memory, avoiding disk-based resume that fails on abort.
     var worker;
-    try {
-      worker = spawnWorker(linuxUser);
-      session.worker = worker;
-    } catch (e) {
-      session.isProcessing = false;
-      onProcessingChanged();
-      sendAndRecord(session, { type: "error", text: "Failed to spawn worker for " + linuxUser + ": " + (e.message || e) });
-      sendAndRecord(session, { type: "done", code: 1 });
-      sm.broadcastSessionList();
-      return;
+    var reusingWorker = false;
+    if (session.worker && session.worker.ready && session.worker.process && !session.worker.process.killed) {
+      worker = session.worker;
+      reusingWorker = true;
+      // Clear old message handlers so they don't fire for the new query
+      worker.messageHandlers = [];
+      worker._queryEnded = false;
+      worker._abortSent = false;
+      console.log("[sdk-bridge] Reusing existing worker pid=" + (worker.process ? worker.process.pid : "?"));
+    } else {
+      try {
+        worker = spawnWorker(linuxUser);
+        session.worker = worker;
+      } catch (e) {
+        session.isProcessing = false;
+        onProcessingChanged();
+        sendAndRecord(session, { type: "error", text: "Failed to spawn worker for " + linuxUser + ": " + (e.message || e) });
+        sendAndRecord(session, { type: "done", code: 1 });
+        sm.broadcastSessionList();
+        return;
+      }
     }
 
     session.messageQueue = "worker"; // sentinel: messages go via worker IPC
@@ -969,7 +1060,7 @@ function createSDKBridge(opts) {
     session.pendingElicitations = {};
     session.streamedText = false;
     session.responsePreview = "";
-    session.abortController = { abort: function() { worker._abortSent = true; worker.send({ type: "abort" }); } };
+    session.abortController = { abort: function() { console.log("[sdk-bridge] ABORT sent to worker pid=" + (worker.process ? worker.process.pid : "?")); worker._abortSent = true; worker.send({ type: "abort" }); } };
 
     // Build initial user message content
     var content = [];
@@ -1076,6 +1167,7 @@ function createSDKBridge(opts) {
           break;
 
         case "query_done":
+          console.log("[sdk-bridge] IPC query_done received, pid=" + (worker.process ? worker.process.pid : "?"));
           // Mark that we received a proper IPC completion, so the exit
           // handler fallback knows not to double-process.
           worker._queryEnded = true;
@@ -1096,6 +1188,7 @@ function createSDKBridge(opts) {
           break;
 
         case "query_error": {
+          console.log("[sdk-bridge] IPC query_error received, pid=" + (worker.process ? worker.process.pid : "?") + " _fallback=" + !!msg._fallback + " _queryEnded=" + worker._queryEnded + " error=" + (msg.error || "").substring(0, 100));
           // Skip fallback errors from exit handler if we already handled the real one
           if (msg._fallback && worker._queryEnded) break;
           // Mark that we received a proper IPC completion
@@ -1105,8 +1198,8 @@ function createSDKBridge(opts) {
           // Only match the exact SDK error, not generic worker stderr
           var isSessionNotFound = qerrLower.indexOf("no conversation found with session id") !== -1;
           if (isSessionNotFound) {
-            // Pre-copy should have handled this. Clear stale cliSessionId
-            // so next message starts a fresh conversation in the same UI session.
+            // Clear stale cliSessionId so next message starts a fresh
+            // conversation in the same UI session.
             session.cliSessionId = null;
           }
           if (session.isProcessing) {
@@ -1218,16 +1311,18 @@ function createSDKBridge(opts) {
     });
 
     // Wait for worker to be ready, then send query
-    try {
-      await worker.readyPromise;
-    } catch (e) {
-      session.isProcessing = false;
-      onProcessingChanged();
-      sendAndRecord(session, { type: "error", text: "Worker failed to connect: " + (e.message || e) });
-      sendAndRecord(session, { type: "done", code: 1 });
-      sm.broadcastSessionList();
-      cleanupSessionWorker(session);
-      return;
+    if (!reusingWorker) {
+      try {
+        await worker.readyPromise;
+      } catch (e) {
+        session.isProcessing = false;
+        onProcessingChanged();
+        sendAndRecord(session, { type: "error", text: "Worker failed to connect: " + (e.message || e) });
+        sendAndRecord(session, { type: "done", code: 1 });
+        sm.broadcastSessionList();
+        killSessionWorker(session);
+        return;
+      }
     }
 
     worker.send({
@@ -1241,10 +1336,15 @@ function createSDKBridge(opts) {
   }
 
   function cleanupSessionWorker(session, fromWorker) {
+    console.log("[sdk-bridge] cleanupSessionWorker() called, localId=" + session.localId +
+      " fromWorkerPid=" + (fromWorker && fromWorker.process ? fromWorker.process.pid : "none") +
+      " currentWorkerPid=" + (session.worker && session.worker.process ? session.worker.process.pid : "none") +
+      " stack=" + new Error().stack.split("\n").slice(1, 4).join(" | "));
     // If called from a specific worker's exit/error handler, only cleanup if
     // that worker is still the session's current worker. Prevents stale
     // worker exit events from killing a newer worker.
     if (fromWorker && session.worker && session.worker !== fromWorker) {
+      console.log("[sdk-bridge] cleanupSessionWorker: stale worker guard triggered, skipping");
       return;
     }
     session.queryInstance = null;
@@ -1254,7 +1354,18 @@ function createSDKBridge(opts) {
     session.pendingPermissions = {};
     session.pendingAskUser = {};
     session.pendingElicitations = {};
+    // Keep the worker alive between queries so the SDK can maintain session
+    // state in memory. Killing the worker after each query forces resume from
+    // disk, but the SDK may not save the session file on abort, causing
+    // "no conversation found" and losing all conversation history.
+    // The worker is only killed when the UI session is destroyed or on error.
+  }
+
+  // Force-kill the worker and remove it from the session.
+  // Used when the session is destroyed or on unrecoverable errors.
+  function killSessionWorker(session) {
     if (session.worker) {
+      session._workerExitPromise = session.worker.exitPromise;
       session.worker.kill();
       session.worker = null;
     }

package/lib/sdk-worker.js

@@ -86,6 +86,7 @@ function sendToDaemon(msg) {
 }
 
 function handleMessage(msg) {
+  try { require("fs").writeSync(2, "[sdk-worker] MSG: " + msg.type + "\n"); } catch (e) {}
   switch (msg.type) {
     case "query_start":
       handleQueryStart(msg);

package/lib/sessions.js

@@ -427,6 +427,10 @@ function createSessionManager(opts) {
     if (session.messageQueue) {
       try { session.messageQueue.end(); } catch(e) {}
     }
+    if (session.worker) {
+      try { session.worker.kill(); } catch(e) {}
+      session.worker = null;
+    }
 
     if (session.cliSessionId) {
       try { fs.unlinkSync(sessionFilePath(session.cliSessionId)); } catch(e) {}
@@ -457,6 +461,10 @@ function createSessionManager(opts) {
     if (session.messageQueue) {
       try { session.messageQueue.end(); } catch(e) {}
     }
+    if (session.worker) {
+      try { session.worker.kill(); } catch(e) {}
+      session.worker = null;
+    }
     if (session.cliSessionId) {
       try { fs.unlinkSync(sessionFilePath(session.cliSessionId)); } catch(e) {}
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "clay-server",
-  "version": "2.23.1-beta.1",
+  "version": "2.23.1",
   "description": "Self-hosted Claude Code in your browser. Multi-session, multi-user, push notifications.",
   "bin": {
     "clay-server": "./bin/cli.js",