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

package/lib/public/modules/session-tui-view.js

@@ -20,15 +20,9 @@ import { getTerminalTheme } from './theme.js';
 import { getTerminalFontFamily, getTerminalFontSize, onTerminalFontChange } from './terminal-prefs.js';
 import { showHeaderTuiFont, hideHeaderTuiFont } from './header-tui-font.js';
 import { attachTuiGrab, detachTuiGrab } from './tui-grab.js';
-import { openArticle as openWhatsNewArticle } from './whats-new-article.js';
 import { createKeyToolbar, TERMINAL_TOOLBAR_HTML } from './terminal-toolbar.js';
 import { refreshIcons, iconHtml } from './icons.js';
 
-// Stable id of the canonical "Why TUI mode?" article in
-// lib/whats-new-content.js. The TUI policy notice's "Learn more" button
-// opens that article in the blog viewer instead of a one-off modal.
-var TUI_POLICY_ARTICLE_ID = "2026-06-tui-default";
-
 // Claude TUI session terminal colors follow Clay's active theme via
 // getTerminalTheme(). Live theme switches are wired through
 // setTuiSessionTheme() below, which theme.js calls from applyTheme.
@@ -44,15 +38,6 @@ var isTouchDevice = "ontouchstart" in window;
 // touch devices and forward its send into the PTY (input.js -> tuiSubmitText).
 // xterm is render-only on mobile.
 
-// The TUI policy notice's "Learn more" button opens the canonical
-// "Why TUI mode?" entry in the What's New blog viewer. The full
-// authoritative text lives in lib/whats-new-content.js so there's a
-// single source of truth.
-function openPolicyArticle(e) {
-  if (e && e.stopPropagation) e.stopPropagation();
-  openWhatsNewArticle(TUI_POLICY_ARTICLE_ID);
-}
-
 var xterm = null;        // xterm.js instance
 var fitAddon = null;
 var webglAddon = null;
@@ -81,7 +66,7 @@ var resizeDebounce = null;
 //      fitAddon.fit() reads clientWidth - otherwise fit() can compute
 //      cols against the pre-resize container width.
 //   2. A second rAF + second fit() pass converges any further layout
-//      adjustments (scrollbar appear/disappear, policy notice
+//      adjustments (scrollbar appear/disappear, the key toolbar
 //      reflowing on narrower widths, etc.). This mirrors the two-pass
 //      fit used on attach (fitNow + setTimeout(fitNow, 50)).
 //   3. WebGL renderer caches a font atlas keyed on cell metrics. When
@@ -128,7 +113,7 @@ function ensureHostEl() {
   hostEl.style.boxSizing = "border-box";
   // 4px inset on all sides so the terminal doesn't kiss the edges of the
   // content area. fitAddon computes against the xterm container's
-  // clientWidth/clientHeight (which exclude padding + the policy banner),
+  // clientWidth/clientHeight (which exclude padding + the key toolbar),
   // so cols/rows stay correct.
   hostEl.style.padding = "4px";
 
@@ -148,30 +133,9 @@ function ensureHostEl() {
     });
   }
 
-  // Policy notice: explains why TUI mode exists (Anthropic split Agent
-  // SDK usage into a separate billing bucket on 2026-06-15; running
-  // `claude` in a real terminal keeps usage in the Interactive bucket).
-  var noticeEl = document.createElement("div");
-  noticeEl.className = "tui-policy-notice";
-  noticeEl.innerHTML =
-    '<span class="tui-policy-icon">●</span>' +
-    '<span class="tui-policy-text">TUI is the default Claude mode in Clay because of Anthropic\'s new billing policy.</span>' +
-    '<button type="button" class="tui-policy-learn-more">Learn more</button>' +
-    '<button type="button" class="tui-policy-dismiss" aria-label="Dismiss this notice for the rest of the page">&times;</button>';
-  noticeEl.querySelector(".tui-policy-learn-more").addEventListener("click", openPolicyArticle);
-  noticeEl.querySelector(".tui-policy-dismiss").addEventListener("click", function () {
-    // Session-only dismiss: hides the notice for the current page load.
-    // Reloading restores it on purpose so the policy context doesn't
-    // get lost forever - a user who comes back next month should be
-    // re-reminded that TUI is a billing workaround.
-    noticeEl.style.display = "none";
-    if (typeof fitNow === "function") fitNow();
-  });
-  hostEl.appendChild(noticeEl);
-
-  // Dedicated xterm container so the banner sits above the terminal
+  // Dedicated xterm container so the toolbar sits above the terminal
   // rather than xterm mounting at the host root (which would have it
-  // side-by-side with the banner under flex layout).
+  // side-by-side with the toolbar under flex layout).
   xtermContainerEl = document.createElement("div");
   xtermContainerEl.className = "tui-xterm-container";
   xtermContainerEl.style.flex = "1 1 auto";

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

@@ -457,7 +457,7 @@ export function renderUserStrip(allUsers, onlineUserIds, myUserId, dmFavorites,
       // Tooltip
       var displayName = mp.displayName || mate.name || "New Mate";
       var mateVendor = mate.vendor || "claude";
-      var vendorLabels = { claude: "Claude Code", codex: "OpenAI Codex" };
+      var vendorLabels = { claude: "Claude Code", codex: "OpenAI Codex", kiro: "Kiro CLI" };
       el.addEventListener("mouseenter", function () {
         var html = '<div style="font-weight:600">' + escapeHtml(displayName);
         if (mate.primary) {

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

@@ -11,8 +11,11 @@ import { getMateSessions } from './mate-sidebar.js';
 import { openProjectSettings } from './project-settings.js';
 import {
   getCachedSessions,
-  getDateGroup
+  getDateGroup,
+  resolveDefaultVendor,
+  startNewSession
 } from './sidebar-sessions.js';
+import { VENDOR_AVATARS, VENDOR_NAMES, VENDOR_ORDER, VENDOR_HOMEPAGES } from './app-rendering.js';
 import {
   getCachedProjectList,
   getCachedCurrentSlug,
@@ -698,36 +701,66 @@ function renderMateMobileActions(container) {
 
 // Helper: render sorted sessions into a container with date groups (with loop session grouping)
 function renderMobileSessionsInto(container) {
-  // Vendor-aware new-session row. Mirrors the desktop sidebar's two-button
-  // pattern (Claude defaults to TUI, Codex always GUI) so mobile users can
-  // pick the vendor instead of being silently routed to Claude TUI.
+  // Mirrors the desktop sidebar's split button: one "New session" action on
+  // the project's last-used vendor, plus a chevron that expands the full
+  // vendor list. The list expands inline rather than as a fixed-position
+  // popover because it lives inside a scrolling bottom sheet.
+  var mobileDefaultVendor = resolveDefaultVendor();
+  var mobileInstalled = store.get('installedVendors') || [];
+
   var newRow = document.createElement("div");
   newRow.className = "mobile-session-new-row";
 
-  var claudeBtn = document.createElement("button");
-  claudeBtn.className = "mobile-session-new mobile-session-new-vendor";
-  claudeBtn.innerHTML = '<img src="/claude-code-avatar.png" class="mobile-session-new-icon" alt=""><span>Claude</span>';
-  claudeBtn.addEventListener("click", function () {
-    if (getWs() && store.get('connected')) {
-      // No explicit mode: the server applies the user's claudeOpenMode pref.
-      getWs().send(JSON.stringify({ type: "new_session", vendor: "claude" }));
-    }
+  var mainBtn = document.createElement("button");
+  mainBtn.className = "mobile-session-new mobile-session-new-main";
+  mainBtn.innerHTML = '<img src="' + (VENDOR_AVATARS[mobileDefaultVendor] || VENDOR_AVATARS.claude) +
+    '" class="mobile-session-new-icon" alt=""><span>New ' + (VENDOR_NAMES[mobileDefaultVendor] || mobileDefaultVendor) + ' session</span>';
+  mainBtn.addEventListener("click", function () {
+    startNewSession(mobileDefaultVendor);
     closeMobileSheet();
   });
-  newRow.appendChild(claudeBtn);
-
-  var codexBtn = document.createElement("button");
-  codexBtn.className = "mobile-session-new mobile-session-new-vendor";
-  codexBtn.innerHTML = '<img src="/codex-avatar.png" class="mobile-session-new-icon" alt=""><span>Codex</span>';
-  codexBtn.addEventListener("click", function () {
-    if (getWs() && store.get('connected')) {
-      getWs().send(JSON.stringify({ type: "new_session", vendor: "codex" }));
-    }
-    closeMobileSheet();
+  newRow.appendChild(mainBtn);
+
+  var vendorList = document.createElement("div");
+  vendorList.className = "mobile-vendor-list hidden";
+
+  var chevronBtn = document.createElement("button");
+  chevronBtn.className = "mobile-session-new mobile-session-new-chevron";
+  chevronBtn.setAttribute("aria-label", "Choose a vendor");
+  chevronBtn.innerHTML = iconHtml("chevron-down");
+  chevronBtn.addEventListener("click", function () {
+    vendorList.classList.toggle("hidden");
+    chevronBtn.classList.toggle("expanded");
   });
-  newRow.appendChild(codexBtn);
+  newRow.appendChild(chevronBtn);
+
+  // Every known vendor is listed. Uninstalled ones stay visible but disabled,
+  // and tapping one opens the vendor's homepage.
+  for (var vi = 0; vi < VENDOR_ORDER.length; vi++) {
+    (function (vendor) {
+      var isInstalled = mobileInstalled.indexOf(vendor) !== -1;
+      var name = VENDOR_NAMES[vendor] || vendor;
+      var vBtn = document.createElement("button");
+      vBtn.className = "mobile-session-new mobile-session-new-vendor";
+      if (!isInstalled) vBtn.classList.add("disabled");
+      if (vendor === mobileDefaultVendor) vBtn.classList.add("active");
+      vBtn.innerHTML = '<img src="' + VENDOR_AVATARS[vendor] + '" class="mobile-session-new-icon" alt="">' +
+        '<span>' + name + '</span>' +
+        (isInstalled ? "" : '<span class="mobile-vendor-note">Not installed</span>');
+      vBtn.addEventListener("click", function () {
+        if (!isInstalled) {
+          window.open(VENDOR_HOMEPAGES[vendor], "_blank", "noopener");
+          return;
+        }
+        startNewSession(vendor);
+        closeMobileSheet();
+      });
+      vendorList.appendChild(vBtn);
+    })(VENDOR_ORDER[vi]);
+  }
 
   container.appendChild(newRow);
+  container.appendChild(vendorList);
 
   // Partition: loop sessions vs normal sessions (same logic as desktop renderSessionList)
   var sessions = getCachedSessions();

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.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) {