clay-server 5.1.0-beta.2 → 6.0.0-beta.1

package/lib/users-preferences.js

@@ -218,78 +218,6 @@ function attachPreferences(deps) {
     return { error: "User not found" };
   }
 
-  // --- Per-user Claude open mode ---
-  //
-  // Decides how Claude sessions are rendered when the user clicks into one:
-  //   'gui' - Clay's custom chat UI driven by the Claude Agent SDK.
-  //   'tui' - Embedded xterm running the real `claude` CLI. Keeps usage in
-  //           the Interactive billing bucket post Agent SDK split.
-  //
-  // Cutover moment: midnight 2026-06-15 in UTC+14 (Line Islands - the
-  // earliest timezone on Earth in June, 14h ahead of UTC). On that instant
-  // two things happen at once:
-  //   1. The default flips from 'gui' to 'tui' (so usage lands in the
-  //      Interactive billing bucket).
-  //   2. Any previously-stored per-user preference is treated as cleared
-  //      so the new default applies to everyone. Toggles made on or after
-  //      the cutover persist normally.
-  //
-  // The preference applies on the next session open. Currently displayed
-  // sessions are not re-rendered retroactively. The cross-mode click
-  // logic in project-sessions.js handles both directions in-place
-  // (prepareTuiSessionForGuiView for tui->gui rendering, claude --resume
-  // PTY respawn for gui->tui rendering on a born-tui session).
-
-  // Single cutover instant for both default flip and one-time reset:
-  // 2026-06-15 00:00 in UTC+14 = 2026-06-14 10:00 UTC.
-  var CLAUDE_OPEN_MODE_CUTOVER_MS = Date.UTC(2026, 5, 14, 10, 0, 0);
-  var CLAUDE_OPEN_MODE_RESET_MS = CLAUDE_OPEN_MODE_CUTOVER_MS;
-
-  function defaultClaudeOpenMode() {
-    // Reverted to GUI: the TUI default was a hedge against the (since-cancelled)
-    // Agent SDK separate-credit billing. Users who explicitly picked TUI after
-    // the cutover keep it (isStoredPreferenceLive); everyone else gets GUI.
-    return "gui";
-  }
-
-  // A stored preference counts only if it was set on or after the reset
-  // moment (or we haven't reached the reset moment yet). Older preferences
-  // are ignored so the new default applies once.
-  function isStoredPreferenceLive(user) {
-    if (Date.now() < CLAUDE_OPEN_MODE_RESET_MS) return true;
-    var setAt = user && user.claudeOpenModeSetAt;
-    return typeof setAt === "number" && setAt >= CLAUDE_OPEN_MODE_RESET_MS;
-  }
-
-  function getClaudeOpenMode(userId) {
-    var data = loadUsers();
-    var fallback = defaultClaudeOpenMode();
-    for (var i = 0; i < data.users.length; i++) {
-      if (data.users[i].id === userId) {
-        var m = data.users[i].claudeOpenMode;
-        if ((m === "gui" || m === "tui") && isStoredPreferenceLive(data.users[i])) return m;
-        return fallback;
-      }
-    }
-    return fallback;
-  }
-
-  function setClaudeOpenMode(userId, mode) {
-    // GUI is the default in every other resolution path, so an unrecognized
-    // value must land on GUI too. Only an explicit "tui" opts into terminal.
-    var normalized = (mode === "tui") ? "tui" : "gui";
-    var data = loadUsers();
-    for (var i = 0; i < data.users.length; i++) {
-      if (data.users[i].id === userId) {
-        data.users[i].claudeOpenMode = normalized;
-        data.users[i].claudeOpenModeSetAt = Date.now();
-        saveUsers(data);
-        return { ok: true, claudeOpenMode: normalized };
-      }
-    }
-    return { error: "User not found" };
-  }
-
   // --- Per-user cursor sharing preference ---
 
   function getCursorSharing(userId) {
@@ -512,8 +440,6 @@ function attachPreferences(deps) {
     setChatLayout: setChatLayout,
     getAutoContinue: getAutoContinue,
     setAutoContinue: setAutoContinue,
-    getClaudeOpenMode: getClaudeOpenMode,
-    setClaudeOpenMode: setClaudeOpenMode,
     getCursorSharing: getCursorSharing,
     setCursorSharing: setCursorSharing,
     getClaudeUserAllowList: getClaudeUserAllowList,

package/lib/users.js

@@ -449,8 +449,6 @@ var getAutoContinue = preferences.getAutoContinue;
 var setAutoContinue = preferences.setAutoContinue;
 var getProjectMateFilterMode = projectMateFilterPreferences.get;
 var setProjectMateFilterMode = projectMateFilterPreferences.set;
-var getClaudeOpenMode = preferences.getClaudeOpenMode;
-var setClaudeOpenMode = preferences.setClaudeOpenMode;
 var getCursorSharing = preferences.getCursorSharing;
 var setCursorSharing = preferences.setCursorSharing;
 var getClaudeUserAllowList = preferences.getClaudeUserAllowList;
@@ -537,8 +535,6 @@ module.exports = {
   setAutoContinue: setAutoContinue,
   getProjectMateFilterMode: getProjectMateFilterMode,
   setProjectMateFilterMode: setProjectMateFilterMode,
-  getClaudeOpenMode: getClaudeOpenMode,
-  setClaudeOpenMode: setClaudeOpenMode,
   getCursorSharing: getCursorSharing,
   setCursorSharing: setCursorSharing,
   getClaudeUserAllowList: getClaudeUserAllowList,

package/lib/ws-schema.js

@@ -346,6 +346,8 @@ var schema = {
   // -----------------------------------------------------------------------
   // Updates
   // -----------------------------------------------------------------------
+  "update_check_failed": { direction: "s2c", handler: "lib/public/modules/app-messages.js", description: "Update check failure" },
+  "set_update_channel_result": { direction: "s2c", handler: "lib/public/modules/app-messages.js", description: "Release channel save acknowledgement" },
   "set_update_channel":       { direction: "c2s", handler: "lib/project-sessions.js", description: "Set the update channel (stable/beta)" },
   "check_update":             { direction: "c2s", handler: "lib/project-sessions.js", description: "Check if an update is available" },
   "update_now":               { direction: "c2s", handler: "lib/project-sessions.js", description: "Start the update process" },
@@ -454,10 +456,6 @@ var schema = {
   "project_env_result":       { direction: "s2c", handler: "lib/public/modules/app-messages.js", description: "Project .envrc content" },
   "set_project_env":          { direction: "c2s", handler: "lib/project-filesystem.js", description: "Write the project .envrc" },
   "set_project_env_result":   { direction: "s2c", handler: "lib/public/modules/app-messages.js", description: "Project .envrc write result" },
-  "read_global_claude_md":    { direction: "c2s", handler: "lib/project-filesystem.js", description: "Read the global CLAUDE.md" },
-  "global_claude_md_result":  { direction: "s2c", handler: "lib/public/modules/app-messages.js", description: "Global CLAUDE.md content" },
-  "write_global_claude_md":   { direction: "c2s", handler: "lib/project-filesystem.js", description: "Write the global CLAUDE.md" },
-  "write_global_claude_md_result": { direction: "s2c", handler: "lib/public/modules/app-messages.js", description: "Global CLAUDE.md write result" },
   "get_shared_env":           { direction: "c2s", handler: "lib/project-filesystem.js", description: "Read the shared .envrc" },
   "shared_env_result":        { direction: "s2c", handler: "lib/public/modules/app-messages.js", description: "Shared .envrc content" },
   "set_shared_env":           { direction: "c2s", handler: "lib/project-filesystem.js", description: "Write the shared .envrc" },

package/lib/yoke/adapters/codex.js

@@ -15,6 +15,8 @@ var backgroundTasks = require("../codex-background-tasks");
 var codexUserInput = require("../codex-user-input");
 var createTurnStop = require("../codex-turn-stop").createTurnStop;
 var idleRecovery = require("../codex-idle-recovery");
+var modelCatalog = require("../codex-model-catalog");
+var normalizeQuotaSnapshot = require("../codex-rate-limits").normalizeSnapshot;
 
 // --- Reasoning defaults ---
 // Reasoning summaries are the only readable thinking channel Codex offers:
@@ -295,30 +297,7 @@ function flattenEvent(notification, state) {
   // Rate limits from Codex account
   if (method === "account/rateLimits/updated") {
     var rl = params.rateLimits;
-    if (rl) {
-      var windows = [
-        { key: "primary", type: "five_hour" },
-        { key: "secondary", type: "seven_day" },
-      ];
-      for (var wi = 0; wi < windows.length; wi++) {
-        var w = rl[windows[wi].key];
-        if (!w) continue;
-        var utilization = (w.usedPercent || 0) / 100;
-        var status = "allowed";
-        if (w.usedPercent >= 100) status = "rejected";
-        else if (w.usedPercent >= 80) status = "allowed_warning";
-        events.push({
-          yokeType: "rate_limit",
-          rateLimitInfo: {
-            status: status,
-            resetsAt: w.resetsAt || null,
-            rateLimitType: windows[wi].type,
-            utilization: utilization,
-            isUsingOverage: false,
-          },
-        });
-      }
-    }
+    if (rl) events.push(normalizeQuotaSnapshot(rl));
     return events;
   }
 
@@ -1459,22 +1438,8 @@ function createCodexAdapter(opts) {
   var _createAppServer = (opts && opts.createAppServer) || function(serverOpts) {
     return new CodexAppServer(null, serverOpts);
   };
-  // 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.
-  // Kept in sync with what `model/list` reports for the bundled codex build
-  // (0.153.4). 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-6-astra",
-    "gpt-5.6-sol",
-    "gpt-5.6-terra",
-    "gpt-5.6-luna",
-    "gpt-5.5",
-    "gpt-5.2",
-  ];
-  var _cachedModels = CODEX_MODELS.slice();
+  // Keep the picker available before initialization and during offline recovery.
+  var _cachedModels = modelCatalog.fallback();
   var _appServer = null;
   var _backgroundTaskResetListeners = [];
 
@@ -1921,9 +1886,7 @@ function createCodexAdapter(opts) {
           throw createShutdownError();
         }
 
-        console.log("[codex] App-server initialized, models: " + CODEX_MODELS.join(", "));
-
-        _cachedModels = CODEX_MODELS.slice();
+        _cachedModels = await modelCatalog.load(_appServer);
 
         // Register foreign vendor roots with Codex so automatic skill
         // triggering and skills/list use the same merged inventory.
@@ -1990,8 +1953,8 @@ function createCodexAdapter(opts) {
     },
 
     supportedModels: function() {
-      // Fixed list; return it without requiring a live app-server init.
-      return Promise.resolve(CODEX_MODELS.slice());
+      // Never start a process merely to populate a picker.
+      return Promise.resolve(_cachedModels.length ? _cachedModels.slice() : modelCatalog.fallback());
     },
 
     createToolServer: function(def) {

package/lib/yoke/codex-model-catalog.js

@@ -0,0 +1,40 @@
+// Runtime catalogs are scoped to the adapter's OS user and provider configuration.
+var FALLBACK = ["gpt-6-astra", "gpt-6.1-sol", "gpt-5.6-sol", "gpt-5.6-terra", "gpt-5.6-luna", "gpt-5.5", "gpt-5.2"];
+
+function fallback() {
+  return FALLBACK.slice();
+}
+
+async function load(server) {
+  var models = [];
+  var seen = new Set();
+  var cursors = new Set();
+  var cursor = null;
+  var deadline = Date.now() + 3000;
+  try {
+    for (var page = 0; page < 4; page++) {
+      var remaining = deadline - Date.now();
+      if (remaining <= 0) return fallback();
+      var result = await server.send("model/list", { limit: 100, includeHidden: false, cursor: cursor }, remaining);
+      if (!result || !Array.isArray(result.data)) return fallback();
+      result.data.forEach(function (entry) {
+        if (!entry || entry.hidden || typeof entry.model !== "string" || !entry.model || seen.has(entry.model)) return;
+        seen.add(entry.model);
+        var model = { value: entry.model, displayName: entry.displayName || entry.model, description: entry.description || "" };
+        if (Array.isArray(entry.supportedReasoningEfforts)) {
+          model.supportedEffortLevels = entry.supportedReasoningEfforts.map(function (option) { return option.reasoningEffort; }).filter(function (effort) { return typeof effort === "string" && effort.length > 0; });
+        }
+        models.push(model);
+      });
+      cursor = result.nextCursor;
+      if (!cursor) return models.length ? models : fallback();
+      if (cursors.has(cursor)) return fallback();
+      cursors.add(cursor);
+    }
+  } catch (error) {
+    // Catalog failure must not prevent existing conversations from starting.
+  }
+  return fallback();
+}
+
+module.exports = { fallback: fallback, load: load };

package/lib/yoke/codex-rate-limits.js

@@ -0,0 +1,26 @@
+// Account quota snapshots describe usage, never whether a turn was rejected.
+function normalizeSnapshot(rateLimits) {
+  var windows = [];
+  ["primary", "secondary"].forEach(function (key) {
+    var window = rateLimits[key];
+    if (!window || window.windowDurationMins === 0) return;
+    var duration = window.windowDurationMins;
+    var used = window.usedPercent;
+    windows.push({
+      key: key,
+      windowDurationMins: Number.isFinite(duration) && duration > 0 ? duration : null,
+      usedPercent: Number.isFinite(used) && used >= 0 ? used : null,
+      resetsAt: Number.isFinite(window.resetsAt) && window.resetsAt > 0 ? window.resetsAt : null,
+    });
+  });
+  return {
+    yokeType: "rate_limit",
+    rateLimitInfo: {
+      source: "account_snapshot",
+      limitId: rateLimits.limitId || "codex",
+      windows: windows,
+    },
+  };
+}
+
+module.exports = { normalizeSnapshot: normalizeSnapshot };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "clay-server",
-  "version": "5.1.0-beta.2",
+  "version": "6.0.0-beta.1",
   "description": "Self-hosted team workspace for Claude Code and Codex. Multi-user, browser-based, with persistent AI mates.",
   "bin": {
     "clay-server": "./bin/cli.js"
@@ -47,7 +47,7 @@
   "homepage": "https://github.com/chadbyte/clay#readme",
   "author": "Chad",
   "dependencies": {
-    "@anthropic-ai/claude-agent-sdk": "^0.3.287",
+    "@anthropic-ai/claude-agent-sdk": "^0.3.296",
     "@dicebear/adventurer": "9.4.3",
     "@dicebear/bottts": "9.4.3",
     "@dicebear/core": "9.4.3",
@@ -58,7 +58,7 @@
     "@dicebear/thumbs": "9.4.3",
     "@lydell/node-pty": "^1.2.0-beta.3",
     "@modelcontextprotocol/sdk": "^1.32.1",
-    "@openai/codex": "^0.160.0",
+    "@openai/codex": "^0.162.1",
     "@seald-io/nedb": "^4.1.2",
     "codemirror": "^5.65.21",
     "imapflow": "^1.7.8",