clay-server 5.2.0-beta.8 → 5.2.0

package/lib/public/modules/app-rate-limit.js

@@ -238,9 +238,16 @@ function tickRateLimitUsage() {
   renderRateLimitUsage();
 }
 
+// Once the server's vendor overview has answered, every vendor including the
+// displayed one is shown by the overview chips, so this session-scoped link
+// stands down. Rejection, warning and scheduling state is untouched.
+function overviewOwnsUsageDisplay() {
+  return !!store.get('vendorUsageOverview');
+}
+
 function renderRateLimitUsage() {
   var activeVendor = store.get('currentVendor') || "claude";
-  if (!vendorTracksRateLimits(activeVendor)) {
+  if (!vendorTracksRateLimits(activeVendor) || overviewOwnsUsageDisplay()) {
     if (rateLimitUsageEl) {
       rateLimitUsageEl.remove();
       rateLimitUsageEl = null;
@@ -320,6 +327,10 @@ export function initRateLimit() {
         || state.currentSlug !== prev.currentSlug || state.myUserId !== prev.myUserId) {
       resetRateLimitState();
     }
+    if (state.vendorUsageOverview !== prev.vendorUsageOverview && state.currentVendor === prev.currentVendor && state.activeSessionId === prev.activeSessionId
+        && state.currentSlug === prev.currentSlug && state.myUserId === prev.myUserId) {
+      renderRateLimitUsage();
+    }
     if (state.vendorInfo !== prev.vendorInfo && state.currentVendor === prev.currentVendor && state.activeSessionId === prev.activeSessionId
         && state.currentSlug === prev.currentSlug && state.myUserId === prev.myUserId) {
       renderRateLimitUsage();

package/lib/public/modules/clay-owner-navigation.js

@@ -1,5 +1,4 @@
 import { observeNavigationRendering } from './clay-navigation-render.js';
-import { dismissContextualClay } from './contextual-clay.js';
 import { showClayNavigationActivity, clearClayControlActivity } from './clay-control-activity.js';
 import { store } from './store.js';
 import { getWs } from './ws-ref.js';
@@ -23,8 +22,6 @@ export function handleOwnerNavigation(msg) {
   var status = 'refused';
   if (accepted && msg.target && typeof msg.target.projectSlug === 'string' && Number.isSafeInteger(msg.target.sessionId)) {
     try {
-      var contextual = store.get('contextualClay') || {};
-      if (msg.target.contextualSourceMateId && contextual.mateId === msg.target.contextualSourceMateId && contextual.mode === 'popover') dismissContextualClay(false);
       showClayNavigationActivity(msg.target, false); navigateToSession(msg.target, null, msg.target.entryIndex); status = 'accepted';
     } catch (error) { showClayNavigationActivity(msg.target, true); status = 'failed'; }
   }

package/lib/public/modules/clay-studio-render.js

@@ -1,5 +1,6 @@
 import { forwardDocumentSource } from './clay-studio-document.js';
 import { store } from './store.js';
+import { paneMessageBinding, livePaneBinding } from './pane-binding.js';
 import { getWs } from './ws-ref.js';
 import { contextualMateStamp } from './contextual-mate-identity.js';
 import { visibleTarget } from './clay-control-target-visibility.js';
@@ -34,7 +35,7 @@ export function forwardStudioPresentation(message, type) {
   if (Object.keys(receipts).length >= 100) return true;
   if (evidence) receipts[evidence.id] = { evidence: evidence, socket: getWs() };
   store.set({ clayStudioRelays: receipts });
-  window.parent.postMessage({ type: type, message: message, studioSource: frame.clayStudioSource.identity() }, location.origin);
+  window.parent.postMessage({ type: type, message: message, paneBinding: paneMessageBinding(), studioSource: frame.clayStudioSource.identity() }, location.origin);
   return true;
 }
 export function trustedStudioFrame(event, data) {
@@ -45,6 +46,7 @@ export function trustedStudioFrame(event, data) {
   if (!live || !live.connected || live.ownerId !== (store.get('myUserId') || null) || live.ownerId !== expected.ownerId || live.slug !== expected.slug || live.sessionId !== expected.sessionId || live.origin !== expected.origin || live.runtime !== expected.runtime) return null;
   if (new URL(frame.src, location.href).pathname !== '/p/' + encodeURIComponent(live.slug) + '/') return null;
   if (frame.classList.contains('split-pane-frame')) {
+    if (frame.clayPane && !livePaneBinding(frame, data)) return null;
     var split = store.get('splitPanes');
     if (!split || !split.panes.some(function (pane) { return pane.slug === live.slug && String(pane.sessionId) === String(live.sessionId); })) return null;
   } else {

package/lib/public/modules/clay-tool-presentation.js

@@ -172,6 +172,7 @@ rows('clay-workspace', [
   ['inspect_mate_chat_change', 'Inspecting Mate conversation change', 'Mate conversation change inspected', 'Mate conversation'],
   ['control_mate_chat', 'Requesting Mate conversation change', 'Mate conversation request returned', 'Mate conversation', 'why', 'mate-chat'],
   ['control_schedules', 'Requesting schedule change', 'Schedule change request returned', 'Scheduling', 'why', 'schedule-control'],
+  ['read_vendor_usage', 'Reading vendor usage', 'Vendor usage read', 'Vendor usage', 'projectSlug'],
   ['read_project_records', 'Reading project records', 'Project records read', 'Project records', 'projectSlug'],
   ['inspect_project_record_change', 'Inspecting record change', 'Record change inspected', 'Project records', 'projectSlug'],
   ['control_project_records', 'Requesting record change', 'Record change request returned', 'Project records', 'why'],

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

@@ -1,3 +1,4 @@
+import { mateLoadingMarkup, updateMateLoadingScene } from './mate-loading-scene.js';
 import { attachContextualSessionCitations } from './contextual-session-citations.js';
 import { attachContextualConversations } from './contextual-mate-sessions.js';
 import { getCachedSessions } from './sidebar-sessions.js';
@@ -34,6 +35,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);
   });
 }
@@ -65,6 +68,7 @@ function render() {
   var mate = contextualMate(state().mateId);
   if (mate) {
     var name = getHomeMateName(mate);
+    updateMateLoadingScene(surface.querySelector('[data-clay-loading]'), name, mateAvatarUrl(mate, 96));
     surface.setAttribute('aria-label', name + ' conversation');
     surface.querySelector('strong').textContent = name;
     var header = surface.querySelector('header');
@@ -82,7 +86,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;
@@ -119,7 +132,7 @@ function ensureSurface() {
   if (!host()) {
     var surface = document.createElement('section');
     surface.id = 'contextual-clay'; surface.setAttribute('role', 'dialog');
-    surface.innerHTML = '<header><img class="contextual-clay-avatar" alt=""><div class="contextual-clay-identity"><strong></strong><div class="contextual-context-line"><span data-clay-context></span><details class="contextual-clay-context"><summary aria-label="What this Mate can see" title="What this Mate can see">' + iconHtml('circle-help') + '</summary><p></p></details></div></div><div class="contextual-clay-actions"><button type="button" data-clay-expand>' + iconHtml('arrow-up-right') + '<span></span></button><button type="button" data-clay-close title="Close">' + iconHtml('x') + '</button></div></header><p class="contextual-capabilities" role="note" aria-label="Conversation capabilities"></p><div class="contextual-clay-body"><p data-clay-loading role="status">Opening conversation…</p></div>';
+    surface.innerHTML = '<header><img class="contextual-clay-avatar" alt=""><div class="contextual-clay-identity"><strong></strong><div class="contextual-context-line"><span data-clay-context></span><details class="contextual-clay-context"><summary aria-label="What this Mate can see" title="What this Mate can see">' + iconHtml('circle-help') + '</summary><p></p></details></div></div><div class="contextual-clay-actions"><button type="button" data-clay-expand>' + iconHtml('arrow-up-right') + '<span></span></button><button type="button" data-clay-close title="Close">' + iconHtml('x') + '</button></div></header><p class="contextual-capabilities" role="note" aria-label="Conversation capabilities"></p><div class="contextual-clay-body">' + mateLoadingMarkup() + '</div>';
     surface.addEventListener('contextual-clay-keydown', function (event) {
       var detail = event.detail; var frame = contextualFrame();
       if (!detail || !frame || detail.source !== frame.contentWindow) return;
@@ -193,7 +206,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 +244,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/github-star.js

@@ -0,0 +1,66 @@
+// github-star.js - Public star count beside the top-bar GitHub Star link.
+//
+// The link itself is static markup. This module only fills in the count read
+// from the server's cached GET /api/github-stars. An unknown count leaves the
+// count segment hidden; nothing is invented, and the module never writes to
+// GitHub or sends anything about the user.
+
+import { store } from './store.js';
+
+var REFRESH_MS = 60 * 60 * 1000;
+var MOBILE_QUERY = "(max-width: 768px)";
+
+var timer = null;
+var inflight = false;
+
+// 999 -> "999", 1234 -> "1.2k", 12500 -> "12.5k", 1200000 -> "1.2m"
+export function formatStarCount(n) {
+  if (typeof n !== "number" || !isFinite(n) || n < 0) return "";
+  n = Math.floor(n);
+  if (n < 1000) return String(n);
+  var units = [[1000000, "m"], [1000, "k"]];
+  for (var i = 0; i < units.length; i++) {
+    if (n >= units[i][0]) {
+      var v = Math.floor(n / units[i][0] * 10) / 10;
+      return (v % 1 === 0 ? String(v) : v.toFixed(1)) + units[i][1];
+    }
+  }
+  return String(n);
+}
+
+function render() {
+  var count = store.get("githubStarCount");
+  var countEl = document.getElementById("github-star-count");
+  var linkEl = document.getElementById("github-star-link");
+  if (!countEl || !linkEl) return;
+  var text = typeof count === "number" ? formatStarCount(count) : "";
+  countEl.textContent = text;
+  countEl.classList.toggle("hidden", !text);
+  linkEl.setAttribute("aria-label", text ? "Star Clay on GitHub, " + count + " stars" : "Star Clay on GitHub");
+}
+
+function isMobile() {
+  return !!(window.matchMedia && window.matchMedia(MOBILE_QUERY).matches);
+}
+
+function load() {
+  if (inflight || isMobile()) return Promise.resolve();
+  inflight = true;
+  return fetch("/api/github-stars", { credentials: "same-origin" }).then(function (res) {
+    return res.ok ? res.json() : null;
+  }).then(function (data) {
+    // Keep the last known count when the server has none or the call failed.
+    if (data && typeof data.stars === "number") {
+      store.set({ githubStarCount: data.stars });
+      render();
+    }
+  }).catch(function () {}).then(function () { inflight = false; });
+}
+
+export function initGithubStar() {
+  if (!document.getElementById("github-star")) return;
+  render();
+  load();
+  if (timer) clearInterval(timer);
+  timer = setInterval(load, REFRESH_MS);
+}

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/home-surface-boot.js

@@ -11,7 +11,6 @@ function explicitProjectPath(pathname) {
 export function resolveHomeBootDestination(options) {
   if (!options) return "wait";
   if (options.paneMode || explicitProjectPath(options.pathname)) return "project";
-  if (/^\/projects\/?$/.test(options.pathname || "")) return "projects";
   // The server-selected project embedded in the root shell is authoritative.
   // Home is entered only through an explicit in-app action; reloading `/`
   // returns to the project workspace even if Home was the last open surface.