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

package/lib/public/modules/knowledge-db-workbench.js

@@ -125,7 +125,7 @@ export function handleKnowledgeDbClick(event, panel) {
   if (event.target.closest('[data-db-create-submit]')) { submitCreate(panel); return true; }
   if (event.target.closest('[data-db-create-cancel]')) { patchState(workspaceKey(), { createDraft: null }); patchMain(workspaceKey(), { fullscreen: false }); if (renderOwner) renderOwner({ forceDocument: true }); return true; }
   var reference = event.target.closest('[data-db-reference]'); if (reference) { var referenceKey = workspaceKey(); if (reference.dataset.dbReferenceType === 'text') { if (openOwnerDocument) openOwnerDocument('local:' + reference.dataset.dbReference); } else { var databaseIdentity = identityOwner ? identityOwner({ id: reference.dataset.dbReferenceDatabase, itemType: 'db', common: false }) : 'local:' + reference.dataset.dbReferenceDatabase; if (openOwnerDocument) openOwnerDocument(databaseIdentity); openRecord(reference.dataset.dbReferenceDatabase, reference.dataset.dbReference, referenceKey); } return true; }
-  var row = event.target.closest('[data-db-record]'); if (row) { openRecord(row.dataset.dbDatabase, row.dataset.dbRecord); return true; }
+  var row = event.target.closest('tr[data-db-record]'); if (row) { openRecord(row.dataset.dbDatabase, row.dataset.dbRecord); return true; }
   var edit = event.target.closest('[data-db-edit-record]'); if (edit) { beginRecordEdit(edit.dataset.dbEditRecord, false); return true; }
   var add = event.target.closest('[data-db-add-record]'); if (add) { beginRecordEdit(add.dataset.dbAddRecord, true); return true; }
   var save = event.target.closest('[data-db-save-record]'); if (save) { submitRecord(panel, save.dataset.dbSaveRecord); return true; }
@@ -155,7 +155,7 @@ export function handleKnowledgeDbClick(event, panel) {
 }
 
 export function handleKnowledgeDbKeydown(event, panel) {
-  var keyboardRow = event.target.closest && event.target.closest('[data-db-record]'); if (keyboardRow && (event.key === 'Enter' || event.key === ' ')) { event.preventDefault(); openRecord(keyboardRow.dataset.dbDatabase, keyboardRow.dataset.dbRecord); return true; }
+  var keyboardRow = event.target.closest && event.target.closest('tr[data-db-record]'); if (keyboardRow && (event.key === 'Enter' || event.key === ' ')) { event.preventDefault(); openRecord(keyboardRow.dataset.dbDatabase, keyboardRow.dataset.dbRecord); return true; }
   var dialog = panel && panel.querySelector('.knowledge-db-dialog'); if (!dialog) return false;
   if (event.key === 'Escape') { event.preventDefault(); closeArchiveDialog(panel); return true; }
   if (event.key !== 'Tab') return false; var controls = dialog.querySelectorAll('button:not(:disabled)'); if (!controls.length) return false; var first = controls[0]; var last = controls[controls.length - 1];
@@ -175,10 +175,10 @@ function renderDatabaseRecovery(body, toolbar, draft) { toolbar.innerHTML = '<sp
 function renderTable(body, dbState) {
   var database = dbState.database; var view = database.views.filter(function (item) { return item.id === dbState.selectedViewId; })[0] || database.views[0] || { columns: database.schema.filter(function (field) { return !field.archived; }).map(function (field) { return field.id; }) }; var fields = view.columns.map(function (id) { return fieldById(database, id); }).filter(Boolean);
   var html = '<div class="knowledge-db-table-wrap"><table class="knowledge-db-table"><thead><tr>' + fields.map(function (field) { return '<th scope="col">' + escapeText(field.name) + '</th>'; }).join('') + '</tr></thead><tbody>';
-  html += dbState.records.map(function (record) { return '<tr tabindex="0" data-db-record="' + escapeText(record.id) + '" data-db-database="' + escapeText(database.id) + '">' + fields.map(function (field) { return '<td>' + displayValue(field, record.values[field.id], record.references) + '</td>'; }).join('') + '</tr>'; }).join('');
+  html += dbState.records.map(function (record) { return '<tr data-control-runtime="' + escapeText(store.get('controlRuntimeId')) + '" data-control-revision="' + escapeText(record.revision) + '" tabindex="0" data-db-record="' + escapeText(record.id) + '" data-db-database="' + escapeText(database.id) + '">' + fields.map(function (field) { return '<td>' + displayValue(field, record.values[field.id], record.references) + '</td>'; }).join('') + '</tr>'; }).join('');
   html += '</tbody></table>' + (!dbState.records.length && !dbState.loading ? '<p class="knowledge-empty">No records in this view.</p>' : '') + (dbState.nextCursor ? '<button type="button" class="knowledge-search-more" data-db-more="' + escapeText(database.id) + '">Load more</button>' : '') + '</div>'; body.innerHTML = html;
 }
-function renderRecord(body, dbState) { var detail = selectedRecordState(workspaceKey(), dbState.database.id); if (!detail) { body.innerHTML = '<p class="knowledge-empty">Loading record…</p>'; return; } var history = (detail.history || []).map(function (entry) { return '<li><b>' + escapeText(entry.action || 'update') + '</b><span>Revision ' + escapeText(entry.revision) + ' · ' + new Date(entry.at).toLocaleString() + '</span></li>'; }).join(''); body.innerHTML = '<article class="knowledge-db-record"><button type="button" data-db-record-back="' + escapeText(dbState.database.id) + '">' + iconHtml('arrow-left') + 'Table</button><h2>' + escapeText(detail.title) + '</h2><dl>' + dbState.database.schema.filter(function (field) { return !field.archived; }).map(function (field) { return '<dt>' + escapeText(field.name) + '</dt><dd>' + displayValue(field, detail.record.values[field.id], detail.record.references) + '</dd>'; }).join('') + '</dl><p class="knowledge-db-attribution">Revision ' + detail.record.revision + ' · updated ' + new Date(detail.record.updatedAt).toLocaleString() + '</p>' + (history ? '<h3>Recent history</h3><ol class="knowledge-db-history">' + history + '</ol>' : '') + '</article>'; }
+function renderRecord(body, dbState) { var detail = selectedRecordState(workspaceKey(), dbState.database.id); if (!detail) { body.innerHTML = '<p class="knowledge-empty">Loading record…</p>'; return; } var history = (detail.history || []).map(function (entry) { return '<li><b>' + escapeText(entry.action || 'update') + '</b><span>Revision ' + escapeText(entry.revision) + ' · ' + new Date(entry.at).toLocaleString() + '</span></li>'; }).join(''); body.innerHTML = '<article class="knowledge-db-record" data-control-runtime="' + escapeText(store.get('controlRuntimeId')) + '" data-control-revision="' + escapeText(detail.record.revision) + '" data-db-record="' + escapeText(detail.record.id) + '" data-db-database="' + escapeText(dbState.database.id) + '"><button type="button" data-db-record-back="' + escapeText(dbState.database.id) + '">' + iconHtml('arrow-left') + 'Table</button><h2>' + escapeText(detail.title) + '</h2><dl>' + dbState.database.schema.filter(function (field) { return !field.archived; }).map(function (field) { return '<dt>' + escapeText(field.name) + '</dt><dd>' + displayValue(field, detail.record.values[field.id], detail.record.references) + '</dd>'; }).join('') + '</dl><p class="knowledge-db-attribution">Revision ' + detail.record.revision + ' · updated ' + new Date(detail.record.updatedAt).toLocaleString() + '</p>' + (history ? '<h3>Recent history</h3><ol class="knowledge-db-history">' + history + '</ol>' : '') + '</article>'; }
 function renderRecordForm(body, toolbar, dbState) { var edit = dbState.edit; var values = edit.values || {}; toolbar.innerHTML = '<span class="knowledge-preview-name">' + (edit.creating ? 'New record' : 'Edit record') + '</span>' + (!edit.creating ? '<button type="button" class="danger" data-db-archive-record="' + escapeText(dbState.database.id) + '">Archive</button>' : '') + '<button type="button" data-db-cancel-edit>Cancel</button><button type="button" class="primary" data-db-save-record="' + escapeText(dbState.database.id) + '">' + (edit.saving ? 'Retry save' : 'Save') + '</button>'; body.innerHTML = '<form class="knowledge-db-form" onsubmit="return false"><h2>' + (edit.creating ? 'New record' : 'Edit record') + '</h2>' + dbState.database.schema.filter(function (field) { return !field.archived; }).map(function (field) { return '<label>' + escapeText(field.name) + fieldInput(field, values[field.id]) + '</label>'; }).join('') + (edit.error ? '<p class="knowledge-inline-error">' + escapeText(edit.error) + '</p>' : '') + '</form>'; }
 function renderSettings(body, toolbar, dbState) { var edit = dbState.edit; toolbar.innerHTML = '<span class="knowledge-preview-name">Database settings</span><button type="button" data-db-cancel-edit>Cancel</button><button type="button" class="primary" data-db-save-settings="' + escapeText(dbState.database.id) + '">' + (edit.saving ? 'Retry rename' : 'Save name') + '</button>'; body.innerHTML = '<form class="knowledge-db-form" onsubmit="return false"><h2>Database settings</h2><label>Name<input data-db-settings-name value="' + escapeText(edit.name) + '" maxlength="120"></label>' + (edit.error ? '<p class="knowledge-inline-error">' + escapeText(edit.error) + '</p>' : '') + '<section class="knowledge-danger-zone"><h3>Archive database</h3><p>Records, schema, views, and history remain recoverable.</p><button type="button" class="danger" data-db-archive-database="' + escapeText(dbState.database.id) + '">Archive database</button></section></form>'; }
 function renderRecover(body, toolbar, dbState) { var edit = dbState.edit; toolbar.innerHTML = '<span class="knowledge-preview-name">Recover record</span><button type="button" data-db-cancel-edit>Cancel</button><button type="button" class="primary" data-db-confirm-recover-record="' + escapeText(dbState.database.id) + '">' + (edit.saving ? 'Retry recovery' : 'Recover') + '</button>'; body.innerHTML = '<div class="knowledge-db-form"><h2>Recover archived record?</h2><p>This restores the exact record at revision ' + escapeText(edit.baseVersion) + '.</p>' + (edit.error ? '<p class="knowledge-inline-error">' + escapeText(edit.error) + '</p>' : '') + '</div>'; }

package/lib/public/modules/markdown.js

@@ -1,3 +1,4 @@
+import { enhanceSessionCitations } from './clay-session-links.js';
 import { renderBrowserLink, enhanceBrowserLinks } from './clay-browser-links.js';
 import { renderWireframeBlocks } from './wireframe-chat.js';
 import { copyToClipboard, escapeHtml } from './utils.js';
@@ -70,40 +71,7 @@ export function renderMarkdown(text) {
 
 export function enhanceClaySessionLinks(root) {
   if (!root || typeof document === "undefined") return;
-  var walker = document.createTreeWalker(root, NodeFilter.SHOW_TEXT);
-  var nodes = [];
-  var node;
-  while ((node = walker.nextNode())) {
-    if (!node.parentElement || node.parentElement.closest("code, pre, a, button")) continue;
-    if (/\[clayos\/session:[A-Za-z0-9_-]{24}(?:\s+[\u2014-]\s+[^\]\n]{1,80})?\]/.test(node.nodeValue || "")) nodes.push(node);
-  }
-  for (var i = 0; i < nodes.length; i++) {
-    var text = nodes[i].nodeValue || "";
-    var pattern = /\[clayos\/(session:[A-Za-z0-9_-]{24})(?:\s+[\u2014-]\s+([^\]\n]{1,80}))?\]/g;
-    var fragment = document.createDocumentFragment();
-    var offset = 0;
-    var match;
-    while ((match = pattern.exec(text))) {
-      fragment.appendChild(document.createTextNode(text.slice(offset, match.index)));
-      var button = document.createElement("button");
-      button.type = "button";
-      button.className = "clayos-session-link clayos-record-link";
-      button.dataset.sessionRef = match[1];
-      button.setAttribute("aria-label", "Open session" + (match[2] ? " from " + match[2].trim() : ""));
-      var label = document.createElement("span");
-      label.textContent = "Session";
-      button.appendChild(label);
-      if (match[2]) {
-        var meta = document.createElement("small");
-        meta.textContent = match[2].trim();
-        button.appendChild(meta);
-      }
-      fragment.appendChild(button);
-      offset = pattern.lastIndex;
-    }
-    fragment.appendChild(document.createTextNode(text.slice(offset)));
-    nodes[i].parentNode.replaceChild(fragment, nodes[i]);
-  }
+  enhanceSessionCitations(root);
   enhanceClayLogLinks(root);
   enhanceClayFileLinks(root);
   enhanceBrowserLinks(root);

package/lib/public/modules/mate-knowledge-workbench.js

@@ -350,7 +350,7 @@ function renderExplorer() {
   files.forEach(function (file) {
     var parts = file.name.split('/'); var folder = parts.length > 1 ? parts.slice(0, -1).join('/') : '';
     if (!state.query.trim() && folder !== lastFolder) { var folderRow = document.createElement('div'); folderRow.className = 'knowledge-folder-row'; folderRow.innerHTML = iconHtml('folder') + '<span>' + escapeText(folder || 'Top level') + '</span>'; list.appendChild(folderRow); lastFolder = folder; }
-    var id = documentIdentity(file); var button = document.createElement('button'); button.type = 'button'; button.className = 'knowledge-file-row'; button.dataset.openDocument = id; button.style.setProperty('--knowledge-depth', String(Math.min(parts.length - 1, 6))); if (id === state.selected) button.setAttribute('aria-current', 'true');
+    var id = documentIdentity(file); var button = document.createElement('button'); button.type = 'button'; button.className = 'knowledge-file-row'; button.dataset.openDocument = id; button.dataset.controlRevision = String(file.revision || ''); button.dataset.controlRuntime = store.get('controlRuntimeId') || '';  button.style.setProperty('--knowledge-depth', String(Math.min(parts.length - 1, 6))); if (id === state.selected) button.setAttribute('aria-current', 'true');
     button.innerHTML = iconHtml(file.itemType === 'db' || file.name.endsWith('.jsonl') ? 'database' : 'file-text') + '<span>' + escapeText(parts[parts.length - 1].replace(/\.(md|jsonl)$/i, '')) + (file.snippet ? '<em>' + escapeText(file.snippet) + '</em>' : '') + '</span>' + (file.common ? '<small>shared</small>' : ''); list.appendChild(button);
   });
   if (state.query.trim() && state.searchFiles.length < state.searchTotal) { var more = document.createElement('button'); more.type = 'button'; more.className = 'knowledge-search-more'; more.dataset.searchMore = ''; more.disabled = state.searching; more.textContent = state.searching ? 'Loading more…' : 'Load more results'; list.appendChild(more); }

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

@@ -179,6 +179,7 @@ export function sendAcknowledgedMessage(payload) {
   nextPayload.cliSessionId = entry.cliSessionId;
   nextPayload.sessionOriginId = entry.sessionOriginId;
   entry.payload = nextPayload;
+  if (nextPayload.contextualSnapshot) store.set({ contextualSnapshotSubmissions: (store.get('contextualSnapshotSubmissions') || []).concat([{ clientMessageId: nextPayload.clientMessageId, accountId: entry.accountId, projectSlug: entry.projectSlug, sessionId: entry.sessionId, sessionOriginId: entry.sessionOriginId, snapshot: nextPayload.contextualSnapshot }]).slice(-64) });
   replacePending(pendingMessages().concat([entry]));
   if (!transmit(entry, false)) {
     if (!getWs() || getWs().readyState !== 1) markUnconfirmed(entry);
@@ -204,6 +205,15 @@ export function retryPendingMessage(clientMessageId) {
   return false;
 }
 
+// Stop retains the uncertain receipt but prevents automatic retransmission.
+export function pausePendingMessage(clientMessageId) {
+  var entry = pendingEntry(clientMessageId);
+  if (!entry || !matchesCurrentContext(entry)) return false;
+  clearAckTimer(clientMessageId);
+  markUnconfirmed(entry);
+  return true;
+}
+
 export function acknowledgeMessage(clientMessageId) {
   if (typeof clientMessageId !== "string") return null;
   var pending = pendingMessages();

package/lib/public/modules/pane-bridge.js

@@ -1,3 +1,4 @@
+import { forwardStudioPresentation } from './clay-studio-render.js';
 // Pane-side postMessage bridge for the split-view shell. A chrome-less pane
 // iframe reports its context usage up to the parent (which renders a chip in
 // the pane header) and honors panel-toggle requests coming back down.
@@ -32,8 +33,7 @@ export function forwardPaneAuthRequired(message) {
 
 export function forwardPaneMarkdownPresentation(message) {
   if (!store.get('paneMode') || window.parent === window) return false;
-  window.parent.postMessage({ type: "clay-pane-present-markdown", message: message }, window.location.origin);
-  return true;
+  return forwardStudioPresentation(message, "clay-pane-present-markdown");
 }
 
 export function forwardPaneIssueReference(ref, projectSlug) {

package/lib/public/modules/pending-message-queue.js

@@ -330,6 +330,7 @@ function renderItem(item, index) {
   var disabled = controlsDisabled ? ' disabled aria-disabled="true"' : '';
   var text = (item.message && item.message.text || "").trim() || "Attachment-only message";
   var html = '<div class="pending-message-chip' + (item.state === "claimed" ? ' is-claimed' : '') + (scheduled ? ' is-scheduled' : '') + (futureScheduled ? ' is-future' : '') + '" data-pending-id="' + escapeHtml(item.id) + '">';
+  if (item.schedule && item.schedule.logicalScheduleId) html = html.replace('data-pending-id=', 'data-control-schedule-id="' + escapeHtml(item.schedule.logicalScheduleId) + '" data-control-revision="' + escapeHtml(item.schedule.logicalRevision || '') + '" data-control-runtime="' + escapeHtml(store.get('controlRuntimeId') || '') + '" data-pending-id=');
   html += '<span class="pending-message-number" aria-hidden="true">' + (index + 1) + '</span>';
   if (own && item.state === "pending") html += '<button class="pending-message-drag" type="button" data-action="drag" aria-label="Reorder queued message ' + (index + 1) + '" title="Drag, or use arrow keys to reorder"' + disabled + '>' + '<i data-lucide="grip-vertical"></i></button>';
   else html += '<span class="pending-message-drag is-static"><i data-lucide="' + (item.state === "claimed" ? "loader-circle" : "lock-keyhole") + '"></i></span>';

package/lib/public/modules/product-review.js

@@ -0,0 +1,26 @@
+// Display-only metadata from a bound product service. The exact question and
+// authenticated response remain unchanged; this renderer grants no authority.
+export function renderProductReview(element, question) {
+  var review = question.review;
+  if (!review || review.kind !== 'product-control' || typeof review.action !== 'string' || typeof review.target !== 'string' || typeof review.context !== 'string' || typeof review.reason !== 'string') return false;
+  element.classList.add('product-review');
+  element.textContent = '';
+  function text(tag, className, value) {
+    var node = document.createElement(tag);
+    node.className = className;
+    node.textContent = value;
+    element.appendChild(node);
+  }
+  text('strong', 'product-review-action', review.action + ': ' + review.target);
+  text('p', 'product-review-context', review.context);
+  text('p', 'product-review-reason', review.reason);
+  var details = document.createElement('details');
+  var summary = document.createElement('summary');
+  summary.textContent = 'Exact request details';
+  var payload = document.createElement('pre');
+  payload.textContent = question.question;
+  details.appendChild(summary);
+  details.appendChild(payload);
+  element.appendChild(details);
+  return true;
+}

package/lib/public/modules/project-chat-identity.js

@@ -4,6 +4,9 @@ import { store } from './store.js';
 import { mateAvatarUrl } from './avatar.js';
 import { VENDOR_AVATARS, VENDOR_NAMES } from './chat-render-runtime.js';
 
+// A missing or failed profile image must never borrow another speaker's identity.
+var NEUTRAL_AVATAR = 'data:image/svg+xml,' + encodeURIComponent('<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 32 32"><rect width="32" height="32" rx="8" fill="#888" fill-opacity=".14"/><circle cx="16" cy="12" r="5" fill="#888"/><path d="M6 29a10 10 0 0 1 20 0" fill="#888"/></svg>');
+
 function mateById(state, mateId) {
   var mates = state.cachedMatesList || [];
   for (var i = 0; i < mates.length; i++) {
@@ -24,12 +27,11 @@ export function resolveProjectAssistantIdentity(state, vendor) {
   if (mateId) {
     var mate = mateById(state, mateId) || dmTarget;
     var fallbackName = dmTarget && dmTarget.displayName || state.activeSessionMateName || 'Mate';
-    var avatarMate = mate || { id: mateId, name: fallbackName, profile: { displayName: fallbackName } };
     return {
       kind: 'mate',
       mateId: mateId,
       name: mateName(mate, fallbackName),
-      avatarUrl: mateAvatarUrl(avatarMate, 34),
+      avatarUrl: mate ? mateAvatarUrl(mate, 34) : NEUTRAL_AVATAR,
     };
   }
   var vendorId = vendor || state.currentVendor || 'claude';
@@ -47,9 +49,16 @@ export function getProjectAssistantPlaceholder(state, vendor) {
 
 export function applyProjectAssistantIdentity(element, identity) {
   if (!element || !identity) return element;
-  var avatar = element.querySelector('.dm-bubble-avatar');
+  var avatar = element.querySelector('.dm-bubble-avatar') || element.querySelector('.activity-inline-avatar');
   var name = element.querySelector('.dm-bubble-name');
-  if (avatar) avatar.src = identity.avatarUrl;
+  if (avatar) {
+    avatar.onerror = identity.kind === 'mate' ? function () { avatar.onerror = null; avatar.src = NEUTRAL_AVATAR; } : null;
+    avatar.src = identity.avatarUrl;
+  }
+  if (element.className.indexOf('activity-inline') >= 0) {
+    var activityLabel = element.querySelector('.activity-state-label');
+    element.setAttribute('aria-label', identity.name + ' · ' + (activityLabel ? activityLabel.textContent : 'Responding'));
+  }
   if (name) name.textContent = identity.name;
   if (identity.kind === 'mate') {
     element.dataset.sessionMateId = identity.mateId;

package/lib/public/modules/project-logs-render.js

@@ -1,3 +1,4 @@
+import { store } from './store.js';
 // Project Logs rendering — ledger rows, entry detail, and discussion.
 //
 // Split from project-logs.js so both stay well inside the module size limit.
@@ -142,6 +143,8 @@ function renderRow(entry, onOpen) {
   row.type = "button";
   row.className = "project-log-row";
   row.dataset.ref = entry.ref;
+  row.dataset.controlRuntime = store.get("controlRuntimeId") || "";
+  row.dataset.controlRevision = String(entry.revisions);
   row.setAttribute("role", "listitem");
 
   var head = document.createElement("div");

package/lib/public/modules/project-mate-navigation.js

@@ -1,3 +1,6 @@
+import { contextualMateStamp, contextualMate } from './contextual-mate-identity.js';
+import { finishContextualWorkspace } from './contextual-clay-workspace.js';
+import { initContextualClay, cycleContextualClay, contextualClayMode } from './contextual-clay.js';
 // Existing Mates share the project rail while retaining their conversations.
 import { store } from './store.js';
 import { applyWorkspaceColor } from './mate-workspace-color.js';
@@ -103,7 +106,7 @@ function renderMateHeaderDefault(state) {
 
 function ordinaryProjects(state) {
   return (state.projectsHubList || []).filter(function (project) {
-    return project && project.slug && project.isMate !== true;
+    return project && project.slug && project.isMate !== true && project.contentAccess !== false;
   });
 }
 
@@ -124,7 +127,7 @@ export function clayReturnTargetForState(state) {
   };
 }
 
-function rememberClayReturnTarget(state) {
+export function rememberClayReturnTarget(state) {
   if (!state || state.homeShellVisible || state.dmMode || isMateWorkspace(state) || !state.currentSlug ||
       state.activeProjectSlug !== state.currentSlug || state.sessionActivatedProjectSlug !== state.currentSlug) return;
   var projects = ordinaryProjects(state);
@@ -135,15 +138,18 @@ function rememberClayReturnTarget(state) {
   return target;
 }
 
-function returnFromClay() {
+export function returnFromClay() {
+  var handoff = store.get('contextualWorkspace');
+  var originalMate = handoff && handoff.returnSlug && handoff.returnSlug.indexOf('mate-') === 0 && contextualMate(handoff.returnSlug.slice(5));
+  if (finishContextualWorkspace() === false) return false;
   var state = store.snap();
-  var target = clayReturnTargetForState(state);
+  var target = originalMate ? { projectSlug: handoff.returnSlug, sessionId: handoff.returnSessionId } : clayReturnTargetForState(state);
   if (!target) {
     store.set({ pendingProjectSessionNavigation: null, clayReturnPendingProjectSlug: null, clayReturnTarget: null });
     showProjectsHub();
     return false;
   }
-  store.set({ clayReturnTarget: null, clayReturnPendingProjectSlug: target.sessionId ? target.projectSlug : null });
+  store.set({ clayReturnTarget: originalMate ? state.clayReturnTarget : null, clayReturnPendingProjectSlug: target.sessionId ? target.projectSlug : null });
   if (target.sessionId) openProjectSession(target.projectSlug, target.sessionId);
   else {
     store.set({ pendingProjectSessionNavigation: null });
@@ -156,7 +162,8 @@ function updateClayBrand(state) {
   var entry = document.querySelector('.icon-strip-brand');
   if (!entry) return;
   var clay = navigationMates(state.cachedMatesList).find(function (mate) { return mate.builtinKey === 'clay'; });
-  var active = clayIsActive(state, clay);
+  var ownPopover = (state.contextualClay || {}).mateId === (clay && clay.id) && contextualClayMode() !== 'closed';
+  var active = clayIsActive(state, clay) || ownPopover;
   var speaking = !!(state.youActivity && state.youActivity.active);
   entry.dataset.clayMode = active ? 'mate' : 'project';
   entry.classList.toggle('clay-speaking', speaking);
@@ -166,20 +173,40 @@ function updateClayBrand(state) {
   if (logo) logo.src = 'clay-studio-symbol.png';
   entry.disabled = !clay;
   entry.classList.toggle('active', active);
-  entry.setAttribute('aria-label', clay ? (active ? 'Return to project' : 'Open Clay') : 'Clay is unavailable');
-  if (active) entry.setAttribute('aria-current', 'page');
+  entry.setAttribute('aria-label', clay ? (ownPopover && contextualClayMode() === 'popover' ? 'Open Clay workspace' : active ? 'Return to project' : 'Open Clay') : 'Clay is unavailable');
+  entry.setAttribute('aria-expanded', String(ownPopover));
+  entry.setAttribute('aria-controls', 'contextual-clay');
+  if (clayIsActive(state, clay)) entry.setAttribute('aria-current', 'page');
   else entry.removeAttribute('aria-current');
 }
 
-export function openMateWorkspace(mateId) {
+export function openMateWorkspace(mateId, sessionId) {
   var mate = navigationMates(store.get('cachedMatesList')).find(function (item) { return item.id === mateId; });
-  if (!mate) return;
+  if (!mate || !contextualMate(mateId)) return;
   if (mate.builtinKey === 'clay' && store.snap) rememberClayReturnTarget(store.snap());
   if (store.get('currentSlug') !== 'mate-' + mateId) {
     closeTerminal();
     closeFileViewer();
   }
-  switchProject('mate-' + mateId);
+  if (Number.isSafeInteger(sessionId) && sessionId > 0) openProjectSession('mate-' + mateId, sessionId);
+  else switchProject('mate-' + mateId);
+}
+
+export function activateContextualMate(mateId) {
+  var mate = contextualMate(mateId);
+  if (!mate) return;
+  var handoff = store.get('contextualWorkspace');
+  if (handoff && handoff.stage !== 'returning') {
+    if (handoff.stage !== 'workspace') return;
+    var popup = store.get('contextualClay') || {};
+    var otherSession = popup.mode === 'popover' && popup.mateId === mateId && popup.sessionId && popup.sessionId !== handoff.sessionId;
+    if (handoff.slug === 'mate-' + mateId && !otherSession && !(popup.mode === 'popover' && popup.mateId === mateId)) return returnFromClay();
+    cycleContextualClay(mate);
+    return;
+  }
+  if (handoff) { store.set({ contextualMatePending: mateId }); return; }
+  rememberClayReturnTarget(store.snap());
+  cycleContextualClay(mate);
 }
 
 function createMateIcon(mateId) {
@@ -190,9 +217,10 @@ function createMateIcon(mateId) {
   button.innerHTML = '<img class="icon-strip-mate-avatar" alt="" draggable="false"><span class="icon-strip-pill"></span><span class="icon-strip-status"></span><span class="icon-strip-project-badge"></span>';
   button.addEventListener('click', function () {
     hideIconTooltip();
-    openMateWorkspace(mateId);
+    activateContextualMate(mateId);
   });
   bindIconTooltip(button, function () {
+    if ((store.get('contextualClay') || {}).mode === 'popover' && (store.get('contextualClay') || {}).mateId === mateId) return { text: '' };
     var mate = navigationMates(store.get('cachedMatesList')).find(function (item) { return item.id === mateId; });
     return {
       text: mate ? getHomeMateName(mate) : 'Mate',
@@ -225,21 +253,25 @@ export function renderProjectMates() {
   applyWorkspaceColor(mateForWorkspace(state));
   renderMateHeaderDefault(state);
   var mates = navigationMates(state.cachedMatesList).filter(function (mate) {
-    return mate.builtinKey !== 'clay';
+    return mate.builtinKey !== 'clay' && contextualMate(mate.id);
   });
   var mentionActive = getActiveMentionMateIds();
   var projects = state.projectsHubList || [];
   var unread = state.dmUnread || {};
   var icons = {};
-  rail.querySelectorAll('[data-mate-id]').forEach(function (button) { icons[button.dataset.mateId] = button; });
+  document.querySelectorAll('.icon-strip-project-mate[data-mate-id]').forEach(function (button) { icons[button.dataset.mateId] = button; });
   mates.forEach(function (mate) {
     var button = icons[mate.id] || createMateIcon(mate.id);
     delete icons[mate.id];
+    button.dataset.controlMateStamp = contextualMateStamp(mate);
     var active = !state.homeShellVisible && !state.dmMode && state.currentSlug === 'mate-' + mate.id;
     var project = projects.find(function (item) { return item.slug === 'mate-' + mate.id; });
     var busy = !!(project && project.isProcessing) || !!mentionActive[mate.id];
     var count = active ? 0 : (unread[mate.id] || 0);
-    button.classList.toggle('active', !!active);
+    var popover = (state.contextualClay || {}).mateId === mate.id && contextualClayMode() === 'popover';
+    button.classList.toggle('active', !!active || popover);
+    button.setAttribute('aria-expanded', String(popover));
+    button.setAttribute('aria-controls', 'contextual-clay');
     button.setAttribute('aria-label', getHomeMateName(mate) + ', Mate' + (busy ? ', working' : '') + (count ? ', ' + count + ' unread' : ''));
     if (active) button.setAttribute('aria-current', 'page');
     else button.removeAttribute('aria-current');
@@ -257,6 +289,7 @@ export function renderProjectMates() {
   Object.keys(icons).forEach(function (id) { icons[id].remove(); });
   var ordered = Array.from(rail.querySelectorAll('[data-mate-id]'));
   mates.forEach(function (mate, index) {
+    if (document.querySelector('.contextual-mate-mobile-trigger[data-mate-id="' + CSS.escape(mate.id) + '"]')) return;
     var button = ordered.find(function (item) { return item.dataset.mateId === mate.id; });
     if (ordered[index] === button) return;
     rail.insertBefore(button, ordered[index] || null);
@@ -284,21 +317,25 @@ export function renderProjectMates() {
 }
 
 export function initProjectMateNavigation() {
+  initContextualClay();
   var clayEntry = document.querySelector('.icon-strip-brand');
   if (clayEntry) {
-    clayEntry.addEventListener('click', function () {
+    clayEntry.addEventListener('click', function (event) {
       var state = store.snap();
       var clay = navigationMates(state.cachedMatesList).find(function (mate) { return mate.builtinKey === 'clay'; });
       hideIconTooltip();
       if (!clay) return;
-      if (!clayIsActive(state, clay)) {
-        openMateWorkspace(clay.id);
-      } else returnFromClay();
+      var popup = state.contextualClay || {};
+      if (clayIsActive(state, clay) && !(popup.mode === 'popover' && popup.mateId === clay.id)) returnFromClay();
+      else {
+        activateContextualMate(clay.id);
+      }
     });
     bindIconTooltip(clayEntry, function () {
       var state = store.snap();
       var clay = navigationMates(state.cachedMatesList).find(function (mate) { return mate.builtinKey === 'clay'; });
-      return { text: clayIsActive(state, clay) ? 'Return to project' : 'Open Clay', kind: 'mate', avatarUrl: 'clay-studio-symbol.png' };
+      if ((state.contextualClay || {}).mateId === (clay && clay.id) && contextualClayMode() === 'popover') return { text: '' };
+      return { text: (state.contextualClay || {}).mateId === (clay && clay.id) && contextualClayMode() === 'popover' ? 'Open Clay workspace' : clayIsActive(state, clay) ? 'Return to project' : 'Open Clay', kind: 'mate', avatarUrl: 'clay-studio-symbol.png' };
     });
   }
   var knob = document.getElementById('icon-strip-filter-knob');
@@ -313,7 +350,7 @@ export function initProjectMateNavigation() {
     if (state.cachedMatesList !== previous.cachedMatesList || state.homeChatMateId !== previous.homeChatMateId ||
         state.homeShellVisible !== previous.homeShellVisible || state.projectsHubList !== previous.projectsHubList ||
         state.dmUnread !== previous.dmUnread || state.currentSlug !== previous.currentSlug ||
-        state.dmMode !== previous.dmMode || state.connected !== previous.connected || state.activeSessionId !== previous.activeSessionId || state.youActivity !== previous.youActivity) renderProjectMates();
+        state.contextualClay !== previous.contextualClay || state.dmMode !== previous.dmMode || state.connected !== previous.connected || state.activeSessionId !== previous.activeSessionId || state.youActivity !== previous.youActivity) renderProjectMates();
     if (state.projectMateFilterMode !== previous.projectMateFilterMode ||
         state.projectMateFilterTurns !== previous.projectMateFilterTurns) applyProjectMateFilter();
   });

package/lib/public/modules/scheduled-tasks.js

@@ -170,6 +170,8 @@ function buildRow(record) {
   var row = document.createElement("article");
   row.className = "scheduled-task-row" + (record.enabled === false ? " paused" : "");
   row.dataset.taskId = record.id;
+  row.dataset.controlRuntime = store.get("controlRuntimeId") || "";
+  row.dataset.controlRevision = String(record.updatedAt);
   row.setAttribute("role", "listitem");
   var stateLabel = scheduledTaskExecutionLabel(record);
   row.innerHTML =