clay-server 5.1.1-beta.1 → 5.2.0-beta.10

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

@@ -8,7 +8,11 @@
 import { refreshIcons, iconHtml } from './icons.js';
 import { extractMarkdown, renderMiniMarkdown } from './sticky-note-markdown.js';
 import { enhanceClayLogLinks } from './clay-log-links.js';
-import { debouncedTextUpdate, syncTitle } from './sticky-notes-shared.js';
+import { debouncedTextUpdate, syncTitle, getNoteUiState, setNoteUiState, subscribeNoteUiState } from './sticky-notes-shared.js';
+
+import { renderTaskControls } from './sticky-notes-checklist.js';
+import { requestChecklistMode } from './sticky-notes-actions.js';
+import { mutateChecklist } from './sticky-notes-state.js';
 
 var formatToolbarEl = null;
 
@@ -145,51 +149,112 @@ function positionToolbarAtRange(toolbar, range) {
   });
 }
 
-export function setupTextEdit(textarea, rendered, noteId, mdBtn) {
+export function setupTextEdit(textarea, rendered, noteId, mdBtn, checklistBtn, noteData) {
   var noteEl = textarea.closest(".sticky-note");
   var mdMode = false;
+  var disposed = false;
+  var ui = getNoteUiState(noteId, noteData);
+  var checklistMode = ui.checklistMode === true;
+  var checklistState = ui.checklistState || {};
+  var renderedDirty = false;
+  var sourceText = ui.text !== undefined ? ui.text : textarea.value;
+  textarea.value = sourceText;
+
+  function renderChecklist() {
+    var active = document.activeElement;
+    var focusKey = active && rendered.contains(active) && active.dataset ? active.dataset.checklistKey : undefined;
+    if (checklistMode) renderTaskControls(rendered, noteId);
+    else rendered.innerHTML = renderMiniMarkdown(sourceText, { checklistMode: checklistMode, checklistState: checklistState });
+    if (sourceText.trim()) enhanceClayLogLinks(rendered);
+    rendered.classList.toggle("is-empty", !checklistMode && !sourceText.trim());
+    rendered.contentEditable = checklistMode || getNoteUiState(noteId).pending.length ? "false" : "true";
+    if (focusKey !== undefined) {
+      var checks = rendered.querySelectorAll("[data-checklist-key]");
+      for (var i = 0; i < checks.length; i++) {
+        if (checks[i].dataset.checklistKey === focusKey) { checks[i].focus({ preventScroll: true }); break; }
+      }
+    }
+  }
 
   function saveRenderedMarkdown() {
-    var markdown = extractMarkdown(rendered);
-    textarea.value = markdown;
-    debouncedTextUpdate(noteId, markdown);
-    syncTitle(noteEl, markdown);
-    rendered.classList.toggle("is-empty", !markdown.trim());
+    if (checklistMode) return;
+    renderedDirty = true;
+    sourceText = extractMarkdown(rendered);
+    textarea.value = sourceText;
+    setNoteUiState(noteId, { text: sourceText, draft: true });
+    debouncedTextUpdate(noteId, sourceText);
+    syncTitle(noteEl, sourceText);
+    rendered.classList.toggle("is-empty", !checklistMode && !sourceText.trim());
   }
 
   function toggleChecklistItem(check) {
-    var checked = !check.classList.contains("checked");
-    check.classList.toggle("checked", checked);
-    check.textContent = checked ? "✓" : "☐";
-    check.setAttribute("aria-checked", checked ? "true" : "false");
+    if (checklistMode && check.dataset.checklistIndex !== undefined) {
+      var index = parseInt(check.dataset.checklistIndex, 10);
+      var checked = !check.classList.contains("checked");
+      mutateChecklist(noteId, { checklistIndex: index, checklistKey: check.dataset.checklistKey || "", checklistSource: sourceText, checklistChecked: checked });
+      return;
+    }
+    var normalChecked = !check.classList.contains("checked");
+    check.classList.toggle("checked", normalChecked);
+    check.textContent = normalChecked ? "✓" : "☐";
+    check.setAttribute("aria-checked", normalChecked ? "true" : "false");
     saveRenderedMarkdown();
   }
 
-  // MD button: toggle between contenteditable rendered view and raw textarea
+  var unsubscribeUiState = subscribeNoteUiState(function (all) {
+    var next = all[noteId];
+    if (!next) return;
+    var changed = next.checklistMode !== checklistMode ||
+      (next.text !== undefined && next.text !== sourceText) ||
+      next.pending.length !== ui.pending.length ||
+      next.checklistInputs !== ui.checklistInputs && !next.checklistInputs ||
+      JSON.stringify(next.checklistState || {}) !== JSON.stringify(checklistState || {});
+    ui = next;
+    checklistMode = next.checklistMode === true;
+    checklistState = next.checklistState || {};
+    if (next.text !== undefined && next.text !== sourceText) {
+      sourceText = next.text;
+      textarea.value = sourceText;
+    }
+    mdBtn.hidden = checklistMode;
+    mdBtn.disabled = checklistMode;
+    if (checklistMode && mdMode) {
+      mdMode = false; textarea.style.display = 'none'; rendered.style.display = ''; mdBtn.classList.remove('active');
+    }
+    checklistBtn.classList.toggle("active", checklistMode);
+    checklistBtn.title = checklistMode ? "Show note" : "Show checklist";
+    checklistBtn.setAttribute("aria-label", checklistBtn.title);
+    checklistBtn.setAttribute("aria-pressed", checklistMode ? "true" : "false");
+    var status = noteEl.querySelector(".sticky-note-save-status");
+    if (status) status.textContent = next.error || (next.pending && next.pending.length ? "Saving…" : "");
+    if (changed && !mdMode) { renderChecklist(); syncTitle(noteEl, sourceText); }
+  });
+  noteEl._stickyNoteDispose = function () {
+    disposed = true;
+    closeFormatToolbar();
+    unsubscribeUiState();
+  };
+
+  checklistBtn.addEventListener("click", function (e) {
+    e.stopPropagation();
+    requestChecklistMode(noteId);
+  });
+
   mdBtn.addEventListener("click", function (e) {
     e.stopPropagation();
+    if (checklistMode) return;
     mdMode = !mdMode;
     if (mdMode) {
-      // Switch to raw markdown editing
-      var md = extractMarkdown(rendered);
-      textarea.value = md;
+      textarea.value = sourceText;
       textarea.style.display = "";
       rendered.style.display = "none";
       mdBtn.classList.add("active");
       textarea.focus();
     } else {
-      // Switch back to contenteditable rendered view
-      var md = textarea.value;
-      debouncedTextUpdate(noteId, md);
-      syncTitle(noteEl, md);
-      if (md.trim()) {
-        rendered.innerHTML = renderMiniMarkdown(md);
-        enhanceClayLogLinks(rendered);
-        rendered.classList.remove("is-empty");
-      } else {
-        rendered.innerHTML = "";
-        rendered.classList.add("is-empty");
-      }
+      sourceText = textarea.value;
+      if (getNoteUiState(noteId).draft) debouncedTextUpdate(noteId, sourceText);
+      syncTitle(noteEl, sourceText);
+      renderChecklist();
       textarea.style.display = "none";
       rendered.style.display = "";
       mdBtn.classList.remove("active");
@@ -197,11 +262,7 @@ export function setupTextEdit(textarea, rendered, noteId, mdBtn) {
     }
   });
 
-  // Sync contenteditable changes to textarea (data store) and save
-  rendered.addEventListener("input", function () {
-    saveRenderedMarkdown();
-  });
-
+  rendered.addEventListener("input", saveRenderedMarkdown);
   rendered.addEventListener("click", function (e) {
     var check = e.target.closest && e.target.closest(".sn-check");
     if (!check || !rendered.contains(check)) return;
@@ -210,27 +271,23 @@ export function setupTextEdit(textarea, rendered, noteId, mdBtn) {
     toggleChecklistItem(check);
   });
 
-  // On blur, re-render to normalize HTML structure
   rendered.addEventListener("blur", function (e) {
-    // Don't re-render if clicking format toolbar (it prevents default, but just in case)
+    if (checklistMode || !renderedDirty) return;
+    renderedDirty = false;
     if (e.relatedTarget && e.relatedTarget.closest && e.relatedTarget.closest(".sn-format-toolbar")) return;
     closeFormatToolbar();
     var md = extractMarkdown(rendered);
+    sourceText = md;
     textarea.value = md;
-    if (md.trim()) {
-      rendered.innerHTML = renderMiniMarkdown(md);
-      enhanceClayLogLinks(rendered);
-      rendered.classList.remove("is-empty");
-    } else {
-      rendered.innerHTML = "";
-      rendered.classList.add("is-empty");
-    }
+    setNoteUiState(noteId, { text: sourceText, draft: true });
+    renderChecklist();
   });
 
   // Show format toolbar when selecting text
   rendered.addEventListener("mouseup", function (e) {
     if (e.target.tagName === "A") return;
     setTimeout(function () {
+      if (disposed) return;
       var sel = window.getSelection();
       if (sel && !sel.isCollapsed && sel.toString().trim()) {
         showFormatToolbar(rendered);
@@ -260,6 +317,7 @@ export function setupTextEdit(textarea, rendered, noteId, mdBtn) {
       toggleChecklistItem(e.target);
       return;
     }
+    if (checklistMode) return;
     if (e.key === "Enter" && !e.shiftKey) {
       e.preventDefault();
       document.execCommand("insertLineBreak");
@@ -268,6 +326,7 @@ export function setupTextEdit(textarea, rendered, noteId, mdBtn) {
 
   // Paste as plain text to avoid importing HTML formatting
   rendered.addEventListener("paste", function (e) {
+    if (checklistMode) return;
     e.preventDefault();
     var text = (e.clipboardData || window.clipboardData).getData("text/plain");
     document.execCommand("insertText", false, text);
@@ -281,10 +340,15 @@ export function setupTextEdit(textarea, rendered, noteId, mdBtn) {
   // Sync textarea edits when in MD mode
   textarea.addEventListener("input", function () {
     if (!mdMode) return;
-    debouncedTextUpdate(noteId, textarea.value);
-    syncTitle(noteEl, textarea.value);
+    sourceText = textarea.value;
+    setNoteUiState(noteId, { text: sourceText, draft: true });
+    debouncedTextUpdate(noteId, sourceText);
+    syncTitle(noteEl, sourceText);
   });
 
+  mdBtn.hidden = checklistMode; mdBtn.disabled = checklistMode;
+  renderChecklist();
+
   textarea.addEventListener("mousedown", function (e) {
     e.stopPropagation();
   });

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

@@ -55,8 +55,51 @@ export function clampSize(x, y, w, h) {
 
 export function send(obj) {
   var ws = getWs();
-  if (!ws || !store.get('connected')) return;
-  ws.send(JSON.stringify(obj));
+  if (!ws || !store.get('connected')) return false;
+  try { ws.send(JSON.stringify(obj)); return true; } catch (error) { return false; }
+}
+
+export function getNoteUiState(id, fallback) {
+  var all = store.get("stickyNoteUiState") || {};
+  if (!all[id]) {
+    var initial = {
+      canonical: Object.assign({}, fallback),
+      canonicalRevision: 0,
+      draft: false,
+      text: fallback && fallback.text ? fallback.text : "",
+      checklistMode: fallback && fallback.checklistMode === true,
+      checklistState: fallback && fallback.checklistState ? fallback.checklistState : {},
+      pending: [],
+    };
+    var next = Object.assign({}, all);
+    next[id] = initial;
+    store.set({ stickyNoteUiState: next });
+    return initial;
+  }
+  return all[id];
+}
+
+export function setNoteUiState(id, changes) {
+  var all = store.get("stickyNoteUiState") || {};
+  var current = all[id] || {};
+  var next = Object.assign({}, all);
+  next[id] = Object.assign({}, current, changes || {});
+  store.set({ stickyNoteUiState: next });
+  return next[id];
+}
+
+export function deleteNoteUiState(id) {
+  var all = store.get("stickyNoteUiState") || {};
+  if (!all[id]) return;
+  var next = Object.assign({}, all);
+  delete next[id];
+  store.set({ stickyNoteUiState: next });
+}
+
+export function subscribeNoteUiState(listener) {
+  return store.subscribe(function (next, previous) {
+    if (next.stickyNoteUiState !== previous.stickyNoteUiState) listener(next.stickyNoteUiState || {});
+  });
 }
 
 export function debouncedUpdate(id, changes, delay) {
@@ -82,6 +125,11 @@ export function syncTitle(noteEl, text) {
 
 
 // Drop any pending writes for a note this client no longer has.
+export function clearNoteTextTimer(id) {
+  clearTimeout(textTimers[id]);
+  delete textTimers[id];
+}
+
 export function clearNoteTimers(id) {
   clearTimeout(updateTimers[id]);
   clearTimeout(textTimers[id]);

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

@@ -0,0 +1,66 @@
+// Reconcile canonical broadcasts with optimistic checklist actions and text drafts.
+import { store } from './store.js';
+import { getNoteUiState, setNoteUiState, send } from './sticky-notes-shared.js';
+
+function project(ui, pending, error) {
+  var canonical = ui.canonical || {};
+  var text = ui.draft ? ui.text : canonical.text || "";
+  var mode = canonical.checklistMode === true;
+  var state = Object.assign({}, canonical.checklistState || {});
+  pending.forEach(function (request) {
+    var changes = request.changes;
+    if (changes.text !== undefined) text = changes.text;
+    if (changes.checklistMode !== undefined) mode = changes.checklistMode;
+    if (changes.checklistKey) state[decodeURIComponent(changes.checklistKey)] = changes.checklistChecked;
+  });
+  return setNoteUiState(canonical.id, {
+    text: text,
+    checklistMode: mode, checklistState: state, pending: pending, error: error || '',
+  });
+}
+
+export function reconcileNote(data) {
+  var ui = getNoteUiState(data.id, data);
+  var draft = ui.draft && ui.text !== (data.text || '');
+  ui = setNoteUiState(data.id, { canonical: data, canonicalRevision: (ui.canonicalRevision || 0) + 1, draft: draft });
+  project(ui, ui.pending || [], ui.error);
+}
+
+export function mutateChecklist(id, changes) {
+  var ui = getNoteUiState(id);
+  var requestId = 'note-update-' + Date.now() + '-' + Math.random().toString(36).slice(2);
+  var pending = (ui.pending || []).concat([{ requestId: requestId, changes: changes, revision: ui.canonicalRevision, draftText: ui.text }]);
+  project(ui, pending, '');
+  if (!send(Object.assign({}, changes, { type: changes.humanClose ? 'note_close' : 'note_update', id: id, requestId: requestId }))) {
+    project(getNoteUiState(id), pending.slice(0, -1), 'Connection unavailable');
+  }
+}
+
+export function reconcileNoteResult(msg) {
+  var ui = getNoteUiState(msg.noteId);
+  var request = (ui.pending || []).find(function (item) { return item.requestId === msg.requestId; });
+  if (!request) return;
+  // The server broadcasts before acknowledgement. Use the returned note when
+  // that broadcast was absent, but never replace a newer remote canonical note.
+  if (msg.ok && msg.note && ui.canonicalRevision === request.revision) {
+    reconcileNote(msg.note);
+    ui = getNoteUiState(msg.noteId);
+  }
+  if (msg.ok && request.changes.checklistConvert && ui.text === request.draftText) {
+    ui = setNoteUiState(msg.noteId, { draft: false, text: ui.canonical.text || '' });
+  }
+  if (msg.ok && (request.changes.checklistEdit || request.changes.checklistConvert || request.changes.humanClose)) {
+    ui = setNoteUiState(msg.noteId, { checklistInputs: null });
+  }
+  var remaining = ui.pending.filter(function (item) { return item.requestId !== msg.requestId; });
+  project(ui, remaining, msg.ok ? '' : msg.error || 'Could not save checklist change');
+  return ui.canonical;
+}
+
+store.subscribe(function (next, previous) {
+  if (next.connected || next.connected === previous.connected) return;
+  var all = next.stickyNoteUiState || {};
+  Object.keys(all).forEach(function (id) {
+    if (all[id].pending && all[id].pending.length) project(all[id], [], 'Connection unavailable');
+  });
+});

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

@@ -1,24 +1,21 @@
 // The sticky-note canvas: the board of floating cards over the conversation.
-//
 // This module owns the notes map, visibility, the badges, and the WebSocket
 // handlers. Card markup and interactions live in sticky-notes-card.js, text
-// editing in sticky-notes-editor.js, and the leaf helpers in
+// editing in sticky-notes-editor.js, and leaf helpers in
 // sticky-notes-shared.js. The browse/index pane is sticky-notes-browser.js.
 
 import { refreshIcons, iconHtml } from './icons.js';
-import { renderMiniMarkdown } from './sticky-note-markdown.js';
-import { enhanceClayLogLinks } from './clay-log-links.js';
-import { isClosedNote, send, clampPos, clearNoteTimers, syncTitle } from './sticky-notes-shared.js';
+import { isClosedNote, send, clampPos, clearNoteTimers, deleteNoteUiState } from './sticky-notes-shared.js';
 import { renderNote, closeColorPicker } from './sticky-notes-card.js';
 import { closeFormatToolbar, isFormatToolbarOpen } from './sticky-notes-editor.js';
 import { store } from './store.js';
+import { reconcileNote, reconcileNoteResult } from './sticky-notes-state.js';
 
 var notes = new Map();  // id -> { data, el }
 var notesVisible = false;
 var notesResizeObserver = null;
 
-// The canvas shows open notes only. Closed notes leave the canvas and live in
-// the browser's Closed tab until they are reopened.
+// The canvas shows open notes only. Closed notes live in the browser's Closed tab.
 function openCount() {
   var count = 0;
   notes.forEach(function (entry) {
@@ -259,9 +256,7 @@ export function handleNotesList(msg) {
   var container = document.getElementById("sticky-notes-container");
   if (!container) return;
 
-  // Keyed reconciliation, never a clear-and-rebuild. A reconnect re-sends this
-  // list unchanged; tearing every note down and recreating it made all the
-  // floating cards vanish and reappear, and destroyed any open editor.
+  // Reconcile keyed cards in place so reconnects retain the active editor.
   var list = msg.notes || [];
   var seen = {};
   var created = false;
@@ -283,28 +278,27 @@ export function handleNotesList(msg) {
     created = true;
   }
 
-  // Remove notes the server no longer lists.
+  // Remove subscriptions and delayed writes along with stale cards.
   var staleIds = [];
   notes.forEach(function (value, id) {
     if (!seen[id]) staleIds.push(id);
   });
   for (i = 0; i < staleIds.length; i++) {
     var stale = notes.get(staleIds[i]);
+    if (stale && stale.el && stale.el._stickyNoteDispose) stale.el._stickyNoteDispose();
     if (stale && stale.el && stale.el.parentNode) stale.el.parentNode.removeChild(stale.el);
+    clearNoteTimers(staleIds[i]);
+    deleteNoteUiState(staleIds[i]);
     notes.delete(staleIds[i]);
   }
 
-  // renderNote already refreshes icons for the nodes it builds; an all-patch
-  // pass introduces no new Lucide markup and must not trigger a document scan.
+  // An all-patch list adds no icon markup and needs no document-wide scan.
   if (created) refreshIcons();
 
   updateBadge();
   updateSidebarBadge();
   refreshBrowser();
 
-  // Auto-show only when something is actually asking for attention. A board of
-  // nothing but closed notes must not pop the canvas open. Temporary hiding is
-  // explicit view state and must survive reconnects and list updates.
   if (openCount() > 0 && !notesVisible) {
     notesVisible = true;
     applyCanvasVisibility();
@@ -337,18 +331,13 @@ export function handleNoteCreated(msg) {
   syncFlightControls();
 }
 
-// Patch one existing note element in place from a server payload.
-//
-// Geometry, z-order, colour, and opacity are plain style writes and are always
-// applied. The rendered markdown is only replaced when the text actually
-// changed and the note is not being edited, so a geometry-only or z-only
-// update never destroys the user's caret, selection, or in-progress draft.
-// Returns true when icon markup was replaced, so the caller can decide whether
-// a Lucide pass is needed at all.
+// Canonical content reconciles through the store; geometry patches independently
+// so movement and stacking updates preserve the editor and its draft.
+// Return whether the minimize control introduced fresh icon markup.
 function patchNote(entry, next) {
   if (!entry || !next) return false;
-  var previous = entry.data || {};
   entry.data = next;
+  reconcileNote(next);
   var el = entry.el;
 
   el.style.left = next.x + "px";
@@ -358,26 +347,6 @@ function patchNote(entry, next) {
   el.style.zIndex = 100 + (next.zIndex || 0);
   el.dataset.color = next.color || "purple";
 
-  var textarea = el.querySelector(".sticky-note-text");
-  var rendered = el.querySelector(".sticky-note-rendered");
-  var nextText = next.text || "";
-  var editing = rendered === document.activeElement || textarea === document.activeElement;
-  // A draft the user typed but has not committed must survive a redraw.
-  var hasDraft = !!(textarea && textarea.value !== (previous.text || ""));
-  var textChanged = nextText !== (previous.text || "");
-  if (rendered && !editing && !hasDraft && textChanged) {
-    if (textarea) textarea.value = nextText;
-    if (nextText.trim()) {
-      rendered.innerHTML = renderMiniMarkdown(nextText);
-      enhanceClayLogLinks(rendered);
-      rendered.classList.remove("is-empty");
-    } else {
-      rendered.innerHTML = "";
-      rendered.classList.add("is-empty");
-    }
-    syncTitle(el, nextText);
-  }
-
   if (typeof next.opacity === "number") {
     el.style.setProperty("--note-opacity", next.opacity);
     var slider = el.querySelector(".sticky-note-opacity-slider");
@@ -388,8 +357,6 @@ function patchNote(entry, next) {
   else el.classList.remove("hidden");
   syncFlightState(el, true);
 
-  // The minimize button swaps its icon, which is the only path here that can
-  // introduce fresh Lucide markup.
   var iconsReplaced = false;
   var wasMinimized = el.classList.contains("minimized");
   var minBtn = el.querySelector(".sticky-note-min-btn");
@@ -419,13 +386,18 @@ export function handleNoteUpdated(msg) {
   if (patchNote(entry, msg.note)) refreshIcons();
   reclampAllNotes();
 
-  // A close or reopen arrives as an ordinary update, so the canvas count and
-  // the browser both follow from the same message.
   updateBadge();
   updateSidebarBadge();
   refreshBrowser();
 }
 
+export function handleNoteUpdateResult(msg) {
+  var entry = notes.get(msg.noteId);
+  if (!entry || !msg.requestId) return;
+  var canonical = reconcileNoteResult(msg);
+  if (canonical) { entry.data = canonical; refreshBrowser(); }
+}
+
 export function handleNoteWritten(msg) {
   var entry = notes.get(msg.id);
   if (!entry) return;
@@ -437,11 +409,11 @@ export function handleNoteWritten(msg) {
   }, 2100);
 }
 
-// Defensive only. The server no longer deletes notes and never sends this, but
-// an older daemon on the other end of the socket still must not corrupt state.
 export function handleNoteDeleted(msg) {
   var entry = notes.get(msg.id);
+  if (entry && entry.el._stickyNoteDispose) entry.el._stickyNoteDispose();
   if (entry) entry.el.remove();
+  deleteNoteUiState(msg.id);
   clearNoteTimers(msg.id);
   notes.delete(msg.id);
   updateBadge();
@@ -467,3 +439,14 @@ function updateSidebarBadge() {
 export function isNotesVisible() {
   return notesVisible;
 }
+
+// Project navigation must cancel writes and detach subscriptions before reuse.
+export function resetStickyNotes() {
+  handleNotesList({ notes: [] });
+  closeFormatToolbar();
+  closeColorPicker();
+}
+
+store.subscribe(function (next, previous) {
+  if (next.currentSlug !== previous.currentSlug) resetStickyNotes();
+});

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');

package/lib/public/modules/terminal.js

@@ -1,3 +1,4 @@
+import { store } from './store.js';
 import { iconHtml, refreshIcons } from './icons.js';
 import { closeSidebar } from './sidebar.js';
 import { claimRightWorkbench, registerRightWorkbench, releaseRightWorkbench } from './right-workbench.js';
@@ -538,6 +539,8 @@ function renderTabBar() {
     (function (t) {
       var el = document.createElement("div");
       el.className = "terminal-tab";
+      el.dataset.controlTerminalId = String(t.id);
+      el.dataset.controlRuntime = store.get("controlRuntimeId") || "";
       if (t.id === activeTabId) el.classList.add("active");
       if (t.exited) el.classList.add("exited");
 
@@ -696,6 +699,7 @@ function updateTerminalBadge() {
 // --- Handle server messages ---
 
 export function handleTermList(msg) {
+  store.set({ clayControlTerminalViews: (msg.terminals || []).map(function (item) { return { id: item.id, identity: item.controlIdentity, revision: item.controlRevision, runtimeId: store.get('controlRuntimeId') }; }) });
   // TUI session terminals are owned by session-tui-view.js and must not
   // appear in the bottom terminal panel. Filter them out before any tab
   // bookkeeping so the panel never tries to render or auto-attach them.
@@ -762,7 +766,11 @@ export function handleTermCreated(msg) {
   }
 }
 
+export function handleTerminalProjection(msg) {
+  if (msg.controlIdentity && msg.controlRevision) store.set({ clayControlTerminalViews: (store.get('clayControlTerminalViews') || []).map(function (item) { return item.id === msg.id && item.identity === msg.controlIdentity ? Object.assign({}, item, { revision: msg.controlRevision }) : item; }) });
+}
 export function handleTermOutput(msg) {
+  handleTerminalProjection(msg);
   if (!msg.id) return;
   var tab = tabs.get(msg.id);
   if (tab && tab.xterm && msg.data) {
@@ -771,6 +779,7 @@ export function handleTermOutput(msg) {
 }
 
 export function handleTermResized(msg) {
+  handleTerminalProjection(msg);
   if (!msg.id) return;
   var tab = tabs.get(msg.id);
   if (tab && tab.xterm && msg.cols > 0 && msg.rows > 0) {