clay-server 2.47.0-beta.2 → 2.47.0-beta.4

package/lib/project.js

@@ -28,9 +28,9 @@ var { attachSessions } = require("./project-sessions");
 var { attachUserMessage } = require("./project-user-message");
 var { attachConnection } = require("./project-connection");
 var { attachMcp } = require("./project-mcp");
-var { attachMateDatastore } = require("./project-mate-datastore");
 var { createLocalMcp } = require("./mcp-local");
 var { attachEmail: attachEmailModule } = require("./project-email");
+var { attachSessionSpawn } = require("./project-session-spawn");
 // project-notifications is attached globally in server.js, passed via opts.notificationsModule
 
 // --- Context Sources persistence ---
@@ -476,23 +476,34 @@ function createProjectContext(opts) {
     },
   });
 
-  // --- Mate datastore (Mate projects only) ---
-  var _mateDatastore = attachMateDatastore({
+  // The SDK bridge is created after local MCP servers. Session spawning uses
+  // a getter so tool handlers see the initialized bridge when they run.
+  var sdk = null;
+  var _sessionSpawn = attachSessionSpawn({
     cwd: cwd,
-    slug: slug,
-    isMate: isMate,
+    sm: sm,
+    getSdk: function () { return sdk; },
     send: send,
-    sendTo: sendTo,
-    clients: clients,
-    getSessionForWs: getSessionForWs,
+    isMate: isMate,
     usersModule: usersModule,
-    getProjectOwnerId: function () { return projectOwnerId; },
+    adapters: adapters,
+    getLinuxUserForSession: getLinuxUserForSession,
   });
 
   // --- MCP tool servers (created via YOKE adapter) ---
   var mcpServers = (function () {
     var servers = {};
 
+    // Agent-driven sibling session fan-out (main projects only).
+    if (!isMate) {
+      try {
+        var sessionSpawnMcpConfig = _sessionSpawn.createMcpServer(adapter);
+        if (sessionSpawnMcpConfig) servers[sessionSpawnMcpConfig.name || "clay-sessions"] = sessionSpawnMcpConfig;
+      } catch (e) {
+        console.error("[project] Failed to create session spawn MCP server:", e.message);
+      }
+    }
+
     // Debate MCP server (available to both mates and main project)
     try {
       var debateMcp = require("./debate-mcp-server");
@@ -643,15 +654,6 @@ function createProjectContext(opts) {
       console.error("[project] Failed to create email MCP server:", e.message);
     }
 
-    if (isMate) {
-      try {
-        var datastoreMcp = _mateDatastore.createMcpServer();
-        if (datastoreMcp) servers[datastoreMcp.name || "clay-datastore"] = datastoreMcp;
-      } catch (e) {
-        console.error("[project] Failed to create datastore MCP server:", e.message);
-      }
-    }
-
     return Object.keys(servers).length > 0 ? servers : undefined;
   })();
 
@@ -663,7 +665,12 @@ function createProjectContext(opts) {
   //
   //   clay-browser -> only when the Chrome extension is connected
   //   clay-email   -> only when the user has an account or server SMTP
-  function getLocalMcpServers() {
+  //
+  // forSession (optional): the session whose query these servers are mounted
+  // into. clay-sessions must know its caller (depth guard + child ownership),
+  // so it is re-instantiated bound to that session; the static instance in
+  // mcpServers only serves descriptor listing and fails closed on calls.
+  function getLocalMcpServers(forSession) {
     if (!mcpServers) return undefined;
     var extWs = browserState._extensionWs;
     var extConnected = !!(extWs && extWs.readyState === 1);
@@ -675,6 +682,15 @@ function createProjectContext(opts) {
       var name = keys[i];
       if (name === "clay-browser" && !extConnected) continue;
       if (name === "clay-email" && !emailAvailable) continue;
+      if (name === "clay-sessions" && forSession) {
+        try {
+          var boundSpawn = _sessionSpawn.createMcpServer(adapter, forSession);
+          if (boundSpawn) { filtered[name] = boundSpawn; hasAny = true; }
+        } catch (e) {
+          console.error("[project] Failed to bind session spawn MCP server:", e.message);
+        }
+        continue;
+      }
       filtered[name] = mcpServers[name];
       hasAny = true;
     }
@@ -682,7 +698,7 @@ function createProjectContext(opts) {
   }
 
   // --- SDK bridge ---
-  var sdk = createSDKBridge({
+  sdk = createSDKBridge({
     cwd: cwd,
     slug: slug,
     sessionManager: sm,
@@ -914,18 +930,25 @@ function createProjectContext(opts) {
                 clayAuthToken: serverAuthToken,
                 slug: slug,
               });
-            } else if ((!sm.modelsByVendor || !sm.modelsByVendor[msg.vendor]) && typeof vendorAdapter.init === "function") {
+            }
+            var needsReadyMetadata = !sm.capabilitiesByVendor || !sm.capabilitiesByVendor[msg.vendor]
+              || !sm.modelsByVendor || !sm.modelsByVendor[msg.vendor];
+            if (vendorAdapter && needsReadyMetadata && typeof vendorAdapter.init === "function") {
               // Init warms the adapter, but a slow/failed init must not block
               // model listing (e.g. Codex models are a fixed list). Keep going
               // to supportedModels() even if init throws.
               try {
-                await vendorAdapter.init({
+                var readyResult = await vendorAdapter.init({
                   cwd: cwd,
                   clayPort: serverPort,
                   clayTls: serverTls,
                   clayAuthToken: serverAuthToken,
                   slug: slug,
                 });
+                sm.capabilitiesByVendor = sm.capabilitiesByVendor || {};
+                sm.capabilitiesByVendor[msg.vendor] = readyResult.capabilities || {};
+                sm.modelsByVendor = sm.modelsByVendor || {};
+                if (Array.isArray(readyResult.models)) sm.modelsByVendor[msg.vendor] = readyResult.models;
               } catch (e) {
                 console.error("[project] " + msg.vendor + " init failed (continuing to model list):", e.message || e);
               }
@@ -957,7 +980,8 @@ function createProjectContext(opts) {
             }
           }
         }
-        sendTo(ws, { type: "model_info", model: modelToSend, models: vendorModels, vendor: msg.vendor, availableVendors: sm.availableVendors || [], installedVendors: sm.installedVendors || [] });
+        var vendorCapabilities = (sm.capabilitiesByVendor && sm.capabilitiesByVendor[msg.vendor]) || {};
+        sendTo(ws, { type: "model_info", model: modelToSend, models: vendorModels, vendor: msg.vendor, capabilities: vendorCapabilities, availableVendors: sm.availableVendors || [], installedVendors: sm.installedVendors || [] });
       })();
       return;
     }
@@ -1020,9 +1044,6 @@ function createProjectContext(opts) {
     // --- MCP bridge (remote MCP servers via extension) ---
     if (_mcp.handleMcpMessage(ws, msg)) return;
 
-    // --- Mate datastore ---
-    if (_mateDatastore.handleMateDatastoreMessage(ws, msg)) return;
-
     // --- Knowledge file management (delegated to project-knowledge.js) ---
     if (_knowledge.handleKnowledgeMessage(ws, msg)) return;
 
@@ -1483,9 +1504,6 @@ function createProjectContext(opts) {
   function destroy() {
     _loop.stopTimer();
     _email.destroy();
-    if (_mateDatastore && typeof _mateDatastore.closeAllDatastores === "function") {
-      try { _mateDatastore.closeAllDatastores(); } catch (e) {}
-    }
     stopFileWatch();
     stopAllDirWatches();
     // Abort all active sessions and clean up mention sessions

package/lib/public/app.js

@@ -18,7 +18,6 @@ import {
   openMobileSheet, setMobileSheetMateData, refreshMobileChatSheet
 } from './modules/sidebar-mobile.js';
 import { initMateSidebar, showMateSidebar, hideMateSidebar, renderMateSessionList, updateMateSidebarProfile, handleMateSearchResults } from './modules/mate-sidebar.js';
-import { initMateDatastoreUI } from './modules/mate-datastore-ui.js';
 import { initMateKnowledge, requestKnowledgeList, renderKnowledgeList, handleKnowledgeContent, hideKnowledge } from './modules/mate-knowledge.js';
 import { initMateMemory, renderMemoryList, hideMemory } from './modules/mate-memory.js';
 import { initRewind, setRewindMode, showRewindModal, clearPendingRewindUuid, addRewindButton, onRewindComplete, onRewindError } from './modules/rewind.js';
@@ -312,6 +311,8 @@ import { initDebate, handleDebatePreparing, handleDebateStarted, handleDebateRes
     currentModels: [],
     // Project's last-used vendor; seeds the sidebar's "New session" button.
     lastVendor: "",
+    // Static adapter metadata sent before any vendor is initialized.
+    vendorInfo: {},
     // How Claude sessions open: "gui" (default) or "tui". The server sends
     // claude_open_mode_changed on connect; this seeds it beforehand so the
     // new-session menu doesn't flash the TUI-only entry.
@@ -414,7 +415,6 @@ import { initDebate, handleDebatePreparing, handleDebateStarted, handleDebateRes
   initSidebar(sidebarCtx);
   var wsGetter = function () { return _getWsRef(); };
   initMateSidebar(wsGetter);
-  initMateDatastoreUI(wsGetter);
   initMateKnowledge(wsGetter);
   initMateMemory(wsGetter, { onShow: function () { hideKnowledge(); hideNotes(); } });
   initMateWizard(

package/lib/public/css/mates.css

@@ -2011,202 +2011,6 @@ body.mate-dm-active #layout.sidebar-collapsed .mate-collapsed-info {
   color: var(--accent);
 }
 
-/* Mate datastore inspector */
-#mate-datastore-panel {
-  position: absolute;
-  inset: 0;
-  z-index: 40;
-  background: var(--bg);
-  display: flex;
-  flex-direction: column;
-  overflow: hidden;
-}
-
-#mate-datastore-panel.hidden {
-  display: none !important;
-}
-
-#main-column.mate-datastore-open > .title-bar-content,
-#main-column.mate-datastore-open > .dm-header-bar,
-#main-column.mate-datastore-open > #main-panels {
-  display: none !important;
-}
-
-.mate-datastore-top-bar {
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  height: 48px;
-  padding: 0 16px;
-  border-bottom: 1px solid var(--border-subtle);
-  flex-shrink: 0;
-}
-
-.mate-datastore-top-title {
-  display: flex;
-  align-items: center;
-  gap: 6px;
-  font-weight: 700;
-  font-size: 15px;
-  color: var(--text);
-}
-
-.mate-datastore-top-title .lucide {
-  width: 14px;
-  height: 14px;
-  color: var(--accent);
-  opacity: 0.85;
-}
-
-.mate-datastore-top-actions {
-  display: flex;
-  align-items: center;
-  gap: 8px;
-}
-
-.mate-db-status {
-  padding: 10px 14px 0;
-  font-size: 12px;
-  color: var(--text-secondary, #8e8e8e);
-}
-
-.mate-db-status[data-kind="error"] {
-  color: var(--error, #ff6b6b);
-}
-
-.mate-db-status[data-kind="warn"] {
-  color: var(--warning, #f5a524);
-}
-
-.mate-db-status[data-kind="ok"] {
-  color: var(--success, #36b37e);
-}
-
-.mate-db-layout {
-  display: grid;
-  grid-template-columns: 220px minmax(0, 1fr);
-  gap: 10px;
-  padding: 12px 10px 10px;
-  min-height: 0;
-  flex: 1;
-}
-
-.mate-db-table-column,
-.mate-db-detail {
-  min-height: 0;
-  display: flex;
-  flex-direction: column;
-}
-
-.mate-db-table-list {
-  overflow-y: auto;
-  border: 1px solid var(--border-subtle, rgba(255,255,255,0.06));
-  border-radius: 12px;
-  background: var(--sidebar-bg, rgba(255,255,255,0.03));
-  padding: 6px;
-  flex: 1;
-}
-
-.mate-db-table-item {
-  width: 100%;
-  display: flex;
-  justify-content: space-between;
-  gap: 6px;
-  padding: 8px 10px;
-  border: none;
-  background: transparent;
-  color: var(--text-secondary, #aaa);
-  border-radius: 8px;
-  text-align: left;
-  cursor: pointer;
-}
-
-.mate-db-table-item:hover,
-.mate-db-table-item.active {
-  background: var(--sidebar-active, rgba(255,255,255,0.08));
-  color: var(--text, #fff);
-}
-
-.mate-db-table-item-name {
-  overflow: hidden;
-  text-overflow: ellipsis;
-  white-space: nowrap;
-  min-width: 0;
-}
-
-.mate-db-table-item-type {
-  font-size: 10px;
-  text-transform: uppercase;
-  letter-spacing: 0.05em;
-  opacity: 0.7;
-  flex-shrink: 0;
-}
-
-.mate-db-empty {
-  padding: 16px 10px;
-  color: var(--text-secondary, #8e8e8e);
-  font-size: 12px;
-}
-
-.mate-db-section-title {
-  font-size: 11px;
-  font-weight: 700;
-  text-transform: uppercase;
-  letter-spacing: 0.08em;
-  color: var(--text-muted, #9aa0a6);
-  margin: 0 0 6px;
-}
-
-.mate-db-detail {
-  gap: 8px;
-  min-width: 0;
-}
-
-.mate-db-table-schema,
-.mate-db-result {
-  margin: 0;
-  padding: 10px;
-  border-radius: 10px;
-  border: 1px solid var(--border-subtle, rgba(255,255,255,0.08));
-  background: var(--bg-alt, rgba(255,255,255,0.03));
-  color: var(--text-secondary, #b8b8b8);
-  font-size: 11px;
-  line-height: 1.5;
-  overflow: auto;
-  white-space: pre-wrap;
-  word-break: break-word;
-  min-height: 0;
-}
-
-.mate-db-table-schema {
-  max-height: 180px;
-}
-
-@media (max-width: 900px) {
-  .mate-db-layout {
-    grid-template-columns: 1fr;
-  }
-}
-
-body.mate-dm-active .mate-datastore-top-bar {
-  background: var(--mate-color);
-  color: #fff;
-}
-
-body.mate-dm-active .mate-datastore-top-title,
-body.mate-dm-active .mate-datastore-top-title .lucide {
-  color: #fff;
-}
-
-body.mate-dm-active .mate-datastore-top-bar .scheduler-close-btn {
-  color: rgba(255, 255, 255, 0.85);
-}
-
-body.mate-dm-active .mate-datastore-top-bar .scheduler-close-btn:hover {
-  color: #fff;
-  background: rgba(255, 255, 255, 0.15);
-}
-
 .mate-session-item.search-match {
   background: var(--accent-12, rgba(108, 92, 231, 0.12));
 }

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

@@ -14,7 +14,6 @@ import { renderSessionList, updateSessionPresence, handleSearchResults, updateSe
 import { updateDmBadge, renderSidebarPresence, setMentionActive, renderUserStrip } from './sidebar-mates.js';
 import { refreshMobileChatSheet } from './sidebar-mobile.js';
 import { renderMateSessionList, handleMateSearchResults, updateMateSidebarProfile } from './mate-sidebar.js';
-import { handleMateDatastoreTablesResult, handleMateDatastoreDescribeResult, handleMateDatastoreQueryResult, handleMateDatastoreError, handleMateDatastoreChange } from './mate-datastore-ui.js';
 import { handleHomeClayHistory, handleHomeClayDelta, handleHomeClayDone, handleHomeClayError } from './home-chat.js';
 import { renderKnowledgeList, handleKnowledgeContent } from './mate-knowledge.js';
 import { renderMemoryList } from './mate-memory.js';
@@ -289,7 +288,7 @@ export function processMessage(msg) {
         // host lives on document.body (it's position: fixed), so it
         // survives project navigation unless we detach explicitly here.
         detachTuiView();
-        store.set({ projectName: msg.project || msg.cwd });
+        store.set({ projectName: msg.project || msg.cwd, vendorInfo: msg.vendors || {} });
         if (msg.cwd) store.set({ cwd: msg.cwd });
         if (msg.slug) store.set({ currentSlug: msg.slug });
         try { var _is = store.snap(); localStorage.setItem("clay-project-name-" + (_is.currentSlug || "default"), _is.projectName); } catch (e) {}
@@ -327,26 +326,6 @@ export function processMessage(msg) {
         updateProjectList(msg);
         break;
 
-      case "mate_db_tables_result":
-        handleMateDatastoreTablesResult(msg);
-        break;
-
-      case "mate_db_describe_result":
-        handleMateDatastoreDescribeResult(msg);
-        break;
-
-      case "mate_db_query_result":
-        handleMateDatastoreQueryResult(msg);
-        break;
-
-      case "mate_db_error":
-        handleMateDatastoreError(msg);
-        break;
-
-      case "mate_db_change":
-        handleMateDatastoreChange(msg);
-        break;
-
       case "update_available":
         // In multi-user mode, only show update UI to admins
         if (store.get('isMultiUserMode')) {
@@ -464,6 +443,7 @@ export function processMessage(msg) {
         if (msg.vendor && !store.get('vendorSelectionLocked')) _miUpdate.currentVendor = msg.vendor;
         if (msg.availableVendors) _miUpdate.availableVendors = msg.availableVendors;
         if (msg.installedVendors) _miUpdate.installedVendors = msg.installedVendors;
+        if (msg.capabilities) _miUpdate.vendorCapabilities = msg.capabilities;
         store.set(_miUpdate);
         updateSettingsModels(_modelVal, msg.models || []);
         break;
@@ -1359,7 +1339,7 @@ export function processMessage(msg) {
           var _lm = store.get('pendingLoginModal');
           store.set({ pendingLoginModal: null });
           openTuiModal(msg.id, _lm.slug, {
-            sessionTitle: (_lm.vendor === "codex" ? "Codex" : "Claude") + " login",
+            sessionTitle: (VENDOR_NAMES[_lm.vendor] || "Claude Code") + " login",
             projectName: _lm.slug,
             compact: true,
           });

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

@@ -19,6 +19,14 @@ var bannerContainer = null;
 var bellBtn = null;
 var badgeEl = null;
 
+function getVendorLoginCommand(vendor) {
+  var vendors = store.get('vendorInfo') || {};
+  var info = vendors[vendor];
+  if (info && info.loginCommand) return info.loginCommand;
+  var fallbacks = { codex: "codex login --device-auth", claude: "claude login" };
+  return fallbacks[vendor] || fallbacks.claude;
+}
+
 // --- Pending TUI attention tracking ---
 // Mirrors the icon-shake / favicon-blink behavior the SDK side already gets
 // from `pendingPermissions` on project status broadcasts. The notification
@@ -252,7 +260,7 @@ function showBanner(notif, autoDismissMs) {
           removeBanner(banner);
           dismissNotif(notif.id);
           var authMeta = notif.meta || {};
-          startLoginInModal(authMeta.loginCommand || ((authMeta.vendor || "claude") === "codex" ? "codex login --device-auth" : "claude login"), authMeta.vendor || "claude");
+          startLoginInModal(authMeta.loginCommand || getVendorLoginCommand(authMeta.vendor || "claude"), authMeta.vendor || "claude");
           showLoginReminderBanner();
         });
       }
@@ -332,7 +340,7 @@ 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 cmd = loginCommand || getVendorLoginCommand(vendor);
   var slug = currentProjectSlug();
   if (!slug) { startLoginCommand(cmd); return; }
   store.set({ pendingLoginModal: { slug: slug, vendor: vendor || "claude" } });
@@ -366,7 +374,7 @@ export function autoStartLoginIfNeeded(msg) {
   if (authReminderVisible) return false;
   var vendor = msg.vendor || "claude";
   var cmd = msg.loginCommand
-    || (vendor === "codex" ? "codex login --device-auth" : "claude login");
+    || getVendorLoginCommand(vendor);
   startLoginInModal(cmd, vendor);
   showLoginReminderBanner();
   return true;
@@ -426,7 +434,7 @@ function showLoginReminderBanner() {
 export function showAuthRequiredBanner(msg) {
   if (!bannerContainer) return;
   var vendor = (msg && (msg.vendor || (msg.meta && msg.meta.vendor))) || "claude";
-  var loginCommand = (msg && (msg.loginCommand || (msg.meta && msg.meta.loginCommand))) || (vendor === "codex" ? "codex login --device-auth" : "claude login");
+  var loginCommand = (msg && (msg.loginCommand || (msg.meta && msg.meta.loginCommand))) || getVendorLoginCommand(vendor);
   activeAuthRequiredMsg = Object.assign({}, msg || {}, {
     id: (msg && msg.id) || ("_auth_" + Date.now()),
     type: "auth_required",

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

@@ -93,7 +93,7 @@ var EFFORT_LEVELS_BY_VENDOR = {
 var THINKING_OPTIONS = ["disabled", "adaptive", "budget"];
 var CODEX_APPROVAL_OPTIONS = [
   { value: "never", label: "Auto" },
-  { value: "on-failure", label: "On Fail" },
+  { value: "untrusted", label: "Untrusted" },
   { value: "on-request", label: "Ask" },
 ];
 var CODEX_SANDBOX_OPTIONS = [
@@ -641,11 +641,14 @@ export function updateConfigChip() {
   rebuildModeList();
   rebuildEffortBar();
 
-  // Vendor-specific sections
+  // MODE remains Claude-specific until adapter modes become capabilities.
   var isClaude = vendor === "claude";
-  // MODE, THINKING, BETA are Claude-only
   if (configModeList && configModeList.parentElement) configModeList.parentElement.style.display = isClaude ? "" : "none";
   rebuildThinkingSection();
+  // capabilities.thinking means "emits a thinking stream" (true for every
+  // vendor), NOT "accepts thinking config". The adaptive/extended toggle and
+  // budget only feed Claude queries (sm.currentThinking), so the section
+  // stays Claude-only until a dedicated thinkingConfig capability exists.
   if (configThinkingSection) configThinkingSection.style.display = isClaude ? "" : "none";
   // BETA section deprecated (1M context is now standard)
   if (configBetaSection) configBetaSection.style.display = "none";

package/lib/public/modules/app-rate-limit.js

@@ -23,20 +23,37 @@ var fastModeIndicatorEl = null;
 // --- Internal helpers ---
 
 function getVendorUsageMeta(vendor) {
-  if (vendor === "codex") {
-    return {
+  var vendors = store.get('vendorInfo') || {};
+  var info = vendors[vendor];
+  if (info && info.usageDashboard) return info.usageDashboard;
+  var fallbacks = {
+    codex: {
       icon: "/codex-avatar.png",
       alt: "Codex",
       href: "https://chatgpt.com/admin/usage",
       title: "Check usage on ChatGPT",
-    };
-  }
-  return {
-    icon: "/claude-code-avatar.png",
-    alt: "Claude Code",
-    href: "https://claude.ai/settings/usage",
-    title: "Check usage on claude.ai",
+    },
+    claude: {
+      icon: "/claude-code-avatar.png",
+      alt: "Claude Code",
+      href: "https://claude.ai/settings/usage",
+      title: "Check usage on claude.ai",
+    },
   };
+  return fallbacks[vendor] || fallbacks.claude;
+}
+
+function vendorTracksRateLimits(vendor) {
+  var vendors = store.get('vendorInfo') || {};
+  var info = vendors[vendor];
+  if (info) return info.rateLimitTracking !== false;
+  var legacyTrackedVendors = ["claude", "codex"];
+  return legacyTrackedVendors.indexOf(vendor) !== -1;
+}
+
+function vendorSupportsScheduledMessages(vendor) {
+  var scheduledMessageVendors = ["claude"];
+  return scheduledMessageVendors.indexOf(vendor) !== -1;
 }
 
 function rateLimitTypeLabel(type) {
@@ -178,8 +195,13 @@ function tickRateLimitUsage() {
 
 export function initRateLimit() {
   store.subscribe(function(state, prev) {
-    if (state.currentVendor !== prev.currentVendor && state.currentVendor && state.currentVendor !== "claude") {
-      clearScheduleDelay();
+    if (state.currentVendor !== prev.currentVendor && state.currentVendor) {
+      if (!vendorSupportsScheduledMessages(state.currentVendor)) clearScheduleDelay();
+    }
+    if (state.currentVendor !== prev.currentVendor || state.vendorInfo !== prev.vendorInfo) {
+      if (rateLimitUsageEl) {
+        rateLimitUsageEl.style.display = vendorTracksRateLimits(state.currentVendor || "claude") ? "" : "none";
+      }
     }
   });
 }
@@ -203,7 +225,7 @@ export function handleRateLimitEvent(msg) {
     if (rateLimitResetTimer) clearTimeout(rateLimitResetTimer);
     // Auto-switch input to schedule mode: any message typed will be queued for after reset
     var delayUntilReset = msg.resetsAt - Date.now();
-    if (delayUntilReset > 0 && (store.get('currentVendor') || "claude") === "claude") {
+    if (delayUntilReset > 0 && vendorSupportsScheduledMessages(store.get('currentVendor') || "claude")) {
       setScheduleDelayMs(delayUntilReset + 60000); // +1min buffer after reset
     }
     rateLimitResetTimer = setTimeout(function () {
@@ -222,6 +244,11 @@ export function handleRateLimitEvent(msg) {
 }
 
 export function updateRateLimitUsage(msg) {
+  var activeVendor = store.get('currentVendor') || "claude";
+  if (!vendorTracksRateLimits(activeVendor)) {
+    if (rateLimitUsageEl) rateLimitUsageEl.style.display = "none";
+    return;
+  }
   if (msg.rateLimitType && msg.resetsAt) {
     rateLimitResetState[msg.rateLimitType] = { resetsAt: msg.resetsAt, status: msg.status };
   }
@@ -238,6 +265,7 @@ export function updateRateLimitUsage(msg) {
     var ref = document.getElementById("skip-perms-pill");
     topBarActions.insertBefore(rateLimitUsageEl, ref);
   }
+  rateLimitUsageEl.style.display = "";
 
   // Build label from available reset times
   var parts = [];
@@ -251,7 +279,7 @@ export function updateRateLimitUsage(msg) {
   }
 
   var label = parts.length > 0 ? parts.join(" · ") : "Check usage";
-  var vendor = store.get('currentVendor') || "claude";
+  var vendor = activeVendor;
   var meta = getVendorUsageMeta(vendor);
   rateLimitUsageEl.href = meta.href;
   rateLimitUsageEl.title = meta.title;

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

@@ -14,6 +14,8 @@ import { sendMessage, hasSendableContent } from './input.js';
 import { getChatLayout } from './theme.js';
 import { getScheduledMsgEl } from './app-rate-limit.js';
 
+// Keep these client constants aligned with lib/yoke/vendor-registry.js. The
+// browser cannot import the server's CommonJS registry directly.
 export var VENDOR_AVATARS = {
   claude: "/claude-code-avatar.png",
   codex: "/codex-avatar.png",

package/lib/public/modules/input.js

@@ -5,6 +5,7 @@ import { checkForMention, showMentionMenu, hideMentionMenu, isMentionMenuVisible
 import { store } from './store.js';
 import { mateAvatarUrl } from './avatar.js';
 import { tuiIsActive, tuiSubmitText } from './session-tui-view.js';
+import { VENDOR_AVATARS, VENDOR_NAMES } from './app-rendering.js';
 
 var ctx;
 
@@ -300,11 +301,9 @@ export function sendMessage() {
       _vtw2.classList.remove("locked");
     }
     if (_avi && _avIcon) {
-      var _vendorAvatars = { claude: "/claude-code-avatar.png", codex: "/codex-avatar.png", kiro: "/kiro-avatar.svg" };
-      var _vendorNames = { claude: "Claude", codex: "Codex", kiro: "Kiro CLI" };
-      _avIcon.src = _vendorAvatars[_committedVendor] || _vendorAvatars.claude;
-      _avIcon.alt = _vendorNames[_committedVendor] || _vendorNames.claude;
-      _avi.title = (_vendorNames[_committedVendor] || _vendorNames.claude) + " session";
+      _avIcon.src = VENDOR_AVATARS[_committedVendor] || VENDOR_AVATARS.claude;
+      _avIcon.alt = VENDOR_NAMES[_committedVendor] || VENDOR_NAMES.claude;
+      _avi.title = (VENDOR_NAMES[_committedVendor] || VENDOR_NAMES.claude) + " session";
       _avi.classList.remove("hidden");
     }
   } else if (_vtw2) {