clay-server 2.31.0 → 2.32.0-beta.2

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

@@ -11,7 +11,7 @@ import { refreshIcons, iconHtml } from './icons.js';
 import { renderMarkdown } from './markdown.js';
 import { updatePageTitle } from './sidebar.js';
 import { renderSessionList, updateSessionPresence, populateCliSessionList, handleSearchResults, updateSessionBadge } from './sidebar-sessions.js';
-import { renderUserStrip, updateDmBadge, renderSidebarPresence } from './sidebar-mates.js';
+import { updateDmBadge, renderSidebarPresence } from './sidebar-mates.js';
 import { refreshMobileChatSheet } from './sidebar-mobile.js';
 import { renderMateSessionList, handleMateSearchResults, updateMateSidebarProfile } from './mate-sidebar.js';
 import { renderKnowledgeList, handleKnowledgeContent } from './mate-knowledge.js';
@@ -21,7 +21,7 @@ import { handleFindInSessionResults } from './session-search.js';
 import { handleInputSync, autoResize, builtinCommands, setScheduleBtnDisabled } from './input.js';
 import { startThinking, appendThinking, stopThinking, resetThinkingGroup, createToolItem, updateToolExecuting, updateToolResult, markAllToolsDone, closeToolGroup, removeToolFromGroup, resetToolState, getTools, getPlanContent, setPlanContent, renderPlanBanner, renderPlanCard, getTodoTools, handleTodoWrite, handleTaskCreate, handleTaskUpdate, isPlanFilePath, enableMainInput, addTurnMeta, updateSubagentActivity, addSubagentToolEntry, markSubagentDone, initSubagentStop, updateSubagentProgress, updateSubagentTaskStatus, renderAskUserQuestion, markAskUserAnswered, renderPermissionRequest, markPermissionCancelled, markPermissionResolved, renderElicitationRequest, markElicitationResolved } from './tools.js';
 import { showDoneNotification, playDoneSound, isNotifAlertEnabled, isNotifSoundEnabled } from './notifications.js';
-import { handleFsList, handleFsRead, handleFileChanged, handleDirChanged, handleFileHistory, handleGitDiff, handleFileAt, refreshIfOpen, getPendingNavigate } from './filebrowser.js';
+import { handleFsList, handleFsRead, handleFileChanged, handleDirChanged, handleFileHistory, handleGitDiff, handleFileAt, refreshIfOpen, getPendingNavigate, handleFsSearch } from './filebrowser.js';
 import { isProjectSettingsOpen, handleInstructionsRead, handleInstructionsWrite, handleProjectEnv, handleProjectEnvSaved, handleProjectSharedEnv, handleProjectSharedEnvSaved, handleProjectOwnerChanged } from './project-settings.js';
 import { updateSettingsModels, updateSettingsStats, updateDaemonConfig, handleSetPinResult, handleKeepAwakeChanged, handleAutoContinueChanged, handleRestartResult, handleShutdownResult, handleSharedEnv, handleSharedEnvSaved, handleGlobalClaudeMdRead, handleGlobalClaudeMdWrite } from './server-settings.js';
 import { handleTermList, handleTermCreated, sendTerminalCommand, handleTermOutput, handleTermResized, handleTermExited, handleTermClosed } from './terminal.js';
@@ -40,17 +40,17 @@ import { handleLoopRegistryUpdated, handleScheduleRunStarted, handleScheduleRunF
 import { scrollToBottom, addToMessages, addUserMessage, addSystemMessage, removeMatePreThinking, appendDelta, finalizeAssistantBlock, addConflictMessage, addContextOverflowMessage, addAuthRequiredMessage, showSuggestionChips } from './app-rendering.js';
 import { setActivity, startUrgentBlink, stopUrgentBlink, blinkSessionDot } from './app-favicon.js';
 import { setStatus } from './app-connection.js';
-import { updateConfigChip, getModelEffortLevels, accumulateUsage, updateUsagePanel, accumulateContext, updateContextPanel, renderCtxPopover, updateStatusPanel } from './app-panels.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';
 import { hideHomeHub, handleHubSchedules } from './app-home-hub.js';
 import { openDm, enterDmMode, exitDmMode, handleMateCreatedInApp, updateMateIconStatus, appendDmMessage, showDmTypingIndicator, buildMateInterviewPrompt } from './app-dm.js';
 import { handleRateLimitEvent, updateRateLimitUsage, addScheduledMessageBubble, removeScheduledMessageBubble, handleFastModeState } from './app-rate-limit.js';
 import { handleRemoteCursorMove, handleRemoteCursorLeave, handleRemoteSelection, clearRemoteCursors } from './app-cursors.js';
-import { updateLoopButton, showLoopBanner, updateLoopBanner, updateRalphBars, updateLoopInputVisibility, showRalphApprovalBar, updateRalphApprovalStatus, openRalphPreviewModal, showExecModal, updateExecModalStatus } from './app-loop-ui.js';
+import { showLoopBanner, updateLoopBanner, updateLoopInputVisibility, showRalphApprovalBar, updateRalphApprovalStatus, openRalphPreviewModal, showExecModal, updateExecModalStatus } from './app-loop-ui.js';
 import { showDebateSticky, showDebateConcludeConfirm, showDebateUserFloor, exitDebateFloorMode, exitDebateConcludeMode, exitDebateEndedMode, updateDebateRound, renderDebateUserFloorDone } from './app-debate-ui.js';
 import { handleSkillInstallWs } from './app-skills-install.js';
-import { handleNotificationsState, handleNotificationCreated, handleNotificationDismissed, handleNotificationDismissedAll } from './app-notifications.js';
+import { handleNotificationsState, handleNotificationCreated, handleNotificationDismissed, handleNotificationDismissedAll, showUpdateBanner } from './app-notifications.js';
 import { handleDebatePreparing, handleDebateBriefReady, renderDebateBriefReady, handleDebateStarted, renderDebateStarted, handleDebateTurn, handleDebateActivity, handleDebateStream, handleDebateTurnDone, handleDebateCommentQueued, handleDebateCommentInjected, renderDebateCommentInjected, handleDebateResumed, handleDebateEnded, renderDebateEnded, handleDebateError, isDebateActive, renderMcpDebateProposal, renderDebateUserResume } from './debate.js';
 import { handleMentionStart, handleMentionActivity, handleMentionStream, handleMentionDone, handleMentionError, renderMentionUser, renderMentionResponse } from './mention.js';
 
@@ -62,8 +62,8 @@ var connectOverlay = document.getElementById("connect-overlay");
 
 export function processMessage(msg) {
     // Preserve original timestamp from history replay
-    store.setState({ currentMsgTs: msg._ts || null });
-    var isMateDm = store.getState().dmMode && store.getState().dmTargetUser && store.getState().dmTargetUser.isMate;
+    store.set({ currentMsgTs: msg._ts || null });
+    var isMateDm = store.get('dmMode') && store.get('dmTargetUser') && store.get('dmTargetUser').isMate;
 
     // Mate DM: update mate icon status indicators
     if (isMateDm) updateMateIconStatus(msg);
@@ -74,11 +74,11 @@ export function processMessage(msg) {
         renderMateSessionList(msg.sessions || []);
         refreshMobileChatSheet();
         // Override title bar with mate name and re-apply color
-        var _mdn = (store.getState().dmTargetUser.displayName || "New Mate");
+        var _mdn = (store.get('dmTargetUser').displayName || "New Mate");
         if (headerTitleEl) headerTitleEl.textContent = _mdn;
         var _tbpn = document.getElementById("title-bar-project-name");
         if (_tbpn) _tbpn.textContent = _mdn;
-        var _mc2 = (store.getState().dmTargetUser.profile && store.getState().dmTargetUser.profile.avatarColor) || store.getState().dmTargetUser.avatarColor || "#7c3aed";
+        var _mc2 = (store.get('dmTargetUser').profile && store.get('dmTargetUser').profile.avatarColor) || store.get('dmTargetUser').avatarColor || "#7c3aed";
         var _tbc2 = document.querySelector(".title-bar-content");
         if (_tbc2) { _tbc2.style.background = _mc2; _tbc2.classList.add("mate-dm-active"); }
         document.body.classList.add("mate-dm-active");
@@ -115,12 +115,12 @@ export function processMessage(msg) {
           var readyMatch = fullText.match(/\[\[MATE_READY:\s*(.+?)\]\]/);
           if (readyMatch) {
             var newName = readyMatch[1].trim();
-            store.getState().dmTargetUser.displayName = newName;
-            updateMateSidebarProfile({ profile: { displayName: newName, avatarColor: store.getState().dmTargetUser.avatarColor, avatarStyle: store.getState().dmTargetUser.avatarStyle, avatarSeed: store.getState().dmTargetUser.avatarSeed } });
+            store.get('dmTargetUser').displayName = newName;
+            updateMateSidebarProfile({ profile: { displayName: newName, avatarColor: store.get('dmTargetUser').avatarColor, avatarStyle: store.get('dmTargetUser').avatarStyle, avatarSeed: store.get('dmTargetUser').avatarSeed } });
             if (getWs() && getWs().readyState === 1) {
               getWs().send(JSON.stringify({
                 type: "mate_update",
-                mateId: store.getState().dmTargetUser.id,
+                mateId: store.get('dmTargetUser').id,
                 updates: { name: newName, status: "ready", profile: { displayName: newName } },
               }));
             }
@@ -138,7 +138,7 @@ export function processMessage(msg) {
 
     switch (msg.type) {
       case "history_meta":
-        store.setState({ historyFrom: msg.from, historyTotal: msg.total, replayingHistory: true });
+        store.set({ historyFrom: msg.from, historyTotal: msg.total, replayingHistory: true });
         updateHistorySentinel();
         break;
 
@@ -147,10 +147,14 @@ export function processMessage(msg) {
         break;
 
       case "history_done":
-        store.setState({ replayingHistory: false });
+        store.set({ replayingHistory: false });
+        // Hide vendor toggle if session has history (vendor already locked)
+        var _hTotal = store.get('historyTotal') || 0;
+        var _vtw2 = document.getElementById("vendor-toggle-wrap");
+        if (_vtw2 && _hTotal > 0) { _vtw2.classList.remove("hidden"); _vtw2.classList.add("locked"); }
         // Restore cached rich context usage BEFORE updateContextPanel runs
         if (msg.contextUsage) {
-          store.setState({ richContextUsage: msg.contextUsage });
+          store.set({ richContextUsage: msg.contextUsage });
         }
         // Restore accurate context data from the last result in full history
         if (msg.lastUsage || msg.lastModelUsage) {
@@ -159,7 +163,7 @@ export function processMessage(msg) {
         updateContextPanel();
         updateUsagePanel();
         // Render + finalize any incomplete turn from the replayed history
-        var _hs = store.getState();
+        var _hs = store.snap();
         if (_hs.currentMsgEl && _hs.currentFullText) {
           var replayContentEl = _hs.currentMsgEl.querySelector(".md-content");
           if (replayContentEl) {
@@ -178,7 +182,7 @@ export function processMessage(msg) {
           var dbBadges = document.querySelectorAll(".debate-header-badge");
           for (var dbi = 0; dbi < dbBadges.length; dbi++) dbBadges[dbi].remove();
           // Clean up all debate mode banners if debate is not active on this session
-          var _ds = store.getState();
+          var _ds = store.snap();
           if (_ds.debateFloorMode) exitDebateFloorMode();
           if (_ds.debateConcludeMode) exitDebateConcludeMode();
           if (_ds.debateEndedMode) exitDebateEndedMode();
@@ -208,20 +212,20 @@ export function processMessage(msg) {
         break;
 
       case "restore_mate_dm":
-        if (msg.mateId && !store.getState().returningFromMateDm) {
+        if (msg.mateId && !store.get('returningFromMateDm')) {
           // Server-driven mate DM restore on reconnect
           // Note: do NOT remove mate-dm-active here; openDm is async (skill check)
           // and removing the class causes a flash where mate UI is lost.
           // enterDmMode will properly set/reset the class when DM is entered.
-          if (store.getState().dmMode) {
-            store.setState({ dmMode: false });
+          if (store.get('dmMode')) {
+            store.set({ dmMode: false });
           }
           messagesEl.innerHTML = "";
           openDm(msg.mateId);
         }
         // Clear the flag and notify server that mate DM is closed
-        if (store.getState().returningFromMateDm) {
-          store.setState({ returningFromMateDm: false });
+        if (store.get('returningFromMateDm')) {
+          store.set({ returningFromMateDm: false });
           if (getWs() && getWs().readyState === 1) {
             try { getWs().send(JSON.stringify({ type: "set_mate_dm", mateId: null })); } catch(e) {}
           }
@@ -233,25 +237,25 @@ export function processMessage(msg) {
           addSystemMessage(msg.text, false);
           break;
         }
-        store.setState({ projectName: msg.project || msg.cwd });
-        if (msg.cwd) store.setState({ cwd: msg.cwd });
-        if (msg.slug) store.setState({ currentSlug: msg.slug });
-        try { var _is = store.getState(); localStorage.setItem("clay-project-name-" + (_is.currentSlug || "default"), _is.projectName); } catch (e) {}
+        store.set({ projectName: msg.project || msg.cwd });
+        if (msg.cwd) store.set({ cwd: msg.cwd });
+        if (msg.slug) store.set({ currentSlug: msg.slug });
+        try { var _is = store.snap(); localStorage.setItem("clay-project-name-" + (_is.currentSlug || "default"), _is.projectName); } catch (e) {}
         // In mate DM, keep title as mate name and re-apply mate color
-        if (store.getState().dmMode && store.getState().dmTargetUser && store.getState().dmTargetUser.isMate) {
-          var _mateDN = store.getState().dmTargetUser.displayName || "New Mate";
+        if (store.get('dmMode') && store.get('dmTargetUser') && store.get('dmTargetUser').isMate) {
+          var _mateDN = store.get('dmTargetUser').displayName || "New Mate";
           headerTitleEl.textContent = _mateDN;
           var tbProjectName = document.getElementById("title-bar-project-name");
           if (tbProjectName) tbProjectName.textContent = _mateDN;
           // Re-apply mate title bar styling (may be lost during project switch)
-          var _mc = (store.getState().dmTargetUser.profile && store.getState().dmTargetUser.profile.avatarColor) || store.getState().dmTargetUser.avatarColor || "#7c3aed";
+          var _mc = (store.get('dmTargetUser').profile && store.get('dmTargetUser').profile.avatarColor) || store.get('dmTargetUser').avatarColor || "#7c3aed";
           var _tbc = document.querySelector(".title-bar-content");
           if (_tbc) { _tbc.style.background = _mc; _tbc.classList.add("mate-dm-active"); }
           document.body.classList.add("mate-dm-active");
         } else {
-          headerTitleEl.textContent = store.getState().projectName;
+          headerTitleEl.textContent = store.get('projectName');
           var tbProjectName = document.getElementById("title-bar-project-name");
-          if (tbProjectName) tbProjectName.textContent = msg.title || store.getState().projectName;
+          if (tbProjectName) tbProjectName.textContent = msg.title || store.get('projectName');
         }
         updatePageTitle();
         if (msg.version) {
@@ -259,12 +263,12 @@ export function processMessage(msg) {
           var serverVersionEl = document.getElementById("settings-server-version");
           if (serverVersionEl) serverVersionEl.textContent = msg.version;
         }
-        if (msg.projectOwnerId !== undefined) store.setState({ currentProjectOwnerId: msg.projectOwnerId });
-        if (msg.ownerLocked !== undefined) store.setState({ ownerLocked: !!msg.ownerLocked });
-        if (msg.osUsers !== undefined) store.setState({ isOsUsers: !!msg.osUsers });
+        if (msg.projectOwnerId !== undefined) store.set({ currentProjectOwnerId: msg.projectOwnerId });
+        if (msg.ownerLocked !== undefined) store.set({ ownerLocked: !!msg.ownerLocked });
+        if (msg.osUsers !== undefined) store.set({ isOsUsers: !!msg.osUsers });
         if (msg.lanHost) window.__lanHost = msg.lanHost;
         if (msg.dangerouslySkipPermissions) {
-          store.setState({ skipPermsEnabled: true });
+          store.set({ skipPermsEnabled: true });
           var spBanner = document.getElementById("skip-perms-pill");
           if (spBanner) spBanner.classList.remove("hidden");
         }
@@ -273,13 +277,15 @@ export function processMessage(msg) {
 
       case "update_available":
         // In multi-user mode, only show update UI to admins
-        if (store.getState().isMultiUserMode) {
+        if (store.get('isMultiUserMode')) {
           checkAdminAccess().then(function (isAdmin) {
             if (!isAdmin) return;
             showUpdateAvailable(msg);
+            showUpdateBanner(msg);
           });
         } else {
           showUpdateAvailable(msg);
+          showUpdateBanner(msg);
         }
         break;
 
@@ -321,18 +327,24 @@ export function processMessage(msg) {
 
       case "slash_commands":
         var reserved = new Set(builtinCommands.map(function (c) { return c.name; }));
-        store.setState({ slashCommands: (msg.commands || []).filter(function (name) {
+        store.set({ slashCommands: (msg.commands || []).filter(function (name) {
           return !reserved.has(name);
         }).map(function (name) {
           return { name: name, desc: "Skill" };
         }) });
         break;
 
-      case "model_info":
-        store.setState({ currentModel: msg.model || store.getState().currentModel, currentModels: msg.models || [] });
-        updateConfigChip();
-        updateSettingsModels(msg.model, msg.models || []);
+      case "model_info": {
+        var _modelVal = msg.model;
+        if (_modelVal && typeof _modelVal === "object") _modelVal = _modelVal.value || _modelVal.displayName || "";
+        var _miUpdate = { currentModel: _modelVal || store.get('currentModel'), currentModels: msg.models || [] };
+        if (msg.vendor) _miUpdate.currentVendor = msg.vendor;
+        if (msg.availableVendors) _miUpdate.availableVendors = msg.availableVendors;
+        if (msg.installedVendors) _miUpdate.installedVendors = msg.installedVendors;
+        store.set(_miUpdate);
+        updateSettingsModels(_modelVal, msg.models || []);
         break;
+      }
 
       case "config_state": {
         var _cs = {};
@@ -342,20 +354,27 @@ export function processMessage(msg) {
         if (msg.betas) _cs.currentBetas = msg.betas;
         if (msg.thinking) _cs.currentThinking = msg.thinking;
         if (msg.thinkingBudget) _cs.currentThinkingBudget = msg.thinkingBudget;
-        store.setState(_cs);
+        store.set(_cs);
         // Validate effort against current model's supported levels
-        var _csRead = store.getState();
+        var _csRead = store.snap();
         if (_csRead.currentModels.length > 0) {
           var levels = getModelEffortLevels();
           var effortValid = false;
           for (var ei = 0; ei < levels.length; ei++) {
             if (levels[ei] === _csRead.currentEffort) { effortValid = true; break; }
           }
-          if (!effortValid) store.setState({ currentEffort: "medium" });
+          if (!effortValid) store.set({ currentEffort: "medium" });
         }
-        updateConfigChip();
         } break;
 
+      case "codex_config":
+        store.set({
+          codexApproval: msg.approval || "on-failure",
+          codexSandbox: msg.sandbox || "workspace-write",
+          codexWebSearch: msg.webSearch || "disabled",
+        });
+        break;
+
       case "client_count":
         // Sidebar presence: current project's online users
         if (msg.users) {
@@ -382,13 +401,13 @@ export function processMessage(msg) {
 
       case "skill_installed":
         handleSkillInstalled(msg);
-        if (msg.success) { var _kis = Object.assign({}, store.getState().knownInstalledSkills); _kis[msg.skill] = true; store.setState({ knownInstalledSkills: _kis }); }
+        if (msg.success) { var _kis = Object.assign({}, store.get('knownInstalledSkills')); _kis[msg.skill] = true; store.set({ knownInstalledSkills: _kis }); }
         handleSkillInstallWs(msg);
         break;
 
       case "skill_uninstalled":
         handleSkillUninstalled(msg);
-        if (msg.success) { var _kis2 = Object.assign({}, store.getState().knownInstalledSkills); delete _kis2[msg.skill]; store.setState({ knownInstalledSkills: _kis2 }); }
+        if (msg.success) { var _kis2 = Object.assign({}, store.get('knownInstalledSkills')); delete _kis2[msg.skill]; store.set({ knownInstalledSkills: _kis2 }); }
         break;
 
       case "loop_registry_updated":
@@ -424,7 +443,7 @@ export function processMessage(msg) {
         break;
 
       case "input_sync":
-        if (!store.getState().dmMode) handleInputSync(msg.text);
+        if (!store.get('dmMode')) handleInputSync(msg.text);
         break;
 
       case "session_list":
@@ -474,23 +493,47 @@ export function processMessage(msg) {
       case "session_switched":
         hideHomeHub();
         // Save draft from outgoing session
-        var _prevSid = store.getState().activeSessionId;
+        var _prevSid = store.get('activeSessionId');
         if (_prevSid && inputEl.value) {
-          store.getState().sessionDrafts[_prevSid] = inputEl.value;
+          store.get('sessionDrafts')[_prevSid] = inputEl.value;
         } else if (_prevSid) {
-          delete store.getState().sessionDrafts[_prevSid];
+          delete store.get('sessionDrafts')[_prevSid];
+        }
+        store.set({ activeSessionId: msg.id, cliSessionId: msg.cliSessionId || null, vendorCapabilities: msg.capabilities || {} });
+        if (msg.vendor) {
+          store.set({ currentVendor: msg.vendor });
+        } else if (msg.hasHistory) {
+          // Existing session without explicit vendor: reset to claude
+          store.set({ currentVendor: "claude" });
+        } else if (!msg.hasHistory) {
+          // New session without vendor: use mate's default vendor if in DM mode
+          var _dmTarget = store.get('dmTargetUser');
+          if (_dmTarget && _dmTarget.isMate) {
+            var _mateList = store.get('cachedMatesList') || [];
+            for (var _mi = 0; _mi < _mateList.length; _mi++) {
+              if (_mateList[_mi].id === _dmTarget.id && _mateList[_mi].vendor) {
+                store.set({ currentVendor: _mateList[_mi].vendor });
+                break;
+              }
+            }
+          }
+        }
+        // Show vendor toggle only for new sessions (no history)
+        var _vtw = document.getElementById("vendor-toggle-wrap");
+        if (_vtw) {
+          if (msg.hasHistory) { _vtw.classList.remove("hidden"); _vtw.classList.add("locked"); }
+          else { _vtw.classList.remove("locked"); _vtw.classList.remove("hidden"); }
         }
-        store.setState({ activeSessionId: msg.id, cliSessionId: msg.cliSessionId || null });
         // Session presence is now tracked server-side (user-presence.json)
         clearRemoteCursors();
         resetClientState();
-        updateRalphBars();
+
         updateLoopInputVisibility(msg.loop);
         // Restore input area visibility (may have been hidden by auth_required)
         var inputAreaSw = document.getElementById("input-area");
         if (inputAreaSw) inputAreaSw.classList.remove("hidden");
         // Restore draft for incoming session
-        var draft = store.getState().sessionDrafts[store.getState().activeSessionId] || "";
+        var draft = store.get('sessionDrafts')[store.get('activeSessionId')] || "";
         inputEl.value = draft;
         autoResize();
         if (!("ontouchstart" in window)) {
@@ -499,7 +542,7 @@ export function processMessage(msg) {
         break;
 
       case "session_id":
-        store.setState({ cliSessionId: msg.cliSessionId });
+        store.set({ cliSessionId: msg.cliSessionId });
         break;
 
       case "message_uuid":
@@ -513,9 +556,9 @@ export function processMessage(msg) {
         }
         if (uuidTarget) {
           uuidTarget.dataset.uuid = msg.uuid;
-          if (msg.messageType === "user") addRewindButton(uuidTarget);
+          if (msg.messageType === "user" && (store.get('vendorCapabilities') || {}).rewind !== false) addRewindButton(uuidTarget);
         }
-        store.getState().messageUuidMap.push({ uuid: msg.uuid, type: msg.messageType });
+        store.get('messageUuidMap').push({ uuid: msg.uuid, type: msg.messageType });
         break;
 
       case "user_message":
@@ -595,7 +638,7 @@ export function processMessage(msg) {
       case "status":
         if (msg.status === "processing") {
           setStatus("processing");
-          if (!(store.getState().dmMode && store.getState().dmTargetUser && store.getState().dmTargetUser.isMate) && !store.getState().matePreThinkingEl) {
+          if (!(store.get('dmMode') && store.get('dmTargetUser') && store.get('dmTargetUser').isMate) && !store.get('matePreThinkingEl')) {
             setActivity("thinking");
           }
         }
@@ -604,7 +647,7 @@ export function processMessage(msg) {
       case "compacting":
         if (msg.active) {
           setActivity("compacting");
-        } else if (!(store.getState().dmMode && store.getState().dmTargetUser && store.getState().dmTargetUser.isMate)) {
+        } else if (!(store.get('dmMode') && store.get('dmTargetUser') && store.get('dmTargetUser').isMate)) {
           setActivity("thinking");
         }
         break;
@@ -620,7 +663,7 @@ export function processMessage(msg) {
 
       case "thinking_stop":
         stopThinking(msg.duration);
-        if (!(store.getState().dmMode && store.getState().dmTargetUser && store.getState().dmTargetUser.isMate)) {
+        if (!(store.get('dmMode') && store.get('dmTargetUser') && store.get('dmTargetUser').isMate)) {
           setActivity("thinking");
         }
         break;
@@ -725,7 +768,7 @@ export function processMessage(msg) {
         break;
 
       case "permission_request":
-        renderPermissionRequest(msg.requestId, msg.toolName, msg.toolInput, msg.decisionReason, msg.mateId);
+        renderPermissionRequest(msg.requestId, msg.toolName, msg.toolInput, msg.decisionReason, msg.mateId, msg.vendor);
         startUrgentBlink();
         break;
 
@@ -740,7 +783,7 @@ export function processMessage(msg) {
         break;
 
       case "permission_request_pending":
-        renderPermissionRequest(msg.requestId, msg.toolName, msg.toolInput, msg.decisionReason, msg.mateId);
+        renderPermissionRequest(msg.requestId, msg.toolName, msg.toolInput, msg.decisionReason, msg.mateId, msg.vendor);
         startUrgentBlink();
         break;
 
@@ -805,23 +848,21 @@ export function processMessage(msg) {
         break;
 
       case "context_usage":
-        if (msg.data && !store.getState().replayingHistory) {
-          store.setState({ richContextUsage: msg.data });
-          var _hce = store.getState().headerContextEl;
-          if (_hce) _hce.removeAttribute("data-tip");
-          if (store.getState().ctxPopoverVisible) renderCtxPopover();
+        if (msg.data && !store.get('replayingHistory')) {
+          store.set({ richContextUsage: msg.data });
+          // UI sync handled by store subscriber in app-panels.js
         }
         break;
 
       case "done":
+        removeMatePreThinking();
         setActivity(null);
         stopThinking();
         markAllToolsDone();
         closeToolGroup();
         finalizeAssistantBlock();
-        store.setState({ processing: false });
         setStatus("connected");
-        if (!store.getState().loopActive) enableMainInput();
+        if (!store.get('loopActive')) enableMainInput();
         resetToolState();
         stopUrgentBlink();
         if (document.hidden) {
@@ -835,6 +876,7 @@ export function processMessage(msg) {
         break;
 
       case "error":
+        removeMatePreThinking();
         setActivity(null);
         addSystemMessage(msg.text, true);
         break;
@@ -848,16 +890,19 @@ export function processMessage(msg) {
         break;
 
       case "process_conflict":
+        removeMatePreThinking();
         setActivity(null);
         addConflictMessage(msg);
         break;
 
       case "context_overflow":
+        removeMatePreThinking();
         setActivity(null);
         addContextOverflowMessage(msg);
         break;
 
       case "auth_required":
+        removeMatePreThinking();
         setActivity(null);
         addAuthRequiredMessage(msg);
         break;
@@ -878,7 +923,6 @@ export function processMessage(msg) {
       case "scheduled_message_sent":
         removeScheduledMessageBubble();
         setScheduleBtnDisabled(false);
-        store.setState({ processing: true });
         setStatus("processing");
         break;
 
@@ -892,7 +936,6 @@ export function processMessage(msg) {
         break;
 
       case "auto_continue_fired":
-        store.setState({ processing: true });
         setStatus("processing");
         break;
 
@@ -935,6 +978,10 @@ export function processMessage(msg) {
         handleFsList(msg);
         break;
 
+      case "fs_search_result":
+        handleFsSearch(msg);
+        break;
+
       case "fs_read_result":
         if (msg.path === "CLAUDE.md" && isProjectSettingsOpen()) {
           handleInstructionsRead(msg);
@@ -1041,9 +1088,9 @@ export function processMessage(msg) {
 
       case "term_created":
         handleTermCreated(msg);
-        if (store.getState().pendingTermCommand) {
-          var cmd = store.getState().pendingTermCommand;
-          store.setState({ pendingTermCommand: null });
+        if (store.get('pendingTermCommand')) {
+          var cmd = store.get('pendingTermCommand');
+          store.set({ pendingTermCommand: null });
           // Small delay to let terminal initialize
           setTimeout(function() {
             sendTerminalCommand(cmd);
@@ -1127,7 +1174,7 @@ export function processMessage(msg) {
         break;
 
       case "project_owner_changed":
-        store.setState({ currentProjectOwnerId: msg.ownerId });
+        store.set({ currentProjectOwnerId: msg.ownerId });
         handleProjectOwnerChanged(msg);
         break;
 
@@ -1139,12 +1186,12 @@ export function processMessage(msg) {
         }
         enterDmMode(msg.dmKey, msg.targetUser, msg.messages);
         // Auto-send first interview prompt after mate DM opens
-        if (store.getState().pendingMateInterview && msg.targetUser && msg.targetUser.isMate && msg.projectSlug) {
-          var interviewMate = store.getState().pendingMateInterview;
-          store.setState({ pendingMateInterview: null });
+        if (store.get('pendingMateInterview') && msg.targetUser && msg.targetUser.isMate && msg.projectSlug) {
+          var interviewMate = store.get('pendingMateInterview');
+          store.set({ pendingMateInterview: null });
           // Wait for mate project WS to connect, then send interview prompt
           var checkMateReady = setInterval(function () {
-            if (getWs() && getWs().readyState === 1 && store.getState().mateProjectSlug) {
+            if (getWs() && getWs().readyState === 1 && store.get('mateProjectSlug')) {
               clearInterval(checkMateReady);
               var interviewText = buildMateInterviewPrompt(interviewMate);
               getWs().send(JSON.stringify({ type: "message", text: interviewText }));
@@ -1155,25 +1202,25 @@ export function processMessage(msg) {
         break;
 
       case "dm_message":
-        if (store.getState().dmMode && msg.dmKey === store.getState().dmKey) {
+        if (store.get('dmMode') && msg.dmKey === store.get('dmKey')) {
           showDmTypingIndicator(false); // hide typing when message arrives
           appendDmMessage(msg.message);
           scrollToBottom();
         } else if (msg.message) {
           // DM notification when not in that DM
           var fromId = msg.message.from;
-          var _s1 = store.getState();
-          if (fromId && fromId !== _s1.myUserId) {
-            _s1.dmUnread[fromId] = (_s1.dmUnread[fromId] || 0) + 1;
-            // Re-render strip so non-favorited sender appears
-            renderUserStrip(_s1.cachedAllUsers, _s1.cachedOnlineIds, _s1.myUserId, _s1.cachedDmFavorites, _s1.cachedDmConversations, _s1.dmUnread, _s1.dmRemovedUsers, _s1.cachedMatesList);
-            updateDmBadge(fromId, _s1.dmUnread[fromId]);
+          if (fromId && fromId !== store.get('myUserId')) {
+            var _du = Object.assign({}, store.get('dmUnread'));
+            _du[fromId] = (_du[fromId] || 0) + 1;
+            store.set({ dmUnread: _du });
+            // renderUserStrip is handled by the store subscriber
+            updateDmBadge(fromId, _du[fromId]);
           }
         }
         break;
 
       case "dm_typing":
-        if (store.getState().dmMode && msg.dmKey === store.getState().dmKey) {
+        if (store.get('dmMode') && msg.dmKey === store.get('dmKey')) {
           showDmTypingIndicator(msg.typing);
         }
         break;
@@ -1184,23 +1231,22 @@ export function processMessage(msg) {
 
       case "dm_favorites_updated":
         // Track users explicitly removed from favorites
-        var _cdf = store.getState().cachedDmFavorites;
+        var _cdf = store.get('cachedDmFavorites');
         if (_cdf && msg.dmFavorites) {
           for (var ri = 0; ri < _cdf.length; ri++) {
             if (msg.dmFavorites.indexOf(_cdf[ri]) === -1) {
-              store.getState().dmRemovedUsers[_cdf[ri]] = true;
+              store.get('dmRemovedUsers')[_cdf[ri]] = true;
             }
           }
         }
         // Clear removed flag for users being added back
         if (msg.dmFavorites) {
           for (var ai = 0; ai < msg.dmFavorites.length; ai++) {
-            delete store.getState().dmRemovedUsers[msg.dmFavorites[ai]];
+            delete store.get('dmRemovedUsers')[msg.dmFavorites[ai]];
           }
         }
-        store.setState({ cachedDmFavorites: msg.dmFavorites || [] });
-        var _s2 = store.getState();
-        renderUserStrip(_s2.cachedAllUsers, _s2.cachedOnlineIds, _s2.myUserId, _s2.cachedDmFavorites, _s2.cachedDmConversations, _s2.dmUnread, _s2.dmRemovedUsers, _s2.cachedMatesList);
+        store.set({ cachedDmFavorites: msg.dmFavorites || [] });
+        // renderUserStrip is handled by the store subscriber
         break;
 
       case "mate_created":
@@ -1208,41 +1254,39 @@ export function processMessage(msg) {
         break;
 
       case "mate_deleted":
-        store.setState({ cachedMatesList: store.getState().cachedMatesList.filter(function (m) { return m.id !== msg.mateId; }) });
-        if (msg.availableBuiltins) store.setState({ cachedAvailableBuiltins: msg.availableBuiltins });
-        var _s3 = store.getState();
-        renderUserStrip(_s3.cachedAllUsers, _s3.cachedOnlineIds, _s3.myUserId, _s3.cachedDmFavorites, _s3.cachedDmConversations, _s3.dmUnread, _s3.dmRemovedUsers, _s3.cachedMatesList);
+        store.set({ cachedMatesList: store.get('cachedMatesList').filter(function (m) { return m.id !== msg.mateId; }) });
+        if (msg.availableBuiltins) store.set({ cachedAvailableBuiltins: msg.availableBuiltins });
+        // renderUserStrip is handled by the store subscriber
         // If currently in DM with this mate, exit DM mode
-        if (_s3.dmMode && store.getState().dmTargetUser && store.getState().dmTargetUser.id === msg.mateId) {
+        if (store.get('dmMode') && store.get('dmTargetUser') && store.get('dmTargetUser').id === msg.mateId) {
           exitDmMode();
         }
         break;
 
       case "mate_updated":
         if (msg.mate) {
-          var _cml = store.getState().cachedMatesList.slice();
+          var _cml = store.get('cachedMatesList').slice();
           for (var mi = 0; mi < _cml.length; mi++) {
             if (_cml[mi].id === msg.mate.id) {
               _cml[mi] = msg.mate;
               break;
             }
           }
-          store.setState({ cachedMatesList: _cml });
-          var _s4 = store.getState();
-          renderUserStrip(_s4.cachedAllUsers, _s4.cachedOnlineIds, _s4.myUserId, _s4.cachedDmFavorites, _s4.cachedDmConversations, _s4.dmUnread, _s4.dmRemovedUsers, _cml);
+          store.set({ cachedMatesList: _cml });
+          // renderUserStrip is handled by the store subscriber
           // Update mate sidebar if currently viewing this mate
-          if (store.getState().dmMode && store.getState().dmTargetUser && store.getState().dmTargetUser.isMate && store.getState().dmTargetUser.id === msg.mate.id) {
+          if (store.get('dmMode') && store.get('dmTargetUser') && store.get('dmTargetUser').isMate && store.get('dmTargetUser').id === msg.mate.id) {
             updateMateSidebarProfile(msg.mate);
             // Sync dmTargetUser so subsequent renders use fresh data
             var mp2 = msg.mate.profile || {};
-            store.getState().dmTargetUser.displayName = mp2.displayName || msg.mate.name || store.getState().dmTargetUser.displayName;
-            store.getState().dmTargetUser.avatarStyle = mp2.avatarStyle || store.getState().dmTargetUser.avatarStyle;
-            store.getState().dmTargetUser.avatarSeed = mp2.avatarSeed || store.getState().dmTargetUser.avatarSeed;
-            store.getState().dmTargetUser.avatarColor = mp2.avatarColor || store.getState().dmTargetUser.avatarColor;
-            store.getState().dmTargetUser.avatarCustom = mp2.avatarCustom || "";
-            store.getState().dmTargetUser.profile = mp2;
+            store.get('dmTargetUser').displayName = mp2.displayName || msg.mate.name || store.get('dmTargetUser').displayName;
+            store.get('dmTargetUser').avatarStyle = mp2.avatarStyle || store.get('dmTargetUser').avatarStyle;
+            store.get('dmTargetUser').avatarSeed = mp2.avatarSeed || store.get('dmTargetUser').avatarSeed;
+            store.get('dmTargetUser').avatarColor = mp2.avatarColor || store.get('dmTargetUser').avatarColor;
+            store.get('dmTargetUser').avatarCustom = mp2.avatarCustom || "";
+            store.get('dmTargetUser').profile = mp2;
             // Refresh body dataset so new chat bubbles use the updated avatar
-            document.body.dataset.mateAvatarUrl = mateAvatarUrl(store.getState().dmTargetUser, 36);
+            document.body.dataset.mateAvatarUrl = mateAvatarUrl(store.get('dmTargetUser'), 36);
             document.body.dataset.mateName = mp2.displayName || msg.mate.name || "";
             // Update existing chat bubble avatars
             var mateAvis = document.querySelectorAll(".dm-bubble-avatar-mate");
@@ -1251,7 +1295,7 @@ export function processMessage(msg) {
             }
           }
           // Update DM header if currently chatting with this mate
-          if (store.getState().dmMode && store.getState().dmTargetUser && store.getState().dmTargetUser.id === msg.mate.id) {
+          if (store.get('dmMode') && store.get('dmTargetUser') && store.get('dmTargetUser').id === msg.mate.id) {
             var updatedName = (msg.mate.profile && msg.mate.profile.displayName) || msg.mate.name;
             if (updatedName) {
               var dmHeaderName = document.getElementById("dm-header-name");
@@ -1264,9 +1308,8 @@ export function processMessage(msg) {
         break;
 
       case "mate_list":
-        store.setState({ cachedMatesList: msg.mates || [], cachedAvailableBuiltins: msg.availableBuiltins || [] });
-        var _s5 = store.getState();
-        renderUserStrip(_s5.cachedAllUsers, _s5.cachedOnlineIds, _s5.myUserId, _s5.cachedDmFavorites, _s5.cachedDmConversations, _s5.dmUnread, _s5.dmRemovedUsers, _s5.cachedMatesList);
+        store.set({ cachedMatesList: msg.mates || [], cachedAvailableBuiltins: msg.availableBuiltins || [] });
+        // renderUserStrip is handled by the store subscriber
         break;
 
       case "mate_available_builtins":
@@ -1329,12 +1372,12 @@ export function processMessage(msg) {
 
       // --- Debate ---
       case "debate_preparing":
-        if (!store.getState().replayingHistory) showDebateSticky("preparing", msg);
+        if (!store.get('replayingHistory')) showDebateSticky("preparing", msg);
         handleDebatePreparing(msg);
         break;
 
       case "debate_brief_ready":
-        if (store.getState().replayingHistory) {
+        if (store.get('replayingHistory')) {
           renderDebateBriefReady(msg);
         } else {
           handleDebateBriefReady(msg);
@@ -1342,8 +1385,8 @@ export function processMessage(msg) {
         break;
 
       case "debate_started":
-        if (!store.getState().replayingHistory) showDebateSticky("live", msg);
-        if (store.getState().replayingHistory) {
+        if (!store.get('replayingHistory')) showDebateSticky("live", msg);
+        if (store.get('replayingHistory')) {
           renderDebateStarted(msg);
         } else {
           handleDebateStarted(msg);
@@ -1377,7 +1420,7 @@ export function processMessage(msg) {
         break;
 
       case "debate_comment_injected":
-        if (store.getState().replayingHistory) {
+        if (store.get('replayingHistory')) {
           renderDebateCommentInjected(msg);
         } else {
           handleDebateCommentInjected(msg);
@@ -1385,11 +1428,11 @@ export function processMessage(msg) {
         break;
 
       case "debate_conclude_confirm":
-        if (!store.getState().replayingHistory) showDebateConcludeConfirm(msg);
+        if (!store.get('replayingHistory')) showDebateConcludeConfirm(msg);
         break;
 
       case "debate_user_floor":
-        if (!store.getState().replayingHistory) showDebateUserFloor(msg);
+        if (!store.get('replayingHistory')) showDebateUserFloor(msg);
         break;
 
       case "debate_user_floor_done":
@@ -1402,12 +1445,12 @@ export function processMessage(msg) {
 
       case "debate_resumed":
         handleDebateResumed(msg);
-        if (!store.getState().replayingHistory) showDebateSticky("live", msg);
+        if (!store.get('replayingHistory')) showDebateSticky("live", msg);
         break;
 
       case "debate_ended":
-        if (!store.getState().replayingHistory) showDebateSticky("ended", msg);
-        if (store.getState().replayingHistory) {
+        if (!store.get('replayingHistory')) showDebateSticky("ended", msg);
+        if (store.get('replayingHistory')) {
           renderDebateEnded(msg);
         } else {
           handleDebateEnded(msg);
@@ -1420,7 +1463,7 @@ export function processMessage(msg) {
         break;
 
       case "daemon_config":
-        if (msg.config && msg.config.headless) store.setState({ isHeadlessMode: true });
+        if (msg.config && msg.config.headless) store.set({ isHeadlessMode: true });
         updateDaemonConfig(msg.config);
         break;
 
@@ -1451,9 +1494,9 @@ export function processMessage(msg) {
 
       // --- Ralph Loop ---
       case "loop_available":
-        store.setState({ loopAvailable: msg.available, loopActive: msg.active, loopIteration: msg.iteration || 0, loopMaxIterations: msg.maxIterations || 20, loopBannerName: msg.name || null });
-        updateLoopButton();
-        var _la = store.getState();
+        store.set({ loopAvailable: msg.available, loopActive: msg.active, loopIteration: msg.iteration || 0, loopMaxIterations: msg.maxIterations || 20, loopBannerName: msg.name || null });
+
+        var _la = store.snap();
         if (_la.loopActive) {
           showLoopBanner(true);
           if (_la.loopIteration > 0) {
@@ -1465,27 +1508,27 @@ export function processMessage(msg) {
         break;
 
       case "loop_started":
-        store.setState({ loopActive: true, ralphPhase: "executing", loopIteration: 0, loopMaxIterations: msg.maxIterations, loopBannerName: msg.name || null });
+        store.set({ loopActive: true, ralphPhase: "executing", loopIteration: 0, loopMaxIterations: msg.maxIterations, loopBannerName: msg.name || null });
         showLoopBanner(true);
-        updateLoopButton();
-        var _lbn = store.getState().loopBannerName;
+
+        var _lbn = store.get('loopBannerName');
         addSystemMessage((_lbn || "Loop") + " started (max " + msg.maxIterations + " iterations)", false);
         inputEl.disabled = true;
         inputEl.placeholder = (_lbn || "Loop") + " is running...";
         break;
 
       case "loop_iteration":
-        store.setState({ loopIteration: msg.iteration, loopMaxIterations: msg.maxIterations });
+        store.set({ loopIteration: msg.iteration, loopMaxIterations: msg.maxIterations });
         updateLoopBanner(msg.iteration, msg.maxIterations, "running");
-        updateLoopButton();
-        var _libn = store.getState().loopBannerName;
+
+        var _libn = store.get('loopBannerName');
         addSystemMessage((_libn || "Loop") + " iteration #" + msg.iteration + " started", false);
         inputEl.disabled = true;
         inputEl.placeholder = (_libn || "Loop") + " is running...";
         break;
 
       case "loop_judging":
-        var _ljs = store.getState();
+        var _ljs = store.snap();
         updateLoopBanner(_ljs.loopIteration, _ljs.loopMaxIterations, "judging");
         addSystemMessage("Judging iteration #" + msg.iteration + "...", false);
         inputEl.disabled = true;
@@ -1497,15 +1540,15 @@ export function processMessage(msg) {
         break;
 
       case "loop_stopping":
-        var _lss = store.getState();
+        var _lss = store.snap();
         updateLoopBanner(_lss.loopIteration, _lss.loopMaxIterations, "stopping");
         break;
 
       case "loop_finished":
-        var _lfbn = store.getState().loopBannerName;
-        store.setState({ loopActive: false, ralphPhase: "done", loopBannerName: null });
+        var _lfbn = store.get('loopBannerName');
+        store.set({ loopActive: false, ralphPhase: "done", loopBannerName: null });
         showLoopBanner(false);
-        updateLoopButton();
+
         enableMainInput();
         updateLoopInputVisibility(null);
         var loopLabel = _lfbn || "Loop";
@@ -1520,7 +1563,7 @@ export function processMessage(msg) {
         break;
 
       case "loop_error":
-        addSystemMessage((store.getState().loopBannerName || "Loop") + " error: " + msg.text, true);
+        addSystemMessage((store.get('loopBannerName') || "Loop") + " error: " + msg.text, true);
         break;
 
       // --- Ralph Wizard / Crafting ---
@@ -1528,16 +1571,16 @@ export function processMessage(msg) {
         var _rps = { ralphPhase: msg.phase || "idle" };
         if (msg.craftingSessionId) _rps.ralphCraftingSessionId = msg.craftingSessionId;
         if (msg.source !== undefined) _rps.ralphCraftingSource = msg.source;
-        store.setState(_rps);
-        if (msg.wizardData) store.setState({ wizardData: msg.wizardData });
-        updateLoopButton();
-        updateRalphBars();
+        store.set(_rps);
+        if (msg.wizardData) store.set({ wizardData: msg.wizardData });
+
+
         break;
 
       case "ralph_crafting_started":
-        store.setState({ ralphPhase: "crafting", ralphCraftingSessionId: msg.sessionId || store.getState().activeSessionId, ralphCraftingSource: msg.source || null });
-        updateLoopButton();
-        updateRalphBars();
+        store.set({ ralphPhase: "crafting", ralphCraftingSessionId: msg.sessionId || store.get('activeSessionId'), ralphCraftingSource: msg.source || null });
+
+
         if (msg.source !== "ralph") {
           // Task sessions open in the scheduler calendar window
           enterCraftingMode(msg.sessionId, msg.taskId);
@@ -1546,22 +1589,22 @@ export function processMessage(msg) {
         break;
 
       case "ralph_files_status":
-        store.setState({ ralphFilesReady: {
+        store.set({ ralphFilesReady: {
           promptReady: msg.promptReady,
           judgeReady: msg.judgeReady,
           bothReady: msg.bothReady,
         } });
         if (msg.bothReady) {
-          var _rfs = store.getState();
+          var _rfs = store.snap();
           if (_rfs.ralphPhase === "crafting" || _rfs.ralphPhase === "approval") {
-            store.setState({ ralphPhase: "approval" });
+            store.set({ ralphPhase: "approval" });
             if (_rfs.ralphCraftingSource !== "ralph" || isSchedulerOpen()) {
               // Task crafting in scheduler: switch from crafting chat to detail view showing files
               exitCraftingMode(msg.taskId);
             } else {
               showRalphApprovalBar(true);
               // Auto-show execution modal (one-time) for Ralph source
-              if (!store.getState().execModalShown && _rfs.ralphCraftingSource === "ralph") {
+              if (!store.get('execModalShown') && _rfs.ralphCraftingSource === "ralph") {
                 showExecModal();
               }
             }
@@ -1576,7 +1619,7 @@ export function processMessage(msg) {
         break;
 
       case "ralph_files_content":
-        store.setState({ ralphPreviewContent: { prompt: msg.prompt || "", judge: msg.judge || "" } });
+        store.set({ ralphPreviewContent: { prompt: msg.prompt || "", judge: msg.judge || "" } });
         openRalphPreviewModal();
         break;