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

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

@@ -0,0 +1,47 @@
+import { store } from './store.js';
+import { iconHtml, refreshIcons } from './icons.js';
+import { showToast } from './utils.js';
+import { forwardPaneBrowserLink } from './pane-browser-bridge.js';
+
+function escape(value) { return String(value).replace(/&/g, '&amp;').replace(/</g, '&lt;').replace(/>/g, '&gt;').replace(/"/g, '&quot;').replace(/'/g, '&#39;'); }
+export function browserLinkTarget(href) {
+  if (typeof href !== 'string' || !href.startsWith('browser:') || href.length > 8200) return null;
+  var raw = href.slice(8);
+  if (!/^https?:\/\//i.test(raw) || /[\u0000-\u0020]/.test(raw)) return null;
+  try {
+    var url = new URL(raw);
+    if (url.username || url.password || !['http:', 'https:'].includes(url.protocol)) return null;
+    return url.href;
+  } catch (error) { return null; }
+}
+export function renderBrowserLink(href, title, text) {
+  var url = browserLinkTarget(href);
+  if (!url) return null;
+  var label = String(text || '').replace(/<[^>]*>/g, '').replace(/&amp;/g, '&').replace(/&lt;/g, '<').replace(/&gt;/g, '>').replace(/&quot;/g, '"').replace(/&#39;/g, "'").trim();
+  if (!label || label === href || label === url) label = new URL(url).host;
+  return '<button type="button" class="clay-browser-link clayos-record-link" data-browser-url="' + escape(url) + '" data-browser-project="' + escape(store.get('currentSlug') || '') + '" title="' + escape('Open in Clay Browser · ' + url) + '" aria-label="' + escape('Open in Clay Browser: ' + label) + '">' + iconHtml('globe') + '<span>Browser</span><small>' + escape(label) + '</small></button>';
+}
+export function enhanceBrowserLinks(root) {
+  if (!root || typeof document === 'undefined') return;
+  root.querySelectorAll('a[href]').forEach(function (anchor) {
+    if (anchor.closest('pre, code, button')) return;
+    var html = renderBrowserLink(anchor.getAttribute('href'), '', anchor.textContent);
+    if (html) { var template = document.createElement('template'); template.innerHTML = html; anchor.replaceWith(template.content); }
+  });
+  initBrowserLinks();
+  refreshIcons();
+}
+export function initBrowserLinks() {
+  if (store.get('browserLinksBound')) return;
+  store.set({ browserLinksBound: true });
+  document.addEventListener('click', function (event) {
+    var button = event.target.closest && event.target.closest('.clay-browser-link');
+    if (!button) return;
+    event.preventDefault(); event.stopPropagation();
+    var url = browserLinkTarget('browser:' + button.dataset.browserUrl);
+    if (!url) { showToast('This browser link is invalid.', 'warn'); return; }
+    if (button.dataset.browserProject && button.dataset.browserProject !== store.get('currentSlug')) { showToast('Open this link from its original project.', 'warn'); return; }
+    if (forwardPaneBrowserLink(url)) return;
+    import('./shared-browser.js').then(function (module) { module.openSharedBrowserAt(url); }).catch(function (error) { showToast(error.message || 'Could not open the browser.', 'warn'); });
+  });
+}

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

@@ -16,7 +16,7 @@ export function renderClaySessionLink(ref, text) {
   var parsed = parseClaySessionReference(ref);
   if (!parsed) return null;
   var label = text ? String(text).trim() : "";
-  var safeLabel = escapeHtml(label);
+  var safeLabel = escapeHtml(label).replace(/"/g, """);
   var entryAttr = parsed.entryIndex === null ? "" : ' data-session-entry-index="' + parsed.entryIndex + '"';
   return '<button type="button" class="clayos-session-link clayos-record-link" data-session-ref="' + parsed.ref + '"' + entryAttr + ' aria-label="Open session' + (safeLabel ? " from " + safeLabel : "") + '"><span>Session</span>' + (safeLabel ? '<small>' + safeLabel + '</small>' : '') + '</button>';
 }

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

@@ -205,7 +205,7 @@ export function handlePaletteHistoryPrepended() {
     return;
   }
   requestAnimationFrame(function () {
-    if (store.get('pendingSessionEntryNavigation') === pending) jumpToSessionEntry(pending.entryIndex, pending);
+    if (store.get('pendingSessionEntryNavigation') === pending) handlePaletteHistoryDone();
   });
 }
 

package/lib/public/modules/debate.js

@@ -58,6 +58,7 @@ function buildAvatarUrl(meta) {
   return mateAvatarUrl({
     id: meta.mateId,
     profile: {
+      avatarCatalogId: meta.avatarCatalogId || "",
       avatarStyle: meta.avatarStyle || "imprint",
       avatarSeed: meta.avatarSeed || meta.mateId || "mate",
       avatarColor: meta.avatarColor || "#5857fc",

package/lib/public/modules/history-replay-batch.js

@@ -27,7 +27,7 @@ function canCombine(previous, message) {
   // can differ; the first token still supplies the message's display time.
   var keys = Object.keys(previous).concat(Object.keys(message));
   return keys.every(function (key) {
-    return key === 'text' || key === '_ts' || previous[key] === message[key];
+    return key === 'text' || key === '_ts' || key === '_historyIndex' || key === '_historyIndexes' || previous[key] === message[key];
   });
 }
 
@@ -105,6 +105,10 @@ export function receiveHistoryReplay(msg, dispatch) {
   if (canCombine(previous, msg)) {
     if (!batch.textParts) batch.textParts = [previous.text];
     batch.textParts.push(msg.text);
+    if (Number.isSafeInteger(msg._historyIndex) && msg._historyIndex >= 0) {
+      if (!previous._historyIndexes) previous._historyIndexes = Number.isSafeInteger(previous._historyIndex) ? [previous._historyIndex] : [];
+      previous._historyIndexes.push(msg._historyIndex);
+    }
   } else {
     finishText(batch);
     batch.items.push(Object.assign({}, msg));

package/lib/public/modules/home-debate-live.js

@@ -23,6 +23,7 @@ function debateIdentity(message, prior) {
   return {
     mateId: message.speakerMateId || message.mateId || previous.mateId || null,
     mateName: name,
+    avatarCatalogId: message.avatarCatalogId || previous.avatarCatalogId || cachedProfile.avatarCatalogId || "",
     avatarStyle: message.avatarStyle || previous.avatarStyle || cachedProfile.avatarStyle || "imprint",
     avatarSeed: message.avatarSeed || previous.avatarSeed || cachedProfile.avatarSeed || message.speakerMateId || message.mateId || name,
     avatarColor: message.avatarColor || previous.avatarColor || cachedProfile.avatarColor || "",
@@ -37,6 +38,7 @@ function mateForTurn(message) {
     name: identity.mateName,
     profile: {
       displayName: identity.mateName,
+      avatarCatalogId: identity.avatarCatalogId,
       avatarStyle: identity.avatarStyle,
       avatarSeed: identity.avatarSeed,
       avatarColor: identity.avatarColor,

package/lib/public/modules/home-debate-planning.js

@@ -123,11 +123,11 @@ export function createHomeDebateProposalCard(message, respond) {
 export function createHomeDebateQuestionCard(message, respond) {
   var question = Array.isArray(message.questions) && message.questions.length ? message.questions[0] : {};
   var card = document.createElement("section");
-  card.className = "home-debate-question";
+  card.className = "home-debate-question" + (message.flow === "mcp_import" ? " mcp-import-consent" : "");
   card.dataset.toolId = message.toolId || "";
   card.setAttribute("aria-busy", message.status === "submitting" ? "true" : "false");
-  var isMateCreation = message.flow === "mate_creation";
-  card.setAttribute("aria-label", (isMateCreation ? "Mate creation interview question: " : "Debate planning question: ") + (question.question || "Question"));
+  var isMateCreation = message.flow === "mate_creation", isMcpImport = message.flow === "mcp_import";
+  card.setAttribute("aria-label", (isMcpImport ? "MCP import consent: " : isMateCreation ? "Mate creation interview question: " : "Debate planning question: ") + (question.question || "Question"));
   if (question.header) card.appendChild(textElement("div", "home-debate-question-header", question.header));
   card.appendChild(textElement("h3", "home-debate-question-text", question.question || "Clay has a question."));
   var form = document.createElement("div");
@@ -162,8 +162,8 @@ export function createHomeDebateQuestionCard(message, respond) {
   answerControl.className = freeform ? "home-debate-question-freeform" : "home-debate-question-other";
   answerControl.placeholder = freeform ? (isMateCreation ? "Describe what you want in your own words" : "Describe the topic in your own words") : "Type another answer";
   answerLabel.appendChild(answerControl);
-  form.appendChild(answerLabel);
-  var submit = textElement("button", "home-debate-question-submit", message.status === "submitting" ? "Submitting…" : "Submit answer");
+  if (freeform || question.allowOther !== false) form.appendChild(answerLabel);
+  var submit = textElement("button", "home-debate-question-submit", message.status === "submitting" ? "Submitting…" : isMcpImport ? "Confirm choice" : "Submit answer");
   submit.type = "button";
   submit.disabled = message.status !== "pending" || !selected;
   function submitAnswer() {
@@ -253,7 +253,7 @@ export function normalizeHomeTranscript(raw) {
 export function applyHomeDebateQuestion(messages, msg) {
   if (!msg || !msg.toolId) return messages;
   for (var i = 0; i < messages.length; i++) if (messages[i].role === "question" && messages[i].toolId === msg.toolId) return messages;
-  return messages.concat([{ role: "question", flow: msg.type === "home_mate_creation_question" ? "mate_creation" : "debate", toolId: msg.toolId, questions: msg.questions || [], status: "pending", error: "" }]);
+  return messages.concat([{ role: "question", flow: msg.type === "home_mcp_import_question" ? "mcp_import" : msg.type === "home_mate_creation_question" ? "mate_creation" : "debate", toolId: msg.toolId, questions: msg.questions || [], status: "pending", error: "" }]);
 }
 
 export function resolveHomeDebateQuestion(messages, msg) {
@@ -296,7 +296,7 @@ export function markHomeDebateQuestionSubmitting(message, opener) {
 export function createHomeDebateResponder(sendMessage, getContext, onChange) {
   return function respond(message, action, opener, answers, modelOverrides) {
     if (!message || message.status === "submitting") return;
-    var payload = message.role === "question" ? { type: message.flow === "mate_creation" ? "home_mate_creation_question_response" : "home_debate_question_response", toolId: message.toolId, answers: answers || {} } : { type: "home_debate_proposal_response", proposalId: message.proposal.proposalId, action: action, modelOverrides: Array.isArray(modelOverrides) ? modelOverrides : [] };
+    var payload = message.role === "question" ? { type: message.flow === "mcp_import" ? "home_mcp_import_response" : message.flow === "mate_creation" ? "home_mate_creation_question_response" : "home_debate_question_response", toolId: message.toolId, answers: answers || {} } : { type: "home_debate_proposal_response", proposalId: message.proposal.proposalId, action: action, modelOverrides: Array.isArray(modelOverrides) ? modelOverrides : [] };
     Object.assign(payload, getContext());
     if (!sendMessage(payload)) return;
     if (message.role === "question") markHomeDebateQuestionSubmitting(message, opener);

package/lib/public/modules/home-mate-avatar-editor.js

@@ -1,228 +1,147 @@
-// Mate avatar choices hosted inside the current settings dialog.
-
-import { mateStyleAvatarUrl, mateAvatarUrl, MATE_AVATAR_STYLES } from './avatar.js';
+// Explicit avatar drafts in the existing owner-scoped Mate settings surface.
+import { mateAvatarUrl, mateCatalogAvatarUrl } from './avatar.js';
 import { showAvatarPositioner } from './profile.js';
 import { getWs } from './ws-ref.js';
 import { store } from './store.js';
+import { MATE_AVATAR_COLLECTIONS } from './mate-avatar-catalog.js';
 
-var activeToken = 0;
-var activeMateId = null;
-var pending = null;
-var statusByMate = Object.create(null);
-var draftByMate = Object.create(null);
-
-function mateName(mate) {
-  var profile = mate && mate.profile ? mate.profile : {};
-  return profile.displayName || (mate && (mate.displayName || mate.name)) || 'Mate';
-}
-
-function mateProfile(mate) {
-  return Object.assign({}, mate && mate.profile ? mate.profile : {});
+var timer = null;
+function state() { return store.get('mateAvatarDraft'); }
+function put(value) { store.set({ mateAvatarDraft: value }); }
+function profile(mate) { return Object.assign({}, mate.profile || {}); }
+function currentMate(mate) {
+  return (store.get('cachedMatesList') || []).find(function (item) { return item.id === mate.id; }) || mate;
 }
-
-function sendProfile(mate, profile, rerender, message) {
-  draftByMate[mate.id] = profile;
-  var ws = getWs();
-  if (!ws || ws.readyState !== 1) {
-    statusByMate[mate.id] = { kind: 'error', text: 'Clay is offline. Your choice was not saved.' };
-    rerender();
-    return false;
+function ensure(mate) {
+  var s = state();
+  if (!s || s.mateId !== mate.id) {
+    s = { mateId: mate.id, selected: (mate.profile || {}).avatarCatalogId || '', dirty: false, requestId: null, error: '', saved: false, uploading: false };
+    put(s);
+  } else if (!s.dirty && !s.requestId && !s.uploading && s.selected !== ((mate.profile || {}).avatarCatalogId || '')) {
+    s = Object.assign({}, s, { selected: (mate.profile || {}).avatarCatalogId || '' }); put(s);
   }
-  pending = { mateId: mate.id, style: profile.avatarStyle || 'imprint', seed: profile.avatarSeed || '', custom: profile.avatarCustom || '' };
-  statusByMate[mate.id] = { kind: 'pending', text: message || 'Saving avatar…' };
-  ws.send(JSON.stringify({ type: 'mate_update', mateId: mate.id, updates: { profile: profile } }));
-  rerender();
-  return true;
-}
-
-function appendStatus(body, mate) {
-  var state = statusByMate[mate.id];
-  var status = document.createElement('div');
-  status.className = 'home-mate-avatar-status' + (state ? ' is-' + state.kind : '');
-  status.setAttribute('aria-live', 'polite');
-  status.textContent = state ? state.text : '';
-  body.appendChild(status);
+  return s;
 }
-
-function createChoice(label, src, selected) {
-  var button = document.createElement('button');
-  button.type = 'button';
-  button.className = 'home-mate-avatar-choice';
-  button.setAttribute('aria-label', label + ' avatar');
-  button.setAttribute('aria-pressed', selected ? 'true' : 'false');
-  button.title = label;
-  var image = document.createElement('img');
-  image.src = src;
-  image.alt = '';
-  image.draggable = false;
-  var text = document.createElement('span');
-  text.textContent = label;
-  button.appendChild(image);
-  button.appendChild(text);
-  return button;
+function button(label, id, action) {
+  var b = document.createElement('button');
+  b.type = 'button'; b.textContent = label; b.id = id;
+  b.addEventListener('click', action);
+  return b;
 }
-
-function selectStyle(mate, style, seed, rerender) {
-  var profile = mateProfile(mate);
-  profile.avatarStyle = style;
-  profile.avatarSeed = seed;
-  profile.avatarCustom = '';
-  sendProfile(mate, profile, rerender);
+function closePicker(render) {
+  clearHomeMateAvatarEditor();
+  store.set({ mateSettingsAvatarOpen: false }); render();
+  var opener = document.getElementById('mate-profile-avatar');
+  if (opener) opener.focus();
 }
-
-function uploadBlob(mate, blob, token, rerender) {
-  pending = null;
-  statusByMate[mate.id] = { kind: 'pending', text: 'Uploading image…' };
-  rerender();
-  blob.arrayBuffer().then(function (buffer) {
-    return fetch('/api/mate-avatar/' + encodeURIComponent(mate.id), {
-      method: 'POST',
-      headers: { 'Content-Type': 'application/octet-stream' },
-      body: new Uint8Array(buffer),
-    });
-  }).then(function (response) {
-    return response.json().then(function (data) {
-      if (!response.ok || !data.ok || !data.avatar) throw new Error(data.error || 'Upload failed');
-      return data.avatar;
-    });
-  }).then(function (avatar) {
-    if (token !== activeToken) return;
-    var profile = mateProfile(mate);
-    profile.avatarCustom = avatar;
-    draftByMate[mate.id] = profile;
-    statusByMate[mate.id] = { kind: 'saved', text: 'Image saved.' };
-    var mates = store.get('cachedMatesList') || [];
-    store.set({ cachedMatesList: mates.map(function (item) {
-      return item && item.id === mate.id ? Object.assign({}, item, { profile: profile }) : item;
-    }) });
-    var ws = getWs();
-    if (ws && ws.readyState === 1) {
-      ws.send(JSON.stringify({ type: 'mate_update', mateId: mate.id, updates: { profile: profile } }));
-    }
-    rerender();
-  }).catch(function (error) {
-    if (token !== activeToken) return;
-    statusByMate[mate.id] = { kind: 'error', text: error && error.message ? error.message : 'Could not upload this image.' };
-    rerender();
-  });
+function save(mate, render) {
+  var s = state(); var ws = getWs();
+  if (!s || s.requestId || !s.dirty) return;
+  if (!ws || ws.readyState !== 1) { put(Object.assign({}, s, { error: 'Clay is offline. Your choice was not saved.' })); render(); return; }
+  var requestId = 'mate-avatar-' + Date.now() + '-' + Math.random().toString(36).slice(2);
+  var p = profile(currentMate(mate)); p.avatarCatalogId = s.selected; p.avatarCustom = '';
+  put(Object.assign({}, s, { requestId: requestId, error: '', saved: false })); render();
+  try { ws.send(JSON.stringify({ type: 'mate_update', mateId: mate.id, requestId: requestId, updates: { profile: p } })); }
+  catch (error) { failHomeMateAvatar(mate.id, 'Could not send your choice. Try again.', requestId); render(); return; }
+  clearTimeout(timer);
+  timer = setTimeout(function () { if (failHomeMateAvatar(mate.id, 'No response received. Your choice is retained; try again.', requestId)) render(); }, 15000);
 }
-
-function openUpload(mate, input, rerender) {
-  var file = input.files && input.files[0];
-  if (!file) return;
-  var token = ++activeToken;
-  var image = new Image();
-  var objectUrl = URL.createObjectURL(file);
+function upload(mate, input, render) {
+  var file = input.files && input.files[0]; if (!file) return;
+  var image = new Image(); var url = URL.createObjectURL(file); var originalState = state();
+  image.onerror = function () {
+    URL.revokeObjectURL(url);
+    if (state() === originalState) { put(Object.assign({}, originalState, { error: 'Could not read this image.' })); render(); }
+  };
   image.onload = function () {
-    if (token !== activeToken) {
-      URL.revokeObjectURL(objectUrl);
-      return;
-    }
-    showAvatarPositioner(image, objectUrl, function (blob) {
-      URL.revokeObjectURL(objectUrl);
-      if (token === activeToken) uploadBlob(mate, blob, token, rerender);
+    if (state() !== originalState) { URL.revokeObjectURL(url); return; }
+    showAvatarPositioner(image, url, function (blob) {
+      URL.revokeObjectURL(url);
+      if (state() !== originalState) return;
+      var uploadingState = Object.assign({}, originalState, { uploading: true, error: '' }); put(uploadingState); render();
+      blob.arrayBuffer().then(function (buffer) {
+        return fetch('/api/mate-avatar/' + encodeURIComponent(mate.id), { method: 'POST', headers: { 'Content-Type': 'application/octet-stream' }, body: new Uint8Array(buffer) });
+      }).then(function (response) {
+        return response.json().then(function (data) { if (!response.ok || !data.ok || !data.avatar) throw new Error(data.error || 'Upload failed.'); return data.avatar; });
+      }).then(function (avatar) {
+        if (state() !== uploadingState) return;
+        var p = profile(currentMate(mate)); p.avatarCustom = avatar;
+        store.set({ cachedMatesList: (store.get('cachedMatesList') || []).map(function (item) { return item.id === mate.id ? Object.assign({}, item, { profile: p }) : item; }) });
+        put(Object.assign({}, uploadingState, { uploading: false, dirty: false, saved: true }));
+        // The HTTP upload is persisted; the update also refreshes other owner tabs.
+        var ws = getWs();
+        if (ws && ws.readyState === 1) {
+          try { ws.send(JSON.stringify({ type: 'mate_update', mateId: mate.id, updates: { profile: p } })); }
+          catch (error) { /* The acknowledged upload remains saved. */ }
+        }
+        render();
+      }).catch(function (error) {
+        if (state() !== uploadingState) return;
+        put(Object.assign({}, uploadingState, { uploading: false, error: error.message || 'Could not upload this image.' })); render();
+      });
     });
   };
-  image.onerror = function () {
-    URL.revokeObjectURL(objectUrl);
-    if (token !== activeToken) return;
-    statusByMate[mate.id] = { kind: 'error', text: 'Could not read this image.' };
-    rerender();
-  };
-  image.src = objectUrl;
+  image.src = url;
 }
-
-export function renderHomeMateAvatarEditor(body, mate, rerender) {
+export function renderHomeMateAvatarEditor(body, mate, render, onCancel) {
   if (!mate) return;
-  if (activeMateId !== mate.id) {
-    activeMateId = mate.id;
-    activeToken++;
-  }
-  var profile = draftByMate[mate.id] || mateProfile(mate);
-  var name = mateName(mate);
-  var style = profile.avatarStyle || 'imprint';
-  var seed = profile.avatarSeed || mate.id || name;
-  var locked = profile.avatarLocked === true;
-  var section = document.createElement('section');
-  section.className = 'home-mate-avatar-editor';
-  var heading = document.createElement('div');
-  heading.className = 'home-mate-avatar-heading';
-  var preview = document.createElement('img');
-  preview.className = 'home-mate-avatar-preview';
-  preview.src = mateAvatarUrl(Object.assign({}, mate, { profile: profile }), 72);
-  preview.alt = name + ' avatar';
-  var copy = document.createElement('div');
-  var title = document.createElement('h3');
-  title.textContent = 'Avatar';
-  var note = document.createElement('p');
-  note.textContent = locked ? 'This built-in avatar is managed by Clay.' : 'Choose a locally generated style or upload your own image.';
-  copy.appendChild(title);
-  copy.appendChild(note);
-  heading.appendChild(preview);
-  heading.appendChild(copy);
-  section.appendChild(heading);
-  if (!locked) {
-    var choices = document.createElement('div');
-    choices.className = 'home-mate-avatar-choices';
-    choices.setAttribute('role', 'group');
-    choices.setAttribute('aria-label', 'Avatar for ' + name);
-    for (var i = 0; i < MATE_AVATAR_STYLES.length; i++) {
-      (function (entry) {
-        var choice = createChoice(entry.name, mateStyleAvatarUrl(entry.id, seed, 48), !profile.avatarCustom && style === entry.id);
-        choice.addEventListener('click', function () { selectStyle(mate, entry.id, seed, rerender); });
-        choices.appendChild(choice);
-      })(MATE_AVATAR_STYLES[i]);
-    }
-    section.appendChild(choices);
-    var actions = document.createElement('div');
-    actions.className = 'home-mate-avatar-actions';
-    var shuffle = document.createElement('button');
-    shuffle.type = 'button';
-    shuffle.textContent = 'Shuffle selected style';
-    shuffle.disabled = style === 'imprint' || style === 'initial' || !!profile.avatarCustom;
-    shuffle.addEventListener('click', function () {
-      selectStyle(mate, style, Math.random().toString(36).substring(2, 10), rerender);
+  var s = ensure(mate); var p = profile(mate); var busy = !!s.requestId || s.uploading;
+  var section = document.createElement('section'); section.className = 'home-mate-avatar-editor';
+  var preview = document.createElement('div'); preview.className = 'home-mate-avatar-selection';
+  var image = document.createElement('img'); image.className = 'home-mate-avatar-preview';
+  image.src = s.dirty ? mateCatalogAvatarUrl(s.selected) : mateAvatarUrl(mate, 52); image.alt = 'Avatar preview';
+  var caption = document.createElement('p'); caption.textContent = s.dirty ? 'Preview' : 'Current avatar';
+  preview.appendChild(image); preview.appendChild(caption); section.appendChild(preview);
+  if (!p.avatarLocked) {
+    MATE_AVATAR_COLLECTIONS.forEach(function (collection) {
+      var family = collection.id;
+      var heading = document.createElement('h4'); heading.textContent = collection.name;
+      heading.id = 'mate-avatar-family-' + family; section.appendChild(heading);
+      var grid = document.createElement('div'); grid.className = 'home-mate-avatar-choices';
+      grid.setAttribute('role', 'group'); grid.setAttribute('aria-labelledby', heading.id);
+      collection.avatars.forEach(function (entry) {
+          var id = entry.id;
+          var choice = button(id, 'mate-avatar-' + id, function () {
+            put(Object.assign({}, state(), { selected: id, dirty: id !== (currentMate(mate).profile || {}).avatarCatalogId || !!(currentMate(mate).profile || {}).avatarCustom, error: '', saved: false }));
+            render(); var target = document.getElementById('mate-avatar-' + id); if (target) target.focus({ preventScroll: true });
+          });
+          choice.textContent = ''; choice.className = 'home-mate-avatar-choice'; choice.disabled = busy;
+          choice.setAttribute('aria-label', entry.name + ' avatar'); choice.title = entry.name; choice.setAttribute('aria-pressed', String(s.selected === id && (s.dirty || !p.avatarCustom)));
+          var img = document.createElement('img'); img.src = mateCatalogAvatarUrl(id); img.alt = ''; img.draggable = false;
+          choice.appendChild(img);
+          choice.addEventListener('keydown', function (event) {
+            var buttons = Array.from(grid.querySelectorAll('button')); var index = buttons.indexOf(choice);
+            var columns = getComputedStyle(grid).gridTemplateColumns.split(' ').length;
+            var offset = { ArrowRight: 1, ArrowLeft: -1, ArrowDown: columns, ArrowUp: -columns }[event.key];
+            if (offset !== undefined || event.key === 'Home' || event.key === 'End') {
+              event.preventDefault(); var next = event.key === 'Home' ? 0 : event.key === 'End' ? 47 : Math.max(0, Math.min(47, index + offset)); buttons[next].focus();
+            }
+          });
+          grid.appendChild(choice);
+      });
+      section.appendChild(grid);
     });
-    var upload = document.createElement('button');
-    upload.type = 'button';
-    upload.textContent = profile.avatarCustom ? 'Replace image' : 'Upload image';
-    var input = document.createElement('input');
-    input.type = 'file';
-    input.accept = 'image/png,image/jpeg,image/gif,image/webp';
-    input.className = 'home-mate-avatar-file-input';
-    input.hidden = true;
-    input.tabIndex = -1;
-    input.setAttribute('aria-hidden', 'true');
-    input.addEventListener('change', function () { openUpload(mate, input, rerender); });
-    upload.addEventListener('click', function () { input.click(); });
-    actions.appendChild(shuffle);
-    actions.appendChild(upload);
-    actions.appendChild(input);
-    section.appendChild(actions);
+    var actions = document.createElement('div'); actions.className = 'home-mate-avatar-actions';
+    var cancel = button('Cancel', 'mate-avatar-cancel', function () { if (onCancel) onCancel(); else closePicker(render); }); cancel.disabled = busy;
+    var saveButton = button('Save avatar', 'mate-avatar-save', function () { save(mate, render); }); saveButton.disabled = busy || !s.dirty;
+    saveButton.className = 'primary';
+    var input = document.createElement('input'); input.type = 'file'; input.accept = 'image/png,image/jpeg,image/gif,image/webp'; input.hidden = true; input.tabIndex = -1;
+    input.className = 'home-mate-avatar-file-input'; input.addEventListener('change', function () { upload(mate, input, render); });
+    var uploadButton = button('Upload image', 'mate-avatar-upload', function () { input.click(); }); uploadButton.disabled = busy;
+    actions.appendChild(cancel); actions.appendChild(saveButton); actions.appendChild(uploadButton); actions.appendChild(input); section.appendChild(actions);
   }
-  appendStatus(section, mate);
-  body.appendChild(section);
+  var status = document.createElement('p'); status.className = 'home-mate-avatar-status' + (s.error ? ' is-error' : '');
+  status.setAttribute('aria-live', 'polite'); status.setAttribute('role', s.error ? 'alert' : 'status'); status.textContent = s.error || (s.requestId ? 'Saving avatar…' : s.uploading ? 'Uploading image…' : s.saved ? 'Avatar saved.' : 'Choose a face, then save.');
+  (actions || section).appendChild(status); body.appendChild(section);
 }
-
-export function confirmHomeMateAvatar(mate) {
-  if (!mate || !pending || pending.mateId !== mate.id) return false;
-  var profile = mateProfile(mate);
-  if ((profile.avatarStyle || 'imprint') !== pending.style || (profile.avatarSeed || '') !== pending.seed || (profile.avatarCustom || '') !== pending.custom) return false;
-  pending = null;
-  delete draftByMate[mate.id];
-  statusByMate[mate.id] = { kind: 'saved', text: 'Avatar saved.' };
-  return true;
+export function hasHomeMateAvatarDraft() { var s = state(); return !!s && s.dirty; }
+export function homeMateAvatarSaving() { var s = state(); return !!s && (!!s.requestId || s.uploading); }
+export function confirmHomeMateAvatar(mate, requestId) {
+  var s = state(); if (!mate || !s || s.mateId !== mate.id || !s.requestId || s.requestId !== requestId || (mate.profile || {}).avatarCatalogId !== s.selected) return false;
+  clearTimeout(timer); put(Object.assign({}, s, { requestId: null, dirty: false, saved: true, error: '' })); return true;
 }
-
-export function failHomeMateAvatar(mateId, message) {
-  if (!pending || !mateId || pending.mateId !== mateId) return false;
-  statusByMate[pending.mateId] = { kind: 'error', text: message || 'Could not save this avatar.' };
-  pending = null;
-  return true;
-}
-
-export function clearHomeMateAvatarEditor() {
-  activeToken++;
-  activeMateId = null;
-  pending = null;
+export function failHomeMateAvatar(mateId, message, requestId) {
+  var s = state(); if (!s || !s.requestId || s.mateId !== mateId || s.requestId !== requestId) return false;
+  clearTimeout(timer); put(Object.assign({}, s, { requestId: null, error: message || 'Could not save this avatar.' })); return true;
 }
+export function clearHomeMateAvatarEditor() { clearTimeout(timer); put(null); }

package/lib/public/modules/home-mate-chat.js

@@ -340,24 +340,24 @@ export function handleHomeDebateTranscript(msg) {
   if (!isCurrentSessionMessage(msg)) return;
   markHomeChatActivity();
   settleHomeDebateLaunch(msg);
-  if (msg.type === "home_debate_proposal" || msg.type === "home_debate_question" || msg.type === "home_debate_event" || msg.type === "home_mate_creation_proposal" || msg.type === "home_mate_creation_question") messages = finalizeHomeAssistant(messages, streamingText, "", Date.now());
+  if (msg.type === "home_debate_proposal" || (msg.type === "home_debate_question" || msg.type === "home_mcp_import_question") || msg.type === "home_debate_event" || msg.type === "home_mate_creation_proposal" || msg.type === "home_mate_creation_question") messages = finalizeHomeAssistant(messages, streamingText, "", Date.now());
   if (msg.type === "home_debate_event") messages = applyHomeDebateEvent(messages, msg);
   if (msg.type === "home_debate_proposal") messages = applyHomeDebateProposal(messages, msg);
   if (msg.type === "home_debate_proposal_resolved") messages = resolveHomeDebateProposal(messages, msg);
-  if (msg.type === "home_debate_question") messages = applyHomeDebateQuestion(messages, msg);
-  if (msg.type === "home_debate_question_resolved") messages = resolveHomeDebateQuestion(messages, msg);
+  if ((msg.type === "home_debate_question" || msg.type === "home_mcp_import_question")) messages = applyHomeDebateQuestion(messages, msg);
+  if ((msg.type === "home_debate_question_resolved" || msg.type === "home_mcp_import_question_resolved")) messages = resolveHomeDebateQuestion(messages, msg);
   if (msg.type === "home_mate_creation_question") messages = applyHomeDebateQuestion(messages, msg);
   if (msg.type === "home_mate_creation_question_resolved") messages = resolveHomeDebateQuestion(messages, msg);
   if (msg.type === "home_mate_creation_proposal") messages = applyHomeMateProposal(messages, msg);
   if (msg.type === "home_mate_creation_proposal_resolved") messages = resolveHomeMateProposal(messages, msg);
   if (msg.type === "home_mate_error" && /^question_/.test(msg.code || "")) messages = failHomeDebateQuestion(messages, msg);
-  if (msg.type === "home_debate_proposal" || msg.type === "home_debate_question" || msg.type === "home_debate_event" || msg.type === "home_mate_creation_proposal" || msg.type === "home_mate_creation_question") { clearHomeDebatePlanningPending(); streaming = false; streamingText = ""; }
-  if ((msg.type === "home_debate_question_resolved" || msg.type === "home_mate_creation_question_resolved") && msg.status === "expired") clearHomeDebatePlanningPending();
+  if (msg.type === "home_debate_proposal" || (msg.type === "home_debate_question" || msg.type === "home_mcp_import_question") || msg.type === "home_debate_event" || msg.type === "home_mate_creation_proposal" || msg.type === "home_mate_creation_question") { clearHomeDebatePlanningPending(); streaming = false; streamingText = ""; }
+  if (((msg.type === "home_debate_question_resolved" || msg.type === "home_mcp_import_question_resolved") || msg.type === "home_mate_creation_question_resolved") && msg.status === "expired") clearHomeDebatePlanningPending();
   renderHomeChat();
   if (msg.proposalId) restoreHomeDebateProposalFocus(msg.proposalId);
   if (msg.proposalId && msg.type === "home_mate_creation_proposal_resolved") restoreHomeMateProposalFocus(msg.proposalId);
   if (msg.toolId && msg.type === "home_mate_creation_question") restoreHomeDebateQuestionFocus(msg.toolId);
-  if (msg.toolId && msg.type === "home_debate_question_resolved") restoreHomeDebateQuestionFocus(msg.toolId);
+  if (msg.toolId && (msg.type === "home_debate_question_resolved" || msg.type === "home_mcp_import_question_resolved")) restoreHomeDebateQuestionFocus(msg.toolId);
   if (msg.toolId && msg.type === "home_mate_error") restoreHomeDebateQuestionFocus(msg.toolId);
 }
 export function handleHomeMateDelta(msg) {