clay-server 2.36.1-beta.1 → 2.36.1-beta.3

package/bin/cli.js

@@ -1503,11 +1503,9 @@ async function forkDaemon(mode, keepAwake, extraProjects, addCwd, wantOsUsers) {
         break;
       }
     }
-    // Restore access settings from previous config
+    // Restore project-level settings from previous config
     if (prevProjectMap[cwd]) {
-      if (prevProjectMap[cwd].visibility) cwdEntry.visibility = prevProjectMap[cwd].visibility;
-      if (prevProjectMap[cwd].allowedUsers) cwdEntry.allowedUsers = prevProjectMap[cwd].allowedUsers;
-      if (prevProjectMap[cwd].ownerId) cwdEntry.ownerId = prevProjectMap[cwd].ownerId;
+      cwdEntry = Object.assign({}, prevProjectMap[cwd], cwdEntry);
     }
     allProjects.push(cwdEntry);
     usedSlugs.push(slug);
@@ -1522,21 +1520,19 @@ async function forkDaemon(mode, keepAwake, extraProjects, addCwd, wantOsUsers) {
       var rpSlug = generateSlug(rp.path, usedSlugs);
       usedSlugs.push(rpSlug);
       var rpEntry = { path: rp.path, slug: rpSlug, title: rp.title || undefined, icon: rp.icon || undefined, addedAt: rp.addedAt || Date.now() };
-      // Restore access settings from previous config
+      // Restore project-level settings from previous config
       if (prevProjectMap[rp.path]) {
-        if (prevProjectMap[rp.path].visibility) rpEntry.visibility = prevProjectMap[rp.path].visibility;
-        if (prevProjectMap[rp.path].allowedUsers) rpEntry.allowedUsers = prevProjectMap[rp.path].allowedUsers;
-        if (prevProjectMap[rp.path].ownerId) rpEntry.ownerId = prevProjectMap[rp.path].ownerId;
+        rpEntry = Object.assign({}, prevProjectMap[rp.path], rpEntry);
       }
       allProjects.push(rpEntry);
     }
   }
 
-  var config = {
+  var config = Object.assign({}, prevConfig || {}, {
     pid: null,
     port: port,
     host: host,
-    pinHash: mode === "multi" && cliPin ? generateAuthToken(cliPin) : null,
+    pinHash: mode === "multi" && cliPin ? generateAuthToken(cliPin) : (prevConfig && prevConfig.pinHash) || null,
     tls: hasTls,
     builtinCert: hasBuiltinCert,
     mkcertDetected: mkcertDetected,
@@ -1548,7 +1544,7 @@ async function forkDaemon(mode, keepAwake, extraProjects, addCwd, wantOsUsers) {
     mode: mode || "single",
     setupCompleted: true,
     projects: allProjects,
-  };
+  });
 
   ensureConfigDir();
   saveConfig(config);
@@ -1687,8 +1683,7 @@ async function devMode(mode, keepAwake, existingPinHash, wantOsUsers) {
   }
   // Restore access settings for cwd from previous config
   if (prevDevProjectMap[cwd]) {
-    if (prevDevProjectMap[cwd].visibility) cwdDevEntry.visibility = prevDevProjectMap[cwd].visibility;
-    if (prevDevProjectMap[cwd].allowedUsers) cwdDevEntry.allowedUsers = prevDevProjectMap[cwd].allowedUsers;
+    cwdDevEntry = Object.assign({}, prevDevProjectMap[cwd], cwdDevEntry);
   }
   var allProjects = [cwdDevEntry];
   var usedSlugs = [slug];
@@ -1697,15 +1692,14 @@ async function devMode(mode, keepAwake, existingPinHash, wantOsUsers) {
     var rpSlug = generateSlug(rp.path, usedSlugs);
     usedSlugs.push(rpSlug);
     var rpDevEntry = { path: rp.path, slug: rpSlug, title: rp.title || undefined, icon: rp.icon || undefined, addedAt: rp.addedAt || Date.now() };
-    // Restore access settings from previous config
+    // Restore project-level settings from previous config
     if (prevDevProjectMap[rp.path]) {
-      if (prevDevProjectMap[rp.path].visibility) rpDevEntry.visibility = prevDevProjectMap[rp.path].visibility;
-      if (prevDevProjectMap[rp.path].allowedUsers) rpDevEntry.allowedUsers = prevDevProjectMap[rp.path].allowedUsers;
+      rpDevEntry = Object.assign({}, prevDevProjectMap[rp.path], rpDevEntry);
     }
     allProjects.push(rpDevEntry);
   }
 
-  var config = {
+  var config = Object.assign({}, prevDevConfig || {}, {
     pid: null,
     port: port,
     host: host,
@@ -1720,7 +1714,7 @@ async function devMode(mode, keepAwake, existingPinHash, wantOsUsers) {
     setupCompleted: true,
     projects: allProjects,
     osUsers: wantOsUsers || (prevDevConfig ? (prevDevConfig.osUsers || false) : false),
-  };
+  });
 
   ensureConfigDir();
   saveConfig(config);

package/lib/project.js

@@ -911,7 +911,19 @@ function createProjectContext(opts) {
         var firstModel = vendorModels[0] || "";
         // model value can be string or {value, displayName} object
         var defaultModel = typeof firstModel === "string" ? firstModel : (firstModel.value || "");
-        sendTo(ws, { type: "model_info", model: defaultModel, models: vendorModels, vendor: msg.vendor, availableVendors: sm.availableVendors || [], installedVendors: sm.installedVendors || [] });
+        // Preserve the user's current model selection if it belongs to this
+        // vendor, rather than always snapping back to the vendor's default.
+        var modelToSend = defaultModel;
+        if (sm.currentModel) {
+          for (var mi = 0; mi < vendorModels.length; mi++) {
+            var mv = typeof vendorModels[mi] === "string" ? vendorModels[mi] : (vendorModels[mi].value || "");
+            if (mv === sm.currentModel) {
+              modelToSend = sm.currentModel;
+              break;
+            }
+          }
+        }
+        sendTo(ws, { type: "model_info", model: modelToSend, models: vendorModels, vendor: msg.vendor, availableVendors: sm.availableVendors || [], installedVendors: sm.installedVendors || [] });
       })();
       return;
     }

package/lib/public/modules/app-messages.js

@@ -389,7 +389,11 @@ export function processMessage(msg) {
         if (_modelVal && typeof _modelVal === "object") _modelVal = _modelVal.value || _modelVal.displayName || "";
         var _miUpdate = { currentModels: msg.models || [] };
         if (Object.prototype.hasOwnProperty.call(msg, "model")) {
-          _miUpdate.currentModel = _modelVal || "";
+          if (store.get('vendorSelectionLocked') && store.get('currentModel')) {
+            // Keep the user's existing selection; only update models list
+          } else {
+            _miUpdate.currentModel = _modelVal || "";
+          }
         } else {
           _miUpdate.currentModel = store.get('currentModel');
         }

package/lib/public/modules/input.js

@@ -1078,6 +1078,13 @@ export function initInput(_ctx) {
         return;
       }
       e.preventDefault();
+      // While Claude is processing and the user has nothing queued, Enter
+      // must not adopt a ghost suggestion — pressing Enter while waiting
+      // should be a no-op, not a send of a stale suggestion the user never
+      // typed.
+      if (ctx.processing && !hasSendableContent()) {
+        return;
+      }
       // If input has no sendable content but ghost suggestion is showing, adopt it.
       // Use hasSendableContent() instead of checking inputEl.value alone so that
       // pending images, pastes, or files block the ghost-text adoption — otherwise
@@ -1097,8 +1104,17 @@ export function initInput(_ctx) {
     ctx.inputEl.setAttribute("enterkeyhint", "enter");
   }
 
-  // Send/Stop button — if sendable content exists, always send; otherwise stop
+  // Send/Stop button — gate stop vs send on live state. If Claude is
+  // processing and the user has nothing queued, the click is a Stop and
+  // must not adopt a ghost suggestion. Otherwise it's a send.
+  // (regression after #337 / 0753833)
   ctx.sendBtn.addEventListener("click", function () {
+    if (ctx.processing && !hasSendableContent()) {
+      if (ctx.connected) {
+        ctx.ws.send(JSON.stringify({ type: "stop" }));
+      }
+      return;
+    }
     // Adopt ghost suggestion if input is empty
     var ghost = ctx.getGhostSuggestion ? ctx.getGhostSuggestion() : "";
     if (!hasSendableContent() && ghost) {
@@ -1111,9 +1127,6 @@ export function initInput(_ctx) {
       sendMessage();
       return;
     }
-    if (ctx.processing && ctx.connected) {
-      ctx.ws.send(JSON.stringify({ type: "stop" }));
-    }
   });
   ctx.sendBtn.addEventListener("dblclick", function (e) { e.preventDefault(); });
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "clay-server",
-  "version": "2.36.1-beta.1",
+  "version": "2.36.1-beta.3",
   "description": "Self-hosted team workspace for Claude Code and Codex. Multi-user, browser-based, with persistent AI mates.",
   "bin": {
     "clay-server": "./bin/cli.js",