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

package/lib/daemon.js

@@ -648,6 +648,29 @@ var relay = createServer({
     }
     return { ok: false, error: "Project not found" };
   },
+  onGetProjectLastVendor: function (slug) {
+    for (var i = 0; i < config.projects.length; i++) {
+      if (config.projects[i].slug === slug) {
+        return { vendor: config.projects[i].lastVendor || null };
+      }
+    }
+    return { vendor: null };
+  },
+  onSetProjectLastVendor: function (slug, vendor) {
+    for (var i = 0; i < config.projects.length; i++) {
+      if (config.projects[i].slug === slug) {
+        if (config.projects[i].lastVendor === vendor) return { ok: true };
+        if (vendor) {
+          config.projects[i].lastVendor = vendor;
+        } else {
+          delete config.projects[i].lastVendor;
+        }
+        saveConfig(config);
+        return { ok: true };
+      }
+    }
+    return { ok: false, error: "Project not found" };
+  },
   onGetProjectMcpServers: function (slug) {
     for (var i = 0; i < config.projects.length; i++) {
       if (config.projects[i].slug === slug) {
@@ -968,21 +991,28 @@ var relay = createServer({
   },
 });
 
-var IDLE_MS = Number(process.env.CLAY_CODEX_IDLE_MS) || 5 * 60 * 1000;
-var REAP_MS = Number(process.env.CLAY_CODEX_REAPER_MS) || 60 * 1000;
+// Reclaim idle out-of-process agent runtimes. Any adapter that owns a child
+// process may implement the optional shutdownIfIdle(ms); adapters without one
+// (Claude, which runs in-process or under sdk-worker) are simply skipped.
+// The CLAY_CODEX_* names are kept as aliases for backwards compatibility.
+var IDLE_MS = Number(process.env.CLAY_ADAPTER_IDLE_MS) || Number(process.env.CLAY_CODEX_IDLE_MS) || 5 * 60 * 1000;
+var REAP_MS = Number(process.env.CLAY_ADAPTER_REAPER_MS) || Number(process.env.CLAY_CODEX_REAPER_MS) || 60 * 1000;
 var reaperHandle = setInterval(function () {
   if (!relay || typeof relay.forEachProject !== "function") return;
   relay.forEachProject(function (ctx) {
-    try {
-      if (ctx && ctx.adapters && ctx.adapters.codex && typeof ctx.adapters.codex.shutdownIfIdle === "function") {
-        var result = ctx.adapters.codex.shutdownIfIdle(IDLE_MS);
+    if (!ctx || !ctx.adapters) return;
+    Object.keys(ctx.adapters).forEach(function (vendor) {
+      try {
+        var adapter = ctx.adapters[vendor];
+        if (!adapter || typeof adapter.shutdownIfIdle !== "function") return;
+        var result = adapter.shutdownIfIdle(IDLE_MS);
         if (result && typeof result.catch === "function") {
           result.catch(function (e) {
-            console.error("[daemon] Codex idle reclaim failed:", e && e.message ? e.message : e);
+            console.error("[daemon] " + vendor + " idle reclaim failed:", e && e.message ? e.message : e);
           });
         }
-      }
-    } catch (e) {}
+      } catch (e) {}
+    });
   });
 }, REAP_MS);
 if (reaperHandle && typeof reaperHandle.unref === "function") {

package/lib/kiro-defaults.js

@@ -0,0 +1,22 @@
+// Kiro-specific default values. Single source of truth — do not duplicate
+// elsewhere. Consumed by the server-side vendor plumbing and sent to clients
+// via the config state so the UI renders the right controls.
+
+var KIRO_DEFAULTS = {
+  // Kiro CLI 2.18.1 exposes the next-generation agent as the v3 engine. Its
+  // general-purpose mode id is "vibe" (displayed as "Default").
+  engine: "v3",
+  mode: "vibe",
+};
+
+function getKiroConfig(sm) {
+  return {
+    engine: (sm && sm.kiroEngine) || KIRO_DEFAULTS.engine,
+    mode: (sm && sm.kiroMode) || KIRO_DEFAULTS.mode,
+  };
+}
+
+module.exports = {
+  KIRO_DEFAULTS: KIRO_DEFAULTS,
+  getKiroConfig: getKiroConfig,
+};

package/lib/project-connection.js

@@ -143,6 +143,7 @@ function attachConnection(ctx) {
       sendTo(ws, { type: "model_info", model: sm.currentModel, models: initialModels, vendor: initialVendor, availableVendors: sm.availableVendors || [], installedVendors: sm.installedVendors || [] });
     }
     sendTo(ws, { type: "config_state", model: sm.currentModel || "", mode: sm.currentPermissionMode || "default", effort: sm.currentEffort || "medium", betas: sm.currentBetas || [], thinking: sm.currentThinking || "adaptive", thinkingBudget: sm.currentThinkingBudget || 10000 });
+    sendTo(ws, { type: "last_vendor", vendor: sm.lastVendor || "" });
     sendTo(ws, Object.assign({ type: "codex_config" }, getCodexConfig(sm)));
     sendTo(ws, { type: "term_list", terminals: tm.list() });
     // Context sources sent after session is resolved (per-session storage)

package/lib/project-notifications.js

@@ -21,7 +21,7 @@ function generateId() {
 var formatters = {
   auth_required: function (data) {
     var vendor = data.vendor || "claude";
-    var title = data.title || ((vendor === "codex" ? "Codex" : "Claude Code") + " is not logged in");
+    var title = data.title || ((vendor === "codex" ? "Codex" : (vendor === "kiro" ? "Kiro CLI" : "Claude Code")) + " is not logged in");
     return {
       type: "auth_required",
       title: title,

package/lib/project-sessions.js

@@ -424,13 +424,13 @@ function attachSessions(ctx) {
       if (ws._clayUser && usersModule.isMultiUser()) sessionOpts.ownerId = ws._clayUser.id;
       if (msg.sessionVisibility) sessionOpts.sessionVisibility = msg.sessionVisibility;
       if (msg.vendor) sessionOpts.vendor = msg.vendor;
-      // Mode resolution: codex sessions are always GUI (no TUI adapter).
+      // Mode resolution: codex and kiro sessions are always GUI (no TUI adapter).
       // Claude sessions honor the explicit msg.mode if provided, otherwise
       // fall back to the user's claudeOpenMode preference. This is what
       // makes the sidebar's "Claude" icon button create the right kind of
       // session without the client needing to know the preference.
       var requestedMode;
-      if (msg.vendor === "codex") {
+      if (msg.vendor === "codex" || msg.vendor === "kiro") {
         requestedMode = "gui";
       } else if (msg.mode === "tui" || msg.mode === "gui") {
         requestedMode = msg.mode;
@@ -495,6 +495,17 @@ function attachSessions(ctx) {
         newSess = sm.createSession(sessionOpts, ws);
       }
       ws._clayActiveSession = newSess.localId;
+      // Remember the vendor only when the client asked for one explicitly.
+      // new_session without a vendor (mate sidebar, notification banner,
+      // debate) falls through to the default adapter and must not clobber
+      // the user's remembered pick.
+      if (msg.vendor && sm.lastVendor !== msg.vendor) {
+        sm.lastVendor = msg.vendor;
+        if (typeof opts.onSetProjectLastVendor === "function") {
+          opts.onSetProjectLastVendor(slug, msg.vendor);
+        }
+        send({ type: "last_vendor", vendor: msg.vendor });
+      }
       // Apply project-level email defaults to new session
       if (typeof ctx._email === "object" && ctx._email.getEmailDefaults) {
         var emailDefaults = ctx._email.getEmailDefaults();

package/lib/project.js

@@ -166,7 +166,7 @@ function createProjectContext(opts) {
   var sessionTitleMigrationScheduled = false;
 
   // --- YOKE adapters (multi-vendor, lazy init) ---
-  var _yokeState = yoke.createAdapters({ cwd: cwd, slug: slug });
+  var _yokeState = yoke.createAdapters({ cwd: cwd, slug: slug, osUsers: osUsers });
   var adapters = _yokeState.adapters;
   var defaultVendor = adapters.claude ? "claude" : Object.keys(adapters)[0] || "claude";
   var adapter = adapters[defaultVendor] || null;
@@ -428,6 +428,12 @@ function createProjectContext(opts) {
   var _srvEffort = typeof opts.onGetServerDefaultEffort === "function" ? opts.onGetServerDefaultEffort() : null;
   sm.currentEffort = (_projEffort && _projEffort.effort) || (_srvEffort && _srvEffort.effort) || "medium";
 
+  // Last vendor the user started a session with in this project. Seeds the
+  // sidebar's "New session" button so it defaults to whatever they used last
+  // instead of always launching Claude.
+  var _projLastVendor = typeof opts.onGetProjectLastVendor === "function" ? opts.onGetProjectLastVendor(slug) : null;
+  sm.lastVendor = (_projLastVendor && _projLastVendor.vendor) || null;
+
   var _projModel = typeof opts.onGetProjectDefaultModel === "function" ? opts.onGetProjectDefaultModel(slug) : null;
   var _srvModel = typeof opts.onGetServerDefaultModel === "function" ? opts.onGetServerDefaultModel() : null;
   sm._savedDefaultModel = (_projModel && _projModel.model) || (_srvModel && _srvModel.model) || null;
@@ -897,10 +903,12 @@ function createProjectContext(opts) {
       (async function() {
         if (msg.vendor) {
           try {
+            var modelLinuxUser = getLinuxUserForWs(ws);
             var vendorAdapter = adapters[msg.vendor] || null;
             if (!vendorAdapter) {
               vendorAdapter = await yoke.lazyCreateAdapter(adapters, msg.vendor, {
                 cwd: cwd,
+                linuxUser: modelLinuxUser || undefined,
                 clayPort: serverPort,
                 clayTls: serverTls,
                 clayAuthToken: serverAuthToken,
@@ -1528,14 +1536,30 @@ function createProjectContext(opts) {
       fs.rmSync(tmpDir, { recursive: true, force: true });
     } catch (e) {}
 
-    var codexShutdown = Promise.resolve(true);
-    if (adapters && adapters.codex && typeof adapters.codex.shutdown === "function") {
-      codexShutdown = adapters.codex.shutdown().catch(function(err) {
-        console.error("[project] Codex shutdown failed for " + slug + ":", err && err.message ? err.message : err);
-        return false;
+    // Shut down every adapter that owns a child process. shutdown() is
+    // optional on the YOKE contract, so adapters without one are skipped.
+    var shutdowns = [];
+    if (adapters) {
+      Object.keys(adapters).forEach(function(vendor) {
+        var adapter = adapters[vendor];
+        if (!adapter || typeof adapter.shutdown !== "function") return;
+        // Shared adapter instances (e.g. Claude) are reused across projects,
+        // so tearing one down here would kill other projects' sessions.
+        if (adapter.shared) return;
+        try {
+          shutdowns.push(Promise.resolve(adapter.shutdown()).catch(function(err) {
+            console.error("[project] " + vendor + " shutdown failed for " + slug + ":", err && err.message ? err.message : err);
+            return false;
+          }));
+        } catch (err) {
+          console.error("[project] " + vendor + " shutdown threw for " + slug + ":", err && err.message ? err.message : err);
+        }
       });
     }
-    return codexShutdown;
+    if (!shutdowns.length) return Promise.resolve(true);
+    return Promise.all(shutdowns).then(function(results) {
+      return results.every(function(r) { return r !== false; });
+    });
   }
 
   // --- Status info ---

package/lib/public/app.js

@@ -310,6 +310,12 @@ import { initDebate, handleDebatePreparing, handleDebateStarted, handleDebateRes
     // panels
     currentModel: "",
     currentModels: [],
+    // Project's last-used vendor; seeds the sidebar's "New session" button.
+    lastVendor: "",
+    // 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.
+    claudeOpenMode: "gui",
     currentMode: "default",
     currentEffort: "medium",
     currentBetas: [],

package/lib/public/css/mobile-nav.css

@@ -358,18 +358,16 @@
     background: rgba(var(--overlay-rgb), 0.06);
   }
 
-  /* Vendor-split row: Claude + Codex side-by-side. Used inside
-     renderMobileSessionsInto so users can pick the vendor on mobile, the
-     same way the desktop sidebar already does. */
+  /* Split "New session" row: main action on the last-used vendor + a chevron
+     that expands .mobile-vendor-list below it. Mirrors the desktop sidebar. */
   .mobile-session-new-row {
     display: flex;
     gap: 6px;
     padding: 6px 8px 8px;
-    border-bottom: 1px solid var(--border-subtle);
   }
 
-  .mobile-session-new-row .mobile-session-new-vendor {
-    flex: 1 1 0;
+  .mobile-session-new-row .mobile-session-new-main {
+    flex: 1 1 auto;
     width: auto;
     margin-bottom: 0;
     padding: 10px 12px;
@@ -377,15 +375,61 @@
     border-radius: 8px;
     background: rgba(var(--overlay-rgb), 0.03);
     color: var(--text);
-    justify-content: center;
     gap: 8px;
   }
-  .mobile-session-new-row .mobile-session-new-vendor:last-of-type {
+  .mobile-session-new-row .mobile-session-new-chevron {
+    flex: 0 0 auto;
+    width: 44px;
+    margin-bottom: 0;
+    padding: 10px 0;
+    border: 1px solid var(--border-subtle);
+    border-radius: 8px;
+    background: rgba(var(--overlay-rgb), 0.03);
+    color: var(--text-muted);
+    justify-content: center;
+    gap: 0;
+  }
+  .mobile-session-new-row .mobile-session-new-chevron.expanded svg {
+    transform: rotate(180deg);
+  }
+  .mobile-session-new-row .mobile-session-new-main:active,
+  .mobile-session-new-row .mobile-session-new-chevron:active {
+    background: rgba(var(--overlay-rgb), 0.1);
+  }
+
+  .mobile-vendor-list {
+    display: flex;
+    flex-direction: column;
+    gap: 4px;
+    padding: 0 8px 8px;
     border-bottom: 1px solid var(--border-subtle);
   }
-  .mobile-session-new-row .mobile-session-new-vendor:active {
+  .mobile-vendor-list.hidden { display: none; }
+
+  .mobile-vendor-list .mobile-session-new-vendor {
+    width: 100%;
+    margin-bottom: 0;
+    padding: 10px 12px;
+    border: 1px solid var(--border-subtle);
+    border-radius: 8px;
+    background: rgba(var(--overlay-rgb), 0.03);
+    color: var(--text);
+    font-weight: 500;
+    gap: 8px;
+  }
+  .mobile-vendor-list .mobile-session-new-vendor.active { font-weight: 700; }
+  /* Uninstalled vendors stay tappable: the tap opens the vendor's homepage. */
+  .mobile-vendor-list .mobile-session-new-vendor.disabled { opacity: 0.45; }
+  .mobile-vendor-list .mobile-session-new-vendor:active {
     background: rgba(var(--overlay-rgb), 0.1);
   }
+  .mobile-vendor-note {
+    margin-left: auto;
+    font-size: 12px;
+    font-weight: 500;
+    color: var(--text-dimmer);
+  }
+
   .mobile-session-new-icon {
     width: 18px;
     height: 18px;

package/lib/public/css/sidebar.css

@@ -993,7 +993,7 @@
 
 .session-top-actions {
   display: grid;
-  grid-template-columns: repeat(2, minmax(0, 1fr));
+  grid-template-columns: minmax(0, 1fr);
   gap: 2px;
   padding: 0 0 2px;
 }
@@ -1240,6 +1240,29 @@
 .session-ctx-item.session-ctx-delete { color: var(--error); }
 .session-ctx-item.session-ctx-delete:hover { background: var(--error-8); }
 
+/* --- New-session vendor picker --- */
+.session-new-menu { min-width: 200px; }
+
+.session-ctx-sep {
+  height: 1px;
+  margin: 4px 0;
+  background: var(--border);
+}
+
+.session-new-vendor .session-new-vendor-name { flex: 1 1 auto; min-width: 0; }
+.session-new-vendor.active { color: var(--text); font-weight: 600; }
+
+/* Uninstalled vendors stay clickable on purpose: the click opens the
+   vendor's homepage instead of creating a session. */
+.session-new-vendor.disabled { opacity: 0.45; }
+.session-new-vendor.disabled:hover { opacity: 0.7; }
+
+.session-new-vendor-note {
+  font-size: 11px;
+  color: var(--text-dimmer);
+  white-space: nowrap;
+}
+
 /* --- Session inline rename --- */
 .session-rename-input {
   width: 100%;

package/lib/public/css/tui-attention.css

@@ -49,69 +49,10 @@ body.tui-suspended #tui-resume-bar {
   .tui-resume-hint { display: none; }
 }
 
-/* Policy notice that sits above the embedded xterm in fullscreen TUI
-   sessions, explaining why this mode exists (post-2026-06-15 Agent SDK
-   billing split). Thin so it doesn't eat terminal real estate. */
-.tui-policy-notice {
-  display: flex;
-  align-items: center;
-  gap: 8px;
-  flex-shrink: 0;
-  padding: 6px 10px;
-  margin-bottom: 4px;
-  border-radius: 6px;
-  background: rgba(80, 250, 123, 0.06);
-  border: 1px solid rgba(80, 250, 123, 0.15);
-  color: #b8b8b8;
-  font-size: 11px;
-  line-height: 1.3;
-  font-family: "Roboto Mono", Menlo, Monaco, monospace;
-}
-.tui-policy-icon {
-  color: #50fa7b;
-  font-size: 9px;
-  line-height: 1;
-  flex-shrink: 0;
-}
-.tui-policy-text {
-  flex: 1 1 auto;
-  min-width: 0;
-}
-.tui-policy-learn-more {
-  flex-shrink: 0;
-  padding: 2px 8px;
-  border: 1px solid rgba(80, 250, 123, 0.3);
-  border-radius: 4px;
-  background: transparent;
-  color: #50fa7b;
-  font: inherit;
-  font-size: 10px;
-  cursor: pointer;
-  transition: background 0.15s, border-color 0.15s;
-}
-.tui-policy-learn-more:hover {
-  background: rgba(80, 250, 123, 0.1);
-  border-color: rgba(80, 250, 123, 0.5);
-}
-.tui-policy-dismiss {
-  flex-shrink: 0;
-  width: 18px;
-  height: 18px;
-  padding: 0;
-  border: none;
-  border-radius: 4px;
-  background: transparent;
-  color: #888;
-  font-size: 14px;
-  line-height: 1;
-  cursor: pointer;
-}
-.tui-policy-dismiss:hover {
-  background: rgba(255, 255, 255, 0.06);
-  color: #ddd;
-}
-
-/* Policy info modal. Themed via CSS vars so it follows light/dark. */
+/* Policy info modal. Themed via CSS vars so it follows light/dark.
+   The modal itself is gone; .tui-policy-modal-* rules stay because
+   What's New article bodies (lib/whats-new-content.js) still use the
+   -links class for their footer links. */
 .tui-policy-modal-backdrop {
   position: fixed;
   inset: 0;

package/lib/public/index.html

@@ -513,6 +513,10 @@
                   <img src="/codex-avatar.png" class="vendor-toggle-icon" alt="Codex">
                   <span class="vendor-toggle-label">Codex</span>
                 </button>
+                <button id="vendor-btn-kiro" class="vendor-toggle-btn" data-vendor="kiro">
+                  <img src="/kiro-avatar.svg" class="vendor-toggle-icon" alt="Kiro">
+                  <span class="vendor-toggle-label">Kiro CLI</span>
+                </button>
               </div>
               <div id="active-vendor-indicator" class="hidden" title="Session vendor">
                 <img id="active-vendor-icon" alt="">

package/lib/public/kiro-avatar.svg

@@ -0,0 +1,14 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="128" height="128" viewBox="0 0 128 128" role="img" aria-label="Kiro CLI">
+  <defs>
+    <linearGradient id="kiroBg" x1="0" y1="0" x2="1" y2="1">
+      <stop offset="0" stop-color="#8b5cf6"/>
+      <stop offset="1" stop-color="#6d28d9"/>
+    </linearGradient>
+  </defs>
+  <rect width="128" height="128" rx="28" fill="url(#kiroBg)"/>
+  <g fill="#ffffff">
+    <rect x="34" y="34" width="12" height="60" rx="3"/>
+    <rect x="52" y="60" width="42" height="12" rx="3" transform="rotate(-45 73 66)"/>
+    <rect x="52" y="60" width="42" height="12" rx="3" transform="rotate(45 73 66)"/>
+  </g>
+</svg>

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

@@ -42,7 +42,7 @@ import { handleMcpServersState } from './mcp-ui.js';
 import { handleLoopRegistryUpdated, handleScheduleRunStarted, handleScheduleRunFinished, handleLoopScheduled, isSchedulerOpen, enterCraftingMode, exitCraftingMode, handleLoopRegistryFiles } from './scheduler.js';
 
 // --- App module imports ---
-import { scrollToBottom, addToMessages, addUserMessage, addSystemMessage, removeMatePreThinking, appendDelta, finalizeAssistantBlock, addConflictMessage, addContextOverflowMessage, showSuggestionChips, armStickyBottom } from './app-rendering.js';
+import { scrollToBottom, addToMessages, addUserMessage, addSystemMessage, removeMatePreThinking, appendDelta, finalizeAssistantBlock, addConflictMessage, addContextOverflowMessage, showSuggestionChips, armStickyBottom, VENDOR_AVATARS, VENDOR_NAMES } from './app-rendering.js';
 import { setActivity, startUrgentBlink, stopUrgentBlink, blinkSessionDot, updateCrossProjectBlink } from './app-favicon.js';
 import { setStatus } from './app-connection.js';
 import { handleWhatsNewState, handleWhatsNewSeenResult, setKnownEntries as setWhatsNewKnownEntries } from './whats-new.js';
@@ -579,6 +579,12 @@ export function processMessage(msg) {
         updateSessionPresence(msg.presence || {});
         break;
 
+      // Project's last-used vendor. Seeds the sidebar's "New session" button
+      // on connect and keeps other tabs in sync after someone picks a vendor.
+      case "last_vendor":
+        store.set({ lastVendor: msg.vendor || "" });
+        break;
+
       case "cursor_move":
         handleRemoteCursorMove(msg);
         break;
@@ -696,15 +702,10 @@ export function processMessage(msg) {
           }
         }
         if (_avi && _avIcon) {
-          if (msg.vendor === "claude") {
-            _avIcon.src = "/claude-code-avatar.png";
-            _avIcon.alt = "Claude";
-            _avi.title = "Claude session";
-            _avi.classList.remove("hidden");
-          } else if (msg.vendor === "codex") {
-            _avIcon.src = "/codex-avatar.png";
-            _avIcon.alt = "Codex";
-            _avi.title = "Codex session";
+          if (msg.vendor && VENDOR_AVATARS[msg.vendor]) {
+            _avIcon.src = VENDOR_AVATARS[msg.vendor];
+            _avIcon.alt = VENDOR_NAMES[msg.vendor] || msg.vendor;
+            _avi.title = (VENDOR_NAMES[msg.vendor] || msg.vendor) + " session";
             _avi.classList.remove("hidden");
           } else {
             _avi.classList.add("hidden");

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

@@ -88,6 +88,7 @@ var EFFORT_LEVELS = ["low", "medium", "high", "xhigh", "max"];
 var EFFORT_LEVELS_BY_VENDOR = {
   claude: ["low", "medium", "high", "xhigh", "max"],
   codex: ["minimal", "low", "medium", "high", "xhigh"],
+  kiro: ["low", "medium", "high", "xhigh", "max"],
 };
 var THINKING_OPTIONS = ["disabled", "adaptive", "budget"];
 var CODEX_APPROVAL_OPTIONS = [
@@ -418,7 +419,8 @@ export function initPanels() {
   var vendorToggleWrap = $("vendor-toggle-wrap");
   var vendorBtnClaude = $("vendor-btn-claude");
   var vendorBtnCodex = $("vendor-btn-codex");
-  var vendorBtns = { claude: vendorBtnClaude, codex: vendorBtnCodex };
+  var vendorBtnKiro = $("vendor-btn-kiro");
+  var vendorBtns = { claude: vendorBtnClaude, codex: vendorBtnCodex, kiro: vendorBtnKiro };
 
   function updateVendorToggle() {
     var installed = store.get('installedVendors') || [];
@@ -447,6 +449,7 @@ export function initPanels() {
 
   if (vendorBtnClaude) vendorBtnClaude.addEventListener("click", function() { onVendorClick("claude"); });
   if (vendorBtnCodex) vendorBtnCodex.addEventListener("click", function() { onVendorClick("codex"); });
+  if (vendorBtnKiro) vendorBtnKiro.addEventListener("click", function() { onVendorClick("kiro"); });
 
   // --- Reactive UI sync ---
   store.subscribe(function (state, prev) {

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

@@ -17,10 +17,22 @@ import { getScheduledMsgEl } from './app-rate-limit.js';
 export var VENDOR_AVATARS = {
   claude: "/claude-code-avatar.png",
   codex: "/codex-avatar.png",
+  kiro: "/kiro-avatar.svg",
 };
 export var VENDOR_NAMES = {
   claude: "Claude Code",
   codex: "Codex",
+  kiro: "Kiro CLI",
+};
+// Display order for every vendor Clay knows about, installed or not. Pickers
+// render the full list so a missing CLI reads as "not installed yet" rather
+// than "Clay doesn't support it".
+export var VENDOR_ORDER = ["claude", "codex", "kiro"];
+// Where to send the user when they pick a vendor whose CLI isn't installed.
+export var VENDOR_HOMEPAGES = {
+  claude: "https://claude.com/product/claude-code",
+  codex: "https://openai.com/codex/",
+  kiro: "https://kiro.dev/",
 };
 var NEW_MSG_BTN_DEFAULT = "\u2193 Latest";
 var NEW_MSG_BTN_ACTIVITY = "\u2193 New activity";

package/lib/public/modules/input.js

@@ -300,9 +300,11 @@ export function sendMessage() {
       _vtw2.classList.remove("locked");
     }
     if (_avi && _avIcon) {
-      _avIcon.src = _committedVendor === "codex" ? "/codex-avatar.png" : "/claude-code-avatar.png";
-      _avIcon.alt = _committedVendor === "codex" ? "Codex" : "Claude";
-      _avi.title = (_committedVendor === "codex" ? "Codex" : "Claude") + " session";
+      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";
       _avi.classList.remove("hidden");
     }
   } else if (_vtw2) {

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

@@ -158,9 +158,9 @@ export function showMateSidebar(mateId, mateData) {
   if (mateVendorWrap) {
     var available = store.get('availableVendors') || [];
     var mateVendor = mateData.vendor || "claude";
-    var vendorIcons = { claude: "/claude-code-avatar.png", codex: "/codex-avatar.png" };
-    var vendorNames = { claude: "Claude Code", codex: "Codex" };
-    var vendorKeys = ["claude", "codex"];
+    var vendorIcons = { claude: "/claude-code-avatar.png", codex: "/codex-avatar.png", kiro: "/kiro-avatar.svg" };
+    var vendorNames = { claude: "Claude Code", codex: "Codex", kiro: "Kiro CLI" };
+    var vendorKeys = ["claude", "codex", "kiro"];
     mateVendorWrap.innerHTML = "";
     for (var vi = 0; vi < vendorKeys.length; vi++) {
       var vk = vendorKeys[vi];