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

package/lib/project-user-message.js

@@ -145,7 +145,8 @@ function attachUserMessage(ctx) {
           return true;
         }
       }
-      var t = tm.create(msg.cols || 80, msg.rows || 24, getOsUserInfoForWs(ws), ws);
+      var t = tm.create(msg.cols || 80, msg.rows || 24, getOsUserInfoForWs(ws), ws,
+        msg.initialCommand ? { initialInput: String(msg.initialCommand) } : undefined);
       if (!t) {
         sendTo(ws, { type: "term_error", error: "Cannot create terminal (node-pty not available or limit reached)" });
         return true;

package/lib/public/css/tui-attention.css

@@ -349,6 +349,12 @@ body.tui-suspended #tui-resume-bar {
   border: 1px solid var(--border);
   box-shadow: 0 12px 48px rgba(0, 0, 0, 0.6);
 }
+/* Compact variant for short content (e.g. login wizard): smaller box so the
+   terminal hugs the content instead of leaving a tall empty area below. */
+.tui-modal.tui-modal-compact {
+  width: min(720px, 96%);
+  height: min(480px, 90%);
+}
 .tui-modal-header {
   display: flex;
   align-items: center;

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

@@ -29,7 +29,7 @@ import { updateSettingsModels, updateSettingsStats, updateDaemonConfig, handleSe
 import { handleTermList, handleTermCreated, sendTerminalCommand, handleTermOutput, handleTermResized, handleTermExited, handleTermClosed } from './terminal.js';
 import { attachTuiView, detachTuiView, setTuiSuspendedView, tuiHandleTermOutput, tuiHandleTermResized, tuiHandleTermExited, tuiHandleTermClosed } from './session-tui-view.js';
 import { handleTuiTranscriptState } from './tui-grab.js';
-import { tuiModalHandleTermOutput, tuiModalHandleTermResized, tuiModalHandleTermExited, tuiModalHandleTermClosed } from './tui-attention.js';
+import { tuiModalHandleTermOutput, tuiModalHandleTermResized, tuiModalHandleTermExited, tuiModalHandleTermClosed, openTuiModal } from './tui-attention.js';
 import { updateTerminalList, handleContextSourcesState, updateEmailAccountList, updateEmailUnreadCounts, handleEmailTestResult, handleEmailAddResult, handleEmailRemoveResult, handleEmailDefaults } from './context-sources.js';
 import { refreshEmailSettings } from './user-settings.js';
 import { handleNotesList, handleNoteCreated, handleNoteUpdated, handleNoteDeleted } from './sticky-notes.js';
@@ -57,7 +57,7 @@ import { handleRemoteCursorMove, handleRemoteCursorLeave, handleRemoteSelection,
 import { showLoopBanner, updateLoopBanner, updateLoopInputVisibility, showRalphApprovalBar, updateRalphApprovalStatus, openRalphPreviewModal, showExecModal, updateExecModalStatus } from './app-loop-ui.js';
 import { showDebateSticky, showDebateConcludeConfirm, showDebateUserFloor, exitDebateFloorMode, exitDebateConcludeMode, exitDebateEndedMode, updateDebateRound, renderDebateUserFloorDone } from './app-debate-ui.js';
 import { handleSkillInstallWs } from './app-skills-install.js';
-import { handleNotificationsState, handleNotificationCreated, handleNotificationDismissed, handleNotificationDismissedAll, showUpdateBanner } from './app-notifications.js';
+import { handleNotificationsState, handleNotificationCreated, handleNotificationDismissed, handleNotificationDismissedAll, showUpdateBanner, autoStartLoginIfNeeded } from './app-notifications.js';
 import { handleDebatePreparing, handleDebateBriefReady, renderDebateBriefReady, handleDebateStarted, renderDebateStarted, handleDebateTurn, handleDebateActivity, handleDebateStream, handleDebateTurnDone, handleDebateCommentQueued, handleDebateCommentInjected, renderDebateCommentInjected, handleDebateResumed, handleDebateEnded, renderDebateEnded, handleDebateError, isDebateActive, renderMcpDebateProposal, renderDebateUserResume } from './debate.js';
 import { handleMentionStart, handleMentionActivity, handleMentionStream, handleMentionDone, handleMentionError, renderMentionUser, renderMentionResponse, renderUserMention } from './mention.js';
 
@@ -1156,6 +1156,9 @@ export function processMessage(msg) {
         appendDelta((msg.text || "Authentication required.") + "\n");
         setStatus("connected");
         if (!store.get('loopActive')) enableMainInput();
+        // Auto-open the login modal terminal when the session can self-login.
+        // No-op otherwise (the auth_required banner remains the manual path).
+        autoStartLoginIfNeeded(msg);
         break;
 
       case "rate_limit":
@@ -1338,6 +1341,19 @@ export function processMessage(msg) {
         break;
 
       case "term_created":
+        // Login-modal path: the terminal was created with the login command as
+        // its initial input; attach the modal dialog to it (replays scrollback
+        // so the login URL is visible) instead of the sidebar terminal.
+        if (store.get('pendingLoginModal')) {
+          var _lm = store.get('pendingLoginModal');
+          store.set({ pendingLoginModal: null });
+          openTuiModal(msg.id, _lm.slug, {
+            sessionTitle: (_lm.vendor === "codex" ? "Codex" : "Claude") + " login",
+            projectName: _lm.slug,
+            compact: true,
+          });
+          break;
+        }
         handleTermCreated(msg);
         if (store.get('pendingTermCommand')) {
           var cmd = store.get('pendingTermCommand');

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

@@ -252,7 +252,7 @@ function showBanner(notif, autoDismissMs) {
           removeBanner(banner);
           dismissNotif(notif.id);
           var authMeta = notif.meta || {};
-          startLoginCommand(authMeta.loginCommand || ((authMeta.vendor || "claude") === "codex" ? "codex login --device-auth" : "claude login"));
+          startLoginInModal(authMeta.loginCommand || ((authMeta.vendor || "claude") === "codex" ? "codex login --device-auth" : "claude login"), authMeta.vendor || "claude");
           showLoginReminderBanner();
         });
       }
@@ -311,7 +311,42 @@ function showBanner(notif, autoDismissMs) {
   }
 }
 
+// Open the login terminal as a modal dialog (the same modal used for TUI
+// attention), running the vendor login command. The terminal is created with
+// the command as its initial input, so when the modal attaches it replays the
+// scrollback and the user sees the login URL / prompts immediately.
+// Falls back to the sidebar terminal if the current project slug is unknown
+// (the modal needs a slug to open its own WS to the project).
+function currentProjectSlug() {
+  var slug = store.get('currentSlug') || "";
+  if (slug) return slug;
+  // Fallback: derive from the URL (/p/<slug>/...).
+  try {
+    var m = (window.location.pathname || "").match(/^\/p\/([a-z0-9_-]+)/);
+    if (m) return m[1];
+  } catch (e) {}
+  return "";
+}
+
+function startLoginInModal(loginCommand, vendor) {
+  if (authReminderVisible) return;
+  var ws = getWs();
+  if (!ws || ws.readyState !== 1) return;
+  var cmd = loginCommand || (vendor === "codex" ? "codex login --device-auth" : "claude login");
+  var slug = currentProjectSlug();
+  if (!slug) { startLoginCommand(cmd); return; }
+  store.set({ pendingLoginModal: { slug: slug, vendor: vendor || "claude" } });
+  ws.send(JSON.stringify({
+    type: "term_create",
+    cols: 100,
+    rows: 30,
+    initialCommand: cmd + "\n",
+  }));
+}
+
+// Sidebar-terminal fallback (used when no slug is available for the modal).
 function startLoginCommand(loginCommand) {
+  if (authReminderVisible) return;
   var ws = getWs();
   if (!ws || ws.readyState !== 1) return;
   var termCommand = (loginCommand || "claude login") + "\n";
@@ -320,6 +355,23 @@ function startLoginCommand(loginCommand) {
   openTerminal();
 }
 
+// Auto-open the login modal and run the login command when the server reports
+// the vendor isn't logged in. The popup terminal runs as the connected user's
+// own OS identity (term_create -> getOsUserInfoForWs), so login always targets
+// the right account — we pop it unconditionally rather than gating on
+// canAutoLogin. Idempotent: startLoginInModal is guarded by authReminderVisible
+// so repeat auth_required events no-op.
+export function autoStartLoginIfNeeded(msg) {
+  if (!msg) return false;
+  if (authReminderVisible) return false;
+  var vendor = msg.vendor || "claude";
+  var cmd = msg.loginCommand
+    || (vendor === "codex" ? "codex login --device-auth" : "claude login");
+  startLoginInModal(cmd, vendor);
+  showLoginReminderBanner();
+  return true;
+}
+
 function showLoginReminderBanner() {
   if (!bannerContainer) return;
   authReminderVisible = true;
@@ -554,6 +606,11 @@ export function handleNotificationCreated(msg) {
   unreadCount = msg.unreadCount;
   updateBadge();
 
+  // auth_required no longer pops a banner: the login terminal modal opens
+  // automatically (see autoStartLoginIfNeeded). Keep the notification in the
+  // center (above) for history, but don't show the redundant banner.
+  if (notif.type === "auth_required") return;
+
   // tui_attention drives the project icon shake and the favicon blink —
   // same visual cues the SDK already produces from pendingPermissions /
   // permission_request messages, so the user notices either kind without

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

@@ -178,25 +178,21 @@ function hasBeta(name) {
 function rebuildModelList() {
   if (!configModelList) return;
   // Picker visibility by vendor+mode:
-  //   Claude TUI -> shown (Claude TUI accepts mid-thread model swaps).
-  //   Claude GUI -> hidden (Agent SDK binds model at session creation;
-  //                 changing mid-thread breaks tool schemas and cache reuse).
-  //   Codex GUI  -> shown but locked after the first message (Codex protocol
-  //                 binds model at thread creation; sdk-bridge setModel
-  //                 already stores into sm.currentModel when there's no
-  //                 active queryInstance, so picks made before the first
-  //                 message do take effect on thread start).
+  //   Claude TUI -> shown, free (Claude TUI accepts mid-thread model swaps).
+  //   GUI (Claude SDK + Codex) -> shown, but locked once the session has
+  //                 history. Both bind the model at session creation and
+  //                 changing mid-thread breaks tool schemas / cache reuse,
+  //                 so we allow the pick only before the first message.
+  //                 sdk-bridge setModel stores into sm.currentModel when
+  //                 there's no active queryInstance, so a pick made before
+  //                 the first message takes effect on session start.
   var modelSection = configModelList.parentElement;
   var s = store.snap();
   var vendor = s.currentVendor || "claude";
-  var hideModelPicker = s.activeSessionMode === "gui" && vendor === "claude";
-  if (modelSection) modelSection.style.display = hideModelPicker ? "none" : "";
+  if (modelSection) modelSection.style.display = "";
   configModelList.innerHTML = "";
-  if (hideModelPicker) return;
 
-  var lockedForCodex = vendor === "codex"
-    && s.activeSessionMode === "gui"
-    && !!s.sessionHasHistory;
+  var lockedForGui = s.activeSessionMode === "gui" && !!s.sessionHasHistory;
 
   var list = s.currentModels.length > 0 ? s.currentModels : (s.currentModel ? [{ value: s.currentModel, displayName: s.currentModel }] : []);
   for (var i = 0; i < list.length; i++) {
@@ -207,12 +203,12 @@ function rebuildModelList() {
     var btn = document.createElement("button");
     btn.className = "config-radio-item";
     if (value === s.currentModel) btn.classList.add("active");
-    if (lockedForCodex) btn.classList.add("locked");
+    if (lockedForGui) btn.classList.add("locked");
     btn.dataset.model = value;
     btn.textContent = label;
-    if (lockedForCodex) {
+    if (lockedForGui) {
       btn.disabled = true;
-      btn.title = "Model is locked after the first message in a Codex session. Start a new session to change it.";
+      btn.title = "Model is locked after the first message in a GUI session. Start a new session to change it.";
     } else {
       btn.addEventListener("click", function () {
         var model = this.dataset.model;
@@ -227,7 +223,7 @@ function rebuildModelList() {
     configModelList.appendChild(btn);
   }
 
-  if (lockedForCodex) {
+  if (lockedForGui) {
     var hint = document.createElement("div");
     hint.className = "config-model-hint";
     hint.textContent = "Locked after first message — start a new session to change.";

package/lib/public/modules/tui-attention.js

@@ -147,6 +147,12 @@ export function openTuiModal(terminalId, sourceSlug, info) {
   });
   modalEl.classList.remove("hidden");
 
+  // Compact sizing for short, content-light terminals (e.g. the login
+  // wizard) so the box hugs the content instead of leaving a tall empty
+  // black area below it. Full-size for live TUI sessions that fill the screen.
+  var boxEl = modalEl.querySelector(".tui-modal");
+  if (boxEl) boxEl.classList.toggle("tui-modal-compact", !!infoObj.compact);
+
   var bodyEl = modalEl.querySelector(".tui-modal-body");
   bodyEl.innerHTML = "";
   modalXterm = new Terminal({

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

@@ -7,6 +7,7 @@
 var { spawn } = require("child_process");
 var readline = require("readline");
 var path = require("path");
+var fs = require("fs");
 var { createRequire } = require("module");
 
 // --- Find the codex binary path ---
@@ -48,7 +49,17 @@ function findCodexPath() {
     var platformPkgJson = codexRequire.resolve(platformPkg + "/package.json");
     var vendorRoot = path.join(path.dirname(platformPkgJson), "vendor");
     var binaryName = process.platform === "win32" ? "codex.exe" : "codex";
-    return path.join(vendorRoot, triple, "codex", binaryName);
+    // The binary layout changed across versions: 0.142+ ships it under
+    // vendor/<triple>/bin/, older builds used vendor/<triple>/codex/.
+    // Try the known layouts and return the first that exists.
+    var candidates = [
+      path.join(vendorRoot, triple, "bin", binaryName),
+      path.join(vendorRoot, triple, "codex", binaryName),
+    ];
+    for (var i = 0; i < candidates.length; i++) {
+      if (fs.existsSync(candidates[i])) return candidates[i];
+    }
+    throw new Error("codex binary not found in any known layout under " + path.join(vendorRoot, triple));
   } catch (e) {
     throw new Error("Could not find codex binary: " + e.message);
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "clay-server",
-  "version": "2.45.0-beta.1",
+  "version": "2.45.0-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",
@@ -50,7 +50,7 @@
   "dependencies": {
     "@anthropic-ai/claude-agent-sdk": "^0.3.196",
     "@lydell/node-pty": "^1.2.0-beta.3",
-    "@openai/codex": "^0.124.0",
+    "@openai/codex": "^0.142.4",
     "imapflow": "^1.3.1",
     "nodemailer": "^6.10.1",
     "qrcode-terminal": "^0.12.0",