clay-server 2.46.0 → 2.47.0-beta.2

package/lib/public/modules/sidebar-sessions.js

@@ -12,6 +12,7 @@ import { dismissOverlayPanels, closeSidebar, updatePageTitle, spawnDustParticles
 import { showConfirm } from './app-misc.js';
 import { getUpcomingSchedules } from './scheduler.js';
 import { refreshMobileChatSheet } from './sidebar-mobile.js';
+import { VENDOR_AVATARS, VENDOR_NAMES, VENDOR_ORDER, VENDOR_HOMEPAGES } from './app-rendering.js';
 
 
 // --- Session state ---
@@ -292,85 +293,140 @@ function appendSessionCloseButton(el, session) {
   el.appendChild(closeBtn);
 }
 
+// Resolve the vendor the "New session" button should launch: the project's
+// last-used vendor when its CLI is still installed, else the first installed
+// vendor, else Claude (so the button always has a sane label to render).
+export function resolveDefaultVendor() {
+  var installed = store.get('installedVendors') || [];
+  var last = store.get('lastVendor') || "";
+  if (last && installed.indexOf(last) !== -1) return last;
+  for (var i = 0; i < VENDOR_ORDER.length; i++) {
+    if (installed.indexOf(VENDOR_ORDER[i]) !== -1) return VENDOR_ORDER[i];
+  }
+  return "claude";
+}
+
+// Single entry point for session creation from the sidebar. Optimistically
+// bind the composer to the requested vendor before the server round-trip.
+// Otherwise vendorSelectionLocked from the previous session can reject the
+// new config_state and leave a Kiro/Codex session rendered as Claude.
+export function startNewSession(vendor, extra) {
+  if (!getWs() || !store.get('connected')) return;
+  var payload = { type: "new_session", vendor: vendor };
+  if (extra) {
+    var keys = Object.keys(extra);
+    for (var i = 0; i < keys.length; i++) payload[keys[i]] = extra[keys[i]];
+  }
+  getWs().send(JSON.stringify(payload));
+  store.set({
+    lastVendor: vendor,
+    currentVendor: vendor,
+    currentModel: "",
+    currentModels: [],
+    vendorSelectionLocked: true,
+  });
+}
+
 function renderSessionTopActions() {
   var wrap = document.createElement("div");
   wrap.className = "session-top-actions";
 
-  // Claude: split button. The main button creates a session using the user's
-  // claudeOpenMode pref (server applies it). The chevron opens a menu with
-  // alternate launch modes (e.g. bypass-permissions, TUI shell only).
-  var claudeCell = document.createElement("div");
-  claudeCell.className = "session-top-action-split";
-
-  var claudeBtn = document.createElement("button");
-  claudeBtn.className = "session-top-action split-main";
-  claudeBtn.type = "button";
-  claudeBtn.title = "New Claude session";
-  claudeBtn.innerHTML = '<img src="/claude-code-avatar.png" class="session-top-action-icon" alt=""><span>Claude</span>';
-  claudeBtn.addEventListener("click", function () {
-    if (getWs() && store.get('connected')) {
-      getWs().send(JSON.stringify({ type: "new_session", vendor: "claude" }));
-    }
+  // Single split button. The main half creates a session with the project's
+  // last-used vendor (for Claude the server applies the claudeOpenMode pref);
+  // the chevron opens the vendor picker plus alternate launch modes.
+  var defaultVendor = resolveDefaultVendor();
+
+  var cell = document.createElement("div");
+  cell.className = "session-top-action-split";
+
+  var mainBtn = document.createElement("button");
+  mainBtn.className = "session-top-action split-main";
+  mainBtn.type = "button";
+  mainBtn.title = "New " + (VENDOR_NAMES[defaultVendor] || defaultVendor) + " session";
+  mainBtn.innerHTML = '<img src="' + (VENDOR_AVATARS[defaultVendor] || VENDOR_AVATARS.claude) +
+    '" class="session-top-action-icon" alt=""><span>New session</span>';
+  mainBtn.addEventListener("click", function () {
+    startNewSession(defaultVendor);
   });
-  claudeCell.appendChild(claudeBtn);
-
-  var claudeChevron = document.createElement("button");
-  claudeChevron.className = "session-top-action split-chevron";
-  claudeChevron.type = "button";
-  claudeChevron.title = "More Claude launch options";
-  claudeChevron.setAttribute("aria-label", "More Claude launch options");
-  claudeChevron.innerHTML = iconHtml("chevron-down");
-  claudeChevron.addEventListener("click", function (e) {
+  cell.appendChild(mainBtn);
+
+  var chevron = document.createElement("button");
+  chevron.className = "session-top-action split-chevron";
+  chevron.type = "button";
+  chevron.title = "Choose a vendor or launch mode";
+  chevron.setAttribute("aria-label", "Choose a vendor or launch mode");
+  chevron.innerHTML = iconHtml("chevron-down");
+  chevron.addEventListener("click", function (e) {
     e.preventDefault();
     e.stopPropagation();
     if (sessionCtxMenu) { closeSessionCtxMenu(); return; }
-    showClaudeStartMenu(claudeChevron);
+    showNewSessionMenu(chevron, defaultVendor);
   });
-  claudeCell.appendChild(claudeChevron);
-
-  wrap.appendChild(claudeCell);
-
-  // Codex: always GUI (no TUI adapter for Codex).
-  var codexBtn = document.createElement("button");
-  codexBtn.className = "session-top-action";
-  codexBtn.type = "button";
-  codexBtn.title = "New Codex session";
-  codexBtn.innerHTML = '<img src="/codex-avatar.png" class="session-top-action-icon" alt=""><span>Codex</span>';
-  codexBtn.addEventListener("click", function () {
-    if (getWs() && store.get('connected')) {
-      getWs().send(JSON.stringify({ type: "new_session", vendor: "codex" }));
-    }
-  });
-  wrap.appendChild(codexBtn);
+  cell.appendChild(chevron);
 
+  wrap.appendChild(cell);
   return wrap;
 }
 
-// Dropdown anchored to the Claude split-button chevron. Reuses the
-// session-ctx-menu element/var so the global document click handler closes it.
-function showClaudeStartMenu(anchorBtn) {
+// Dropdown anchored to the split-button chevron. Reuses the session-ctx-menu
+// element/var so the global document click handler closes it.
+function showNewSessionMenu(anchorBtn, defaultVendor) {
   closeSessionCtxMenu();
 
   var menu = document.createElement("div");
-  menu.className = "session-ctx-menu";
+  menu.className = "session-ctx-menu session-new-menu";
+  var installed = store.get('installedVendors') || [];
+
+  // Every known vendor is listed. Uninstalled ones stay visible but disabled,
+  // and clicking one opens the vendor's homepage so the user can install it.
+  for (var i = 0; i < VENDOR_ORDER.length; i++) {
+    (function (vendor) {
+      var isInstalled = installed.indexOf(vendor) !== -1;
+      var name = VENDOR_NAMES[vendor] || vendor;
+      var item = document.createElement("button");
+      item.className = "session-ctx-item session-new-vendor";
+      if (!isInstalled) item.classList.add("disabled");
+      if (vendor === defaultVendor) item.classList.add("active");
+      item.type = "button";
+      item.innerHTML = '<img src="' + VENDOR_AVATARS[vendor] + '" class="session-top-action-icon" alt="">' +
+        '<span class="session-new-vendor-name">' + name + '</span>' +
+        (isInstalled ? "" : '<span class="session-new-vendor-note">Not installed</span>' + iconHtml("external-link"));
+      item.title = isInstalled
+        ? "New " + name + " session"
+        : name + " is not installed - open " + VENDOR_HOMEPAGES[vendor];
+      item.addEventListener("click", function (e) {
+        e.stopPropagation();
+        closeSessionCtxMenu();
+        if (!isInstalled) {
+          window.open(VENDOR_HOMEPAGES[vendor], "_blank", "noopener");
+          return;
+        }
+        startNewSession(vendor);
+      });
+      menu.appendChild(item);
+    })(VENDOR_ORDER[i]);
+  }
 
-  var skipItem = document.createElement("button");
-  skipItem.className = "session-ctx-item";
-  skipItem.innerHTML = iconHtml("shield-off") + " <span>Skip permissions (TUI)</span>";
-  skipItem.title = "Start a terminal session with --dangerously-skip-permissions";
-  skipItem.addEventListener("click", function (e) {
-    e.stopPropagation();
-    closeSessionCtxMenu();
-    if (getWs() && store.get('connected')) {
-      getWs().send(JSON.stringify({
-        type: "new_session",
-        vendor: "claude",
-        mode: "tui",
-        dangerouslySkipPermissions: true,
-      }));
-    }
-  });
-  menu.appendChild(skipItem);
+  // Claude-only launch mode: a bare TUI shell with permission prompts off.
+  // Hidden in GUI mode (the default) because the item only ever produces a
+  // terminal session, which contradicts what the rest of the menu creates.
+  if (installed.indexOf("claude") !== -1 && store.get('claudeOpenMode') === "tui") {
+    var sep = document.createElement("div");
+    sep.className = "session-ctx-sep";
+    menu.appendChild(sep);
+
+    var skipItem = document.createElement("button");
+    skipItem.className = "session-ctx-item";
+    skipItem.type = "button";
+    skipItem.innerHTML = iconHtml("shield-off") + " <span>Skip permissions (TUI)</span>";
+    skipItem.title = "Start a terminal session with --dangerously-skip-permissions";
+    skipItem.addEventListener("click", function (e) {
+      e.stopPropagation();
+      closeSessionCtxMenu();
+      startNewSession("claude", { mode: "tui", dangerouslySkipPermissions: true });
+    });
+    menu.appendChild(skipItem);
+  }
 
   document.body.appendChild(menu);
   sessionCtxMenu = menu;
@@ -528,6 +584,14 @@ export function initSidebarSessions() {
     syncHeaderSearchUi();
   }
 
+  // The "New session" split button renders from lastVendor + installedVendors,
+  // so a late-arriving vendor detection or a vendor switch has to repaint it.
+  store.subscribe(function (state, prev) {
+    if (state.lastVendor !== prev.lastVendor || state.installedVendors !== prev.installedVendors) {
+      renderSessionList(null);
+    }
+  });
+
   // --- Resume session picker ---
   // --- Schedule countdown timer ---
   startCountdownTimer();
@@ -1411,4 +1475,3 @@ function relativeTime(isoString) {
   if (days < 30) return days + "d ago";
   return new Date(isoString).toLocaleDateString();
 }
-

package/lib/public/modules/tools.js

@@ -814,7 +814,7 @@ function resolvePermissionIdentity(mateId, vendor) {
     }
   }
   // Project chat: use vendor name and avatar
-  var vendorAvatars = { claude: "/claude-code-avatar.png", codex: "/codex-avatar.png" };
+  var vendorAvatars = { claude: "/claude-code-avatar.png", codex: "/codex-avatar.png", kiro: "/kiro-avatar.svg" };
   var vendorName = (vendor && VENDOR_NAMES[vendor]) || VENDOR_NAMES.claude;
   return {
     name: vendorName,

package/lib/sdk-bridge.js

@@ -5,6 +5,7 @@ var execSync = require("child_process").execSync;
 var execFileSync = require("child_process").execFileSync;
 var usersModule = require("./users");
 var { getCodexConfig } = require("./codex-defaults");
+var { getKiroConfig } = require("./kiro-defaults");
 var { splitShellSegments, attachSkillDiscovery } = require("./sdk-skill-discovery");
 var { isSafeBashSegment } = require("./safe-bash-commands");
 var { createMessageQueue } = require("./sdk-message-queue");
@@ -151,6 +152,7 @@ function createSDKBridge(opts) {
   function getLoginCommand(vendor) {
     if (vendor === "codex") return "codex login --device-auth";
     if (vendor === "claude") return "claude login";
+    if (vendor === "kiro") return "kiro-cli login";
     return (vendor || "claude") + " login";
   }
 
@@ -799,7 +801,7 @@ function createSDKBridge(opts) {
         onProcessingChanged();
         send({ type: "status", processing: false });
         sendAndRecord(session, { type: "thinking_stop" });
-        var interruptMsg = (session.vendor === "codex")
+        var interruptMsg = (session.vendor && session.vendor !== "claude")
           ? "\u25a0 Conversation interrupted - tell the model what to do differently."
           : "Interrupted \u00b7 What should Claude do instead?";
         sendAndRecord(session, { type: "info", text: interruptMsg });
@@ -813,7 +815,7 @@ function createSDKBridge(opts) {
         if (err.name === "AbortError" || (myAbortController && myAbortController.signal.aborted) || session.taskStopRequested) {
           if (!session.destroying) {
             sendAndRecord(session, { type: "thinking_stop" });
-            var interruptMsg2 = (session.vendor === "codex")
+            var interruptMsg2 = (session.vendor && session.vendor !== "claude")
               ? "\u25a0 Conversation interrupted - tell the model what to do differently."
               : "Interrupted \u00b7 What should Claude do instead?";
             sendAndRecord(session, { type: "info", text: interruptMsg2 });
@@ -867,7 +869,8 @@ function createSDKBridge(opts) {
               var canAutoLogin = !usersModule.isMultiUser()
                 || !!authLinuxUser
                 || (authUser && authUser.role === "admin");
-              var authTitle = (session.vendor === "codex" ? "Codex" : "Claude Code") + " is not logged in.";
+              var authVendorLabel = session.vendor === "codex" ? "Codex" : (session.vendor === "kiro" ? "Kiro CLI" : "Claude Code");
+              var authTitle = authVendorLabel + " is not logged in.";
               var authMsg = {
                 type: "auth_required",
                 text: authTitle,
@@ -1067,6 +1070,7 @@ function createSDKBridge(opts) {
   async function startQuery(session, text, images, linuxUser) {
     async function ensureVendorReady(vendor) {
       if (!vendor) return null;
+      if (linuxUser && vendor === "kiro") return null;
       var vendorAdapter = adapters[vendor] || null;
       if (!vendorAdapter) {
         var yoke = require("./yoke");
@@ -1091,7 +1095,7 @@ function createSDKBridge(opts) {
         });
       }
       if (vendorAdapter) {
-        sm.availableVendors = Object.keys(adapters);
+        sm.availableVendors = getAvailableVendors(linuxUser);
         sm.modelsByVendor = sm.modelsByVendor || {};
         if (!sm.modelsByVendor[vendor] && typeof vendorAdapter.supportedModels === "function") {
           sm.modelsByVendor[vendor] = await vendorAdapter.supportedModels();
@@ -1100,6 +1104,20 @@ function createSDKBridge(opts) {
       return vendorAdapter;
     }
 
+    // Kiro ACP currently spawns as the daemon user. Running it for an
+    // OS-isolated session would expose the daemon user's HOME and Kiro
+    // credentials to another user, so refuse until the adapter has a
+    // per-user worker path.
+    if (linuxUser && session.vendor === "kiro") {
+      console.error("[sdk-bridge] Refusing Kiro for OS-isolated user " + linuxUser + ": per-user ACP spawning is not implemented");
+      sendAndRecord(session, {
+        type: "error",
+        text: "Kiro is not available for OS-isolated users yet.",
+      });
+      sendAndRecord(session, { type: "done", code: 1 });
+      return;
+    }
+
     // If vendor is set but adapter not ready, try lazy creation (user may have logged in)
     if (session.vendor && !adapters[session.vendor]) {
       var lazyAdapter = await ensureVendorReady(session.vendor);
@@ -1292,6 +1310,7 @@ function createSDKBridge(opts) {
     }
 
     var codexConfig = getCodexConfig(sm);
+    var kiroConfig = getKiroConfig(sm);
     var mergedMcpServers = mergeMcpServers(getMcpServers(), getRemoteMcpServers) || undefined;
 
     // Derive an explicit session title for fresh queries so the SDK records
@@ -1346,6 +1365,14 @@ function createSDKBridge(opts) {
           sandboxMode: codexConfig.sandbox,
           webSearchMode: codexConfig.webSearch,
         },
+        KIRO: {
+          engine: kiroConfig.engine,
+          mode: kiroConfig.mode,
+          // Kiro reads its native ~/.kiro/settings/mcp.json. Clay-managed MCP
+          // servers are intentionally not forwarded until the ACP entry shape
+          // and duplicate-registration behavior are verified against CLI 3.x.
+          mcpServers: [],
+        },
       },
     };
 
@@ -1502,9 +1529,27 @@ function createSDKBridge(opts) {
     } catch (e) {}
     if ((codexBin && fs.existsSync(codexBin)) || tryLookup("codex")) result.push("codex");
 
+    // Kiro has no per-user ACP spawn path yet. Do not advertise the daemon's
+    // binary to an OS-isolated user, even if that user also has Kiro installed.
+    if (!linuxUser) {
+      var kiroBin = null;
+      try {
+        kiroBin = require("./yoke/kiro-acp-server").findKiroPath();
+      } catch (e) {}
+      if ((kiroBin && fs.existsSync(kiroBin)) || tryLookup("kiro-cli")) result.push("kiro");
+    } else {
+      console.log("[sdk-bridge] Kiro hidden for OS-isolated user " + linuxUser + ": per-user ACP spawning is not implemented");
+    }
+
     return result;
   }
 
+  function getAvailableVendors(linuxUser) {
+    return Object.keys(adapters).filter(function(vendor) {
+      return !(linuxUser && vendor === "kiro");
+    });
+  }
+
   // SDK warmup: initialize all available adapters and collect models.
   // The default adapter is initialized first for slash_commands and skills.
   // Passes linuxUser to adapter for worker-based warmup when OS isolation is needed.
@@ -1568,7 +1613,7 @@ function createSDKBridge(opts) {
 
     // Detect installed vendors per-user (binary existence check)
     sm.installedVendors = detectInstalledVendors(linuxUser);
-    sm.availableVendors = Object.keys(adapters);
+    sm.availableVendors = getAvailableVendors(linuxUser);
 
     // Send initial state to client
     send({

package/lib/sdk-message-processor.js

@@ -50,10 +50,12 @@ function attachMessageProcessor(ctx) {
     var canAutoLogin = !usersModule.isMultiUser()
       || !!authLinuxUser
       || (authUser && authUser.role === "admin");
-    var authTitle = session.vendor === "codex" ? "Codex is not logged in." : "Claude Code is not logged in.";
+    var authTitle = session.vendor === "codex"
+      ? "Codex is not logged in."
+      : (session.vendor === "kiro" ? "Kiro CLI is not logged in." : "Claude Code is not logged in.");
     var loginCommand = session.vendor === "codex"
       ? "codex login --device-auth"
-      : "claude login";
+      : (session.vendor === "kiro" ? "kiro-cli login" : "claude login");
     var _nmLogin = getNotificationsModule();
     sendAndRecord(session, {
       type: "auth_required",

package/lib/server-auth.js

@@ -102,11 +102,20 @@ function attachAuth(ctx) {
   function getMultiUserFromReq(req) {
     var cookies = parseCookies(req);
     var token = cookies[MULTI_USER_COOKIE];
-    if (!token) return null;
-    var userId = multiUserTokens[token];
-    if (!userId) return null;
-    var user = users.findUserById(userId);
-    return user || null;
+    if (token) {
+      var userId = multiUserTokens[token];
+      if (userId) {
+        var user = users.findUserById(userId);
+        if (user) return user;
+      }
+    }
+    // Solo auto-login: exactly one user with no PIN => frictionless access, no
+    // login wall. Mirrors the old single-user onramp once single-user mode is
+    // absorbed into multi-user. Disabled the moment a PIN is set or a second
+    // user is added (then the normal token/login flow applies).
+    var solo = users.getSoloNoPinUser();
+    if (solo) return solo;
+    return null;
   }
 
   function isMultiUserAuthed(req) {

package/lib/server.js

@@ -148,6 +148,8 @@ function createServer(opts) {
   var onSetServerDefaultMode = opts.onSetServerDefaultMode || null;
   var onGetProjectDefaultMode = opts.onGetProjectDefaultMode || null;
   var onSetProjectDefaultMode = opts.onSetProjectDefaultMode || null;
+  var onGetProjectLastVendor = opts.onGetProjectLastVendor || null;
+  var onSetProjectLastVendor = opts.onSetProjectLastVendor || null;
   var onGetProjectMcpServers = opts.onGetProjectMcpServers || null;
   var onSetProjectMcpServers = opts.onSetProjectMcpServers || null;
   var onGetDaemonConfig = opts.onGetDaemonConfig || null;
@@ -1253,6 +1255,8 @@ function createServer(opts) {
       onSetServerDefaultMode: onSetServerDefaultMode,
       onGetProjectDefaultMode: onGetProjectDefaultMode,
       onSetProjectDefaultMode: onSetProjectDefaultMode,
+      onGetProjectLastVendor: onGetProjectLastVendor,
+      onSetProjectLastVendor: onSetProjectLastVendor,
       onGetProjectMcpServers: onGetProjectMcpServers,
       onSetProjectMcpServers: onSetProjectMcpServers,
       onGetDaemonConfig: onGetDaemonConfig,

package/lib/users-preferences.js

@@ -274,7 +274,9 @@ function attachPreferences(deps) {
   }
 
   function setClaudeOpenMode(userId, mode) {
-    var normalized = (mode === "gui") ? "gui" : "tui";
+    // 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) {

package/lib/users.js

@@ -165,6 +165,19 @@ function getAllUsers() {
   });
 }
 
+// Solo frictionless access: exactly one user with no PIN. Returns the full
+// user record (callers read id/role/etc.) or null. Used to skip the login wall
+// so an absorbed single-user deploy stays zero-friction; auto-disables the
+// moment a PIN is set or a second user is added.
+function getSoloNoPinUser() {
+  if (!isMultiUser()) return null;
+  var data = loadUsers();
+  if (!data.users || data.users.length !== 1) return null;
+  var u = data.users[0];
+  if (u.pinHash) return null;
+  return u;
+}
+
 function getOtherUsers(excludeUserId) {
   return getAllUsers().filter(function (u) {
     return u.id !== excludeUserId;
@@ -451,6 +464,7 @@ module.exports = {
   findUserByEmail: findUserByEmail,
   authenticateUser: authenticateUser,
   getAllUsers: getAllUsers,
+  getSoloNoPinUser: getSoloNoPinUser,
   removeUser: removeUser,
   updateUserProfile: updateUserProfile,
   updateUserPin: updateUserPin,

package/lib/yoke/adapters/codex.js

@@ -620,7 +620,7 @@ function createCodexQueryHandle(appServer, queryOpts) {
     done: false,
     aborted: false,
     loopStarted: false,
-    model: queryOpts.model || "gpt-5.5",
+    model: queryOpts.model || "gpt-5.6-terra",
     // Track incremental text deltas
     textBlocks: {},     // itemId -> true (text_start sent)
     textLengths: {},    // itemId -> last sent length
@@ -865,7 +865,7 @@ function createCodexQueryHandle(appServer, queryOpts) {
 
       // Start or resume thread
       var threadParams = {
-        model: queryOpts.model || "gpt-5.5",
+        model: queryOpts.model || "gpt-5.6-terra",
         sandbox: queryOpts.sandboxMode || "workspace-write",
         approvalPolicy: queryOpts.approvalPolicy || "on-failure",
         cwd: queryOpts.cwd,
@@ -1086,6 +1086,9 @@ function createCodexAdapter(opts) {
   // slow/failed `initialize` leaves the picker empty and the chip shows the
   // previous vendor's model.
   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",
@@ -1131,7 +1134,7 @@ function createCodexAdapter(opts) {
   function buildReadyResponse(skillNames) {
     return {
       models: _cachedModels,
-      defaultModel: "gpt-5.5",
+      defaultModel: "gpt-5.6-terra",
       skills: skillNames || [],
       slashCommands: skillNames || [],
       fastModeState: null,
@@ -1428,7 +1431,7 @@ function createCodexAdapter(opts) {
         throw new Error("[yoke/codex] Adapter not initialized. Call init() first.");
       }
 
-      var model = queryOpts.model || "gpt-5.5";
+      var model = queryOpts.model || "gpt-5.6-terra";
       var ac = queryOpts.abortController || new AbortController();
       var activeEntry = {
         abort: function() {