clay-server 3.4.0-beta.11 → 3.4.0-beta.13

package/lib/public/css/pane.css

@@ -100,7 +100,8 @@ body.pane-mode #input-area {
 }
 
 .split-pane-title {
-  flex: 1;
+  flex: 0 1 auto;
+  max-width: 46%;
   min-width: 0;
   overflow: hidden;
   text-overflow: ellipsis;
@@ -283,12 +284,17 @@ button.split-pair-role:hover { filter: brightness(1.25); }
   color: var(--text-dimmer);
   cursor: pointer;
   flex-shrink: 0;
+  margin-left: auto;
 }
 
 .split-pane-context.has-data {
   display: inline-flex;
 }
 
+.split-pane-context:not(.has-data) + .split-pane-close {
+  margin-left: auto;
+}
+
 .split-pane-context:hover {
   background: var(--bg-alt);
   color: var(--text);

package/lib/public/css/session-actions.css

@@ -0,0 +1,98 @@
+#header-session-actions-btn {
+  display: inline-flex;
+  align-items: center;
+  justify-content: center;
+  width: 28px;
+  height: 28px;
+  padding: 0;
+  border: 1px solid transparent;
+  border-radius: 8px;
+  background: transparent;
+  color: var(--text-dimmer);
+  cursor: pointer;
+  flex-shrink: 0;
+  transition: color 0.15s, background 0.15s, border-color 0.15s;
+}
+
+#header-session-actions-btn:hover,
+#header-session-actions-btn[aria-expanded="true"] {
+  color: var(--text);
+  background: rgba(var(--overlay-rgb), 0.05);
+  border-color: var(--border);
+}
+
+#header-session-actions-btn.hidden { display: none; }
+#header-session-actions-btn .lucide { width: 16px; height: 16px; }
+
+.session-actions-menu {
+  position: fixed;
+  z-index: 10020;
+  width: 286px;
+  padding: 6px;
+  border: 1px solid var(--border);
+  border-radius: 12px;
+  background: color-mix(in srgb, var(--bg) 96%, transparent);
+  box-shadow: 0 14px 38px rgba(var(--shadow-rgb), 0.32), 0 2px 8px rgba(var(--shadow-rgb), 0.2);
+  backdrop-filter: blur(18px);
+}
+
+.session-actions-row {
+  width: 100%;
+  border: 0;
+  background: transparent;
+  color: var(--text);
+  font: inherit;
+  text-align: left;
+  cursor: pointer;
+}
+
+.session-actions-row {
+  display: grid;
+  grid-template-columns: 30px minmax(0, 1fr) 16px;
+  align-items: center;
+  gap: 8px;
+  min-height: 54px;
+  padding: 7px 8px;
+  border-radius: 8px;
+}
+
+.session-actions-row:hover { background: var(--bg-alt); }
+.session-actions-row:disabled { cursor: default; opacity: 0.42; }
+.session-actions-row:disabled:hover { background: transparent; }
+
+.session-actions-row-icon {
+  display: grid;
+  place-items: center;
+  width: 28px;
+  height: 28px;
+  border: 1px solid var(--border-subtle);
+  border-radius: 8px;
+  background: rgba(var(--overlay-rgb), 0.035);
+  color: var(--accent2);
+}
+
+.session-actions-row-icon .lucide { width: 15px; height: 15px; }
+.session-actions-row-copy { display: flex; min-width: 0; flex-direction: column; gap: 2px; }
+.session-actions-row-copy strong { font-size: 12px; font-weight: 750; }
+.session-actions-row-copy > span { color: var(--text-dimmer); font-size: 10px; line-height: 1.25; }
+.session-actions-row-chevron { color: var(--text-dimmer); }
+.session-actions-row-chevron .lucide { width: 13px; height: 13px; }
+
+.handoff-modal { width: min(420px, calc(100vw - 32px)); }
+.handoff-modal-desc { margin: -10px 0 14px; color: var(--text-dimmer); font-size: 12px; line-height: 1.45; }
+.handoff-modal-source {
+  display: flex;
+  align-items: center;
+  gap: 10px;
+  margin-bottom: 14px;
+  padding: 10px;
+  border: 1px solid var(--border-subtle);
+  border-radius: 9px;
+  background: var(--bg-alt);
+}
+.handoff-modal-source > img { width: 26px; height: 26px; object-fit: contain; border-radius: 6px; }
+.handoff-modal-source > span { display: grid; min-width: 0; gap: 1px; }
+.handoff-modal-source strong { overflow: hidden; color: var(--text); font-size: 12px; text-overflow: ellipsis; white-space: nowrap; }
+.handoff-modal-source span span { color: var(--text-dimmer); font-size: 10px; }
+.handoff-modal-field + .handoff-modal-field { margin-top: 10px; }
+.handoff-modal-field .wt-modal-label { margin-top: 0; }

package/lib/public/index.html

@@ -30,7 +30,7 @@
 (function(){try{var k="clay-theme-vars",v=localStorage.getItem(k),r=document.documentElement;if(v){var o=JSON.parse(v),p;for(p in o)r.style.setProperty(p,o[p]);var vt=localStorage.getItem(k.replace("-vars","-variant"));if(vt==="light"){r.classList.add("light-theme");r.classList.remove("dark-theme")}else{r.classList.add("dark-theme");r.classList.remove("light-theme")}var m=document.querySelector('meta[name="theme-color"]');if(m&&o["--bg"])m.setAttribute("content",o["--bg"])}else{var sl=window.matchMedia&&window.matchMedia("(prefers-color-scheme: light)").matches;if(sl){r.classList.add("light-theme");r.classList.remove("dark-theme")}}}catch(e){}})();
 </script>
 <script>if(window.navigator.standalone||window.matchMedia("(display-mode:standalone)").matches){document.documentElement.classList.add("pwa-standalone")}</script>
-<link rel="stylesheet" href="style.css?v=20260824f">
+<link rel="stylesheet" href="style.css?v=20260826a">
 <style>
 @media(max-width:768px){
   /* User messages: vertical stack, avatar on top, right-aligned */
@@ -388,12 +388,8 @@
         <div id="ralph-sticky" class="hidden"></div>
         <div id="debate-sticky" class="hidden"></div>
         <div class="status">
-          <button id="header-add-worker-btn" type="button" aria-label="Add AI Worker" title="Add an AI Worker — this session becomes the Driver of a pair">
-            <span class="header-worker-icon" aria-hidden="true">
-              <i data-lucide="bot"></i>
-              <span class="header-worker-add-badge"><i data-lucide="plus"></i></span>
-            </span>
-            <span class="header-worker-label">Add Worker</span>
+          <button id="header-session-actions-btn" type="button" aria-label="Session actions" title="Session actions" aria-haspopup="menu" aria-expanded="false">
+            <i data-lucide="ellipsis"></i>
           </button>
           <button type="button" id="header-tui-font-btn" class="header-tui-font-btn hidden" title="Terminal font" aria-label="Terminal font">
             <i data-lucide="type"></i>
@@ -2364,7 +2360,7 @@
 <script src="https://cdn.jsdelivr.net/npm/@xterm/addon-fit@0/lib/addon-fit.min.js"></script>
 <script src="https://cdn.jsdelivr.net/npm/@xterm/addon-web-links@0/lib/addon-web-links.min.js"></script>
 <script src="https://cdn.jsdelivr.net/npm/@xterm/addon-webgl@0/lib/addon-webgl.min.js"></script>
-<script type="module" src="app.js?v=20260824g"></script>
+<script type="module" src="app.js?v=20260826a"></script>
 <div id="pwa-install-modal" class="pwa-modal hidden">
   <div class="pwa-modal-backdrop"></div>
   <div class="pwa-modal-card">

package/lib/public/modules/agent-config-selects.js

@@ -0,0 +1,69 @@
+import { VENDOR_NAMES, VENDOR_ORDER, isExperimentalVendor } from './app-rendering.js';
+import { effortLevelsFor, effortDisplayName } from './app-panels.js';
+
+function optionValue(entry) {
+  if (typeof entry === "string") return entry;
+  return entry && (entry.value || entry.id) || "";
+}
+
+function optionLabel(entry) {
+  if (typeof entry === "string") return entry;
+  return entry && (entry.displayName || entry.name || entry.value || entry.id) || "";
+}
+
+export function buildAgentVendorSelect(installed, preferred) {
+  var select = document.createElement("select");
+  select.className = "wt-modal-input";
+  for (var i = 0; i < VENDOR_ORDER.length; i++) {
+    var vendor = VENDOR_ORDER[i];
+    if (installed.indexOf(vendor) === -1) continue;
+    var option = document.createElement("option");
+    option.value = vendor;
+    option.textContent = (isExperimentalVendor(vendor) ? "🧪 " : "") + (VENDOR_NAMES[vendor] || vendor);
+    if (isExperimentalVendor(vendor)) option.title = "Experimental integration; not yet validated through direct use testing";
+    select.appendChild(option);
+  }
+  if (preferred && installed.indexOf(preferred) !== -1) select.value = preferred;
+  return select;
+}
+
+export function fillAgentModels(select, vendor, options, preferred) {
+  var models = (options.modelsByVendor && options.modelsByVendor[vendor]) || [];
+  select.innerHTML = "";
+  var automatic = document.createElement("option");
+  automatic.value = "";
+  automatic.textContent = "Automatic";
+  select.appendChild(automatic);
+  for (var i = 0; i < models.length; i++) {
+    var option = document.createElement("option");
+    option.value = optionValue(models[i]);
+    option.textContent = optionLabel(models[i]);
+    select.appendChild(option);
+  }
+  select.value = preferred || "";
+  if (select.selectedIndex === -1) select.value = "";
+}
+
+export function buildAgentEffortSelect() {
+  var select = document.createElement("select");
+  select.className = "wt-modal-input";
+  return select;
+}
+
+export function fillAgentEffort(select, vendor, options, modelValue, preferred) {
+  var previous = preferred === undefined ? select.value : preferred;
+  var models = (options.modelsByVendor && options.modelsByVendor[vendor]) || [];
+  var levels = effortLevelsFor(vendor, models, modelValue);
+  select.innerHTML = "";
+  var automatic = document.createElement("option");
+  automatic.value = "";
+  automatic.textContent = "Default";
+  select.appendChild(automatic);
+  for (var i = 0; i < levels.length; i++) {
+    var option = document.createElement("option");
+    option.value = levels[i];
+    option.textContent = effortDisplayName(levels[i]);
+    select.appendChild(option);
+  }
+  select.value = levels.indexOf(previous) !== -1 ? previous : "";
+}

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

@@ -12,7 +12,6 @@ import { saveToolState, resetToolState, restoreToolState } from './tools.js';
 import { getSessionUsage, setSessionUsage, getContextData, setContextData, updateContextPanel, updateUsagePanel } from './app-panels.js';
 import { onHistoryPrepended as onSessionSearchHistoryPrepended } from './session-search.js';
 import { getCachedSessions } from './sidebar-sessions.js';
-import { openPairDialog } from './split-pair-ui.js';
 import { showConfirm } from './app-misc.js';
 
 // --- Module-owned state ---
@@ -23,27 +22,6 @@ export function initHeader() {
   var headerRenameBtn = document.getElementById("header-rename-btn");
   var headerTitleEl = document.getElementById("header-title");
   var headerInfoBtn = document.getElementById("header-info-btn");
-  var headerAddWorkerBtn = document.getElementById("header-add-worker-btn");
-
-  // --- Add Worker: the current session becomes the Driver of a new pair ---
-  if (headerAddWorkerBtn) {
-    headerAddWorkerBtn.addEventListener("click", function () {
-      var sessionId = store.get('activeSessionId');
-      if (!sessionId || store.get('splitPanes') || store.get('dmMode')) return;
-      openPairDialog({
-        sessionId: sessionId,
-        title: headerTitleEl ? headerTitleEl.textContent : "",
-        vendor: store.get('currentVendor') || "claude",
-      });
-    });
-    // A split shows the GROUP in the title bar; adding a worker there makes
-    // no sense (the group already has two members), so hide the button.
-    store.subscribe(function (state, prev) {
-      if (state.splitPanes !== prev.splitPanes) {
-        headerAddWorkerBtn.classList.toggle("hidden", !!state.splitPanes);
-      }
-    });
-  }
   var headerFullAccessBtn = document.getElementById("header-full-access-btn");
 
   function updateFullAccessButton() {

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

@@ -21,6 +21,7 @@ import { handlePaletteSessionSwitch, setPaletteVersion } from './command-palette
 import { handleFindInSessionResults } from './session-search.js';
 import { syncPaneTitles, maybeRestoreSplitGroup, openGroup } from './split-view.js';
 import { showPairDialog, handlePairCreated, handleSplitDelegation, showWorkerDelegationNotice, hideWorkerDelegationNotice } from './split-pair-ui.js';
+import { handleSessionActionMessage } from './session-actions.js';
 import { renderWorkerProposal, updateWorkerProposal } from './worker-proposal.js';
 import { handleInputSync, autoResize, builtinCommands, setScheduleBtnDisabled, sendShellResultToAgent } from './input.js';
 import { startThinking, appendThinking, stopThinking, resetThinkingGroup, createToolItem, updateToolExecuting, updateToolResult, markAllToolsDone, closeToolGroup, removeToolFromGroup, resetToolState, getTools, getPlanContent, setPlanContent, renderPlanBanner, renderPlanCard, getTodoTools, handleTodoWrite, handleTaskCreate, handleTaskUpdate, applyDeadSessionTodoCompaction, isPlanFilePath, enableMainInput, addTurnMeta, updateSubagentActivity, addSubagentToolEntry, markSubagentDone, initSubagentStop, updateSubagentProgress, updateSubagentTaskStatus, renderAskUserQuestion, markAskUserAnswered, renderPermissionRequest, markPermissionCancelled, markPermissionResolved, renderElicitationRequest, markElicitationResolved, renderUserDialogRequest, markUserDialogResolved, updateThinkingTokens } from './tools.js';
@@ -53,6 +54,7 @@ import { handleWhatsNewState, handleWhatsNewSeenResult, setKnownEntries as setWh
 import { closeArticle as closeWhatsNewArticle } from './whats-new-article.js';
 import { resolvePaneSession, resolveSwitchedVendor } from './pane-session.js';
 import { selectDefaultVendorForBlankSession } from './vendor-selection.js';
+import { getModelInfoUpdate, modelEntryMatches, handleModelSelectionResult } from './model-picker.js';
 import { getModelEffortLevels, accumulateUsage, updateUsagePanel, accumulateContext, updateContextPanel, renderCtxPopover, updateStatusPanel } from './app-panels.js';
 import { updateProjectList, resetClientState, showUpdateAvailable, handleRemoveProjectCheckResult, handleRemoveProjectResult, handleBrowseDirResult, handleAddProjectResult, handleCloneProgress } from './app-projects.js';
 import { updateHistorySentinel, prependOlderHistory } from './app-header.js';
@@ -431,12 +433,12 @@ export function processMessage(msg) {
         // currentModels with the wrong vendor's list and trigger app-panels
         // to request models for the "wrong" vendor, which feeds back into a
         // ping-pong loop of vendor flapping. See issue #336.
-        var _curV = store.get('currentVendor');
-        if (msg.vendor && _curV && msg.vendor !== _curV) break;
+        var _modelLoadUpdate = getModelInfoUpdate(msg);
+        if (!_modelLoadUpdate) break;
 
         var _modelVal = msg.model;
         if (_modelVal && typeof _modelVal === "object") _modelVal = _modelVal.value || _modelVal.displayName || "";
-        var _miUpdate = { currentModels: msg.models || [] };
+        var _miUpdate = Object.assign({ currentModels: msg.models || [] }, _modelLoadUpdate);
         if (Object.prototype.hasOwnProperty.call(msg, "model")) {
           // Keep the user's existing selection only if it actually belongs to
           // this vendor's model list. Otherwise (e.g. switching to a Codex
@@ -445,8 +447,7 @@ export function processMessage(msg) {
           // model.
           var _curModel = store.get('currentModel');
           var _curInList = !!_curModel && (msg.models || []).some(function (m) {
-            var v = typeof m === "string" ? m : (m && m.value);
-            return v === _curModel;
+            return modelEntryMatches(m, _curModel);
           });
           if (store.get('vendorSelectionLocked') && _curInList) {
             // Keep the user's existing (valid) selection; only update models list
@@ -463,6 +464,10 @@ export function processMessage(msg) {
         break;
       }
 
+      case "model_selection_result":
+        handleModelSelectionResult(msg);
+        break;
+
       case "config_state": {
         var _cs = {};
         if (msg.model) _cs.currentModel = msg.model;
@@ -597,6 +602,13 @@ export function processMessage(msg) {
         if (createdPairGroup) openGroup(createdPairGroup);
         break;
 
+      case "session_handoff_result":
+      case "handoff_session_options":
+      case "handoff_context":
+      case "handoff_created":
+        handleSessionActionMessage(msg);
+        break;
+
       case "worker_proposal":
         renderWorkerProposal(msg);
         break;

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

@@ -7,6 +7,7 @@ import { store } from './store.js';
 import { getWs } from './ws-ref.js';
 import { VENDOR_NAMES, isExperimentalVendor } from './app-rendering.js';
 import { reportPaneContext } from './pane-bridge.js';
+import { setupModelPicker, renderModelPicker, requestVendorModels, prepareModelPickerOpen, modelDisplayName } from './model-picker.js';
 
 // --- Module-owned state (not in store) ---
 var sessionUsage = { cost: 0, input: 0, output: 0, cacheRead: 0, cacheWrite: 0, turns: 0 };
@@ -20,7 +21,6 @@ var configChipWrap = null;
 var configChip = null;
 var configChipLabel = null;
 var configPopover = null;
-var configModelList = null;
 var configModeList = null;
 var configEffortSection = null;
 var configEffortBar = null;
@@ -132,18 +132,6 @@ export function setContextData(v) { contextData = v; }
 
 // --- Internal helpers ---
 
-function modelDisplayName(value, models) {
-  if (!value) return "";
-  if (models) {
-    for (var i = 0; i < models.length; i++) {
-      var m = models[i];
-      if (typeof m === "string") { if (m === value) return m; }
-      else if (m.value === value && m.displayName) return m.displayName;
-    }
-  }
-  return value;
-}
-
 function modeDisplayName(value) {
   for (var i = 0; i < MODE_OPTIONS.length; i++) {
     if (MODE_OPTIONS[i].value === value) return MODE_OPTIONS[i].label;
@@ -198,65 +186,6 @@ function hasBeta(name) {
   return false;
 }
 
-function rebuildModelList() {
-  if (!configModelList) return;
-  // Picker lock policy is capability-based (yoke midSessionModelSwitch):
-  //   Claude -> free. The SDK supports mid-thread swaps on a live query
-  //             (query.setModel: "Change the model used for subsequent
-  //             responses"), and sdk-bridge already routes set_model to
-  //             queryInstance.setModel. Cache re-priming on switch is a
-  //             cost, not a breakage.
-  //   Codex / Kiro -> locked once the session has history: their threads
-  //             bind the model at creation and a mid-thread change would be
-  //             silently ignored. Picks made before the first message still
-  //             work everywhere (sdk-bridge stores into sm.currentModel when
-  //             there's no active queryInstance).
-  var modelSection = configModelList.parentElement;
-  var s = store.snap();
-  var vendor = s.currentVendor || "claude";
-  if (modelSection) modelSection.style.display = "";
-  configModelList.innerHTML = "";
-
-  var caps = s.vendorCapabilities || {};
-  var lockedForGui = s.activeSessionMode === "gui" && !!s.sessionHasHistory && !caps.midSessionModelSwitch;
-
-  var list = s.currentModels.length > 0 ? s.currentModels : (s.currentModel ? [{ value: s.currentModel, displayName: s.currentModel }] : []);
-  for (var i = 0; i < list.length; i++) {
-    var item = list[i];
-    // Support both object { value, displayName } and plain string formats
-    var value = typeof item === "string" ? item : (item.value || "");
-    var label = typeof item === "string" ? item : (item.displayName || value);
-    var btn = document.createElement("button");
-    btn.className = "config-radio-item";
-    if (value === s.currentModel) btn.classList.add("active");
-    if (lockedForGui) btn.classList.add("locked");
-    btn.dataset.model = value;
-    btn.textContent = label;
-    if (lockedForGui) {
-      btn.disabled = true;
-      btn.title = "This vendor binds the model when the session starts. Start a new session to change it.";
-    } else {
-      btn.addEventListener("click", function () {
-        var model = this.dataset.model;
-        var ws = getWs();
-        if (ws && ws.readyState === 1) {
-          ws.send(JSON.stringify({ type: "set_model", model: model }));
-        }
-        configPopover.classList.add("hidden");
-        configChip.classList.remove("active");
-      });
-    }
-    configModelList.appendChild(btn);
-  }
-
-  if (lockedForGui) {
-    var hint = document.createElement("div");
-    hint.className = "config-model-hint";
-    hint.textContent = "Locked after first message. Start a new session to change models.";
-    configModelList.appendChild(hint);
-  }
-}
-
 function rebuildModeList() {
   if (!configModeList) return;
   configModeList.innerHTML = "";
@@ -422,7 +351,7 @@ export function initPanels() {
   configChip = $("config-chip");
   configChipLabel = $("config-chip-label");
   configPopover = $("config-popover");
-  configModelList = $("config-model-list");
+  setupModelPicker();
   configModeList = $("config-mode-list");
   configEffortSection = $("config-effort-section");
   configEffortBar = $("config-effort-bar");
@@ -487,7 +416,7 @@ export function initPanels() {
     if (vendor === (store.get('currentVendor') || "claude")) return;
     var installed = store.get('installedVendors') || [];
     if (installed.indexOf(vendor) === -1) return;
-    store.set({ currentVendor: vendor, currentModel: "", currentModels: [], vendorSelectionLocked: true, sessionVendorBound: true });
+    store.set({ currentVendor: vendor, currentModel: "", currentModels: [], vendorCapabilities: {}, vendorSelectionLocked: true, sessionVendorBound: true });
     var ws = getWs();
     if (ws) ws.send(JSON.stringify({ type: "set_vendor", vendor: vendor }));
   }
@@ -528,8 +457,7 @@ export function initPanels() {
 
     // Vendor changed -> switch model list and current model to match
     if (state.currentVendor !== prev.currentVendor && state.currentVendor) {
-      var ws = getWs();
-      if (ws) ws.send(JSON.stringify({ type: "get_vendor_models", vendor: state.currentVendor }));
+      requestVendorModels(state.currentVendor, true);
     }
 
     // config chip
@@ -539,6 +467,12 @@ export function initPanels() {
         state.currentBetas !== prev.currentBetas ||
         state.currentThinking !== prev.currentThinking ||
         state.currentVendor !== prev.currentVendor ||
+        state.currentModels !== prev.currentModels ||
+        state.vendorCapabilities !== prev.vendorCapabilities ||
+        state.modelListStatus !== prev.modelListStatus ||
+        state.modelListError !== prev.modelListError ||
+        state.modelSelectionPending !== prev.modelSelectionPending ||
+        state.modelSelectionError !== prev.modelSelectionError ||
         state.codexApproval !== prev.codexApproval ||
         state.codexSandbox !== prev.codexSandbox ||
         state.codexWebSearch !== prev.codexWebSearch ||
@@ -639,6 +573,7 @@ export function initPanels() {
       e.stopPropagation();
       var wasHidden = configPopover.classList.toggle("hidden");
       configChip.classList.toggle("active", !wasHidden);
+      if (!wasHidden) prepareModelPickerOpen();
     });
   }
 
@@ -692,7 +627,7 @@ export function updateConfigChip() {
   var s = store.snap();
   var vendor = s.currentVendor || "claude";
   configChipLabel.textContent = modelDisplayName(s.currentModel, s.currentModels);
-  rebuildModelList();
+  renderModelPicker();
   rebuildModeList();
   rebuildEffortBar();
 
@@ -879,9 +814,7 @@ export function updateContextPanel() {
       hCtxEl = document.createElement("div");
       hCtxEl.className = "header-context";
       hCtxEl.innerHTML = '<div class="header-context-bar"><div class="header-context-fill"></div></div><span class="header-context-label"></span>';
-      var workerBtn = document.getElementById("header-add-worker-btn");
-      var contextAnchor = workerBtn && workerBtn.parentNode === statusArea ? workerBtn.nextSibling : statusArea.firstChild;
-      statusArea.insertBefore(hCtxEl, contextAnchor);
+      statusArea.insertBefore(hCtxEl, statusArea.firstChild);
       hCtxEl.addEventListener("mouseenter", function() {
         if (store.get('richContextUsage')) {
           showCtxPopover();

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

@@ -5,6 +5,7 @@ import { escapeHtml, showToast } from './utils.js';
 import { refreshIcons } from './icons.js';
 import { parseEmojis } from './markdown.js';
 import { store } from './store.js';
+import { resetModelPickerState } from './model-picker.js';
 import { getWs, setWs } from './ws-ref.js';
 import { getMessagesEl, getStatusDot } from './dom-refs.js';
 import { userAvatarUrl } from './avatar.js';
@@ -363,6 +364,7 @@ export function renderProjectList() {
 }
 
 export function resetClientState() {
+  resetModelPickerState();
   if (isSearchOpen()) closeSearch();
   getMessagesEl().innerHTML = "";
   store.set({ currentMsgEl: null });