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

package/lib/public/modules/profile.js

@@ -4,7 +4,7 @@ import { setChatLayout } from './theme.js';
 // Generated identities use deterministic local pixel identicons.
 
 import { iconHtml, refreshIcons } from './icons.js';
-import { avatarUrl, mateAvatarUrl, mateMarkUrl, userAvatarSeed } from './avatar.js';
+import { avatarUrl, userAvatarSeed } from './avatar.js';
 import { store } from './store.js';
 import { applyTerminalFont } from './terminal-prefs.js';
 
@@ -586,240 +586,3 @@ export function getProfile() {
 export function getProfileLang() {
   return profile.lang;
 }
-
-// --- Mate profile popover (reuses same UI minus language) ---
-var matePopoverEl = null;
-var mateSaveTimer = null;
-
-export function showMateProfilePopover(anchorEl, mateData, onUpdate) {
-  if (matePopoverEl) {
-    hideMatePopover();
-    return;
-  }
-
-  var mp = mateData.profile || {};
-  var mateName = mp.displayName || mateData.name || '';
-  var mateColor = mp.avatarColor || '#5857fc';
-  var mateStyle = mp.avatarStyle || 'imprint';
-  var mateSeed = mp.avatarSeed || mateData.id || 'mate';
-  var mateCustom = mp.avatarCustom || '';
-
-  matePopoverEl = document.createElement('div');
-  matePopoverEl.className = 'profile-popover mate-profile-popover';
-
-  var html = '';
-
-  // Banner + close
-  html += '<div class="profile-banner">';
-  html += '<button class="profile-close-btn">&times;</button>';
-  html += '</div>';
-
-  // Avatar row
-  var mateAvatarSrc = mateCustom ? mateCustom : mateMarkUrl(mateName || 'Mate', 80);
-  html += '<div class="profile-avatar-row">';
-  html += '<div class="profile-popover-avatar">';
-  html += '<img class="profile-popover-avatar-img" src="' + mateAvatarSrc + '" alt="' + escapeAttr(mateName || 'Clay Mate') + '">';
-  html += '</div>';
-  html += '<div class="profile-name-display">' + escapeAttr(mateName || 'New Mate') + '</div>';
-  html += '</div>';
-
-  // Body
-  html += '<div class="profile-popover-body">';
-
-  // Name
-  html += '<div class="profile-field">';
-  html += '<label class="profile-field-label">Display Name</label>';
-  html += '<input type="text" class="profile-field-input" id="mate-profile-name" value="' + escapeAttr(mateName) + '" placeholder="Name your mate..." maxlength="50" spellcheck="false" autocomplete="off">';
-  html += '</div>';
-
-  // Avatar picker (hidden if avatar is locked)
-  var mateAvatarLocked = mp.avatarLocked || false;
-  if (!mateAvatarLocked) {
-  html += '<div class="profile-field">';
-  html += '<label class="profile-field-label">Identity</label>';
-  html += '<div class="profile-imprint-panel">';
-  html += '<div class="profile-imprint-preview"><img src="' + mateMarkUrl(mateName || 'Mate', 72) + '" alt="Clay Mate initial"><span><strong>Mate initial</strong><small>Based on display name</small></span></div>';
-  html += '<div class="profile-imprint-actions profile-mate-mark-actions">';
-  html += '<button class="profile-use-imprint' + (!mateCustom ? ' is-active' : '') + '" type="button">Use initial</button>';
-  html += '<button class="profile-avatar-upload' + (mateCustom ? ' is-active' : '') + '" type="button">Upload image</button>';
-  html += '</div>';
-  html += '</div>';
-  html += '<input type="file" id="mate-profile-avatar-file" accept="image/*" style="display:none">';
-  html += '</div>';
-  }
-
-  html += '</div>'; // close body
-
-  matePopoverEl.innerHTML = html;
-
-  // State tracker
-  var mateProfile = {
-    displayName: mateName,
-    avatarStyle: mateStyle,
-    avatarSeed: mateSeed,
-    avatarColor: mateColor,
-    avatarCustom: mateCustom,
-  };
-
-  function refreshChatAvatars() {
-    var newUrl = mateAvatarUrl({ profile: mateProfile, id: mateData.id }, 64);
-    // Update all mate avatars in the chat area
-    var bubbles = document.querySelectorAll('.dm-bubble-avatar-mate');
-    for (var i = 0; i < bubbles.length; i++) {
-      bubbles[i].src = newUrl;
-    }
-    // Update body dataset so new messages use the updated URL
-    if (document.body.dataset.mateAvatarUrl) {
-      document.body.dataset.mateAvatarUrl = newUrl;
-    }
-    // Update mate sidebar avatar
-    var sidebarAvatar = document.querySelector('.mate-sidebar-avatar');
-    if (sidebarAvatar) sidebarAvatar.src = newUrl;
-  }
-
-  function debouncedMateUpdate() {
-    if (mateSaveTimer) clearTimeout(mateSaveTimer);
-    mateSaveTimer = setTimeout(function() {
-      if (onUpdate) onUpdate({
-        name: mateProfile.displayName,
-        profile: {
-          displayName: mateProfile.displayName,
-          avatarStyle: mateProfile.avatarStyle,
-          avatarSeed: mateProfile.avatarSeed,
-          avatarColor: mateProfile.avatarColor,
-          avatarCustom: mateProfile.avatarCustom,
-        },
-      });
-      refreshChatAvatars();
-      mateSaveTimer = null;
-    }, 400);
-  }
-
-  function updateMatePopoverHeader() {
-    if (!matePopoverEl) return;
-    var img = matePopoverEl.querySelector('.profile-popover-avatar-img');
-    var nd = matePopoverEl.querySelector('.profile-name-display');
-    if (img) img.src = mateProfile.avatarCustom
-      ? mateProfile.avatarCustom
-      : mateMarkUrl(mateProfile.displayName || 'Mate', 80);
-    var preview = matePopoverEl.querySelector('.profile-imprint-preview img');
-    if (preview) preview.src = mateMarkUrl(mateProfile.displayName || 'Mate', 72);
-    if (nd) nd.textContent = mateProfile.displayName || 'New Mate';
-  }
-
-  // Events
-  matePopoverEl.querySelector('.profile-close-btn').addEventListener('click', function(e) {
-    e.stopPropagation();
-    hideMatePopover();
-  });
-
-  var nameInput = matePopoverEl.querySelector('#mate-profile-name');
-  nameInput.addEventListener('input', function() {
-    mateProfile.displayName = nameInput.value.trim();
-    updateMatePopoverHeader();
-    debouncedMateUpdate();
-  });
-  nameInput.addEventListener('keydown', function(e) {
-    if (e.key === 'Enter') { e.preventDefault(); hideMatePopover(); }
-    e.stopPropagation();
-  });
-  nameInput.addEventListener('keyup', function(e) { e.stopPropagation(); });
-  nameInput.addEventListener('keypress', function(e) { e.stopPropagation(); });
-
-  // Avatar upload button
-  var mateUploadBtn = matePopoverEl.querySelector('.profile-avatar-upload');
-  var mateFileInput = matePopoverEl.querySelector('#mate-profile-avatar-file');
-  if (mateUploadBtn && mateFileInput) {
-    mateUploadBtn.addEventListener('click', function() {
-      mateFileInput.click();
-    });
-    mateFileInput.addEventListener('change', function() {
-      var file = mateFileInput.files[0];
-      if (!file) return;
-
-      function uploadMateBlob(blob) {
-        blob.arrayBuffer().then(function(ab) {
-          var buf = new Uint8Array(ab);
-          fetch('/api/mate-avatar/' + encodeURIComponent(mateData.id), {
-            method: 'POST',
-            headers: { 'Content-Type': 'application/octet-stream' },
-            body: buf,
-          }).then(function(r) { return r.json(); }).then(function(data) {
-            if (data.ok) {
-              mateProfile.avatarCustom = data.avatar;
-              updateMatePopoverHeader();
-              if (mateUploadBtn) {
-                mateUploadBtn.classList.add('is-active');
-              }
-              var imprintButton = matePopoverEl && matePopoverEl.querySelector('.profile-use-imprint');
-              if (imprintButton) imprintButton.classList.remove('is-active');
-              debouncedMateUpdate();
-            }
-          });
-        });
-      }
-
-      // Load image and open position picker
-      var img = new Image();
-      var objectUrl = URL.createObjectURL(file);
-      img.onload = function() {
-        showAvatarPositioner(img, objectUrl, function(croppedBlob) {
-          URL.revokeObjectURL(objectUrl);
-          uploadMateBlob(croppedBlob);
-        });
-      };
-      img.src = objectUrl;
-    });
-  }
-
-  if (!mateAvatarLocked) {
-    matePopoverEl.querySelector('.profile-use-imprint').addEventListener('click', function() {
-      mateProfile.avatarCustom = '';
-      updateMatePopoverHeader();
-      matePopoverEl.querySelector('.profile-use-imprint').classList.add('is-active');
-      matePopoverEl.querySelector('.profile-avatar-upload').classList.remove('is-active');
-      debouncedMateUpdate();
-    });
-  }
-
-  matePopoverEl.addEventListener('click', function(e) { e.stopPropagation(); });
-
-  // Position near anchor
-  document.body.appendChild(matePopoverEl);
-  refreshIcons();
-
-  var rect = anchorEl.getBoundingClientRect();
-  matePopoverEl.style.position = 'fixed';
-  matePopoverEl.style.left = (rect.right + 8) + 'px';
-  matePopoverEl.style.zIndex = '9999';
-  // Align bottom of popover with bottom of anchor icon
-  var popHeight = matePopoverEl.offsetHeight;
-  var bottomAligned = rect.bottom - popHeight;
-  matePopoverEl.style.top = Math.max(8, bottomAligned) + 'px';
-
-  setTimeout(function() {
-    document.addEventListener('click', closeMateOnOutside);
-    document.addEventListener('keydown', closeMateOnEscape);
-  }, 0);
-}
-
-function closeMateOnOutside(e) {
-  if (matePopoverEl && !matePopoverEl.contains(e.target)) {
-    hideMatePopover();
-  }
-}
-
-function closeMateOnEscape(e) {
-  if (e.key === 'Escape' && matePopoverEl) {
-    hideMatePopover();
-  }
-}
-
-function hideMatePopover() {
-  if (matePopoverEl) {
-    matePopoverEl.remove();
-    matePopoverEl = null;
-  }
-  document.removeEventListener('click', closeMateOnOutside);
-  document.removeEventListener('keydown', closeMateOnEscape);
-}

package/lib/public/modules/project-access-recovery.js

@@ -0,0 +1,17 @@
+import { store } from './store.js';
+
+// Hard navigation destroys detached panels, cached transcripts and sockets.
+// Clear the rendered document first so revoked content cannot linger while the
+// replacement page is loading or when that request fails.
+export function leaveRevokedProject(url) {
+  store.set({ activeSessionId: null, activeProjectSlug: null, sessionActivatedProjectSlug: null, sessions: [], splitPanes: null });
+  document.body.replaceChildren();
+  window.location.replace(url || "/");
+}
+
+export function reconnectDestination(info, slug) {
+  if (!slug || !info || !Array.isArray(info.projects)) return null;
+  var project = info.projects.find(function (item) { return item.slug === slug; });
+  if (!project) return "/";
+  return project.contentAccess === false ? "/p/" + encodeURIComponent(slug) + "/" : null;
+}

package/lib/public/modules/project-admin-overview.js

@@ -0,0 +1,21 @@
+// This page never opens a project socket or loads project content modules.
+var tabs = Array.from(document.querySelectorAll('[role="tab"]'));
+function select(tab) {
+  tabs.forEach(function (item) {
+    var active = item === tab;
+    item.setAttribute("aria-selected", String(active));
+    item.tabIndex = active ? 0 : -1;
+    document.getElementById(item.getAttribute("aria-controls")).hidden = !active;
+  });
+}
+tabs.forEach(function (tab, index) {
+  tab.addEventListener("click", function () { select(tab); });
+  tab.addEventListener("keydown", function (event) {
+    if (["ArrowLeft", "ArrowRight", "Home", "End"].indexOf(event.key) === -1) return;
+    event.preventDefault();
+    var target = event.key === "Home" ? tabs[0] : event.key === "End" ? tabs[tabs.length - 1] : tabs[(index + (event.key === "ArrowRight" ? 1 : tabs.length - 1)) % tabs.length];
+    select(target);
+    target.focus();
+  });
+});
+select(tabs[0]);

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';
@@ -8,6 +11,9 @@ import { switchProject } from './app-projects.js';
 import { closeTerminal } from './terminal.js';
 import { closeFileViewer } from './filebrowser.js';
 import { getActiveMentionMateIds, onMentionActiveChange, bindIconTooltip, hideIconTooltip, showMateCtxMenu } from './sidebar-mates.js';
+import { chooseProjectActivationTarget } from './project-activation.js';
+import { showProjectsHub } from './projects-hub.js';
+import { openProjectSession } from './project-session-navigation.js';
 
 var FILTER_MODES = ['all', 'projects', 'mates'];
 var FILTER_LABELS = { all: 'All', projects: 'Projects', mates: 'Mates' };
@@ -98,14 +104,109 @@ function renderMateHeaderDefault(state) {
   renderMateProjectHeader(state, mate);
 }
 
-export function openMateWorkspace(mateId) {
+function ordinaryProjects(state) {
+  return (state.projectsHubList || []).filter(function (project) {
+    return project && project.slug && project.isMate !== true && project.contentAccess !== false;
+  });
+}
+
+function clayIsActive(state, clay) {
+  return !!clay && !state.homeShellVisible && !state.dmMode && state.currentSlug === 'mate-' + clay.id;
+}
+
+export function clayReturnTargetForState(state) {
+  var target = state && state.clayReturnTarget;
+  var recordedSlug = target && target.projectSlug;
+  var candidates = recordedSlug ? [recordedSlug] : [];
+  var slug = chooseProjectActivationTarget(ordinaryProjects(state), candidates);
+  if (!slug) return null;
+  var sameProject = slug === recordedSlug;
+  return {
+    projectSlug: slug,
+    sessionId: sameProject && target && Number.isSafeInteger(Number(target.sessionId)) && Number(target.sessionId) > 0 ? Number(target.sessionId) : null,
+  };
+}
+
+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);
+  var found = projects.some(function (project) { return project.slug === state.currentSlug; });
+  if (!found) return;
+  var target = { projectSlug: state.currentSlug, sessionId: Number.isSafeInteger(Number(state.activeSessionId)) && Number(state.activeSessionId) > 0 ? Number(state.activeSessionId) : null };
+  store.set({ clayReturnTarget: target });
+  return target;
+}
+
+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 = 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: originalMate ? state.clayReturnTarget : null, clayReturnPendingProjectSlug: target.sessionId ? target.projectSlug : null });
+  if (target.sessionId) openProjectSession(target.projectSlug, target.sessionId);
+  else {
+    store.set({ pendingProjectSessionNavigation: null });
+    switchProject(target.projectSlug);
+  }
+  return true;
+}
+
+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 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);
+  var avatar = entry.querySelector('.clay-brand-avatar');
+  var logo = entry.querySelector('.clay-brand-logo');
+  if (avatar && clay) avatar.src = mateAvatarUrl(clay, 38);
+  if (logo) logo.src = 'clay-studio-symbol.png';
+  entry.disabled = !clay;
+  entry.classList.toggle('active', active);
+  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, 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) {
@@ -116,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',
@@ -126,10 +228,14 @@ function createMateIcon(mateId) {
       avatarUrl: mate ? mateAvatarUrl(mate, 24) : '',
     };
   });
-  button.addEventListener('contextmenu', function (event) {
-    event.preventDefault();
+  function openContextMenu(event) {
+    event.preventDefault(); event.stopPropagation(); hideIconTooltip();
     var mate = navigationMates(store.get('cachedMatesList')).find(function (item) { return item.id === mateId; });
     if (mate) showMateCtxMenu(button, mate);
+  }
+  button.addEventListener('contextmenu', openContextMenu);
+  button.addEventListener('keydown', function (event) {
+    if (event.key === 'ContextMenu' || (event.shiftKey && event.key === 'F10')) openContextMenu(event);
   });
   return button;
 }
@@ -142,33 +248,30 @@ export function renderProjectMates() {
   var clay = navigationMates(state.cachedMatesList).find(function (mate) { return mate.builtinKey === 'clay'; });
   var clayActive = !!clay && !state.homeShellVisible && !state.dmMode && state.currentSlug === 'mate-' + clay.id;
   document.body.classList.toggle('clay-workspace-active', clayActive);
-  var clayEntry = document.querySelector('.icon-strip-brand');
-  if (clayEntry) {
-    clayEntry.disabled = !clay;
-    clayEntry.classList.toggle('active', clayActive);
-    clayEntry.setAttribute('aria-label', clay ? 'Open Clay' : 'Clay is unavailable');
-    if (clayActive) clayEntry.setAttribute('aria-current', 'page');
-    else clayEntry.removeAttribute('aria-current');
-  }
+  updateClayBrand(state);
   document.body.classList.toggle('mate-workspace-active', !state.homeShellVisible && isMateWorkspace(state));
   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');
@@ -186,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);
@@ -213,22 +317,40 @@ export function renderProjectMates() {
 }
 
 export function initProjectMateNavigation() {
+  initContextualClay();
   var clayEntry = document.querySelector('.icon-strip-brand');
   if (clayEntry) {
-    clayEntry.addEventListener('click', function () {
-      var clay = navigationMates(store.get('cachedMatesList')).find(function (mate) { return mate.builtinKey === 'clay'; });
+    clayEntry.addEventListener('click', function (event) {
+      var state = store.snap();
+      var clay = navigationMates(state.cachedMatesList).find(function (mate) { return mate.builtinKey === 'clay'; });
       hideIconTooltip();
-      if (clay) openMateWorkspace(clay.id);
+      if (!clay) return;
+      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'; });
+      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' };
     });
-    bindIconTooltip(clayEntry, { text: 'Clay', kind: 'mate', avatarUrl: 'clay-studio-symbol.png' });
   }
   var knob = document.getElementById('icon-strip-filter-knob');
   if (knob) knob.addEventListener('click', activateProjectMateFilter);
   store.subscribe(function (state, previous) {
+    if (state.clayReturnPendingProjectSlug && state.currentSlug !== previous.currentSlug &&
+        state.currentSlug !== state.clayReturnPendingProjectSlug) {
+      store.set({ pendingProjectSessionNavigation: null, clayReturnPendingProjectSlug: null });
+    } else if (state.clayReturnPendingProjectSlug && !state.pendingProjectSessionNavigation && previous.pendingProjectSessionNavigation) {
+      store.set({ clayReturnPendingProjectSlug: null });
+    }
     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) 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/rewind.js

@@ -1,5 +1,7 @@
 import { escapeHtml } from './utils.js';
 import { iconHtml, refreshIcons } from './icons.js';
+import { store } from './store.js';
+import { captureSessionAction, sessionActionCurrent } from './pane-binding.js';
 
 var ctx;
 var rewindMode = false;
@@ -81,6 +83,7 @@ function initiateRewind(uuid) {
     return;
   }
   pendingRewindUuid = uuid;
+  store.set({ rewindAction: captureSessionAction() });
   rewindPreviewInFlight = true;
   if (ctx.ws && ctx.connected) {
     ctx.ws.send(JSON.stringify({ type: "rewind_preview", uuid: uuid }));
@@ -120,6 +123,7 @@ function updateSummaryForMode() {
 }
 
 export function showRewindModal(data) {
+  if (!sessionActionCurrent(store.get('rewindAction'))) return;
   rewindPreviewInFlight = false;
 
   // Ignore stale preview results that don't match current pending UUID
@@ -367,6 +371,7 @@ export function initRewind(_ctx) {
   });
 
   rewindConfirmBtn.addEventListener("click", function() {
+    if (!sessionActionCurrent(store.get('rewindAction'))) { hideRewindModal(); return; }
     if (rewindExecuting) return;
     if (pendingRewindUuid && ctx.ws && ctx.connected) {
       rewindExecuting = true;

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 =

package/lib/public/modules/scheduler.js

@@ -784,6 +784,8 @@ function renderModelTab(bodyEl, rec) {
   }
 
   var opts = {
+    effortLevels: ((store.get("vendorInfo") || {})[store.get("currentVendor")] || {}).effortLevels || [],
+    configuration: ((store.get("vendorInfo") || {})[store.get("currentVendor")] || {}).configuration || {},
     models: store.get('currentModels') || [],
     currentModel: settings.model || "",
     currentMode: settings.permissionMode || "default",