clay-server 2.31.0 → 2.32.0-beta.10

package/lib/public/modules/sidebar-sessions.js

@@ -5,8 +5,14 @@ import { avatarUrl, userAvatarUrl } from './avatar.js';
 import { escapeHtml } from './utils.js';
 import { iconHtml, refreshIcons } from './icons.js';
 import { openSearch as openSessionSearch } from './session-search.js';
+import { store } from './store.js';
+import { getWs } from './ws-ref.js';
+import { getSessionListEl } from './dom-refs.js';
+import { dismissOverlayPanels, closeSidebar, updatePageTitle } from './sidebar.js';
+import { showConfirm } from './app-misc.js';
+import { getUpcomingSchedules } from './scheduler.js';
+import { refreshMobileChatSheet } from './sidebar-mobile.js';
 
-var _ctx = null;
 
 // --- Session state ---
 var cachedSessions = [];
@@ -27,16 +33,15 @@ var countdownContainer = null;
 var sessionCtxMenu = null;
 var sessionCtxSessionId = null;
 
-export function initSidebarSessions(ctx) {
-  _ctx = ctx;
+export function initSidebarSessions() {
 
   document.addEventListener("click", function () { closeSessionCtxMenu(); });
 
   // --- Session search ---
-  var searchBtn = _ctx.$("search-session-btn");
-  var searchBox = _ctx.$("session-search");
-  var searchInput = _ctx.$("session-search-input");
-  var searchClear = _ctx.$("session-search-clear");
+  var searchBtn = document.getElementById("search-session-btn");
+  var searchBox = document.getElementById("session-search");
+  var searchInput = document.getElementById("session-search-input");
+  var searchClear = document.getElementById("session-search-clear");
 
   function openSearch() {
     searchBox.classList.remove("hidden");
@@ -79,8 +84,8 @@ export function initSidebarSessions(ctx) {
       return;
     }
     searchDebounce = setTimeout(function () {
-      if (_ctx.ws && _ctx.connected) {
-        _ctx.ws.send(JSON.stringify({ type: "search_sessions", query: searchQuery }));
+      if (getWs() && store.get('connected')) {
+        getWs().send(JSON.stringify({ type: "search_sessions", query: searchQuery }));
       }
     }, 200);
   });
@@ -93,11 +98,11 @@ export function initSidebarSessions(ctx) {
   });
 
   // --- Resume session picker ---
-  var resumeModal = _ctx.$("resume-modal");
-  var resumeCancel = _ctx.$("resume-cancel");
-  var pickerLoading = _ctx.$("resume-picker-loading");
-  var pickerEmpty = _ctx.$("resume-picker-empty");
-  var pickerList = _ctx.$("resume-picker-list");
+  var resumeModal = document.getElementById("resume-modal");
+  var resumeCancel = document.getElementById("resume-cancel");
+  var pickerLoading = document.getElementById("resume-picker-loading");
+  var pickerEmpty = document.getElementById("resume-picker-empty");
+  var pickerList = document.getElementById("resume-picker-list");
 
   function openResumeModal() {
     resumeModal.classList.remove("hidden");
@@ -105,8 +110,8 @@ export function initSidebarSessions(ctx) {
     pickerEmpty.classList.add("hidden");
     pickerList.classList.add("hidden");
     pickerList.innerHTML = "";
-    if (_ctx.ws && _ctx.connected) {
-      _ctx.ws.send(JSON.stringify({ type: "list_cli_sessions" }));
+    if (getWs() && store.get('connected')) {
+      getWs().send(JSON.stringify({ type: "list_cli_sessions" }));
     }
   }
 
@@ -114,7 +119,8 @@ export function initSidebarSessions(ctx) {
     resumeModal.classList.add("hidden");
   }
 
-  _ctx.resumeSessionBtn.addEventListener("click", openResumeModal);
+  var resumeBtn = document.getElementById("resume-session-btn");
+  if (resumeBtn) resumeBtn.addEventListener("click", openResumeModal);
   resumeCancel.addEventListener("click", closeResumeModal);
   resumeModal.querySelector(".confirm-backdrop").addEventListener("click", closeResumeModal);
 
@@ -172,7 +178,7 @@ function showSessionCtxMenu(anchorBtn, sessionId, title, cliSid, sessionData) {
   menu.appendChild(renameItem);
 
   // Session visibility toggle (only the session owner can change)
-  if (_ctx.multiUser && sessionData && sessionData.ownerId && sessionData.ownerId === _ctx.myUserId) {
+  if (store.get('isMultiUserMode') && sessionData && sessionData.ownerId && sessionData.ownerId === store.get('myUserId')) {
     var currentVis = (sessionData && sessionData.sessionVisibility) || "shared";
     var isPrivate = currentVis === "private";
     var visItem = document.createElement("button");
@@ -182,23 +188,23 @@ function showSessionCtxMenu(anchorBtn, sessionId, title, cliSid, sessionData) {
       e.stopPropagation();
       closeSessionCtxMenu();
       var newVis = isPrivate ? "shared" : "private";
-      if (_ctx.ws && _ctx.connected) {
-        _ctx.ws.send(JSON.stringify({ type: "set_session_visibility", sessionId: sessionId, visibility: newVis }));
+      if (getWs() && store.get('connected')) {
+        getWs().send(JSON.stringify({ type: "set_session_visibility", sessionId: sessionId, visibility: newVis }));
       }
     });
     menu.appendChild(visItem);
   }
 
-  if (!_ctx.permissions || _ctx.permissions.sessionDelete !== false) {
+  if (!store.get('permissions') || store.get('permissions').sessionDelete !== false) {
     var deleteItem = document.createElement("button");
     deleteItem.className = "session-ctx-item session-ctx-delete";
     deleteItem.innerHTML = iconHtml("trash-2") + " <span>Delete</span>";
     deleteItem.addEventListener("click", function (e) {
       e.stopPropagation();
       closeSessionCtxMenu();
-      _ctx.showConfirm('Delete "' + (title || "New Session") + '"? This session and its history will be permanently removed.', function () {
-        var ws = _ctx.ws;
-        if (ws && _ctx.connected) {
+      showConfirm('Delete "' + (title || "New Session") + '"? This session and its history will be permanently removed.', function () {
+        var ws = getWs();
+        if (ws && store.get('connected')) {
           ws.send(JSON.stringify({ type: "delete_session", id: sessionId }));
         }
       });
@@ -241,7 +247,7 @@ function showLoopCtxMenu(anchorBtn, loopId, loopName, childCount) {
   });
   menu.appendChild(renameItem);
 
-  if (!_ctx.permissions || _ctx.permissions.sessionDelete !== false) {
+  if (!store.get('permissions') || store.get('permissions').sessionDelete !== false) {
     var deleteItem = document.createElement("button");
     deleteItem.className = "session-ctx-item session-ctx-delete";
     deleteItem.innerHTML = iconHtml("trash-2") + " <span>Delete</span>";
@@ -251,9 +257,9 @@ function showLoopCtxMenu(anchorBtn, loopId, loopName, childCount) {
       var msg = 'Delete "' + (loopName || "Loop") + '"';
       if (childCount > 1) msg += " and its " + childCount + " sessions";
       msg += "? This cannot be undone.";
-      _ctx.showConfirm(msg, function () {
-        if (_ctx.ws && _ctx.connected) {
-          _ctx.ws.send(JSON.stringify({ type: "delete_loop_group", loopId: loopId }));
+      showConfirm(msg, function () {
+        if (getWs() && store.get('connected')) {
+          getWs().send(JSON.stringify({ type: "delete_loop_group", loopId: loopId }));
         }
       });
     });
@@ -280,7 +286,7 @@ function showLoopCtxMenu(anchorBtn, loopId, loopName, childCount) {
 // --- Inline rename ---
 
 function startInlineRename(sessionId, currentTitle) {
-  var el = _ctx.sessionListEl.querySelector('.session-item[data-session-id="' + sessionId + '"]');
+  var el = getSessionListEl().querySelector('.session-item[data-session-id="' + sessionId + '"]');
   if (!el) return;
   var textSpan = el.querySelector(".session-item-text");
   if (!textSpan) return;
@@ -298,8 +304,8 @@ function startInlineRename(sessionId, currentTitle) {
 
   function commitRename() {
     var newTitle = input.value.trim();
-    if (newTitle && newTitle !== currentTitle && _ctx.ws && _ctx.connected) {
-      _ctx.ws.send(JSON.stringify({ type: "rename_session", id: sessionId, title: newTitle }));
+    if (newTitle && newTitle !== currentTitle && getWs() && store.get('connected')) {
+      getWs().send(JSON.stringify({ type: "rename_session", id: sessionId, title: newTitle }));
     }
     // Restore text (server will send updated session_list)
     textSpan.innerHTML = originalHtml;
@@ -317,7 +323,7 @@ function startInlineRename(sessionId, currentTitle) {
 }
 
 function startLoopInlineRename(loopId, currentName) {
-  var el = _ctx.sessionListEl.querySelector('.session-loop-group[data-loop-id="' + loopId + '"]');
+  var el = getSessionListEl().querySelector('.session-loop-group[data-loop-id="' + loopId + '"]');
   if (!el) return;
   var textSpan = el.querySelector(".session-item-text");
   if (!textSpan) return;
@@ -335,8 +341,8 @@ function startLoopInlineRename(loopId, currentName) {
 
   function commitRename() {
     var newName = input.value.trim();
-    if (newName && newName !== currentName && _ctx.ws && _ctx.connected) {
-      _ctx.ws.send(JSON.stringify({ type: "loop_registry_rename", id: loopId, name: newName }));
+    if (newName && newName !== currentName && getWs() && store.get('connected')) {
+      getWs().send(JSON.stringify({ type: "loop_registry_rename", id: loopId, name: newName }));
     }
     textSpan.innerHTML = originalHtml;
     if (newName && newName !== currentName) {
@@ -407,10 +413,10 @@ function renderLoopChild(s) {
 
   el.addEventListener("click", (function (id) {
     return function () {
-      if (_ctx.ws && _ctx.connected) {
-        _ctx.ws.send(JSON.stringify({ type: "switch_session", id: id }));
-        _ctx.dismissOverlayPanels();
-        _ctx.closeSidebar();
+      if (getWs() && store.get('connected')) {
+        getWs().send(JSON.stringify({ type: "switch_session", id: id }));
+        dismissOverlayPanels();
+        closeSidebar();
       }
     };
   })(s.id));
@@ -530,10 +536,10 @@ function renderLoopGroup(loopId, children, groupKey) {
   // Click row (not chevron/more) -> switch to latest session
   el.addEventListener("click", (function (id) {
     return function () {
-      if (_ctx.ws && _ctx.connected) {
-        _ctx.ws.send(JSON.stringify({ type: "switch_session", id: id }));
-        _ctx.dismissOverlayPanels();
-        _ctx.closeSidebar();
+      if (getWs() && store.get('connected')) {
+        getWs().send(JSON.stringify({ type: "switch_session", id: id }));
+        dismissOverlayPanels();
+        closeSidebar();
       }
     };
   })(latestSession.id));
@@ -617,10 +623,10 @@ function renderLoopRun(parentGk, startedAtKey, sessions, isRalph) {
   // Click row -> switch to latest session of this run
   el.addEventListener("click", (function (id) {
     return function () {
-      if (_ctx.ws && _ctx.connected) {
-        _ctx.ws.send(JSON.stringify({ type: "switch_session", id: id }));
-        _ctx.dismissOverlayPanels();
-        _ctx.closeSidebar();
+      if (getWs() && store.get('connected')) {
+        getWs().send(JSON.stringify({ type: "switch_session", id: id }));
+        dismissOverlayPanels();
+        closeSidebar();
       }
     };
   })(latestSession.id));
@@ -657,7 +663,7 @@ function renderSessionItem(s) {
   if (s.loop && s.loop.source === "debate") {
     textHtml += '<span class="session-debate-icon" title="Debate">' + iconHtml("mic") + '</span>';
   }
-  if (_ctx.multiUser && s.sessionVisibility === "private") {
+  if (store.get('isMultiUserMode') && s.sessionVisibility === "private") {
     textHtml += '<span class="session-private-icon" title="Private session">' + iconHtml("lock") + '</span>';
   }
   textHtml += highlightMatch(s.title || "New Session", searchQuery);
@@ -685,11 +691,11 @@ function renderSessionItem(s) {
 
   el.addEventListener("click", (function (id) {
     return function () {
-      if (_ctx.ws && _ctx.connected) {
+      if (getWs() && store.get('connected')) {
         var pendingQuery = searchQuery || "";
-        _ctx.ws.send(JSON.stringify({ type: "switch_session", id: id }));
-        _ctx.dismissOverlayPanels();
-        _ctx.closeSidebar();
+        getWs().send(JSON.stringify({ type: "switch_session", id: id }));
+        dismissOverlayPanels();
+        closeSidebar();
         if (pendingQuery) {
           setTimeout(function () { openSessionSearch(pendingQuery); }, 400);
         }
@@ -709,9 +715,9 @@ export function renderSessionList(sessions) {
   if (sessions) cachedSessions = sessions;
 
   // If mobile chat sheet is open, refresh it
-  if (_ctx.refreshMobileChatSheet) _ctx.refreshMobileChatSheet();
+  if (refreshMobileChatSheet) refreshMobileChatSheet();
 
-  _ctx.sessionListEl.innerHTML = "";
+  getSessionListEl().innerHTML = "";
 
   // Partition: loop sessions vs normal sessions
   // Group by loopId + date so all runs of the same task on the same day are merged
@@ -765,16 +771,16 @@ export function renderSessionList(sessions) {
       var header = document.createElement("div");
       header.className = "session-group-header";
       header.textContent = group;
-      _ctx.sessionListEl.appendChild(header);
+      getSessionListEl().appendChild(header);
     }
     if (item.type === "loop") {
-      _ctx.sessionListEl.appendChild(renderLoopGroup(item.loopId, item.children, item.groupKey));
+      getSessionListEl().appendChild(renderLoopGroup(item.loopId, item.children, item.groupKey));
     } else {
-      _ctx.sessionListEl.appendChild(renderSessionItem(item.data));
+      getSessionListEl().appendChild(renderSessionItem(item.data));
     }
   }
   refreshIcons();
-  if (_ctx.updatePageTitle) _ctx.updatePageTitle();
+  if (updatePageTitle) updatePageTitle();
 }
 
 // --- Search results ---
@@ -794,7 +800,7 @@ export function handleSearchResults(msg) {
 export function updateSessionPresence(presence) {
   sessionPresence = presence;
   // Update presence avatars on existing session items without full re-render
-  var items = _ctx.sessionListEl.querySelectorAll("[data-session-id]");
+  var items = getSessionListEl().querySelectorAll("[data-session-id]");
   for (var i = 0; i < items.length; i++) {
     renderPresenceAvatars(items[i], items[i].dataset.sessionId);
   }
@@ -866,11 +872,11 @@ function startCountdownTimer() {
 }
 
 function updateCountdowns() {
-  if (!_ctx || !_ctx.getUpcomingSchedules || !_ctx.sessionListEl) return;
-  var upcoming = _ctx.getUpcomingSchedules(3 * 60 * 1000); // 3 minutes
+  if (!getSessionListEl()) return;
+  var upcoming = getUpcomingSchedules(3 * 60 * 1000); // 3 minutes
 
   // Remove stale container
-  if (countdownContainer && !_ctx.sessionListEl.contains(countdownContainer)) {
+  if (countdownContainer && !getSessionListEl().contains(countdownContainer)) {
     countdownContainer = null;
   }
 
@@ -885,7 +891,7 @@ function updateCountdowns() {
   if (!countdownContainer) {
     countdownContainer = document.createElement("div");
     countdownContainer.className = "session-countdown-group";
-    _ctx.sessionListEl.insertBefore(countdownContainer, _ctx.sessionListEl.firstChild);
+    getSessionListEl().insertBefore(countdownContainer, getSessionListEl().firstChild);
   }
 
   var html = "";
@@ -922,9 +928,9 @@ function relativeTime(isoString) {
 }
 
 export function populateCliSessionList(sessions) {
-  var pickerLoading = _ctx.$("resume-picker-loading");
-  var pickerEmpty = _ctx.$("resume-picker-empty");
-  var pickerList = _ctx.$("resume-picker-list");
+  var pickerLoading = document.getElementById("resume-picker-loading");
+  var pickerEmpty = document.getElementById("resume-picker-empty");
+  var pickerList = document.getElementById("resume-picker-list");
   if (!pickerLoading || !pickerList) return;
 
   pickerLoading.classList.add("hidden");
@@ -972,12 +978,12 @@ export function populateCliSessionList(sessions) {
 
     (function (sessionId) {
       item.addEventListener("click", function () {
-        if (_ctx.ws && _ctx.connected) {
-          _ctx.ws.send(JSON.stringify({ type: "resume_session", cliSessionId: sessionId }));
+        if (getWs() && store.get('connected')) {
+          getWs().send(JSON.stringify({ type: "resume_session", cliSessionId: sessionId }));
         }
-        var modal = _ctx.$("resume-modal");
+        var modal = document.getElementById("resume-modal");
         if (modal) modal.classList.add("hidden");
-        _ctx.closeSidebar();
+        closeSidebar();
       });
     })(s.sessionId);
 

package/lib/public/modules/sidebar.js

@@ -13,8 +13,13 @@ import {
 import { initSidebarMobile } from './sidebar-mobile.js';
 
 var ctx;
+var _syncResizeHandles = null;
 
-function dismissOverlayPanels() {
+export function syncResizeHandles() {
+  if (_syncResizeHandles) _syncResizeHandles();
+}
+
+export function dismissOverlayPanels() {
   closeArchive();
   closeScheduler();
 }
@@ -56,21 +61,11 @@ export function closeSidebar() {
 export function initSidebar(_ctx) {
   ctx = _ctx;
 
-  // Initialize session sub-module with sidebar callbacks
-  ctx.closeSidebar = closeSidebar;
-  ctx.dismissOverlayPanels = dismissOverlayPanels;
-  ctx.updatePageTitle = updatePageTitle;
-  ctx.showIconTooltip = showIconTooltip;
-  ctx.showIconTooltipHtml = showIconTooltipHtml;
-  ctx.hideIconTooltip = hideIconTooltip;
-  ctx.closeUserCtxMenu = closeUserCtxMenu;
-  ctx.closeProjectCtxMenu = closeProjectCtxMenu;
-  ctx.getCurrentDmUserId = getCurrentDmUserId;
-  ctx.spawnDustParticles = spawnDustParticles;
-  initSidebarSessions(ctx);
-  initSidebarProjects(ctx);
-  initSidebarMates(ctx);
-  initSidebarMobile(ctx);
+  // Initialize sidebar sub-modules (they import their own deps directly)
+  initSidebarSessions();
+  initSidebarProjects();
+  initSidebarMates();
+  initSidebarMobile();
 
   ctx.hamburgerBtn.addEventListener("click", function () {
     ctx.sidebar.classList.contains("open") ? closeSidebar() : openSidebar();
@@ -128,7 +123,6 @@ export function initSidebar(_ctx) {
   var sessionsPanel = ctx.$("sidebar-panel-sessions");
   var filesPanel = ctx.$("sidebar-panel-files");
   var sessionsHeaderContent = ctx.$("sessions-header-content");
-  var filesHeaderContent = ctx.$("files-header-content");
   var filePanelClose = ctx.$("file-panel-close");
 
   function hideAllPanels() {
@@ -136,7 +130,6 @@ export function initSidebar(_ctx) {
     if (sessionsPanel) sessionsPanel.classList.add("hidden");
     if (filesPanel) filesPanel.classList.add("hidden");
     if (sessionsHeaderContent) sessionsHeaderContent.classList.add("hidden");
-    if (filesHeaderContent) filesHeaderContent.classList.add("hidden");
   }
 
   function showProjectsPanel() {
@@ -157,7 +150,6 @@ export function initSidebar(_ctx) {
       filesPanel.classList.remove("fb-exit");
       filesPanel.classList.add("fb-enter");
     }
-    if (filesHeaderContent) filesHeaderContent.classList.remove("hidden");
     if (ctx.onFilesTabOpen) ctx.onFilesTabOpen();
   }
 
@@ -364,7 +356,7 @@ export function initSidebar(_ctx) {
   }
 
   // Expose for external callers (e.g. after DM exit)
-  ctx.syncResizeHandles = function () {
+  _syncResizeHandles = ctx.syncResizeHandles = function () {
     // Restore project sidebar width from localStorage (may have changed during DM)
     try {
       var sw = localStorage.getItem("sidebar-width");

package/lib/public/modules/skills.js

@@ -1,21 +1,20 @@
 import { iconHtml, refreshIcons } from './icons.js';
 import { escapeHtml, copyToClipboard, showToast } from './utils.js';
+import { store } from './store.js';
 
-var ctx;
 var modal;
 var contentEl;
 var activeTab = "all";
 var currentView = "list"; // "list" or "detail"
 var skillsData = {}; // cache per tab
-var basePath = "";
 var installedSkills = {}; // { skillName: { scope: "global"|"project"|"both" } }
 var searchQuery = "";
 var searchTimer = null;
 var searchCache = {}; // cache per query
 
-export function initSkills(_ctx) {
-  ctx = _ctx;
-  basePath = _ctx.basePath || "";
+function basePath() { return store.get('basePath') || ""; }
+
+export function initSkills() {
 
   modal = document.getElementById("skills-modal");
   contentEl = document.getElementById("skills-content");
@@ -134,7 +133,7 @@ export function initSkills(_ctx) {
 }
 
 function fetchInstalledSkills() {
-  return fetch(basePath + "api/installed-skills")
+  return fetch(basePath() + "api/installed-skills")
     .then(function (res) { return res.json(); })
     .then(function (data) {
       installedSkills = data.installed || {};
@@ -225,7 +224,7 @@ function loadSkills(tab) {
 function loadInstalledSkills() {
   contentEl.innerHTML = '<div class="skills-loading"><div class="skills-spinner"></div> Loading installed skills...</div>';
 
-  fetch(basePath + "api/installed-skills")
+  fetch(basePath() + "api/installed-skills")
     .then(function (res) { return res.json(); })
     .then(function (data) {
       installedSkills = data.installed || {};
@@ -563,7 +562,7 @@ function installSkill(source, skill, scope) {
     btns[i].innerHTML = '<div class="skills-btn-spinner"></div> Installing...';
   }
 
-  fetch(basePath + "api/install-skill", {
+  fetch(basePath() + "api/install-skill", {
     method: "POST",
     headers: { "Content-Type": "application/json" },
     body: JSON.stringify({ url: url, skill: skill, scope: scope }),
@@ -631,7 +630,7 @@ function uninstallSkill(skill, scope) {
     unBtn.innerHTML = '<div class="skills-btn-spinner small"></div>';
   }
 
-  fetch(basePath + "api/uninstall-skill", {
+  fetch(basePath() + "api/uninstall-skill", {
     method: "POST",
     headers: { "Content-Type": "application/json" },
     body: JSON.stringify({ skill: skill, scope: scope }),

package/lib/public/modules/sticky-notes.js

@@ -885,8 +885,7 @@ export function handleNotesList(msg) {
   updateBadge();
   updateSidebarBadge();
 
-  // If user already has notes, they know the feature — dismiss onboarding
-  if (list.length > 0) dismissOnboarding();
+  // If user already has notes, they know the feature (no onboarding needed)
 
   // Auto-show if there are notes
   if (list.length > 0 && !notesVisible) {

package/lib/public/modules/store.js

@@ -10,12 +10,19 @@ function createStore(initial) {
 }
 
 var store = {
-  getState: function () { return _state; },
-  setState: function (partial) {
+  // Read a single field: store.get('dmMode')
+  get: function (key) { return _state[key]; },
+  // Grab full snapshot for multi-field reads: var s = store.snap();
+  snap: function () { return _state; },
+  // Shallow-merge update: store.set({ dmMode: true, dmKey: 'abc' })
+  set: function (partial) {
     var prev = _state;
     _state = Object.assign({}, _state, partial);
     for (var i = 0; i < _listeners.length; i++) _listeners[i](_state, prev);
   },
+  // Keep legacy aliases for gradual migration
+  getState: function () { return _state; },
+  setState: function (partial) { store.set(partial); },
   subscribe: function (listener) {
     _listeners.push(listener);
     return function () {

package/lib/public/modules/stt.js

@@ -3,6 +3,8 @@
 
 import { iconHtml, refreshIcons } from './icons.js';
 import { autoResize } from './input.js';
+import { store } from './store.js';
+import { VENDOR_NAMES } from './app-rendering.js';
 
 var ctx;
 
@@ -253,7 +255,8 @@ function stopRecording() {
   if (document.body.classList.contains("mate-dm-active") && document.body.dataset.mateName) {
     ctx.inputEl.setAttribute('placeholder', 'Message ' + document.body.dataset.mateName + '...');
   } else {
-    ctx.inputEl.setAttribute('placeholder', 'Message Claude Code...');
+    var _v = store.get('currentVendor') || "claude";
+    ctx.inputEl.setAttribute('placeholder', 'Message ' + (VENDOR_NAMES[_v] || VENDOR_NAMES.claude) + '...');
   }
 }
 

package/lib/public/modules/terminal.js

@@ -152,6 +152,18 @@ export function initTerminal(_ctx) {
     fitTerminal();
   });
 
+  // Header toggle button
+  var toggleBtn = document.getElementById("terminal-toggle-btn");
+  if (toggleBtn) {
+    toggleBtn.addEventListener("click", function () {
+      if (isOpen && !ctx.terminalContainerEl.classList.contains("hidden")) {
+        closeTerminal();
+      } else {
+        openTerminal();
+      }
+    });
+  }
+
   // Sidebar terminal button
   var sidebarTermBtn = document.getElementById("terminal-sidebar-btn");
   if (sidebarTermBtn) {

package/lib/public/modules/tools.js

@@ -5,6 +5,8 @@ import { renderUnifiedDiff, renderSplitDiff, renderPatchDiff } from './diff.js';
 import { openFile } from './filebrowser.js';
 import { mateAvatarUrl } from './avatar.js';
 import { getChatLayout } from './theme.js';
+import { store } from './store.js';
+import { VENDOR_NAMES } from './app-rendering.js';
 
 var ctx;
 
@@ -367,7 +369,8 @@ export function enableMainInput() {
   if (document.body.classList.contains("mate-dm-active") && document.body.dataset.mateName) {
     ctx.inputEl.placeholder = "Message " + document.body.dataset.mateName + "...";
   } else {
-    ctx.inputEl.placeholder = "Message Claude Code...";
+    var _v = store.get('currentVendor') || "claude";
+    ctx.inputEl.placeholder = "Message " + (VENDOR_NAMES[_v] || VENDOR_NAMES.claude) + "...";
   }
 }
 
@@ -485,7 +488,7 @@ function permissionInputSummary(toolName, input) {
   }
 }
 
-export function renderPermissionRequest(requestId, toolName, toolInput, decisionReason, mateId) {
+export function renderPermissionRequest(requestId, toolName, toolInput, decisionReason, mateId, vendor) {
   if (pendingPermissions[requestId]) return;
   ctx.finalizeAssistantBlock();
   stopThinking();
@@ -499,7 +502,7 @@ export function renderPermissionRequest(requestId, toolName, toolInput, decision
 
   // Channel layout or Mate DM: conversational "Can I ...?" style
   if ((ctx.isMateDm && ctx.isMateDm()) || getChatLayout() === "channel") {
-    renderConversationalPermission(requestId, toolName, toolInput, mateId);
+    renderConversationalPermission(requestId, toolName, toolInput, mateId, vendor);
     return;
   }
 
@@ -566,7 +569,7 @@ function renderFormalPermission(requestId, toolName, toolInput, decisionReason)
 
   var allowAlwaysBtn = document.createElement("button");
   allowAlwaysBtn.className = "permission-btn permission-allow-session";
-  allowAlwaysBtn.textContent = "Always Allow";
+  allowAlwaysBtn.textContent = "Allow for Session";
   allowAlwaysBtn.addEventListener("click", function () {
     sendPermissionResponse(container, requestId, "allow_always");
   });
@@ -761,7 +764,7 @@ function matePermissionInfo(toolName, toolInput) {
   return { verb: verb, target: target };
 }
 
-function resolvePermissionIdentity(mateId) {
+function resolvePermissionIdentity(mateId, vendor) {
   // Mate DM: use DM target mate info
   if (ctx.isMateDm && ctx.isMateDm()) {
     var name = ctx.getMateName();
@@ -786,15 +789,17 @@ function resolvePermissionIdentity(mateId) {
       };
     }
   }
-  // Project chat (Claude Code)
+  // Project chat: use vendor name and avatar
+  var vendorAvatars = { claude: "/claude-code-avatar.png", codex: "/codex-avatar.png", gemini: "/gemini-avatar.png" };
+  var vendorName = (vendor && VENDOR_NAMES[vendor]) || VENDOR_NAMES.claude;
   return {
-    name: "Claude Code",
-    avatar: ctx.getClaudeAvatar ? ctx.getClaudeAvatar() : ""
+    name: vendorName,
+    avatar: (vendor && vendorAvatars[vendor]) || vendorAvatars.claude,
   };
 }
 
-function renderConversationalPermission(requestId, toolName, toolInput, mateId) {
-  var identity = resolvePermissionIdentity(mateId);
+function renderConversationalPermission(requestId, toolName, toolInput, mateId, vendor) {
+  var identity = resolvePermissionIdentity(mateId, vendor);
   var info = matePermissionInfo(toolName, toolInput);
   var askMsg = "Can I " + info.verb + (info.target ? " " + info.target : "") + "?";
 
@@ -851,7 +856,7 @@ function renderConversationalPermission(requestId, toolName, toolInput, mateId)
 
   var alwaysBtn = document.createElement("button");
   alwaysBtn.className = "mate-permission-reply mate-permission-always";
-  alwaysBtn.textContent = "Always allow";
+  alwaysBtn.textContent = "Allow for session";
   alwaysBtn.addEventListener("click", function () {
     sendPermissionResponse(container, requestId, "allow_always");
   });
@@ -882,7 +887,7 @@ function sendPermissionResponse(container, requestId, decision) {
   container.classList.add("resolved");
   if (ctx.stopUrgentBlink) ctx.stopUrgentBlink();
 
-  var label = decision === "deny" ? "Denied" : "Allowed";
+  var label = decision === "deny" ? "Denied" : decision === "allow_always" ? "Allowed for session" : "Allowed";
   var resolvedClass = decision === "deny" ? "resolved-denied" : "resolved-allowed";
   container.classList.add(resolvedClass);
 
@@ -923,7 +928,7 @@ export function markPermissionResolved(requestId, decision) {
   var resolvedClass = isDeny ? "resolved-denied" : "resolved-allowed";
   container.classList.add(resolvedClass);
 
-  var label = planLabelMap[decision] || (decision === "deny" ? "Denied" : "Allowed");
+  var label = planLabelMap[decision] || (decision === "deny" ? "Denied" : decision === "allow_always" ? "Allowed for session" : "Allowed");
   var actions = container.querySelector(".permission-actions") || container.querySelector(".plan-permission-actions");
   if (actions) {
     actions.innerHTML = '<span class="permission-decision-label">' + label + '</span>';