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

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,26 @@ 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());
+  var questionMessage = ["home_debate_question", "home_mcp_import_question", "home_mate_question"].indexOf(msg.type) >= 0;
+  var questionResolved = ["home_debate_question_resolved", "home_mcp_import_question_resolved", "home_mate_question_resolved"].indexOf(msg.type) >= 0;
+  if (msg.type === "home_debate_proposal" || questionMessage || 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 (questionMessage) messages = applyHomeDebateQuestion(messages, msg);
+  if (questionResolved) 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" || questionMessage || msg.type === "home_debate_event" || msg.type === "home_mate_creation_proposal" || msg.type === "home_mate_creation_question") { clearHomeDebatePlanningPending(); streaming = false; streamingText = ""; }
+  if ((questionResolved || 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 && questionResolved) restoreHomeDebateQuestionFocus(msg.toolId);
   if (msg.toolId && msg.type === "home_mate_error") restoreHomeDebateQuestionFocus(msg.toolId);
 }
 export function handleHomeMateDelta(msg) {

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

@@ -7,6 +7,67 @@ function textElement(tag, className, text) {
   return element;
 }
 
+function scheduleDate(value) {
+  var parts = String(value || "").split("-").map(Number);
+  var date = new Date(Date.UTC(parts[0], parts[1] - 1, parts[2]));
+  return Number.isFinite(date.getTime()) ? date.toLocaleDateString("en-US", { month: "long", day: "numeric", year: "numeric", timeZone: "UTC" }) : value;
+}
+
+function exactScheduleFact(proposal) {
+  var intent = proposal.scheduleIntent;
+  var schedule = intent.scheduleRule;
+  var recurrence = schedule.recurrence;
+  var timing = "On " + scheduleDate(schedule.anchorDate);
+  if (recurrence) {
+    var days = (recurrence.weekdays || []).map(function (day) { return ["Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday"][day]; });
+    if (recurrence.unit === "week" && recurrence.every === 1 && (recurrence.weekdays || []).join(",") === "1,2,3,4,5") timing = "Every weekday";
+    else if (recurrence.unit === "week" && recurrence.every === 1 && days.length) timing = "Every " + days.join(", ");
+    else timing = "Every " + (recurrence.every === 1 ? recurrence.unit : recurrence.every + " " + recurrence.unit + "s") + (days.length ? " on " + days.join(", ") : "");
+  }
+  timing += " at " + schedule.time + " (" + (proposal.scheduleTimezone || "server local") + ")";
+  if (recurrence) timing += ", starting " + scheduleDate(schedule.anchorDate);
+  if (schedule.recurrenceEnd) timing += schedule.recurrenceEnd.type === "after" ? "; for " + schedule.recurrenceEnd.count + " deliveries" : "; through " + scheduleDate(schedule.recurrenceEnd.date);
+  if (schedule.interval) {
+    var interval = schedule.interval;
+    timing += "; every " + interval.every + " " + interval.unit + (interval.every === 1 ? "" : "s");
+    timing += !interval.end ? " until end of day" : interval.end.type === "after" ? ", " + interval.end.count + " deliveries per day" : " until " + interval.end.time;
+  }
+  return timing + ": " + intent.message;
+}
+
+function friendlyTime(value) {
+  var parts = value.split(":");
+  var hour = Number(parts[0]);
+  if (parts[1] === "00" && (hour === 0 || hour === 12)) return hour === 0 ? "midnight" : "noon";
+  return (hour % 12 || 12) + (parts[1] === "00" ? "" : ":" + parts[1]) + (hour < 12 ? " AM" : " PM");
+}
+
+function scheduleSummary(proposal) {
+  var intent = proposal.scheduleIntent;
+  var schedule = intent.scheduleRule;
+  var recurrence = schedule.recurrence;
+  var timing = scheduleDate(schedule.anchorDate);
+  if (recurrence) {
+    var days = (recurrence.weekdays || []).map(function (day) { return ["Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday"][day]; });
+    if (recurrence.unit === "week" && recurrence.every === 1 && (recurrence.weekdays || []).join(",") === "1,2,3,4,5") timing = "Every weekday";
+    else if (recurrence.unit === "week" && recurrence.every === 1 && days.length) timing = "Every " + days.join(", ");
+    else timing = "Every " + (recurrence.every === 1 ? recurrence.unit : recurrence.every + " " + recurrence.unit + "s") + (days.length ? " on " + days.join(", ") : "");
+  }
+  var hour = Number(schedule.time.split(":")[0]);
+  var time = friendlyTime(schedule.time);
+  var period = hour >= 5 && hour < 12 ? "morning" : hour >= 13 && hour < 17 ? "afternoon" : hour >= 17 && hour < 21 ? "evening" : "";
+  if (recurrence && period && recurrence.unit === "day" && recurrence.every === 1) timing = "Every " + period + " at " + time.replace(/ (AM|PM)$/, "");
+  else if (recurrence && period && timing === "Every weekday") timing += " " + period + " at " + time.replace(/ (AM|PM)$/, "");
+  else timing += " at " + time;
+  if (schedule.recurrenceEnd) timing += schedule.recurrenceEnd.type === "after" ? ", for " + schedule.recurrenceEnd.count + (schedule.recurrenceEnd.count === 1 ? " delivery" : " deliveries") : ", through " + scheduleDate(schedule.recurrenceEnd.date);
+  if (schedule.interval) {
+    var interval = schedule.interval;
+    timing += ", then every " + interval.every + " " + interval.unit + (interval.every === 1 ? "" : "s");
+    timing += !interval.end ? " until the end of the day" : interval.end.type === "after" ? ", " + interval.end.count + " deliveries a day" : " until " + friendlyTime(interval.end.time);
+  }
+  return timing + ": " + intent.message;
+}
+
 export function createHomeMateProposalCard(message, respond, openMate) {
   var proposal = message.proposal || {};
   var card = document.createElement("section");
@@ -21,12 +82,23 @@ export function createHomeMateProposalCard(message, respond, openMate) {
   function fact(label, value) {
     if (!value) return;
     facts.appendChild(textElement("dt", "", label));
-    facts.appendChild(textElement("dd", "", value));
+    var description = textElement("dd", "", typeof value === "string" ? value : "");
+    if (typeof value !== "string") description.appendChild(value);
+    facts.appendChild(description);
+    return description;
   }
   fact("Relationship", proposal.relationship);
   fact("Activities", Array.isArray(proposal.activities) ? proposal.activities.join(", ") : "");
   fact("Communication", Array.isArray(proposal.communicationStyle) ? proposal.communicationStyle.join(", ") : "");
   fact("Autonomy", proposal.autonomy);
+  if (proposal.scheduleIntent && proposal.scheduleIntent.message && proposal.scheduleIntent.scheduleRule) {
+    var scheduleItem = fact("Schedule", textElement("span", "home-mate-proposal-schedule-summary", scheduleSummary(proposal)));
+    var exactTiming = document.createElement("details");
+    exactTiming.className = "home-mate-proposal-schedule-details";
+    exactTiming.appendChild(textElement("summary", "", "Exact timing"));
+    exactTiming.appendChild(textElement("div", "", exactScheduleFact(proposal)));
+    scheduleItem.appendChild(exactTiming);
+  }
   card.appendChild(facts);
   if (proposal.identityMarkdown) {
     var details = document.createElement("details");

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

@@ -8,7 +8,7 @@ import { store } from './store.js';
 import { getWs } from './ws-ref.js';
 import { iconHtml, refreshIcons } from './icons.js';
 import { confirmMateRemoval } from './mate-management.js';
-import { renderHomeMateAvatarEditor, confirmHomeMateAvatar, failHomeMateAvatar, clearHomeMateAvatarEditor } from './home-mate-avatar-editor.js';
+import { hasHomeMateAvatarDraft, homeMateAvatarSaving, renderHomeMateAvatarEditor, confirmHomeMateAvatar, failHomeMateAvatar, clearHomeMateAvatarEditor } from './home-mate-avatar-editor.js';
 import { resetHomeMateModelPicker, clearHomeMateModelPicker, hasHomeMateModelDraft, requestHomeMateModels, renderHomeMateModelPicker, applyHomeMateModelsState, applyHomeMateModelResult } from './home-mate-model-picker.js';
 
 var dialog = null;
@@ -73,16 +73,19 @@ function renderGeneral(body, mate) {
   description.textContent = "Manage " + getMateName(mate) + "’s identity and appearance.";
   body.appendChild(description);
   renderMateProfile(body, mate, renderDialogContent, function () {
+    if (homeMateAvatarSaving()) return;
+    if (store.get('mateSettingsAvatarOpen') && hasHomeMateAvatarDraft()) {
+      showConfirm('Discard this avatar choice?', function () { clearHomeMateAvatarEditor(); store.set({mateSettingsAvatarOpen:false}); renderDialogContent(); document.getElementById('mate-profile-avatar').focus(); }, 'Discard choice');
+      return;
+    }
+    clearHomeMateAvatarEditor();
     store.set({mateSettingsAvatarOpen: !store.get('mateSettingsAvatarOpen')});
     renderDialogContent();
   });
   if (store.get('mateSettingsAvatarOpen')) {
     var appearance = document.createElement("section");
     appearance.className = "mate-settings-appearance";
-    renderHomeMateAvatarEditor(appearance, mate, renderDialogContent);
-    var done = document.createElement('button'); done.type = 'button'; done.className = 'mate-settings-button'; done.textContent = 'Done';
-    done.addEventListener('click',function () { store.set({mateSettingsAvatarOpen:false}); renderDialogContent(); document.getElementById('mate-profile-avatar').focus(); });
-    appearance.appendChild(done);
+    renderHomeMateAvatarEditor(appearance, mate, renderDialogContent, store.get('mateSettingsAvatarDirect') ? function () { clearHomeMateAvatarEditor(); renderDialogContent(); closeHomeMateSettings(); } : null);
     body.appendChild(appearance);
   }
   renderMateColorPicker(body, mate, renderDialogContent);
@@ -118,7 +121,7 @@ function requestSection(section) {
 function savePending() {
   var prompt = store.get('mateInstructionsDraft');
   var model = store.get('mateModelDraft');
-  return mateColorSaving() || mateProfileSaving() || !!((prompt && prompt.status === 'saving') || (model && model.saveId));
+  return homeMateAvatarSaving() || mateColorSaving() || mateProfileSaving() || !!((prompt && prompt.status === 'saving') || (model && model.saveId));
 }
 
 function renderDialogContent() {
@@ -199,7 +202,7 @@ function handleDialogKeydown(event) {
 
 export function closeHomeMateSettings(force) {
   if (force !== true && savePending()) return false;
-  if (force !== true && (hasMateProfileDraft() || hasMateInstructionDraft() || hasHomeMateModelDraft())) {
+  if (force !== true && (hasHomeMateAvatarDraft() || hasMateProfileDraft() || hasMateInstructionDraft() || hasHomeMateModelDraft())) {
     var previous = document.activeElement;
     showConfirm("Discard unsaved Mate settings?", function () { closeHomeMateSettings(true); }, "Discard changes", false, function () { if (previous && previous.isConnected) previous.focus(); });
     document.getElementById("confirm-cancel").focus();
@@ -215,7 +218,7 @@ export function closeHomeMateSettings(force) {
   memoryState = null;
   knowledgeState = null;
   modelRequested = false;
-  store.set({mateSettingsAvatarOpen:false});
+  store.set({mateSettingsAvatarOpen:false, mateSettingsAvatarDirect:false});
   resetMateProfile();
   resetMateColor();
   clearHomeMateModelPicker();
@@ -230,12 +233,13 @@ export function closeHomeMateSettings(force) {
 export function openHomeMateSettings(mateId, opener, options) {
   var mate = getMate(mateId);
   if (!mate || (dialog && savePending())) return false;
-  if (dialog && (hasMateProfileDraft() || hasMateInstructionDraft() || hasHomeMateModelDraft())) {
+  if (dialog && (hasHomeMateAvatarDraft() || hasMateProfileDraft() || hasMateInstructionDraft() || hasHomeMateModelDraft())) {
     showConfirm("Discard unsaved Mate settings?", function () { closeHomeMateSettings(true); openHomeMateSettings(mateId, opener, options); }, "Discard changes", false);
     return false;
   }
   closeHomeMateSettings(true);
   resetMateInstructions(mateId);
+  store.set({ mateSettingsAvatarOpen: !!(options && options.avatar && !(mate.profile || {}).avatarLocked), mateSettingsAvatarDirect: !!(options && options.avatar) });
   dialogMateId = mateId;
   dialogOpener = opener || document.activeElement;
   dialogSection = options && ["model", "prompt"].indexOf(options.section) !== -1 ? options.section : "general";
@@ -308,7 +312,10 @@ export function openHomeMateSettings(mateId, opener, options) {
   requestSection(dialogSection);
   loadMateInstructions(renderDialogContent);
   refreshIcons();
-  requestAnimationFrame(function () { close.focus({ preventScroll: true }); });
+  requestAnimationFrame(function () {
+    var first = options && options.avatar && dialog ? (dialog.querySelector('.home-mate-avatar-choice[aria-pressed="true"]:not(:disabled)') || dialog.querySelector('.home-mate-avatar-choice:not(:disabled)')) : null;
+    (first || close).focus();
+  });
   return true;
 }
 
@@ -354,7 +361,7 @@ export function syncHomeMateSettingsTarget(msg) {
   var mate = getMate(dialogMateId);
   if (!mate) closeHomeMateSettings();
   else {
-    confirmHomeMateAvatar(mate);
+    confirmHomeMateAvatar(mate, msg && msg.requestId);
     dialog.querySelector(".home-mate-settings-header span").textContent = getMateName(mate);
     renderDialogContent();
   }
@@ -364,7 +371,7 @@ export function handleHomeMateAvatarError(msg) {
   if (!dialog || !msg) return false;
   var colorHandled = applyMateColorResult(msg);
   var profileHandled = applyMateProfile(msg);
-  if (!colorHandled && !profileHandled && !failHomeMateAvatar(msg.mateId, msg.error)) return false;
+  if (!colorHandled && !profileHandled && !failHomeMateAvatar(msg.mateId, msg.error, msg.requestId)) return false;
   renderDialogContent();
   return true;
 }

package/lib/public/modules/icon-strip-tooltip.js

@@ -81,7 +81,8 @@ export function showIconTooltipHtml(el, html, options) {
 export function bindIconTooltip(el, resolveMetadata) {
   function show() {
     var metadata = tooltipMetadata(typeof resolveMetadata === "function" ? resolveMetadata() : resolveMetadata);
-    showIconTooltip(el, metadata.text || "", metadata);
+    if (!metadata.text) { hideIconTooltip(); return; }
+    showIconTooltip(el, metadata.text, metadata);
   }
   el.addEventListener("mouseenter", show);
   el.addEventListener("focus", show);