clay-server 2.45.0-beta.3 → 2.45.0-beta.4

package/lib/project.js

@@ -907,13 +907,20 @@ function createProjectContext(opts) {
                 slug: slug,
               });
             } else if ((!sm.modelsByVendor || !sm.modelsByVendor[msg.vendor]) && typeof vendorAdapter.init === "function") {
-              await vendorAdapter.init({
-                cwd: cwd,
-                clayPort: serverPort,
-                clayTls: serverTls,
-                clayAuthToken: serverAuthToken,
-                slug: slug,
-              });
+              // Init warms the adapter, but a slow/failed init must not block
+              // model listing (e.g. Codex models are a fixed list). Keep going
+              // to supportedModels() even if init throws.
+              try {
+                await vendorAdapter.init({
+                  cwd: cwd,
+                  clayPort: serverPort,
+                  clayTls: serverTls,
+                  clayAuthToken: serverAuthToken,
+                  slug: slug,
+                });
+              } catch (e) {
+                console.error("[project] " + msg.vendor + " init failed (continuing to model list):", e.message || e);
+              }
             }
             if (vendorAdapter) {
               sm.availableVendors = Object.keys(adapters);

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

@@ -443,8 +443,18 @@ 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")) {
-          if (store.get('vendorSelectionLocked') && store.get('currentModel')) {
-            // Keep the user's existing selection; only update models list
+          // Keep the user's existing selection only if it actually belongs to
+          // this vendor's model list. Otherwise (e.g. switching to a Codex
+          // session while currentModel is still a Claude model) snap to the
+          // server-provided default so the chip doesn't show a cross-vendor
+          // model.
+          var _curModel = store.get('currentModel');
+          var _curInList = !!_curModel && (msg.models || []).some(function (m) {
+            var v = typeof m === "string" ? m : (m && m.value);
+            return v === _curModel;
+          });
+          if (store.get('vendorSelectionLocked') && _curInList) {
+            // Keep the user's existing (valid) selection; only update models list
           } else {
             _miUpdate.currentModel = _modelVal || "";
           }

package/lib/sdk-message-processor.js

@@ -36,6 +36,50 @@ function attachMessageProcessor(ctx) {
     sm.sendToSession(session, obj);
   }
 
+  // Emit the "not logged in" signal (WS message + notification) so the client
+  // auto-opens the login modal. Shared by the Claude path (login-prompt text
+  // detection) and the Codex path (app-server unauthorized error). Deduped
+  // per session to avoid spamming when multiple auth errors arrive in a burst.
+  function emitAuthRequired(session) {
+    var now = Date.now();
+    if (session._lastAuthEmit && (now - session._lastAuthEmit) < 5000) return;
+    session._lastAuthEmit = now;
+
+    var authUser = session.ownerId ? usersModule.findUserById(session.ownerId) : null;
+    var authLinuxUser = authUser && authUser.linuxUser ? authUser.linuxUser : null;
+    var canAutoLogin = !usersModule.isMultiUser()
+      || !!authLinuxUser
+      || (authUser && authUser.role === "admin");
+    var authTitle = session.vendor === "codex" ? "Codex is not logged in." : "Claude Code is not logged in.";
+    var loginCommand = session.vendor === "codex"
+      ? "codex login --device-auth"
+      : "claude login";
+    var _nmLogin = getNotificationsModule();
+    sendAndRecord(session, {
+      type: "auth_required",
+      text: authTitle,
+      vendor: session.vendor || "claude",
+      loginCommand: loginCommand,
+      linuxUser: authLinuxUser,
+      canAutoLogin: canAutoLogin,
+    });
+    if (_nmLogin) {
+      _nmLogin.notify("auth_required", {
+        title: authTitle,
+        body: "Open a terminal, then click the URL and follow the instructions.",
+        slug: slug,
+        sessionId: session.localId,
+        ownerId: session.ownerId || null,
+        vendor: session.vendor || "claude",
+        loginCommand: loginCommand,
+        linuxUser: authLinuxUser,
+        canAutoLogin: canAutoLogin,
+      });
+    }
+    // Reset CLI session so the next query starts fresh with new auth.
+    session.cliSessionId = null;
+  }
+
   function getModelsForVendor(vendor) {
     if (vendor && sm.modelsByVendor && sm.modelsByVendor[vendor]) return sm.modelsByVendor[vendor];
     return sm.availableModels || [];
@@ -447,40 +491,7 @@ function attachMessageProcessor(ctx) {
       // Detect "Not logged in / Please run /login" from SDK.
       // This is a short canned response with zero cost, not actual AI output.
       if (isLoginPrompt) {
-        var authUser = session.ownerId ? usersModule.findUserById(session.ownerId) : null;
-        var authLinuxUser = authUser && authUser.linuxUser ? authUser.linuxUser : null;
-        var canAutoLogin = !usersModule.isMultiUser()
-          || !!authLinuxUser
-          || (authUser && authUser.role === "admin");
-        var authTitle = session.vendor === "codex" ? "Codex is not logged in." : "Claude Code is not logged in.";
-        var loginCommand = session.vendor === "codex"
-          ? "codex login --device-auth"
-          : "claude login";
-        var _nmLogin = getNotificationsModule();
-        var authMsg = {
-          type: "auth_required",
-          text: authTitle,
-          vendor: session.vendor || "claude",
-          loginCommand: loginCommand,
-          linuxUser: authLinuxUser,
-          canAutoLogin: canAutoLogin,
-        };
-        sendAndRecord(session, authMsg);
-        if (_nmLogin) {
-          _nmLogin.notify("auth_required", {
-            title: authTitle,
-            body: "Open a terminal, then click the URL and follow the instructions.",
-            slug: slug,
-            sessionId: session.localId,
-            ownerId: session.ownerId || null,
-            vendor: session.vendor || "claude",
-            loginCommand: loginCommand,
-            linuxUser: authLinuxUser,
-            canAutoLogin: canAutoLogin,
-          });
-        }
-        // Reset CLI session so next query starts fresh with new auth
-        session.cliSessionId = null;
+        emitAuthRequired(session);
       }
       sendAndRecord(session, { type: "done", code: 0 });
       var _donePreviewText = (session.responsePreview || "").replace(/\s+/g, " ").trim();
@@ -751,6 +762,14 @@ function attachMessageProcessor(ctx) {
         message: parsed.message || "",
       });
 
+    } else if (parsed.yokeType === "auth_required") {
+      // Vendor adapter signalled the session isn't authenticated (e.g. Codex
+      // app-server returned an unauthorized/token-revoked error). Trigger the
+      // same login flow as the Claude login-prompt path.
+      session.isProcessing = false;
+      onProcessingChanged();
+      emitAuthRequired(session);
+
     } else if (parsed.yokeType === "model_refusal") {
       // Model declined the request. "fallback" => the CLI retried on another
       // model; "no_fallback" => the turn ended with a refusal.

package/lib/whats-new-content.js

@@ -27,6 +27,7 @@ var ENTRIES = [
     title: "TUI becomes the default for Claude sessions",
     publishedAt: "2026-05-25",
     image: null,
+    popup: false, // superseded by "GUI is back"; keep in the home feed only
     summary: "Anthropic is splitting Claude billing into Interactive and Programmatic buckets on June 15. To keep working with your existing plan, Clay opens Claude sessions in the embedded claude CLI by default from that date.",
     body: '' +
       '<p><strong>2026-06-15 Anthropic billing change.</strong> Claude subscriptions split into two buckets:</p>' +
@@ -55,6 +56,7 @@ var ENTRIES = [
     title: "Mates leaves the official feature set",
     publishedAt: "2026-05-25",
     image: null,
+    popup: false, // superseded by "GUI is back"; keep in the home feed only
     summary: "June 15 will be Mates' last day as a first-class Clay feature. It continues as a separate standalone project so Clay can focus fully on being a developer tool.",
     body: '' +
       '<p>On <strong>2026-06-15</strong>, Mates leaves Clay\'s official feature set. Your existing Mates and their knowledge files will remain on disk; we will share migration instructions and a link to the new standalone project before the cutover.</p>' +
@@ -63,6 +65,20 @@ var ENTRIES = [
       '<p>We are formally positioning Clay as a <strong>developer tool</strong>. From here on, every roadmap decision is judged by a single question: does it make Clay the sleekest, sharpest workspace on the AI-coding frontier? Mates no longer fits that bar cleanly, so it gets its own home where it can evolve on its own terms.</p>' +
       '<p>Thanks for being here. Clay only gets sharper from here.</p>',
   },
+  {
+    id: "2026-07-gui-is-back",
+    title: "GUI is back as the default",
+    publishedAt: "2026-07-01",
+    image: null,
+    summary: "Anthropic reversed the June 15 billing split, so SDK usage is no longer billed separately. Clay opens Claude sessions in the GUI chat again by default. Mates is now off by default as it winds down.",
+    body: '' +
+      '<p><strong>Good news: Anthropic walked back the June 15 billing change.</strong> The planned Interactive vs. Programmatic split (which would have charged Claude Agent SDK usage at full API rates) is off the table, so the reason we moved everyone to the TUI is gone.</p>' +
+      '<h3>GUI is the default again</h3>' +
+      '<p>New Claude sessions open in the <strong>GUI chat</strong> (SDK) by default, the way they did before. The embedded <code>claude</code> <strong>TUI</strong> is still there whenever you want it &mdash; toggle <strong>"Open Claude as terminal (TUI)"</strong> in Settings.</p>' +
+      '<h3>Mates is off by default</h3>' +
+      '<p>As announced, <strong>Mates</strong> is no longer a first-class Clay feature. It is now <strong>off by default</strong> so Clay stays focused as a developer tool. Your existing Mates and their knowledge files remain on disk &mdash; if you still use them, re-enable Mates in <strong>Settings</strong>.</p>' +
+      '<p>Clay only gets sharper from here.</p>',
+  },
 ];
 
 module.exports = { ENTRIES: ENTRIES };

package/lib/whats-new.js

@@ -26,6 +26,9 @@ function getStateForUser(userId) {
   var seen = (typeof users.getWhatsNewSeenIds === "function" && userId) ? users.getWhatsNewSeenIds(userId) : [];
   var unseenIds = [];
   for (var i = 0; i < entries.length; i++) {
+    // popup:false entries stay in the home feed (entries) as history but never
+    // auto-pop in the carousel, so superseded announcements don't resurface.
+    if (entries[i] && entries[i].popup === false) continue;
     if (entries[i] && entries[i].id && seen.indexOf(entries[i].id) === -1) {
       unseenIds.push(entries[i].id);
     }

package/lib/yoke/adapters/codex.js

@@ -145,6 +145,16 @@ function normalizePlanStatus(status) {
   return "pending";
 }
 
+// Detect Codex "not logged in" errors. Codex surfaces auth failures several
+// ways depending on transport: a clean error event with
+// codexErrorInfo:"unauthorized", or a turn/failed / item error whose message
+// carries a 401 / token-revoked / missing-bearer / "sign in again" string.
+// Callers map a match to the neutral auth_required yokeType.
+function isCodexAuthError(text, errObj) {
+  if (errObj && errObj.codexErrorInfo === "unauthorized") return true;
+  return /sign in again|token[_ ]?revoked|invalidated oauth|missing bearer|unauthorized|\b401\b/i.test(String(text || ""));
+}
+
 function extractPromptSuggestion(params) {
   if (!params) return "";
   if (typeof params.suggestion === "string") return params.suggestion;
@@ -226,9 +236,14 @@ function flattenEvent(notification, state) {
   }
 
   if (method === "turn/failed") {
+    var tfMsg = params.error ? params.error.message : "Turn failed";
+    if (isCodexAuthError(tfMsg, params.error)) {
+      events.push({ yokeType: "auth_required", vendor: "codex" });
+      return events;
+    }
     events.push({
       yokeType: "error",
-      text: params.error ? params.error.message : "Turn failed",
+      text: tfMsg,
     });
     return events;
   }
@@ -525,9 +540,14 @@ function flattenEvent(notification, state) {
 
     // Error item
     if (item.type === "error") {
+      var ieMsg = item.message || "Unknown error";
+      if (isCodexAuthError(ieMsg, item)) {
+        events.push({ yokeType: "auth_required", vendor: "codex" });
+        return events;
+      }
       events.push({
         yokeType: "error",
-        text: item.message || "Unknown error",
+        text: ieMsg,
       });
       return events;
     }
@@ -551,6 +571,20 @@ function flattenEvent(notification, state) {
     return events;
   }
 
+  // Top-level error event. Codex signals "not logged in" via an unauthorized /
+  // token-revoked error (not a login-prompt message like Claude), so map it to
+  // the neutral auth_required yokeType to drive the login flow.
+  if (method === "error" && params && params.error) {
+    var cErr = params.error;
+    var cErrMsg = cErr.message || "Codex error";
+    if (isCodexAuthError(cErrMsg, cErr)) {
+      events.push({ yokeType: "auth_required", vendor: "codex" });
+      return events;
+    }
+    events.push({ yokeType: "error", text: cErrMsg });
+    return events;
+  }
+
   // Unknown event type - pass through
   console.log("[yoke/codex] UNHANDLED event:", method, JSON.stringify(params).substring(0, 200));
   events.push({
@@ -922,10 +956,10 @@ function createCodexQueryHandle(appServer, queryOpts) {
       if (!isCancelled() && e.name !== "AbortError") {
         console.error("[yoke/codex] runQueryLoop error:", e.message || e);
         console.error("[yoke/codex] stack:", e.stack || "(no stack)");
-        pushEvent({
-          yokeType: "error",
-          text: e.message || String(e),
-        });
+        var loopErrMsg = e.message || String(e);
+        pushEvent(isCodexAuthError(loopErrMsg)
+          ? { yokeType: "auth_required", vendor: "codex" }
+          : { yokeType: "error", text: loopErrMsg });
       }
     }
 
@@ -1047,7 +1081,19 @@ function createCodexAdapter(opts) {
   var _cwd = (opts && opts.cwd) || process.cwd();
   var _slug = (opts && opts.slug) || "";
   var _defaultInitOpts = Object.assign({}, opts || {});
-  var _cachedModels = [];
+  // Codex models are a fixed list (the app-server doesn't enumerate them), so
+  // model listing must not depend on a successful app-server init — otherwise a
+  // slow/failed `initialize` leaves the picker empty and the chip shows the
+  // previous vendor's model.
+  var CODEX_MODELS = [
+    "gpt-5.5",
+    "gpt-5.4",
+    "gpt-5.4-mini",
+    "gpt-5.3-codex",
+    "gpt-5.3-codex-spark",
+    "gpt-5.2",
+  ];
+  var _cachedModels = CODEX_MODELS.slice();
   var _appServer = null;
   var _initPromise = null;
   var _shutdownPromise = null;
@@ -1297,16 +1343,9 @@ function createCodexAdapter(opts) {
           throw createShutdownError();
         }
 
-        console.log("[codex] App-server initialized, models: gpt-5.5, gpt-5.4, gpt-5.4-mini, gpt-5.3-codex, gpt-5.3-codex-spark, gpt-5.2");
+        console.log("[codex] App-server initialized, models: " + CODEX_MODELS.join(", "));
 
-        _cachedModels = [
-          "gpt-5.5",
-          "gpt-5.4",
-          "gpt-5.4-mini",
-          "gpt-5.3-codex",
-          "gpt-5.3-codex-spark",
-          "gpt-5.2",
-        ];
+        _cachedModels = CODEX_MODELS.slice();
 
         // Discover skills: built-in Codex skills + Claude skills
         var skillNames = [];
@@ -1361,7 +1400,8 @@ function createCodexAdapter(opts) {
     },
 
     supportedModels: function() {
-      return Promise.resolve(_cachedModels.slice());
+      // Fixed list; return it without requiring a live app-server init.
+      return Promise.resolve(CODEX_MODELS.slice());
     },
 
     createToolServer: function(def) {

package/lib/yoke/codex-app-server.js

@@ -164,6 +164,7 @@ CodexAppServer.prototype.start = function() {
         while (lines.length > 1) {
           var line = lines.shift();
           if (line.trim()) console.log("[codex-app-server stderr]", line);
+          self._maybeSignalAuthError(line);
         }
         self._stderrBuf = lines[0] || "";
       });
@@ -222,6 +223,23 @@ CodexAppServer.prototype._handleMessage = function(msg) {
   }
 };
 
+// The definitive "not logged in" signal from Codex is a 401 on its own
+// responses endpoint, which only appears on stderr (not as a JSON-RPC error).
+// When we see it, synthesize an error event so the adapter maps it to the
+// neutral auth_required yokeType. Deduped so a burst of 401 retries collapses.
+CodexAppServer.prototype._maybeSignalAuthError = function(line) {
+  if (!this.eventHandler || !line || this._authSignalSent) return;
+  var isAuth = /missing bearer|token[_ ]?revoked|invalidated oauth|please sign in again/i.test(line)
+    || (/\b401\b/.test(line) && /unauthorized|responses|openai\.com|chatgpt\.com/i.test(line));
+  if (!isAuth) return;
+  this._authSignalSent = true;
+  var self = this;
+  setTimeout(function () { self._authSignalSent = false; }, 15000);
+  try {
+    this.eventHandler({ method: "error", params: { error: { codexErrorInfo: "unauthorized", message: line } } });
+  } catch (e) {}
+};
+
 // Send a JSON-RPC request (expects a response)
 CodexAppServer.prototype.send = function(method, params, timeoutMs) {
   var self = this;

package/package.json

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