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

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

@@ -1,8 +1,11 @@
+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';
 import { navigateToSession } from './command-palette.js';
 function context() {
-  return JSON.stringify([store.get('currentSlug'), store.get('activeSessionId'), store.get('dmMode'), store.get('homeShellVisible'), store.get('homeChatMateId'), store.get('homeChatSessionId'), store.get('homeSubSurface')]);
+  return JSON.stringify([store.get('currentSlug'), store.get('activeSessionId'), store.get('dmMode'), store.get('homeShellVisible'), store.get('homeChatMateId'), store.get('homeChatSessionId'), store.get('homeSubSurface'), (store.get('contextualClay') || {}).mode]);
 }
 export function handleOwnerNavigation(msg) {
   if (msg.type !== 'clay_navigation_offer' && msg.type !== 'clay_navigation_apply') return false;
@@ -19,9 +22,15 @@ export function handleOwnerNavigation(msg) {
   var accepted = offer && offer.id === msg.deliveryId && offer.socket === ws && offer.context === context() && !document.hidden && !store.get('paneMode');
   var status = 'refused';
   if (accepted && msg.target && typeof msg.target.projectSlug === 'string' && Number.isSafeInteger(msg.target.sessionId)) {
-    try { navigateToSession(msg.target); status = 'accepted'; } catch (error) { status = 'failed'; }
+    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'; }
   }
+  if (status === 'refused') clearClayControlActivity();
   // This acknowledges navigator invocation only. Rendering may finish after reconnect.
   if (ws.readyState === 1) ws.send(JSON.stringify({ type: 'clay_navigation_ack', deliveryId: msg.deliveryId, status: status }));
+  if (status === 'accepted') observeNavigationRendering(msg, ws);
   return true;
 }

package/lib/public/modules/clay-session-links.js

@@ -0,0 +1,31 @@
+import { parseClaySessionReference, renderClaySessionLink } from './clay-log-links.js';
+
+// The prefix is a display compatibility label, never a navigation target.
+var citationPattern = /\[([A-Za-z0-9][A-Za-z0-9_-]{0,79})\/(session:[A-Za-z0-9_-]{24}(?:#entry-[0-9]+)?)(?:\s+[\u2014-]\s+([^\]\n]{1,80}))?\]/g;
+function matches(text) {
+  var pattern = new RegExp(citationPattern.source, 'g'), results = [], match;
+  while ((match = pattern.exec(text))) if (parseClaySessionReference(match[2])) results.push({ start: match.index, end: pattern.lastIndex, prefix: match[1], ref: match[2], label: match[3] || '' });
+  return results;
+}
+function button(match) {
+  var template = document.createElement('template');
+  template.innerHTML = renderClaySessionLink(match.ref, match.label);
+  return template.content.firstElementChild;
+}
+export function enhanceSessionCitations(root) {
+  // Historical assistants sometimes wrapped a whole project-labelled citation
+  // in inline code. Only that complete legacy token is a compatibility citation.
+  // Canonical code samples, mixed inline code and all fenced code stay literal.
+  if (root.closest('.msg-assistant')) root.querySelectorAll('code').forEach(function (code) {
+    if (code.closest('pre, a, button')) return;
+    var text = code.textContent || '', found = matches(text);
+    if (found.length === 1 && found[0].prefix !== 'clayos' && found[0].start === 0 && found[0].end === text.length) code.replaceWith(button(found[0]));
+  });
+  var walker = document.createTreeWalker(root, NodeFilter.SHOW_TEXT), nodes = [], node;
+  while ((node = walker.nextNode())) if (node.parentElement && !node.parentElement.closest('code, pre, a, button') && matches(node.nodeValue || '').length) nodes.push(node);
+  nodes.forEach(function (node) {
+    var text = node.nodeValue || '', fragment = document.createDocumentFragment(), offset = 0;
+    matches(text).forEach(function (match) { fragment.appendChild(document.createTextNode(text.slice(offset, match.start))); fragment.appendChild(button(match)); offset = match.end; });
+    fragment.appendChild(document.createTextNode(text.slice(offset))); node.replaceWith(fragment);
+  });
+}

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

@@ -0,0 +1,20 @@
+import { adoptDocumentSource, presentedDocument, initDocumentSource } from './clay-studio-document.js';
+import { acceptStudioForward, trustedStudioFrame, initStudioReceipts } from './clay-studio-render.js';
+import { presentMarkdownEdit, handleFileChanged } from './filebrowser.js';
+import { openWireframe } from './wireframe-workbench.js';
+
+export function initStudioBridge() {
+  initStudioReceipts(); initDocumentSource();
+  window.addEventListener('message', function (event) {
+    var data = event.data;
+    if (event.origin === location.origin && data && data.type === 'clay-studio-document-update' && data.message) {
+      var view = presentedDocument(data.message.path);
+      if (view && view.source === event.source && view.descriptor.token === data.token) handleFileChanged(data.message, view);
+      return;
+    }
+    if (!data || ['clay-pane-present-markdown', 'clay-pane-present-wireframe'].indexOf(data.type) < 0 || !data.message || !data.message.controlPresentation) return;
+    if (!trustedStudioFrame(event, data) || !acceptStudioForward(event, data)) return;
+    if (data.type === 'clay-pane-present-markdown') { adoptDocumentSource(event, data, trustedStudioFrame(event, data)); presentMarkdownEdit(data.message); }
+    else openWireframe(data.message);
+  });
+}

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

@@ -0,0 +1,67 @@
+import { showToast } from './utils.js';
+import { store } from './store.js';
+import { getWs } from './ws-ref.js';
+
+function live(view) { var state = store.snap(); return view && state.connected && view.socket === getWs() && view.ownerId === (state.myUserId || null) && view.slug === state.currentSlug && view.sessionId === state.activeSessionId && view.origin === state.sessionOriginId && view.runtime === state.controlRuntimeId; }
+export function forwardDocumentSource(message) {
+  var old = store.get('studioDocumentSource');
+  if (old) clearTimeout(old.timer);
+  if (old && live(old)) old.socket.send(JSON.stringify({ type: 'fs_unwatch' }));
+  var state = store.snap(), view = { token: crypto.randomUUID(), socket: getWs(), ownerId: state.myUserId || null, slug: state.currentSlug, sessionId: state.activeSessionId, origin: state.sessionOriginId, runtime: state.controlRuntimeId, path: message.path, expires: Date.now() + 300000 };
+  view.timer = setTimeout(function () { if (store.get('studioDocumentSource') === view) { if (live(view)) view.socket.send(JSON.stringify({ type: 'fs_unwatch' })); store.set({ studioDocumentSource: null }); } }, 300000);
+  store.set({ studioDocumentSource: view });
+  if (live(view)) view.socket.send(JSON.stringify({ type: 'fs_watch', path: view.path }));
+  return Object.assign({}, message, { studioDocument: { token: view.token, sourceSlug: view.slug, sourceSessionId: view.sessionId, sourceOrigin: view.origin, runtimeId: view.runtime, expires: view.expires, path: view.path } });
+}
+export function adoptDocumentSource(event, data, frame) {
+  var document = data.message && data.message.studioDocument;
+  if (!frame || !document || document.path !== data.message.path || document.sourceSlug !== data.studioSource.slug || document.sourceSessionId !== data.studioSource.sessionId || document.sourceOrigin !== data.studioSource.origin || document.runtimeId !== data.studioSource.runtime) return;
+  closePresentedDocument();
+  var socket = getWs(); if (socket && socket.readyState === 1) socket.send(JSON.stringify({ type: 'fs_unwatch' }));
+  store.set({ fileReadRequest: null, pendingFileNavigation: null });
+  var view = { descriptor: document, frame: frame, document: frame.contentDocument, source: event.source, owner: store.get('myUserId'), context: store.get('currentSlug') };
+  view.timer = setTimeout(function () { if (store.get('studioDocumentView') === view) store.set({ studioDocumentView: { descriptor: view.descriptor, invalidated: true } }); }, Math.max(0, document.expires - Date.now()));
+  store.set({ studioDocumentView: view });
+}
+export function presentedDocument(path) {
+  var view = store.get('studioDocumentView');
+  if (!view || view.invalidated || !view.frame || Date.now() > view.descriptor.expires || view.descriptor.path !== path) return null;
+  var bridge = view.frame.clayStudioSource, identity = bridge && bridge.document === view.frame.contentDocument && bridge.window === view.source && bridge.identity();
+  return identity && identity.connected && identity.ownerId === view.owner && identity.slug === view.descriptor.sourceSlug && identity.sessionId === view.descriptor.sourceSessionId && identity.origin === view.descriptor.sourceOrigin && identity.runtime === view.descriptor.runtimeId && view.document === view.frame.contentDocument && view.source === view.frame.contentWindow && view.owner === store.get('myUserId') && view.context === store.get('currentSlug') ? view : null;
+}
+export function refreshPresentedDocument(path) {
+  var stored = store.get('studioDocumentView');
+  if (!stored || stored.descriptor.path !== path) return false;
+  var view = presentedDocument(path);
+  if (!view) { showToast('The source connection changed. Reopen this document from its conversation.'); return true; }
+  view.source.postMessage({ type: 'clay-studio-document-refresh', token: view.descriptor.token }, location.origin);
+  return true;
+}
+export function closePresentedDocument() {
+  var view = store.get('studioDocumentView');
+  if (view) clearTimeout(view.timer);
+  if (view && view.frame && view.source === view.frame.contentWindow && view.document === view.frame.contentDocument) view.source.postMessage({ type: 'clay-studio-document-close', token: view.descriptor.token }, location.origin);
+  store.set({ studioDocumentView: null });
+}
+export function handleStudioDocumentMessage(message) {
+  var view = store.get('studioDocumentSource');
+  if (!live(view) || Date.now() > view.expires || message.path !== view.path) return false;
+  if (message.type !== 'fs_file_changed' && !(message.type === 'fs_read_result' && message.requestId === view.requestId)) return false;
+  window.parent.postMessage({ type: 'clay-studio-document-update', token: view.token, message: message }, location.origin);
+  return true;
+}
+export function initDocumentSource() {
+  window.addEventListener('message', function (event) {
+    var data = event.data, view = store.get('studioDocumentSource');
+    if (event.origin !== location.origin || event.source !== window.parent || !data || !view || data.token !== view.token || !live(view)) return;
+    if (data.type === 'clay-studio-document-close') { clearTimeout(view.timer); view.socket.send(JSON.stringify({ type: 'fs_unwatch' })); store.set({ studioDocumentSource: null }); }
+    if (data.type === 'clay-studio-document-refresh' && Date.now() <= view.expires) {
+      view.requestId = 'studio-document-' + crypto.randomUUID();
+      view.socket.send(JSON.stringify({ type: 'fs_read', path: view.path, requestId: view.requestId, projectSlug: view.slug, sessionId: String(view.sessionId), accountId: view.ownerId }));
+    }
+  });
+  function stop() { var view = store.get('studioDocumentSource'); if (view) clearTimeout(view.timer); if (live(view)) view.socket.send(JSON.stringify({ type: 'fs_unwatch' })); store.set({ studioDocumentSource: null }); var presented = store.get('studioDocumentView'); closePresentedDocument(); if (presented) store.set({ studioDocumentView: { descriptor: presented.descriptor, invalidated: true } }); }
+  store.subscribe(function (state, old) { if (!state.connected && old.connected || state.currentSlug !== old.currentSlug || state.activeSessionId !== old.activeSessionId || state.myUserId !== old.myUserId) stop(); });
+  document.addEventListener('contextual-ask-stopped', stop, true);
+  document.addEventListener('click', function (event) { if (event.target.closest('#generation-stop, #autonomous-run-stop, #send-btn.stop')) stop(); }, true);
+}

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

@@ -0,0 +1,144 @@
+import { forwardDocumentSource } from './clay-studio-document.js';
+import { store } from './store.js';
+import { getWs } from './ws-ref.js';
+import { contextualMateStamp } from './contextual-mate-identity.js';
+import { visibleTarget } from './clay-control-target-visibility.js';
+
+function validEvidence(evidence) {
+  var uuid = /^[a-f0-9-]{36}$/;
+  return evidence && evidence.version === 1 && uuid.test(evidence.id) && uuid.test(evidence.token) && /^activity:[a-f0-9-]{36}$/.test(evidence.activityId) && Number.isSafeInteger(evidence.deadline) &&
+    evidence.target && ['document', 'sketch', 'browser'].indexOf(evidence.target.surface) >= 0 && typeof evidence.target.key === 'string' && evidence.target.key.length <= 400 && /^[a-f0-9]{64}$/.test(evidence.target.revision);
+}
+function source(evidence, state) {
+  return validEvidence(evidence) && evidence.mateId === state.activeProjectMateId && evidence.sourceSlug === 'mate-' + evidence.mateId && evidence.ownerId === (state.myUserId || null) && evidence.runtimeId === state.controlRuntimeId && evidence.sourceSlug === state.currentSlug && evidence.sourceSessionId === state.activeSessionId && evidence.sourceSessionOriginId === state.sessionOriginId &&
+    (state.cachedMatesList || []).some(function (mate) { return mate.id === evidence.mateId && mate.builtinKey === 'clay' && !mate.archived && !mate.lifecycleDeletion && contextualMateStamp(mate) === evidence.sourceMateStamp; });
+}
+function currentActivity(evidence) {
+  var activity = store.get('clayControlActivity'), forwarded = store.get('clayControlForwarded');
+  var message = store.get('paneMode') ? forwarded : activity && activity.message;
+  return message && message.id === evidence.activityId && message.mateId === evidence.mateId && message.sourceSlug === evidence.sourceSlug && message.sourceSessionId === evidence.sourceSessionId && message.sourceSessionOriginId === evidence.sourceSessionOriginId && message.sourceMateStamp === evidence.sourceMateStamp && message.sourceQueryGeneration === evidence.sourceQueryGeneration && message.phase !== 'clear' && !(store.get('clayControlReceipts') || []).some(function (receipt) { return receipt.id === evidence.activityId && receipt.stopped; });
+}
+function binding() {
+  return { window: window, document: document, identity: function () { var s = store.snap(); return { ownerId: s.myUserId || null, slug: s.currentSlug, sessionId: s.activeSessionId, origin: s.sessionOriginId, connected: s.connected, runtime: s.controlRuntimeId, mateId: s.activeProjectMateId }; } };
+}
+export function forwardStudioPresentation(message, type) {
+  if (!store.get('paneMode') || window.parent === window) return false;
+  var frame = window.frameElement;
+  if (!frame) return false;
+  frame.clayStudioSource = binding();
+  var evidence = message.controlPresentation;
+  if (evidence && (!source(evidence, store.snap()) || !currentActivity(evidence))) return true;
+  if (type === 'clay-pane-present-markdown') message = forwardDocumentSource(message);
+  var receipts = Object.assign({}, store.get('clayStudioRelays') || {});
+  Object.keys(receipts).forEach(function (id) { if (Date.now() > receipts[id].evidence.deadline) delete receipts[id]; });
+  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);
+  return true;
+}
+export function trustedStudioFrame(event, data) {
+  if (event.origin !== location.origin || !data || !data.studioSource) return null;
+  var frame = Array.from(document.querySelectorAll('#contextual-clay iframe, .split-pane-frame')).find(function (item) { return item.contentWindow === event.source; });
+  var bridge = frame && frame.clayStudioSource, live = bridge && bridge.window === frame.contentWindow && bridge.document === frame.contentDocument && bridge.identity();
+  var expected = data.studioSource;
+  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')) {
+    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 {
+    var conversation = frame.conversation, identity = conversation && conversation.document === frame.contentDocument && conversation.source === frame.contentWindow && conversation.identity();
+    if (!identity || !identity.connected || !identity.available || identity.ownerId !== live.ownerId || identity.sessionId !== live.sessionId || identity.sessionOriginId !== live.origin) return null;
+  }
+  var evidence = data.message && data.message.controlPresentation;
+  if (evidence && (!validEvidence(evidence) || evidence.sourceSlug !== 'mate-' + evidence.mateId || evidence.mateId !== live.mateId || !(store.get('cachedMatesList') || []).some(function (mate) { return mate.id === evidence.mateId && mate.builtinKey === 'clay' && !mate.archived && !mate.lifecycleDeletion && contextualMateStamp(mate) === evidence.sourceMateStamp; }) || evidence.sourceSlug !== live.slug || evidence.sourceSessionId !== live.sessionId || evidence.sourceSessionOriginId !== live.origin || evidence.ownerId !== live.ownerId || evidence.runtimeId !== live.runtime)) return null;
+  return frame;
+}
+export function acceptStudioForward(event, data) {
+  var frame = trustedStudioFrame(event, data), evidence = data.message && data.message.controlPresentation;
+  if (!frame || !evidence || !currentActivity(evidence) || Date.now() > evidence.deadline) return false;
+  var entries = Object.assign({}, store.get('clayStudioForwarded') || {});
+  Object.keys(entries).forEach(function (id) { if (Date.now() > entries[id].evidence.deadline) delete entries[id]; });
+  if (Object.keys(entries).length >= 100) return false;
+  entries[evidence.id] = { frame: frame, document: frame.contentDocument, window: event.source, data: data, evidence: evidence };
+  store.set({ clayStudioForwarded: entries });
+  return true;
+}
+function delivery(evidence) {
+  var socket = getWs(), owner = store.get('myUserId'), slug = store.get('currentSlug');
+  var relay = (store.get('clayStudioForwarded') || {})[evidence.id];
+  return {
+    valid: function () {
+      if (Date.now() > evidence.deadline || !currentActivity(evidence) || !store.get('connected') || owner !== store.get('myUserId') || slug !== store.get('currentSlug') || getWs() !== socket) return false;
+      return relay ? relay.document === relay.frame.contentDocument && relay.window === relay.frame.contentWindow && !!trustedStudioFrame({ origin: location.origin, source: relay.window }, relay.data) : source(evidence, store.snap());
+    },
+    send: function (visible) {
+      var message = { type: 'clay_studio_rendered', id: evidence.id, token: evidence.token, sessionOriginId: evidence.sourceSessionOriginId, revision: evidence.target.revision, visible: visible };
+      if (relay) { if (relay.document === relay.frame.contentDocument) relay.window.postMessage({ type: 'clay-studio-receipt', message: message }, location.origin); }
+      else if (getWs() === socket && socket && socket.readyState === 1) socket.send(JSON.stringify(message));
+    }
+  };
+}
+async function digest(value) {
+  var hash = await crypto.subtle.digest('SHA-256', new TextEncoder().encode(JSON.stringify(value)));
+  return Array.from(new Uint8Array(hash)).map(function (byte) { return byte.toString(16).padStart(2, '0'); }).join('');
+}
+// Called only by the actual renderer after content has reached its real product surface.
+export function registerStudioPaint(message, element, ready, contentElement) {
+  if (!element) return;
+  delete element.dataset.controlSurface;
+  var evidence = message.controlPresentation;
+  if (!validEvidence(evidence)) return;
+  var receipt = delivery(evidence), settled = false, frame, timer, stable = 0;
+  var entry = { painted: false, evidence: evidence, target: evidence.target, element: element, valid: receipt.valid };
+  element.dataset.controlSurface = evidence.id;
+  var surfaces = Object.assign({}, store.get('clayStudioSurfaces') || {});
+  Object.keys(surfaces).forEach(function (id) { if (!surfaces[id].element.isConnected || surfaces[id].element === element || Date.now() > surfaces[id].evidence.deadline + 6000) delete surfaces[id]; });
+  surfaces[evidence.id] = entry; store.set({ clayStudioSurfaces: surfaces });
+  function finish(visible) { if (settled) return; settled = true; clearTimeout(timer); cancelAnimationFrame(frame); document.removeEventListener('visibilitychange', hidden); receipt.send(visible); }
+  entry.cancel = function () { finish(false); };
+  function hidden() { if (document.hidden) finish(false); }
+  document.addEventListener('visibilitychange', hidden);
+  timer = setTimeout(function () { finish(false); }, Math.max(0, evidence.deadline - Date.now()));
+  var content = evidence.target.surface === 'document' ? { content: message.content, exists: message.exists, size: message.size } : evidence.target.surface === 'sketch' ? message.source : message.data;
+  Promise.all([Promise.resolve(ready), digest(content)]).then(function (values) {
+    if (values[1] !== evidence.target.revision) { finish(false); return; }
+    function inspect() {
+      if (settled) return;
+      if (!receipt.valid() || document.hidden || element.dataset.controlSurface !== evidence.id) { finish(false); return; }
+      stable = painted(contentElement || element) ? stable + 1 : 0;
+      if (stable >= 2) { entry.painted = true; finish(true); } else frame = requestAnimationFrame(inspect);
+    }
+    frame = requestAnimationFrame(inspect);
+  }).catch(function () { finish(false); });
+}
+function painted(element) {
+  if (!element || !element.isConnected || element.closest('[hidden], [inert], [aria-hidden="true"]')) return false;
+  var rect = element.getBoundingClientRect(), style = getComputedStyle(element);
+  if (style.visibility !== 'visible' || Number(style.opacity) === 0) return false;
+  for (var parent = element.parentElement; parent; parent = parent.parentElement) {
+    var ancestorStyle = getComputedStyle(parent);
+    if (ancestorStyle.visibility !== 'visible' || Number(ancestorStyle.opacity) === 0) return false;
+  }
+  var left = Math.max(0, rect.left), right = Math.min(innerWidth, rect.right), top = Math.max(0, rect.top), bottom = Math.min(innerHeight, rect.bottom);
+  if (right <= left || bottom <= top) return false;
+  return [0.2, 0.5, 0.8].some(function (x) { return [0.2, 0.5, 0.8].some(function (y) { var hit = document.elementFromPoint(left + (right - left) * x, top + (bottom - top) * y); return hit && element.contains(hit); }); });
+}
+export function studioControlTarget(target) {
+  var entries = store.get('clayStudioSurfaces') || {};
+  var entry = Object.values(entries).find(function (item) { return item.painted && item.target.surface === target.surface && item.target.key === target.key && item.target.revision === target.revision && item.target.runtimeId === target.runtimeId && item.target.sourceSessionOriginId === target.sourceSessionOriginId && item.target.sourceSessionId === target.sourceSessionId && item.target.sourceSlug === target.sourceSlug && item.element.dataset.controlSurface === item.evidence.id && item.valid(); });
+  return entry && entry.element;
+}
+export function initStudioReceipts() {
+  window.addEventListener('message', function (event) {
+    if (event.origin !== location.origin || event.source !== window.parent || !event.data || event.data.type !== 'clay-studio-receipt') return;
+    var message = event.data.message, entries = Object.assign({}, store.get('clayStudioRelays') || {}), entry = message && entries[message.id];
+    if (!entry || entry.evidence.token !== message.token || !source(entry.evidence, store.snap()) || getWs() !== entry.socket || entry.socket.readyState !== 1 || Date.now() > entry.evidence.deadline) return;
+    delete entries[message.id]; store.set({ clayStudioRelays: entries }); entry.socket.send(JSON.stringify(message));
+  });
+  function stop() { Object.values(store.get('clayStudioSurfaces') || {}).forEach(function (entry) { delete entry.element.dataset.controlSurface; if (entry.cancel) entry.cancel(); }); store.set({ clayStudioRelays: {}, clayStudioForwarded: {}, clayStudioSurfaces: {} }); }
+  document.addEventListener('contextual-ask-stopped', stop, true);
+  document.addEventListener('click', function (event) { if (event.target.closest('#generation-stop, #autonomous-run-stop, #send-btn.stop')) stop(); }, true);
+  store.subscribe(function (state, prior) { if (!state.connected && prior.connected || state.currentSlug !== prior.currentSlug || state.activeSessionId !== prior.activeSessionId || state.myUserId !== prior.myUserId) stop(); });
+}

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

@@ -153,6 +153,10 @@ rows('clay-email', [
 ]);
 rows('clay-history', [['search_clay_history', 'Searching conversations', 'Conversations searched', 'Conversation search', 'query'], ['read_session', 'Reading conversation', 'Conversation read', 'Conversation'], ['list_recent_decisions', 'Checking recent decisions', 'Recent decisions checked', 'Recent decisions']]);
 rows('clay-workspace', [
+  ['read_current_context', 'Checking shared context', 'Shared context checked', 'Shared context'],
+  ['read_selected_context', 'Reading selected conversation', 'Selected conversation read', 'Selected conversation'],
+  ['open_context_conversation', 'Requesting conversation navigation', 'Navigation request returned', 'Conversation navigation', 'why'],
+  ['read_context_navigation_receipt', 'Checking navigation receipt', 'Navigation receipt checked', 'Navigation receipt'],
   ['read_owner_screen', 'Checking your screen context', 'Screen context request returned', 'Screen context'],
   ['inspect_owner_screen_change', 'Inspecting screen change', 'Screen change inspected', 'Screen control'],
   ['control_owner_screen', 'Requesting screen change', 'Screen change request returned', 'Screen control', 'why'],

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

@@ -1,8 +1,10 @@
+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';
 import { openSearch as openSessionSearch } from './session-search.js';
-import { startSearchClayChat, attachSearchClayChat, detachSearchClayChat, getSearchClayChatSummary } from './search-clay-chat.js';
+import { startSearchClayChat, retrySearchClayAsk } from './search-clay-chat.js';
 import { getWs } from './ws-ref.js';
 import { openProjectLog } from './project-logs.js';
 import { store } from './store.js';
@@ -29,7 +31,7 @@ var paletteEl = null, inputEl = null, resultsEl = null, footerEl = null;
 var activeIndex = -1, items = [], debounceTimer = null, abortCtrl = null;
 var pendingNav = null, cachedHomeData = [], cachedVersion = null;
 var pendingLogNav = null;
-var searchResults = [], searchQuery = "", searchPending = false, chatMode = false;
+var searchResults = [], searchQuery = "", searchPending = false;
 
 export function initCommandPalette(value) {
   ctx = value;
@@ -62,6 +64,10 @@ function handleClaySessionLinkClick(event) {
     openProjectLog(link.dataset.logRef);
     return;
   }
+  if (link.classList.contains('clayos-session-link') && forwardContextualSessionCitation(link)) return;
+  requestClayRecordLink(link);
+}
+export function requestClayRecordLink(link, citation) {
   var ws = getWs();
   if (!ws || ws.readyState !== 1) {
     link.classList.add("is-error");
@@ -74,7 +80,7 @@ function handleClaySessionLinkClick(event) {
   else link.dataset.sessionRequest = requestId;
   if (!isLog) store.set({ sessionNavigationRequestId: requestId, sessionNavigationRequestContext: {
     projectSlug: store.get('currentSlug'),
-    sessionId: store.get('activeSessionId')
+    sessionId: store.get('activeSessionId'), citation: citation || null
   } });
   link.classList.remove("is-error");
   link.classList.add("is-loading");
@@ -85,19 +91,24 @@ function handleClaySessionLinkClick(event) {
   } else {
     request.type = "home_clay_session_resolve";
     request.sessionRef = link.dataset.sessionRef;
+    if (citation) request.contextualSource = { mateId: citation.mateId, sessionId: citation.sessionId, sessionOriginId: citation.originId, mateStamp: citation.stamp };
     if (link.dataset.sessionEntryIndex !== undefined) request.entryIndex = Number(link.dataset.sessionEntryIndex);
   }
   ws.send(JSON.stringify(request));
+  return true;
 }
 
 export function handleClaySessionTarget(msg) {
   if (!msg || (msg.type !== "home_clay_session_target" && msg.type !== "home_clay_log_target")) return false;
   var isLog = msg.type === "home_clay_log_target";
   var links = document.querySelectorAll(isLog ? ".clayos-log-link[data-log-request]" : ".clayos-session-link[data-session-request]");
-  var link = null;
+  var sourceContext = store.get('sessionNavigationRequestContext');
+  var citation = !isLog && sourceContext && sourceContext.citation;
+  var link = !isLog ? contextualCitationLink(citation, msg.requestId) : null;
   for (var i = 0; i < links.length; i++) {
     if ((isLog ? links[i].dataset.logRequest : links[i].dataset.sessionRequest) === msg.requestId) link = links[i];
   }
+  if (!isLog && link && link.ownerDocument !== document && !citation) { link.classList.remove('is-loading'); link.classList.add('is-error'); link.title = 'The view changed. Click again from the current conversation.'; delete link.dataset.sessionRequest; return true; }
   if (!isLog && store.get('sessionNavigationRequestId') !== msg.requestId) {
     if (link) {
       link.classList.remove("is-loading");
@@ -107,6 +118,7 @@ export function handleClaySessionTarget(msg) {
   }
   if (!isLog) {
     var requestContext = store.get('sessionNavigationRequestContext');
+    if (citation && (!validContextualCitation(citation) || msg.sessionRef !== citation.ref)) { if (link) { link.classList.remove('is-loading'); link.classList.add('is-error'); link.title = 'The view changed. Click again from the current conversation.'; delete link.dataset.sessionRequest; } store.set({ pendingSessionEntryNavigation: null, sessionNavigationRequestContext: null }); return true; }
     if (requestContext && (String(store.get('currentSlug')) !== String(requestContext.projectSlug) || String(store.get('activeSessionId')) !== String(requestContext.sessionId))) {
       if (link) {
         link.classList.remove("is-loading");
@@ -134,6 +146,7 @@ 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;
 }
@@ -146,11 +159,6 @@ export function openCommandPalette() {
   var trigger = document.getElementById("cmd-palette-btn");
   if (trigger) trigger.style.visibility = "hidden";
   updateFooter();
-  if (attachSearchClayChat(resultsEl, showSearch, closeCommandPalette)) {
-    chatMode = true;
-    paletteEl.classList.add("is-chatting");
-    return;
-  }
   showSearch();
   fetchHomeData();
 }
@@ -162,7 +170,6 @@ export function closeCommandPalette() {
   if (trigger) trigger.style.visibility = "";
   if (debounceTimer) { clearTimeout(debounceTimer); debounceTimer = null; }
   if (abortCtrl) { abortCtrl.abort(); abortCtrl = null; }
-  detachSearchClayChat();
 }
 
 export function setPaletteVersion(version) { cachedVersion = version; }
@@ -289,8 +296,6 @@ function buildDOM() {
 }
 
 function showSearch() {
-  chatMode = false;
-  paletteEl.classList.remove("is-chatting");
   inputEl.value = searchQuery;
   inputEl.disabled = false;
   inputEl.focus({ preventScroll: true });
@@ -354,7 +359,6 @@ function sessionIcon(session) {
 }
 
 function renderSearch() {
-  if (chatMode) return;
   var query = searchQuery.toLowerCase();
   var sessions = query ? cachedHomeData.filter(function (item) {
     return (item.sessionTitle || "").toLowerCase().indexOf(query) !== -1 || (item.projectTitle || "").toLowerCase().indexOf(query) !== -1;
@@ -364,11 +368,10 @@ function renderSearch() {
   for (var r = 0; r < searchResults.length; r++) if (!seen[sessionKey(searchResults[r])]) { sessions.push(searchResults[r]); seen[sessionKey(searchResults[r])] = true; }
   items = [];
   var html = "", index = 0;
-  var clayChat = getSearchClayChatSummary();
-  if (clayChat) {
-    items.push({ type: "resume-clay" });
-    html += '<div class="cmd-palette-group-label">Current Clay chat</div>';
-    html += renderItem(index++, '<img src="/clay-studio-symbol.png" width="22" height="22" alt="">', "Return to Clay", escapeHtml(clayChat.processing ? "Clay is responding" : "Continue your current conversation"), clayChat.preview ? escapeHtml(clayChat.preview) : null, clayChat.updatedAt, " is-resume-clay");
+  var pendingAsk = store.get('contextualSearchAsk');
+  if (!query && pendingAsk && pendingAsk.ownerId === store.get('myUserId') && !pendingAsk.clientMessageId && /^(error|stopped)$/.test(pendingAsk.status)) {
+    items.push({ type: 'retry-clay-ask' });
+    html += renderItem(index++, '<img src="/clay-studio-symbol.png" width="22" height="22" alt="">', 'Retry previous question', escapeHtml(pendingAsk.text), null, null, ' is-retry-clay-ask');
   }
   if (sessions.length) {
     html += '<div class="cmd-palette-group-label">' + (query ? "Conversations" : "Recent conversations") + '</div>';
@@ -383,8 +386,8 @@ function renderSearch() {
   if (query) {
     items.push({ type: "ask-clay", query: searchQuery });
     if (!sessions.length && !searchPending) html += '<div class="cmd-palette-exact-empty">No exact matches. Clay can search by meaning.</div>';
-    html += '<div class="cmd-palette-group-label">' + (clayChat ? "New Clay chat" : "Ask Clay") + '</div>';
-    html += renderItem(index, '<img src="/clay-studio-symbol.png" width="22" height="22" alt="">', (clayChat ? 'Start a new Clay chat about “' : 'Ask Clay about “') + escapeHtml(searchQuery) + '”', "Search by meaning across your projects and conversations", null, null, " is-ask-clay");
+    html += '<div class="cmd-palette-group-label">Ask Clay</div>';
+    html += renderItem(index, '<img src="/clay-studio-symbol.png" width="22" height="22" alt="">', 'Ask Clay about “' + escapeHtml(searchQuery) + '”', "Start a new Clay conversation", null, null, " is-ask-clay");
   }
   if (!html) html = '<div class="cmd-palette-empty">No conversations yet.</div>';
   resultsEl.innerHTML = html;
@@ -417,20 +420,12 @@ function setActive(index, skipScroll) {
 }
 
 function beginClayChat(query) {
-  if (chatMode) return;
-  chatMode = true;
-  paletteEl.classList.add("is-chatting");
-  startSearchClayChat(query, resultsEl, showSearch, closeCommandPalette);
-}
-
-function resumeClayChat() {
-  if (!attachSearchClayChat(resultsEl, showSearch, closeCommandPalette)) return;
-  chatMode = true;
-  paletteEl.classList.add("is-chatting");
+  if (!isCommandPaletteOpen()) return;
+  if (startSearchClayChat(query)) closeCommandPalette();
 }
 
 function activateItem(entry) {
-  if (entry.type === "resume-clay") { resumeClayChat(); return; }
+  if (entry.type === 'retry-clay-ask') { if (retrySearchClayAsk()) closeCommandPalette(); return; }
   if (entry.type === "ask-clay") { beginClayChat(entry.query); return; }
   if (entry.type === "mate-session" || entry.type === "session") navigateToSession(entry.data, entry.query);
 }

package/lib/public/modules/contextual-ask-session.js

@@ -0,0 +1,26 @@
+import { store } from './store.js';
+import { sendTextMessage } from './input.js';
+import { pausePendingMessage } from './message-delivery.js';
+import { stopGeneration } from './generation-stop.js';
+
+export function submitContextualAsk(request) {
+  if (!request || typeof request.requestId !== 'string' || typeof request.text !== 'string') return null;
+  var current = store.get('contextualAskSubmission');
+  if (current && current.requestId === request.requestId) return current;
+  if (!request || request.ownerId !== store.get('myUserId') || request.sessionId !== store.get('paneSessionId') || request.sessionOriginId !== store.get('sessionOriginId') || !store.get('contextualSessionReady') || !store.get('connected') || store.get('contextualWriterSuspended') || !window.frameElement || window.frameElement.dataset.canonical !== 'true') return null;
+  // A fresh session has no user draft to replace. Refuse any ambiguous target.
+  if (document.getElementById('input').value || (store.get('pendingOutboundMessages') || []).length) return null;
+  store.set({ contextualAskSubmission: { requestId: request.requestId, status: 'sending' } });
+  sendTextMessage(request.text);
+  var outbound = (store.get('pendingOutboundMessages') || []).find(function (item) { return item.payload.text === request.text && item.sessionId === request.sessionId; });
+  var submission = { requestId: request.requestId, status: outbound ? 'sent' : 'unconfirmed', clientMessageId: outbound && outbound.payload.clientMessageId };
+  store.set({ contextualAskSubmission: submission });
+  return submission;
+}
+
+export function pauseContextualAsk() {
+  var current = store.get('contextualAskSubmission');
+  if (current && current.clientMessageId) pausePendingMessage(current.clientMessageId);
+  if (current) store.set({ contextualAskSubmission: Object.assign({}, current, { status: 'stopped' }) });
+}
+export function stopContextualAsk() { pauseContextualAsk(); return stopGeneration(); }