synabun 2.0.10 → 2.2.0

package/neural-interface/public/shared/ui-terminal.js

@@ -4,7 +4,7 @@
 // ═══════════════════════════════════════════
 //
 // Provides a docked bottom terminal panel with tabbed sessions.
-// Profiles: Claude Code, Codex CLI, Gemini CLI, Shell.
+// Profiles: Claude Code, Codex CLI, Antigravity CLI, OpenCode, Shell.
 
 import { state, emit, on } from './state.js';
 import { KEYS } from './constants.js';
@@ -14,6 +14,7 @@ import { registerAction } from './ui-keybinds.js';
 import { isGuest, hasPermission } from './ui-sync.js';
 import { getWhiteboardElementById } from './ui-whiteboard.js';
 import { createFrameRenderer } from './utils.js';
+import { frameRect, onFrameChange, clampBox, clampBoxLoose } from './app-frame.js';
 import { notify, NOTIF_TYPE } from './ui-notifications.js';
 import { getProviderMeta } from './provider-icons.js';
 import { readinessKind, typeWhenReady } from './term-ready.js';
@@ -22,13 +23,12 @@ import { mountAssistant } from './assistant/asst-panel.js';
 import { getAssistantSession } from './assistant/asst-api.js';
 import { mascotCameoSvg } from './synabun-mascot.js';
 import { brainLabel, normalizeBrain, readStoredBrain, restoredSessionName, sessionNameGivenUp } from './assistant/asst-state.js';
-import { initAssistant, registerAssistantHost, openAssistant, assistantOwnerOf, fetchLiveAssistantSessions, isAssistantSessionLive } from './ui-assistant.js';
+import { initAssistant, registerAssistantHost, openAssistant, assistantOwnerOf, readLiveAssistantSessions, assistantBlocked, isAssistantSessionLive } from './ui-assistant.js';
 
 const $ = (id) => document.getElementById(id);
-const CLI_PROFILES = new Set(['claude-code', 'codex', 'gemini', 'opencode']);
-const NOTIF_TRACKED_CLI_PROFILES = new Set(['claude-code', 'codex', 'gemini', 'opencode']);
-const CLI_PROFILES_NEED_PROFILER = new Set(['codex', 'gemini']); // Claude Code has tool search — no profiler needed
-const CLI_PROFILES_NEED_RECALL = new Set(['claude-code', 'codex', 'gemini', 'opencode']);
+const CLI_PROFILES = new Set(['claude-code', 'codex', 'antigravity', 'opencode']);
+const NOTIF_TRACKED_CLI_PROFILES = new Set(['claude-code', 'codex', 'antigravity', 'opencode']);
+const CLI_PROFILES_NEED_RECALL = new Set(['claude-code', 'codex', 'antigravity', 'opencode']);
 
 // ── Platform ──
 // macOS gets Terminal.app keys (Cmd shortcuts, Option word-jumps, Ctrl keys
@@ -144,7 +144,7 @@ function _injectPathIntoTerm(term, ws, path) {
 
 const SVG_CLAUDE = '<svg viewBox="0 0 24 24" fill="currentColor"><path d="M4.709 15.955l4.72-2.647.08-.23-.08-.128H9.2l-.79-.048-2.698-.073-2.339-.097-2.266-.122-.571-.121L0 11.784l.055-.352.48-.321.686.06 1.52.103 2.278.158 1.652.097 2.449.255h.389l.055-.157-.134-.098-.103-.097-2.358-1.596-2.552-1.688-1.336-.972-.724-.491-.364-.462-.158-1.008.656-.722.881.06.225.061.893.686 1.908 1.476 2.491 1.833.365.304.145-.103.019-.073-.164-.274-1.355-2.446-1.446-2.49-.644-1.032-.17-.619a2.97 2.97 0 01-.104-.729L6.283.134 6.696 0l.996.134.42.364.62 1.414 1.002 2.229 1.555 3.03.456.898.243.832.091.255h.158V9.01l.128-1.706.237-2.095.23-2.695.08-.76.376-.91.747-.492.584.28.48.685-.067.444-.286 1.851-.559 2.903-.364 1.942h.212l.243-.242.985-1.306 1.652-2.064.73-.82.85-.904.547-.431h1.033l.76 1.129-.34 1.166-1.064 1.347-.881 1.142-1.264 1.7-.79 1.36.073.11.188-.02 2.856-.606 1.543-.28 1.841-.315.833.388.091.395-.328.807-1.969.486-2.309.462-3.439.813-.042.03.049.061 1.549.146.662.036h1.622l3.02.225.79.522.474.638-.079.485-1.215.62-1.64-.389-3.829-.91-1.312-.329h-.182v.11l1.093 1.068 2.006 1.81 2.509 2.33.127.578-.322.455-.34-.049-2.205-1.657-.851-.747-1.926-1.62h-.128v.17l.444.649 2.345 3.521.122 1.08-.17.353-.608.213-.668-.122-1.374-1.925-1.415-2.167-1.143-1.943-.14.08-.674 7.254-.316.37-.729.28-.607-.461-.322-.747.322-1.476.389-1.924.315-1.53.286-1.9.17-.632-.012-.042-.14.018-1.434 1.967-2.18 2.945-1.726 1.845-.414.164-.717-.37.067-.662.401-.589 2.388-3.036 1.44-1.882.93-1.086-.006-.158h-.055L4.132 18.56l-1.13.146-.487-.456.061-.746.231-.243 1.908-1.312-.006.006z"/></svg>';
 const SVG_OPENAI = '<svg viewBox="0 0 24 24" fill="currentColor"><path d="M9.205 8.658v-2.26c0-.19.072-.333.238-.428l4.543-2.616c.619-.357 1.356-.523 2.117-.523 2.854 0 4.662 2.212 4.662 4.566 0 .167 0 .357-.024.547l-4.71-2.759a.797.797 0 00-.856 0l-5.97 3.473zm10.609 8.8V12.06c0-.333-.143-.57-.429-.737l-5.97-3.473 1.95-1.118a.433.433 0 01.476 0l4.543 2.617c1.309.76 2.189 2.378 2.189 3.948 0 1.808-1.07 3.473-2.76 4.163zM7.802 12.703l-1.95-1.142c-.167-.095-.239-.238-.239-.428V5.899c0-2.545 1.95-4.472 4.591-4.472 1 0 1.927.333 2.712.928L8.23 5.067c-.285.166-.428.404-.428.737v6.898zM12 15.128l-2.795-1.57v-3.33L12 8.658l2.795 1.57v3.33L12 15.128zm1.796 7.23c-1 0-1.927-.332-2.712-.927l4.686-2.712c.285-.166.428-.404.428-.737v-6.898l1.974 1.142c.167.095.238.238.238.428v5.233c0 2.545-1.974 4.472-4.614 4.472zm-5.637-5.303l-4.544-2.617c-1.308-.761-2.188-2.378-2.188-3.948A4.482 4.482 0 014.21 6.327v5.423c0 .333.143.571.428.738l5.947 3.449-1.95 1.118a.432.432 0 01-.476 0zm-.262 3.9c-2.688 0-4.662-2.021-4.662-4.519 0-.19.024-.38.047-.57l4.686 2.71c.286.167.571.167.856 0l5.97-3.448v2.26c0 .19-.07.333-.237.428l-4.543 2.616c-.619.357-1.356.523-2.117.523zm5.899 2.83a5.947 5.947 0 005.827-4.756C22.287 18.339 24 15.84 24 13.296c0-1.665-.713-3.282-1.998-4.448.119-.5.19-.999.19-1.498 0-3.401-2.759-5.947-5.946-5.947-.642 0-1.26.095-1.88.31A5.962 5.962 0 0010.205 0a5.947 5.947 0 00-5.827 4.757C1.713 5.447 0 7.945 0 10.49c0 1.666.713 3.283 1.998 4.448-.119.5-.19 1-.19 1.499 0 3.401 2.759 5.946 5.946 5.946.642 0 1.26-.095 1.88-.309a5.96 5.96 0 004.162 1.713z"/></svg>';
-const SVG_GEMINI = '<svg viewBox="0 0 24 24" fill="currentColor"><path d="M20.616 10.835a14.147 14.147 0 01-4.45-3.001 14.111 14.111 0 01-3.678-6.452.503.503 0 00-.975 0 14.134 14.134 0 01-3.679 6.452 14.155 14.155 0 01-4.45 3.001c-.65.28-1.318.505-2.002.678a.502.502 0 000 .975c.684.172 1.35.397 2.002.677a14.147 14.147 0 014.45 3.001 14.112 14.112 0 013.679 6.453.502.502 0 00.975 0c.172-.685.397-1.351.677-2.003a14.145 14.145 0 013.001-4.45 14.113 14.113 0 016.453-3.678.503.503 0 000-.975 13.245 13.245 0 01-2.003-.678z"/></svg>';
+const SVG_ANTIGRAVITY = '<svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M4.5 20 12 4l7.5 16"/><path d="M8.2 20a3.8 3.8 0 0 1 7.6 0"/></svg>';
 const SVG_OPENCODE = '<svg viewBox="0 0 240 300" fill="currentColor"><path fill-rule="evenodd" d="M0 0h240v300H0V0zm60 60v180h120V60H60z"/><rect x="60" y="120" width="120" height="120" opacity=".45"/></svg>';
 const SVG_SHELL = '<svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><polyline points="4 17 10 11 4 5"/><line x1="12" y1="19" x2="20" y2="19"/></svg>';
 const SVG_GIT = '<svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><line x1="6" y1="3" x2="6" y2="15"/><circle cx="18" cy="6" r="3"/><circle cx="6" cy="18" r="3"/><path d="M18 9a9 9 0 0 1-9 9"/></svg>';
@@ -156,7 +156,7 @@ const PROFILES = [
   { id: 'assistant',   label: 'Assistant',   svg: SVG_ASSISTANT, color: '#FFD23C' }, // non-PTY: hosts assistant/asst-panel.js
   { id: 'claude-code', label: 'Claude Code', svg: SVG_CLAUDE,  color: '#D4A27F' },
   { id: 'codex',       label: 'Codex CLI',   svg: SVG_OPENAI,  color: '#74c7a5' },
-  { id: 'gemini',      label: 'Gemini CLI',  svg: SVG_GEMINI,    color: '#669DF6' },
+  { id: 'antigravity', label: 'Antigravity CLI', svg: SVG_ANTIGRAVITY, color: '#669DF6' },
   { id: 'opencode',    label: 'OpenCode',    svg: SVG_OPENCODE, color: '#E8E0DC' },
   { id: 'shell',       label: 'Shell',       svg: SVG_SHELL,    color: '#aaaaaa' },
   { id: 'browser',     label: 'Browser',     svg: SVG_BROWSER, color: '#4fc3f7' },
@@ -248,6 +248,12 @@ let _closingIds = new Set();   // session IDs currently being closed (prevents r
 let _opening = false;          // true while openSession/openBrowserSession is in progress
 let _openingAt = 0;            // timestamp when _opening was set true (auto-reset after 15s)
 let _restoringLayout = false;  // true during reconnect+layout restore (suppresses layout saves)
+// Saved Assistant tabs whose session list could not be read yet (server still starting).
+// Kept in the registry on every save until a read succeeds; never pruned on a failed read.
+let _waitingAssistant = [];
+let _waitingAssistantTimer = null;
+const _waitingPlace = new Map(); // waiting Assistant tab id → { float, order, pane, paneActive, switches } from the saved layout
+const ASSISTANT_RESTORE_RETRY_MS = [500, 1000, 2000, 4000, 8000, 15_000];
 let _windowResizeTimer = null; // debounce handle for window resize clamping
 
 // ── Split pane state ──
@@ -256,6 +262,7 @@ let _focusedPane = 0;             // 0=left, 1=right — which pane has keyboard
 let _paneAssignments = new Map(); // sessionId → 0|1 (which pane a session belongs to)
 let _activePaneIdx = [-1, -1];    // per-pane active session index (into _sessions)
 let _splitRatio = 0.5;            // left pane width fraction (0.3–0.7)
+let _paneSwitches = [0, 0];       // per-pane count of tab switches outside a restore
 
 const DEFAULT_HEIGHT = 320;
 const MIN_HEIGHT = 120;
@@ -617,79 +624,6 @@ function _cliBadgeHtml(sessionId) {
     : '';
 }
 
-// ── Floating terminal MCP profile dropdown ──
-
-let _floatProfileCache = null;
-let _floatProfileCacheTime = 0;
-
-async function _fetchFloatProfiles() {
-  const now = Date.now();
-  if (_floatProfileCache && now - _floatProfileCacheTime < 60000) return _floatProfileCache;
-  try {
-    const resp = await fetch('/api/mcp/profile');
-    const data = await resp.json();
-    if (data.ok) {
-      _floatProfileCache = { current: data.profile || 'full', presets: data.presets || {} };
-      _floatProfileCacheTime = now;
-    }
-  } catch {}
-  return _floatProfileCache || { current: 'full', presets: {} };
-}
-
-function _initFloatProfileDropdown(dd) {
-  const btn = dd.querySelector('.term-float-profile-btn');
-  const menu = dd.querySelector('.term-float-profile-menu');
-  const label = dd.querySelector('.term-float-profile-label');
-
-  // Load current profile label
-  _fetchFloatProfiles().then(data => {
-    const p = data.presets[data.current];
-    label.textContent = p?.label || data.current;
-  });
-
-  btn.addEventListener('click', async (e) => {
-    e.stopPropagation();
-    const wasOpen = menu.classList.contains('open');
-    // Close all other open profile menus
-    document.querySelectorAll('.term-float-profile-menu.open').forEach(m => m.classList.remove('open'));
-    if (wasOpen) return;
-
-    const data = await _fetchFloatProfiles();
-    menu.innerHTML = '';
-    for (const [id, preset] of Object.entries(data.presets)) {
-      const opt = document.createElement('div');
-      opt.className = 'term-float-profile-option' + (id === data.current ? ' selected' : '');
-      opt.innerHTML = `<span class="tfp-name">${_escHtml(String(preset.label || id))}</span><span class="tfp-hint">${_escHtml(String(preset.tools))} tools</span>`;
-      opt.addEventListener('click', async (ev) => {
-        ev.stopPropagation();
-        menu.classList.remove('open');
-        if (id === data.current) return;
-        label.textContent = preset.label || id;
-        try {
-          await fetch('/api/mcp/profile', {
-            method: 'POST',
-            headers: { 'Content-Type': 'application/json' },
-            body: JSON.stringify({ profile: id }),
-          });
-          _floatProfileCache = null; // bust cache
-          // Update all other floating profile dropdowns
-          document.querySelectorAll('.term-float-profile-label').forEach(lbl => {
-            lbl.textContent = preset.label || id;
-          });
-        } catch {}
-      });
-      menu.appendChild(opt);
-    }
-    menu.classList.add('open');
-
-    // Close on outside click
-    const close = (ev) => {
-      if (!dd.contains(ev.target)) { menu.classList.remove('open'); document.removeEventListener('mousedown', close); }
-    };
-    setTimeout(() => document.addEventListener('mousedown', close), 0);
-  });
-}
-
 // ── Floating terminal Recall profile dropdown ──
 
 const FLOAT_RECALL_META = [
@@ -1683,6 +1617,7 @@ function saveSessionRegistry() {
       brain: s._isAssistant ? (s._brain || prev?.brain || null) : null,
     });
   }
+  for (const w of _waitingAssistant) if (!seen.has(w.id)) seen.set(w.id, w);
   storage.setItem(KEYS.TERMINAL_SESSIONS, JSON.stringify([...seen.values()]));
 }
 
@@ -1719,6 +1654,14 @@ function saveTerminalLayout() {
   if (_restoringLayout) return; // don't overwrite saved layout during reconnect
   try {
     const snap = getTerminalSnapshot();
+    // A float still waiting for its session keeps its saved place.
+    for (const w of _waitingAssistant) {
+      const float = _waitingPlace.get(w.id)?.float;
+      if (float && !snap.detachedTabs.some(dt => dt.sessionId === w.id)) snap.detachedTabs.push(float);
+      // …and a docked one its split pane.
+      const pane = _waitingPlace.get(w.id)?.pane;
+      if (snap.splitMode && pane != null && !(w.id in snap.paneAssignments)) snap.paneAssignments[w.id] = pane;
+    }
     storage.setItem(KEYS.TERMINAL_SESSIONS + '-layout', JSON.stringify(snap));
   } catch {}
 }
@@ -2322,24 +2265,22 @@ function detachPanel() {
   // so left margin matches right margin — accounts for left sidebars and right sidepanel)
   let pos;
   try { pos = JSON.parse(storage.getItem(KEYS.TERMINAL_FLOAT_POS)); } catch {}
+  const f = frameRect();
   if (!pos) {
-    const cs = getComputedStyle(document.documentElement);
-    const leftEdge = (parseFloat(cs.getPropertyValue('--explorer-width')) || 0)
-                   + (parseFloat(cs.getPropertyValue('--file-explorer-width')) || 0);
-    const rightEdge = window.innerWidth - getRightPanelReservedWidth(cs);
+    const { left: leftEdge, right: rightEdge } = _usableArea(f);
     const usableW = Math.max(0, rightEdge - leftEdge);
     const w = Math.min(800, usableW * 0.6);
     const h = Math.min(500, dockedH);
     pos = {
       left: leftEdge + (usableW - w) / 2,
-      top: Math.max(48, (window.innerHeight - h) / 2),
+      top: Math.max(f.top, f.top + (f.height - h) / 2),
       width: w, height: h,
     };
   }
 
   _panel.classList.add('detached');
-  _panel.style.left = pos.left + 'px';
-  _panel.style.top = Math.max(48, pos.top) + 'px';
+  _panel.style.left = Math.max(f.left, Math.min(pos.left, f.right - 80)) + 'px';
+  _panel.style.top = Math.max(f.top, Math.min(pos.top, f.bottom - 80)) + 'px';
   _panel.style.width = pos.width + 'px';
   _panel.style.height = pos.height + 'px';
 
@@ -2436,7 +2377,7 @@ function initFloatDrag() {
   // Header drag for floating mode
   function _startPanelDrag(x, y) {
     const rect = _panel.getBoundingClientRect();
-    _floatDrag = { startX: x, startY: y, startL: rect.left, startT: rect.top };
+    _floatDrag = { startX: x, startY: y, startL: rect.left, startT: rect.top, w: rect.width, h: rect.height, frame: frameRect() };
     pendingPanelDrag = null;
     _panel.classList.add('float-dragging');
     document.body.classList.add('ui-interacting');
@@ -2452,7 +2393,10 @@ function initFloatDrag() {
       finalL = Math.round(finalL / gs) * gs;
       finalT = Math.round(finalT / gs) * gs;
     }
-    finalT = Math.max(48, finalT);
+    // Inside the app frame: the header stays below the bar, 80px of the window stays in reach
+    const f = _floatDrag.frame || (_floatDrag.frame = frameRect());
+    const w = _floatDrag.w || 0, h = _floatDrag.h || 0;
+    ({ x: finalL, y: finalT } = clampBoxLoose(finalL, finalT, w, h, f, 80));
     // Transform during drag (composited, no layout); committed on dragend
     _floatDrag.lastL = finalL;
     _floatDrag.lastT = finalT;
@@ -2546,7 +2490,11 @@ function initFloatResize() {
       nl = Math.round(nl / gs) * gs; nt = Math.round(nt / gs) * gs;
       nw = Math.round(nw / gs) * gs; nh = Math.round(nh / gs) * gs;
     }
-    nt = Math.max(48, nt);
+    const f = frameRect();
+    if (nt < f.top) { if (dir.includes('n')) nh -= f.top - nt; nt = f.top; }
+    if (nl < f.left) { if (dir.includes('w')) nw -= f.left - nl; nl = f.left; }
+    nw = Math.max(MIN_W, Math.min(nw, f.right - nl));
+    nh = Math.max(MIN_H, Math.min(nh, f.bottom - nt));
     _panel.style.left = nl + 'px';
     _panel.style.top = nt + 'px';
     _panel.style.width = nw + 'px';
@@ -2653,10 +2601,12 @@ function initResizeHandle() {
     _draggingResize = true;
     document.body.classList.add('ui-interacting');
     graphLayers = [$('graph-container'), $('static-bg')].filter(Boolean);
+    // Up to 80% of the window, and never past the top of the app frame (its 12px inner padding kept)
+    const dockBottom = _panel.getBoundingClientRect().bottom;
+    const maxH = Math.max(MIN_HEIGHT, Math.min(window.innerHeight * 0.8, dockBottom - frameRect().top - 12));
 
     const onMove = (e) => {
       const dy = startY - e.clientY;
-      const maxH = window.innerHeight * 0.8;
       const newH = Math.max(MIN_HEIGHT, Math.min(maxH, startH + dy));
       scheduleHeight(newH);
     };
@@ -3596,6 +3546,107 @@ function _assistantOwnedElsewhere(sessionId) {
 }
 
 /** Reconnect a saved assistant tab (registry / workspace) to its live server session. */
+/** Keep saved Assistant tabs while the session list cannot be read, and retry the read. */
+function _waitAssistantRestore(entries, { layout = null, order = [] } = {}) {
+  const known = new Set(_waitingAssistant.map(w => w.id));
+  for (const e of entries) {
+    if (!known.has(e.id)) _waitingAssistant.push(e);
+    // Where the tab was: its float (position, size) from the saved layout, or its docked place.
+    const float = (layout?.detachedTabs || []).find(dt => dt?.sessionId === e.id) || null;
+    // In split mode, its pane and whether it was that pane's active tab.
+    const p = layout?.splitMode ? layout.paneAssignments?.[e.id] : null;
+    const pane = p === 0 || p === 1 ? p : null;
+    const paneActive = pane != null && (layout.sessions || [])[layout.activePaneIdx?.[pane]]?.id === e.id;
+    _waitingPlace.set(e.id, { float, order: order.map(o => o.id), pane, paneActive, switches: null });
+  }
+  if (_waitingAssistantTimer) return;
+  const attempt = async (n) => {
+    _waitingAssistantTimer = null;
+    if (!_waitingAssistant.length || assistantBlocked()) return;
+    const live = await readLiveAssistantSessions();
+    if (!live) {
+      // Out of retries: the entries stay saved for the next page load.
+      if (n < ASSISTANT_RESTORE_RETRY_MS.length) _waitingAssistantTimer = setTimeout(() => attempt(n + 1), ASSISTANT_RESTORE_RETRY_MS[n]);
+      return;
+    }
+    const waiting = _waitingAssistant;
+    _waitingAssistant = [];
+    // A late restore is silent: no panel opened, the active tab kept, each tab back where it was saved.
+    const active = _sessions[_activeIdx] || null;
+    const restored = [];
+    _restoringLayout = true;
+    try {
+      for (const saved of waiting) {
+        if (!live.has(saved.id) || _sessions.some(s => s.id === saved.id)) continue;
+        try { const s = await reconnectAssistantSession(saved.id, live.get(saved.id), saved); if (s) restored.push(s); }
+        catch (err) { console.warn('[assistant] reconnect failed:', saved.id, err); }
+      }
+    } finally { _restoringLayout = false; }
+    if (active) _activeIdx = _sessions.indexOf(active);
+    for (const s of restored) _placeLateAssistant(s, _waitingPlace.get(s.id));
+    _waitingPlace.clear();
+    if (active) _activeIdx = _sessions.indexOf(active);
+    else {
+      // Nothing was active: the first docked tab is, unhidden for when the panel is opened.
+      _activeIdx = _sessions.findIndex(s => !_detachedTabs.has(s.id));
+      const first = _sessions[_activeIdx];
+      if (first?.viewport) first.viewport.style.display = '';
+    }
+    renderTabBar();
+    saveSessionRegistry(); // prunes the ones whose sessions are really gone
+    saveTerminalLayout();
+  };
+  _waitingAssistantTimer = setTimeout(() => attempt(1), ASSISTANT_RESTORE_RETRY_MS[0]);
+}
+
+/** The restore that started the wait is done: pane switches from now on are the user's. */
+function _markLatePaneSwitches() {
+  for (const place of _waitingPlace.values()) if (!place.switches) place.switches = [..._paneSwitches];
+}
+
+/** A tab a late restore mounted goes where it was saved: its float, or its docked place in the saved order (and split pane). */
+function _placeLateAssistant(session, place) {
+  if (place?.float) {
+    if (session.viewport) session.viewport.style.display = '';
+    applyTerminalLayout({ detachedTabs: [place.float] });
+    return;
+  }
+  if (!_splitMode) { _orderLateAssistant(session, place?.order || []); return; }
+  // Split is on, so both panes exist: its saved pane, else its neighbour's. The user's layout stays as it is.
+  const paneActiveIds = _activePaneIdx.map(i => _sessions[i]?.id ?? null);
+  const pane = place?.pane ?? null;
+  let order = place?.order || [];
+  if (pane != null) order = order.filter(id => id === session.id || _paneAssignments.get(id) === pane);
+  const neighbour = _orderLateAssistant(session, order);
+  const target = pane ?? _paneAssignments.get(neighbour?.id) ?? _focusedPane;
+  _paneAssignments.set(session.id, target);
+  _panel?.querySelector(`.term-pane[data-pane="${target}"] .term-pane-body`)?.appendChild(session.viewport);
+  _activePaneIdx = paneActiveIds.map(id => _sessions.findIndex(s => s.id === id));
+  // It was the pane's active tab and nobody switched tabs there since: it is again.
+  const untouched = place?.switches && place.switches[target] === _paneSwitches[target];
+  if (pane != null && place.paneActive && untouched) switchToSessionInPane(_sessions.indexOf(session), target);
+  else if (session.viewport) session.viewport.style.display = 'none';
+}
+
+/** Move a late tab next to its nearest neighbour in `order`; returns that neighbour (or null). */
+function _orderLateAssistant(session, order) {
+  const at = order.indexOf(session.id);
+  if (at < 0) return null; // not in the saved order: it stays last
+  const from = _sessions.indexOf(session);
+  _sessions.splice(from, 1);
+  // After the nearest tab saved before it, else before the nearest saved after it, else last.
+  let to = _sessions.length;
+  const before = order.slice(0, at).reverse().map(id => _sessions.findIndex(s => s.id === id)).find(i => i >= 0);
+  if (before !== undefined) to = before + 1;
+  else {
+    const after = order.slice(at + 1).map(id => _sessions.findIndex(s => s.id === id)).find(i => i >= 0);
+    if (after !== undefined) to = after;
+  }
+  const neighbour = _sessions[to] || _sessions[to - 1] || null;
+  _sessions.splice(to, 0, session);
+  return neighbour;
+}
+
 async function reconnectAssistantSession(sessionId, live, saved) {
   if (_assistantOwnedElsewhere(sessionId)) return null;
   let meta = live || null;
@@ -4180,12 +4231,13 @@ function initContextMenu(viewport, term, getWs) {
     menu.style.top = '0px';
     menu.classList.add('open');
     const rect = menu.getBoundingClientRect();
+    const f = frameRect();
     let x = e.clientX;
     let y = e.clientY;
-    if (x + rect.width > window.innerWidth) x = window.innerWidth - rect.width - 4;
-    if (y + rect.height > window.innerHeight) y = e.clientY - rect.height;
-    if (x < 0) x = 4;
-    if (y < 0) y = 4;
+    if (x + rect.width > f.right) x = f.right - rect.width - 4;
+    if (y + rect.height > f.bottom) y = e.clientY - rect.height;
+    if (x < f.left) x = f.left + 4;
+    if (y < f.top) y = f.top + 4;
     menu.style.left = x + 'px';
     menu.style.top = y + 'px';
 
@@ -4415,7 +4467,8 @@ function sendMemoryDrop(node, ws) {
   ws.send(JSON.stringify({ type: 'memory_drop', content, title }));
 }
 
-function formatMemoryForCLI(node) {
+// Also what the context menu sends to the AI panel (ui-context-menu.js).
+export function formatMemoryForCLI(node) {
   const p = node.payload;
   const parts = [];
 
@@ -4551,10 +4604,11 @@ function _placeFloatColorPicker(picker, colorBtn) {
   const inset = first ? first.left + first.width / 2 - box.left : 0;
   const margin = 8, gap = 6;
   const left = btn.left + btn.width / 2 - inset;
+  const f = frameRect();
   let top = btn.top - gap - box.height;
-  if (top < margin) top = btn.bottom + gap;
-  picker.style.left = Math.max(margin, Math.min(left, window.innerWidth - box.width - margin)) + 'px';
-  picker.style.top = Math.max(margin, Math.min(top, window.innerHeight - box.height - margin)) + 'px';
+  if (top < f.top + margin) top = btn.bottom + gap;
+  picker.style.left = Math.max(f.left + margin, Math.min(left, f.right - box.width - margin)) + 'px';
+  picker.style.top = Math.max(f.top + margin, Math.min(top, f.bottom - box.height - margin)) + 'px';
 }
 
 function getRightPanelReservedWidth(cs = getComputedStyle(document.documentElement)) {
@@ -4563,17 +4617,24 @@ function getRightPanelReservedWidth(cs = getComputedStyle(document.documentEleme
     || 0;
 }
 
+/** The app frame's area left for the floats: right of the explorers, left of a docked right sidepanel (its reserved
+ *  width counts from the window's right edge), below the bar. */
+function _usableArea(f = frameRect(), cs = getComputedStyle(document.documentElement)) {
+  const reserved = getRightPanelReservedWidth(cs);
+  return { left: f.left, top: f.top, right: Math.max(f.left, Math.min(f.right, window.innerWidth - reserved)), bottom: f.bottom };
+}
+
 /** Update snapped-edge classes on all floating tabs based on adjacency */
-/** Compute viewport/panel snap boundaries (getComputedStyle reads — cache during drag) */
+/** Compute frame/panel snap boundaries (getComputedStyle reads — cache during drag) */
 function _snapEnv() {
-  const cs = getComputedStyle(document.documentElement);
-  const explorerW = parseFloat(cs.getPropertyValue('--explorer-width')) || 0;
-  const fileExplorerW = parseFloat(cs.getPropertyValue('--file-explorer-width')) || 0;
+  const f = frameRect();
+  const area = _usableArea(f);
   return {
-    leftPanelEdge: explorerW + fileExplorerW,
-    rightPanelEdge: window.innerWidth - getRightPanelReservedWidth(cs),
-    topEdge: parseFloat(cs.getPropertyValue('--navbar-height')) || 48,
-    bottomEdge: window.innerHeight,
+    leftPanelEdge: f.left,
+    rightPanelEdge: area.right,
+    frameRight: f.right,
+    topEdge: f.top,
+    bottomEdge: f.bottom,
   };
 }
 
@@ -4591,7 +4652,7 @@ function _updateSnappedEdges(rectsOverride, envOverride) {
     }
   }
 
-  const { leftPanelEdge, rightPanelEdge, topEdge, bottomEdge } = envOverride || _snapEnv();
+  const { leftPanelEdge, rightPanelEdge, frameRight, topEdge, bottomEdge } = envOverride || _snapEnv();
 
   for (const [sid, dt] of _detachedTabs) {
     if (!dt.el || dt.minimized) continue;
@@ -4611,8 +4672,8 @@ function _updateSnappedEdges(rectsOverride, envOverride) {
     }
 
     // Check adjacency to viewport / panel edges
-    if (Math.abs(me.left - leftPanelEdge) < TOLERANCE || Math.abs(me.left) < TOLERANCE) edges.left = true;
-    if (Math.abs(me.right - rightPanelEdge) < TOLERANCE || Math.abs(me.right - window.innerWidth) < TOLERANCE) edges.right = true;
+    if (Math.abs(me.left - leftPanelEdge) < TOLERANCE) edges.left = true;
+    if (Math.abs(me.right - rightPanelEdge) < TOLERANCE || Math.abs(me.right - frameRight) < TOLERANCE) edges.right = true;
     if (Math.abs(me.top - topEdge) < TOLERANCE) edges.top = true;
     if (Math.abs(me.bottom - bottomEdge) < TOLERANCE) edges.bottom = true;
 
@@ -4668,20 +4729,16 @@ export function tileFloatingTerminals() {
   }
   if (entries.length === 0) return;
 
-  // Compute available whiteboard area (respect open panels)
-  const cs = getComputedStyle(document.documentElement);
-  const explorerW = parseFloat(cs.getPropertyValue('--explorer-width')) || 0;
-  const fileExplorerW = parseFloat(cs.getPropertyValue('--file-explorer-width')) || 0;
-  const sidebarW = explorerW + fileExplorerW;
-  const rightPanelW = getRightPanelReservedWidth(cs);
+  // Compute the available area: the app frame, minus a docked right sidepanel and the docked terminal (which sits
+  // 12px inside the frame's bottom: the tiles stop at its top)
+  const area = _usableArea();
   const termPanel = document.getElementById('terminal-panel');
-  const termH = (termPanel && !termPanel.classList.contains('hidden') && !termPanel.classList.contains('detached'))
-    ? termPanel.getBoundingClientRect().height : 0;
-  const TOP_PAD = parseFloat(cs.getPropertyValue('--navbar-height')) || 48;
-  const areaL = sidebarW;
-  const areaT = TOP_PAD;
-  const areaW = window.innerWidth - sidebarW - rightPanelW;
-  const areaH = window.innerHeight - TOP_PAD - termH;
+  const termTop = (termPanel && !termPanel.classList.contains('hidden') && !termPanel.classList.contains('detached'))
+    ? termPanel.getBoundingClientRect().top : area.bottom;
+  const areaL = area.left;
+  const areaT = area.top;
+  const areaW = Math.max(0, area.right - area.left);
+  const areaH = Math.max(0, Math.min(area.bottom, termTop) - area.top);
 
   // Calculate grid: find best cols/rows to fill the space
   const n = entries.length;
@@ -4732,17 +4789,16 @@ function _defaultFloatRect(kind = {}) {
   const offset = _detachedTabs.size * 30;
   const isBrowser = kind.profile === 'browser';
   const isAssistant = !!kind._isAssistant || kind.profile === 'assistant';
-  const cs = getComputedStyle(document.documentElement);
-  const leftEdge = (parseFloat(cs.getPropertyValue('--explorer-width')) || 0)
-                 + (parseFloat(cs.getPropertyValue('--file-explorer-width')) || 0);
-  const rightEdge = window.innerWidth - getRightPanelReservedWidth(cs);
+  const f = frameRect();
+  const { left: leftEdge, right: rightEdge } = _usableArea(f);
   const usableW = Math.max(0, rightEdge - leftEdge);
   // Assistant floats default to 780×560 (chat + agents dock need more room than a TUI)
   const w = Math.round(Math.min(isBrowser ? 960 : (isAssistant ? 780 : 700), usableW * (isBrowser ? 0.65 : (isAssistant ? 0.6 : 0.5))));
-  const h = Math.round(Math.min(isBrowser ? 640 : (isAssistant ? 560 : 420), window.innerHeight * (isBrowser ? 0.6 : (isAssistant ? 0.7 : 0.5))));
+  const h = Math.round(Math.min(isBrowser ? 640 : (isAssistant ? 560 : 420), f.height * (isBrowser ? 0.6 : (isAssistant ? 0.7 : 0.5))));
+  const at = clampBox(leftEdge + (usableW - w) / 2 + offset, f.top + (f.height - h) / 2 + offset, w, h, f);
   return {
-    left: Math.round(leftEdge + (usableW - w) / 2 + offset),
-    top: Math.round(Math.max(48, (window.innerHeight - h) / 2 + offset)),
+    left: Math.round(at.x),
+    top: Math.round(at.y),
     width: w,
     height: h,
   };
@@ -4792,10 +4848,6 @@ function detachTab(idx, opts = {}) {
       <span class="term-float-tab-icon">${prof?.svg || SVG_SHELL}</span>
       <button class="term-float-color-strip" data-tooltip="Change color"></button>
       <span class="term-float-tab-title">${_escHtml(_displayLabel(session))}</span>${session._isAssistant ? '<span class="term-float-brain-chip" data-tooltip="Brain" hidden></span>' : ''}${_cliBadgeHtml(session.id)}
-      ${CLI_PROFILES_NEED_PROFILER.has(session.profile) ? `<div class="term-float-profile-dd" data-tooltip="Tool profile">
-        <button class="term-float-profile-btn"><span class="term-float-profile-label">...</span><span class="term-float-profile-arrow">&#x25BE;</span></button>
-        <div class="term-float-profile-menu"></div>
-      </div>` : ''}
       ${CLI_PROFILES_NEED_RECALL.has(session.profile) ? `<div class="term-float-recall-dd" data-tooltip="Recall profile">
         <button class="term-float-recall-btn"><span class="term-float-recall-label">...</span><span class="term-float-recall-arrow">&#x25BE;</span></button>
         <div class="term-float-recall-menu"></div>
@@ -5018,11 +5070,6 @@ function detachTab(idx, opts = {}) {
     });
   }
 
-  // Wire MCP profile dropdown (CLI profiles only)
-  const profileDd = win.querySelector('.term-float-profile-dd');
-  if (profileDd) {
-    _initFloatProfileDropdown(profileDd);
-  }
 
   // Wire recall profile dropdown
   const recallDd = win.querySelector('.term-float-recall-dd');
@@ -5306,7 +5353,7 @@ function initTabFloatDrag(win, sessionId) {
 
   function _checkHeader(target) {
     const header = target.closest('.term-float-tab-header');
-    if (!header || target.closest('button, .term-float-profile-dd')) return false;
+    if (!header || target.closest('button')) return false;
     const session = _sessions.find(s => s.id === sessionId);
     return !session?.pinned;
   }
@@ -5343,8 +5390,9 @@ function initTabFloatDrag(win, sessionId) {
     const KEEP = 80;
     const w = drag.startW || parseFloat(win.style.width) || 700;
     const h = drag.startH || parseFloat(win.style.height) || 420;
-    finalL = Math.max(KEEP - w, Math.min(finalL, window.innerWidth - KEEP));
-    finalT = Math.max(48, Math.min(finalT, window.innerHeight - KEEP));
+    const env = drag.snapEnv;
+    const frame = { left: env.leftPanelEdge, top: env.topEdge, right: env.frameRight, bottom: env.bottomEdge };
+    ({ x: finalL, y: finalT } = clampBoxLoose(finalL, finalT, w, h, frame, KEEP));
 
     // Snap to other floating windows (rects cached at drag start)
     const SNAP_DIST = 12;
@@ -5375,11 +5423,12 @@ function initTabFloatDrag(win, sessionId) {
         else if (Math.abs(myB - or.bottom) < SNAP_DIST) { finalT = or.bottom - h; snapped = true; }
       }
     }
-    // Also snap to viewport edges
-    if (Math.abs(finalL) < SNAP_DIST) { finalL = 0; snapped = true; }
-    if (Math.abs(finalT - 48) < SNAP_DIST) { finalT = 48; snapped = true; }
-    if (Math.abs(myR - window.innerWidth) < SNAP_DIST) { finalL = window.innerWidth - w; snapped = true; }
-    if (Math.abs(myB - window.innerHeight) < SNAP_DIST) { finalT = window.innerHeight - h; snapped = true; }
+    // Also snap to the app frame's edges (and a docked right sidepanel's)
+    if (Math.abs(finalL - frame.left) < SNAP_DIST) { finalL = frame.left; snapped = true; }
+    if (Math.abs(finalT - frame.top) < SNAP_DIST) { finalT = frame.top; snapped = true; }
+    if (Math.abs(myR - frame.right) < SNAP_DIST) { finalL = frame.right - w; snapped = true; }
+    else if (Math.abs(myR - env.rightPanelEdge) < SNAP_DIST) { finalL = env.rightPanelEdge - w; snapped = true; }
+    if (Math.abs(myB - frame.bottom) < SNAP_DIST) { finalT = frame.bottom - h; snapped = true; }
 
     win.classList.toggle('float-snapping', snapped);
     // Transform-based positioning: left/top force layout every frame; a
@@ -5498,7 +5547,9 @@ function initTabFloatResize(win, sessionId) {
       nl = Math.round(nl / gs) * gs; nt = Math.round(nt / gs) * gs;
       nw = Math.round(nw / gs) * gs; nh = Math.round(nh / gs) * gs;
     }
-    nt = Math.max(48, nt);
+    // The header never goes above the app frame's top (a top edge stops there, the bottom edge stays put)
+    const frameTop = frameRect().top;
+    if (nt < frameTop) { if (dir.includes('n')) nh = Math.max(MIN_H, nh - (frameTop - nt)); nt = frameTop; }
     win.style.left = nl + 'px';
     win.style.top = nt + 'px';
     win.style.width = nw + 'px';
@@ -5841,41 +5892,48 @@ export async function initTerminal() {
     }
   });
 
-  // ── Window resize — clamp floating tabs on screen, refit all terminals ──
+  // ── Window resize, an explorer opening or closing — keep the floats in the app frame, refit all terminals ──
+  const clampFloatsToFrame = () => {
+    const f = frameRect();
+    const KEEP = 80; // min px of tab that must remain visible
+    const floats = [..._detachedTabs.values()].filter(tabState => !tabState.minimized).map(tabState => tabState.el);
+    if (_detached && _panel && !_panel.classList.contains('hidden')) floats.push(_panel);
+
+    for (const el of floats) {
+      if (!el) continue;
+      let l = parseFloat(el.style.left) || 0;
+      let t = parseFloat(el.style.top) || 0;
+      let w = parseFloat(el.style.width) || 700;
+      let h = parseFloat(el.style.height) || 420;
+
+      // Clamp dimensions to the frame
+      w = Math.min(w, f.width);
+      h = Math.min(h, f.height);
+
+      // Clamp position so the header stays reachable, below the title bar and right of the explorers
+      ({ x: l, y: t } = clampBoxLoose(l, t, w, h, f, KEEP));
+
+      el.style.left = l + 'px';
+      el.style.top = t + 'px';
+      el.style.width = w + 'px';
+      el.style.height = h + 'px';
+    }
+
+    // Refit all terminals to new dimensions
+    _sessions.forEach(s => _scheduleFit(s));
+  };
   window.addEventListener('resize', () => {
     if (_windowResizeTimer) clearTimeout(_windowResizeTimer);
     _windowResizeTimer = setTimeout(() => {
       _windowResizeTimer = null;
-      const vw = window.innerWidth;
-      const vh = window.innerHeight;
-      const KEEP = 80; // min px of tab that must remain visible
-
-      for (const [, tabState] of _detachedTabs) {
-        if (tabState.minimized) continue;
-        const el = tabState.el;
-        let l = parseFloat(el.style.left) || 0;
-        let t = parseFloat(el.style.top) || 0;
-        let w = parseFloat(el.style.width) || 700;
-        let h = parseFloat(el.style.height) || 420;
-
-        // Clamp dimensions to viewport
-        w = Math.min(w, vw);
-        h = Math.min(h, vh);
-
-        // Clamp position so header stays reachable and below title bar
-        l = Math.max(KEEP - w, Math.min(l, vw - KEEP));
-        t = Math.max(48, Math.min(t, vh - KEEP));
-
-        el.style.left = l + 'px';
-        el.style.top = t + 'px';
-        el.style.width = w + 'px';
-        el.style.height = h + 'px';
-      }
-
-      // Refit all terminals to new dimensions
-      _sessions.forEach(s => _scheduleFit(s));
+      clampFloatsToFrame();
     }, 150);
   });
+  onFrameChange(() => {
+    if (_windowResizeTimer) return; // the resize pass runs shortly
+    clampFloatsToFrame();
+    _updateSnappedEdges();
+  });
 
   // ── Visibility change — flow control, warm renderers, one focus target ──
   document.addEventListener('visibilitychange', () => {
@@ -6055,7 +6113,7 @@ export async function initTerminal() {
   // Register CLI launch keybind actions (open as detached floating tab)
   registerAction('launch-claude',   () => launchDetached('claude-code'));
   registerAction('launch-codex',    () => launchDetached('codex'));
-  registerAction('launch-gemini',   () => launchDetached('gemini'));
+  registerAction('launch-antigravity', () => launchDetached('antigravity'));
   registerAction('launch-opencode', () => launchDetached('opencode'));
   registerAction('launch-browser',  () => openBrowserSession());
   registerAction('launch-youtube', () => openBrowserSession('https://www.youtube.com'));
@@ -6184,7 +6242,17 @@ export async function initTerminal() {
     const liveBrowserMap = _streamDisabled ? new Map() : new Map(liveBrowserSessions.map(s => [s.id, s]));
 
     // Fetch live assistant sessions (only when the registry has assistant tabs)
-    const liveAssistantMap = registry.some(r => r.profile === 'assistant') ? await fetchLiveAssistantSessions() : new Map();
+    // A failed read is not an empty list: keep those tabs waiting and retry.
+    let liveAssistantMap = new Map();
+    if (registry.some(r => r.profile === 'assistant')) {
+      const read = await readLiveAssistantSessions();
+      if (read) liveAssistantMap = read;
+      else {
+        let layout = null;
+        try { layout = JSON.parse(storage.getItem(KEYS.TERMINAL_SESSIONS + '-layout') || 'null'); } catch {}
+        _waitAssistantRestore(registry.filter(r => r.profile === 'assistant'), { layout, order: registry });
+      }
+    }
 
     const liveIds = new Set([...liveMap.keys(), ...liveBrowserMap.keys(), ...liveAssistantMap.keys()]);
 
@@ -6249,6 +6317,8 @@ export async function initTerminal() {
       _syncRenderers();
     }
 
+    _markLatePaneSwitches();
+
     // Clean up dead sessions from registry
     if (toReconnect.length !== registry.length) {
       saveSessionRegistry();
@@ -6482,11 +6552,13 @@ async function attachDetached(terminalSessionId, profile, initialMessage, autoSu
       if (dt?.el) {
         const panelWidth = getRightPanelReservedWidth();
         if (panelWidth > 0) {
-          const availWidth = window.innerWidth - panelWidth - 16;
-          const w = Math.min(700, availWidth * 0.6);
-          const h = Math.min(500, window.innerHeight - 96);
-          dt.el.style.left = (window.innerWidth - panelWidth - w - 24) + 'px';
-          dt.el.style.top = '56px';
+          // Beside the panel, 24px from its slot, at the top of the app frame
+          const f = frameRect();
+          const area = _usableArea(f);
+          const w = Math.min(700, Math.max(0, area.right - area.left - 16) * 0.6);
+          const h = Math.min(500, f.height - 40);
+          dt.el.style.left = Math.max(f.left, area.right - w - 24) + 'px';
+          dt.el.style.top = f.top + 'px';
           dt.el.style.width = w + 'px';
           dt.el.style.height = h + 'px';
         }
@@ -6669,10 +6741,11 @@ function applyTerminalLayout(snap) {
         const minW = 280, minH = 160;
         const w = Math.max(minW, dt.width || minW);
         const h = Math.max(minH, dt.height || minH);
-        const maxL = window.innerWidth - 80;
-        const maxT = window.innerHeight - 40;
-        const l = Math.max(0, Math.min(dt.left || 0, maxL));
-        const t = Math.max(48, Math.min(dt.top || 0, maxT));
+        const f = frameRect();
+        const maxL = f.right - 80;
+        const maxT = f.bottom - 40;
+        const l = Math.max(f.left, Math.min(dt.left || 0, maxL));
+        const t = Math.max(f.top, Math.min(dt.top || 0, maxT));
 
         tabState.el.style.left = l + 'px';
         tabState.el.style.top = t + 'px';
@@ -6764,7 +6837,12 @@ export async function restoreTerminalSnapshot(snap) {
     } catch {}
     const liveMap = new Map(liveSessions.map(s => [s.id, s]));
     const liveIds = new Set(liveMap.keys());
-    const liveAssistantMap = snap.sessions.some(s => s.profile === 'assistant') ? await fetchLiveAssistantSessions() : new Map();
+    let liveAssistantMap = new Map();
+    if (snap.sessions.some(s => s.profile === 'assistant')) {
+      const read = await readLiveAssistantSessions();
+      if (read) liveAssistantMap = read;
+      else _waitAssistantRestore(snap.sessions.filter(s => s.profile === 'assistant'), { layout: snap, order: snap.sessions });
+    }
 
     // Disconnect current sessions without killing server PTY
     disconnectAllSessions();
@@ -6801,6 +6879,7 @@ export async function restoreTerminalSnapshot(snap) {
   const firstDocked = _sessions.findIndex(s => !_detachedTabs.has(s.id));
   if (firstDocked >= 0 && !_splitMode) switchToSession(firstDocked, { force: true });
   _syncRenderers();
+  _markLatePaneSwitches();
 }
 
 // ══════════════════════════════════════════
@@ -7706,6 +7785,7 @@ function initSplitDivider() {
 function switchToSessionInPane(idx, pane) {
   if (idx < 0 || idx >= _sessions.length) return;
   _activePaneIdx[pane] = idx;
+  if (!_restoringLayout) _paneSwitches[pane]++;
 
   // Show/hide viewports within this pane only
   const paneBody = _panel?.querySelector(`.term-pane[data-pane="${pane}"] .term-pane-body`);