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

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:
@@ -30,7 +32,6 @@ var idleRecovery = require("../codex-idle-recovery");
 // Everything here is overridable via adapterOptions.CODEX.config.
 var CODEX_REASONING_DEFAULTS = {
   model_reasoning_summary: "detailed",
-  model_supports_reasoning_summaries: true,
 };
 var DEFAULT_CODEX_MODEL = "gpt-6-astra";
 var CODEX_QUERY_BOUND_TOOL_CAPABILITY = { mode: "dynamic", resume: "session-mcp-recovery" };
@@ -295,30 +296,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;
   }
 
@@ -777,7 +755,7 @@ function flattenEvent(notification, state) {
   }
 
   // Unknown event type - pass through
-  console.log("[yoke/codex] UNHANDLED event:", method, JSON.stringify(params).substring(0, 200));
+  console.log("[yoke/codex] Unhandled event:", method);
   events.push({
     yokeType: "runtime_specific",
     vendor: "codex",
@@ -1459,22 +1437,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 +1885,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 +1952,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) {
@@ -2150,12 +2112,10 @@ function createCodexAdapter(opts) {
         throw new Error("Codex requires a mapped Linux user while OS-user isolation is enabled");
       }
       var models = await adapter.supportedModels();
-      var model = models.indexOf("gpt-5.6-luna") !== -1 ? "gpt-5.6-luna"
-        : (opts && models.indexOf(opts.model) !== -1 ? opts.model : models[0]);
-      if (!model) throw new Error("No supported Codex title model is available");
+      var selection = modelCatalog.selectTitleModel(models, opts && opts.model);
       return require("../title-query").generateTitle(adapter, messages, opts, {
-        model: model,
-        effort: "low",
+        model: selection.model,
+        effort: selection.effort,
         ephemeral: true,
         adapterOptions: { CODEX: { sandboxMode: "read-only", approvalPolicy: "never" } },
       });

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

@@ -174,7 +174,7 @@ CodexAppServer.prototype.start = function() {
 
       var spawnSpec = buildSpawnSpec(self.executablePath, args, self.opts);
       var userSuffix = self.opts.osUserInfo ? " as " + self.opts.osUserInfo.user : "";
-      console.log("[codex-app-server] Spawning" + userSuffix + ":", spawnSpec.command, spawnSpec.args.join(" "));
+      console.log("[codex-app-server] Spawning" + userSuffix + ":", spawnSpec.command, "(" + spawnSpec.args.length + " arguments; values omitted)");
 
       self.proc = spawn(spawnSpec.command, spawnSpec.args, spawnSpec.options);
 
@@ -218,7 +218,7 @@ CodexAppServer.prototype.start = function() {
           var msg = JSON.parse(line);
           self._handleMessage(msg);
         } catch (e) {
-          console.error("[codex-app-server] Failed to parse line:", line.substring(0, 200));
+          console.error("[codex-app-server] Failed to parse protocol message (content omitted)");
         }
       });
 

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

@@ -0,0 +1,52 @@
+// 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();
+}
+
+function selectTitleModel(models, sessionModel) {
+  var entries = models.map(function (entry) {
+    return typeof entry === "string" ? { value: entry } : entry;
+  }).filter(function (entry) { return entry && typeof entry.value === "string" && entry.value.trim(); });
+  var selected = entries.find(function (entry) { return entry.value === "gpt-5.6-luna"; })
+    || entries.find(function (entry) { return entry.value === sessionModel; }) || entries[0];
+  if (!selected) throw new Error("No supported Codex title model is available");
+  var efforts = selected.supportedEffortLevels;
+  var effort = Array.isArray(efforts) ? (efforts.indexOf("low") !== -1 ? "low" : efforts[0]) : "low";
+  return { model: selected.value, effort: effort };
+}
+
+module.exports = { fallback: fallback, load: load, selectTitleModel: selectTitleModel };

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.1",
+  "version": "5.1.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"
@@ -47,11 +47,20 @@
   "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",
+    "@dicebear/fun-emoji": "9.4.3",
+    "@dicebear/icons": "9.4.3",
+    "@dicebear/micah": "9.4.3",
+    "@dicebear/pixel-art": "9.4.3",
+    "@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",
     "ipaddr.js": "^2.5.0",
     "nodemailer": "^9.1.1",