clay-server 2.34.0 → 2.34.1-beta.1

package/lib/project-connection.js

@@ -60,6 +60,35 @@ function attachConnection(ctx) {
   // warmup once per reconnect.
   var _warmedUp = false;
 
+  function findRestoredActiveSession(ws, wsUser, allSessions) {
+    var active = null;
+    var presenceKey = wsUser ? wsUser.id : "_default";
+    var storedPresence = userPresence.getPresence(slug, presenceKey);
+    if (storedPresence && storedPresence.sessionId) {
+      if (sm.sessions.has(storedPresence.sessionId)) {
+        active = sm.sessions.get(storedPresence.sessionId);
+      } else {
+        sm.sessions.forEach(function (s) {
+          if (s.cliSessionId && s.cliSessionId === storedPresence.sessionId) active = s;
+        });
+      }
+      if (active && usersModule.isMultiUser() && wsUser) {
+        if (!usersModule.canAccessSession(wsUser.id, active, { visibility: "public" })) active = null;
+      } else if (active && !usersModule.isMultiUser() && active.ownerId) {
+        active = null;
+      }
+    }
+    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];
+        }
+      }
+    }
+    return { active: active, storedPresence: storedPresence };
+  }
+
   function handleConnection(ws, wsUser, handleMessage, handleDisconnection) {
     ws._clayUser = wsUser || null;
     clients.add(ws);
@@ -90,6 +119,18 @@ function attachConnection(ctx) {
     var title = getTitle();
     var project = getProject();
     var ownerLocked = !!(osUsers && osUsers.length > 0 && /^\/home\/[^/]+\//.test(cwd));
+    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; });
+    }
+    var restoredState = findRestoredActiveSession(ws, wsUser, allSessions);
+    var restoredActive = restoredState.active;
+    var initialVendor = (restoredActive && restoredActive.vendor) || sm.defaultVendor || "claude";
+    var initialModels = (sm.modelsByVendor && sm.modelsByVendor[initialVendor]) || sm.availableModels || [];
     sendTo(ws, { type: "info", cwd: cwd, slug: slug, project: title || project, version: currentVersion, debug: !!debug, dangerouslySkipPermissions: dangerouslySkipPermissions, osUsers: osUsers, lanHost: lanHost, projectCount: _filteredProjects.length, projects: _filteredProjects, projectOwnerId: projectOwnerId, ownerLocked: ownerLocked });
     // Update notifications are pushed on a scheduled interval (see
     // scheduleUpdateBroadcast). We no longer push on connect to avoid
@@ -98,8 +139,7 @@ function attachConnection(ctx) {
       sendTo(ws, { type: "slash_commands", commands: sm.slashCommands });
     }
     if (sm.currentModel) {
-      // Vendor is resolved per-session in session_switched; send default here
-      sendTo(ws, { type: "model_info", model: sm.currentModel, models: sm.availableModels || [], vendor: sm.defaultVendor || "claude", availableVendors: sm.availableVendors || [], installedVendors: sm.installedVendors || [] });
+      sendTo(ws, { type: "model_info", model: sm.currentModel, models: initialModels, vendor: initialVendor, availableVendors: sm.availableVendors || [], installedVendors: sm.installedVendors || [] });
     }
     sendTo(ws, { type: "config_state", model: sm.currentModel || "", mode: sm.currentPermissionMode || "default", effort: sm.currentEffort || "medium", betas: sm.currentBetas || [], thinking: sm.currentThinking || "adaptive", thinkingBudget: sm.currentThinkingBudget || 10000 });
     sendTo(ws, Object.assign({ type: "codex_config" }, getCodexConfig(sm)));
@@ -116,14 +156,6 @@ function attachConnection(ctx) {
     if (_notifications) _notifications.sendConnectionState(ws, sendTo);
 
     // 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",
       sessions: allSessions.map(function (s) {
@@ -152,31 +184,9 @@ function attachConnection(ctx) {
     });
 
     // Restore active session for this client from server-side presence
-    var active = null;
+    var active = restoredState.active;
     var presenceKey = wsUser ? wsUser.id : "_default";
-    var storedPresence = userPresence.getPresence(slug, presenceKey);
-    if (storedPresence && storedPresence.sessionId) {
-      if (sm.sessions.has(storedPresence.sessionId)) {
-        active = sm.sessions.get(storedPresence.sessionId);
-      } else {
-        sm.sessions.forEach(function (s) {
-          if (s.cliSessionId && s.cliSessionId === storedPresence.sessionId) active = s;
-        });
-      }
-      if (active && usersModule.isMultiUser() && wsUser) {
-        if (!usersModule.canAccessSession(wsUser.id, active, { visibility: "public" })) active = null;
-      } else if (active && !usersModule.isMultiUser() && active.ownerId) {
-        active = null;
-      }
-    }
-    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];
-        }
-      }
-    }
+    var storedPresence = restoredState.storedPresence;
     var autoCreated = false;
     if (!active) {
       var autoOpts = {};

package/lib/project-sessions.js

@@ -227,6 +227,24 @@ function attachSessions(ctx) {
     if (msg.type === "resume_session") {
       if (!msg.cliSessionId) return true;
       var cliSess = require("./cli-sessions");
+
+      // If Clay already has a persisted meta file for this cliSessionId, read
+      // its vendor so resumeSession doesn't silently default to the project's
+      // primary vendor (which would break codex sessions after server restart).
+      var persistedVendor = null;
+      try {
+        var _fsResume = require("fs");
+        var _pathResume = require("path");
+        var metaPath = _pathResume.join(sm.sessionsDir, msg.cliSessionId + ".jsonl");
+        if (_fsResume.existsSync(metaPath)) {
+          var firstLine = _fsResume.readFileSync(metaPath, "utf8").split("\n", 1)[0];
+          try {
+            var metaObj = JSON.parse(firstLine);
+            if (metaObj && metaObj.type === "meta" && metaObj.vendor) persistedVendor = metaObj.vendor;
+          } catch (e) {}
+        }
+      } catch (e) {}
+
       // Try SDK for title first, then fall back to manual parsing
       var titlePromise = adapter.getSessionInfo(msg.cliSessionId, { dir: cwd }).then(function(info) {
         return (info && info.summary) ? info.summary.substring(0, 100) : null;
@@ -247,10 +265,10 @@ function attachSessions(ctx) {
             }
           }
         }
-        var resumed = sm.resumeSession(msg.cliSessionId, { history: history, title: title }, ws);
+        var resumed = sm.resumeSession(msg.cliSessionId, { history: history, title: title, vendor: persistedVendor || undefined }, ws);
         if (resumed) ws._clayActiveSession = resumed.localId;
       }).catch(function() {
-        var resumed = sm.resumeSession(msg.cliSessionId, undefined, ws);
+        var resumed = sm.resumeSession(msg.cliSessionId, persistedVendor ? { vendor: persistedVendor } : undefined, ws);
         if (resumed) ws._clayActiveSession = resumed.localId;
       });
       return true;
@@ -311,7 +329,13 @@ function attachSessions(ctx) {
         if (switchTargetSess && sm.currentModel) {
           var targetVendor = switchTargetSess.vendor || sm.defaultVendor || null;
           var tvModels = (targetVendor && sm.modelsByVendor && sm.modelsByVendor[targetVendor]) || [];
-          if (tvModels.length > 0 && tvModels.indexOf(sm.currentModel) === -1) {
+          var found = false;
+          for (var tvi = 0; tvi < tvModels.length; tvi++) {
+            var tvEntry = tvModels[tvi];
+            var tvVal = typeof tvEntry === "string" ? tvEntry : (tvEntry && (tvEntry.value || tvEntry.id)) || "";
+            if (tvVal === sm.currentModel) { found = true; break; }
+          }
+          if (tvModels.length > 0 && !found) {
             sm.currentModel = "";
           }
         }
@@ -507,14 +531,24 @@ function attachSessions(ctx) {
     if (msg.type === "set_vendor" && msg.vendor) {
       var vendorSession = getSessionForWs(ws);
       if (vendorSession) {
-        vendorSession.vendor = msg.vendor;
-        // Clear the shared model so the next query uses the vendor's default
-        // instead of leaking the previous vendor's model into a fresh session.
-        if (sm.currentModel) {
-          sm.currentModel = "";
+        // Refuse to rebind vendor on a session that is already bound to a
+        // different CLI (cliSessionId is vendor-specific). This prevents a
+        // stale client-side vendor state from clobbering the persisted vendor
+        // on page reload / server restart.
+        var alreadyBound = vendorSession.cliSessionId && vendorSession.vendor && vendorSession.vendor !== msg.vendor;
+        if (alreadyBound) {
+          console.warn("[project] set_vendor ignored: session " + vendorSession.localId +
+            " is bound to '" + vendorSession.vendor + "', refused rebind to '" + msg.vendor + "'");
+        } else {
+          vendorSession.vendor = msg.vendor;
+          // Clear the shared model so the next query uses the vendor's default
+          // instead of leaking the previous vendor's model into a fresh session.
+          if (sm.currentModel) {
+            sm.currentModel = "";
+          }
+          sm.saveSessionFile(vendorSession);
+          sm.broadcastSessionList();
         }
-        sm.saveSessionFile(vendorSession);
-        sm.broadcastSessionList();
       }
       if (msg.vendor) {
         var vendorModels = (sm.modelsByVendor && sm.modelsByVendor[msg.vendor]) || [];

package/lib/public/modules/sidebar-projects.js

@@ -1257,10 +1257,18 @@ export function renderIconStrip(projects, currentSlug) {
         wtEl.href = "/p/" + wt.slug + "/";
         wtEl.dataset.slug = wt.slug;
 
-        var abbrev = document.createElement("span");
-        abbrev.className = "wt-branch-abbrev";
-        abbrev.textContent = getProjectAbbrev(wt.name);
-        wtEl.appendChild(abbrev);
+        if (wt.icon) {
+          var wtEmoji = document.createElement("span");
+          wtEmoji.className = "wt-branch-abbrev project-emoji";
+          wtEmoji.textContent = wt.icon;
+          parseEmojis(wtEmoji);
+          wtEl.appendChild(wtEmoji);
+        } else {
+          var abbrev = document.createElement("span");
+          abbrev.className = "wt-branch-abbrev";
+          abbrev.textContent = getProjectAbbrev(wt.name);
+          wtEl.appendChild(abbrev);
+        }
 
         var wtStatus = document.createElement("span");
         wtStatus.className = "icon-strip-status";

package/lib/sdk-bridge.js

@@ -182,6 +182,22 @@ function createSDKBridge(opts) {
     return sm.availableModels || [];
   }
 
+  // Model list entries may be plain strings (Codex) or { value, displayName }
+  // objects (Claude SDK). Normalize to the identifier string.
+  function modelEntryValue(entry) {
+    if (!entry) return "";
+    if (typeof entry === "string") return entry;
+    return entry.value || entry.id || "";
+  }
+
+  function modelListContains(list, modelId) {
+    if (!list || !modelId) return false;
+    for (var mi = 0; mi < list.length; mi++) {
+      if (modelEntryValue(list[mi]) === modelId) return true;
+    }
+    return false;
+  }
+
   function sendModelInfoForVendor(vendor, model) {
     send({
       type: "model_info",
@@ -1221,10 +1237,15 @@ function createSDKBridge(opts) {
     var sessionVendor = session.vendor || (adapter && adapter.vendor) || null;
     if (sessionVendor) {
       var vendorModels = (sm.modelsByVendor && sm.modelsByVendor[sessionVendor]) || [];
-      if (vendorModels.length > 0 && queryModel && vendorModels.indexOf(queryModel) === -1) {
-        queryModel = vendorModels[0];
+      if (vendorModels.length > 0 && queryModel && !modelListContains(vendorModels, queryModel)) {
+        queryModel = modelEntryValue(vendorModels[0]);
       }
     }
+    // Guard against anything upstream having set queryModel to an object
+    // (e.g. a cached ModelInfo leaked through). Always coerce to string id.
+    if (queryModel && typeof queryModel !== "string") {
+      queryModel = modelEntryValue(queryModel) || undefined;
+    }
 
     var codexConfig = getCodexConfig(sm);
     var mergedMcpServers = mergeMcpServers(getMcpServers(), getRemoteMcpServers) || undefined;
@@ -1480,6 +1501,10 @@ function createSDKBridge(opts) {
   }
 
   async function setModel(session, model) {
+    // Normalize to string id in case a { value, displayName } object slips in
+    if (model && typeof model !== "string") {
+      model = modelEntryValue(model);
+    }
     if (!session.queryInstance) {
       // No active query — just store the model for next startQuery
       sm.currentModel = model;

package/lib/sessions.js

@@ -661,6 +661,8 @@ function createSessionManager(opts) {
       bookmarked: false,
       favoriteOrder: null,
     };
+    if (opts && opts.vendor) session.vendor = opts.vendor;
+    if (opts && opts.ownerId) session.ownerId = opts.ownerId;
     sessions.set(localId, session);
     saveSessionFile(session);
     switchSession(localId, targetWs);

package/package.json

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