clay-server 2.27.0-beta.17 → 2.27.0-beta.18

package/lib/public/app.js

@@ -46,21 +46,23 @@ import { initMateWizard, openMateWizard, closeMateWizard, handleMateCreated } fr
 import { initCommandPalette, handlePaletteSessionSwitch, setPaletteVersion } from './modules/command-palette.js';
 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 { initMessages, processMessage as _msgProcessMessage } from './modules/app-messages.js';
+import { processMessage as _msgProcessMessage } from './modules/app-messages.js';
+import { 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';
 import { initFavicon, updateFavicon as _favUpdateFavicon, setSendBtnMode as _favSetSendBtnMode, blinkIO as _favBlinkIO, blinkSessionDot as _favBlinkSessionDot, updateCrossProjectBlink as _favUpdateCrossProjectBlink, startUrgentBlink as _favStartUrgentBlink, stopUrgentBlink as _favStopUrgentBlink, setActivity as _favSetActivity, drawFaviconAnimFrame as _favDrawFaviconAnimFrame } from './modules/app-favicon.js';
 import { initHeader, closeSessionInfoPopover as _hdrCloseSessionInfoPopover, updateHistorySentinel as _hdrUpdateHistorySentinel, requestMoreHistory as _hdrRequestMoreHistory, prependOlderHistory as _hdrPrependOlderHistory } from './modules/app-header.js';
 import { initMisc, showImageModal as _miscShowImageModal, closeImageModal as _miscCloseImageModal, showPasteModal as _miscShowPasteModal, closePasteModal as _miscClosePasteModal, showConfirm as _miscShowConfirm, hideConfirm as _miscHideConfirm, showForceChangePinOverlay as _miscShowForceChangePinOverlay, sendExtensionCommand as _miscSendExtensionCommand, handleExtensionResult as _miscHandleExtensionResult } from './modules/app-misc.js';
-import { initSkillInstall, requireSkills as _siRequireSkills, requireClayMateInterview as _siRequireClayMateInterview, handleSkillInstallWs as _siHandleSkillInstallWs, getKnownInstalledSkills, setKnownInstalledSkills } from './modules/app-skills-install.js';
-import { initDebateUi, showDebateConcludeConfirm as _debShowDebateConcludeConfirm, exitDebateConcludeMode as _debExitDebateConcludeMode, handleDebateConcludeSend as _debHandleDebateConcludeSend, showDebateEndedMode as _debShowDebateEndedMode, exitDebateEndedMode as _debExitDebateEndedMode, showDebateUserFloor as _debShowDebateUserFloor, exitDebateFloorMode as _debExitDebateFloorMode, handleDebateFloorSend as _debHandleDebateFloorSend, renderDebateUserFloorDone as _debRenderDebateUserFloorDone, showDebateSticky as _debShowDebateSticky, showDebateBottomBar as _debShowDebateBottomBar, removeDebateBottomBar as _debRemoveDebateBottomBar, sendDebateStickyComment as _debSendDebateStickyComment, updateDebateRound as _debUpdateDebateRound, getDebateStickyState, setDebateStickyState, getDebateFloorMode, getDebateConcludeMode, getDebateEndedMode } from './modules/app-debate-ui.js';
-import { initLoopUi, updateLoopInputVisibility as _loopUpdateLoopInputVisibility, updateLoopButton as _loopUpdateLoopButton, showLoopBanner as _loopShowLoopBanner, updateLoopBanner as _loopUpdateLoopBanner, updateRalphBars as _loopUpdateRalphBars, showRalphCraftingBar as _loopShowRalphCraftingBar, showRalphApprovalBar as _loopShowRalphApprovalBar, updateRalphApprovalStatus as _loopUpdateRalphApprovalStatus, openRalphPreviewModal as _loopOpenRalphPreviewModal, showExecModal as _loopShowExecModal, closeExecModal as _loopCloseExecModal, updateExecModalStatus as _loopUpdateExecModalStatus, getLoopActive, setLoopActive, getLoopAvailable, setLoopAvailable, getLoopIteration, setLoopIteration, getLoopMaxIterations, setLoopMaxIterations, getLoopBannerName, setLoopBannerName, getRalphPhase, setRalphPhase, getRalphCraftingSessionId, setRalphCraftingSessionId, getRalphCraftingSource, setRalphCraftingSource, getRalphFilesReady, setRalphFilesReady, getRalphPreviewContent, setRalphPreviewContent, getExecModalShown, setExecModalShown } from './modules/app-loop-ui.js';
-import { initLoopWizard, openRalphWizard as _loopOpenRalphWizard, closeRalphWizard as _loopCloseRalphWizard, getWizardData, setWizardData, getWizardSource as _loopGetWizardSource } from './modules/app-loop-wizard.js';
+import { initSkillInstall, requireSkills as _siRequireSkills, requireClayMateInterview as _siRequireClayMateInterview, handleSkillInstallWs as _siHandleSkillInstallWs } from './modules/app-skills-install.js';
+import { initDebateUi, showDebateConcludeConfirm as _debShowDebateConcludeConfirm, exitDebateConcludeMode as _debExitDebateConcludeMode, handleDebateConcludeSend as _debHandleDebateConcludeSend, showDebateEndedMode as _debShowDebateEndedMode, exitDebateEndedMode as _debExitDebateEndedMode, showDebateUserFloor as _debShowDebateUserFloor, exitDebateFloorMode as _debExitDebateFloorMode, handleDebateFloorSend as _debHandleDebateFloorSend, renderDebateUserFloorDone as _debRenderDebateUserFloorDone, showDebateSticky as _debShowDebateSticky, showDebateBottomBar as _debShowDebateBottomBar, removeDebateBottomBar as _debRemoveDebateBottomBar, sendDebateStickyComment as _debSendDebateStickyComment, updateDebateRound as _debUpdateDebateRound } from './modules/app-debate-ui.js';
+import { initLoopUi, updateLoopInputVisibility as _loopUpdateLoopInputVisibility, updateLoopButton as _loopUpdateLoopButton, showLoopBanner as _loopShowLoopBanner, updateLoopBanner as _loopUpdateLoopBanner, updateRalphBars as _loopUpdateRalphBars, showRalphCraftingBar as _loopShowRalphCraftingBar, showRalphApprovalBar as _loopShowRalphApprovalBar, updateRalphApprovalStatus as _loopUpdateRalphApprovalStatus, openRalphPreviewModal as _loopOpenRalphPreviewModal, showExecModal as _loopShowExecModal, closeExecModal as _loopCloseExecModal, updateExecModalStatus as _loopUpdateExecModalStatus } from './modules/app-loop-ui.js';
+import { initLoopWizard, openRalphWizard as _loopOpenRalphWizard, closeRalphWizard as _loopCloseRalphWizard, getWizardSource as _loopGetWizardSource } from './modules/app-loop-wizard.js';
 import { initAppNotifications, handleNotificationsState as _notifHandleState, handleNotificationCreated as _notifHandleCreated, handleNotificationDismissed as _notifHandleDismissed, handleNotificationDismissedAll as _notifHandleDismissedAll } from './modules/app-notifications.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, getCurrentModel, setCurrentModel, getCurrentModels, setCurrentModels, getCurrentMode, setCurrentMode, getCurrentEffort, setCurrentEffort, getCurrentBetas, setCurrentBetas, getCurrentThinking, setCurrentThinking, getCurrentThinkingBudget, setCurrentThinkingBudget, getSessionUsage, setSessionUsage, getContextData, setContextData, getHeaderContextEl as _panGetHeaderContextEl, setHeaderContextEl as _panSetHeaderContextEl, getRichContextUsage, setRichContextUsage, getCtxPopoverVisible, setContextView as _panSetContextView, applyContextView as _panApplyContextView } from './modules/app-panels.js';
+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, getCurrentMsgEl, setCurrentMsgEl, getCurrentFullText, setCurrentFullText, getTurnCounter, setTurnCounter, getPrependAnchor, setPrependAnchor, getActivityEl, setActivityEl, getMatePreThinkingEl, getCurrentMsgTs, setCurrentMsgTs, getIsUserScrolledUp, setIsUserScrolledUp, getReplayingHistory, setReplayingHistory } 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, 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';
@@ -96,26 +98,15 @@ import { initDebate, handleDebatePreparing, handleDebateStarted, handleDebateRes
   var connectOverlay = $("connect-overlay");
 
   // --- DM Mode ---
-  var dmMode = false;
-  var dmKey = null;
-  var dmTargetUser = null;
+  // dmMode, dmUnread, cachedAllUsers, cachedOnlineIds, cachedDmFavorites,
+  // cachedDmConversations, dmRemovedUsers, cachedMatesList, cachedAvailableBuiltins,
+  // dmTargetUser, dmKey -> store
   var dmMessageCache = []; // cached DM messages for quick debate context
-  var dmUnread = {}; // { otherUserId: count }
-  var cachedAllUsers = [];
-  var cachedOnlineIds = [];
-  var cachedDmFavorites = [];
-  var cachedDmConversations = [];
-  var dmRemovedUsers = {};       // { userId: true } - users explicitly removed from favorites
-  var cachedMatesList = [];       // Cached list of mates for user strip
-  var cachedAvailableBuiltins = []; // Deleted built-in mates available for re-add
 
   var CLAUDE_CODE_AVATAR = "/claude-code-avatar.png";
 
   // --- Mate project switching ---
-  var mateProjectSlug = null;
-  var savedMainSlug = null; // main project slug saved during mate DM
-  var returningFromMateDm = false; // suppress restore_mate_dm after intentional exit
-  var pendingMateInterview = null;
+  // mateProjectSlug, savedMainSlug, returningFromMateDm, pendingMateInterview -> store
 
 
   // --- Home Hub (delegated to app-home-hub.js) ---
@@ -145,8 +136,8 @@ import { initDebate, handleDebatePreparing, handleDebateStarted, handleDebateRes
   var projectHint = $("project-hint");
   var projectHintDismiss = $("project-hint-dismiss");
   // cachedProjects, cachedProjectCount, cachedRemovedProjects -> modules/app-projects.js
-  var currentProjectOwnerId = null;
-  var currentSlug = slugMatch ? slugMatch[1] : null;
+  // currentProjectOwnerId -> store
+  var currentSlug = slugMatch ? slugMatch[1] : null; // kept for pre-store init
 
   // updateProjectList, renderTopbarPresence, renderProjectList -> modules/app-projects.js
   function updateProjectList(msg) { _projUpdateProjectList(msg); }
@@ -174,12 +165,12 @@ import { initDebate, handleDebatePreparing, handleDebateStarted, handleDebateRes
 
   document.addEventListener("keydown", function (e) {
     if (e.key === "Escape") {
-      if (isHomeHubVisible() && currentSlug) {
+      if (isHomeHubVisible() && store.getState().currentSlug) {
         hideHomeHub();
         if (document.documentElement.classList.contains("pwa-standalone")) {
-          history.replaceState(null, "", "/p/" + currentSlug + "/");
+          history.replaceState(null, "", "/p/" + store.getState().currentSlug + "/");
         } else {
-          history.pushState(null, "", "/p/" + currentSlug + "/");
+          history.pushState(null, "", "/p/" + store.getState().currentSlug + "/");
         }
         var homeIcon = document.querySelector(".icon-strip-home");
         if (homeIcon) homeIcon.classList.remove("active");
@@ -219,23 +210,12 @@ import { initDebate, handleDebatePreparing, handleDebateStarted, handleDebateRes
 
   // --- State ---
   var ws = null;
-  var connected = false;
-  var processing = false;
-  // rateLimitResetsAt, rateLimitResetTimer -> modules/app-rate-limit.js
-  // isComposing -> modules/input.js
-  // wasConnected, reconnectTimer, reconnectDelay, disconnectNotifTimer, disconnectNotifShown -> modules/app-connection.js
-  // activityEl, currentMsgEl, currentFullText, highlightTimer -> modules/app-rendering.js
-  // tools, currentThinking -> modules/tools.js
-  var activeSessionId = null;
-  var sessionDrafts = {};
+  // connected, processing, activeSessionId, sessionDrafts -> store
   // loopActive, loopAvailable, loopIteration, loopMaxIterations, loopBannerName,
   // ralphPhase, ralphCraftingSessionId, ralphCraftingSource, ralphFilesReady, ralphPreviewContent -> modules/app-loop-ui.js
   // wizardStep, wizardSource, wizardData, loopModeChoice, promptAuthor, judgeAuthor -> modules/app-loop-wizard.js
-  var slashCommands = [];
-  // slashActiveIdx, slashFiltered, pendingImages, pendingPastes -> modules/input.js
-  // pendingPermissions -> modules/tools.js
-  var cliSessionId = null;
-  var projectName = "";
+  // slashCommands, cliSessionId -> store
+  var projectName = ""; // kept for pre-store localStorage init
   // turnCounter -> modules/app-rendering.js
 
   // Restore cached project name and icon for instant display (before WS connects)
@@ -257,13 +237,7 @@ import { initDebate, handleDebatePreparing, handleDebateStarted, handleDebateRes
       }
     }
   } catch (e) {}
-  var messageUuidMap = [];
-  // pendingRewindUuid is now in modules/rewind.js
-  // rewindMode is now in modules/rewind.js
-
-  // --- Progressive history loading ---
-  var historyFrom = 0;
-  var historyTotal = 0;
+  // messageUuidMap, historyFrom, historyTotal -> store
   // prependAnchor, replayingHistory, isUserScrolledUp, scrollThreshold -> modules/app-rendering.js
   var loadingMore = false;
   // historySentinelObserver -> modules/app-header.js
@@ -279,12 +253,91 @@ import { initDebate, handleDebatePreparing, handleDebateStarted, handleDebateRes
   function showConfirm(text, onConfirm, okLabel, destructive) { _miscShowConfirm(text, onConfirm, okLabel, destructive); }
   function hideConfirm() { _miscHideConfirm(); }
 
+  // --- Initialize store (single source of truth for client state) ---
+  createStore({
+    // session / routing
+    basePath: basePath,
+    wsPath: wsPath,
+    dmMode: false,
+    historyFrom: 0,
+    historyTotal: 0,
+    replayingHistory: false,
+    projectName: projectName,
+    currentSlug: currentSlug,
+    currentProjectOwnerId: null,
+    isOsUsers: false,
+    skipPermsEnabled: false,
+    slashCommands: [],
+    processing: false,
+    activeSessionId: null,
+    cliSessionId: null,
+    isHeadlessMode: false,
+    savedMainSlug: null,
+    connected: false,
+    // dm
+    dmTargetUser: null,
+    dmKey: null,
+    cachedMatesList: [],
+    cachedDmFavorites: [],
+    cachedAvailableBuiltins: [],
+    returningFromMateDm: false,
+    pendingMateInterview: null,
+    pendingTermCommand: null,
+    mateProjectSlug: null,
+    myUserId: null,
+    isMultiUserMode: false,
+    dmUnread: {},
+    dmRemovedUsers: {},
+    cachedAllUsers: [],
+    cachedOnlineIds: [],
+    cachedDmConversations: [],
+    sessionDrafts: {},
+    messageUuidMap: [],
+    // rendering
+    currentMsgTs: null,
+    richContextUsage: null,
+    currentMsgEl: null,
+    currentFullText: "",
+    matePreThinkingEl: null,
+    // panels
+    currentModel: "",
+    currentModels: [],
+    currentMode: "default",
+    currentEffort: "medium",
+    currentBetas: [],
+    currentThinking: "adaptive",
+    currentThinkingBudget: 10000,
+    ctxPopoverVisible: false,
+    headerContextEl: null,
+    // loop
+    loopActive: false,
+    loopAvailable: false,
+    loopIteration: 0,
+    loopMaxIterations: 0,
+    loopBannerName: null,
+    ralphPhase: "idle",
+    ralphCraftingSessionId: null,
+    ralphCraftingSource: null,
+    ralphFilesReady: { promptReady: false, judgeReady: false, bothReady: false },
+    ralphPreviewContent: { prompt: "", judge: "" },
+    execModalShown: false,
+    // debate
+    debateStickyState: null,
+    debateFloorMode: false,
+    debateConcludeMode: false,
+    debateEndedMode: false,
+    // skills
+    knownInstalledSkills: {},
+    // loop wizard
+    wizardData: { name: "", task: "", maxIterations: null, cron: null }
+  });
+
   // --- Rewind (module) ---
   initRewind({
     $: $,
     get ws() { return ws; },
-    get connected() { return connected; },
-    get processing() { return processing; },
+    get connected() { return store.getState().connected; },
+    get processing() { return store.getState().processing; },
     messagesEl: messagesEl,
     addSystemMessage: addSystemMessage,
   });
@@ -302,8 +355,8 @@ import { initDebate, handleDebatePreparing, handleDebateStarted, handleDebateRes
   var sidebarCtx = {
     $: $,
     get ws() { return ws; },
-    get connected() { return connected; },
-    get projectName() { return projectName; },
+    get connected() { return store.getState().connected; },
+    get projectName() { return store.getState().projectName; },
     messagesEl: messagesEl,
     sessionListEl: sessionListEl,
     sidebar: sidebar,
@@ -322,18 +375,18 @@ import { initDebate, handleDebatePreparing, handleDebateStarted, handleDebateRes
     showHomeHub: function () { showHomeHub(); },
     openRalphWizard: function (source) { openRalphWizard(source); },
     getUpcomingSchedules: getUpcomingSchedules,
-    get multiUser() { return isMultiUserMode; },
-    get myUserId() { return myUserId; },
-    get projectOwnerId() { return currentProjectOwnerId; },
+    get multiUser() { return store.getState().isMultiUserMode; },
+    get myUserId() { return store.getState().myUserId; },
+    get projectOwnerId() { return store.getState().currentProjectOwnerId; },
     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) { dmRemovedUsers[userId] = true; },
-    getHistoryFrom: function () { return historyFrom; },
+    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; },
     get projectList() { return getCachedProjects() || []; },
-    availableBuiltins: function () { return cachedAvailableBuiltins || []; },
+    availableBuiltins: function () { return store.getState().cachedAvailableBuiltins || []; },
   };
   initSidebar(sidebarCtx);
   var wsGetter = function () { return ws; };
@@ -347,13 +400,13 @@ import { initDebate, handleDebatePreparing, handleDebateStarted, handleDebateRes
 
   initCommandPalette({
     switchProject: function (slug) { switchProject(slug); },
-    currentSlug: function () { return currentSlug; },
+    currentSlug: function () { return store.getState().currentSlug; },
     projectList: function () { return getCachedProjects() || []; },
-    matesList: function () { return cachedMatesList || []; },
-    availableBuiltins: function () { return cachedAvailableBuiltins || []; },
-    allUsers: function () { return cachedAllUsers || []; },
-    dmConversations: function () { return cachedDmConversations || []; },
-    myUserId: function () { return myUserId; },
+    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; },
     selectSession: function (id) {
       // Close any open panels before switching
       if (isSchedulerOpen()) closeScheduler();
@@ -408,8 +461,7 @@ import { initDebate, handleDebatePreparing, handleDebateStarted, handleDebateRes
   // currentModels, currentModel, currentMode, currentEffort, currentBetas,
   // currentThinking, currentThinkingBudget, sessionUsage, contextData,
   // headerContextEl, richContextUsage, ctxPopoverVisible -> modules/app-panels.js
-  var skipPermsEnabled = false;
-  var isOsUsers = false;
+  // skipPermsEnabled, isOsUsers -> store
 
   function updateConfigChip() { _panUpdateConfigChip(); }
   function getModelEffortLevels() { return _panGetModelEffortLevels(); }
@@ -479,11 +531,7 @@ import { initDebate, handleDebatePreparing, handleDebateStarted, handleDebateRes
   function forceScrollToBottom() { _renForceScrollToBottom(); }
 
   // --- Misc module (modals, PWA, extension bridge, force PIN) ---
-  initMisc({
-    $: $,
-    getWs: function () { return ws; },
-    updateBrowserTabList: updateBrowserTabList,
-  });
+  initMisc();
 
   // --- Favicon module ---
   initFavicon({
@@ -495,10 +543,10 @@ import { initDebate, handleDebatePreparing, handleDebateStarted, handleDebateRes
     scrollToBottom: scrollToBottom,
     getActivityEl: getActivityEl,
     setActivityEl: setActivityEl,
-    get connected() { return connected; },
-    get dmMode() { return dmMode; },
-    get dmTargetUser() { return dmTargetUser; },
-    get currentSlug() { return currentSlug; },
+    get connected() { return store.getState().connected; },
+    get dmMode() { return store.getState().dmMode; },
+    get dmTargetUser() { return store.getState().dmTargetUser; },
+    get currentSlug() { return store.getState().currentSlug; },
   });
 
   // --- Header module (rename, info popover, history) ---
@@ -509,17 +557,19 @@ import { initDebate, handleDebatePreparing, handleDebateStarted, handleDebateRes
     headerRenameBtn: headerRenameBtn,
     headerInfoBtn: $("header-info-btn"),
     getWs: function () { return ws; },
-    get connected() { return connected; },
-    get activeSessionId() { return activeSessionId; },
-    get cliSessionId() { return cliSessionId; },
-    get historyFrom() { return historyFrom; },
-    set historyFrom(v) { historyFrom = v; },
+    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: getCurrentMsgEl, setCurrentMsgEl: setCurrentMsgEl,
+    getCurrentMsgEl: function () { return store.getState().currentMsgEl; },
+    setCurrentMsgEl: function (v) { store.setState({ currentMsgEl: v }); },
     getActivityEl: getActivityEl, setActivityEl: setActivityEl,
-    getCurrentFullText: getCurrentFullText, setCurrentFullText: setCurrentFullText,
+    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,
@@ -533,60 +583,19 @@ import { initDebate, handleDebatePreparing, handleDebateStarted, handleDebateRes
   });
 
   // --- Skill Install module ---
-  initSkillInstall({
-    get basePath() { return basePath; },
-  });
+  initSkillInstall();
 
   // --- Debate UI module ---
-  initDebateUi({
-    getWs: function () { return ws; },
-    inputEl: inputEl,
-    messagesEl: messagesEl,
-    scrollToBottom: scrollToBottom,
-    exportDebateAsPdf: exportDebateAsPdf,
-  });
-
-  // --- Loop UI module ---
-  var loopUiCtx = {
-    getWs: function () { return ws; },
-    get activeSessionId() { return activeSessionId; },
-    get basePath() { return basePath; },
-    showConfirm: showConfirm,
-    requireSkills: requireSkills,
-    openSchedulerToTab: openSchedulerToTab,
-    openRalphWizard: openRalphWizard,
-    showDebateSticky: showDebateSticky,
-    get debateStickyState() { return getDebateStickyState(); },
-    getWizardData: function () { return getWizardData(); },
-    getExecModalShown: function () { return getExecModalShown(); },
-    setExecModalShown: function (v) { setExecModalShown(v); },
-  };
-  initLoopUi(loopUiCtx);
+  initDebateUi();
 
-  initLoopWizard({
-    getWs: function () { return ws; },
-    requireSkills: requireSkills,
-    setExecModalShown: function (v) { setExecModalShown(v); },
-  });
+  initLoopUi();
+  initLoopWizard();
 
   // --- Notifications module ---
-  initAppNotifications({
-    getWs: function () { return ws; },
-    openDm: function (mateId) { if (typeof openDm === "function") openDm(mateId); },
-    getCachedProjects: function () { return getCachedProjects(); },
-    getActiveSessionId: function () { return activeSessionId; },
-    getCurrentSlug: function () { return currentSlug; },
-    switchProject: function (s) { if (typeof switchProject === "function") switchProject(s); },
-  });
+  initAppNotifications();
 
   // --- Panels module ---
-  initPanels({
-    $: $,
-    getWs: function () { return ws; },
-    get skipPermsEnabled() { return skipPermsEnabled; },
-    getReplayingHistory: function () { return getReplayingHistory(); },
-    refreshIcons: refreshIcons,
-  });
+  initPanels();
 
   // --- Rendering module ---
   initRendering({
@@ -615,18 +624,18 @@ import { initDebate, handleDebatePreparing, handleDebateStarted, handleDebateRes
     openTerminal: function () { openTerminal(); },
     getChatLayout: getChatLayout,
     getWs: function () { return ws; },
-    getDmTargetUser: function () { return dmTargetUser; },
-    setPendingTermCommand: function (v) { pendingTermCommand = v; },
-    getProcessing: function () { return processing; },
-    get myUserId() { return myUserId; },
-    get cachedAllUsers() { return cachedAllUsers; },
+    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; },
   });
 
   // --- Tools module ---
   initTools({
     $: $,
     get ws() { return ws; },
-    get connected() { return connected; },
+    get connected() { return store.getState().connected; },
     get turnCounter() { return getTurnCounter(); },
     messagesEl: messagesEl,
     inputEl: inputEl,
@@ -640,14 +649,15 @@ import { initDebate, handleDebatePreparing, handleDebateStarted, handleDebateRes
       var cd = getContextData();
       return cd.contextWindow > 0 ? Math.round((cd.input / cd.contextWindow) * 100) : 0;
     },
-    isMateDm: function () { return dmMode && dmTargetUser && dmTargetUser.isMate; },
-    getMateName: function () { return dmTargetUser ? (dmTargetUser.displayName || "Mate") : "Mate"; },
+    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"; },
     getMateAvatarUrl: function () { return document.body.dataset.mateAvatarUrl || ""; },
     getClaudeAvatar: function () { return CLAUDE_CODE_AVATAR; },
     getMateById: function (id) {
-      if (!id || !cachedMatesList) return null;
-      for (var i = 0; i < cachedMatesList.length; i++) {
-        if (cachedMatesList[i].id === id) return cachedMatesList[i];
+      var ml = store.getState().cachedMatesList;
+      if (!id || !ml) return null;
+      for (var i = 0; i < ml.length; i++) {
+        if (ml[i].id === id) return ml[i];
       }
       return null;
     },
@@ -670,8 +680,7 @@ import { initDebate, handleDebatePreparing, handleDebateStarted, handleDebateRes
   function addConflictMessage(msg) { _renAddConflictMessage(msg); }
   function addContextOverflowMessage(msg) { _renAddContextOverflowMessage(msg); }
 
-  // Pending command to run in the next created terminal
-  var pendingTermCommand = null;
+  // pendingTermCommand -> store
 
   function addAuthRequiredMessage(msg) { _renAddAuthRequiredMessage(msg); }
 
@@ -696,14 +705,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 !== currentSlug) {
+    if (newSlug && newSlug !== store.getState().currentSlug) {
       resetFileBrowser();
       closeArchive();
       if (isSchedulerOpen()) closeScheduler();
       resetScheduler(newSlug);
-      currentSlug = newSlug;
+      store.setState({ currentSlug: newSlug });
       basePath = "/p/" + newSlug + "/";
       wsPath = "/p/" + newSlug + "/ws";
+      store.setState({ basePath: basePath, wsPath: wsPath });
       resetClientState();
       connect();
     }
@@ -728,16 +738,16 @@ import { initDebate, handleDebatePreparing, handleDebateStarted, handleDebateRes
   // --- Input module (sendMessage, autoResize, paste/image, slash menu, input handlers) ---
   initInput({
     get ws() { return ws; },
-    get connected() { return connected; },
-    get processing() { return processing; },
+    get connected() { return store.getState().connected; },
+    get processing() { return store.getState().processing; },
     get basePath() { return basePath; },
     inputEl: inputEl,
     sendBtn: sendBtn,
     slashMenu: slashMenu,
     messagesEl: messagesEl,
     imagePreviewBar: imagePreviewBar,
-    slashCommands: function() { return slashCommands; },
-    messageUuidMap: function() { return messageUuidMap; },
+    slashCommands: function() { return store.getState().slashCommands; },
+    messageUuidMap: function() { return store.getState().messageUuidMap; },
     addUserMessage: addUserMessage,
     addSystemMessage: addSystemMessage,
     toggleUsagePanel: toggleUsagePanel,
@@ -747,18 +757,18 @@ import { initDebate, handleDebatePreparing, handleDebateStarted, handleDebateRes
     showImageModal: showImageModal,
     hideSuggestionChips: hideSuggestionChips,
     setSendBtnMode: setSendBtnMode,
-    isDmMode: function () { return dmMode && !(dmTargetUser && dmTargetUser.isMate); },
-    getDmKey: function () { return dmKey; },
+    isDmMode: function () { return store.getState().dmMode && !(store.getState().dmTargetUser && store.getState().dmTargetUser.isMate); },
+    getDmKey: function () { return store.getState().dmKey; },
     handleDmSend: function () { handleDmSend(); },
-    isDebateEndedMode: function () { return getDebateEndedMode(); },
+    isDebateEndedMode: function () { return store.getState().debateEndedMode; },
     handleDebateEndedSend: function () { handleDebateEndedSend(); },
-    isDebateConcludeMode: function () { return getDebateConcludeMode(); },
+    isDebateConcludeMode: function () { return store.getState().debateConcludeMode; },
     handleDebateConcludeSend: function () { handleDebateConcludeSend(); },
-    isDebateFloorMode: function () { return getDebateFloorMode(); },
+    isDebateFloorMode: function () { return store.getState().debateFloorMode; },
     handleDebateFloorSend: function () { handleDebateFloorSend(); },
-    isMateDm: function () { return dmMode && dmTargetUser && dmTargetUser.isMate; },
-    getDmMateId: function () { return (dmMode && dmTargetUser && dmTargetUser.isMate) ? dmTargetUser.id : null; },
-    getMateName: function () { return dmTargetUser ? (dmTargetUser.displayName || "Mate") : "Mate"; },
+    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"; },
     getMateAvatarUrl: function () { return document.body.dataset.mateAvatarUrl || ""; },
     showMatePreThinking: function () { showMatePreThinking(); },
     showClaudePreThinking: function () { showClaudePreThinking(); },
@@ -767,11 +777,11 @@ import { initDebate, handleDebatePreparing, handleDebateStarted, handleDebateRes
   // --- @Mention module ---
   initMention({
     get ws() { return ws; },
-    get connected() { return connected; },
+    get connected() { return store.getState().connected; },
     inputEl: inputEl,
     messagesEl: messagesEl,
-    matesList: function () { return cachedMatesList || []; },
-    availableBuiltins: function () { return cachedAvailableBuiltins || []; },
+    matesList: function () { return store.getState().cachedMatesList || []; },
+    availableBuiltins: function () { return store.getState().cachedAvailableBuiltins || []; },
     scrollToBottom: scrollToBottom,
     addUserMessage: addUserMessage,
     addCopyHandler: addCopyHandler,
@@ -788,9 +798,9 @@ import { initDebate, handleDebatePreparing, handleDebateStarted, handleDebateRes
     addToMessages: function (el) { addToMessages(el); },
     scrollToBottom: scrollToBottom,
     addCopyHandler: addCopyHandler,
-    matesList: function () { return cachedMatesList || []; },
-    availableBuiltins: function () { return cachedAvailableBuiltins || []; },
-    currentMateId: function () { return (dmTargetUser && dmTargetUser.isMate) ? dmTargetUser.id : null; },
+    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; },
     requireSkills: requireSkills,
     showDebateEndedMode: function (msg) { showDebateEndedMode(msg); },
   });
@@ -816,20 +826,18 @@ import { initDebate, handleDebatePreparing, handleDebateStarted, handleDebateRes
   function showForceChangePinOverlay() { _miscShowForceChangePinOverlay(); }
 
   // --- Admin (multi-user mode) ---
-  var isMultiUserMode = false;
-  var isHeadlessMode = false;
-  var myUserId = null;
+  // isMultiUserMode, isHeadlessMode, myUserId -> store
   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) isMultiUserMode = true;
-    if (d.user && d.user.id) myUserId = d.user.id;
+    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.mustChangePin) showForceChangePinOverlay();
     // Single-user mode: clear user strip skeletons immediately (no presence message will arrive)
-    if (!isMultiUserMode) {
+    if (!store.getState().isMultiUserMode) {
       var usersContainer = document.getElementById("icon-strip-users");
       if (usersContainer) {
         usersContainer.innerHTML = "";
@@ -869,7 +877,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 (isMultiUserMode && !isAdmin) {
+    if (store.getState().isMultiUserMode && !isAdmin) {
       var settingsBtn = document.getElementById("server-settings-btn");
       if (settingsBtn) settingsBtn.style.display = "none";
       var updatePill = document.getElementById("update-pill-wrap");
@@ -881,7 +889,7 @@ import { initDebate, handleDebatePreparing, handleDebateStarted, handleDebateRes
   initNotifications({
     $: $,
     get ws() { return ws; },
-    get connected() { return connected; },
+    get connected() { return store.getState().connected; },
     messagesEl: messagesEl,
     sessionListEl: sessionListEl,
     scrollToBottom: scrollToBottom,
@@ -893,17 +901,17 @@ import { initDebate, handleDebatePreparing, handleDebateStarted, handleDebateRes
   // --- Server Settings ---
   initServerSettings({
     get ws() { return ws; },
-    get projectName() { return projectName; },
-    get currentSlug() { return currentSlug; },
+    get projectName() { return store.getState().projectName; },
+    get currentSlug() { return store.getState().currentSlug; },
     wsPath: wsPath,
-    get currentModels() { return getCurrentModels(); },
-    set currentModels(v) { setCurrentModels(v); updateConfigChip(); },
-    get currentModel() { return getCurrentModel(); },
-    get currentMode() { return getCurrentMode(); },
-    get currentEffort() { return getCurrentEffort(); },
-    get currentBetas() { return getCurrentBetas(); },
-    get currentThinking() { return getCurrentThinking(); },
-    get currentThinkingBudget() { return getCurrentThinkingBudget(); },
+    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; },
     setContextView: function (v) { _panSetContextView(v); },
     applyContextView: function (v) { _panApplyContextView(v); },
   });
@@ -911,14 +919,14 @@ import { initDebate, handleDebatePreparing, handleDebateStarted, handleDebateRes
   // --- Project Settings ---
   initProjectSettings({
     get ws() { return ws; },
-    get connected() { return connected; },
-    get currentModels() { return getCurrentModels(); },
-    get currentModel() { return getCurrentModel(); },
-    get currentMode() { return getCurrentMode(); },
-    get currentEffort() { return getCurrentEffort(); },
-    get currentBetas() { return getCurrentBetas(); },
-    get currentThinking() { return getCurrentThinking(); },
-    get currentThinkingBudget() { return getCurrentThinkingBudget(); },
+    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; },
   }, getEmojiCategories());
 
   // --- QR code ---
@@ -929,8 +937,8 @@ import { initDebate, handleDebatePreparing, handleDebateStarted, handleDebateRes
   // --- File browser ---
   initFileBrowser({
     get ws() { return ws; },
-    get connected() { return connected; },
-    get activeSessionId() { return activeSessionId; },
+    get connected() { return store.getState().connected; },
+    get activeSessionId() { return store.getState().activeSessionId; },
     messagesEl: messagesEl,
     fileTreeEl: $("file-tree"),
     fileViewerEl: $("file-viewer"),
@@ -939,7 +947,7 @@ import { initDebate, handleDebatePreparing, handleDebateStarted, handleDebateRes
   // --- Terminal ---
   initTerminal({
     get ws() { return ws; },
-    get connected() { return connected; },
+    get connected() { return store.getState().connected; },
     terminalContainerEl: $("terminal-container"),
     terminalBodyEl: $("terminal-body"),
     fileViewerEl: $("file-viewer"),
@@ -948,7 +956,7 @@ import { initDebate, handleDebatePreparing, handleDebateStarted, handleDebateRes
   // --- Context Sources ---
   initContextSources({
     get ws() { return ws; },
-    get connected() { return connected; },
+    get connected() { return store.getState().connected; },
   });
 
   // --- Chrome Extension Bridge -> modules/app-misc.js
@@ -977,7 +985,7 @@ import { initDebate, handleDebatePreparing, handleDebateStarted, handleDebateRes
   initSessionSearch({
     messagesEl: messagesEl,
     get ws() { return ws; },
-    getHistoryFrom: function () { return historyFrom; },
+    getHistoryFrom: function () { return store.getState().historyFrom; },
   });
   var findInSessionBtn = $("find-in-session-btn");
   if (findInSessionBtn) {
@@ -989,7 +997,7 @@ import { initDebate, handleDebatePreparing, handleDebateStarted, handleDebateRes
   // --- Sticky Notes ---
   initStickyNotes({
     get ws() { return ws; },
-    get connected() { return connected; },
+    get connected() { return store.getState().connected; },
   });
 
   // --- Sticky Notes sidebar button (archive view) ---
@@ -1043,7 +1051,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 !== myUserId };
+        return { text: m.text, isMate: m.from !== store.getState().myUserId };
       });
       openDebateModal({ dmContext: contextMessages });
     });
@@ -1075,7 +1083,7 @@ import { initDebate, handleDebatePreparing, handleDebateStarted, handleDebateRes
   // --- Skills ---
   initSkills({
     get ws() { return ws; },
-    get connected() { return connected; },
+    get connected() { return store.getState().connected; },
     basePath: basePath,
     openTerminal: function () { openTerminal(); },
     sendTerminalCommand: function (cmd) { sendTerminalCommand(cmd); },
@@ -1084,10 +1092,10 @@ import { initDebate, handleDebatePreparing, handleDebateStarted, handleDebateRes
   // --- Scheduler ---
   initScheduler({
     get ws() { return ws; },
-    get connected() { return connected; },
-    get activeSessionId() { return activeSessionId; },
+    get connected() { return store.getState().connected; },
+    get activeSessionId() { return store.getState().activeSessionId; },
     basePath: basePath,
-    currentSlug: currentSlug,
+    currentSlug: currentSlug, // init-time snapshot, scheduler uses for initial setup
     openRalphWizard: function (source) { openRalphWizard(source); },
     requireClayRalph: function (cb) {
       requireSkills({
@@ -1123,22 +1131,11 @@ import { initDebate, handleDebatePreparing, handleDebateStarted, handleDebateRes
     messagesEl: messagesEl,
     registerTooltip: registerTooltip,
     get ws() { return ws; },
-    get isMultiUserMode() { return isMultiUserMode; },
+    get isMultiUserMode() { return store.getState().isMultiUserMode; },
   });
 
   // --- Rate Limit module ---
-  initRateLimit({
-    iconHtml: iconHtml,
-    refreshIcons: refreshIcons,
-    addToMessages: addToMessages,
-    scrollToBottom: scrollToBottom,
-    userAvatarUrl: userAvatarUrl,
-    setScheduleDelayMs: setScheduleDelayMs,
-    clearScheduleDelay: clearScheduleDelay,
-    get ws() { return ws; },
-    get cachedAllUsers() { return cachedAllUsers; },
-    get myUserId() { return myUserId; },
-  });
+  initRateLimit();
 
   // --- Projects module ---
   initProjects({
@@ -1159,8 +1156,8 @@ import { initDebate, handleDebatePreparing, handleDebateStarted, handleDebateRes
     spawnDustParticles: spawnDustParticles,
     getStatusDot: getStatusDot,
     // Rendering state accessors
-    setCurrentMsgEl: setCurrentMsgEl,
-    setCurrentFullText: setCurrentFullText,
+    setCurrentMsgEl: function (v) { store.setState({ currentMsgEl: v }); },
+    setCurrentFullText: function (v) { store.setState({ currentFullText: v }); },
     setTurnCounter: setTurnCounter,
     setPrependAnchor: setPrependAnchor,
     setActivityEl: setActivityEl,
@@ -1193,42 +1190,42 @@ import { initDebate, handleDebatePreparing, handleDebateStarted, handleDebateRes
     connect: function () { connect(); },
     cancelReconnect: function () { _connCancelReconnect(); },
     getWs: function () { return ws; },
-    setWs: function (v) { ws = v; },
-    setConnected: function (v) { connected = v; },
-    setProcessing: function (v) { processing = v; },
-    setCurrentSlug: function (v) { currentSlug = v; },
+    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) { messageUuidMap = v; },
-    setHistoryFrom: function (v) { historyFrom = v; },
-    setHistoryTotal: function (v) { historyTotal = 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 _panGetHeaderContextEl(); },
-    setHeaderContextEl: function (v) { _panSetHeaderContextEl(v); },
-    setDebateStickyState: function (v) { setDebateStickyState(v); },
-    setCachedOnlineIds: function (v) { cachedOnlineIds = v; },
-    setCachedAllUsers: function (v) { cachedAllUsers = v; },
-    setCachedDmFavorites: function (v) { cachedDmFavorites = v; },
-    setCachedDmConversations: function (v) { cachedDmConversations = v; },
-    get currentSlug() { return currentSlug; },
-    get connected() { return connected; },
-    get processing() { return processing; },
-    get loopActive() { return getLoopActive(); },
-    get dmMode() { return dmMode; },
-    get dmTargetUser() { return dmTargetUser; },
-    get activeSessionId() { return activeSessionId; },
-    get isHeadlessMode() { return isHeadlessMode; },
-    get isOsUsers() { return isOsUsers; },
-    get mateProjectSlug() { return mateProjectSlug; },
-    get savedMainSlug() { return savedMainSlug; },
-    get myUserId() { return myUserId; },
-    get cachedAllUsers() { return cachedAllUsers; },
-    get cachedOnlineIds() { return cachedOnlineIds; },
-    get cachedDmFavorites() { return cachedDmFavorites; },
-    get cachedDmConversations() { return cachedDmConversations; },
-    get dmUnread() { return dmUnread; },
-    get dmRemovedUsers() { return dmRemovedUsers; },
-    get cachedMatesList() { return cachedMatesList; },
+    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; },
   });
 
   // --- Home Hub module ---
@@ -1244,11 +1241,11 @@ import { initDebate, handleDebatePreparing, handleDebateStarted, handleDebateRes
     openPlaybook: openPlaybook,
     getPlaybookForTip: getPlaybookForTip,
     renderProjectList: renderProjectList,
-    get dmMode() { return dmMode; },
+    get dmMode() { return store.getState().dmMode; },
     get ws() { return ws; },
-    get currentSlug() { return currentSlug; },
+    get currentSlug() { return store.getState().currentSlug; },
     get cachedProjects() { return getCachedProjects(); },
-    get cachedMatesList() { return cachedMatesList; },
+    get cachedMatesList() { return store.getState().cachedMatesList; },
   });
 
   // --- DM module ---
@@ -1284,393 +1281,43 @@ import { initDebate, handleDebatePreparing, handleDebateStarted, handleDebateRes
     messagesEl: messagesEl,
     inputEl: inputEl,
   };
-  // Mutable state for DM module
-  var _dmStateProps = {
-    ws: function() { return ws; },
-    dmMode: function() { return dmMode; }, _dmMode: function(v) { dmMode = v; },
-    dmKey: function() { return dmKey; }, _dmKey: function(v) { dmKey = v; },
-    dmTargetUser: function() { return dmTargetUser; }, _dmTargetUser: function(v) { dmTargetUser = v; },
-    dmMessageCache: function() { return dmMessageCache; }, _dmMessageCache: function(v) { dmMessageCache = v; },
-    dmUnread: function() { return dmUnread; },
-    dmRemovedUsers: function() { return dmRemovedUsers; },
-    cachedAllUsers: function() { return cachedAllUsers; },
-    cachedOnlineIds: function() { return cachedOnlineIds; },
-    cachedDmFavorites: function() { return cachedDmFavorites; }, _cachedDmFavorites: function(v) { cachedDmFavorites = v; },
-    cachedDmConversations: function() { return cachedDmConversations; },
-    cachedMatesList: function() { return cachedMatesList; },
-    cachedAvailableBuiltins: function() { return cachedAvailableBuiltins; }, _cachedAvailableBuiltins: function(v) { cachedAvailableBuiltins = v; },
-    cachedProjects: function() { return getCachedProjects(); },
-    mateProjectSlug: function() { return mateProjectSlug; }, _mateProjectSlug: function(v) { mateProjectSlug = v; },
-    savedMainSlug: function() { return savedMainSlug; }, _savedMainSlug: function(v) { savedMainSlug = v; },
-    returningFromMateDm: function() { return returningFromMateDm; }, _returningFromMateDm: function(v) { returningFromMateDm = v; },
-    pendingMateInterview: function() { return pendingMateInterview; }, _pendingMateInterview: function(v) { pendingMateInterview = v; },
-    currentSlug: function() { return currentSlug; }, _currentSlug: function(v) { currentSlug = v; },
-    wsPath: function() { return wsPath; }, _wsPath: function(v) { wsPath = v; },
-    basePath: function() { return basePath; }, _basePath: function(v) { basePath = v; },
-    activeSessionId: function() { return activeSessionId; },
-    myUserId: function() { return myUserId; },
-  };
-  Object.keys(_dmStateProps).forEach(function(key) {
-    if (key.charAt(0) === "_") return;
-    var getter = _dmStateProps[key];
-    var setter = _dmStateProps["_" + key];
-    var desc = { get: getter, enumerable: true };
-    if (setter) desc.set = setter;
-    Object.defineProperty(_dmCtx, key, desc);
+  // 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);
 
-  // --- Messages module ---
-  var _msgCtx = {
-    // DOM refs
-    messagesEl: messagesEl,
-    headerTitleEl: headerTitleEl,
-    inputEl: inputEl,
-    connectOverlay: connectOverlay,
-    $: $,
-    // Functions - sidebar/session
-    renderMateSessionList: renderMateSessionList,
-    refreshMobileChatSheet: refreshMobileChatSheet,
-    handleMateSearchResults: handleMateSearchResults,
-    renderKnowledgeList: renderKnowledgeList,
-    handleKnowledgeContent: handleKnowledgeContent,
-    renderMemoryList: renderMemoryList,
-    updateMateSidebarProfile: updateMateSidebarProfile,
-    renderSessionList: renderSessionList,
-    handlePaletteSessionSwitch: handlePaletteSessionSwitch,
-    updateSessionPresence: updateSessionPresence,
-    populateCliSessionList: populateCliSessionList,
-    handleSearchResults: handleSearchResults,
-    handleFindInSessionResults: handleFindInSessionResults,
-    blinkSessionDot: blinkSessionDot,
-    updateSessionBadge: updateSessionBadge,
-    updatePageTitle: updatePageTitle,
-    setPaletteVersion: setPaletteVersion,
-    hideHomeHub: hideHomeHub,
-    clearRemoteCursors: clearRemoteCursors,
-    resetClientState: resetClientState,
-    // Functions - rendering
-    scrollToBottom: scrollToBottom,
-    addToMessages: addToMessages,
-    addUserMessage: addUserMessage,
-    addSystemMessage: addSystemMessage,
-    renderMarkdown: renderMarkdown,
-    refreshIcons: refreshIcons,
-    iconHtml: iconHtml,
-    showImageModal: showImageModal,
-    showToast: showToast,
-    autoResize: autoResize,
-    // Functions - tools/thinking
-    startThinking: startThinking,
-    appendThinking: appendThinking,
-    stopThinking: stopThinking,
-    resetThinkingGroup: resetThinkingGroup,
-    removeMatePreThinking: removeMatePreThinking,
-    appendDelta: appendDelta,
-    createToolItem: createToolItem,
-    updateToolExecuting: updateToolExecuting,
-    updateToolResult: updateToolResult,
-    markAllToolsDone: markAllToolsDone,
-    closeToolGroup: closeToolGroup,
-    removeToolFromGroup: removeToolFromGroup,
-    resetToolState: resetToolState,
-    getTools: getTools,
-    getPlanContent: getPlanContent,
-    setPlanContent: setPlanContent,
-    renderPlanBanner: renderPlanBanner,
-    renderPlanCard: renderPlanCard,
-    getTodoTools: getTodoTools,
-    handleTodoWrite: handleTodoWrite,
-    handleTaskCreate: handleTaskCreate,
-    handleTaskUpdate: handleTaskUpdate,
-    isPlanFilePath: isPlanFilePath,
-    enableMainInput: enableMainInput,
-    addTurnMeta: addTurnMeta,
-    // Functions - subagents
-    updateSubagentActivity: updateSubagentActivity,
-    addSubagentToolEntry: addSubagentToolEntry,
-    markSubagentDone: markSubagentDone,
-    initSubagentStop: initSubagentStop,
-    updateSubagentProgress: updateSubagentProgress,
-    // Functions - permissions/elicitation
-    renderAskUserQuestion: renderAskUserQuestion,
-    markAskUserAnswered: markAskUserAnswered,
-    renderPermissionRequest: renderPermissionRequest,
-    markPermissionCancelled: markPermissionCancelled,
-    markPermissionResolved: markPermissionResolved,
-    renderElicitationRequest: renderElicitationRequest,
-    markElicitationResolved: markElicitationResolved,
-    // Functions - status
-    setStatus: setStatus,
-    setActivity: setActivity,
-    setSendBtnMode: setSendBtnMode,
-    hasSendableContent: hasSendableContent,
-    startUrgentBlink: startUrgentBlink,
-    stopUrgentBlink: stopUrgentBlink,
-    finalizeAssistantBlock: finalizeAssistantBlock,
-    // Functions - usage/context
-    accumulateUsage: accumulateUsage,
-    accumulateContext: accumulateContext,
-    updateContextPanel: updateContextPanel,
-    updateUsagePanel: updateUsagePanel,
-    renderCtxPopover: renderCtxPopover,
-    // Functions - notifications
-    showDoneNotification: showDoneNotification,
-    playDoneSound: playDoneSound,
-    isNotifAlertEnabled: isNotifAlertEnabled,
-    isNotifSoundEnabled: isNotifSoundEnabled,
-    // Functions - filesystem
-    handleFsList: handleFsList,
-    handleFsRead: handleFsRead,
-    isProjectSettingsOpen: isProjectSettingsOpen,
-    handleInstructionsRead: handleInstructionsRead,
-    handleInstructionsWrite: handleInstructionsWrite,
-    handleProjectEnv: handleProjectEnv,
-    handleProjectEnvSaved: handleProjectEnvSaved,
-    handleGlobalClaudeMdRead: handleGlobalClaudeMdRead,
-    handleGlobalClaudeMdWrite: handleGlobalClaudeMdWrite,
-    handleSharedEnv: handleSharedEnv,
-    handleProjectSharedEnv: handleProjectSharedEnv,
-    handleSharedEnvSaved: handleSharedEnvSaved,
-    handleProjectSharedEnvSaved: handleProjectSharedEnvSaved,
-    handleFileChanged: handleFileChanged,
-    handleDirChanged: handleDirChanged,
-    handleFileHistory: handleFileHistory,
-    handleGitDiff: handleGitDiff,
-    handleFileAt: handleFileAt,
-    refreshIfOpen: refreshIfOpen,
-    getPendingNavigate: getPendingNavigate,
-    // Functions - terminals
-    handleTermList: handleTermList,
-    updateTerminalList: updateTerminalList,
-    handleContextSourcesState: handleContextSourcesState,
-    sendExtensionCommand: sendExtensionCommand,
-    handleTermCreated: handleTermCreated,
-    sendTerminalCommand: sendTerminalCommand,
-    handleTermOutput: handleTermOutput,
-    handleTermResized: handleTermResized,
-    handleTermExited: handleTermExited,
-    handleTermClosed: handleTermClosed,
-    // Functions - notes
-    handleNotesList: handleNotesList,
-    handleNoteCreated: handleNoteCreated,
-    handleNoteUpdated: handleNoteUpdated,
-    handleNoteDeleted: handleNoteDeleted,
-    // Functions - projects
-    updateProjectList: updateProjectList,
-    handleBrowseDirResult: handleBrowseDirResult,
-    handleAddProjectResult: handleAddProjectResult,
-    handleCloneProgress: handleCloneProgress,
-    handleRemoveProjectResult: handleRemoveProjectResult,
-    handleRemoveProjectCheckResult: handleRemoveProjectCheckResult,
-    handleProjectOwnerChanged: handleProjectOwnerChanged,
-    // Functions - settings/config
-    updateConfigChip: updateConfigChip,
-    getModelEffortLevels: getModelEffortLevels,
-    updateSettingsModels: updateSettingsModels,
-    updateSettingsStats: updateSettingsStats,
-    updateStatusPanel: updateStatusPanel,
-    updateDaemonConfig: updateDaemonConfig,
-    handleSetPinResult: handleSetPinResult,
-    handleKeepAwakeChanged: handleKeepAwakeChanged,
-    handleAutoContinueChanged: handleAutoContinueChanged,
-    handleRestartResult: handleRestartResult,
-    handleShutdownResult: handleShutdownResult,
-    showUpdateAvailable: showUpdateAvailable,
-    checkAdminAccess: checkAdminAccess,
-    renderSidebarPresence: renderSidebarPresence,
-    // Functions - skills
-    handleSkillInstalled: handleSkillInstalled,
-    handleSkillInstallWs: handleSkillInstallWs,
-    handleSkillUninstalled: handleSkillUninstalled,
-    // Functions - DM
-    enterDmMode: enterDmMode,
-    exitDmMode: exitDmMode,
-    openDm: openDm,
-    appendDmMessage: appendDmMessage,
-    showDmTypingIndicator: showDmTypingIndicator,
-    buildMateInterviewPrompt: buildMateInterviewPrompt,
-    handleMateCreatedInApp: handleMateCreatedInApp,
-    updateMateIconStatus: updateMateIconStatus,
-    updateDmBadge: updateDmBadge,
-    renderUserStrip: renderUserStrip,
-    mateAvatarUrl: mateAvatarUrl,
-    // Functions - mention
-    handleMentionStart: handleMentionStart,
-    handleMentionActivity: handleMentionActivity,
-    handleMentionStream: handleMentionStream,
-    handleMentionDone: handleMentionDone,
-    handleMentionError: handleMentionError,
-    renderMentionUser: renderMentionUser,
-    renderMentionResponse: renderMentionResponse,
-    // Functions - debate
-    showDebateSticky: showDebateSticky,
-    handleDebatePreparing: handleDebatePreparing,
-    handleDebateBriefReady: handleDebateBriefReady,
-    renderDebateBriefReady: renderDebateBriefReady,
-    handleDebateStarted: handleDebateStarted,
-    renderDebateStarted: renderDebateStarted,
-    handleDebateTurn: handleDebateTurn,
-    updateDebateRound: updateDebateRound,
-    handleDebateActivity: handleDebateActivity,
-    handleDebateStream: handleDebateStream,
-    handleDebateTurnDone: handleDebateTurnDone,
-    handleDebateCommentQueued: handleDebateCommentQueued,
-    handleDebateCommentInjected: handleDebateCommentInjected,
-    renderDebateCommentInjected: renderDebateCommentInjected,
-    showDebateConcludeConfirm: showDebateConcludeConfirm,
-    showDebateUserFloor: showDebateUserFloor,
-    renderDebateUserFloorDone: renderDebateUserFloorDone,
-    renderDebateUserResume: renderDebateUserResume,
-    handleDebateResumed: handleDebateResumed,
-    handleDebateEnded: handleDebateEnded,
-    renderDebateEnded: renderDebateEnded,
-    handleDebateError: handleDebateError,
-    isDebateActive: isDebateActive,
-    exitDebateFloorMode: exitDebateFloorMode,
-    exitDebateConcludeMode: exitDebateConcludeMode,
-    exitDebateEndedMode: exitDebateEndedMode,
-    renderMcpDebateProposal: renderMcpDebateProposal,
-    // Functions - loop/ralph
-    updateLoopButton: updateLoopButton,
-    showLoopBanner: showLoopBanner,
-    updateLoopBanner: updateLoopBanner,
-    updateRalphBars: updateRalphBars,
-    updateLoopInputVisibility: updateLoopInputVisibility,
-    showRalphApprovalBar: showRalphApprovalBar,
-    updateRalphApprovalStatus: updateRalphApprovalStatus,
-    openRalphPreviewModal: openRalphPreviewModal,
-    showExecModal: showExecModal,
-    closeExecModal: closeExecModal,
-    updateExecModalStatus: updateExecModalStatus,
-    getExecModalShown: function () { return getExecModalShown(); },
-    setWizardData: function (v) { setWizardData(v); },
-    enterCraftingMode: enterCraftingMode,
-    exitCraftingMode: exitCraftingMode,
-    isSchedulerOpen: isSchedulerOpen,
-    handleLoopRegistryUpdated: handleLoopRegistryUpdated,
-    handleScheduleRunStarted: handleScheduleRunStarted,
-    handleScheduleRunFinished: handleScheduleRunFinished,
-    handleLoopScheduled: handleLoopScheduled,
-    handleHubSchedules: handleHubSchedules,
-    handleLoopRegistryFiles: handleLoopRegistryFiles,
-    // Functions - notifications
-    handleNotificationsState: handleNotificationsState,
-    handleNotificationCreated: handleNotificationCreated,
-    handleNotificationDismissed: handleNotificationDismissed,
-    handleNotificationDismissedAll: handleNotificationDismissedAll,
-    // Functions - input/misc
-    handleInputSync: handleInputSync,
-    handleRateLimitEvent: handleRateLimitEvent,
-    updateRateLimitUsage: updateRateLimitUsage,
-    addScheduledMessageBubble: addScheduledMessageBubble,
-    removeScheduledMessageBubble: removeScheduledMessageBubble,
-    setScheduleBtnDisabled: setScheduleBtnDisabled,
-    showSuggestionChips: showSuggestionChips,
-    handleFastModeState: handleFastModeState,
-    addConflictMessage: addConflictMessage,
-    addContextOverflowMessage: addContextOverflowMessage,
-    addAuthRequiredMessage: addAuthRequiredMessage,
-    // Functions - rewind
-    showRewindModal: showRewindModal,
-    onRewindComplete: onRewindComplete,
-    setRewindMode: setRewindMode,
-    onRewindError: onRewindError,
-    clearPendingRewindUuid: clearPendingRewindUuid,
-    addRewindButton: addRewindButton,
-    // Functions - cursors
-    handleRemoteCursorMove: handleRemoteCursorMove,
-    handleRemoteCursorLeave: handleRemoteCursorLeave,
-    handleRemoteSelection: handleRemoteSelection,
-    // Functions - history
-    updateHistorySentinel: updateHistorySentinel,
-    prependOlderHistory: prependOlderHistory,
-    // Functions - builtinCommands
-    builtinCommands: builtinCommands,
-  };
-  // Add mutable state with live get/set accessors
-  var _msgStateProps = {
-    currentMsgTs: function() { return getCurrentMsgTs(); }, _currentMsgTs: function(v) { setCurrentMsgTs(v); },
-    dmMode: function() { return dmMode; }, _dmMode: function(v) { dmMode = v; },
-    dmTargetUser: function() { return dmTargetUser; },
-    ws: function() { return ws; },
-    historyFrom: function() { return historyFrom; }, _historyFrom: function(v) { historyFrom = v; },
-    historyTotal: function() { return historyTotal; }, _historyTotal: function(v) { historyTotal = v; },
-    replayingHistory: function() { return getReplayingHistory(); }, _replayingHistory: function(v) { setReplayingHistory(v); },
-    richContextUsage: function() { return getRichContextUsage(); }, _richContextUsage: function(v) { setRichContextUsage(v); },
-    projectName: function() { return projectName; }, _projectName: function(v) { projectName = v; },
-    currentSlug: function() { return currentSlug; }, _currentSlug: function(v) { currentSlug = v; },
-    currentProjectOwnerId: function() { return currentProjectOwnerId; }, _currentProjectOwnerId: function(v) { currentProjectOwnerId = v; },
-    isOsUsers: function() { return isOsUsers; }, _isOsUsers: function(v) { isOsUsers = v; },
-    skipPermsEnabled: function() { return skipPermsEnabled; }, _skipPermsEnabled: function(v) { skipPermsEnabled = v; },
-    currentModel: function() { return getCurrentModel(); }, _currentModel: function(v) { setCurrentModel(v); },
-    currentModels: function() { return getCurrentModels(); }, _currentModels: function(v) { setCurrentModels(v); },
-    currentMode: function() { return getCurrentMode(); }, _currentMode: function(v) { setCurrentMode(v); },
-    currentEffort: function() { return getCurrentEffort(); }, _currentEffort: function(v) { setCurrentEffort(v); },
-    currentBetas: function() { return getCurrentBetas(); }, _currentBetas: function(v) { setCurrentBetas(v); },
-    currentThinking: function() { return getCurrentThinking(); }, _currentThinking: function(v) { setCurrentThinking(v); },
-    currentThinkingBudget: function() { return getCurrentThinkingBudget(); }, _currentThinkingBudget: function(v) { setCurrentThinkingBudget(v); },
-    slashCommands: function() { return slashCommands; }, _slashCommands: function(v) { slashCommands = v; },
-    returningFromMateDm: function() { return returningFromMateDm; }, _returningFromMateDm: function(v) { returningFromMateDm = v; },
-    processing: function() { return processing; }, _processing: function(v) { processing = v; },
-    loopActive: function() { return getLoopActive(); }, _loopActive: function(v) { setLoopActive(v); },
-    loopAvailable: function() { return getLoopAvailable(); }, _loopAvailable: function(v) { setLoopAvailable(v); },
-    loopIteration: function() { return getLoopIteration(); }, _loopIteration: function(v) { setLoopIteration(v); },
-    loopMaxIterations: function() { return getLoopMaxIterations(); }, _loopMaxIterations: function(v) { setLoopMaxIterations(v); },
-    loopBannerName: function() { return getLoopBannerName(); }, _loopBannerName: function(v) { setLoopBannerName(v); },
-    ralphPhase: function() { return getRalphPhase(); }, _ralphPhase: function(v) { setRalphPhase(v); },
-    ralphCraftingSessionId: function() { return getRalphCraftingSessionId(); }, _ralphCraftingSessionId: function(v) { setRalphCraftingSessionId(v); },
-    ralphCraftingSource: function() { return getRalphCraftingSource(); }, _ralphCraftingSource: function(v) { setRalphCraftingSource(v); },
-    ralphFilesReady: function() { return getRalphFilesReady(); }, _ralphFilesReady: function(v) { setRalphFilesReady(v); },
-    ralphPreviewContent: function() { return getRalphPreviewContent(); }, _ralphPreviewContent: function(v) { setRalphPreviewContent(v); },
-    pendingMateInterview: function() { return pendingMateInterview; }, _pendingMateInterview: function(v) { pendingMateInterview = v; },
-    pendingTermCommand: function() { return pendingTermCommand; }, _pendingTermCommand: function(v) { pendingTermCommand = v; },
-    activeSessionId: function() { return activeSessionId; }, _activeSessionId: function(v) { activeSessionId = v; },
-    cliSessionId: function() { return cliSessionId; }, _cliSessionId: function(v) { cliSessionId = v; },
-    isHeadlessMode: function() { return isHeadlessMode; }, _isHeadlessMode: function(v) { isHeadlessMode = v; },
-    cachedMatesList: function() { return cachedMatesList; }, _cachedMatesList: function(v) { cachedMatesList = v; },
-    cachedDmFavorites: function() { return cachedDmFavorites; }, _cachedDmFavorites: function(v) { cachedDmFavorites = v; },
-    cachedAvailableBuiltins: function() { return cachedAvailableBuiltins; }, _cachedAvailableBuiltins: function(v) { cachedAvailableBuiltins = v; },
-    // Read-only mutable state (processMessage reads but doesn't reassign)
-    currentMsgEl: function() { return getCurrentMsgEl(); },
-    currentFullText: function() { return getCurrentFullText(); },
-    debateFloorMode: function() { return getDebateFloorMode(); },
-    debateConcludeMode: function() { return getDebateConcludeMode(); },
-    debateEndedMode: function() { return getDebateEndedMode(); },
-    ctxPopoverVisible: function() { return getCtxPopoverVisible(); },
-    headerContextEl: function() { return _panGetHeaderContextEl(); },
-    myUserId: function() { return myUserId; },
-    mateProjectSlug: function() { return mateProjectSlug; },
-    dmKey: function() { return dmKey; },
-    isMultiUserMode: function() { return isMultiUserMode; },
-    sessionDrafts: function() { return sessionDrafts; },
-    messageUuidMap: function() { return messageUuidMap; },
-    knownInstalledSkills: function() { return getKnownInstalledSkills(); },
-    dmUnread: function() { return dmUnread; },
-    dmRemovedUsers: function() { return dmRemovedUsers; },
-    cachedAllUsers: function() { return cachedAllUsers; },
-    cachedOnlineIds: function() { return cachedOnlineIds; },
-    cachedDmConversations: function() { return cachedDmConversations; },
-    matePreThinkingEl: function() { return getMatePreThinkingEl(); },
-  };
-  // Wire up defineProperty for each state var
-  Object.keys(_msgStateProps).forEach(function(key) {
-    if (key.charAt(0) === "_") return; // skip setter helpers
-    var getter = _msgStateProps[key];
-    var setter = _msgStateProps["_" + key];
-    var desc = { get: getter, enumerable: true };
-    if (setter) desc.set = setter;
-    Object.defineProperty(_msgCtx, key, desc);
-  });
-  initMessages(_msgCtx);
+  // --- Messages module (uses direct imports, no ctx injection needed) ---
 
   // --- Connection module ---
   initConnection({
     getWs: function () { return ws; },
-    setWs: function (v) { ws = v; },
-    isConnected: function () { return connected; },
-    setConnected: function (v) { connected = v; },
-    setProcessing: function (v) { processing = v; },
+    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,
@@ -1704,7 +1351,7 @@ import { initDebate, handleDebatePreparing, handleDebateStarted, handleDebateRes
       } catch(e) {}
 
       // If connecting to a mate project, request knowledge list for badge
-      if (mateProjectSlug) {
+      if (store.getState().mateProjectSlug) {
         try { ws.send(JSON.stringify({ type: "knowledge_list" })); } catch(e) {}
       }
 
@@ -1713,9 +1360,9 @@ import { initDebate, handleDebatePreparing, handleDebateStarted, handleDebateRes
       // 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 && !dmMode && !mateProjectSlug) {
+      if (savedDm && !store.getState().dmMode && !store.getState().mateProjectSlug) {
         var dmFallbackTimer = setTimeout(function () {
-          if (!dmMode && savedDm) {
+          if (!store.getState().dmMode && savedDm) {
             console.log("[dm-restore] Server did not restore DM, using localStorage fallback:", savedDm);
             openDm(savedDm);
           }
@@ -1735,10 +1382,10 @@ import { initDebate, handleDebatePreparing, handleDebateStarted, handleDebateRes
         setTimeout(function () { ws.removeEventListener("message", checkRestore); }, 3000);
       }
       // Safety: clear returningFromMateDm after initial messages settle
-      if (returningFromMateDm) {
+      if (store.getState().returningFromMateDm) {
         setTimeout(function () {
-          if (returningFromMateDm) {
-            returningFromMateDm = false;
+          if (store.getState().returningFromMateDm) {
+            store.setState({ returningFromMateDm: false });
           }
         }, 2000);
       }
@@ -1748,7 +1395,7 @@ import { initDebate, handleDebatePreparing, handleDebateStarted, handleDebateRes
   // --- Init ---
   lucide.createIcons();
   connect();
-  if (!currentSlug) {
+  if (!store.getState().currentSlug) {
     showHomeHub();
   } else if (location.hash === "#scheduler") {
     // Restore scheduler view after refresh