clay-server 2.9.0 → 2.9.2

package/bin/cli.js

@@ -28,7 +28,7 @@ if (_isDev) process.env.CLAY_DEV = "1";
 var { loadConfig, saveConfig, configPath, socketPath, logPath, ensureConfigDir, isDaemonAlive, isDaemonAliveAsync, generateSlug, clearStaleConfig, loadClayrc, saveClayrc, readCrashInfo } = require("../lib/config");
 var { sendIPCCommand } = require("../lib/ipc");
 var { generateAuthToken } = require("../lib/server");
-var { enableMultiUser, hasAdmin, isMultiUser } = require("../lib/users");
+var { enableMultiUser, disableMultiUser, hasAdmin, isMultiUser } = require("../lib/users");
 
 function openUrl(url) {
   try {
@@ -2319,7 +2319,7 @@ function showSettingsMenu(config, ip) {
       items.push({ label: "Set PIN", value: "pin" });
     }
     if (muEnabled) {
-      items.push({ label: "Multi-user mode (enabled)", value: "multi_user" });
+      items.push({ label: "Disable multi-user mode", value: "disable_multi_user" });
     } else {
       items.push({ label: "Enable multi-user mode", value: "multi_user" });
     }
@@ -2365,39 +2365,51 @@ function showSettingsMenu(config, ip) {
         break;
 
       case "multi_user":
-        if (muEnabled && hasAdmin()) {
+        var muResult = enableMultiUser();
+        log(sym.bar);
+        log(sym.bar + "  " + a.yellow + sym.warn + " Experimental Feature" + a.reset);
+        log(sym.bar);
+        log(sym.bar + "  " + a.dim + "Multi-user mode is experimental and may change in future releases." + a.reset);
+        log(sym.bar + "  " + a.dim + "Sharing access to AI-powered tools may be subject to your provider's" + a.reset);
+        log(sym.bar + "  " + a.dim + "terms of service. Please review the applicable usage policies before" + a.reset);
+        log(sym.bar + "  " + a.dim + "granting access to other users." + a.reset);
+        log(sym.bar);
+        if (muResult.setupCode) {
+          log(sym.bar + "  " + a.green + "Multi-user mode enabled." + a.reset);
           log(sym.bar);
-          log(sym.bar + "  " + a.dim + "Multi-user mode is already enabled and an admin account exists." + a.reset);
-          log(sym.bar + "  " + a.dim + "No changes made." + a.reset);
+          log(sym.bar + "  Setup code:  " + a.bold + muResult.setupCode + a.reset);
           log(sym.bar);
-          promptSelect("Back?", [{ label: "Back", value: "back" }], function () {
-            showSettingsMenu(config, ip);
-          });
+          log(sym.bar + "  " + a.dim + "Open Clay in your browser and enter this code to create the admin account." + a.reset);
+          log(sym.bar + "  " + a.dim + "The code is single-use and will be cleared once the admin is set up." + a.reset);
         } else {
-          var muResult = enableMultiUser();
-          log(sym.bar);
-          log(sym.bar + "  " + a.yellow + sym.warn + " Experimental Feature" + a.reset);
-          log(sym.bar);
-          log(sym.bar + "  " + a.dim + "Multi-user mode is experimental and may change in future releases." + a.reset);
-          log(sym.bar + "  " + a.dim + "Sharing access to AI-powered tools may be subject to your provider's" + a.reset);
-          log(sym.bar + "  " + a.dim + "terms of service. Please review the applicable usage policies before" + a.reset);
-          log(sym.bar + "  " + a.dim + "granting access to other users." + a.reset);
-          log(sym.bar);
-          if (muResult.setupCode) {
-            log(sym.bar + "  " + a.green + "Multi-user mode enabled." + a.reset);
+          log(sym.bar + "  " + a.dim + "Multi-user mode is already enabled." + a.reset);
+        }
+        log(sym.bar);
+        promptSelect("Back?", [{ label: "Back", value: "back" }], function () {
+          showSettingsMenu(config, ip);
+        });
+        break;
+
+      case "disable_multi_user":
+        log(sym.bar);
+        log(sym.bar + "  " + a.yellow + sym.warn + " Disable multi-user mode?" + a.reset);
+        log(sym.bar);
+        log(sym.bar + "  " + a.dim + "Sessions created by other users will no longer be visible." + a.reset);
+        log(sym.bar + "  " + a.dim + "User accounts will be preserved and restored if re-enabled." + a.reset);
+        log(sym.bar);
+        promptSelect("Confirm", [
+          { label: "Disable multi-user mode", value: "confirm" },
+          { label: "Cancel", value: "cancel" },
+        ], function (confirmChoice) {
+          if (confirmChoice === "confirm") {
+            disableMultiUser();
             log(sym.bar);
-            log(sym.bar + "  Setup code:  " + a.bold + muResult.setupCode + a.reset);
+            log(sym.done + "  " + a.green + "Multi-user mode disabled." + a.reset);
+            log(sym.bar + "  " + a.dim + "Restart the daemon for changes to take full effect." + a.reset);
             log(sym.bar);
-            log(sym.bar + "  " + a.dim + "Open Clay in your browser and enter this code to create the admin account." + a.reset);
-            log(sym.bar + "  " + a.dim + "The code is single-use and will be cleared once the admin is set up." + a.reset);
-          } else {
-            log(sym.bar + "  " + a.dim + "Multi-user mode is already enabled." + a.reset);
           }
-          log(sym.bar);
-          promptSelect("Back?", [{ label: "Back", value: "back" }], function () {
-            showSettingsMenu(config, ip);
-          });
-        }
+          showSettingsMenu(config, ip);
+        });
         break;
 
       case "logs":
@@ -2456,7 +2468,12 @@ var currentVersion = require("../package.json").version;
       clearStaleConfig();
       await new Promise(function (resolve) { setTimeout(resolve, 500); });
     }
-    // First run — go through setup (disclaimer, port, PIN, etc.)
+    // No running daemon — clear config so setup runs fresh
+    if (!devAlive && devConfig) {
+      if (devConfig.pid) clearStaleConfig();
+      devConfig = null;
+    }
+    // No config — go through setup (disclaimer, port, PIN, etc.)
     if (!devConfig) {
       setup(function (pin, keepAwake) {
         devMode(pin, keepAwake, null);

package/lib/pages.js

@@ -22,11 +22,10 @@ function pinPageHtml() {
     'if(d.ok){location.reload();return}' +
     'if(d.locked){for(var i=0;i<boxes.length;i++)boxes[i].disabled=true;' +
     'err.textContent="Too many attempts. Try again in "+Math.ceil(d.retryAfter/60)+" min";' +
-    'setTimeout(function(){for(var i=0;i<boxes.length;i++){boxes[i].disabled=false;boxes[i].value="";boxes[i].classList.remove("filled")}' +
-    'document.getElementById("pin").value="";err.textContent="";boxes[0].focus()},d.retryAfter*1000);return}' +
+    'setTimeout(function(){for(var i=0;i<boxes.length;i++)boxes[i].disabled=false;' +
+    'err.textContent="";resetPinBoxes()},d.retryAfter*1000);return}' +
     'var msg="Wrong PIN";if(typeof d.attemptsLeft==="number"&&d.attemptsLeft<=3)msg+=" ("+d.attemptsLeft+" left)";' +
-    'err.textContent=msg;for(var i=0;i<boxes.length;i++){boxes[i].value="";boxes[i].classList.remove("filled")}' +
-    'document.getElementById("pin").value="";boxes[0].focus()})' +
+    'err.textContent=msg;resetPinBoxes()})' +
     '.catch(function(){err.textContent="Connection error"})}' +
     'initPinBoxes("pin-boxes","pin",submitPin);' +
     '</script></div></body></html>';
@@ -727,9 +726,9 @@ var authPageStyles =
   // PIN digit boxes
   '.pin-wrap{display:flex;gap:8px;justify-content:center}' +
   '.pin-digit{width:44px;height:56px;background:var(--input-bg);border:1.5px solid var(--border);border-radius:8px;' +
-  'color:var(--accent);font-family:"Courier New",Courier,"Roboto Mono",monospace;font-size:28px;font-weight:700;' +
+  'color:var(--text);font-family:"Courier New",Courier,"Roboto Mono",monospace;font-size:28px;font-weight:700;' +
   'text-align:center;line-height:56px;outline:none;caret-color:transparent;' +
-  '-webkit-text-security:disc;transition:border-color 0.15s,box-shadow 0.15s}' +
+  'transition:border-color 0.15s,box-shadow 0.15s}' +
   '.pin-digit:focus{border-color:var(--accent);box-shadow:0 0 0 2px var(--accent-20)}' +
   '.pin-digit.filled{color:var(--text)}' +
   // Legacy single-input fallback
@@ -754,28 +753,30 @@ var pinBoxScript =
   'function initPinBoxes(cId,hId,onComplete){' +
   'var wrap=document.getElementById(cId),hidden=document.getElementById(hId);' +
   'var boxes=wrap.querySelectorAll(".pin-digit");' +
+  'var digits=["","","","","",""];' +
   'boxes[0].focus();' +
+  'function setDigit(idx,v){digits[idx]=v;boxes[idx].value=v?"\\u2022":"";boxes[idx].classList.toggle("filled",v.length>0);syncHidden()}' +
   'for(var i=0;i<boxes.length;i++){(function(idx){' +
   'boxes[idx].addEventListener("input",function(e){' +
-  'var v=this.value.replace(/[^0-9]/g,"");' +
-  'if(v.length>1)v=v.charAt(v.length-1);' +
-  'this.value=v;' +
-  'this.classList.toggle("filled",v.length>0);' +
-  'syncHidden();' +
+  'var raw=this.value.replace(/[^0-9]/g,"");' +
+  'if(!raw){setDigit(idx,"");return}' +
+  'var v=raw.charAt(raw.length-1);' +
+  'setDigit(idx,v);' +
   'if(v&&idx<5)boxes[idx+1].focus();' +
   'if(hidden.value.length===6&&onComplete)onComplete()});' +
   'boxes[idx].addEventListener("keydown",function(e){' +
-  'if(e.key==="Backspace"&&!this.value&&idx>0){boxes[idx-1].focus();boxes[idx-1].value="";boxes[idx-1].classList.remove("filled");syncHidden()}' +
+  'if(e.key==="Backspace"){if(!digits[idx]&&idx>0){setDigit(idx-1,"");boxes[idx-1].focus()}else{setDigit(idx,"")}syncHidden();return}' +
   'if(e.key==="ArrowLeft"&&idx>0)boxes[idx-1].focus();' +
   'if(e.key==="ArrowRight"&&idx<5)boxes[idx+1].focus();' +
   'if(e.key==="Enter"&&hidden.value.length===6&&onComplete){e.preventDefault();onComplete()}});' +
   'boxes[idx].addEventListener("paste",function(e){' +
   'e.preventDefault();var d=(e.clipboardData||window.clipboardData).getData("text").replace(/[^0-9]/g,"").slice(0,6);' +
-  'for(var j=0;j<d.length&&j<6;j++){boxes[j].value=d.charAt(j);boxes[j].classList.add("filled")}' +
-  'syncHidden();if(d.length>=6){boxes[5].focus();if(onComplete)onComplete()}else if(d.length>0)boxes[d.length].focus()});' +
+  'for(var j=0;j<d.length&&j<6;j++){setDigit(j,d.charAt(j))}' +
+  'if(d.length>=6){boxes[5].focus();if(onComplete)onComplete()}else if(d.length>0)boxes[d.length].focus()});' +
   'boxes[idx].addEventListener("focus",function(){this.select()});' +
   '})(i)}' +
-  'function syncHidden(){var v="";for(var j=0;j<boxes.length;j++)v+=boxes[j].value;hidden.value=v}' +
+  'function syncHidden(){var v="";for(var j=0;j<digits.length;j++)v+=digits[j];hidden.value=v}' +
+  'window.resetPinBoxes=function(){for(var j=0;j<6;j++){digits[j]="";boxes[j].value="";boxes[j].classList.remove("filled")}hidden.value="";boxes[0].focus()}' +
   '}';
 
 // HTML fragment for 6 PIN digit boxes + hidden input
@@ -938,8 +939,8 @@ function multiUserLoginPageHtml() {
 
     'function resetPin(){' +
     'var boxes=document.querySelectorAll(".pin-digit");' +
-    'for(var i=0;i<boxes.length;i++){boxes[i].value="";boxes[i].classList.remove("filled");boxes[i].disabled=false}' +
-    'pinEl.value="";btns[1].disabled=true;if(boxes[0])boxes[0].focus()}' +
+    'for(var i=0;i<boxes.length;i++)boxes[i].disabled=false;' +
+    'if(window.resetPinBoxes)resetPinBoxes();btns[1].disabled=true}' +
 
     'function goBackToUsername(){' +
     'steps[1].classList.remove("active");dots[1].classList.remove("current");dots[1].classList.remove("done");' +

package/lib/project.js

@@ -156,6 +156,24 @@ function createProjectContext(opts) {
     }
   }
 
+  function sendToSession(sessionId, obj) {
+    var data = JSON.stringify(obj);
+    for (var ws of clients) {
+      if (ws.readyState === 1 && ws._clayActiveSession === sessionId) {
+        ws.send(data);
+      }
+    }
+  }
+
+  function sendToSessionOthers(sender, sessionId, obj) {
+    var data = JSON.stringify(obj);
+    for (var ws of clients) {
+      if (ws !== sender && ws.readyState === 1 && ws._clayActiveSession === sessionId) {
+        ws.send(data);
+      }
+    }
+  }
+
   // --- File watcher ---
   var fileWatcher = null;
   var watchedPath = null;
@@ -703,7 +721,7 @@ function createProjectContext(opts) {
     session.isProcessing = true;
     onProcessingChanged();
     session.sentToolResults = {};
-    send({ type: "status", status: "processing" });
+    sendToSession(session.localId, { type: "status", status: "processing" });
     session.acceptEditsAfterStart = true;
     session.singleTurn = true;
     sdk.startQuery(session, loopState.promptText);
@@ -1016,12 +1034,14 @@ function createProjectContext(opts) {
       });
     }
 
-    // Session list (filtered for multi-user)
+    // Session list (filtered for access control)
     var allSessions = [].concat(Array.from(sm.sessions.values())).filter(function (s) { return !s.hidden; });
     if (usersModule.isMultiUser() && wsUser) {
       allSessions = allSessions.filter(function (s) {
         return usersModule.canAccessSession(wsUser.id, s, { visibility: "public" });
       });
+    } else if (!usersModule.isMultiUser()) {
+      allSessions = allSessions.filter(function (s) { return !s.ownerId; });
     }
     sendTo(ws, {
       type: "session_list",
@@ -1048,12 +1068,23 @@ function createProjectContext(opts) {
       }),
     });
 
-    // Restore active session for this client (check access in multi-user mode)
+    // Restore active session for this client (check access)
     var active = sm.getActiveSession();
     if (active && usersModule.isMultiUser() && wsUser) {
       if (!usersModule.canAccessSession(wsUser.id, active, { visibility: "public" })) {
         active = null;
       }
+    } else if (active && !usersModule.isMultiUser() && active.ownerId) {
+      active = null;
+    }
+    // Fallback: pick the most recent accessible session
+    if (!active && allSessions.length > 0) {
+      active = allSessions[0];
+      for (var fi = 1; fi < allSessions.length; fi++) {
+        if ((allSessions[fi].lastActivity || 0) > (active.lastActivity || 0)) {
+          active = allSessions[fi];
+        }
+      }
     }
     if (active) {
       ws._clayActiveSession = active.localId;
@@ -1101,6 +1132,10 @@ function createProjectContext(opts) {
   }
 
   // --- WS message handler ---
+  function getSessionForWs(ws) {
+    return sm.sessions.get(ws._clayActiveSession) || null;
+  }
+
   function handleMessage(ws, msg) {
     if (msg.type === "push_subscribe") {
       if (pushModule && msg.subscription) pushModule.addSubscription(msg.subscription, msg.replaceEndpoint);
@@ -1108,7 +1143,7 @@ function createProjectContext(opts) {
     }
 
     if (msg.type === "load_more_history") {
-      var session = sm.getActiveSession();
+      var session = getSessionForWs(ws);
       if (!session || typeof msg.before !== "number") return;
       var before = msg.before;
       var from = sm.findTurnBoundary(session.history, Math.max(0, before - sm.HISTORY_PAGE_SIZE));
@@ -1126,9 +1161,9 @@ function createProjectContext(opts) {
       var sessionOpts = {};
       if (ws._clayUser) sessionOpts.ownerId = ws._clayUser.id;
       if (msg.sessionVisibility) sessionOpts.sessionVisibility = msg.sessionVisibility;
-      var newSess = sm.createSession(sessionOpts, usersModule.isMultiUser() ? ws : undefined);
+      var newSess = sm.createSession(sessionOpts, ws);
+      ws._clayActiveSession = newSess.localId;
       if (usersModule.isMultiUser()) {
-        ws._clayActiveSession = newSess.localId;
         broadcastPresence();
       }
       return;
@@ -1152,11 +1187,11 @@ function createProjectContext(opts) {
             break;
           }
         }
-        var _rws = usersModule.isMultiUser() ? ws : undefined;
-        sm.resumeSession(msg.cliSessionId, { history: history, title: title }, _rws);
+        var resumed = sm.resumeSession(msg.cliSessionId, { history: history, title: title }, ws);
+        if (resumed) ws._clayActiveSession = resumed.localId;
       }).catch(function () {
-        var _rws = usersModule.isMultiUser() ? ws : undefined;
-        sm.resumeSession(msg.cliSessionId, undefined, _rws);
+        var resumed = sm.resumeSession(msg.cliSessionId, undefined, ws);
+        if (resumed) ws._clayActiveSession = resumed.localId;
       });
       return;
     }
@@ -1201,7 +1236,8 @@ function createProjectContext(opts) {
           sm.switchSession(msg.id, ws);
           broadcastPresence();
         } else {
-          sm.switchSession(msg.id);
+          ws._clayActiveSession = msg.id;
+          sm.switchSession(msg.id, ws);
         }
       }
       return;
@@ -1209,7 +1245,7 @@ function createProjectContext(opts) {
 
     if (msg.type === "delete_session") {
       if (msg.id && sm.sessions.has(msg.id)) {
-        sm.deleteSession(msg.id, usersModule.isMultiUser() ? ws : undefined);
+        sm.deleteSession(msg.id, ws);
       }
       return;
     }
@@ -1276,7 +1312,7 @@ function createProjectContext(opts) {
     }
 
     if (msg.type === "stop") {
-      var session = sm.getActiveSession();
+      var session = getSessionForWs(ws);
       if (session && session.abortController && session.isProcessing) {
         session.abortController.abort();
       }
@@ -1297,22 +1333,22 @@ function createProjectContext(opts) {
       // Verify target is actually a claude process before killing
       if (!sdk.isClaudeProcess(pid)) {
         console.error("[project] Refused to kill PID " + pid + ": not a claude process");
-        send({ type: "error", text: "Process " + pid + " is not a Claude process." });
+        sendTo(ws, { type: "error", text: "Process " + pid + " is not a Claude process." });
         return;
       }
       try {
         process.kill(pid, "SIGTERM");
         console.log("[project] Sent SIGTERM to conflicting Claude process PID " + pid);
-        send({ type: "process_killed", pid: pid });
+        sendTo(ws, { type: "process_killed", pid: pid });
       } catch (e) {
         console.error("[project] Failed to kill PID " + pid + ":", e.message);
-        send({ type: "error", text: "Failed to kill process " + pid + ": " + (e.message || e) });
+        sendTo(ws, { type: "error", text: "Failed to kill process " + pid + ": " + (e.message || e) });
       }
       return;
     }
 
     if (msg.type === "set_model" && msg.model) {
-      var session = sm.getActiveSession();
+      var session = getSessionForWs(ws);
       if (session) {
         sdk.setModel(session, msg.model);
       }
@@ -1323,7 +1359,7 @@ function createProjectContext(opts) {
       if (typeof opts.onSetServerDefaultModel === "function") {
         opts.onSetServerDefaultModel(msg.model);
       }
-      var session = sm.getActiveSession();
+      var session = getSessionForWs(ws);
       if (session) {
         sdk.setModel(session, msg.model);
       }
@@ -1334,7 +1370,7 @@ function createProjectContext(opts) {
       if (typeof opts.onSetProjectDefaultModel === "function") {
         opts.onSetProjectDefaultModel(slug, msg.model);
       }
-      var session = sm.getActiveSession();
+      var session = getSessionForWs(ws);
       if (session) {
         sdk.setModel(session, msg.model);
       }
@@ -1348,7 +1384,7 @@ function createProjectContext(opts) {
         return;
       }
       sm.currentPermissionMode = msg.mode;
-      var session = sm.getActiveSession();
+      var session = getSessionForWs(ws);
       if (session) {
         sdk.setPermissionMode(session, msg.mode);
       }
@@ -1362,7 +1398,7 @@ function createProjectContext(opts) {
       }
       if (!dangerouslySkipPermissions) {
         sm.currentPermissionMode = msg.mode;
-        var session = sm.getActiveSession();
+        var session = getSessionForWs(ws);
         if (session) {
           sdk.setPermissionMode(session, msg.mode);
         }
@@ -1377,7 +1413,7 @@ function createProjectContext(opts) {
       }
       if (!dangerouslySkipPermissions) {
         sm.currentPermissionMode = msg.mode;
-        var session = sm.getActiveSession();
+        var session = getSessionForWs(ws);
         if (session) {
           sdk.setPermissionMode(session, msg.mode);
         }
@@ -1417,7 +1453,7 @@ function createProjectContext(opts) {
     }
 
     if (msg.type === "rewind_preview") {
-      var session = sm.getActiveSession();
+      var session = getSessionForWs(ws);
       if (!session || !session.cliSessionId || !msg.uuid) return;
 
       (async function () {
@@ -1446,7 +1482,7 @@ function createProjectContext(opts) {
     }
 
     if (msg.type === "rewind_execute") {
-      var session = sm.getActiveSession();
+      var session = getSessionForWs(ws);
       if (!session || !session.cliSessionId || !msg.uuid) return;
       var mode = msg.mode || "both";
 
@@ -1501,11 +1537,11 @@ function createProjectContext(opts) {
           onProcessingChanged();
 
           sm.saveSessionFile(session);
-          sm.switchSession(session.localId, usersModule.isMultiUser() ? ws : undefined);
+          sm.switchSession(session.localId, ws);
           sm.sendAndRecord(session, { type: "rewind_complete", mode: mode });
           sm.broadcastSessionList();
         } catch (err) {
-          send({ type: "rewind_error", text: "Rewind failed: " + err.message });
+          sendTo(ws, { type: "rewind_error", text: "Rewind failed: " + err.message });
         } finally {
           if (result && result.isTemp) result.cleanup();
         }
@@ -1514,7 +1550,7 @@ function createProjectContext(opts) {
     }
 
     if (msg.type === "ask_user_response") {
-      var session = sm.getActiveSession();
+      var session = getSessionForWs(ws);
       if (!session) return;
       var toolId = msg.toolId;
       var answers = msg.answers || {};
@@ -1530,12 +1566,12 @@ function createProjectContext(opts) {
     }
 
     if (msg.type === "input_sync") {
-      sendToOthers(ws, msg);
+      sendToSessionOthers(ws, ws._clayActiveSession, msg);
       return;
     }
 
     if (msg.type === "permission_response") {
-      var session = sm.getActiveSession();
+      var session = getSessionForWs(ws);
       if (!session) return;
       var requestId = msg.requestId;
       var decision = msg.decision;
@@ -1603,17 +1639,17 @@ function createProjectContext(opts) {
             newSession.title = "Plan execution (cleared context)";
             sm.saveSessionFile(newSession);
             sm.broadcastSessionList();
-            send(userMsg);
+            sendToSession(newSession.localId, userMsg);
 
             newSession.isProcessing = true;
             onProcessingChanged();
             newSession.sentToolResults = {};
-            send({ type: "status", status: "processing" });
+            sendToSession(newSession.localId, { type: "status", status: "processing" });
             newSession.acceptEditsAfterStart = true;
             sdk.startQuery(newSession, planPrompt);
           } catch (e) {
             console.error("[project] Error starting plan execution:", e);
-            send({ type: "error", text: "Failed to start plan execution: " + (e.message || e) });
+            sendTo(ws, { type: "error", text: "Failed to start plan execution: " + (e.message || e) });
           }
         });
         return;
@@ -1631,13 +1667,13 @@ function createProjectContext(opts) {
             var userMsg = { type: "user_message", text: feedback };
             session.history.push(userMsg);
             sm.appendToSessionFile(session, userMsg);
-            send(userMsg);
+            sendToSession(session.localId, userMsg);
 
             if (!session.isProcessing) {
               session.isProcessing = true;
               onProcessingChanged();
               session.sentToolResults = {};
-              send({ type: "status", status: "processing" });
+              sendToSession(session.localId, { type: "status", status: "processing" });
               if (!session.queryInstance) {
                 sdk.startQuery(session, feedback);
               } else {
@@ -2406,11 +2442,11 @@ function createProjectContext(opts) {
       // Send crafting prompt and start the conversation with Claude.
       craftingSession.history.push({ type: "user_message", text: craftingPrompt });
       sm.appendToSessionFile(craftingSession, { type: "user_message", text: craftingPrompt });
-      send({ type: "user_message", text: craftingPrompt });
+      sendToSession(craftingSession.localId, { type: "user_message", text: craftingPrompt });
       craftingSession.isProcessing = true;
       onProcessingChanged();
       craftingSession.sentToolResults = {};
-      send({ type: "status", status: "processing" });
+      sendToSession(craftingSession.localId, { type: "status", status: "processing" });
       sdk.startQuery(craftingSession, craftingPrompt);
 
       send({ type: "ralph_crafting_started", sessionId: craftingSession.localId, taskId: newLoopId, source: recordSource });
@@ -2600,7 +2636,7 @@ function createProjectContext(opts) {
     if (msg.type !== "message") return;
     if (!msg.text && (!msg.images || msg.images.length === 0) && (!msg.pastes || msg.pastes.length === 0)) return;
 
-    var session = sm.getActiveSession();
+    var session = getSessionForWs(ws);
     if (!session) return;
 
     var userMsg = { type: "user_message", text: msg.text || "" };
@@ -2612,7 +2648,7 @@ function createProjectContext(opts) {
     }
     session.history.push(userMsg);
     sm.appendToSessionFile(session, userMsg);
-    sendToOthers(ws, userMsg);
+    sendToSessionOthers(ws, session.localId, userMsg);
 
     if (!session.title) {
       session.title = (msg.text || "Image").substring(0, 50);
@@ -2632,7 +2668,7 @@ function createProjectContext(opts) {
       session.isProcessing = true;
       onProcessingChanged();
       session.sentToolResults = {};
-      send({ type: "status", status: "processing" });
+      sendToSession(session.localId, { type: "status", status: "processing" });
       if (!session.queryInstance) {
         sdk.startQuery(session, fullText, msg.images);
       } else {
@@ -2845,7 +2881,8 @@ function createProjectContext(opts) {
           return;
         }
         var spawnCwd = scope === "global" ? os.homedir() : cwd;
-        var child = spawn("npx", ["skills", "add", url, "--skill", skill], {
+        var scopeFlag = scope === "global" ? "--global" : "--project";
+        var child = spawn("npx", ["skills", "add", url, "--skill", skill, "--yes", scopeFlag], {
           cwd: spawnCwd,
           stdio: "ignore",
           detached: false,
@@ -3116,29 +3153,6 @@ function createProjectContext(opts) {
     },
     warmup: function () {
       sdk.warmup();
-      // Auto-install clay-ralph skill globally if not present
-      var clayRalphDir = path.join(os.homedir(), ".claude", "skills", "clay-ralph", "SKILL.md");
-      try {
-        fs.accessSync(clayRalphDir, fs.constants.R_OK);
-      } catch (e) {
-        console.log("[project] Auto-installing clay-ralph skill...");
-        var child = spawn("npx", ["skills", "add", "https://github.com/chadbyte/clay-ralph", "--skill", "clay-ralph"], {
-          cwd: os.homedir(),
-          stdio: "ignore",
-          detached: false,
-        });
-        child.on("close", function (code) {
-          if (code === 0) {
-            console.log("[project] clay-ralph skill installed successfully");
-            send({ type: "skill_installed", skill: "clay-ralph", scope: "global", success: true, error: null });
-          } else {
-            console.log("[project] clay-ralph skill install failed (code " + code + ")");
-          }
-        });
-        child.on("error", function (err) {
-          console.log("[project] clay-ralph skill install error: " + err.message);
-        });
-      }
     },
     destroy: destroy,
   };