clay-server 2.31.0 → 2.32.0-beta.10

package/lib/public/app.js

@@ -12,7 +12,7 @@ import {
 } from './modules/sidebar-projects.js';
 import {
   renderUserStrip, closeDmUserPicker, setCurrentDmUser,
-  updateDmBadge, renderSidebarPresence
+  updateDmBadge, renderSidebarPresence, setMentionActive, clearAllMentionActive
 } from './modules/sidebar-mates.js';
 import {
   openMobileSheet, setMobileSheetMateData, refreshMobileChatSheet
@@ -48,7 +48,7 @@ import { initCommandPalette, handlePaletteSessionSwitch, setPaletteVersion } fro
 import { initLongPress } from './modules/longpress.js';
 import { initConnection, connect as _connConnect, setStatus as _connSetStatus, scheduleReconnect as _connScheduleReconnect, cancelReconnect as _connCancelReconnect } from './modules/app-connection.js';
 import { processMessage as _msgProcessMessage } from './modules/app-messages.js';
-import { setWs as _setWsRef } from './modules/ws-ref.js';
+import { getWs as _getWsRef, setWs as _setWsRef } from './modules/ws-ref.js';
 import { initHomeHub, showHomeHub as _hubShowHomeHub, hideHomeHub as _hubHideHomeHub, handleHubSchedules as _hubHandleHubSchedules, renderHomeHub as _hubRenderHomeHub, isHomeHubVisible } from './modules/app-home-hub.js';
 import { initRateLimit, handleRateLimitEvent as _rlHandleRateLimitEvent, updateRateLimitUsage as _rlUpdateRateLimitUsage, addScheduledMessageBubble as _rlAddScheduledMessageBubble, removeScheduledMessageBubble as _rlRemoveScheduledMessageBubble, handleFastModeState as _rlHandleFastModeState, getScheduledMsgEl, resetRateLimitState } from './modules/app-rate-limit.js';
 import { initCursors, handleRemoteCursorMove as _curHandleRemoteCursorMove, handleRemoteCursorLeave as _curHandleRemoteCursorLeave, handleRemoteSelection as _curHandleRemoteSelection, clearRemoteCursors as _curClearRemoteCursors, initCursorToggle } from './modules/app-cursors.js';
@@ -63,7 +63,7 @@ import { initAppNotifications, handleNotificationsState as _notifHandleState, ha
 import { createStore, store } from './modules/store.js';
 import { initPanels, updateConfigChip as _panUpdateConfigChip, getModelEffortLevels as _panGetModelEffortLevels, accumulateUsage as _panAccumulateUsage, updateUsagePanel as _panUpdateUsagePanel, resetUsage as _panResetUsage, toggleUsagePanel as _panToggleUsagePanel, formatTokens as _panFormatTokens, updateStatusPanel as _panUpdateStatusPanel, requestProcessStats as _panRequestProcessStats, toggleStatusPanel as _panToggleStatusPanel, accumulateContext as _panAccumulateContext, updateContextPanel as _panUpdateContextPanel, resetContext as _panResetContext, resetContextData as _panResetContextData, minimizeContext as _panMinimizeContext, expandContext as _panExpandContext, toggleContextPanel as _panToggleContextPanel, getContextView as _panGetContextView, renderCtxPopover as _panRenderCtxPopover, hideCtxPopover as _panHideCtxPopover, formatBytes as _panFormatBytes, formatUptime as _panFormatUptime, getModelSupportsEffort as _panGetModelSupportsEffort, getSessionUsage, setSessionUsage, getContextData, setContextData, setContextView as _panSetContextView, applyContextView as _panApplyContextView } from './modules/app-panels.js';
 import { initProjects, updateProjectList as _projUpdateProjectList, renderProjectList as _projRenderProjectList, renderTopbarPresence as _projRenderTopbarPresence, switchProject as _projSwitchProject, resetClientState as _projResetClientState, confirmRemoveProject as _projConfirmRemoveProject, handleRemoveProjectCheckResult as _projHandleRemoveProjectCheckResult, handleRemoveProjectResult as _projHandleRemoveProjectResult, openAddProjectModal as _projOpenAddProjectModal, closeAddProjectModal as _projCloseAddProjectModal, handleBrowseDirResult as _projHandleBrowseDirResult, handleAddProjectResult as _projHandleAddProjectResult, handleCloneProgress as _projHandleCloneProgress, showUpdateAvailable as _projShowUpdateAvailable, getCachedProjects, setCachedProjects, getCachedProjectCount, getCachedRemovedProjects, setCachedRemovedProjects } from './modules/app-projects.js';
-import { initRendering, addToMessages as _renAddToMessages, scrollToBottom as _renScrollToBottom, forceScrollToBottom as _renForceScrollToBottom, addUserMessage as _renAddUserMessage, getMsgTime as _renGetMsgTime, shouldGroupMessage as _renShouldGroupMessage, ensureAssistantBlock as _renEnsureAssistantBlock, addCopyHandler as _renAddCopyHandler, appendDelta as _renAppendDelta, flushStreamBuffer as _renFlushStreamBuffer, finalizeAssistantBlock as _renFinalizeAssistantBlock, addSystemMessage as _renAddSystemMessage, addConflictMessage as _renAddConflictMessage, addContextOverflowMessage as _renAddContextOverflowMessage, addAuthRequiredMessage as _renAddAuthRequiredMessage, showClaudePreThinking as _renShowClaudePreThinking, showMatePreThinking as _renShowMatePreThinking, removeMatePreThinking as _renRemoveMatePreThinking, showSuggestionChips as _renShowSuggestionChips, hideSuggestionChips as _renHideSuggestionChips, getTurnCounter, setTurnCounter, getPrependAnchor, setPrependAnchor, getActivityEl, setActivityEl, getIsUserScrolledUp, setIsUserScrolledUp } from './modules/app-rendering.js';
+import { initRendering, addToMessages as _renAddToMessages, scrollToBottom as _renScrollToBottom, forceScrollToBottom as _renForceScrollToBottom, addUserMessage as _renAddUserMessage, getMsgTime as _renGetMsgTime, shouldGroupMessage as _renShouldGroupMessage, ensureAssistantBlock as _renEnsureAssistantBlock, addCopyHandler as _renAddCopyHandler, appendDelta as _renAppendDelta, flushStreamBuffer as _renFlushStreamBuffer, finalizeAssistantBlock as _renFinalizeAssistantBlock, addSystemMessage as _renAddSystemMessage, addConflictMessage as _renAddConflictMessage, addContextOverflowMessage as _renAddContextOverflowMessage, addAuthRequiredMessage as _renAddAuthRequiredMessage, showClaudePreThinking as _renShowClaudePreThinking, showMatePreThinking as _renShowMatePreThinking, removeMatePreThinking as _renRemoveMatePreThinking, showSuggestionChips as _renShowSuggestionChips, hideSuggestionChips as _renHideSuggestionChips, getGhostSuggestion as _renGetGhostSuggestion, getTurnCounter, setTurnCounter, getPrependAnchor, setPrependAnchor, getActivityEl, setActivityEl, getIsUserScrolledUp, setIsUserScrolledUp } from './modules/app-rendering.js';
 import { initDm, openDm as _dmOpenDm, enterDmMode as _dmEnterDmMode, exitDmMode as _dmExitDmMode, handleMateCreatedInApp as _dmHandleMateCreatedInApp, renderAvailableBuiltins as _dmRenderAvailableBuiltins, buildMateInterviewPrompt as _dmBuildMateInterviewPrompt, updateMateIconStatus as _dmUpdateMateIconStatus, connectMateProject as _dmConnectMateProject, disconnectMateProject as _dmDisconnectMateProject, appendDmMessage as _dmAppendDmMessage, showDmTypingIndicator as _dmShowDmTypingIndicator, handleDmSend as _dmHandleDmSend } from './modules/app-dm.js';
 import { initMention, handleMentionStart, handleMentionStream, handleMentionDone, handleMentionError, handleMentionActivity, renderMentionUser, renderMentionResponse } from './modules/mention.js';
 import { initDebate, handleDebatePreparing, handleDebateStarted, handleDebateResumed, handleDebateTurn, handleDebateActivity, handleDebateStream, handleDebateTurnDone, handleDebateCommentQueued, handleDebateCommentInjected, handleDebateEnded, handleDebateError, renderDebateStarted, renderDebateTurnDone, renderDebateEnded, renderDebateCommentInjected, renderDebateUserResume, openDebateModal, closeDebateModal, handleDebateBriefReady, renderDebateBriefReady, isDebateActive, resetDebateState, exportDebateAsPdf, renderMcpDebateProposal } from './modules/debate.js';
@@ -166,12 +166,12 @@ import { initDebate, handleDebatePreparing, handleDebateStarted, handleDebateRes
 
   document.addEventListener("keydown", function (e) {
     if (e.key === "Escape") {
-      if (isHomeHubVisible() && store.getState().currentSlug) {
+      if (isHomeHubVisible() && store.get('currentSlug')) {
         hideHomeHub();
         if (document.documentElement.classList.contains("pwa-standalone")) {
-          history.replaceState(null, "", "/p/" + store.getState().currentSlug + "/");
+          history.replaceState(null, "", "/p/" + store.get('currentSlug') + "/");
         } else {
-          history.pushState(null, "", "/p/" + store.getState().currentSlug + "/");
+          history.pushState(null, "", "/p/" + store.get('currentSlug') + "/");
         }
         var homeIcon = document.querySelector(".icon-strip-home");
         if (homeIcon) homeIcon.classList.remove("active");
@@ -210,7 +210,6 @@ import { initDebate, handleDebatePreparing, handleDebateStarted, handleDebateRes
   function closeImageModal() { _miscCloseImageModal(); }
 
   // --- State ---
-  var ws = null;
   // connected, processing, activeSessionId, sessionDrafts -> store
   // loopActive, loopAvailable, loopIteration, loopMaxIterations, loopBannerName,
   // ralphPhase, ralphCraftingSessionId, ralphCraftingSource, ralphFilesReady, ralphPreviewContent -> modules/app-loop-ui.js
@@ -240,7 +239,7 @@ import { initDebate, handleDebatePreparing, handleDebateStarted, handleDebateRes
   } catch (e) {}
   // messageUuidMap, historyFrom, historyTotal -> store
   // prependAnchor, replayingHistory, isUserScrolledUp, scrollThreshold -> modules/app-rendering.js
-  var loadingMore = false;
+  // loadingMore -> moved to store
   // historySentinelObserver -> modules/app-header.js
 
   // builtinCommands -> modules/input.js
@@ -261,6 +260,7 @@ import { initDebate, handleDebatePreparing, handleDebateStarted, handleDebateRes
     wsPath: wsPath,
     dmMode: false,
     historyFrom: 0,
+    loadingMore: false,
     historyTotal: 0,
     replayingHistory: false,
     projectName: projectName,
@@ -309,6 +309,9 @@ import { initDebate, handleDebatePreparing, handleDebateStarted, handleDebateRes
     currentBetas: [],
     currentThinking: "adaptive",
     currentThinkingBudget: 10000,
+    codexApproval: null,
+    codexSandbox: null,
+    codexWebSearch: null,
     ctxPopoverVisible: false,
     headerContextEl: null,
     // loop
@@ -330,6 +333,8 @@ import { initDebate, handleDebatePreparing, handleDebateStarted, handleDebateRes
     debateEndedMode: false,
     // skills
     knownInstalledSkills: {},
+    // permissions (RBAC)
+    permissions: null,
     // loop wizard
     wizardData: { name: "", task: "", maxIterations: null, cron: null }
   });
@@ -337,9 +342,9 @@ import { initDebate, handleDebatePreparing, handleDebateStarted, handleDebateRes
   // --- Rewind (module) ---
   initRewind({
     $: $,
-    get ws() { return ws; },
-    get connected() { return store.getState().connected; },
-    get processing() { return store.getState().processing; },
+    get ws() { return _getWsRef(); },
+    get connected() { return store.get('connected'); },
+    get processing() { return store.get('processing'); },
     messagesEl: messagesEl,
     addSystemMessage: addSystemMessage,
   });
@@ -356,9 +361,9 @@ import { initDebate, handleDebatePreparing, handleDebateStarted, handleDebateRes
   // --- Sidebar (module) ---
   var sidebarCtx = {
     $: $,
-    get ws() { return ws; },
-    get connected() { return store.getState().connected; },
-    get projectName() { return store.getState().projectName; },
+    get ws() { return _getWsRef(); },
+    get connected() { return store.get('connected'); },
+    get projectName() { return store.get('projectName'); },
     messagesEl: messagesEl,
     sessionListEl: sessionListEl,
     sidebar: sidebar,
@@ -377,39 +382,39 @@ import { initDebate, handleDebatePreparing, handleDebateStarted, handleDebateRes
     showHomeHub: function () { showHomeHub(); },
     openRalphWizard: function (source) { openRalphWizard(source); },
     getUpcomingSchedules: getUpcomingSchedules,
-    get multiUser() { return store.getState().isMultiUserMode; },
-    get myUserId() { return store.getState().myUserId; },
-    get projectOwnerId() { return store.getState().currentProjectOwnerId; },
-    get ownerLocked() { return store.getState().ownerLocked; },
+    get multiUser() { return store.get('isMultiUserMode'); },
+    get myUserId() { return store.get('myUserId'); },
+    get projectOwnerId() { return store.get('currentProjectOwnerId'); },
+    get ownerLocked() { return store.get('ownerLocked'); },
     openDm: function (userId) { openDm(userId); },
     openMateWizard: function () { requireClayMateInterview(function () { openMateWizard(); }); },
     openAddProjectModal: function () { openAddProjectModal(); },
-    sendWs: function (msg) { if (ws && ws.readyState === 1) ws.send(JSON.stringify(msg)); },
-    onDmRemoveUser: function (userId) { var dr = Object.assign({}, store.getState().dmRemovedUsers); dr[userId] = true; store.setState({ dmRemovedUsers: dr }); },
-    getHistoryFrom: function () { return store.getState().historyFrom; },
-    get permissions() { return myPermissions; },
+    sendWs: function (msg) { var _ws = _getWsRef(); if (_ws && _ws.readyState === 1) _ws.send(JSON.stringify(msg)); },
+    onDmRemoveUser: function (userId) { var dr = Object.assign({}, store.get('dmRemovedUsers')); dr[userId] = true; store.set({ dmRemovedUsers: dr }); },
+    getHistoryFrom: function () { return store.get('historyFrom'); },
+    get permissions() { return store.get('permissions'); },
     get projectList() { return getCachedProjects() || []; },
-    availableBuiltins: function () { return store.getState().cachedAvailableBuiltins || []; },
+    availableBuiltins: function () { return store.get('cachedAvailableBuiltins') || []; },
   };
   initSidebar(sidebarCtx);
-  var wsGetter = function () { return ws; };
+  var wsGetter = function () { return _getWsRef(); };
   initMateSidebar(wsGetter);
   initMateKnowledge(wsGetter);
   initMateMemory(wsGetter, { onShow: function () { hideKnowledge(); hideNotes(); } });
   initMateWizard(
-    function (msg) { if (ws && ws.readyState === 1) ws.send(JSON.stringify(msg)); },
+    function (msg) { var _ws = _getWsRef(); if (_ws && _ws.readyState === 1) _ws.send(JSON.stringify(msg)); },
     function (mate) { handleMateCreatedInApp(mate); }
   );
 
   initCommandPalette({
     switchProject: function (slug) { switchProject(slug); },
-    currentSlug: function () { return store.getState().currentSlug; },
+    currentSlug: function () { return store.get('currentSlug'); },
     projectList: function () { return getCachedProjects() || []; },
-    matesList: function () { return store.getState().cachedMatesList || []; },
-    availableBuiltins: function () { return store.getState().cachedAvailableBuiltins || []; },
-    allUsers: function () { return store.getState().cachedAllUsers || []; },
-    dmConversations: function () { return store.getState().cachedDmConversations || []; },
-    myUserId: function () { return store.getState().myUserId; },
+    matesList: function () { return store.get('cachedMatesList') || []; },
+    availableBuiltins: function () { return store.get('cachedAvailableBuiltins') || []; },
+    allUsers: function () { return store.get('cachedAllUsers') || []; },
+    dmConversations: function () { return store.get('cachedDmConversations') || []; },
+    myUserId: function () { return store.get('myUserId'); },
     selectSession: function (id) {
       // Close any open panels before switching
       if (isSchedulerOpen()) closeScheduler();
@@ -418,8 +423,9 @@ import { initDebate, handleDebatePreparing, handleDebateStarted, handleDebateRes
         var stickyBtn = document.getElementById("sticky-notes-sidebar-btn");
         if (stickyBtn) stickyBtn.click();
       }
-      if (ws && ws.readyState === 1) {
-        ws.send(JSON.stringify({ type: "switch_session", id: id }));
+      var _ws = _getWsRef();
+      if (_ws && _ws.readyState === 1) {
+        _ws.send(JSON.stringify({ type: "switch_session", id: id }));
       }
     },
     openDm: function (userId) { openDm(userId); },
@@ -524,8 +530,9 @@ import { initDebate, handleDebatePreparing, handleDebateStarted, handleDebateRes
     if (!msgEl || !msgEl.dataset.uuid) return;
     var forkUuid = msgEl.dataset.uuid;
     showConfirm("Fork session from this message?", function() {
-      if (ws && ws.readyState === 1) {
-        ws.send(JSON.stringify({ type: "fork_session", uuid: forkUuid }));
+      var _ws = _getWsRef();
+      if (_ws && _ws.readyState === 1) {
+        _ws.send(JSON.stringify({ type: "fork_session", uuid: forkUuid }));
       }
     }, "Fork", false);
   });
@@ -537,53 +544,10 @@ import { initDebate, handleDebatePreparing, handleDebateStarted, handleDebateRes
   initMisc();
 
   // --- Favicon module ---
-  initFavicon({
-    sendBtn: sendBtn,
-    get basePath() { return basePath; },
-    onThemeChange: onThemeChange,
-    getStatusDot: getStatusDot,
-    addToMessages: addToMessages,
-    scrollToBottom: scrollToBottom,
-    getActivityEl: getActivityEl,
-    setActivityEl: setActivityEl,
-    get connected() { return store.getState().connected; },
-    get dmMode() { return store.getState().dmMode; },
-    get dmTargetUser() { return store.getState().dmTargetUser; },
-    get currentSlug() { return store.getState().currentSlug; },
-  });
+  initFavicon();
 
   // --- Header module (rename, info popover, history) ---
-  initHeader({
-    $: $,
-    messagesEl: messagesEl,
-    headerTitleEl: headerTitleEl,
-    headerRenameBtn: headerRenameBtn,
-    headerInfoBtn: $("header-info-btn"),
-    getWs: function () { return ws; },
-    get connected() { return store.getState().connected; },
-    get activeSessionId() { return store.getState().activeSessionId; },
-    get cliSessionId() { return store.getState().cliSessionId; },
-    get historyFrom() { return store.getState().historyFrom; },
-    set historyFrom(v) { store.setState({ historyFrom: v }); },
-    get loadingMore() { return loadingMore; },
-    set loadingMore(v) { loadingMore = v; },
-    // Rendering state accessors for prependOlderHistory
-    getCurrentMsgEl: function () { return store.getState().currentMsgEl; },
-    setCurrentMsgEl: function (v) { store.setState({ currentMsgEl: v }); },
-    getActivityEl: getActivityEl, setActivityEl: setActivityEl,
-    getCurrentFullText: function () { return store.getState().currentFullText; },
-    setCurrentFullText: function (v) { store.setState({ currentFullText: v }); },
-    getTurnCounter: getTurnCounter, setTurnCounter: setTurnCounter,
-    saveToolState: saveToolState, resetToolState: resetToolState, restoreToolState: restoreToolState,
-    getContextData: getContextData, setContextData: setContextData,
-    getSessionUsage: getSessionUsage, setSessionUsage: setSessionUsage,
-    setPrependAnchor: setPrependAnchor, getPrependAnchor: getPrependAnchor,
-    processMessage: processMessage,
-    finalizeAssistantBlock: finalizeAssistantBlock,
-    updateContextPanel: updateContextPanel,
-    updateUsagePanel: updateUsagePanel,
-    onSessionSearchHistoryPrepended: onSessionSearchHistoryPrepended,
-  });
+  initHeader();
 
   // --- Skill Install module ---
   initSkillInstall();
@@ -601,44 +565,13 @@ import { initDebate, handleDebatePreparing, handleDebateStarted, handleDebateRes
   initPanels();
 
   // --- Rendering module ---
-  initRendering({
-    messagesEl: messagesEl,
-    inputEl: inputEl,
-    sendBtn: sendBtn,
-    suggestionChipsEl: suggestionChipsEl,
-    newMsgBtn: newMsgBtn,
-    newMsgBtnDefault: newMsgBtnDefault,
-    newMsgBtnActivity: newMsgBtnActivity,
-    CLAUDE_CODE_AVATAR: CLAUDE_CODE_AVATAR,
-    // Functions
-    getScheduledMsgEl: getScheduledMsgEl,
-    renderMarkdown: renderMarkdown,
-    highlightCodeBlocks: highlightCodeBlocks,
-    renderMermaidBlocks: renderMermaidBlocks,
-    closeToolGroup: closeToolGroup,
-    copyToClipboard: copyToClipboard,
-    escapeHtml: escapeHtml,
-    iconHtml: iconHtml,
-    refreshIcons: refreshIcons,
-    showImageModal: showImageModal,
-    showPasteModal: showPasteModal,
-    userAvatarUrl: userAvatarUrl,
-    sendMessage: sendMessage,
-    openTerminal: function () { openTerminal(); },
-    getChatLayout: getChatLayout,
-    getWs: function () { return ws; },
-    getDmTargetUser: function () { return store.getState().dmTargetUser; },
-    setPendingTermCommand: function (v) { store.setState({ pendingTermCommand: v }); },
-    getProcessing: function () { return store.getState().processing; },
-    get myUserId() { return store.getState().myUserId; },
-    get cachedAllUsers() { return store.getState().cachedAllUsers; },
-  });
+  initRendering();
 
   // --- Tools module ---
   initTools({
     $: $,
-    get ws() { return ws; },
-    get connected() { return store.getState().connected; },
+    get ws() { return _getWsRef(); },
+    get connected() { return store.get('connected'); },
     get turnCounter() { return getTurnCounter(); },
     messagesEl: messagesEl,
     inputEl: inputEl,
@@ -652,12 +585,12 @@ import { initDebate, handleDebatePreparing, handleDebateStarted, handleDebateRes
       var cd = getContextData();
       return cd.contextWindow > 0 ? Math.round((cd.input / cd.contextWindow) * 100) : 0;
     },
-    isMateDm: function () { return store.getState().dmMode && store.getState().dmTargetUser && store.getState().dmTargetUser.isMate; },
-    getMateName: function () { return store.getState().dmTargetUser ? (store.getState().dmTargetUser.displayName || "Mate") : "Mate"; },
+    isMateDm: function () { return store.get('dmMode') && store.get('dmTargetUser') && store.get('dmTargetUser').isMate; },
+    getMateName: function () { return store.get('dmTargetUser') ? (store.get('dmTargetUser').displayName || "Mate") : "Mate"; },
     getMateAvatarUrl: function () { return document.body.dataset.mateAvatarUrl || ""; },
     getClaudeAvatar: function () { return CLAUDE_CODE_AVATAR; },
     getMateById: function (id) {
-      var ml = store.getState().cachedMatesList;
+      var ml = store.get('cachedMatesList');
       if (!id || !ml) return null;
       for (var i = 0; i < ml.length; i++) {
         if (ml[i].id === id) return ml[i];
@@ -708,15 +641,15 @@ import { initDebate, handleDebatePreparing, handleDebateStarted, handleDebateRes
   window.addEventListener("popstate", function () {
     var m = location.pathname.match(/^\/p\/([a-z0-9_-]+)/);
     var newSlug = m ? m[1] : null;
-    if (newSlug && newSlug !== store.getState().currentSlug) {
+    if (newSlug && newSlug !== store.get('currentSlug')) {
       resetFileBrowser();
       closeArchive();
       if (isSchedulerOpen()) closeScheduler();
       resetScheduler(newSlug);
-      store.setState({ currentSlug: newSlug });
+      store.set({ currentSlug: newSlug });
       basePath = "/p/" + newSlug + "/";
       wsPath = "/p/" + newSlug + "/ws";
-      store.setState({ basePath: basePath, wsPath: wsPath });
+      store.set({ basePath: basePath, wsPath: wsPath });
       resetClientState();
       connect();
     }
@@ -740,17 +673,17 @@ import { initDebate, handleDebatePreparing, handleDebateStarted, handleDebateRes
 
   // --- Input module (sendMessage, autoResize, paste/image, slash menu, input handlers) ---
   initInput({
-    get ws() { return ws; },
-    get connected() { return store.getState().connected; },
-    get processing() { return store.getState().processing; },
+    get ws() { return _getWsRef(); },
+    get connected() { return store.get('connected'); },
+    get processing() { return store.get('processing'); },
     get basePath() { return basePath; },
     inputEl: inputEl,
     sendBtn: sendBtn,
     slashMenu: slashMenu,
     messagesEl: messagesEl,
     imagePreviewBar: imagePreviewBar,
-    slashCommands: function() { return store.getState().slashCommands; },
-    messageUuidMap: function() { return store.getState().messageUuidMap; },
+    slashCommands: function() { return store.get('slashCommands'); },
+    messageUuidMap: function() { return store.get('messageUuidMap'); },
     addUserMessage: addUserMessage,
     addSystemMessage: addSystemMessage,
     toggleUsagePanel: toggleUsagePanel,
@@ -759,19 +692,20 @@ import { initDebate, handleDebatePreparing, handleDebateStarted, handleDebateRes
     resetContextData: resetContextData,
     showImageModal: showImageModal,
     hideSuggestionChips: hideSuggestionChips,
+    getGhostSuggestion: function () { return _renGetGhostSuggestion(); },
     setSendBtnMode: setSendBtnMode,
-    isDmMode: function () { return store.getState().dmMode && !(store.getState().dmTargetUser && store.getState().dmTargetUser.isMate); },
-    getDmKey: function () { return store.getState().dmKey; },
+    isDmMode: function () { return store.get('dmMode') && !(store.get('dmTargetUser') && store.get('dmTargetUser').isMate); },
+    getDmKey: function () { return store.get('dmKey'); },
     handleDmSend: function () { handleDmSend(); },
-    isDebateEndedMode: function () { return store.getState().debateEndedMode; },
+    isDebateEndedMode: function () { return store.get('debateEndedMode'); },
     handleDebateEndedSend: function () { handleDebateEndedSend(); },
-    isDebateConcludeMode: function () { return store.getState().debateConcludeMode; },
+    isDebateConcludeMode: function () { return store.get('debateConcludeMode'); },
     handleDebateConcludeSend: function () { handleDebateConcludeSend(); },
-    isDebateFloorMode: function () { return store.getState().debateFloorMode; },
+    isDebateFloorMode: function () { return store.get('debateFloorMode'); },
     handleDebateFloorSend: function () { handleDebateFloorSend(); },
-    isMateDm: function () { return store.getState().dmMode && store.getState().dmTargetUser && store.getState().dmTargetUser.isMate; },
-    getDmMateId: function () { return (store.getState().dmMode && store.getState().dmTargetUser && store.getState().dmTargetUser.isMate) ? dmTargetUser.id : null; },
-    getMateName: function () { return store.getState().dmTargetUser ? (store.getState().dmTargetUser.displayName || "Mate") : "Mate"; },
+    isMateDm: function () { return store.get('dmMode') && store.get('dmTargetUser') && store.get('dmTargetUser').isMate; },
+    getDmMateId: function () { var _dmt = store.get('dmTargetUser'); return (store.get('dmMode') && _dmt && _dmt.isMate) ? _dmt.id : null; },
+    getMateName: function () { return store.get('dmTargetUser') ? (store.get('dmTargetUser').displayName || "Mate") : "Mate"; },
     getMateAvatarUrl: function () { return document.body.dataset.mateAvatarUrl || ""; },
     showMatePreThinking: function () { showMatePreThinking(); },
     showClaudePreThinking: function () { showClaudePreThinking(); },
@@ -779,12 +713,12 @@ import { initDebate, handleDebatePreparing, handleDebateStarted, handleDebateRes
 
   // --- @Mention module ---
   initMention({
-    get ws() { return ws; },
-    get connected() { return store.getState().connected; },
+    get ws() { return _getWsRef(); },
+    get connected() { return store.get('connected'); },
     inputEl: inputEl,
     messagesEl: messagesEl,
-    matesList: function () { return store.getState().cachedMatesList || []; },
-    availableBuiltins: function () { return store.getState().cachedAvailableBuiltins || []; },
+    matesList: function () { return store.get('cachedMatesList') || []; },
+    availableBuiltins: function () { return store.get('cachedAvailableBuiltins') || []; },
     scrollToBottom: scrollToBottom,
     addUserMessage: addUserMessage,
     addCopyHandler: addCopyHandler,
@@ -795,15 +729,15 @@ import { initDebate, handleDebatePreparing, handleDebateStarted, handleDebateRes
 
   // --- Debate module ---
   initDebate({
-    get ws() { return ws; },
-    sendWs: function (obj) { if (ws && ws.readyState === 1) ws.send(JSON.stringify(obj)); },
+    get ws() { return _getWsRef(); },
+    sendWs: function (obj) { var _ws = _getWsRef(); if (_ws && _ws.readyState === 1) _ws.send(JSON.stringify(obj)); },
     messagesEl: messagesEl,
     addToMessages: function (el) { addToMessages(el); },
     scrollToBottom: scrollToBottom,
     addCopyHandler: addCopyHandler,
-    matesList: function () { return store.getState().cachedMatesList || []; },
-    availableBuiltins: function () { return store.getState().cachedAvailableBuiltins || []; },
-    currentMateId: function () { return (store.getState().dmTargetUser && store.getState().dmTargetUser.isMate) ? store.getState().dmTargetUser.id : null; },
+    matesList: function () { return store.get('cachedMatesList') || []; },
+    availableBuiltins: function () { return store.get('cachedAvailableBuiltins') || []; },
+    currentMateId: function () { return (store.get('dmTargetUser') && store.get('dmTargetUser').isMate) ? store.get('dmTargetUser').id : null; },
     requireSkills: requireSkills,
     showDebateEndedMode: function (msg) { showDebateEndedMode(msg); },
   });
@@ -833,14 +767,13 @@ import { initDebate, handleDebatePreparing, handleDebateStarted, handleDebateRes
   initAdmin({
     get projectList() { return getCachedProjects(); },
   });
-  var myPermissions = null; // null = single-user, all allowed
   fetch("/api/me").then(function (r) { return r.json(); }).then(function (d) {
-    if (d.multiUser) { store.setState({ isMultiUserMode: true }); }
-    if (d.user && d.user.id) { store.setState({ myUserId: d.user.id }); }
-    if (d.permissions) myPermissions = d.permissions;
+    if (d.multiUser) { store.set({ isMultiUserMode: true }); }
+    if (d.user && d.user.id) { store.set({ myUserId: d.user.id }); }
+    if (d.permissions) store.set({ permissions: d.permissions });
     if (d.mustChangePin) showForceChangePinOverlay();
     // Single-user mode: clear user strip skeletons immediately (no presence message will arrive)
-    if (!store.getState().isMultiUserMode) {
+    if (!store.get('isMultiUserMode')) {
       var usersContainer = document.getElementById("icon-strip-users");
       if (usersContainer) {
         usersContainer.innerHTML = "";
@@ -849,28 +782,31 @@ import { initDebate, handleDebatePreparing, handleDebateStarted, handleDebateRes
     }
     initCursorToggle();
     // Apply RBAC UI gating
-    if (myPermissions) {
-      if (!myPermissions.terminal) {
+    var _perms = store.get('permissions');
+    if (_perms) {
+      if (!_perms.terminal) {
+        var termBtn = document.getElementById("terminal-toggle-btn");
+        if (termBtn) termBtn.style.display = "none";
         var termSideBtn = document.getElementById("terminal-sidebar-btn");
         if (termSideBtn) termSideBtn.style.display = "none";
       }
-      if (!myPermissions.fileBrowser) {
+      if (!_perms.fileBrowser) {
         var fbBtn = document.getElementById("file-browser-btn");
         if (fbBtn) fbBtn.style.display = "none";
       }
-      if (!myPermissions.skills) {
+      if (!_perms.skills) {
         var sBtn = document.getElementById("skills-btn");
         if (sBtn) sBtn.style.display = "none";
         var msBtn = document.getElementById("mate-skills-btn");
         if (msBtn) msBtn.style.display = "none";
       }
-      if (!myPermissions.scheduledTasks) {
+      if (!_perms.scheduledTasks) {
         var schBtn = document.getElementById("scheduler-btn");
         if (schBtn) schBtn.style.display = "none";
         var mateSchBtn = document.getElementById("mate-scheduler-btn");
         if (mateSchBtn) mateSchBtn.style.display = "none";
       }
-      if (!myPermissions.createProject) {
+      if (!_perms.createProject) {
         var addProjBtn = document.getElementById("icon-strip-add");
         if (addProjBtn) addProjBtn.style.display = "none";
       }
@@ -878,7 +814,7 @@ import { initDebate, handleDebatePreparing, handleDebateStarted, handleDebateRes
   }).catch(function () {});
   // Hide server settings and update controls for non-admin users in multi-user mode
   checkAdminAccess().then(function (isAdmin) {
-    if (store.getState().isMultiUserMode && !isAdmin) {
+    if (store.get('isMultiUserMode') && !isAdmin) {
       var settingsBtn = document.getElementById("server-settings-btn");
       if (settingsBtn) settingsBtn.style.display = "none";
       var updatePill = document.getElementById("update-pill-wrap");
@@ -889,8 +825,8 @@ import { initDebate, handleDebatePreparing, handleDebateStarted, handleDebateRes
   // --- Notifications module (viewport, banners, notifications, debug, service worker) ---
   initNotifications({
     $: $,
-    get ws() { return ws; },
-    get connected() { return store.getState().connected; },
+    get ws() { return _getWsRef(); },
+    get connected() { return store.get('connected'); },
     messagesEl: messagesEl,
     sessionListEl: sessionListEl,
     scrollToBottom: scrollToBottom,
@@ -901,33 +837,33 @@ import { initDebate, handleDebatePreparing, handleDebateStarted, handleDebateRes
 
   // --- Server Settings ---
   initServerSettings({
-    get ws() { return ws; },
-    get projectName() { return store.getState().projectName; },
-    get currentSlug() { return store.getState().currentSlug; },
+    get ws() { return _getWsRef(); },
+    get projectName() { return store.get('projectName'); },
+    get currentSlug() { return store.get('currentSlug'); },
     wsPath: wsPath,
-    get currentModels() { return store.getState().currentModels; },
-    set currentModels(v) { store.setState({ currentModels: v }); updateConfigChip(); },
-    get currentModel() { return store.getState().currentModel; },
-    get currentMode() { return store.getState().currentMode; },
-    get currentEffort() { return store.getState().currentEffort; },
-    get currentBetas() { return store.getState().currentBetas; },
-    get currentThinking() { return store.getState().currentThinking; },
-    get currentThinkingBudget() { return store.getState().currentThinkingBudget; },
+    get currentModels() { return store.get('currentModels'); },
+    set currentModels(v) { store.set({ currentModels: v }); },
+    get currentModel() { return store.get('currentModel'); },
+    get currentMode() { return store.get('currentMode'); },
+    get currentEffort() { return store.get('currentEffort'); },
+    get currentBetas() { return store.get('currentBetas'); },
+    get currentThinking() { return store.get('currentThinking'); },
+    get currentThinkingBudget() { return store.get('currentThinkingBudget'); },
     setContextView: function (v) { _panSetContextView(v); },
     applyContextView: function (v) { _panApplyContextView(v); },
   });
 
   // --- Project Settings ---
   initProjectSettings({
-    get ws() { return ws; },
-    get connected() { return store.getState().connected; },
-    get currentModels() { return store.getState().currentModels; },
-    get currentModel() { return store.getState().currentModel; },
-    get currentMode() { return store.getState().currentMode; },
-    get currentEffort() { return store.getState().currentEffort; },
-    get currentBetas() { return store.getState().currentBetas; },
-    get currentThinking() { return store.getState().currentThinking; },
-    get currentThinkingBudget() { return store.getState().currentThinkingBudget; },
+    get ws() { return _getWsRef(); },
+    get connected() { return store.get('connected'); },
+    get currentModels() { return store.get('currentModels'); },
+    get currentModel() { return store.get('currentModel'); },
+    get currentMode() { return store.get('currentMode'); },
+    get currentEffort() { return store.get('currentEffort'); },
+    get currentBetas() { return store.get('currentBetas'); },
+    get currentThinking() { return store.get('currentThinking'); },
+    get currentThinkingBudget() { return store.get('currentThinkingBudget'); },
   }, getEmojiCategories());
 
   // --- QR code ---
@@ -937,10 +873,10 @@ import { initDebate, handleDebatePreparing, handleDebateStarted, handleDebateRes
 
   // --- File browser ---
   initFileBrowser({
-    get ws() { return ws; },
-    get connected() { return store.getState().connected; },
-    get activeSessionId() { return store.getState().activeSessionId; },
-    get cwd() { return store.getState().cwd; },
+    get ws() { return _getWsRef(); },
+    get connected() { return store.get('connected'); },
+    get activeSessionId() { return store.get('activeSessionId'); },
+    get cwd() { return store.get('cwd'); },
     messagesEl: messagesEl,
     fileTreeEl: $("file-tree"),
     fileViewerEl: $("file-viewer"),
@@ -948,8 +884,8 @@ import { initDebate, handleDebatePreparing, handleDebateStarted, handleDebateRes
 
   // --- Terminal ---
   initTerminal({
-    get ws() { return ws; },
-    get connected() { return store.getState().connected; },
+    get ws() { return _getWsRef(); },
+    get connected() { return store.get('connected'); },
     terminalContainerEl: $("terminal-container"),
     terminalBodyEl: $("terminal-body"),
     fileViewerEl: $("file-viewer"),
@@ -957,8 +893,8 @@ import { initDebate, handleDebatePreparing, handleDebateStarted, handleDebateRes
 
   // --- Context Sources ---
   initContextSources({
-    get ws() { return ws; },
-    get connected() { return store.getState().connected; },
+    get ws() { return _getWsRef(); },
+    get connected() { return store.get('connected'); },
   });
 
   // --- Chrome Extension Bridge -> modules/app-misc.js
@@ -986,8 +922,8 @@ import { initDebate, handleDebatePreparing, handleDebateStarted, handleDebateRes
   // --- In-session search (Cmd+F / Ctrl+F) ---
   initSessionSearch({
     messagesEl: messagesEl,
-    get ws() { return ws; },
-    getHistoryFrom: function () { return store.getState().historyFrom; },
+    get ws() { return _getWsRef(); },
+    getHistoryFrom: function () { return store.get('historyFrom'); },
   });
   var findInSessionBtn = $("find-in-session-btn");
   if (findInSessionBtn) {
@@ -998,8 +934,8 @@ import { initDebate, handleDebatePreparing, handleDebateStarted, handleDebateRes
 
   // --- Sticky Notes ---
   initStickyNotes({
-    get ws() { return ws; },
-    get connected() { return store.getState().connected; },
+    get ws() { return _getWsRef(); },
+    get connected() { return store.get('connected'); },
   });
 
   // --- Sticky Notes sidebar button (create new note) ---
@@ -1065,7 +1001,7 @@ import { initDebate, handleDebatePreparing, handleDebateStarted, handleDebateRes
   if (debateBtn) {
     debateBtn.addEventListener("click", function () {
       var contextMessages = dmMessageCache.map(function (m) {
-        return { text: m.text, isMate: m.from !== store.getState().myUserId };
+        return { text: m.text, isMate: m.from !== store.get('myUserId') };
       });
       openDebateModal({ dmContext: contextMessages });
     });
@@ -1099,19 +1035,13 @@ import { initDebate, handleDebatePreparing, handleDebateStarted, handleDebateRes
   initEmailDefaultsModal();
 
   // --- Skills ---
-  initSkills({
-    get ws() { return ws; },
-    get connected() { return store.getState().connected; },
-    basePath: basePath,
-    openTerminal: function () { openTerminal(); },
-    sendTerminalCommand: function (cmd) { sendTerminalCommand(cmd); },
-  });
+  initSkills();
 
   // --- Scheduler ---
   initScheduler({
-    get ws() { return ws; },
-    get connected() { return store.getState().connected; },
-    get activeSessionId() { return store.getState().activeSessionId; },
+    get ws() { return _getWsRef(); },
+    get connected() { return store.get('connected'); },
+    get activeSessionId() { return store.get('activeSessionId'); },
     basePath: basePath,
     currentSlug: currentSlug, // init-time snapshot, scheduler uses for initial setup
     openRalphWizard: function (source) { openRalphWizard(source); },
@@ -1145,278 +1075,29 @@ import { initDebate, handleDebatePreparing, handleDebateStarted, handleDebateRes
   function clearRemoteCursors() { _curClearRemoteCursors(); }
 
   // --- Cursors module ---
-  initCursors({
-    messagesEl: messagesEl,
-    registerTooltip: registerTooltip,
-    get ws() { return ws; },
-    get isMultiUserMode() { return store.getState().isMultiUserMode; },
-  });
+  initCursors();
 
   // --- Rate Limit module ---
   initRateLimit();
 
   // --- Projects module ---
-  initProjects({
-    $: $,
-    messagesEl: messagesEl,
-    newMsgBtn: newMsgBtn,
-    connectOverlay: connectOverlay,
-    userAvatarUrl: userAvatarUrl,
-    checkAdminAccess: checkAdminAccess,
-    renderUserStrip: renderUserStrip,
-    renderIconStrip: renderIconStrip,
-    updateCrossProjectBlink: updateCrossProjectBlink,
-    showConfirm: showConfirm,
-    showToast: showToast,
-    showHomeHub: showHomeHub,
-    hideHomeHub: hideHomeHub,
-    isHomeHubVisible: isHomeHubVisible,
-    spawnDustParticles: spawnDustParticles,
-    getStatusDot: getStatusDot,
-    // Rendering state accessors
-    setCurrentMsgEl: function (v) { store.setState({ currentMsgEl: v }); },
-    setCurrentFullText: function (v) { store.setState({ currentFullText: v }); },
-    setTurnCounter: setTurnCounter,
-    setPrependAnchor: setPrependAnchor,
-    setActivityEl: setActivityEl,
-    setIsUserScrolledUp: setIsUserScrolledUp,
-    // Reset helpers
-    closeSearch: function () { if (isSearchOpen()) closeSearch(); },
-    resetToolState: resetToolState,
-    clearPendingImages: clearPendingImages,
-    setRewindMode: function (v) { setRewindMode(v); },
-    setActivity: setActivity,
-    setStatus: setStatus,
-    enableMainInput: enableMainInput,
-    resetUsage: resetUsage,
-    resetTurnMetaCost: resetTurnMetaCost,
-    resetContext: resetContext,
-    resetRateLimitState: resetRateLimitState,
-    hideSuggestionChips: hideSuggestionChips,
-    closeSessionInfoPopover: closeSessionInfoPopover,
-    stopUrgentBlink: stopUrgentBlink,
-    resetDebateState: resetDebateState,
-    removeDebateBottomBar: removeDebateBottomBar,
-    // Project switching helpers
-    exitDmMode: exitDmMode,
-    resetFileBrowser: resetFileBrowser,
-    closeArchive: closeArchive,
-    hideMemory: hideMemory,
-    isSchedulerOpen: isSchedulerOpen,
-    closeScheduler: closeScheduler,
-    resetScheduler: resetScheduler,
-    connect: function () { connect(); },
-    cancelReconnect: function () { _connCancelReconnect(); },
-    getWs: function () { return ws; },
-    setWs: function (v) { ws = v; _setWsRef(v); },
-    setConnected: function (v) { store.setState({ connected: v }); },
-    setProcessing: function (v) { store.setState({ processing: v }); },
-    setCurrentSlug: function (v) { store.setState({ currentSlug: v }); },
-    setBasePath: function (v) { basePath = v; },
-    setWsPath: function (v) { wsPath = v; },
-    setMessageUuidMap: function (v) { store.setState({ messageUuidMap: v }); },
-    setHistoryFrom: function (v) { store.setState({ historyFrom: v }); },
-    setHistoryTotal: function (v) { store.setState({ historyTotal: v }); },
-    setLoadingMore: function (v) { loadingMore = v; },
-    getHeaderContextEl: function () { return store.getState().headerContextEl; },
-    setHeaderContextEl: function (v) { store.setState({ headerContextEl: v }); },
-    setDebateStickyState: function (v) { store.setState({ debateStickyState: v }); },
-    setCachedOnlineIds: function (v) { store.setState({ cachedOnlineIds: v }); },
-    setCachedAllUsers: function (v) { store.setState({ cachedAllUsers: v }); },
-    setCachedDmFavorites: function (v) { store.setState({ cachedDmFavorites: v }); },
-    setCachedDmConversations: function (v) { store.setState({ cachedDmConversations: v }); },
-    get currentSlug() { return store.getState().currentSlug; },
-    get connected() { return store.getState().connected; },
-    get processing() { return store.getState().processing; },
-    get loopActive() { return store.getState().loopActive; },
-    get dmMode() { return store.getState().dmMode; },
-    get dmTargetUser() { return store.getState().dmTargetUser; },
-    get activeSessionId() { return store.getState().activeSessionId; },
-    get isHeadlessMode() { return store.getState().isHeadlessMode; },
-    get isOsUsers() { return store.getState().isOsUsers; },
-    get mateProjectSlug() { return store.getState().mateProjectSlug; },
-    get savedMainSlug() { return store.getState().savedMainSlug; },
-    get myUserId() { return store.getState().myUserId; },
-    get cachedAllUsers() { return store.getState().cachedAllUsers; },
-    get cachedOnlineIds() { return store.getState().cachedOnlineIds; },
-    get cachedDmFavorites() { return store.getState().cachedDmFavorites; },
-    get cachedDmConversations() { return store.getState().cachedDmConversations; },
-    get dmUnread() { return store.getState().dmUnread; },
-    get dmRemovedUsers() { return store.getState().dmRemovedUsers; },
-    get cachedMatesList() { return store.getState().cachedMatesList; },
-  });
+  initProjects();
 
   // --- Home Hub module ---
-  initHomeHub({
-    $: $,
-    exitDmMode: exitDmMode,
-    openDm: openDm,
-    mateAvatarUrl: mateAvatarUrl,
-    escapeHtml: escapeHtml,
-    switchProject: switchProject,
-    openSchedulerToTab: openSchedulerToTab,
-    getPlaybooks: getPlaybooks,
-    openPlaybook: openPlaybook,
-    getPlaybookForTip: getPlaybookForTip,
-    renderProjectList: renderProjectList,
-    get dmMode() { return store.getState().dmMode; },
-    get ws() { return ws; },
-    get currentSlug() { return store.getState().currentSlug; },
-    get cachedProjects() { return getCachedProjects(); },
-    get cachedMatesList() { return store.getState().cachedMatesList; },
-  });
+  initHomeHub();
 
   // --- DM module ---
-  var _dmCtx = {
-    // Functions
-    connect: connect,
-    resetClientState: resetClientState,
-    scrollToBottom: scrollToBottom,
-    autoResize: autoResize,
-    showDebateSticky: showDebateSticky,
-    updateDmBadge: updateDmBadge,
-    setCurrentDmUser: setCurrentDmUser,
-    renderProjectList: renderProjectList,
-    hideHomeHub: hideHomeHub,
-    hideNotes: hideNotes,
-    showMateSidebar: showMateSidebar,
-    hideMateSidebar: hideMateSidebar,
-    hideKnowledge: hideKnowledge,
-    hideMemory: hideMemory,
-    closeFileViewer: closeFileViewer,
-    closeTerminal: closeTerminal,
-    mateAvatarUrl: mateAvatarUrl,
-    userAvatarUrl: userAvatarUrl,
-    renderUserStrip: renderUserStrip,
-    openMobileSheet: openMobileSheet,
-    setMobileSheetMateData: setMobileSheetMateData,
-    closeDmUserPicker: closeDmUserPicker,
-    getProfileLang: getProfileLang,
-    isSchedulerOpen: isSchedulerOpen,
-    closeScheduler: closeScheduler,
-    requireClayMateInterview: requireClayMateInterview,
-    // DOM refs
-    messagesEl: messagesEl,
-    inputEl: inputEl,
-  };
-  // Mutable state for DM module (store-backed)
-  Object.defineProperties(_dmCtx, {
-    ws: { get: function() { return ws; }, enumerable: true },
-    dmMode: { get: function() { return store.getState().dmMode; }, set: function(v) { store.setState({ dmMode: v }); }, enumerable: true },
-    dmKey: { get: function() { return store.getState().dmKey; }, set: function(v) { store.setState({ dmKey: v }); }, enumerable: true },
-    dmTargetUser: { get: function() { return store.getState().dmTargetUser; }, set: function(v) { store.setState({ dmTargetUser: v }); }, enumerable: true },
-    dmMessageCache: { get: function() { return dmMessageCache; }, set: function(v) { dmMessageCache = v; }, enumerable: true },
-    dmUnread: { get: function() { return store.getState().dmUnread; }, enumerable: true },
-    dmRemovedUsers: { get: function() { return store.getState().dmRemovedUsers; }, enumerable: true },
-    cachedAllUsers: { get: function() { return store.getState().cachedAllUsers; }, enumerable: true },
-    cachedOnlineIds: { get: function() { return store.getState().cachedOnlineIds; }, enumerable: true },
-    cachedDmFavorites: { get: function() { return store.getState().cachedDmFavorites; }, set: function(v) { store.setState({ cachedDmFavorites: v }); }, enumerable: true },
-    cachedDmConversations: { get: function() { return store.getState().cachedDmConversations; }, enumerable: true },
-    cachedMatesList: { get: function() { return store.getState().cachedMatesList; }, enumerable: true },
-    cachedAvailableBuiltins: { get: function() { return store.getState().cachedAvailableBuiltins; }, set: function(v) { store.setState({ cachedAvailableBuiltins: v }); }, enumerable: true },
-    cachedProjects: { get: function() { return getCachedProjects(); }, enumerable: true },
-    mateProjectSlug: { get: function() { return store.getState().mateProjectSlug; }, set: function(v) { store.setState({ mateProjectSlug: v }); }, enumerable: true },
-    savedMainSlug: { get: function() { return store.getState().savedMainSlug; }, set: function(v) { store.setState({ savedMainSlug: v }); }, enumerable: true },
-    returningFromMateDm: { get: function() { return store.getState().returningFromMateDm; }, set: function(v) { store.setState({ returningFromMateDm: v }); }, enumerable: true },
-    pendingMateInterview: { get: function() { return store.getState().pendingMateInterview; }, set: function(v) { store.setState({ pendingMateInterview: v }); }, enumerable: true },
-    currentSlug: { get: function() { return store.getState().currentSlug; }, set: function(v) { store.setState({ currentSlug: v }); }, enumerable: true },
-    wsPath: { get: function() { return wsPath; }, set: function(v) { wsPath = v; }, enumerable: true },
-    basePath: { get: function() { return basePath; }, set: function(v) { basePath = v; }, enumerable: true },
-    activeSessionId: { get: function() { return store.getState().activeSessionId; }, enumerable: true },
-    myUserId: { get: function() { return store.getState().myUserId; }, enumerable: true },
-  });
-  initDm(_dmCtx);
+  initDm();
 
   // --- Messages module (uses direct imports, no ctx injection needed) ---
 
   // --- Connection module ---
-  initConnection({
-    getWs: function () { return ws; },
-    setWs: function (v) { ws = v; _setWsRef(v); },
-    isConnected: function () { return store.getState().connected; },
-    setConnected: function (v) { store.setState({ connected: v }); },
-    setProcessing: function (v) { store.setState({ processing: v }); },
-    getWsPath: function () { return wsPath; },
-    getStatusDot: getStatusDot,
-    sendBtn: sendBtn,
-    connectOverlay: connectOverlay,
-    setSendBtnMode: setSendBtnMode,
-    hasSendableContent: hasSendableContent,
-    startVerbCycle: startVerbCycle,
-    stopVerbCycle: stopVerbCycle,
-    blinkIO: blinkIO,
-    isNotifAlertEnabled: isNotifAlertEnabled,
-    closeDmUserPicker: closeDmUserPicker,
-    setActivity: setActivity,
-    processMessage: processMessage,
-    onConnected: function () {
-      // Flush any extension messages that arrived before WS was ready
-      flushPendingExtMessages();
-
-      // Reset terminal xterm instances (server will send fresh term_list)
-      resetTerminals();
-
-      // Re-send push subscription on reconnect
-      if (window._pushSubscription) {
-        try {
-          ws.send(JSON.stringify({
-            type: "push_subscribe",
-            subscription: window._pushSubscription.toJSON(),
-          }));
-        } catch(e) {}
-      }
-
-      // Request mates list
-      try {
-        ws.send(JSON.stringify({ type: "mate_list" }));
-      } catch(e) {}
-
-      // If connecting to a mate project, request knowledge list for badge
-      if (store.getState().mateProjectSlug) {
-        try { ws.send(JSON.stringify({ type: "knowledge_list" })); } catch(e) {}
-      }
-
-      // Session restore is now server-driven (user-presence.json).
-      // Mate DM restore is also server-driven via "restore_mate_dm" message.
-      // Fallback: if server doesn't restore DM within 2s, try localStorage
-      var savedDm = null;
-      try { savedDm = localStorage.getItem("clay-active-dm"); } catch (e) {}
-      if (savedDm && !store.getState().dmMode && !store.getState().mateProjectSlug) {
-        var dmFallbackTimer = setTimeout(function () {
-          if (!store.getState().dmMode && savedDm) {
-            console.log("[dm-restore] Server did not restore DM, using localStorage fallback:", savedDm);
-            openDm(savedDm);
-          }
-        }, 2000);
-        // Cancel fallback if server restores DM first
-        var patchedOnce = false;
-        var checkRestore = function (evt) {
-          try {
-            var d = JSON.parse(evt.data);
-            if (d.type === "restore_mate_dm" && !patchedOnce) {
-              patchedOnce = true;
-              clearTimeout(dmFallbackTimer);
-            }
-          } catch (e) {}
-        };
-        ws.addEventListener("message", checkRestore);
-        setTimeout(function () { ws.removeEventListener("message", checkRestore); }, 3000);
-      }
-      // Safety: clear returningFromMateDm after initial messages settle
-      if (store.getState().returningFromMateDm) {
-        setTimeout(function () {
-          if (store.getState().returningFromMateDm) {
-            store.setState({ returningFromMateDm: false });
-          }
-        }, 2000);
-      }
-    },
-  });
+  initConnection();
 
   // --- Init ---
   lucide.createIcons();
   connect();
-  if (!store.getState().currentSlug) {
+  if (!store.get('currentSlug')) {
     showHomeHub();
   } else if (location.hash === "#scheduler") {
     // Restore scheduler view after refresh