clay-server 4.1.0-beta.13 → 4.1.0-beta.15

package/lib/public/modules/sticky-notes-browser.js

@@ -14,6 +14,7 @@ import { renderMiniMarkdown, getTitle } from './sticky-note-markdown.js';
 import { enhanceClayLogLinks } from './clay-log-links.js';
 import { send } from './sticky-notes-shared.js';
 import { listNoteData, focusNoteOnCanvas, hideNotes, showNotes } from './sticky-notes.js';
+import { claimRightWorkbench, registerRightWorkbench, releaseRightWorkbench } from './right-workbench.js';
 
 var panel = null;
 var gridEl = null;
@@ -21,18 +22,6 @@ var tabsEl = null;
 
 // Registered by app.js so this module never imports the other right-pane tools
 // and cannot form an import cycle with them.
-var exclusiveClosers = [];
-
-export function registerExclusiveClosers(fns) {
-  exclusiveClosers = (fns || []).filter(function (fn) { return typeof fn === "function"; });
-}
-
-function closeOtherRightTools() {
-  for (var i = 0; i < exclusiveClosers.length; i++) {
-    try { exclusiveClosers[i](); } catch (e) { /* a missing tool must not block opening */ }
-  }
-}
-
 function isClosed(data) {
   if (!data) return false;
   if (data.state === "closed") return true;
@@ -283,7 +272,7 @@ export function renderNotesBrowser() {
 export function openNotesBrowser() {
   ensurePanel();
   if (!panel) return;
-  closeOtherRightTools();
+  claimRightWorkbench("notes-browser");
   // The floating canvas would otherwise sit on top of the pane.
   hideNotes();
   panel.classList.remove("hidden");
@@ -295,6 +284,7 @@ export function openNotesBrowser() {
 }
 
 export function closeNotesBrowser() {
+  releaseRightWorkbench("notes-browser");
   if (!store.get('notesBrowserOpen')) return;
   if (panel) panel.classList.add("hidden");
   // Fullscreen is always dropped on close so the next open is a bounded pane.
@@ -311,6 +301,7 @@ export function isNotesBrowserOpen() {
 }
 
 export function initNotesBrowser() {
+  registerRightWorkbench("notes-browser", closeNotesBrowser);
   document.addEventListener("keydown", function (e) {
     if (e.key !== "Escape") return;
     if (!store.get('notesBrowserOpen')) return;

package/lib/public/modules/terminal.js

@@ -1,11 +1,10 @@
 import { iconHtml, refreshIcons } from './icons.js';
 import { closeSidebar } from './sidebar.js';
-import { closeFileViewer } from './filebrowser.js';
+import { claimRightWorkbench, registerRightWorkbench, releaseRightWorkbench } from './right-workbench.js';
 import { copyToClipboard } from './utils.js';
 import { getTerminalTheme } from './theme.js';
 import { getTerminalFontFamily, getTerminalFontSize, onTerminalFontChange } from './terminal-prefs.js';
 import { createKeyToolbar } from './terminal-toolbar.js';
-import { closeIssues } from './issues.js';
 
 var ctx;
 var tabs = new Map(); // termId -> { id, title, exited, xterm, fitAddon, bodyEl }
@@ -136,6 +135,7 @@ function createMultiLineLinkProvider(xterm) {
 // --- Init ---
 export function initTerminal(_ctx) {
   ctx = _ctx;
+  registerRightWorkbench("terminal", closeTerminal);
 
   // Close panel button
   document.getElementById("terminal-close").addEventListener("click", function () {
@@ -193,8 +193,7 @@ export function openTerminal() {
   var container = ctx.terminalContainerEl;
 
   // Hide file viewer if open (also unwatches)
-  closeFileViewer();
-  closeIssues();
+  claimRightWorkbench("terminal");
 
   container.classList.remove("hidden");
   isOpen = true;
@@ -224,6 +223,7 @@ export function openTerminal() {
 
 // --- Close terminal panel (hide, detach, but keep PTYs alive) ---
 export function closeTerminal() {
+  releaseRightWorkbench("terminal");
   var container = ctx.terminalContainerEl;
   container.classList.remove("panel-fullscreen");
   container.classList.add("hidden");

package/lib/sdk-message-processor.js

@@ -583,7 +583,12 @@ function attachMessageProcessor(ctx) {
         && /not logged in/i.test(previewTrimmed) && /\/login/i.test(previewTrimmed);
       // Fetch rich context usage breakdown (fire-and-forget, non-blocking)
       if (session.queryInstance && typeof session.queryInstance.getContextUsage === "function") {
+        var contextQuery = session.queryInstance;
+        var contextTurn = session.turnCount;
         contextUsage.readUsage(session, "summary").then(function(ctxUsage) {
+          if (session.queryInstance !== contextQuery || session.turnCount !== contextTurn) return;
+          // null means the shared reader suppressed a superseded response;
+          // only an adapter's explicit unavailable object may clear the UI.
           if (!ctxUsage) return;
           session.lastContextUsage = ctxUsage;
           sendToSession(session, { type: "context_usage", data: ctxUsage });
@@ -778,10 +783,12 @@ function attachMessageProcessor(ctx) {
       var info = parsed.rateLimitInfo;
       console.log("[sdk-bridge] rate_limit_event for session " + session.localId + ": status=" + info.status + " resetsAt=" + info.resetsAt + " isUsingOverage=" + info.isUsingOverage + " isProcessing=" + session.isProcessing);
 
-      // Broadcast reset time for top-bar usage link
+      // Persist the scoped reset snapshot so reconnect/history restore can reproject it.
       if (info.rateLimitType && info.resetsAt) {
-        send({
+        sendAndRecord(session, {
           type: "rate_limit_usage",
+          sessionId: session.localId,
+          vendor: session.vendor || "claude",
           rateLimitType: info.rateLimitType,
           resetsAt: info.resetsAt * 1000,
           status: info.status,
@@ -792,6 +799,8 @@ function attachMessageProcessor(ctx) {
       if (info.status === "allowed_warning" || info.status === "rejected") {
         sendAndRecord(session, {
           type: "rate_limit",
+          sessionId: session.localId,
+          vendor: session.vendor || "claude",
           status: info.status,
           resetsAt: info.resetsAt ? info.resetsAt * 1000 : null,
           rateLimitType: info.rateLimitType || null,

package/lib/server-default-vendor.js

@@ -0,0 +1,60 @@
+// Authenticated user-wide New session vendor preference service.
+
+function attachDefaultVendorService(deps) {
+  var users = deps.users;
+  var homeChatHandler = deps.homeChatHandler;
+  var forEachAppClient = deps.forEachAppClient;
+  var revisions = {};
+  var epoch = deps.serverEpoch || require("crypto").randomBytes(12).toString("hex");
+
+  function multiUser() { return users.isMultiUser() === true; }
+  function actor(ws) {
+    if (!multiUser()) return { userId: "default", user: true };
+    var claimed = ws && ws._clayUser && ws._clayUser.id;
+    var user = claimed ? users.findUserById(claimed) : null;
+    return user ? { userId: user.id, user: user } : { userId: null, user: null };
+  }
+  function sameActor(ws, userId) { var current = actor(ws); return current.user && current.userId === userId; }
+  function send(ws, message) { if (ws && ws.readyState === 1) ws.send(JSON.stringify(Object.assign({ serverEpoch: epoch }, message))); }
+  function revision(userId) { return revisions[userId] || 0; }
+  function installedVendors(ws, who) {
+    var found;
+    try { found = homeChatHandler.findMateProject(multiUser() ? who.userId : null, null, true); } catch (e) { return []; }
+    if (!found || !found.ctx || typeof found.ctx.getVendorModelAvailability !== "function") return [];
+    var socket = Object.create(ws || null);
+    socket._clayUser = who.user === true ? null : who.user;
+    var choices = found.ctx.getVendorModelAvailability(socket) || [];
+    return choices.filter(function (choice) { return choice && choice.installed === true; }).map(function (choice) { return choice.id; });
+  }
+  function broadcast(userId, message, except) {
+    forEachAppClient(function (client) { if (client === except || !sameActor(client, userId)) return; send(client, message); });
+  }
+  function handle(ws, msg, projectSlug) {
+    if (!msg || ["default_vendor_get", "default_vendor_set"].indexOf(msg.type) === -1) return false;
+    var requestId = typeof msg.requestId === "string" ? msg.requestId.slice(0, 200) : null;
+    var who = actor(ws);
+    if (!who.user) { send(ws, { type: "default_vendor_state", requestId: requestId, accountAvailable: false, accountId: null, projectSlug: projectSlug || null, installedVendors: [], preference: null, error: "Your account is no longer available." }); return true; }
+    var installed = installedVendors(ws, who);
+    if (msg.type === "default_vendor_get") {
+      var saved = users.getDefaultVendorPreference(who.userId);
+      send(ws, { type: "default_vendor_state", requestId: requestId, projectSlug: projectSlug || null, accountAvailable: true, accountId: who.userId, installedVendors: installed, preference: saved.vendor, preferencePresent: saved.present, ready: !saved.error, canonicalRevision: revision(who.userId), error: saved.error || "" });
+      return true;
+    }
+    if (msg.vendor !== "" && (typeof msg.vendor !== "string" || installed.indexOf(msg.vendor) === -1)) {
+      send(ws, { type: "default_vendor_state", requestId: requestId, projectSlug: projectSlug || null, accountAvailable: true, accountId: who.userId, installedVendors: installed, preference: users.getDefaultVendorPreference(who.userId).vendor, ready: false, canonicalRevision: revision(who.userId), error: "That vendor is not installed or authorized." });
+      return true;
+    }
+    var savedResult = users.setDefaultVendorPreference(who.userId, msg.vendor);
+    if (!savedResult.ok) { send(ws, { type: "default_vendor_state", requestId: requestId, projectSlug: projectSlug || null, accountAvailable: true, accountId: who.userId, installedVendors: installed, ready: false, error: savedResult.error }); return true; }
+    revisions[who.userId] = revision(who.userId) + 1;
+    var state = { type: "default_vendor_state", requestId: null, projectSlug: projectSlug || null, accountAvailable: true, accountId: who.userId, installedVendors: installed, preference: msg.vendor || null, preferencePresent: !!msg.vendor, ready: true, canonicalRevision: revisions[who.userId], error: "" };
+    var broadcastState = Object.assign({}, state);
+    delete broadcastState.projectSlug;
+    broadcast(who.userId, broadcastState, ws);
+    send(ws, Object.assign({}, state, { requestId: requestId }));
+    return true;
+  }
+  return { handleMessage: handle };
+}
+
+module.exports = { attachDefaultVendorService: attachDefaultVendorService };

package/lib/server.js

@@ -17,6 +17,7 @@ var serverHomeChat = require("./server-home-chat");
 var shouldSuppressHomeResponse = require("./home-response-notifications").shouldSuppressHomeResponse;
 var serverHomePreferences = require("./server-home-preferences");
 var serverDefaultAi = require("./server-default-ai");
+var serverDefaultVendor = require("./server-default-vendor");
 var serverCursorSharing = require("./server-cursor-sharing");
 var serverTools = require("./server-tools");
 var serverAdmin = require("./server-admin");
@@ -1067,6 +1068,7 @@ function createServer(opts) {
   var wss = new WebSocketServer({ noServer: true });
   var homePreferencesHandler = null;
   var defaultAiService = null;
+  var defaultVendorService = null;
   var cursorSharingService = null;
 
   // Slug-less /ws handler: lets a user with no projects yet load the regular
@@ -1552,6 +1554,7 @@ function createServer(opts) {
   });
 
   defaultAiService = serverDefaultAi.attachDefaultAiService({ users: users, homeChatHandler: homeChatHandler, forEachAppClient: forEachAppClient });
+  defaultVendorService = serverDefaultVendor.attachDefaultVendorService({ users: users, homeChatHandler: homeChatHandler, forEachAppClient: forEachAppClient });
   cursorSharingService = serverCursorSharing.attachCursorSharingService({ users: users, forEachAppClient: forEachAppClient });
 
   // --- User-installed home tools handler ---
@@ -1580,6 +1583,7 @@ function createServer(opts) {
 
   function handleDmMessage(ws, msg, routedProjectSlug) {
     if (cursorSharingService && cursorSharingService.handleMessage(ws, msg)) return true;
+    if (defaultVendorService && defaultVendorService.handleMessage(ws, msg, routedProjectSlug)) return true;
     if (defaultAiService && defaultAiService.handleMessage(ws, msg)) return true;
     if (assignmentService.handleMessage(ws, msg, routedProjectSlug)) return true;
     if (dmHandler.handleMessage(ws, msg)) return true;

package/lib/session-notes-mcp-server.js

@@ -4,10 +4,8 @@ var buildShape = require("./session-spawn-mcp-server").buildShape;
 
 var MEMORY_CONTRACT =
   "The sticky-note board persists across sessions and is a user-facing artifact shared with people and Clay agents, not private agent scratch space. " +
-  "Default to not writing. Create a note proactively only when the user explicitly asks to remember or track something, or when all of these are true: it will remain useful after the current task and session, it is not already adequately recorded in the repository or another note, and the user would likely be glad to find it on the board a week later. " +
-  "Good notes capture an unresolved commitment, durable product decision, user preference, constraint, or handoff that will materially change future work. " +
-  "Important exception for deferred defects: while doing code or technical work, actively create a sticky note when you discover a concrete defect, regression risk, security issue, or data-loss risk that is outside the current session goal and will remain unfixed when the turn ends. Do not wait for the user to ask. For a Project Driver session with Issues authority, search, reuse, or create the Issue first and put the primary details there: observable evidence, affected component, impact, and next action. Then make the sticky note only a concise title, one-line actionable cue, and the actual opaque issue: reference; do not duplicate the full defect details in the note. If you lack Issues authority, route through an eligible Project Driver; never invent an issue reference or drop the alert. Check active notes first when a duplicate is plausible. Do not create defect notes for speculation, general cleanup ideas, or problems you fixed in the current session. " +
-  "Important exception for deferred proposals: when you propose work (a fix, follow-up, improvement, or next step) and the user defers it rather than declining it (\"let's do that later\", \"next time\", \"after this\"), actively create a sticky note before the topic moves on. Do not wait to be asked. Capture what was proposed, why it mattered, and the agreed timing if any. Deferred agreements scroll out of chat history quickly and are hard to track; the board is where they survive. If the user declines the idea outright, do not write a note. " +
+  "Default to not writing. Create a note proactively only when the user explicitly asks to remember or track something, or when all of these are true: it will remain useful after the current task and session, it is not already adequately recorded in the repository, an Issue, or another note, and the user would likely be glad to find it on the board a week later. " +
+  "Use Sticky Notes for preferences, reminders, undeveloped ideas, or an explicit request to remember something; they are not mandatory duplicates of Project Issues. For concrete actionable bugs, improvements, or deferred implementation, an authorized Project Driver should use Project Issues. If you lack Issues authority, route the work through an eligible Project Driver. Check active notes first when a duplicate is plausible. " +
   "Never create a note merely because work is important, lengthy, spans agents or restarts, or might help another agent. Do not record completed work, implementation details, test results, investigation logs, transient blockers, conversation summaries, or announcements of your own activity. When uncertain, do not write. " +
   "Updates are visible too: update only when durable state materially changes. " +
   "A note is an attention item, so finishing it means closing it, never erasing it: call close_note once the thing it is asking for is done, and the note leaves the active board while the record stays and can be reopened. Do not turn a note into a completion log instead of closing it. " +

package/lib/users-default-vendor-preferences.js

@@ -0,0 +1,80 @@
+// Durable user-scoped New session vendor preference storage.
+
+var PREFERENCE_KEY = "defaultVendorPreference";
+
+function validVendor(value) {
+  return typeof value === "string" && /^[a-z0-9][a-z0-9_-]{0,39}$/.test(value);
+}
+
+function attachDefaultVendorPreferences(deps) {
+  var loadUsers = deps.loadUsers;
+  var saveUsers = deps.saveUsers;
+  var isMultiUser = deps.isMultiUser || function () { return false; };
+  var configModule = deps.configModule || require("./config");
+
+  function getRecord(data, userId) {
+    var records = Array.isArray(data.users) ? data.users : [];
+    for (var i = 0; i < records.length; i++) if (records[i] && records[i].id === userId) return records[i];
+    return null;
+  }
+
+  function readValue(value, source) {
+    if (value === undefined || value === null || value === "") return { present: false, vendor: null, source: null };
+    if (!validVendor(value)) return { present: true, vendor: null, source: source, error: "Default coding vendor is invalid." };
+    return { present: true, vendor: value, source: source };
+  }
+
+  function getDefaultVendor(userId) {
+    var data;
+    try { data = loadUsers(); } catch (error) { return { present: false, vendor: null, source: null, error: "Unable to read default coding vendor: " + (error.message || error) }; }
+    var record = getRecord(data, userId);
+    if (isMultiUser() && !record) return { present: false, vendor: null, source: null, error: "User not found." };
+    if (record && Object.prototype.hasOwnProperty.call(record, PREFERENCE_KEY)) return readValue(record[PREFERENCE_KEY], "explicit");
+    if (record) return { present: false, vendor: null, source: null };
+    if (userId === "default") {
+      var config;
+      try { config = configModule.loadConfig() || {}; } catch (configError) { return { present: false, vendor: null, source: null, error: "Unable to read default coding vendor: " + (configError.message || configError) }; }
+      if (Object.prototype.hasOwnProperty.call(config, PREFERENCE_KEY)) return readValue(config[PREFERENCE_KEY], "explicit");
+    }
+    return { present: false, vendor: null, source: null };
+  }
+
+  function setDefaultVendor(userId, vendor) {
+    if (vendor !== "" && !validVendor(vendor)) return { ok: false, error: "Default coding vendor is invalid." };
+    var data;
+    try { data = loadUsers(); } catch (error) { return { ok: false, error: "Unable to read default coding vendor: " + (error.message || error) }; }
+    var record = getRecord(data, userId);
+    if (isMultiUser() && !record) return { ok: false, error: "User not found." };
+    if (record) {
+      var nextData = Object.assign({}, data, { users: (data.users || []).map(function (item) {
+        if (item !== record) return item;
+        var next = Object.assign({}, item);
+        if (vendor) next.defaultVendorPreference = vendor;
+        else delete next.defaultVendorPreference;
+        return next;
+      }) });
+      try { saveUsers(nextData); } catch (saveError) { return { ok: false, error: "Unable to save default coding vendor: " + (saveError.message || saveError) }; }
+      if (!vendor && userId === "default") {
+        try {
+          var recordConfig = configModule.loadConfig() || {};
+          delete recordConfig[PREFERENCE_KEY];
+          configModule.saveConfig(Object.assign({}, recordConfig));
+        } catch (recordConfigError) { return { ok: false, error: "Unable to clear default coding vendor: " + (recordConfigError.message || recordConfigError) }; }
+      }
+      return { ok: true, vendor: vendor };
+    }
+    if (userId !== "default") return { ok: false, error: "User not found." };
+    try {
+      var current = configModule.loadConfig() || {};
+      var nextConfig = Object.assign({}, current);
+      if (vendor) nextConfig.defaultVendorPreference = vendor;
+      else delete nextConfig.defaultVendorPreference;
+      configModule.saveConfig(nextConfig);
+      return { ok: true, vendor: vendor };
+    } catch (configSaveError) { return { ok: false, error: "Unable to save default coding vendor: " + (configSaveError.message || configSaveError) }; }
+  }
+
+  return { getDefaultVendor: getDefaultVendor, setDefaultVendor: setDefaultVendor, validVendor: validVendor };
+}
+
+module.exports = { attachDefaultVendorPreferences: attachDefaultVendorPreferences, validVendor: validVendor, PREFERENCE_KEY: PREFERENCE_KEY };

package/lib/users.js

@@ -11,6 +11,7 @@ var { attachHomeSurfacePreferences } = require("./users-home-surface-preferences
 var { attachExperimentalPreferences } = require("./users-experimental-preferences");
 var { attachScheduledTaskPreferences } = require("./users-scheduled-task-preferences");
 var { attachDefaultAiPreferences } = require("./users-default-ai-preferences");
+var { attachDefaultVendorPreferences } = require("./users-default-vendor-preferences");
 
 var USERS_FILE = path.join(CONFIG_DIR, "users.json");
 
@@ -404,6 +405,7 @@ var homeSurfacePreferences = attachHomeSurfacePreferences({ loadUsers: loadUsers
 var experimentalPreferences = attachExperimentalPreferences({ loadUsers: loadUsers, saveUsers: saveUsers });
 var scheduledTaskPreferences = attachScheduledTaskPreferences({ loadUsers: loadUsers, saveUsers: saveUsers });
 var defaultAiPreferences = attachDefaultAiPreferences({ loadUsers: loadUsers, saveUsers: saveUsers, isMultiUser: auth.isMultiUser });
+var defaultVendorPreferences = attachDefaultVendorPreferences({ loadUsers: loadUsers, saveUsers: saveUsers, isMultiUser: auth.isMultiUser });
 
 // Alias auth functions
 var isMultiUser = auth.isMultiUser;
@@ -464,6 +466,8 @@ var getScheduledTaskInterviewEngine = scheduledTaskPreferences.get;
 var setScheduledTaskInterviewEngine = scheduledTaskPreferences.set;
 var getDefaultAiPreference = defaultAiPreferences.getDefaultAiPreference;
 var setDefaultAiPreference = defaultAiPreferences.setDefaultAiPreference;
+var getDefaultVendorPreference = defaultVendorPreferences.getDefaultVendor;
+var setDefaultVendorPreference = defaultVendorPreferences.setDefaultVendor;
 
 module.exports = {
   USERS_FILE: USERS_FILE,
@@ -545,6 +549,8 @@ module.exports = {
   setScheduledTaskInterviewEngine: setScheduledTaskInterviewEngine,
   getDefaultAiPreference: getDefaultAiPreference,
   setDefaultAiPreference: setDefaultAiPreference,
+  getDefaultVendorPreference: getDefaultVendorPreference,
+  setDefaultVendorPreference: setDefaultVendorPreference,
   getDeletedBuiltinKeys: getDeletedBuiltinKeys,
   addDeletedBuiltinKey: addDeletedBuiltinKey,
   removeDeletedBuiltinKey: removeDeletedBuiltinKey,

package/lib/ws-schema.js

@@ -723,6 +723,9 @@ var schema = {
   "default_ai_get":           { direction: "c2s", handler: "lib/server-default-ai.js", description: "Read the authenticated user's shared Default AI and available providers" },
   "default_ai_catalog_get":   { direction: "c2s", handler: "lib/server-default-ai.js", description: "Read one installed provider catalog for the Default AI picker" },
   "default_ai_set":           { direction: "c2s", handler: "lib/server-default-ai.js", description: "Validate and persist the authenticated user's shared Default AI" },
+  "default_vendor_get":       { direction: "c2s", handler: "lib/server-default-vendor.js", description: "Read the authenticated user's New session vendor preference" },
+  "default_vendor_set":       { direction: "c2s", handler: "lib/server-default-vendor.js", description: "Validate and persist the authenticated user's New session vendor preference" },
+  "default_vendor_state":     { direction: "s2c", handler: "lib/public/modules/default-vendor.js", description: "Correlated or same-user-broadcast New session vendor preference" },
   "default_ai_state":         { direction: "s2c", handler: "lib/public/modules/default-ai.js", description: "Correlated or same-user-broadcast canonical Default AI state" },
   "default_ai_catalog":       { direction: "s2c", handler: "lib/public/modules/default-ai.js", description: "Correlated Default AI provider catalog" },
   "home_mate_history":        { direction: "s2c", handler: "lib/public/modules/home-mate-chat.js", description: "Selected mate's initial or refreshed chat history" },

package/lib/yoke/acp-agent-profiles.js

@@ -82,13 +82,26 @@ function isSafeOpenCodePermission(value) {
 }
 
 function validateOpenCodeConfig(config) {
-  if (!config || config.permission !== "ask") {
+  if (!config || typeof config !== "object" || Array.isArray(config)) {
+    throw new Error("OpenCode resolved configuration is malformed");
+  }
+  var globalPermission = config.permission;
+  var globalAsk = globalPermission === "ask" || (
+    isSafeOpenCodePermission(globalPermission) && globalPermission["*"] === "ask"
+  );
+  if (!globalAsk) {
     throw new Error("OpenCode resolved configuration does not preserve global ask permissions");
   }
+  if (config.agent !== undefined && (!config.agent || typeof config.agent !== "object" || Array.isArray(config.agent))) {
+    throw new Error("OpenCode resolved configuration has malformed agents");
+  }
   var agents = config.agent || {};
   var names = Object.keys(agents);
   for (var i = 0; i < names.length; i++) {
-    var agent = agents[names[i]] || {};
+    var agent = agents[names[i]];
+    if (!agent || typeof agent !== "object" || Array.isArray(agent)) {
+      throw new Error("OpenCode agent has malformed resolved configuration: " + names[i]);
+    }
     if (agent.permission === undefined) continue;
     if (!isSafeOpenCodePermission(agent.permission)) {
       throw new Error("OpenCode agent has unsafe resolved permissions: " + names[i]);

package/lib/yoke/adapters/codex.js

@@ -181,6 +181,11 @@ function flattenEvent(notification, state) {
 
   if (method === "turn/started") {
     state.turnStarted = true;
+    state.currentTurnId = params.turnId || params.turn_id || (params.turn && params.turn.id) || null;
+    state.lastInputTokens = null;
+    state.lastCachedTokens = null;
+    state.lastOutputTokens = null;
+    state.currentContextUsage = null;
     var userUuid = generateUuid();
     events.push({ yokeType: "turn_start", uuid: userUuid, messageType: "user" });
     return events;
@@ -194,16 +199,38 @@ function flattenEvent(notification, state) {
     if (turnStatus === "interrupted" || state.aborted) {
       events.push({ yokeType: "interrupted" });
     }
-    var inputTokens = state.lastInputTokens !== null && state.lastInputTokens !== undefined
-      ? state.lastInputTokens : (usage ? (usage.input_tokens || 0) : 0);
-    var outputTokens = (usage ? (usage.output_tokens || 0) : 0) || state.lastOutputTokens || 0;
-    var cachedTokens = (usage ? (usage.cached_input_tokens || 0) : 0) || state.lastCachedTokens || 0;
+    // Generic usage reporting is independent from current context occupancy.
+    // The latter is supplied only by a valid thread/tokenUsage snapshot.
+    // Some normal protocol completions omit usage even though the preceding
+    // token snapshot carried useful per-turn accounting. Keep that fallback
+    // for the generic usage panel, but never use it as context occupancy.
+    var inputTokens = usage && typeof usage.input_tokens === "number"
+      ? usage.input_tokens : (typeof state.lastInputTokens === "number" ? state.lastInputTokens : 0);
+    var outputTokens = usage && typeof usage.output_tokens === "number"
+      ? usage.output_tokens : (typeof state.lastOutputTokens === "number" ? state.lastOutputTokens : 0);
+    var cachedTokens = usage && typeof usage.cached_input_tokens === "number"
+      ? usage.cached_input_tokens : (typeof state.lastCachedTokens === "number" ? state.lastCachedTokens : 0);
     var hasTokenData = inputTokens > 0 || outputTokens > 0;
     var resultModelUsage = {};
     // Codex reports the real window in thread/tokenUsage/updated. Dropping it
     // made the client fall back to its model-name table, which has no entry
     // for codex model ids and defaulted to Claude's 200k denominator.
-    resultModelUsage[state.model] = { contextWindow: state.modelContextWindow || null };
+    var contextSnapshot = { valid: false };
+    if (state.currentContextUsage
+        && typeof state.currentContextUsage.input_tokens === "number"
+        && typeof state.currentContextUsage.contextWindow === "number"
+        && state.currentContextUsage.contextWindow > 0) {
+      contextSnapshot = {
+        valid: true,
+        inputTokens: state.currentContextUsage.input_tokens,
+        contextWindow: state.currentContextUsage.contextWindow,
+      };
+      if (state.currentContextUsage.turnId) contextSnapshot.turnId = state.currentContextUsage.turnId;
+    }
+    resultModelUsage[state.model] = {
+      contextWindow: state.modelContextWindow || null,
+      contextSnapshot: contextSnapshot,
+    };
     var assistantUuid = generateUuid();
     events.push({
       yokeType: "result",
@@ -683,24 +710,36 @@ function flattenEvent(notification, state) {
   if (method === "thread/tokenUsage/updated") {
     var tu = params.tokenUsage;
     if (tu) {
+      var tokenTurnId = params.turnId || params.turn_id || tu.turnId || null;
+      if (tokenTurnId && state.currentTurnId && tokenTurnId !== state.currentTurnId) {
+        state.lastInputTokens = null;
+        state.lastCachedTokens = null;
+        state.lastOutputTokens = null;
+        state.currentContextUsage = null;
+        return events;
+      }
+      var currentWindow = null;
       var turnUsage = tu.lastTurn;
       if (turnUsage) {
         var candidateInput = typeof turnUsage.inputTokens === "number" ? turnUsage.inputTokens : null;
-        var currentWindow = typeof tu.modelContextWindow === "number" ? tu.modelContextWindow : null;
-        state.lastInputTokens = candidateInput !== null && (currentWindow === null || candidateInput <= currentWindow) ? candidateInput : null;
+        currentWindow = typeof tu.modelContextWindow === "number" && isFinite(tu.modelContextWindow) && tu.modelContextWindow > 0
+          ? tu.modelContextWindow : null;
+        state.lastInputTokens = candidateInput !== null && isFinite(candidateInput) && candidateInput >= 0 && currentWindow !== null && candidateInput <= currentWindow ? candidateInput : null;
         state.lastCachedTokens = turnUsage.cachedInputTokens || 0;
         state.lastOutputTokens = turnUsage.outputTokens || 0;
-        state.currentContextUsage = state.lastInputTokens !== null &&
-          (currentWindow === null || state.lastInputTokens <= currentWindow)
-          ? { input_tokens: state.lastInputTokens, contextWindow: currentWindow }
-          : { input_tokens: null, contextWindow: currentWindow };
+        if (state.lastInputTokens !== null && currentWindow !== null) {
+          state.currentContextUsage = { input_tokens: state.lastInputTokens, contextWindow: currentWindow };
+          if (tokenTurnId || state.currentTurnId) state.currentContextUsage.turnId = tokenTurnId || state.currentTurnId;
+        } else {
+          state.currentContextUsage = null;
+        }
       } else {
         state.lastInputTokens = null;
         state.lastCachedTokens = null;
         state.lastOutputTokens = null;
         state.currentContextUsage = null;
       }
-      if (tu.modelContextWindow) state.modelContextWindow = tu.modelContextWindow;
+      if (currentWindow !== null) state.modelContextWindow = currentWindow;
     }
     return events;
   }
@@ -750,6 +789,7 @@ function createEventState(model) {
     lastCachedTokens: null,
     lastOutputTokens: null,
     currentContextUsage: null,
+    currentTurnId: null,
     modelContextWindow: null,
     done: false,
     aborted: false,
@@ -1288,7 +1328,10 @@ function createCodexQueryHandle(appServer, queryOpts) {
     },
 
     getContextUsage: function() {
-      return Promise.resolve(state.currentContextUsage);
+      return Promise.resolve(state.currentContextUsage || {
+        unavailable: true,
+        reason: "current_context_unavailable",
+      });
     },
 
     abort: function() {

package/lib/yoke/vendor-registry.js

@@ -38,7 +38,7 @@ var VENDOR_REGISTRY = {
     usageDashboard: {
       icon: "/codex-avatar.png",
       alt: "Codex",
-      href: "https://chatgpt.com/admin/usage",
+      href: "https://chatgpt.com/codex/settings/usage",
       title: "Check usage on ChatGPT",
     },
     rateLimitTracking: true,

package/package.json

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