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

package/lib/public/modules/vendor-login.js

@@ -0,0 +1,287 @@
+// vendor-login.js - Vendor login (auth_required) recovery flow.
+//
+// The server owns the login terminal (see lib/project-vendor-login.js): exactly
+// one per vendor per project, tracked server-side, killed once the login lands.
+// This module is the client half of that contract - it asks for the flow, opens
+// the modal on whatever terminal the server hands back, and reflects the flow's
+// state in a banner.
+//
+// Nothing here spawns a terminal speculatively. Every auth_required after the
+// first is a no-op while a flow is live, which is what stops the login-terminal
+// pile-up and the endless auth_required -> login -> 401 loop.
+
+import { store } from './store.js';
+import { getWs } from './ws-ref.js';
+import { refreshIcons, iconHtml } from './icons.js';
+import { openTuiModal, closeTuiModal, getTuiModalTerminalId } from './tui-attention.js';
+import { forwardPaneAuthRequired } from './pane-bridge.js';
+
+// vendor -> { terminalId, startedAt } as last broadcast by the server.
+var activeFlows = Object.create(null);
+// vendor -> true between sending vendor_login_start and hearing back.
+var pendingStarts = Object.create(null);
+// Vendor whose login terminal the modal is currently showing.
+var modalVendor = null;
+// Set while this module tears the modal down itself, so the modal's close hook
+// does not read a programmatic close as "the user gave up".
+var closingModalInternally = false;
+
+function vendorDisplayName(vendor) {
+  var vendors = store.get('vendorInfo') || {};
+  var info = vendors[vendor];
+  if (info && info.displayName) return info.displayName;
+  return vendor === "codex" ? "Codex" : "Claude Code";
+}
+
+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 "";
+}
+
+// The banner surface belongs to the notification center. Query it rather than
+// importing app-notifications so the dependency stays one-directional
+// (app-notifications -> vendor-login).
+function bannerContainer() {
+  return document.querySelector(".notif-banner-container");
+}
+
+function removeBannerEl(el) {
+  if (!el) return;
+  el.classList.remove("show");
+  setTimeout(function () {
+    if (el.parentNode) el.parentNode.removeChild(el);
+  }, 300);
+}
+
+function clearLoginBanners() {
+  var container = bannerContainer();
+  if (!container) return;
+  var existing = container.querySelectorAll('[data-vendor-login="true"]');
+  for (var i = 0; i < existing.length; i++) removeBannerEl(existing[i]);
+}
+
+function showLoginBanner(opts) {
+  var container = bannerContainer();
+  if (!container) return null;
+  clearLoginBanners();
+
+  var banner = document.createElement("div");
+  banner.className = "notif-banner notif-banner-update";
+  banner.setAttribute("data-notif-id", "_vendor_login");
+  banner.setAttribute("data-vendor-login", "true");
+  banner.innerHTML =
+    '<div class="notif-banner-icon">' + iconHtml(opts.icon || "check-circle") + '</div>' +
+    '<div class="notif-banner-body">' +
+      '<div class="notif-banner-project">CLAY</div>' +
+      '<div class="notif-banner-title">' + opts.title + '</div>' +
+      '<div class="notif-banner-text">' + opts.text + '</div>' +
+    '</div>' +
+    '<button class="notif-banner-close">' + iconHtml("x") + '</button>';
+
+  container.appendChild(banner);
+  refreshIcons();
+  requestAnimationFrame(function () { banner.classList.add("show"); });
+
+  var closeBtn = banner.querySelector(".notif-banner-close");
+  if (closeBtn) {
+    closeBtn.addEventListener("click", function (e) {
+      e.stopPropagation();
+      removeBannerEl(banner);
+      if (opts.onDismiss) opts.onDismiss();
+    });
+  }
+  if (typeof opts.autoDismissMs === "number") {
+    setTimeout(function () { removeBannerEl(banner); }, opts.autoDismissMs);
+  }
+  return banner;
+}
+
+function showLoginStartedBanner(vendor) {
+  showLoginBanner({
+    icon: "check-circle",
+    title: vendorDisplayName(vendor) + " login started",
+    text: "Finish the sign-in in the terminal. Clay reloads the credentials on its own, so your sessions keep working - no new session needed.",
+    onDismiss: function () { cancelVendorLogin(vendor); },
+  });
+}
+
+function showLoginCompleteBanner(vendor) {
+  showLoginBanner({
+    icon: "check-circle",
+    title: "Signed in to " + vendorDisplayName(vendor),
+    text: "Credentials reloaded. Send your next message to continue.",
+    autoDismissMs: 6000,
+  });
+}
+
+function showLoginErrorBanner(vendor, error) {
+  showLoginBanner({
+    icon: "alert-triangle",
+    title: vendorDisplayName(vendor) + " login could not start",
+    text: error || "The login terminal could not be created.",
+    autoDismissMs: 8000,
+  });
+}
+
+function closeModalInternally() {
+  modalVendor = null;
+  closingModalInternally = true;
+  try {
+    closeTuiModal();
+  } finally {
+    closingModalInternally = false;
+  }
+}
+
+function closeModalForVendor(vendor, terminalId) {
+  if (modalVendor !== vendor) return;
+  var openId = getTuiModalTerminalId();
+  if (typeof terminalId === "number" && openId != null && openId !== terminalId) return;
+  closeModalInternally();
+}
+
+// ========================================================
+// Outgoing
+// ========================================================
+
+/**
+ * Ask the server to start (or hand back) the login terminal for a vendor.
+ * opts.auto marks a request triggered by an auth_required event; those never
+ * open a second prompt while a flow is already running.
+ */
+export function requestVendorLogin(vendor, opts) {
+  var options = opts || {};
+  var target = vendor || "claude";
+  if (options.auto && (activeFlows[target] || pendingStarts[target])) return false;
+
+  var ws = getWs();
+  if (!ws || ws.readyState !== 1) return false;
+
+  pendingStarts[target] = true;
+  ws.send(JSON.stringify({
+    type: "vendor_login_start",
+    vendor: target,
+    auto: !!options.auto,
+    sessionId: options.sessionId || store.get('activeSessionId') || null,
+  }));
+  showLoginStartedBanner(target);
+  return true;
+}
+
+export function cancelVendorLogin(vendor) {
+  var target = vendor || modalVendor;
+  if (!target) return;
+  delete pendingStarts[target];
+  delete activeFlows[target];
+  clearLoginBanners();
+  if (modalVendor === target) closeModalInternally();
+  var ws = getWs();
+  if (ws && ws.readyState === 1) {
+    ws.send(JSON.stringify({ type: "vendor_login_cancel", vendor: target }));
+  }
+}
+
+/**
+ * Auto-open the login flow when the server reports the vendor isn't logged in.
+ *
+ * Split panes have no banner surface of their own (the parent shell owns the
+ * single visible one), so a pane hands the event up instead of running two
+ * competing flows.
+ */
+export function autoStartLoginIfNeeded(msg) {
+  if (!msg) return false;
+  if (store.get('paneMode')) {
+    return forwardPaneAuthRequired({
+      vendor: msg.vendor || "claude",
+      sessionId: store.get('activeSessionId') || null,
+    });
+  }
+  var vendor = msg.vendor || "claude";
+  if (activeFlows[vendor] || pendingStarts[vendor]) return false;
+  return requestVendorLogin(vendor, { auto: true, sessionId: msg.sessionId || null });
+}
+
+// ========================================================
+// Incoming
+// ========================================================
+
+export function handleVendorLoginReady(msg) {
+  if (!msg || typeof msg.terminalId !== "number") return;
+  var vendor = msg.vendor || "claude";
+  delete pendingStarts[vendor];
+  activeFlows[vendor] = { terminalId: msg.terminalId, startedAt: Date.now() };
+
+  var slug = msg.slug || currentProjectSlug();
+  if (!slug) return;
+  modalVendor = vendor;
+  openTuiModal(msg.terminalId, slug, {
+    sessionTitle: vendorDisplayName(vendor) + " login",
+    projectName: slug,
+    compact: true,
+    // Dismissing the modal abandons the login: kill the terminal server-side
+    // so it never lingers in the sidebar terminal list.
+    onClose: function () {
+      if (closingModalInternally) return;
+      modalVendor = null;
+      cancelVendorLogin(vendor);
+    },
+  });
+}
+
+export function handleVendorLoginState(msg) {
+  if (!msg) return;
+  var next = Object.create(null);
+  var flows = msg.flows || [];
+  for (var i = 0; i < flows.length; i++) {
+    next[flows[i].vendor] = { terminalId: flows[i].terminalId, startedAt: flows[i].startedAt };
+    delete pendingStarts[flows[i].vendor];
+  }
+
+  // A flow the server dropped without an auth_refreshed (cancelled elsewhere,
+  // terminal killed from the sidebar) must not leave a stale modal behind.
+  var previous = Object.keys(activeFlows);
+  for (var p = 0; p < previous.length; p++) {
+    if (!next[previous[p]] && modalVendor === previous[p]) {
+      closeModalInternally();
+      clearLoginBanners();
+    }
+  }
+  activeFlows = next;
+}
+
+export function handleAuthRefreshed(msg) {
+  if (!msg) return;
+  var vendor = msg.vendor || "claude";
+  var flow = activeFlows[vendor];
+  delete pendingStarts[vendor];
+  delete activeFlows[vendor];
+  closeModalForVendor(vendor, flow ? flow.terminalId : undefined);
+  clearLoginBanners();
+  showLoginCompleteBanner(vendor);
+}
+
+export function handleVendorLoginError(msg) {
+  if (!msg) return;
+  var vendor = msg.vendor || "claude";
+  delete pendingStarts[vendor];
+  delete activeFlows[vendor];
+  if (modalVendor === vendor) closeModalInternally();
+  clearLoginBanners();
+  showLoginErrorBanner(vendor, msg.error);
+}
+
+export function requestVendorLoginState() {
+  var ws = getWs();
+  if (!ws || ws.readyState !== 1) return;
+  ws.send(JSON.stringify({ type: "vendor_login_state_request" }));
+}
+
+export function getActiveLoginFlow(vendor) {
+  return activeFlows[vendor] || null;
+}

package/lib/sdk-message-processor.js

@@ -1,5 +1,6 @@
 var usersModule = require("./users");
 var yoke = require("./yoke");
+var backgroundTaskTiming = require("./background-task-timing");
 
 function attachMessageProcessor(ctx) {
   var sm = ctx.sm;
@@ -686,8 +687,15 @@ function attachMessageProcessor(ctx) {
       }
 
     } else if (parsed.yokeType === "background_tasks_changed") {
-      var previousBackgroundTaskCount = (session.activeBackgroundTasks || []).length;
-      var activeBackgroundTasks = Array.isArray(parsed.tasks) ? parsed.tasks : [];
+      var previousBackgroundTasks = session.activeBackgroundTasks || [];
+      var previousBackgroundTaskCount = previousBackgroundTasks.length;
+      // Vendors re-send the whole list on every change, so carry each task's
+      // first-seen time forward; otherwise the composer's elapsed timer would
+      // restart whenever any other task starts or finishes.
+      var activeBackgroundTasks = backgroundTaskTiming.mergeStartTimes(
+        previousBackgroundTasks,
+        Array.isArray(parsed.tasks) ? parsed.tasks : []
+      );
       session.activeBackgroundTasks = activeBackgroundTasks;
       sendToSession(session, { type: "active_background_tasks", tasks: activeBackgroundTasks });
       if (previousBackgroundTaskCount !== activeBackgroundTasks.length) {

package/lib/tools-registry.js

@@ -137,7 +137,17 @@ function seedBuiltInCapsules(ctx) {
   for (var ri = 0; ri < REMOVED_BUILTIN_IDS.length; ri++) {
     fs.rmSync(path.join(root, REMOVED_BUILTIN_IDS[ri]), { recursive: true, force: true });
   }
-  var entries = fs.readdirSync(CAPSULES_ROOT, { withFileTypes: true });
+  // Clay ships no built-in Capsules any more, so lib/capsules/ is absent from a
+  // fresh checkout and from the npm tarball (neither git nor npm carries an
+  // empty directory). Seeding still owns the removed-built-in migration above
+  // and the marker below, so an absent root means "nothing to copy" rather than
+  // a failure. Anything other than a missing root is still a real error.
+  var entries = [];
+  try {
+    entries = fs.readdirSync(CAPSULES_ROOT, { withFileTypes: true });
+  } catch (e) {
+    if (e.code !== "ENOENT") throw e;
+  }
   var seeded = [];
   for (var i = 0; i < entries.length; i++) {
     if (!entries[i].isDirectory()) continue;

package/lib/ws-schema.js

@@ -171,6 +171,13 @@ var schema = {
   // Auth
   // -----------------------------------------------------------------------
   "auth_required":            { direction: "s2c", handler: "lib/public/modules/app-messages.js", description: "Authentication required (e.g. API key needed)" },
+  "vendor_login_start":       { direction: "c2s", handler: "lib/project-vendor-login.js", description: "Start (or re-attach to) the per-vendor login terminal" },
+  "vendor_login_cancel":      { direction: "c2s", handler: "lib/project-vendor-login.js", description: "Dismiss the login flow and kill its terminal" },
+  "vendor_login_state_request": { direction: "c2s", handler: "lib/project-vendor-login.js", description: "Ask for the project's active login flows" },
+  "vendor_login_ready":       { direction: "s2c", handler: "lib/public/modules/vendor-login.js", description: "Login terminal is available; open/re-attach the modal to it" },
+  "vendor_login_state":       { direction: "s2c", handler: "lib/public/modules/vendor-login.js", description: "Active login flows for this project (one per vendor)" },
+  "vendor_login_error":       { direction: "s2c", handler: "lib/public/modules/vendor-login.js", description: "The login flow could not be started" },
+  "auth_refreshed":           { direction: "s2c", handler: "lib/public/modules/vendor-login.js", description: "Login completed and the vendor adapter was restarted" },
 
   // -----------------------------------------------------------------------
   // Rate limiting / scheduling

package/lib/yoke/adapters/claude.js

@@ -400,11 +400,16 @@ function normalizeBackgroundTasks(tasks) {
     var nativeType = task && task.task_type;
     var taskType = nativeType === "local_bash" ? "shell"
       : nativeType === "local_agent" ? "agent" : "other";
-    return {
+    var normalized = {
       task_id: task && task.task_id,
       task_type: taskType,
       description: (task && task.description) || "",
     };
+    // The SDK does not report a start time today. Forward one if a future
+    // version adds it; otherwise the session stamps first-seen time.
+    var startedAt = task && (task.started_at || task.startedAt || task.created_at);
+    if (startedAt) normalized.started_at = startedAt;
+    return normalized;
   });
 }
 

package/lib/yoke/adapters/codex.js

@@ -1312,15 +1312,14 @@ function createCodexAdapter(opts) {
   // 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.
+  // Kept in sync with what `model/list` reports for the bundled codex build
+  // (0.152.1). Models the CLI no longer offers are rejected at turn/start, so
+  // listing them would only surface a runtime failure in the model picker.
   var CODEX_MODELS = [
     "gpt-5.6-terra",
     "gpt-5.6-sol",
     "gpt-5.6-luna",
     "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();

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

@@ -13,7 +13,13 @@ var { buildUserEnv } = require("../build-user-env");
 var { wrapSpawnAsUser } = require("../os-users");
 
 // --- Find the codex binary path ---
-// Mirrors the logic from @openai/codex-sdk findCodexPath()
+// Mirrors the logic from @openai/codex-sdk findCodexPath().
+//
+// The bundled @openai/codex platform package is the default. Set the
+// CLAY_CODEX_PATH env var to an existing executable to run a different codex
+// build (local dev build, system install, pinned older release); the chosen
+// binary is logged on every resolution. An unset or non-existent
+// CLAY_CODEX_PATH silently falls back to the bundled resolution.
 
 var PLATFORM_PACKAGE_BY_TARGET = {
   "aarch64-apple-darwin": "@openai/codex-darwin-arm64",
@@ -39,6 +45,15 @@ function getTargetTriple() {
 }
 
 function findCodexPath() {
+  var override = process.env.CLAY_CODEX_PATH;
+  if (override) {
+    if (fs.existsSync(override)) {
+      console.log("[codex-app-server] Using CLAY_CODEX_PATH binary:", override);
+      return override;
+    }
+    console.warn("[codex-app-server] CLAY_CODEX_PATH does not exist, falling back to bundled codex:", override);
+  }
+
   var triple = getTargetTriple();
   if (!triple) throw new Error("Unsupported platform: " + process.platform + "/" + process.arch);
 
@@ -59,7 +74,10 @@ function findCodexPath() {
       path.join(vendorRoot, triple, "codex", binaryName),
     ];
     for (var i = 0; i < candidates.length; i++) {
-      if (fs.existsSync(candidates[i])) return candidates[i];
+      if (fs.existsSync(candidates[i])) {
+        console.log("[codex-app-server] Using bundled codex binary:", candidates[i]);
+        return candidates[i];
+      }
     }
     throw new Error("codex binary not found in any known layout under " + path.join(vendorRoot, triple));
   } catch (e) {

package/lib/yoke/codex-background-tasks.js

@@ -19,11 +19,17 @@ function mapTerminals(result) {
     var terminal = terminals[i] || {};
     var taskId = terminal.id || terminal.terminalId || terminal.taskId || "";
     if (!taskId || !isLiveTerminal(terminal)) continue;
-    tasks.push({
+    var task = {
       task_id: String(taskId),
       task_type: "shell",
       description: terminal.commandLine || terminal.command || terminal.name || "",
-    });
+    };
+    // Forward the terminal's own start time when the app-server reports one,
+    // so elapsed time survives a Clay restart. Falls back to first-seen
+    // stamping in background-task-timing.js when absent.
+    var startedAt = terminal.startedAt || terminal.started_at || terminal.createdAt || terminal.created_at;
+    if (startedAt) task.started_at = startedAt;
+    tasks.push(task);
   }
   return tasks;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "clay-server",
-  "version": "4.0.0-beta.1",
+  "version": "4.0.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",
@@ -51,7 +51,7 @@
   "dependencies": {
     "@anthropic-ai/claude-agent-sdk": "^0.3.241",
     "@lydell/node-pty": "^1.2.0-beta.3",
-    "@openai/codex": "^0.147.0",
+    "@openai/codex": "^0.152.1",
     "@seald-io/nedb": "^4.1.2",
     "imapflow": "^1.3.1",
     "nodemailer": "^9.0.5",