clay-server 5.2.0-beta.2 → 5.2.0-beta.4

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-mate-navigation.js

@@ -8,6 +8,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,9 +101,80 @@ function renderMateHeaderDefault(state) {
   renderMateProjectHeader(state, mate);
 }
 
+function ordinaryProjects(state) {
+  return (state.projectsHubList || []).filter(function (project) {
+    return project && project.slug && project.isMate !== true;
+  });
+}
+
+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,
+  };
+}
+
+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;
+}
+
+function returnFromClay() {
+  var state = store.snap();
+  var target = 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 });
+  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 active = clayIsActive(state, clay);
+  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 ? (active ? 'Return to project' : 'Open Clay') : 'Clay is unavailable');
+  if (active) entry.setAttribute('aria-current', 'page');
+  else entry.removeAttribute('aria-current');
+}
+
 export function openMateWorkspace(mateId) {
   var mate = navigationMates(store.get('cachedMatesList')).find(function (item) { return item.id === mateId; });
   if (!mate) return;
+  if (mate.builtinKey === 'clay' && store.snap) rememberClayReturnTarget(store.snap());
   if (store.get('currentSlug') !== 'mate-' + mateId) {
     closeTerminal();
     closeFileViewer();
@@ -126,10 +200,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,14 +220,7 @@ 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);
@@ -216,19 +287,33 @@ export function initProjectMateNavigation() {
   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'; });
+      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;
+      if (!clayIsActive(state, clay)) {
+        openMateWorkspace(clay.id);
+      } else returnFromClay();
+    });
+    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' };
     });
-    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.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/search-clay-chat.js

@@ -1,3 +1,4 @@
+import { createHomeDebateQuestionCard, applyHomeDebateQuestion, resolveHomeDebateQuestion, markHomeDebateQuestionSubmitting } from './home-debate-planning.js';
 // Compact Clay conversation hosted inside the global search drawer.
 import { getWs } from './ws-ref.js';
 import { openProjectSession } from './project-session-navigation.js';
@@ -131,6 +132,7 @@ function appendActivityList(content, items, expanded, onToggle) {
 }
 
 function renderMessage(message, streaming) {
+  if (message.role === "question" && message.flow === "mcp_import") return createHomeDebateQuestionCard(message, respondToImport);
   var row;
   if (message.role === "user") {
     row = createUserBubble({ text: message.text || "" });
@@ -221,6 +223,13 @@ function stopSearchClayChat() {
   return true;
 }
 
+function respondToImport(message, action, opener, answers) {
+  if (!state || message.status !== 'pending') return;
+  if (!send({ type: 'home_mcp_import_response', mateId: state.mateId, sessionId: state.sessionId, requestId: state.requestId, toolId: message.toolId, answers: answers || {} })) return;
+  markHomeDebateQuestionSubmitting(message, opener);
+  store.set({ searchClayChatState: state }); render();
+}
+
 function respondToPermission(permission, decision) {
   if (!state || permission.status !== "pending") return false;
   if (!send({ type: "home_mate_permission_response", mateId: state.mateId, sessionId: state.sessionId, requestId: state.requestId, permissionRequestId: permission.permissionRequestId, decision: decision })) return false;
@@ -371,7 +380,12 @@ export function handleSearchClayMessage(msg) {
   state.updatedAt = Date.now();
   if (msg.mateId) state.mateId = msg.mateId;
   if (msg.type === "home_mate_session_identity" && msg.sessionId) state.sessionId = msg.sessionId;
-  if (msg.type === "home_clay_activity") {
+  if (msg.type === 'home_mcp_import_question') {
+    if (state.stream) { state.messages.push({ role: 'assistant', text: state.stream }); state.stream = ''; }
+    state.messages = applyHomeDebateQuestion(state.messages, msg);
+  } else if (msg.type === 'home_mcp_import_question_resolved') {
+    state.messages = resolveHomeDebateQuestion(state.messages, msg);
+  } else if (msg.type === "home_clay_activity") {
     if (!state.awaitingCompletion) return true;
     state.activity = msg.phase || state.activity;
     state.step = typeof msg.step === "number" ? msg.step : state.step;
@@ -379,7 +393,7 @@ export function handleSearchClayMessage(msg) {
   } else if (msg.type === "home_mate_history") {
     state.sessionId = msg.sessionId || state.sessionId;
     state.localId = typeof msg.localId === "number" ? msg.localId : state.localId;
-    state.messages = Array.isArray(msg.messages) ? msg.messages.filter(function (item) { return item && (item.role === "user" || item.role === "assistant"); }).map(function (item) { return { role: item.role, text: item.text || "" }; }) : state.messages;
+    state.messages = Array.isArray(msg.messages) ? msg.messages.filter(function (item) { return item && (item.role === "user" || item.role === "assistant" || item.role === "question" && item.flow === "mcp_import"); }).map(function (item) { return item.role === "question" ? Object.assign({}, item) : { role: item.role, text: item.text || "" }; }) : state.messages;
     state.processing = msg.isProcessing === true;
     state.awaitingCompletion = state.processing;
     state.pendingTurns = state.processing ? Math.max(1, state.pendingTurns) : 0;

package/lib/public/modules/session-github.js

@@ -3,6 +3,7 @@ import { getWs } from './ws-ref.js';
 import { githubLinkTarget } from './github-links.js';
 import { iconHtml, refreshIcons } from './icons.js';
 import { escapeHtml as escapeText } from './utils.js';
+import { primaryWorkPopover, handlePrimaryWorkClick } from './session-work-primary.js';
 
 function escapeHtml(value) {
   return escapeText(String(value)).replace(/"/g, '"').replace(/'/g, ''');
@@ -34,13 +35,16 @@ export function orderedGithubWork(session) {
   var links = safeLinks(session).slice().reverse();
   var latestIssue = links.find(function (link) { return link.kind === 'issue' || link.provider === 'linear'; });
   if (latestIssue) links = [latestIssue].concat(links.filter(function (link) { return link !== latestIssue; }));
-  return links;
+  var primary = session && session.workPrimary || {};
+  return links.filter(function (link) { return String(primary[link.provider === 'linear' ? 'linear' : link.kind] || '').toLowerCase() === link.url.toLowerCase(); }).concat(
+    links.filter(function (link) { return String(primary[link.provider === 'linear' ? 'linear' : link.kind] || '').toLowerCase() !== link.url.toLowerCase(); }));
 }
 function compactGithubWork(links, sessionRow) {
   if (!sessionRow && !links.some(function (link) { return link.provider === 'linear'; })) return links.slice(0, 1);
-  var latestIssue = links.find(function (link) { return link.kind === 'issue' || link.provider === 'linear'; });
+  var latestLinear = links.find(function (link) { return link.provider === 'linear'; });
+  var latestIssue = links.find(function (link) { return link.kind === 'issue' && link.provider !== 'linear'; });
   var latestPr = links.find(function (link) { return link.kind === 'pr'; });
-  return [latestIssue, latestPr].filter(Boolean);
+  return [latestLinear, latestIssue, latestPr].filter(Boolean);
 }
 export function githubWorkMarkup(session, detailed, expanded, sessionRow) {
   var links = orderedGithubWork(session);
@@ -57,14 +61,20 @@ export function githubWorkMarkup(session, detailed, expanded, sessionRow) {
     var html = anchor(link.url, description, iconHtml('github', 'github-work-brand') + iconHtml(icon, 'github-work-status') + '<span><span class="github-work-kind">' + (link.kind === 'pr' ? 'PR ' : 'Issue ') + '</span>#' + escapeHtml(String(link.number)) + '</span>', 'session-github-link github-kind-' + (link.kind === 'pr' ? 'pr' : 'issue') + ' github-state-' + state);
     if (expanded) html = '<span class="github-work-entry">' + html + '<span class="github-work-entry-title">' + escapeHtml(link.title || '') + '</span><span class="github-work-entry-meta">' + escapeHtml(link.repository + ' · ' + state + (link.stale ? ' · Last known status' : '')) + '</span></span>';
     if (detailed && link.kind === 'pr') {
-      html += anchor(link.url + '/files', 'View PR changes on GitHub', 'Changes', 'github-work-action');
-      html += anchor(link.url + '#pullrequestreview', 'View PR reviews on GitHub', escapeHtml((link.review || 'Reviews').replace(/_/g, ' ').toLowerCase()), 'github-work-action');
+      var actions = anchor(link.url + '/files', 'View PR changes on GitHub', 'Changes', 'github-work-action') +
+        anchor(link.url + '#pullrequestreview', 'View PR reviews on GitHub', escapeHtml((link.review || 'Reviews').replace(/_/g, ' ').toLowerCase()), 'github-work-action');
+      var checks = '';
       (link.checks || []).forEach(function (check) {
-        if (/^https:\/\//i.test(check.url)) html += anchor(check.url, check.name + ': ' + check.state, escapeHtml(check.name + ' · ' + check.state.toLowerCase()), 'github-work-action');
+        if (/^https:\/\//i.test(check.url)) checks += anchor(check.url, check.name + ': ' + check.state, '<span class="github-work-check-name">' + escapeHtml(check.name) + '</span><span class="github-work-check-state">' + escapeHtml(check.state.toLowerCase()) + '</span>', 'github-work-action github-work-check');
       });
+      return '<span class="github-work-pr-group" data-github-pr="' + escapeHtml(String(link.number)) + '">' +
+        '<span class="github-work-pr-header">' + html + '</span>' +
+        '<span class="github-work-pr-actions">' + actions + '</span>' +
+        (checks ? '<span class="github-work-pr-checks">' + checks + '</span>' : '') +
+        '</span>';
     }
     return html;
-  }).join('') + (!detailed && !expanded && links.length > displayed.length ? '<button type="button" class="github-work-more" aria-label="Show all ' + links.length + ' linked ' + (links.some(function (item) { return item.provider === 'linear'; }) ? 'work items' : 'GitHub items') + '" aria-haspopup="dialog" aria-expanded="false" data-github-links="' + escapeHtml(JSON.stringify(safeLinks(session))) + '">+' + (links.length - displayed.length) + '</button>' : '') + '</span>';
+  }).join('') + (!detailed && !expanded && links.length > displayed.length ? '<button type="button" class="github-work-more" aria-label="Show all ' + links.length + ' linked ' + (links.some(function (item) { return item.provider === 'linear'; }) ? 'work items' : 'GitHub items') + '" aria-haspopup="dialog" aria-expanded="false" data-work-session="' + escapeHtml(String(session.id || session.localId || '')) + '" data-work-primary="' + escapeHtml(JSON.stringify(session.workPrimary || {})) + '" data-github-links="' + escapeHtml(JSON.stringify(safeLinks(session))) + '">+' + (links.length - displayed.length) + '</button>' : '') + '</span>';
 }
 export function appendGithubWork(row, session, title) {
   var html = githubWorkMarkup(session, false, false, true);
@@ -130,7 +140,7 @@ export function refreshGithubWork() {
 
 export function resetGithubWork() {
   closeGithubWorkPopover();
-  store.set({ githubWorkSessions: [], githubWorkProject: null, githubWorkRefresh: null });
+  store.set({ githubWorkSessions: [], githubWorkProject: null, githubWorkRefresh: null, workPrimaryPending: null });
   var header = document.getElementById('header-github-links');
   if (header) header.remove();
 }
@@ -184,6 +194,7 @@ function bindGithubWorkPopover() {
   if (store.get('githubWorkPopoverBound')) return;
   store.set({ githubWorkPopoverBound: true });
   document.addEventListener('click', function (event) {
+    if (handlePrimaryWorkClick(event)) return;
     var linear = event.target.closest('.session-linear-link');
     if (linear && !event.metaKey && !event.ctrlKey && !event.shiftKey && !event.altKey) { event.preventDefault(); event.stopPropagation(); closeGithubWorkPopover(); import('./linear-panel.js').then(function (module) { module.openLinear(linear.href); }); return; }
     var button = event.target.closest('.github-work-more');
@@ -204,7 +215,10 @@ function bindGithubWorkPopover() {
     popup.setAttribute('role', 'dialog');
     var workTitle = links.some(function (link) { return link.provider === 'linear'; }) ? 'Linked work' : 'Linked GitHub work';
     popup.setAttribute('aria-label', workTitle);
-    popup.innerHTML = '<strong>' + workTitle + '</strong>' + githubWorkMarkup({ githubLinks: links }, false, true);
+    popup.dataset.sessionId = button.dataset.workSession || '';
+    var primary;
+    try { primary = JSON.parse(button.dataset.workPrimary || '{}'); } catch (error) { primary = {}; }
+    popup.innerHTML = '<strong>' + workTitle + '</strong>' + primaryWorkPopover(links, primary, popup.dataset.sessionId, githubWorkMarkup);
     document.body.appendChild(popup);
     mountGithubWorkPopover(popup, button);
     button.setAttribute('aria-expanded', 'true');

package/lib/public/modules/session-work-primary.js

@@ -0,0 +1,51 @@
+import { store } from './store.js';
+import { getWs } from './ws-ref.js';
+import { escapeHtml } from './utils.js';
+var PRIMARY_PIN = '<svg viewBox="0 0 24 24" width="13" height="13" fill="none" stroke="currentColor" stroke-width="1.7" stroke-linecap="round" stroke-linejoin="round" aria-hidden="true" focusable="false"><path class="work-primary-pin-head" d="M16 9V4l1-1V2H7v1l1 1v5l-2 3v2h12v-2z"/><path d="M12 14v8"/></svg>';
+function attr(value) { return escapeHtml(String(value)).replace(/"/g, '&quot;').replace(/'/g, '&#39;'); }
+export function primaryWorkPopover(links, primary, sessionId, render) {
+  var html = ['linear', 'pr', 'issue'].map(function (type) {
+    var items = links.filter(function (link) { return (link.provider === 'linear' ? 'linear' : link.kind) === type; }).reverse();
+    if (!items.length) return '';
+    return '<section class="work-primary-group"><h3>' + ({ linear: 'Linear issues', pr: 'Pull requests', issue: 'GitHub issues' })[type] + '</h3>' + items.map(function (link) {
+      var selected = String(primary[type] || '').toLowerCase() === link.url.toLowerCase();
+      return '<div class="work-primary-row">' + render({ githubLinks: [link] }, false, true) +
+        (sessionId ? '<button type="button" class="work-primary-choice" data-primary-url="' + attr(link.url) + '" aria-label="' + attr((selected ? 'Primary: ' : 'Make primary: ') + (link.identifier || (type === 'pr' ? 'PR #' : 'Issue #') + link.number)) + '" title="' + (selected ? 'Primary' : 'Make primary') + '" aria-pressed="' + selected + '"' + (selected ? ' disabled' : '') + '>' + PRIMARY_PIN + '</button>' : '') + '</div>';
+    }).join('') + '</section>';
+  }).join('');
+  return html + '<p class="work-primary-feedback" role="status" aria-live="polite"></p>';
+}
+export function handlePrimaryWorkClick(event) {
+  var button = event.target.closest('.work-primary-choice');
+  if (!button) return false;
+  event.preventDefault(); event.stopPropagation();
+  var popup = button.closest('#github-work-popover'), ws = getWs();
+  if (!popup) return true;
+  var feedback = popup.querySelector('.work-primary-feedback');
+  if (!ws || ws.readyState !== 1) { feedback.textContent = 'Reconnect to save your selection.'; return true; }
+  var requestId = 'work-primary-' + Date.now() + '-' + Math.random().toString(36).slice(2);
+  store.set({ workPrimaryPending: { requestId: requestId, sessionId: Number(popup.dataset.sessionId), projectSlug: store.get('currentSlug') } });
+  popup.querySelectorAll('.work-primary-choice').forEach(function (control) { control.disabled = true; });
+  feedback.textContent = 'Saving…';
+  var projectSlug = store.get('currentSlug');
+  setTimeout(function () {
+    handlePrimaryWorkResult({ requestId: requestId, projectSlug: projectSlug, error: 'Save confirmation did not arrive. Reopen the list to check, or retry.' });
+  }, 15000);
+  try { ws.send(JSON.stringify({ type: 'session_work_primary_set', requestId: requestId, sessionId: Number(popup.dataset.sessionId), url: button.dataset.primaryUrl })); }
+  catch (error) { handlePrimaryWorkResult({ requestId: requestId, projectSlug: store.get('currentSlug'), error: 'Could not send your selection. Please retry.' }); }
+  return true;
+}
+export function handlePrimaryWorkResult(msg) {
+  var pending = store.get('workPrimaryPending');
+  if (!pending || msg.requestId !== pending.requestId || msg.projectSlug !== pending.projectSlug) return;
+  store.set({ workPrimaryPending: null });
+  var popup = document.getElementById('github-work-popover');
+  if (!popup || Number(popup.dataset.sessionId) !== pending.sessionId || store.get('currentSlug') !== pending.projectSlug) return;
+  popup.querySelectorAll('.work-primary-choice').forEach(function (button) {
+    var selected = msg.error ? button.getAttribute('aria-pressed') === 'true' : Object.values(msg.workPrimary || {}).some(function (url) { return url.toLowerCase() === button.dataset.primaryUrl.toLowerCase(); });
+    button.setAttribute('aria-pressed', String(selected)); button.disabled = selected;
+    button.title = selected ? 'Primary' : 'Make primary';
+    button.setAttribute('aria-label', (selected ? 'Primary: ' : 'Make primary: ') + button.getAttribute('aria-label').replace(/^(Primary|Make primary): /, ''));
+  });
+  popup.querySelector('.work-primary-feedback').textContent = msg.error || 'Primary saved.';
+}