clay-server 5.2.0-beta.7 → 5.2.0-beta.9

package/lib/public/modules/split-group-restore.js

@@ -0,0 +1,68 @@
+import { store } from './store.js';
+import { getWs } from './ws-ref.js';
+import { getCachedSessions } from './sidebar-sessions.js';
+import { isCurrentProjectSessionReady } from './split-session-boundary.js';
+import { splitPanesMatchProject, reconcileRestoredSplit } from './project-activation.js';
+import { splitGroupMemberIds } from './split-group-helpers.js';
+import { splitPaneForSession } from './split-pane-reconciler.js';
+import { clearProjectSplitState } from './split-session-boundary.js';
+
+export function reconcileSplitIdentity(state, previous, host) {
+  var ownerChanged = (previous.authIdentityLoaded === true || state.splitIdentityHydrated) && state.myUserId !== previous.myUserId;
+  if (state.authIdentityLoaded && !state.splitIdentityHydrated) store.set({ splitIdentityHydrated: true });
+  if (state.currentSlug === previous.currentSlug && state.myUserId === previous.myUserId) return false;
+  Array.from(host.querySelectorAll('.split-pane-frame')).forEach(function (frame) {
+    if (frame.clayPane) frame.clayPane.suspend();
+  });
+  host.innerHTML = '';
+  if (ownerChanged) {
+    // This socket was authenticated as the previous owner. Fresh metadata on
+    // that connection cannot establish the replacement owner's pane boundary.
+    store.set({ splitIdentityBlockedSocket: getWs(), paneBindingSessions: [] });
+    clearProjectSplitState();
+  } else if (state.splitPanes) store.set({ splitPanes: null });
+  return true;
+}
+
+// The initial owner response can arrive after history and split metadata.
+// Wait for it so identity cleanup cannot discard panes we just restored.
+export function restoreSplitGroup(openGroup) {
+  var state = store.snap();
+  if (state.authIdentityLoaded === false || state.isMultiUserMode && !state.myUserId) return;
+  if (!isCurrentProjectSessionReady(state, getWs())) return;
+  var split = state.splitPanes;
+  if (split && !splitPanesMatchProject(split, state.currentSlug)) {
+    store.set({ splitPanes: null });
+    return;
+  }
+  if (state.paneMode) return;
+  if (split) {
+    var reconciliation = reconcileRestoredSplit(split, state.splitGroups);
+    if (reconciliation.action === "clear") {
+      store.set({ splitPanes: null });
+      return;
+    }
+    if (reconciliation.action === "rebuild") {
+      var rebuilt = reconciliation.group;
+      if (rebuilt.members.some(function (id) { return !getCachedSessions().some(function (session) { return session.id === id; }); })) {
+        store.set({ splitPanes: null });
+        return;
+      }
+      store.set({ splitPanes: {
+        groupId: rebuilt.id,
+        panes: splitGroupMemberIds(rebuilt).map(function (id) { return splitPaneForSession(id, state.currentSlug, getCachedSessions()); }),
+      } });
+    }
+    return;
+  }
+  var activeId = store.get('activeSessionId');
+  if (!activeId) return;
+  var groups = store.get('splitGroups') || [];
+  for (var i = 0; i < groups.length; i++) {
+    var members = groups[i].members || [];
+    if (members.indexOf(activeId) !== -1) {
+      openGroup(groups[i]);
+      return;
+    }
+  }
+}

package/lib/public/modules/split-pair-ui.js

@@ -236,6 +236,7 @@ function sendSetPair(groupId, driverId) {
 
 export function syncPairChrome(host, split) {
   if (!host || !split || !split.groupId) return;
+  if (Array.from(host.querySelectorAll('.split-pane-frame')).some(function (frame) { return !!frame.dataset.requestedSessionId; })) return;
   var groups = store.get('splitGroups') || [];
   var group = null;
   for (var i = 0; i < groups.length; i++) {

package/lib/public/modules/split-pane-reconciler.js

@@ -2,6 +2,11 @@
 // (and their iframe browsing contexts) are reused by stable project/session
 // identity while metadata and visual order are refreshed.
 
+export function splitPaneForSession(id, slug, sessions) {
+  var session = (sessions || []).find(function (item) { return item.id === id; });
+  return { slug: slug, sessionId: id, title: session && session.title || ('Session ' + id) };
+}
+
 export function splitPaneIdentity(pane) {
   return String(pane && pane.slug || "") + "#" + String(pane && pane.sessionId || "");
 }
@@ -16,9 +21,19 @@ export function reconcileSplitPanes(host, panes, createPane, updatePane) {
     var pane = desired[pi];
     var key = splitPaneIdentity(pane);
     var paneEl = byKey.get(key);
+    if (!paneEl) {
+      for (var ci = 0; ci < existing.length; ci++) {
+        var candidate = existing[ci], frame = candidate.querySelector('.split-pane-frame');
+        if (!used.has(candidate) && frame && frame.dataset.projectSlug === pane.slug && frame.clayPane &&
+          !desired.some(function (item) { return splitPaneIdentity(item) === candidate.dataset.splitPaneKey; })) {
+          paneEl = candidate; break;
+        }
+      }
+    }
     if (!paneEl) paneEl = createPane(pane, pi);
     paneEl.dataset.splitPaneKey = key;
     updatePane(paneEl, pane, pi);
+    if (paneEl.style) paneEl.style.order = String(pi);
     used.add(paneEl);
     if (!paneEl.parentNode) host.appendChild(paneEl);
   }

package/lib/public/modules/split-pane-renderer.js

@@ -6,6 +6,8 @@ import { formatTokens } from './app-panels.js';
 import { VENDOR_AVATARS, VENDOR_NAMES } from './app-rendering.js';
 import { createPermissionControl, bindPermissionControl, renderPermissionControl } from './permission-control.js';
 import { splitGroupRoles } from './split-group-helpers.js';
+import { paneTarget, livePaneBinding, samePaneTarget } from './pane-binding.js';
+import { syncPairChrome } from './split-pair-ui.js';
 
 function sessionById(sessionId) {
   var sessions = getCachedSessions() || [];
@@ -17,17 +19,31 @@ function paneUrl(pane) {
   return "/p/" + encodeURIComponent(pane.slug) + "/?pane=1&session=" + encodeURIComponent(pane.sessionId);
 }
 
+function headerBindingStamp(frame) {
+  var live = frame.clayPane && frame.clayPane.identity();
+  return JSON.stringify([frame.dataset.sessionId, frame.dataset.sessionOriginId,
+    live && live.binding && live.binding.requestId, live && live.binding && live.binding.generation]);
+}
+
 function startPaneRename(header, titleEl, pane) {
   if (header.querySelector(".split-pane-rename-input")) return;
   var input = document.createElement("input");
   input.type = "text"; input.className = "split-pane-rename-input"; input.value = pane.title;
   titleEl.style.display = "none"; header.insertBefore(input, titleEl); input.focus(); input.select();
   var done = false;
+  var section = header.parentNode, frame = section.querySelector('.split-pane-frame');
+  var origin = frame.dataset.sessionOriginId, binding = frame.clayPane && frame.clayPane.identity().binding, socket = getWs();
+  function current() {
+    var live = frame.clayPane && frame.clayPane.identity();
+    return header.isConnected && !header.inert && socket === getWs() && store.get('connected') &&
+      frame.dataset.sessionId === String(pane.sessionId) && frame.dataset.sessionOriginId === origin && !frame.dataset.requestedSessionId &&
+      (!frame.clayPane || livePaneBinding(frame) && live.binding === binding);
+  }
   function finish(commit) {
     if (done) return;
     done = true;
     var newTitle = input.value.trim(); input.remove(); titleEl.style.display = "";
-    if (!commit || !newTitle || newTitle === pane.title) return;
+    if (!commit || !current() || !newTitle || newTitle === pane.title) return;
     pane.title = newTitle; titleEl.textContent = newTitle;
     var ws = getWs();
     if (ws && ws.readyState === 1) ws.send(JSON.stringify({ type: "rename_session", id: pane.sessionId, title: newTitle }));
@@ -37,6 +53,7 @@ function startPaneRename(header, titleEl, pane) {
     if (event.key === "Escape") { event.preventDefault(); finish(false); }
   });
   input.addEventListener("blur", function () { finish(true); });
+  header.addEventListener('clay-pane-retarget', function cancel() { finish(false); header.removeEventListener('clay-pane-retarget', cancel); });
   input.addEventListener("click", function (event) { event.stopPropagation(); });
 }
 
@@ -73,33 +90,97 @@ export function createSplitPane(pane, closePane) {
   var vendorIcon = document.createElement("img"); vendorIcon.className = "split-pane-vendor";
   vendorIcon.src = VENDOR_AVATARS[vendor] || VENDOR_AVATARS.claude; vendorIcon.alt = ""; vendorIcon.title = VENDOR_NAMES[vendor] || vendor; header.appendChild(vendorIcon);
   var title = document.createElement("span"); title.className = "split-pane-title"; title.textContent = pane.title; title.title = "Rename session";
-  title.addEventListener("click", function () { startPaneRename(header, title, pane); }); header.appendChild(title);
+  title.addEventListener("click", function () { var current = sessionById(Number(paneEl.dataset.sessionId)); if (current) startPaneRename(header, title, { sessionId: current.id, title: current.title }); }); header.appendChild(title);
   var frame = document.createElement("iframe"); frame.className = "split-pane-frame"; frame.dataset.projectSlug = pane.slug;
   frame.dataset.sessionId = String(pane.sessionId); frame.src = paneUrl(pane); frame.title = pane.title;
+  frame.dataset.sessionOriginId = session && session.sessionOriginId || '';
+  header.addEventListener('pointerdown', function () { header.dataset.pointerSessionId = frame.dataset.sessionId; header.dataset.pointerBinding = headerBindingStamp(frame); });
+  header.addEventListener('click', function (event) {
+    if (frame.clayPane && (!livePaneBinding(frame) || event.detail && header.dataset.pointerBinding !== headerBindingStamp(frame))) {
+      event.preventDefault(); event.stopImmediatePropagation();
+    }
+  }, true);
+  ['keydown', 'keyup'].forEach(function (name) {
+    header.addEventListener(name, function (event) {
+      var stamp = headerBindingStamp(frame);
+      if (name === 'keydown' && !event.repeat) header.dataset.keyBinding = stamp;
+      if (header.inert || header.dataset.keyBinding !== stamp) { event.preventDefault(); event.stopImmediatePropagation(); }
+    }, true);
+  });
   var ctxChip = document.createElement("button"); ctxChip.type = "button"; ctxChip.className = "split-pane-context"; ctxChip.title = "Context usage";
   ctxChip.innerHTML = '<span class="split-pane-context-bar"><span class="split-pane-context-fill"></span></span><span class="split-pane-context-label"></span>';
-  ctxChip.addEventListener("click", function () { if (frame.contentWindow) frame.contentWindow.postMessage({ type: "clay-pane-toggle-context" }, window.location.origin); }); header.appendChild(ctxChip);
+  ctxChip.addEventListener("click", function () { if (frame.contentWindow && (!frame.clayPane || livePaneBinding(frame))) frame.contentWindow.postMessage({ type: "clay-pane-toggle-context", paneBinding: frame.clayPane && frame.clayPane.identity().binding }, window.location.origin); }); header.appendChild(ctxChip);
   var fullAccess = createPermissionControl("split-pane-full-access hidden", "Driver session permission mode");
-  updatePaneFullAccessButton(fullAccess, session); bindPermissionControl(fullAccess, function () { return permissionState(sessionById(pane.sessionId)); }); header.appendChild(fullAccess); header.insertBefore(fullAccess, ctxChip);
+  updatePaneFullAccessButton(fullAccess, session); bindPermissionControl(fullAccess, function () { return permissionState(sessionById(Number(paneEl.dataset.sessionId))); }); header.appendChild(fullAccess); header.insertBefore(fullAccess, ctxChip);
   var close = document.createElement("button"); close.type = "button"; close.className = "split-pane-close"; close.title = "Close pane"; close.setAttribute("aria-label", "Close pane"); close.innerHTML = iconHtml("x");
   close.dataset.sessionId = String(pane.sessionId); close.addEventListener("click", function () { closePane(Number(this.dataset.sessionId)); }); header.appendChild(close);
+  frame.addEventListener('clay-pane-ready', function () {
+    var id = Number(frame.dataset.requestedSessionId || frame.dataset.sessionId), current = sessionById(id);
+    var live = frame.clayPane && frame.clayPane.identity(), target = paneTarget(store.snap(), getCachedSessions(), id);
+    if (!current || !live || !live.ready || !samePaneTarget(target, live.binding) || live.sessionId !== id) return;
+    frame.dataset.sessionId = String(id); delete frame.dataset.requestedSessionId;
+    frame.dataset.sessionOriginId = live.binding.sessionOriginId;
+    updateSplitPaneMetadata(paneEl, { slug: frame.dataset.projectSlug, sessionId: id, title: current.title });
+    syncPairChrome(paneEl.parentNode, store.get('splitPanes'));
+  });
+  frame.addEventListener('clay-pane-activation-failed', function () {
+    var id = Number(frame.dataset.requestedSessionId || frame.dataset.sessionId);
+    var fallbackTarget = paneTarget(store.snap(), getCachedSessions(), id);
+    if (!fallbackTarget) { header.inert = true; return; }
+    frame.dataset.sessionOriginId = fallbackTarget.sessionOriginId;
+    frame.src = paneUrl({ slug: frame.dataset.projectSlug, sessionId: id });
+    frame.dataset.sessionId = String(id); delete frame.dataset.requestedSessionId;
+  });
   paneEl.appendChild(header); paneEl.appendChild(frame); return paneEl;
 }
 
 export function updateSplitPaneMetadata(paneEl, pane) {
   var session = sessionById(pane.sessionId); var header = paneEl.querySelector(".split-pane-header");
   var title = paneEl.querySelector(".split-pane-title"); var frame = paneEl.querySelector(".split-pane-frame"); var vendor = paneEl.querySelector(".split-pane-vendor");
+  var live = frame && frame.clayPane && frame.clayPane.identity();
+  var retarget = frame && (Number(frame.dataset.sessionId) !== pane.sessionId || frame.dataset.sessionOriginId !== (session && session.sessionOriginId || '') || frame.clayPane && (!live || !live.ready));
+  if (retarget && header) {
+    header.dispatchEvent(new Event('clay-pane-retarget'));
+    header.inert = true;
+    header.title = 'Loading conversation';
+    if (title) { title.style.display = ''; title.textContent = 'Loading conversation'; }
+    if (vendor) vendor.hidden = true;
+    var permission = paneEl.querySelector('.split-pane-full-access');
+    if (permission) permission.classList.add('hidden');
+    resetPaneContextChip(paneEl);
+  }
+  if (frame && frame.clayPane && retarget) {
+    var target = paneTarget(store.snap(), getCachedSessions(), pane.sessionId);
+    if (target && frame.clayPane.source === frame.contentWindow && frame.clayPane.document === frame.contentDocument && frame.clayPane.activate(pane.sessionId, false, target)) {
+      frame.dataset.requestedSessionId = String(pane.sessionId);
+      if (header) header.inert = true;
+      return;
+    }
+    frame.src = paneUrl(pane);
+    frame.dataset.sessionId = String(pane.sessionId); frame.dataset.projectSlug = pane.slug;
+    frame.dataset.sessionOriginId = session && session.sessionOriginId || '';
+  }
+  if (header) header.inert = false;
   paneEl.dataset.sessionId = String(pane.sessionId); paneEl.dataset.projectSlug = pane.slug;
   if (header) header.title = pane.title; if (title && title.style.display !== "none") title.textContent = pane.title; if (frame) frame.title = pane.title;
-  if (vendor) { var vendorName = session && session.vendor || "claude"; vendor.src = VENDOR_AVATARS[vendorName] || VENDOR_AVATARS.claude; vendor.title = VENDOR_NAMES[vendorName] || vendorName; }
+  if (vendor) { vendor.hidden = false; var vendorName = session && session.vendor || "claude"; vendor.src = VENDOR_AVATARS[vendorName] || VENDOR_AVATARS.claude; vendor.title = VENDOR_NAMES[vendorName] || vendorName; }
+  updatePaneFullAccessButton(paneEl.querySelector('.split-pane-full-access'), session);
   var close = paneEl.querySelector(".split-pane-close");
   if (close) {
     close.dataset.sessionId = String(pane.sessionId); close.disabled = false; close.title = "Close pane"; close.setAttribute("aria-label", close.title);
   }
 }
 
+function resetPaneContextChip(paneEl) {
+  var chip = paneEl.querySelector('.split-pane-context'); if (!chip) return;
+  chip.classList.remove('has-data'); chip.title = 'Context usage';
+  var fill = chip.querySelector('.split-pane-context-fill'), label = chip.querySelector('.split-pane-context-label');
+  if (fill) { fill.style.width = '0%'; fill.className = 'split-pane-context-fill'; }
+  if (label) label.textContent = '';
+}
+
 export function updatePaneContextChip(paneEl, msg) {
-  if (!paneEl) return; var chip = paneEl.querySelector(".split-pane-context"); if (!chip) return; var pct = msg.pct || 0; if (pct <= 0) return;
+  if (!paneEl) return; var chip = paneEl.querySelector(".split-pane-context"); if (!chip) return; var pct = msg.pct || 0; if (pct <= 0) { resetPaneContextChip(paneEl); return; }
   chip.classList.add("has-data"); var fill = chip.querySelector(".split-pane-context-fill"); var label = chip.querySelector(".split-pane-context-label");
   fill.style.width = Math.min(100, pct).toFixed(1) + "%"; fill.className = "split-pane-context-fill" + (msg.cls || ""); label.textContent = pct.toFixed(0) + "%";
   var tip = "Context " + pct.toFixed(0) + "% (" + formatTokens(msg.used || 0) + " / " + formatTokens(msg.win || 0) + " tokens)";

package/lib/public/modules/split-session-boundary.js

@@ -2,7 +2,7 @@ import { store } from './store.js';
 import { isProjectSessionReady } from './project-activation.js';
 
 export function isCurrentProjectSessionReady(state, socket) {
-  return isProjectSessionReady(state, socket);
+  return socket !== state.splitIdentityBlockedSocket && isProjectSessionReady(state, socket);
 }
 
 export function clearProjectSplitState() {

package/lib/public/modules/split-view.js

@@ -6,6 +6,9 @@ import { openWireframe } from './wireframe-workbench.js';
 
 import { store } from './store.js';
 import { getWs } from './ws-ref.js';
+import { livePaneBinding } from './pane-binding.js';
+import { showToast } from './utils.js';
+import { checkComposerDeparture } from './session-rich-drafts.js';
 import { getCachedSessions } from './sidebar-sessions.js';
 import { refreshIcons } from './icons.js';
 import { detachTuiView } from './session-tui-view.js';
@@ -14,11 +17,12 @@ import { syncPairChrome } from './split-pair-ui.js';
 import { presentMarkdownEdit } from './filebrowser.js';
 import { autoStartLoginIfNeeded } from './vendor-login.js';
 import { isCurrentProjectSessionReady } from './split-session-boundary.js';
-import { splitPanesMatchProject, reconcileRestoredSplit } from './project-activation.js';
+import { splitPanesMatchProject } from './project-activation.js';
 import { handlePaneIssueMessage } from './pane-issue-bridge.js';
 import { handlePaneFileMessage, revealFilesPanel } from './pane-file-bridge.js';
 import { openFile } from './filebrowser.js';
-import { reconcileSplitPanes } from './split-pane-reconciler.js';
+import { restoreSplitGroup, reconcileSplitIdentity } from './split-group-restore.js';
+import { reconcileSplitPanes, splitPaneForSession } from './split-pane-reconciler.js';
 import { createSplitPane, updateSplitPaneMetadata, updatePaneContextChip, updatePaneFullAccessButton } from './split-pane-renderer.js';
 
 var host = null;
@@ -54,12 +58,7 @@ function sessionById(sessionId) {
 }
 
 function paneForSession(sessionId) {
-  var session = sessionById(sessionId);
-  return {
-    slug: store.get('currentSlug'),
-    sessionId: sessionId,
-    title: (session && session.title) || ("Session " + sessionId),
-  };
+  return splitPaneForSession(sessionId, store.get('currentSlug'), getCachedSessions());
 }
 
 // Arc-style drop preview: hovering one half folds the live app into the
@@ -90,6 +89,7 @@ function showDropOverlay() {
 }
 
 function switchNativeSession(sessionId, expectedSlug) {
+  if (!canLeavePanes()) return;
   store.set({ splitPanes: null });
   var ws = getWs();
   var state = store.snap();
@@ -128,16 +128,16 @@ export function syncPaneTitles() {
   var split = store.get('splitPanes');
   if (!split || !split.panes || !host) return;
   var titleEls = host.querySelectorAll(".split-pane-title");
+  var paneEls = host.querySelectorAll('.split-pane');
   for (var i = 0; i < split.panes.length && i < titleEls.length; i++) {
-    var session = sessionById(split.panes[i].sessionId);
+    var session = sessionById(paneEls[i] && Number(paneEls[i].dataset.sessionId) || split.panes[i].sessionId);
     if (!session || !session.title) continue;
-    split.panes[i].title = session.title;
     if (titleEls[i].parentNode) titleEls[i].parentNode.title = session.title;
     if (titleEls[i].style.display !== "none") titleEls[i].textContent = session.title;
   }
   var accessBtns = host.querySelectorAll(".split-pane-full-access");
   for (var ai = 0; ai < split.panes.length && ai < accessBtns.length; ai++) {
-    updatePaneFullAccessButton(accessBtns[ai], sessionById(split.panes[ai].sessionId));
+    updatePaneFullAccessButton(accessBtns[ai], sessionById(paneEls[ai] && Number(paneEls[ai].dataset.sessionId) || split.panes[ai].sessionId));
   }
   syncPairChrome(host, split);
 }
@@ -146,6 +146,8 @@ function handlePaneMessage(event) {
   if (event.origin !== window.location.origin) return;
   var msg = event.data;
   if (!msg || !host) return;
+  var reusable = Array.from(host.querySelectorAll('.split-pane-frame')).find(function (frame) { return frame.contentWindow === event.source && frame.clayPane; });
+  if (reusable && !livePaneBinding(reusable, msg)) return;
   if (msg.type === "clay-pane-present-wireframe" || msg.type === "clay-pane-present-markdown") {
     if (msg.message && !msg.message.controlPresentation && trustedStudioFrame(event, msg)) {
       if (msg.type === "clay-pane-present-wireframe") openWireframe(msg.message);
@@ -177,7 +179,10 @@ function renderSplit(split) {
   var panes = split && split.panes;
   if (!panes || panes.length < 2 || panes.length > 3) {
     placeStickyNotesOverlay(false);
-    host.innerHTML = "";
+    var frames = host.querySelectorAll('.split-pane-frame');
+    var retain = frames.length > 0 && frames.length <= 3 && Array.from(frames).every(function (frame) { return frame.dataset.projectSlug === store.get('currentSlug') && frame.clayPane; });
+    if (retain) Array.from(frames).forEach(function (frame) { frame.clayPane.suspend(); });
+    else host.innerHTML = "";
     host.classList.remove("visible");
     nativeApp.classList.remove("split-native-hidden");
     return;
@@ -217,6 +222,7 @@ function openSplit(side, draggedId) {
 }
 
 export function openGroup(group) {
+  if (!canLeavePanes()) return false;
   if (!group || !Array.isArray(group.members) || group.members.length < 2 || group.members.length > 3) return false;
   var memberIds = splitGroupMemberIds(group);
   if (memberIds.length !== group.members.length) return false;
@@ -265,47 +271,9 @@ export function openWorkerWithDriver(worker) {
   return true;
 }
 
-// Reload survival: when the restored active session turns out to be a split
-// group member, reopen that group. Safe to call often -- no-ops unless a
-// group member is active natively with no split open.
+// Keep the public entry shared by connection, sidebar and identity hydration.
 export function maybeRestoreSplitGroup() {
-  var state = store.snap();
-  if (!isCurrentProjectSessionReady(state, getWs())) return;
-  var split = state.splitPanes;
-  if (split && !splitPanesMatchProject(split, state.currentSlug)) {
-    store.set({ splitPanes: null });
-    return;
-  }
-  if (state.paneMode) return;
-  if (split) {
-    var reconciliation = reconcileRestoredSplit(split, state.splitGroups);
-    if (reconciliation.action === "clear") {
-      store.set({ splitPanes: null });
-      return;
-    }
-    if (reconciliation.action === "rebuild") {
-      var rebuilt = reconciliation.group;
-      if (rebuilt.members.some(function (id) { return !sessionById(id); })) {
-        store.set({ splitPanes: null });
-        return;
-      }
-      store.set({ splitPanes: {
-        groupId: rebuilt.id,
-        panes: splitGroupMemberIds(rebuilt).map(function (id) { return paneForSession(id); }),
-      } });
-    }
-    return;
-  }
-  var activeId = store.get('activeSessionId');
-  if (!activeId) return;
-  var groups = store.get('splitGroups') || [];
-  for (var i = 0; i < groups.length; i++) {
-    var members = groups[i].members || [];
-    if (members.indexOf(activeId) !== -1) {
-      openGroup(groups[i]);
-      return;
-    }
-  }
+  restoreSplitGroup(openGroup);
 }
 
 export function separateGroup(group) {
@@ -369,6 +337,24 @@ function handleSessionDragStart(event) {
   if (draggedSessionId) showDropOverlay();
 }
 
+function openDriverGroup(driver) {
+  var state = store.snap();
+  if (!driver || driver.sessionRole !== "driver" || !isCurrentProjectSessionReady(state, getWs())) return false;
+  var groups = state.splitGroups || [];
+  for (var i = 0; i < groups.length; i++) {
+    var group = groups[i];
+    var roles = splitGroupRoles(group);
+    if (!roles || roles.driverId !== driver.id || typeof group.id !== "string" || !group.id) continue;
+    var available = roles.workerIds.every(function (id) {
+      var worker = sessionById(id);
+      return worker && worker.sessionRole === "worker" && worker.parentAvailable === true && worker.parentSessionId === driver.id;
+    });
+    // Keep mounted conversations when selecting their Driver again.
+    if (available) return openGroup(group);
+  }
+  return false;
+}
+
 function handleSidebarSessionClick(event) {
   if (!store.get('splitPanes') || event.button !== 0) return;
   // This document capture listener runs before a row's bubble handlers. Leave
@@ -381,11 +367,22 @@ function handleSidebarSessionClick(event) {
   if (!sessionId) return;
   event.preventDefault();
   event.stopImmediatePropagation();
+  if (!canLeavePanes()) return;
   var session = sessionById(sessionId);
   if (session && session.sessionRole === "worker" && openWorkerWithDriver(session)) return;
+  if (openDriverGroup(session)) return;
   switchNativeSession(sessionId);
 }
 
+function canLeavePanes() {
+  if (!host) return true;
+  try {
+    if (!store.get('splitPanes')) checkComposerDeparture();
+    Array.from(host.querySelectorAll('.split-pane-frame')).forEach(function (frame) { if (frame.clayPane) frame.clayPane.checkDraft(); });
+    return true;
+  } catch (error) { showToast(error.message, 'warn'); return false; }
+}
+
 export function initSplitView() {
   if (store.get('paneMode')) return;
   var mainPanels = document.getElementById("main-panels");
@@ -411,6 +408,8 @@ export function initSplitView() {
   });
   document.addEventListener("click", handleSidebarSessionClick, true);
   store.subscribe(function (state, prev) {
+    if (state.authIdentityLoaded && !prev.authIdentityLoaded) queueMicrotask(maybeRestoreSplitGroup);
+    if (reconcileSplitIdentity(state, prev, host)) { renderSplit(null); return; }
     if (state.splitPanes !== prev.splitPanes) renderSplit(state.splitPanes);
     if (state.permissionModePendingByTarget !== prev.permissionModePendingByTarget || state.connected !== prev.connected ||
         state.skipPermsEnabled !== prev.skipPermsEnabled) syncPaneTitles();

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

@@ -27,27 +27,55 @@ export function renderTaskControls(root, id) {
   var ui = getNoteUiState(id);
   var fields = ui.checklistInputs || {};
   var busy = ui.pending.length > 0;
+  var active = document.activeElement;
+  var focusField = active && root.contains(active) ? active.dataset.taskField : undefined;
+  var selection = focusField !== undefined ? [active.selectionStart, active.selectionEnd] : null;
   root.replaceChildren();
   var form = document.createElement('form'); form.className = 'sn-task-form';
+  form.setAttribute('aria-label', 'Checklist');
+  form.setAttribute('aria-busy', busy ? 'true' : 'false');
+  var feedback = document.createElement('span'); feedback.className = 'sn-task-feedback';
+  feedback.setAttribute('role', 'status');
+  var saveButton = document.createElement('button');
+  function updateFeedback() {
+    var current = getNoteUiState(id);
+    var dirty = checklistDraftText(current) !== current.text;
+    feedback.textContent = busy ? 'Saving…' : current.error ? (dirty ? 'Draft kept. ' : 'Not saved. ') + current.error : dirty ? 'Unsaved changes' : 'All changes saved';
+    saveButton.disabled = busy || !dirty;
+  }
   function input(label, value, key) {
-    var control = document.createElement('input'); control.type = 'text'; control.value = fields[key] !== undefined ? fields[key] : value;
+    var control = document.createElement('textarea'); control.rows = 1; control.value = fields[key] !== undefined ? fields[key] : value;
     control.setAttribute('aria-label', label); control.placeholder = label; control.maxLength = 400;
-    control.disabled = busy;
+    control.readOnly = busy;
+    control.dataset.taskField = key;
+    control.onkeydown = function (event) {
+      if (event.key === 'Enter' && !event.isComposing) { event.preventDefault(); form.requestSubmit(); }
+    };
     control.oninput = function () {
       var current = getNoteUiState(id);
+      // A task remains one persisted line; visual wrapping does not split tasks.
+      control.value = control.value.replace(/[\r\n]+/g, ' ');
       var draft = Object.assign({}, current.checklistInputs || {}); draft[key] = control.value;
       setNoteUiState(id, { checklistInputs: draft });
+      updateFeedback();
     };
     return control;
   }
   var title = input('Checklist title', (ui.text || '').split('\n')[0], 'title'); title.className = 'sn-task-title'; form.appendChild(title);
-  getChecklistItems(ui.text).forEach(function (item, position) {
+  var items = getChecklistItems(ui.text);
+  var completed = 0;
+  var summary = document.createElement('div'); summary.className = 'sn-task-summary';
+  form.appendChild(summary);
+  items.forEach(function (item, position) {
     var row = document.createElement('div'); row.className = 'sn-task-row';
     var marker = item.text.match(/^\s*(?:[-*+]\s+)?\[([ xX])\]\s*(.*)$/);
     var check = document.createElement('button'); check.type = 'button'; check.className = 'sn-check';
     var checked = ui.checklistState[item.key];
     if (checked === undefined) checked = marker && marker[1].toLowerCase() === 'x';
-    check.classList.toggle('checked', !!checked); check.textContent = checked ? '✓' : '☐';
+    check.classList.toggle('checked', !!checked);
+    check.innerHTML = '<span class="sn-task-box" aria-hidden="true"><svg viewBox="0 0 16 16" fill="none"><path d="m3.5 8 3 3 6-6" stroke="currentColor" stroke-width="1.8" stroke-linecap="round" stroke-linejoin="round"/></svg></span>';
+    row.classList.toggle('is-complete', !!checked);
+    if (checked) completed++;
     check.setAttribute('role', 'checkbox'); check.setAttribute('aria-checked', checked ? 'true' : 'false'); check.setAttribute('aria-label', 'Complete task ' + (position + 1));
     check.dataset.checklistIndex = item.index; check.dataset.checklistKey = encodeURIComponent(item.key);
     check.disabled = busy;
@@ -59,8 +87,15 @@ export function renderTaskControls(root, id) {
     };
     row.append(check, label, remove); form.appendChild(row);
   });
-  var entry = input('New task', '', 'entry'); entry.className = 'sn-task-entry'; form.appendChild(entry);
-  var saveButton = document.createElement('button'); saveButton.type = 'submit'; saveButton.className = 'sn-task-save'; saveButton.textContent = 'Save tasks'; saveButton.disabled = busy; form.appendChild(saveButton);
+  summary.textContent = items.length ? completed + ' of ' + items.length + ' complete' : 'A little space for what’s next';
+  var addRow = document.createElement('div'); addRow.className = 'sn-task-add';
+  var plus = document.createElement('span'); plus.className = 'sn-task-plus'; plus.innerHTML = iconHtml('plus'); plus.setAttribute('aria-hidden', 'true');
+  var entry = input('New task', '', 'entry'); entry.className = 'sn-task-entry'; entry.placeholder = 'Add a task…';
+  addRow.append(plus, entry); form.appendChild(addRow);
+  var footer = document.createElement('div'); footer.className = 'sn-task-footer';
+  saveButton.type = 'submit'; saveButton.className = 'sn-task-save'; saveButton.textContent = 'Save tasks';
+  footer.append(feedback, saveButton); form.appendChild(footer);
+  updateFeedback();
   function save(text) {
     var current = getNoteUiState(id);
     if (current.pending.length) return;
@@ -68,4 +103,14 @@ export function renderTaskControls(root, id) {
   }
   form.onsubmit = function (event) { event.preventDefault(); save(checklistDraftText(getNoteUiState(id))); };
   root.appendChild(form); refreshIcons(root);
+  if (focusField !== undefined) {
+    var controls = form.querySelectorAll('[data-task-field]');
+    for (var i = 0; i < controls.length; i++) {
+      if (controls[i].dataset.taskField === focusField) {
+        controls[i].focus({ preventScroll: true });
+        controls[i].setSelectionRange(selection[0], selection[1]);
+        break;
+      }
+    }
+  }
 }

package/lib/public/modules/stt-controller.js

@@ -12,7 +12,8 @@ export function speechContext() {
   var s = store.snap();
   return JSON.stringify([s.currentSlug, s.activeSessionId, s.dmMode, s.dmKey,
     s.dmTargetUser && s.dmTargetUser.id, s.homePrimarySurface, s.homeSubSurface,
-    s.homeChatMateId, s.homeChatSessionId]);
+    s.homeChatMateId, s.homeChatSessionId, s.sessionOriginId, s.myUserId, s.sessionActionEpoch || 0,
+    s.paneCommittedBinding && s.paneCommittedBinding.generation]);
 }
 
 export function setSpeechStatus(id, message, isError) {
@@ -76,6 +77,7 @@ export function claimSpeech(id, input, recognition) {
   var active = { id: id, input: input, recognition: recognition, context: speechContext(),
     before: input.value, lastValue: input.value, writing: false, started: false, timeout: null };
   active.traceId = Date.now().toString(36) + '-' + Math.random().toString(36).slice(2, 7);
+  active.paneBinding = store.get('paneCommittedBinding') || null;
   active.traceStarted = Date.now();
   store.set({ speechActive: active, speechRetry: null });
   return active;
@@ -113,6 +115,7 @@ export function startSTT(id, input) {
   var active = { id: id, input: input, recognition: recognition, context: speechContext(),
     before: input.value, lastValue: input.value, writing: false, started: false, timeout: null };
   recognition.lang = store.get('speechLang') || 'en-US';
+  active.paneBinding = store.get('paneCommittedBinding') || null;
   recognition.continuous = true;
   recognition.interimResults = true;
   recognition.onstart = function () {

package/lib/public/modules/stt-recording.js

@@ -26,7 +26,7 @@ async function upload(active, blob) {
       model: active.model, language: active.language, blob: blob };
     failSTT(error.name === 'AbortError' ? 'Transcription timed out. Please try again.' : error.message);
     store.set({ speechRetry: retry });
-    setTimeout(function () { if (store.get('speechRetry') === retry) store.set({ speechRetry: null }); }, 300000);
+    setTimeout(function () { if (store.get('speechRetry') === retry && !store.get('deferredSessionSwitch')) store.set({ speechRetry: null }); }, 300000);
     return false;
   }
 }

package/lib/public/modules/stt.js

@@ -25,6 +25,7 @@ function bindComposer(id, inputId, wrapperId) {
   if (!button || !input || !wrapper || button.dataset.speechBound) return;
   var composer = document.getElementById(id === 'stt-btn' ? 'input-row' : 'home-mate-chat-composer') || wrapper;
   var toolbar = document.getElementById(id === 'stt-btn' ? 'input-bottom' : 'home-mate-chat-composer') || composer;
+  button.addEventListener('click', refreshSpeechBrowser);
   button.dataset.speechBound = 'true'; button.classList.add('stt-button');
   var group = document.createElement('span'); group.className = 'stt-controls';
   button.before(group); group.appendChild(button);
@@ -32,7 +33,7 @@ function bindComposer(id, inputId, wrapperId) {
   picker.className = 'stt-picker-toggle'; picker.innerHTML = iconHtml('chevron-down');
   picker.setAttribute('aria-label', 'Choose voice model'); picker.setAttribute('aria-haspopup', 'dialog'); picker.setAttribute('aria-expanded', 'false');
   picker.title = 'Choose voice model'; group.appendChild(picker);
-  picker.addEventListener('click', function () { openSpeechPicker(picker); });
+  picker.addEventListener('click', function () { refreshSpeechBrowser(); openSpeechPicker(picker); });
   var row = document.createElement('div'); row.className = 'stt-progress'; row.hidden = true;
   var status = document.createElement('span'); status.id = id + '-status'; status.className = 'stt-status'; status.setAttribute('role', 'status');
   var timer = document.createElement('span'); timer.className = 'stt-timer'; timer.setAttribute('aria-hidden', 'true');
@@ -70,7 +71,7 @@ function bindComposer(id, inputId, wrapperId) {
   function render() {
     var active = store.get('speechActive'); var own = !!active && active.id === id;
     var model = voiceModel(); var provider = voiceProvider(model.provider);
-    var browser = model.provider === 'browser' ? browserSpeechInfo() : null;
+    var browser = model.provider === 'browser' ? store.get('speechBrowserIdentity') : null;
     var pending = own && active.model && active.phase !== 'recording';
     var autoSend = own && !!active.autoSend;
     composer.classList.toggle('stt-recording', own);
@@ -117,7 +118,11 @@ function bindComposer(id, inputId, wrapperId) {
   observer.observe(input, { attributes: true, attributeFilter: ['disabled', 'readonly'] });
   render();
 }
+// Browser identity may read layout; refresh on entry and interaction, not transcript updates.
+function refreshSpeechBrowser() { store.set({ speechBrowserIdentity: browserSpeechInfo() }); }
 export function initSTT() {
+  refreshSpeechBrowser();
+  window.addEventListener('focus', refreshSpeechBrowser);
   initSpeechLifecycle(); initSpeechPicker();
   bindComposer('stt-btn', 'input', 'input-wrapper');
   bindComposer('home-stt-btn', 'home-mate-chat-input', 'home-mate-chat-composer-frame');