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

package/lib/public/modules/command-palette.js

@@ -1,5 +1,4 @@
 import { forwardContextualSessionCitation, validContextualCitation, contextualCitationLink } from './contextual-session-citations.js';
-import { dismissContextualClay } from './contextual-clay.js';
 import { mateAvatarUrl } from './avatar.js';
 import { escapeHtml } from './utils.js';
 import { refreshIcons } from './icons.js';
@@ -146,7 +145,6 @@ export function handleClaySessionTarget(msg) {
     navigateToLog(msg.target);
     return true;
   }
-  if (citation) { dismissContextualClay(false); if ((store.get('contextualClay') || {}).mode !== 'closed') return true; }
   navigateToSession({ projectSlug: msg.target.projectSlug, sessionId: msg.target.sessionId }, null, msg.target.entryIndex);
   return true;
 }
@@ -174,24 +172,36 @@ export function closeCommandPalette() {
 
 export function setPaletteVersion(version) { cachedVersion = version; }
 
-export function handlePaletteSessionSwitch() {
+export function handlePaletteSessionSwitch(authoritative) {
   if (pendingLogNav && ctx.currentSlug && ctx.currentSlug() === pendingLogNav.projectSlug) {
     var logNav = pendingLogNav;
     pendingLogNav = null;
     openProjectLog(logNav.ref);
   }
-  if (!pendingNav) return;
-  var nav = pendingNav;
-  pendingNav = null;
-  if (ctx.currentSlug && ctx.currentSlug() === nav.slug) {
-    navigateToSession({ projectSlug: nav.slug, sessionId: nav.sessionId }, nav.query, nav.entryIndex);
+  // session_list precedes the connection's authoritative session_switched.
+  // Wait for that identity instead of requesting a duplicate initial replay.
+  if (authoritative === true && pendingNav && store.get('activeSessionId')) {
+    var nav = pendingNav;
+    pendingNav = null;
+    if (ctx.currentSlug && ctx.currentSlug() === nav.slug) {
+      navigateToSession({ projectSlug: nav.slug, sessionId: nav.sessionId }, nav.query, nav.entryIndex);
+    }
   }
+  var pending = store.get('pendingSessionEntryNavigation');
+  if (pending && isActiveEntryNavigation(pending)) pending.awaitingTarget = false;
+  var highlight = store.get('sessionEntryHighlight');
+  if (highlight && !isCurrentEntryHighlight(highlight)) store.set({ sessionEntryHighlight: null });
 }
 
 export function handlePaletteHistoryDone() {
   var pending = store.get('pendingSessionEntryNavigation');
-  if (!pending) return;
+  if (!pending) {
+    var highlight = store.get('sessionEntryHighlight');
+    if (highlight && isCurrentEntryHighlight(highlight)) jumpToSessionEntry(highlight.entryIndex, highlight);
+    return;
+  }
   if (!isActiveEntryNavigation(pending)) {
+    if (pending.awaitingTarget) return;
     store.set({ pendingSessionEntryNavigation: null });
     return;
   }
@@ -201,18 +211,26 @@ export function handlePaletteHistoryDone() {
     if (ws && ws.readyState === 1) ws.send(JSON.stringify({ type: "load_more_history", before: historyFrom, target: pending.entryIndex }));
     return;
   }
-  jumpToSessionEntry(pending.entryIndex);
+  jumpToSessionEntry(pending.entryIndex, pending);
 }
 
 export function handlePaletteHistoryPrepended() {
   var pending = store.get('pendingSessionEntryNavigation');
   if (!pending) return;
   if (!isActiveEntryNavigation(pending)) {
+    if (pending.awaitingTarget) return;
     store.set({ pendingSessionEntryNavigation: null });
     return;
   }
   requestAnimationFrame(function () {
-    if (store.get('pendingSessionEntryNavigation') === pending) handlePaletteHistoryDone();
+    if (store.get('pendingSessionEntryNavigation') !== pending) return;
+    // This frame was scheduled for an already active target. A later
+    // navigation cancels it even if its initial awaiting flag was retained.
+    if (!isActiveEntryNavigation(pending)) {
+      store.set({ pendingSessionEntryNavigation: null });
+      return;
+    }
+    handlePaletteHistoryDone();
   });
 }
 
@@ -220,6 +238,11 @@ function isActiveEntryNavigation(pending) {
   return String(store.get('currentSlug') || (ctx && ctx.currentSlug ? ctx.currentSlug() : "")) === String(pending.projectSlug) && String(store.get('activeSessionId')) === String(pending.sessionId);
 }
 
+function isCurrentEntryHighlight(highlight) {
+  return highlight.expiresAt > Date.now() && isActiveEntryNavigation(highlight)
+    && highlight.sessionOriginId === (store.get('sessionOriginId') || null);
+}
+
 function jumpToSessionEntry(entryIndex, pending) {
   if (pending && !isActiveEntryNavigation(pending)) return;
   var messages = document.querySelectorAll("#messages [data-history-index], #messages [data-history-indexes]");
@@ -228,17 +251,31 @@ function jumpToSessionEntry(entryIndex, pending) {
     var indexes = (messages[i].dataset.historyIndexes || messages[i].dataset.historyIndex || "").split(",");
     if (indexes.indexOf(String(entryIndex)) !== -1) { target = messages[i]; break; }
   }
-  store.set({ pendingSessionEntryNavigation: null });
   if (!target) return;
+  store.set({ pendingSessionEntryNavigation: null });
   disarmStickyBottom();
   var oldTargets = document.querySelectorAll("#messages .session-entry-target");
   for (var oldIndex = 0; oldIndex < oldTargets.length; oldIndex++) oldTargets[oldIndex].classList.remove("session-entry-target");
   var reducedMotion = window.matchMedia && window.matchMedia("(prefers-reduced-motion: reduce)").matches;
+  // A repeated authoritative replay replaces the DOM after the initial jump.
+  // Retain only this exact origin for the original feedback lifetime.
+  var highlight = pending && pending.expiresAt ? pending : {
+    projectSlug: store.get('currentSlug'), sessionId: store.get('activeSessionId'),
+    sessionOriginId: store.get('sessionOriginId') || null, entryIndex: entryIndex,
+    expiresAt: Date.now() + (reducedMotion ? 700 : 1800),
+  };
+  store.set({ sessionEntryHighlight: highlight });
   target.scrollIntoView({ behavior: reducedMotion ? "auto" : "smooth", block: "center" });
   target.classList.remove("session-entry-target");
   void target.offsetWidth;
   target.classList.add("session-entry-target");
-  setTimeout(function () { target.classList.remove("session-entry-target"); }, reducedMotion ? 700 : 1800);
+  target.sessionEntryHighlight = highlight;
+  setTimeout(function () {
+    if (target.sessionEntryHighlight !== highlight) return;
+    target.classList.remove("session-entry-target");
+    delete target.sessionEntryHighlight;
+    if (store.get('sessionEntryHighlight') === highlight) store.set({ sessionEntryHighlight: null });
+  }, Math.max(0, highlight.expiresAt - Date.now()));
 }
 
 function navigateToLog(target) {
@@ -433,8 +470,9 @@ function activateItem(entry) {
 export function navigateToSession(item, query, entryIndex) {
   closeCommandPalette();
   pendingNav = null;
+  store.set({ sessionEntryHighlight: null });
   var hasEntry = entryIndex !== null && entryIndex !== undefined && Number.isSafeInteger(Number(entryIndex)) && Number(entryIndex) >= 0;
-  store.set({ pendingSessionEntryNavigation: hasEntry ? { projectSlug: item.projectSlug, sessionId: item.sessionId, entryIndex: Number(entryIndex) } : null });
+  store.set({ pendingSessionEntryNavigation: hasEntry ? { projectSlug: item.projectSlug, sessionId: item.sessionId, entryIndex: Number(entryIndex), awaitingTarget: true } : null });
   if (ctx.currentSlug && ctx.currentSlug() === item.projectSlug) {
     var alreadyActive = String(store.get('activeSessionId')) === String(item.sessionId);
     if (alreadyActive) {

package/lib/public/modules/contextual-clay-workspace.js

@@ -89,7 +89,9 @@ export function finishContextualWorkspace() {
     if (handoff.stage === 'workspace' && store.get('currentSlug') === handoff.slug && store.get('activeSessionId') === handoff.sessionId) draft = takeComposerDraft();
     connection.restore(draft);
     connection.suspend(false);
-    store.set({ contextualWorkspace: Object.assign({}, handoff, { draft: null, stage: 'returning' }), contextualClay: Object.assign({}, store.get('contextualClay'), { mode: 'closed' }) });
+    var presentation = store.get('contextualClay') || {};
+    var keepOverlay = presentation.mode === 'popover' && connection !== bridge();
+    store.set({ contextualWorkspace: Object.assign({}, handoff, { draft: null, stage: 'returning' }), contextualClay: keepOverlay ? presentation : Object.assign({}, presentation, { mode: 'closed' }) });
     lockNative(true);
     return true;
   } catch (error) { showToast(error.message, 'error'); return false; }
@@ -136,7 +138,17 @@ export function renderContextualWorkspaceBack() {
 
 export function prepareContextualWorkspaceDeparture(slug) {
   var origin = store.get('contextualNativeOrigin');
-  if (origin && slug !== origin.slug && !finishContextualNativeOrigin()) return false;
+  if (origin && slug !== origin.slug) {
+    if ((store.get('contextualClay') || {}).mode === 'popover') {
+      var connection = bridge(origin.mateId, origin.sessionId);
+      try {
+        if (origin.stage !== 'pane' || !connection || !connection.identity().ready) throw new Error('Wait for this Mate conversation to reconnect.');
+        // The pane keeps its composer when its former native parent changes.
+        connection.checkDraft();
+        store.set({ contextualNativeOrigin: null }); lockNative(false);
+      } catch (error) { showToast(error.message, 'error'); return false; }
+    } else if (!finishContextualNativeOrigin()) return false;
+  }
   var handoff = store.get('contextualWorkspace');
   if (handoff && handoff.stage.indexOf('workspace') === 0 && slug !== handoff.slug) return finishContextualWorkspace();
 }

package/lib/public/modules/contextual-clay.js

@@ -34,6 +34,8 @@ function escapePopover(event) {
     if (event.defaultPrevented || contextualClayMode() !== 'popover') return;
     var context = host().querySelector('details[open]');
     if (context) { context.open = false; context.querySelector('summary').focus(); return; }
+    var focused = document.activeElement;
+    if (!host().contains(focused) && focused !== trigger()) return;
     event.preventDefault(); dismissContextualClay(true);
   });
 }
@@ -82,7 +84,16 @@ function render() {
   }
   var projectContext = (store.get('projectsHubList') || []).find(function (item) { return item.slug === store.get('currentSlug'); });
   var contextSession = getCachedSessions().find(function (item) { return item.id === store.get('activeSessionId'); });
-  updateMateContext(surface, mate, contextualFrame(), { projectTitle: store.get('homeShellVisible') ? 'Home' : projectContext && (projectContext.title || projectContext.project || projectContext.slug), conversationTitle: contextSession && contextSession.title, projectSlug: store.get('homeShellVisible') ? null : store.get('currentSlug'), sessionId: store.get('homeShellVisible') ? null : store.get('activeSessionId'), screen: store.get('homeShellVisible') ? 'Home' : store.get('dmMode') ? 'Direct message' : 'Project', ownerId: store.get('myUserId') || null });
+  var screen = store.get('homeShellVisible') || store.get('projectsHubVisible') ? 'Home' : store.get('dmMode') ? 'Direct message' : 'Project';
+  var projectView = screen === 'Project';
+  var parentReady = store.get('activeProjectSlug') === store.get('currentSlug') && store.get('sessionActivatedProjectSlug') === store.get('currentSlug') && !store.get('replayingHistory');
+  updateMateContext(surface, mate, contextualFrame(), {
+    projectTitle: projectView ? projectContext && (projectContext.title || projectContext.project || projectContext.slug) : store.get('projectsHubVisible') ? 'Projects' : screen,
+    conversationTitle: projectView && parentReady && contextSession ? contextSession.title : null,
+    projectSlug: projectView && parentReady ? store.get('currentSlug') : null,
+    sessionId: projectView && parentReady ? store.get('activeSessionId') : null,
+    screen: screen, ownerId: store.get('myUserId') || null
+  });
   if (trigger()) trigger().setAttribute('aria-expanded', String(mode === 'popover'));
   var selectedFrame = contextualFrame();
   var connection = selectedFrame && selectedFrame.conversation;
@@ -193,7 +204,7 @@ export function initContextualClay() {
   initClayControlActivity();
   initContextualWorkspace();
   document.addEventListener('pointerdown', function (event) {
-    if (contextualClayMode() === 'popover' && host() && !host().contains(event.target) && !(trigger() && trigger().contains(event.target)) && !event.target.closest('#contextual-mate-hint, .icon-strip-project-mate, .icon-strip-brand')) dismissContextualClay(false);
+    if (host() && !host().contains(event.target)) host().querySelectorAll('details[open]').forEach(function (menu) { menu.open = false; });
   });
   document.addEventListener('keydown', function (event) {
     if (event.key === 'Escape' && !event.defaultPrevented && contextualClayMode() === 'popover') {
@@ -231,7 +242,9 @@ export function initContextualClay() {
       var pending = value.contextualMatePending;
       store.set({ contextualMatePending: null }); activateContextualMate(pending); return;
     }
-    if (current.mode === 'popover' && (value.currentSlug !== previous.currentSlug || value.homeShellVisible !== previous.homeShellVisible || value.dmMode !== previous.dmMode)) dismissContextualClay(false);
+    // Ordinary navigation refreshes context without replacing the conversation.
+    // Direct navigation into a native Mate workspace ends the floating surface.
+    if (current.mode === 'popover' && value.currentSlug !== previous.currentSlug && (value.currentSlug || '').indexOf('mate-') === 0) dismissContextualClay(false);
     render();
   });
 }

package/lib/public/modules/contextual-mate-context.js

@@ -1,12 +1,13 @@
 import { store } from './store.js';
 import { getWs } from './ws-ref.js';
+import { contextualFrame } from './contextual-mate-identity.js';
 
 function identity(frame) {
   try { return frame && frame.conversation && frame.conversation.identity(); } catch (error) { return null; }
 }
 function contextKey(frame, canonical) {
   var current = identity(frame);
-  return JSON.stringify([store.get('currentSlug'), store.get('activeSessionId'), store.get('homeShellVisible'), store.get('dmMode'), store.get('rightWorkbenchOwner'), store.get('homeSubSurface'), store.get('rightWorkbenchRevision'), store.get('myUserId'), store.get('connected'), current && current.mateId, current && current.sessionId, current && (canonical ? current.connected : current.ready), canonical && current && current.sessionOriginId]);
+  return JSON.stringify([store.get('currentSlug'), store.get('activeSessionId'), store.get('sessionOriginId'), store.get('activeProjectSlug'), store.get('sessionActivatedProjectSlug'), store.get('replayingHistory'), (store.get('contextualClay') || {}).mode, store.get('homeShellVisible'), store.get('projectsHubVisible'), store.get('dmMode'), store.get('rightWorkbenchOwner'), store.get('homeSubSurface'), store.get('rightWorkbenchRevision'), store.get('myUserId'), store.get('connected'), current && current.mateId, current && current.sessionId, current && (canonical ? current.connected : current.ready), canonical && current && current.sessionOriginId]);
 }
 export function updateMateContext(surface, mate, frame, snapshot) {
   var current = identity(frame), ws = getWs(), key = contextKey(frame, mate && mate.builtinKey === 'clay'), prepared = store.get('contextualPrepared');
@@ -16,11 +17,12 @@ export function updateMateContext(surface, mate, frame, snapshot) {
   capabilities.setAttribute('aria-label', 'Clay capabilities');
   capabilities.textContent = "I can control Clay Studio for you—manage projects, coordinate work, set up schedules, and navigate your workspace. Just tell me what you’d like done.";
   var privateWorkspace = (store.get('currentSlug') || '').indexOf('mate-') === 0;
-  var available = !canonical && !privateWorkspace && current && current.ready && store.get('connected') && !store.get('homeShellVisible') && !store.get('dmMode') && !store.get('rightWorkbenchOwner') && ws && ws.readyState === 1;
+  var parentReady = store.get('activeProjectSlug') === store.get('currentSlug') && store.get('sessionActivatedProjectSlug') === store.get('currentSlug') && !store.get('replayingHistory');
+  var available = (store.get('contextualClay') || {}).mode === 'popover' && parentReady && !canonical && !privateWorkspace && current && current.ready && store.get('connected') && !store.get('homeShellVisible') && !store.get('projectsHubVisible') && !store.get('dmMode') && !store.get('rightWorkbenchOwner') && ws && ws.readyState === 1;
   var changed = !prepared || prepared.key !== key || prepared.socket !== ws;
   if (changed) {
     var requestId = 'context-' + crypto.randomUUID();
-    prepared = { key: key, requestId: requestId, socket: ws, mateId: current && current.mateId, status: available ? 'preparing' : 'unavailable' };
+    prepared = { key: key, requestId: requestId, socket: ws, mateId: current && current.mateId, canonical: !!canonical, status: available ? 'preparing' : 'unavailable' };
   }
   // Stamp the reference before publishing a new preparation: store subscribers
   // may render synchronously, and the composer must never see the prior view ID.
@@ -65,7 +67,7 @@ export function updateMateContext(surface, mate, frame, snapshot) {
 export function handleMateContextMessage(msg) {
   if (msg.type === 'mate_context_prepared') {
     var pending = store.get('contextualPrepared');
-    if (pending && pending.requestId === msg.requestId && pending.socket === getWs()) {
+    if (pending && pending.requestId === msg.requestId && pending.socket === getWs() && pending.key === contextKey(contextualFrame(), pending.canonical)) {
       store.set({ contextualPrepared: Object.assign({}, pending, msg, { status: msg.contextRef ? 'ready' : 'unavailable' }) });
       if (msg.contextRef) setTimeout(function () {
         var current = store.get('contextualPrepared');

package/lib/public/modules/elicitation-form.js

@@ -4,6 +4,8 @@
 import { escapeHtml } from './utils.js';
 import { iconHtml } from './icons.js';
 import { getWs } from './ws-ref.js';
+import { store } from './store.js';
+import { currentPaneReview } from './pane-binding.js';
 import { fieldInfo, patternIsBounded, validateForm } from './elicitation-schema.js';
 
 var UNSET = "__clay_unset__";
@@ -154,12 +156,14 @@ function showFormError(container, message) {
 }
 
 function send(container, action, content, onSent) {
+  if (!currentPaneReview(container)) return false;
   var ws = getWs();
   if (!ws || ws.readyState !== 1) {
     showFormError(container, "Not connected. Try again when the connection is restored.");
     return false;
   }
   var msg = { type: "elicitation_response", requestId: container.dataset.requestId, action: action };
+  if (container.paneBinding) msg.paneBinding = container.paneBinding;
   if (action === "accept") msg.content = content;
   ws.send(JSON.stringify(msg));
   setBusy(container, true);
@@ -177,6 +181,7 @@ function actionButton(label, className, handler) {
 
 export function buildElicitationCard(msg, onSent) {
   var container = el("div", "permission-container elicitation-container");
+  container.paneBinding = store.get('panePendingBinding') || store.get('paneCommittedBinding') || null;
   container.dataset.requestId = msg.requestId;
   var header = el("div", "permission-header");
   header.innerHTML = '<span class="permission-icon">' + iconHtml("key") + '</span>' +

package/lib/public/modules/history-replay-batch.js

@@ -27,6 +27,14 @@ function canCombine(previous, message) {
   // can differ; the first token still supplies the message's display time.
   var keys = Object.keys(previous).concat(Object.keys(message));
   return keys.every(function (key) {
+    // Socket JSON gives each event its own activation object. Compare every
+    // field, including future metadata, without weakening replay boundaries.
+    if (key === 'paneActivation' && previous[key] && message[key]) {
+      var before = previous[key], after = message[key];
+      return Object.keys(before).concat(Object.keys(after)).every(function (field) {
+        return before[field] === after[field];
+      });
+    }
     return key === 'text' || key === '_ts' || key === '_historyIndex' || key === '_historyIndexes' || previous[key] === message[key];
   });
 }

package/lib/public/modules/input.js

@@ -8,6 +8,7 @@ import { setRewindMode, isRewindMode } from './rewind.js';
 import { renderPicker as renderContextPicker } from './context-sources.js';
 import { checkForMention, showMentionMenu, hideMentionMenu, isMentionMenuVisible, mentionMenuKeydown, setMentionAtIdx, parseMentionFromInput, clearMentionState, stickyReapplyMention, sendMention, sendUserMention, renderMentionUser, renderUserMention, removeMentionChip } from './mention.js';
 import { store } from './store.js';
+import { sessionCallback, paneMessageBinding, samePaneBinding } from './pane-binding.js';
 import { sendAcknowledgedMessage } from './message-delivery.js';
 import { mateAvatarUrl } from './avatar.js';
 import { tuiIsActive, tuiSubmitText } from './session-tui-view.js';
@@ -122,6 +123,9 @@ function showPreThinkingForTurn() {
 
 // --- Send ---
 export function sendMessage() {
+  if (store.get('deferredSessionSwitch') || store.get('panePendingBinding') || store.get('paneSuspended')) return;
+  if (store.get('paneCommittedBinding') && !store.get('paneReady')) return;
+  var actionBinding = paneMessageBinding();
   if (store.get('contextualWriterSuspended')) return;
   if (ctx && requestRecordedSend(ctx.inputEl, sendMessage)) return;
   stopSTT();
@@ -346,6 +350,7 @@ export function sendMessage() {
     store.set({ pendingScheduleAdmissions: admissions, pendingScheduleAdmission: admissions[scheduleRequestId] });
     ctx.ws.send(JSON.stringify({
       type: "schedule_message", requestId: scheduleRequestId,
+      paneBinding: actionBinding || undefined,
       projectSlug: scheduleContext.projectSlug, sessionId: scheduleContext.sessionId, accountId: scheduleContext.accountId,
       text: text || "", images: images, pastes: pastes, resetsAt: resetsAt,
     }));
@@ -354,6 +359,7 @@ export function sendMessage() {
 
   var screenReference = contextualScreenReference();
   var payload = { type: "message", text: text || "" };
+  if (actionBinding) payload.paneBinding = actionBinding;
   if (screenReference) payload.contextualSnapshot = screenReference;
   if (images.length > 0) {
     payload.images = images;
@@ -440,6 +446,7 @@ export function sendTextMessage(text) {
 export function sendShellResultToAgent(msg) {
   if (!ctx || !ctx.connected || !msg || msg.error || !msg.command) return false;
   if (String(msg.sessionId) !== String(store.get("activeSessionId"))) return false;
+  if (store.get('paneCommittedBinding') && !samePaneBinding(msg.paneActivation, store.get('paneCommittedBinding'))) return false;
   var payload = {
     type: "message",
     text: "$ " + msg.command,
@@ -447,7 +454,8 @@ export function sendShellResultToAgent(msg) {
   };
   var selectedVendor = store.get("currentVendor") || null;
   if (selectedVendor) payload.vendor = selectedVendor;
-  ctx.ws.send(JSON.stringify(payload));
+  if (msg.paneActivation) payload.paneBinding = msg.paneActivation;
+  if (ctx.ws.send(JSON.stringify(payload)) === false) return false;
   commitVendorForTurn();
   showPreThinkingForTurn();
   return true;
@@ -543,9 +551,17 @@ function removePendingImage(idx) {
 }
 
 // Move composer ownership between two authenticated views of the same session.
+export function composerDepartureReason() {
+  if (uploadingCount) return 'Wait for attachments to finish uploading before changing views.';
+  if (store.get('speechActive') || ctx && hasRecordedSpeechFor(ctx.inputEl)) return 'Finish or discard the voice recording before changing views.';
+  var retry = store.get('speechRetry');
+  if (retry && ctx && retry.input === ctx.inputEl) return 'Retry or discard the voice recording before changing views.';
+  return '';
+}
 export function takeComposerDraft() {
-  if (uploadingCount) throw new Error('Wait for attachments to finish uploading before opening Clay.');
-  if (store.get('speechActive') || hasRecordedSpeechFor(ctx.inputEl)) throw new Error('Finish or discard the voice recording before changing Clay views.');
+  var reason = composerDepartureReason();
+  if (reason) throw new Error(reason);
+  if (document.dispatchEvent) document.dispatchEvent(new CustomEvent('clay-composer-handoff'));
   var input = ctx.inputEl;
   var draft = { text: input.value, start: input.selectionStart, end: input.selectionEnd, direction: input.selectionDirection, images: pendingImages, pastes: pendingPastes, files: pendingFiles, delay: scheduleDelayMs };
   input.value = '';
@@ -585,14 +601,14 @@ function pastePreview(text) {
 }
 
 function editPendingPaste(idx) {
-  showPasteModal(pendingPastes[idx].text, function (text) {
+  showPasteModal(pendingPastes[idx].text, sessionCallback(function (text) {
     if (!text) {
       removePendingPaste(idx);
       return;
     }
     pendingPastes[idx] = { text: text, preview: pastePreview(text) };
     renderInputPreviews();
-  });
+  }));
 }
 
 function removePendingFile(idx) {
@@ -726,6 +742,7 @@ function uploadFile(file) {
     return;
   }
   uploadingCount++;
+  store.set({ composerUploadingCount: uploadingCount });
   renderInputPreviews();
   var reader = new FileReader();
   reader.onload = function (ev) {
@@ -738,12 +755,14 @@ function uploadFile(file) {
     xhr.setRequestHeader("Content-Type", "application/json");
     xhr.onload = function () {
       uploadingCount--;
+      store.set({ composerUploadingCount: uploadingCount });
       if (xhr.status === 200) {
         try {
           var resp = JSON.parse(xhr.responseText);
           pendingFiles.push({ name: resp.name || uploadName, path: resp.path });
-        } catch (e) {}
+        } catch (e) { showToast('Upload response could not be read: ' + uploadName + '. Your draft is preserved.', 'error'); }
       } else {
+        showToast('Upload failed: ' + uploadName + '. Your draft is preserved.', 'error');
         if (ctx.addSystemMessage) ctx.addSystemMessage("Upload failed: " + uploadName, true);
       }
       renderInputPreviews();
@@ -753,6 +772,8 @@ function uploadFile(file) {
     };
     xhr.onerror = function () {
       uploadingCount--;
+      store.set({ composerUploadingCount: uploadingCount });
+      showToast('Upload failed: ' + uploadName + '. Your draft is preserved.', 'error');
       if (ctx.addSystemMessage) ctx.addSystemMessage("Upload failed: " + uploadName, true);
       renderInputPreviews();
       if (ctx.processing && ctx.setSendBtnMode) {
@@ -761,6 +782,7 @@ function uploadFile(file) {
     };
     xhr.send(JSON.stringify({ name: uploadName, data: b64 }));
   };
+  reader.onerror = function () { uploadingCount--; store.set({ composerUploadingCount: uploadingCount }); renderInputPreviews(); showToast('Attachment could not be read. Your draft is preserved.', 'error'); };
   reader.readAsDataURL(file);
 }
 
@@ -772,7 +794,14 @@ function readImageBlob(blob) {
     uploadFile(blob);
     return;
   }
+  uploadingCount++; store.set({ composerUploadingCount: uploadingCount });
+  var completed = false;
+  function finish() {
+    if (completed) return; completed = true; uploadingCount--;
+    store.set({ composerUploadingCount: uploadingCount }); renderInputPreviews();
+  }
   var reader = new FileReader();
+  reader.onerror = function () { finish(); showToast('Image could not be read. Your draft is preserved.', 'error'); };
   reader.onload = function (ev) {
     var dataUrl = ev.target.result;
     // Check base64 payload size (~3/4 of base64 length)
@@ -781,7 +810,7 @@ function readImageBlob(blob) {
     var estimatedBytes = b64.length * 0.75;
 
     if (estimatedBytes <= MAX_IMAGE_BYTES) {
-      addPendingImage(dataUrl);
+      addPendingImage(dataUrl); finish();
       return;
     }
 
@@ -799,8 +828,9 @@ function readImageBlob(blob) {
       var cx = canvas.getContext("2d");
       cx.drawImage(img, 0, 0, nw, nh);
       var resized = canvas.toDataURL("image/jpeg", RESIZE_QUALITY);
-      addPendingImage(resized);
+      addPendingImage(resized); finish();
     };
+    img.onerror = function () { finish(); showToast('Image could not be loaded. Your draft is preserved.', 'error'); };
     img.src = dataUrl;
   };
   reader.readAsDataURL(blob);
@@ -869,7 +899,9 @@ function sendInputSync() {
     if (dk) ctx.ws.send(JSON.stringify({ type: "dm_typing", dmKey: dk, typing: hasText }));
     return;
   }
-  ctx.ws.send(JSON.stringify({ type: "input_sync", text: ctx.inputEl.value }));
+  var speech = store.get('speechActive');
+  ctx.ws.send(JSON.stringify({ type: "input_sync", text: ctx.inputEl.value,
+    paneBinding: speech && speech.writing ? speech.paneBinding || undefined : undefined }));
 }
 
 export function handleInputSync(text) {
@@ -893,7 +925,7 @@ function createFileInput(accept, capture, multiple) {
   input.style.display = "none";
   document.body.appendChild(input);
 
-  input.addEventListener("change", function () {
+  var selectFiles = sessionCallback(function () {
     if (input.files) {
       for (var i = 0; i < input.files.length; i++) {
         if (input.files[i].type.indexOf("image/") === 0) {
@@ -903,6 +935,9 @@ function createFileInput(accept, capture, multiple) {
         }
       }
     }
+  });
+  input.addEventListener("change", function () {
+    selectFiles();
     document.body.removeChild(input);
   });
 
@@ -991,6 +1026,14 @@ export function initInput(_ctx) {
     }
   }
 
+  document.addEventListener('clay-composer-handoff', function () {
+    if (scheduleInlineInput) {
+      var minutes = parseInt(scheduleInlineInput.value, 10);
+      if (minutes >= 1 && minutes <= 1440) setScheduleDelayMs(minutes * 60000);
+    }
+    collapseScheduleBtn();
+  });
+
   function setScheduleDelay(ms) {
     scheduleDelayMs = ms;
     if (!scheduleBtn) return;
@@ -1020,7 +1063,7 @@ export function initInput(_ctx) {
     scheduleInlineInput.className = "schedule-inline-input";
     scheduleBtn.appendChild(scheduleInlineInput);
 
-    setTimeout(function () { scheduleInlineInput.focus(); }, 0);
+    setTimeout(sessionCallback(function () { if (scheduleInlineInput) scheduleInlineInput.focus(); }), 0);
 
     scheduleInlineInput.addEventListener("click", function (e) { e.stopPropagation(); });
     scheduleInlineInput.addEventListener("keydown", function (e) {
@@ -1039,6 +1082,7 @@ export function initInput(_ctx) {
 
     // Close on outside click
     setTimeout(function () {
+      if (!scheduleInlineInput) return;
       scheduleOutsideHandler = function (ev) {
         if (!scheduleBtn.contains(ev.target)) {
           if (scheduleInlineInput) {

package/lib/public/modules/message-delivery.js

@@ -2,6 +2,7 @@
 
 import { store } from './store.js';
 import { getWs } from './ws-ref.js';
+import { paneMessageBinding } from './pane-binding.js';
 
 var ACK_TIMEOUT_MS = 5000;
 var ACK_RETRY_LIMIT = 3;
@@ -152,7 +153,7 @@ function transmit(entry, automatic) {
   }
   socketRefs[entry.payload.clientMessageId] = socket;
   try {
-    socket.send(JSON.stringify(entry.payload));
+    if (socket.send(JSON.stringify(entry.payload)) === false) { markUnconfirmed(entry); return false; }
     armAckTimer(entry.payload.clientMessageId, socket);
     return true;
   } catch (e) {
@@ -163,6 +164,8 @@ function transmit(entry, automatic) {
 
 export function sendAcknowledgedMessage(payload) {
   var nextPayload = Object.assign({}, payload, { clientMessageId: createClientMessageId() });
+  var binding = paneMessageBinding();
+  if (binding && !nextPayload.paneBinding) nextPayload.paneBinding = binding;
   var entry = {
     projectSlug: store.get('currentSlug'),
     sessionId: store.get('activeSessionId'),
@@ -193,7 +196,12 @@ export function sendAcknowledgedMessage(payload) {
 export function retryPendingMessage(clientMessageId) {
   var entry = pendingEntry(clientMessageId);
   if (!matchesActivatedContext(entry) || hasKnownCliMismatch(entry)) return false;
-  var retryEntry = Object.assign({}, entry, { attempts: 0, status: "pending" });
+  // An explicit Retry in the same durable conversation may use its new live
+  // binding. Automatic retry retains the original action binding and refuses.
+  var payload = Object.assign({}, entry.payload);
+  var binding = paneMessageBinding();
+  if (binding) payload.paneBinding = binding;
+  var retryEntry = Object.assign({}, entry, { payload: payload, attempts: 0, status: "pending" });
   replacePending(pendingMessages().map(function (candidate) {
     return candidate.payload.clientMessageId === clientMessageId ? retryEntry : candidate;
   }));

package/lib/public/modules/model-picker.js

@@ -50,6 +50,8 @@ export function setupModelPicker() {
 
 export function resetModelPickerState() {
   clearRequestTimer();
+  if (configPopover) configPopover.classList.add('hidden');
+  if (configChip) configChip.classList.remove('active');
   store.set({
     modelListVendor: "",
     modelListStatus: "idle",