clay-server 2.32.0-beta.1 → 2.32.0-beta.11

package/lib/codex-defaults.js

@@ -0,0 +1,18 @@
+var CODEX_DEFAULTS = {
+  approval: "on-failure",
+  sandbox: "danger-full-access",
+  webSearch: "live",
+};
+
+function getCodexConfig(sm) {
+  return {
+    approval: (sm && sm.codexApproval) || CODEX_DEFAULTS.approval,
+    sandbox: (sm && sm.codexSandbox) || CODEX_DEFAULTS.sandbox,
+    webSearch: (sm && sm.codexWebSearch) || CODEX_DEFAULTS.webSearch,
+  };
+}
+
+module.exports = {
+  CODEX_DEFAULTS: CODEX_DEFAULTS,
+  getCodexConfig: getCodexConfig,
+};

package/lib/project-connection.js

@@ -3,6 +3,7 @@ var path = require("path");
 var usersModule = require("./users");
 var userPresence = require("./user-presence");
 var emailAccounts = require("./email-accounts");
+var { getCodexConfig } = require("./codex-defaults");
 
 /**
  * Attach connection/disconnection handlers to a project context.
@@ -84,10 +85,9 @@ function attachConnection(ctx) {
     var project = getProject();
     var ownerLocked = !!(osUsers && osUsers.length > 0 && /^\/home\/[^/]+\//.test(cwd));
     sendTo(ws, { type: "info", cwd: cwd, slug: slug, project: title || project, version: currentVersion, debug: !!debug, dangerouslySkipPermissions: dangerouslySkipPermissions, osUsers: osUsers, lanHost: lanHost, projectCount: _filteredProjects.length, projects: _filteredProjects, projectOwnerId: projectOwnerId, ownerLocked: ownerLocked });
-    var latestVersion = getLatestVersion();
-    if (latestVersion && ws._clayUser && ws._clayUser.role === "admin") {
-      sendTo(ws, { type: "update_available", version: latestVersion });
-    }
+    // Update notifications are pushed on a scheduled interval (see
+    // scheduleUpdateBroadcast). We no longer push on connect to avoid
+    // re-triggering the banner on every page refresh.
     if (sm.slashCommands) {
       sendTo(ws, { type: "slash_commands", commands: sm.slashCommands });
     }
@@ -96,6 +96,7 @@ function attachConnection(ctx) {
       sendTo(ws, { type: "model_info", model: sm.currentModel, models: sm.availableModels || [], vendor: sm.defaultVendor || "claude", availableVendors: sm.availableVendors || [], installedVendors: sm.installedVendors || [] });
     }
     sendTo(ws, { type: "config_state", model: sm.currentModel || "", mode: sm.currentPermissionMode || "default", effort: sm.currentEffort || "medium", betas: sm.currentBetas || [], thinking: sm.currentThinking || "adaptive", thinkingBudget: sm.currentThinkingBudget || 10000 });
+    sendTo(ws, Object.assign({ type: "codex_config" }, getCodexConfig(sm)));
     sendTo(ws, { type: "term_list", terminals: tm.list() });
     // Context sources sent after session is resolved (per-session storage)
     // Send email accounts list for context sources picker

package/lib/project-debate.js

@@ -601,7 +601,9 @@ function attachDebate(ctx) {
     var digests = ctx.loadMateDigests(mateCtx, debate.moderatorId, debate.topic);
 
     var briefText = "";
+    var _modMate = matesModule.getMate(mateCtx, debate.moderatorId);
     ctx.sdk.createMentionSession({
+      vendor: _modMate ? _modMate.vendor : null,
       claudeMd: claudeMd,
       initialContext: digests,
       initialMessage: quickBriefPrompt,
@@ -794,7 +796,9 @@ function attachDebate(ctx) {
     var digests = ctx.loadMateDigests(mateCtx, debate.moderatorId, debate.topic);
     var moderatorContext = buildModeratorContext(debate) + digests;
 
+    var _modMate2 = matesModule.getMate(mateCtx, debate.moderatorId);
     ctx.sdk.createMentionSession({
+      vendor: _modMate2 ? _modMate2.vendor : null,
       claudeMd: claudeMd,
       initialContext: moderatorContext,
       initialMessage: "Begin the debate on: " + debate.topic,
@@ -987,7 +991,9 @@ function attachDebate(ctx) {
         historyContext += "---";
       }
 
+      var _panMate = matesModule.getMate(debate.mateCtx, mateId);
       ctx.sdk.createMentionSession({
+        vendor: _panMate ? _panMate.vendor : null,
         claudeMd: claudeMd,
         initialContext: panelistContext + historyContext,
         initialMessage: "The moderator addresses you:\n\n" + moderatorText,
@@ -1521,7 +1527,9 @@ function attachDebate(ctx) {
         }
         moderatorContext += "---\n";
 
+        var _modMate3 = matesModule.getMate(mateCtx, debate.moderatorId);
         ctx.sdk.createMentionSession({
+          vendor: _modMate3 ? _modMate3.vendor : null,
           claudeMd: claudeMd,
           initialContext: moderatorContext,
           initialMessage: resumePrompt,

package/lib/project-mate-interaction.js

@@ -4,6 +4,7 @@ var crypto = require("crypto");
 
 function attachMateInteraction(ctx) {
   var cwd = ctx.cwd;
+  var slug = ctx.slug || "";
   var sm = ctx.sm;
   var sdk = ctx.sdk;
   var send = ctx.send;
@@ -21,6 +22,7 @@ function attachMateInteraction(ctx) {
   var loadMateDigests = ctx.loadMateDigests;
   var updateMemorySummary = ctx.updateMemorySummary;
   var initMemorySummary = ctx.initMemorySummary;
+  var getNotificationsModule = ctx.getNotificationsModule || function () { return null; };
   // checkForDmDebateBrief is accessed via ctx at call time because
   // it comes from the debate module initialized after this one.
 
@@ -104,6 +106,30 @@ function attachMateInteraction(ctx) {
     return lines.join("\n") + "\n\n";
   }
 
+  function getHostMateId() {
+    if (typeof slug === "string" && slug.indexOf("mate-") === 0) {
+      return slug.substring(5) || null;
+    }
+    return null;
+  }
+
+  function notifyMentionResponse(session, mentionMateId, mentionMateName, fullText) {
+    var notificationsModule = getNotificationsModule();
+    var hostMateId = getHostMateId();
+    var preview = (fullText || "").replace(/\s+/g, " ").trim();
+    if (preview.length > 140) preview = preview.substring(0, 140) + "...";
+    if (!notificationsModule || !hostMateId) return;
+    notificationsModule.notify("mention_response", {
+      title: (mentionMateName || "Mate") + " responded",
+      preview: preview,
+      slug: slug,
+      sessionId: session.localId,
+      mateId: hostMateId,
+      avatarMateId: mentionMateId || null,
+      ownerId: session.ownerId || null,
+    });
+  }
+
   // --- Shared digest worker: one reusable Haiku session for gate+digest ---
   // Combines gate check and digest generation into a single prompt,
   // processes jobs sequentially from a queue, reuses the session across calls.
@@ -136,12 +162,19 @@ function attachMateInteraction(ctx) {
     } catch (e) {}
 
     // Combined gate + digest in one prompt (saves a full round-trip vs separate gate)
-    var prompt = [
+    var promptParts = [
       "[SYSTEM: Memory Gate + Digest]",
       "You are a memory system for an AI Mate (role: " + (mateRole || "assistant") + ").",
       "",
-      "Conversation (" + job.type + "):",
-      job.conversationContent,
+    ];
+    if (job.priorSummary) {
+      promptParts.push("Prior conversation context (memory summary so far):");
+      promptParts.push(job.priorSummary);
+      promptParts.push("");
+    }
+    promptParts.push("Conversation (" + job.type + "):");
+    promptParts.push(job.conversationContent);
+    var prompt = promptParts.concat([
       "",
       "STEP 1: Should this be saved to memory?",
       'Answer "no" ONLY if the entire conversation is trivial (e.g. just "hi"/"hello").',
@@ -171,7 +204,7 @@ function attachMateInteraction(ctx) {
       "user_observations: OPTIONAL array. Include ONLY if you noticed meaningful patterns about the USER themselves (not the topic).",
       "Categories: pattern (repeated behavior 2+ times), decision (explicit choice with reasoning), reaction (emotional/attitude signal), preference (tool/style/communication preference).",
       "Omit the field entirely if nothing notable about the user.",
-    ].join("\n");
+    ]).join("\n");
 
     function handleResult(text) {
       var cleaned = text.trim();
@@ -225,9 +258,14 @@ function attachMateInteraction(ctx) {
         }
       }
 
-      updateMemorySummary(job.mateCtx, job.mateId, digestObj);
-      maybeSynthesizeUserProfile(job.mateCtx, job.mateId);
-      if (job.onDone) job.onDone();
+      // Skip summary update for failed parses -- the fallback digest would degrade quality
+      if (digestObj.topic !== "parse_failed") {
+        updateMemorySummary(job.mateCtx, job.mateId, digestObj);
+        maybeSynthesizeUserProfile(job.mateCtx, job.mateId);
+        if (job.onDone) job.onDone();
+      } else {
+        if (job.onError) job.onError(new Error("parse_failed"));
+      }
       processDigestQueue();
     }
 
@@ -249,7 +287,7 @@ function attachMateInteraction(ctx) {
           console.error("[digest-worker] Error:", err);
           _digestWorker = null;
           _digestWorkerTurns = 0;
-          if (job.onDone) job.onDone();
+          if (job.onError) job.onError(err);
           processDigestQueue();
         },
       });
@@ -265,11 +303,11 @@ function attachMateInteraction(ctx) {
         onError: function (err) {
           console.error("[digest-worker] Create error:", err);
           _digestWorker = null;
-          if (job.onDone) job.onDone();
+          if (job.onError) job.onError(err);
           processDigestQueue();
         },
-      }).then(function (ws) { _digestWorker = ws; _digestWorkerTurns = 1; }).catch(function () {
-        if (job.onDone) job.onDone();
+      }).then(function (ws) { _digestWorker = ws; _digestWorkerTurns = 1; }).catch(function (err) {
+        if (job.onError) job.onError(err || new Error("digest worker creation failed"));
         processDigestQueue();
       });
     }
@@ -303,10 +341,14 @@ function attachMateInteraction(ctx) {
       type: "mention",
       conversationContent: conversationContent,
       onDone: function () { mentionSession._digesting = false; },
+      onError: function () { mentionSession._digesting = false; },
     });
   }
 
-  // Digest DM turn for mate projects - uses shared digest worker
+  // Digest DM turn for mate projects - uses shared digest worker.
+  // Delta-based: only collects new turns since the last successful digest.
+  // Concurrency debounce: turns that arrive while a digest is in-flight
+  // are naturally batched into the next flush.
   var _dmDigestPending = false;
   function digestDmTurn(session, responsePreview) {
     if (!isMate || _dmDigestPending) return;
@@ -314,11 +356,26 @@ function attachMateInteraction(ctx) {
     var mateCtx = matesModule.buildMateCtx(projectOwnerId);
     if (!matesModule.isMate(mateCtx, mateId)) return;
 
-    // Collect full conversation from session history (all user + mate turns)
+    // Track digest index per session so switching sessions doesn't misalign.
+    // On resumed sessions (after restart), recover index from the last
+    // digest_checkpoint entry in history so undigested turns aren't lost.
+    if (typeof session._dmLastDigestedIndex !== "number") {
+      session._dmLastDigestedIndex = 0;
+      for (var ci = session.history.length - 1; ci >= 0; ci--) {
+        if (session.history[ci].type === "digest_checkpoint") {
+          session._dmLastDigestedIndex = session.history[ci].digestedIndex;
+          break;
+        }
+      }
+    }
+
+    // Collect only new turns since the last successful digest
     var conversationParts = [];
     var totalLen = 0;
     var CONV_CAP = 6000;
-    for (var hi = 0; hi < session.history.length; hi++) {
+    var startIndex = session._dmLastDigestedIndex;
+    for (var hi = startIndex; hi < session.history.length; hi++) {
+      if (totalLen >= CONV_CAP) break;
       var entry = session.history[hi];
       if (entry.type === "user_message" && entry.text) {
         var uText = entry.text;
@@ -335,8 +392,8 @@ function attachMateInteraction(ctx) {
         conversationParts.push("Mate: " + aText);
         totalLen += aText.length;
       }
-      if (totalLen >= CONV_CAP) break;
     }
+    // If the latest response hasn't landed in history yet, append it
     var lastResponseText = responsePreview || "";
     if (lastResponseText && conversationParts.length > 0) {
       var lastPart = conversationParts[conversationParts.length - 1];
@@ -362,14 +419,34 @@ function attachMateInteraction(ctx) {
       });
     }
 
+    // Read existing summary to give the digest worker context for delta content
+    var priorSummary = "";
+    try {
+      if (fs.existsSync(summaryFile)) {
+        priorSummary = fs.readFileSync(summaryFile, "utf8").trim();
+      }
+    } catch (e) {}
+
     _dmDigestPending = true;
+    var snapshotIndex = session.history.length;
 
     enqueueDigest({
       mateCtx: mateCtx,
       mateId: mateId,
       type: "dm",
+      priorSummary: priorSummary || "",
       conversationContent: conversationParts.join("\n"),
-      onDone: function () { _dmDigestPending = false; },
+      onDone: function () {
+        session._dmLastDigestedIndex = snapshotIndex;
+        // Persist checkpoint so resumed sessions know where to continue
+        var checkpoint = { type: "digest_checkpoint", digestedIndex: snapshotIndex };
+        session.history.push(checkpoint);
+        sm.appendToSessionFile(session, checkpoint);
+        _dmDigestPending = false;
+      },
+      onError: function () {
+        _dmDigestPending = false;
+      },
     });
   }
 
@@ -445,6 +522,7 @@ function attachMateInteraction(ctx) {
     }
 
     session._mentionInProgress = true;
+    session._mentionActiveMateId = msg.mateId;
 
     // Send mention start indicator
     sendToSession(session.localId, {
@@ -478,6 +556,7 @@ function attachMateInteraction(ctx) {
       },
       onDone: function (fullText) {
         session._mentionInProgress = false;
+        session._mentionActiveMateId = null;
 
         // Save mention response to session history
         var mentionResponseEntry = {
@@ -504,6 +583,10 @@ function attachMateInteraction(ctx) {
         sendToSession(session.localId, { type: "mention_done", mateId: msg.mateId });
         send({ type: "mention_processing", mateId: msg.mateId, active: false });
 
+        if (isMate) {
+          notifyMentionResponse(session, msg.mateId, mateName, fullText);
+        }
+
         // Check if the mate wrote a debate brief during this turn
         ctx.checkForDmDebateBrief(session, msg.mateId, mateCtx);
 
@@ -512,6 +595,7 @@ function attachMateInteraction(ctx) {
       },
       onError: function (errMsg) {
         session._mentionInProgress = false;
+        session._mentionActiveMateId = null;
         // Clean up dead session
         if (session._mentionSessions && session._mentionSessions[msg.mateId]) {
           delete session._mentionSessions[msg.mateId];
@@ -560,6 +644,7 @@ function attachMateInteraction(ctx) {
 
       // Create new persistent mention session
       sdk.createMentionSession({
+        vendor: mate.vendor || null,
         claudeMd: claudeMd,
         initialContext: mentionContext,
         initialMessage: mentionFullInput,
@@ -614,6 +699,7 @@ function attachMateInteraction(ctx) {
         }
       }).catch(function (err) {
         session._mentionInProgress = false;
+        session._mentionActiveMateId = null;
         console.error("[mention] Failed to create session for mate " + msg.mateId + ":", err.message || err);
         sendToSession(session.localId, { type: "mention_error", mateId: msg.mateId, error: "Failed to create mention session." });
       });

package/lib/project-notifications.js

@@ -60,6 +60,15 @@ var formatters = {
       body: data.preview || "Sent you a message",
     };
   },
+
+  mention_response: function (data) {
+    return {
+      type: "mention_response",
+      title: data.title || "Mention response ready",
+      body: data.preview || "",
+      meta: { avatarMateId: data.avatarMateId || null },
+    };
+  },
 };
 
 // ========================================================

package/lib/project-sessions.js

@@ -1,6 +1,7 @@
 var fs = require("fs");
 var path = require("path");
 var { execFileSync } = require("child_process");
+var { CODEX_DEFAULTS, getCodexConfig } = require("./codex-defaults");
 
 /**
  * Attach session management, config, project management, and mid-section
@@ -280,6 +281,7 @@ function attachSessions(ctx) {
       if (msg.id && sm.sessions.has(msg.id) && msg.title) {
         var s = sm.sessions.get(msg.id);
         s.title = String(msg.title).substring(0, 100);
+        s.titleManuallySet = true;
         sm.saveSessionFile(s);
         sm.broadcastSessionList();
         // Sync title to SDK session
@@ -519,18 +521,18 @@ function attachSessions(ctx) {
 
     // Codex-specific settings (stored on sessionManager, passed to adapter via adapterOptions)
     if (msg.type === "set_codex_approval") {
-      sm.codexApproval = msg.approval || "on-failure";
-      send({ type: "codex_config", approval: sm.codexApproval, sandbox: sm.codexSandbox || "workspace-write", webSearch: sm.codexWebSearch || "disabled" });
+      sm.codexApproval = msg.approval || CODEX_DEFAULTS.approval;
+      send(Object.assign({ type: "codex_config" }, getCodexConfig(sm)));
       return true;
     }
     if (msg.type === "set_codex_sandbox") {
-      sm.codexSandbox = msg.sandbox || "workspace-write";
-      send({ type: "codex_config", approval: sm.codexApproval || "on-failure", sandbox: sm.codexSandbox, webSearch: sm.codexWebSearch || "disabled" });
+      sm.codexSandbox = msg.sandbox || CODEX_DEFAULTS.sandbox;
+      send(Object.assign({ type: "codex_config" }, getCodexConfig(sm)));
       return true;
     }
     if (msg.type === "set_codex_websearch") {
-      sm.codexWebSearch = msg.webSearch || "disabled";
-      send({ type: "codex_config", approval: sm.codexApproval || "on-failure", sandbox: sm.codexSandbox || "workspace-write", webSearch: sm.codexWebSearch });
+      sm.codexWebSearch = msg.webSearch || CODEX_DEFAULTS.webSearch;
+      send(Object.assign({ type: "codex_config" }, getCodexConfig(sm)));
       return true;
     }
 
@@ -596,6 +598,10 @@ function attachSessions(ctx) {
               }
               session.history = session.history.slice(0, trimTo);
               session.messageUUIDs = session.messageUUIDs.slice(0, targetIdx);
+              // Reset digest checkpoint if it points past the trimmed history
+              if (typeof session._dmLastDigestedIndex === "number" && session._dmLastDigestedIndex > trimTo) {
+                session._dmLastDigestedIndex = trimTo;
+              }
             }
 
             // Notify adapter of conversation rollback (e.g. Codex thread/rollback)

package/lib/project.js

@@ -615,15 +615,33 @@ function createProjectContext(opts) {
   var tm = createTerminalManager({ cwd: cwd, send: send, sendTo: sendTo });
   var nm = createNotesManager({ cwd: cwd, send: send, sendTo: sendTo });
 
-  // Check for updates in background (admin only)
-  fetchVersion(updateChannel).then(function (v) {
-    if (v && isNewer(v, currentVersion)) {
-      latestVersion = v;
-      sendToAdmins({ type: "update_available", version: v });
-    }
-  }).catch(function (e) {
-    console.error("[project] Background version check failed:", e.message || e);
-  });
+  // Check for updates in background (admin only). The result is stored in
+  // latestVersion; broadcast is handled by the hourly scheduler below, so
+  // page refreshes don't re-trigger the banner.
+  function runVersionCheck(broadcast) {
+    fetchVersion(updateChannel).then(function (v) {
+      if (v && isNewer(v, currentVersion)) {
+        latestVersion = v;
+        if (broadcast) sendToAdmins({ type: "update_available", version: v });
+      }
+    }).catch(function (e) {
+      console.error("[project] Background version check failed:", e.message || e);
+    });
+  }
+  runVersionCheck(false);
+
+  // Push update_available on every hour boundary. Clients can dismiss the
+  // banner; the next hourly push acts as a fresh ping. This avoids needing
+  // any dismissed-state persistence.
+  function scheduleNextHourlyBroadcast() {
+    var now = Date.now();
+    var msUntilNextHour = 60 * 60 * 1000 - (now % (60 * 60 * 1000));
+    setTimeout(function tick() {
+      runVersionCheck(true);
+      setTimeout(tick, 60 * 60 * 1000);
+    }, msUntilNextHour);
+  }
+  scheduleNextHourlyBroadcast();
 
   // --- WS connection handler (delegated to project-connection.js) ---
   function handleConnection(ws, wsUser) {
@@ -726,6 +744,7 @@ function createProjectContext(opts) {
           delete session._mentionSessions[mateId];
         }
         session._mentionInProgress = false;
+        session._mentionActiveMateId = null;
         sendToSession(session.localId, { type: "mention_done", mateId: mateId, stopped: true });
         send({ type: "mention_processing", mateId: mateId, active: false });
       }
@@ -849,6 +868,7 @@ function createProjectContext(opts) {
   // so we use a lazy getter that resolves at call time.
   var _mateInteraction = attachMateInteraction({
     cwd: cwd,
+    slug: slug,
     sm: sm,
     sdk: sdk,
     send: send,
@@ -866,6 +886,7 @@ function createProjectContext(opts) {
     loadMateDigests: loadMateDigests,
     updateMemorySummary: updateMemorySummary,
     initMemorySummary: initMemorySummary,
+    getNotificationsModule: function () { return _notifications; },
     get checkForDmDebateBrief() { return checkForDmDebateBrief; },
   });
   var handleMention = _mateInteraction.handleMention;

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
@@ -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
@@ -386,7 +389,7 @@ import { initDebate, handleDebatePreparing, handleDebateStarted, handleDebateRes
     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)); },
+    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'); },
@@ -399,7 +402,7 @@ import { initDebate, handleDebatePreparing, handleDebateStarted, handleDebateRes
   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); }
   );
 
@@ -420,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); },
@@ -518,6 +522,15 @@ import { initDebate, handleDebatePreparing, handleDebateStarted, handleDebateRes
     forceScrollToBottom();
   });
 
+  // Scroll to bottom when returning to the app (e.g. switching back from another
+  // Android app or tab). Without this the browser restores a stale scroll offset
+  // and leaves the user stranded mid-session instead of at the latest message.
+  document.addEventListener("visibilitychange", function () {
+    if (!document.hidden) {
+      scrollToBottom();
+    }
+  });
+
   // Fork session from a user message
   messagesEl.addEventListener("click", function(e) {
     var btn = e.target.closest(".msg-action-fork");
@@ -700,7 +713,7 @@ import { initDebate, handleDebatePreparing, handleDebateStarted, handleDebateRes
     isDebateFloorMode: function () { return store.get('debateFloorMode'); },
     handleDebateFloorSend: function () { handleDebateFloorSend(); },
     isMateDm: function () { return store.get('dmMode') && store.get('dmTargetUser') && store.get('dmTargetUser').isMate; },
-    getDmMateId: function () { return (store.get('dmMode') && store.get('dmTargetUser') && store.get('dmTargetUser').isMate) ? dmTargetUser.id : null; },
+    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(); },
@@ -726,7 +739,7 @@ import { initDebate, handleDebatePreparing, handleDebateStarted, handleDebateRes
   // --- Debate module ---
   initDebate({
     get ws() { return _getWsRef(); },
-    sendWs: function (obj) { if (ws && ws.readyState === 1) ws.send(JSON.stringify(obj)); },
+    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,
@@ -781,6 +794,8 @@ import { initDebate, handleDebatePreparing, handleDebateStarted, handleDebateRes
     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";
       }