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

package/lib/public/mate-avatars/catalog.json

@@ -0,0 +1,482 @@
+[
+  {
+    "id": "B01",
+    "family": "B",
+    "name": "Indigo Cyclops"
+  },
+  {
+    "id": "B02",
+    "family": "B",
+    "name": "Coral Sentinel"
+  },
+  {
+    "id": "B03",
+    "family": "B",
+    "name": "Golden Visor"
+  },
+  {
+    "id": "B04",
+    "family": "B",
+    "name": "Mint Wide Eyes"
+  },
+  {
+    "id": "B05",
+    "family": "B",
+    "name": "Ivory Grin"
+  },
+  {
+    "id": "B06",
+    "family": "B",
+    "name": "Blue Teardrop"
+  },
+  {
+    "id": "B07",
+    "family": "B",
+    "name": "Peach Orbit"
+  },
+  {
+    "id": "B08",
+    "family": "B",
+    "name": "Lilac Sleeper"
+  },
+  {
+    "id": "B09",
+    "family": "B",
+    "name": "Coral Prism"
+  },
+  {
+    "id": "B10",
+    "family": "B",
+    "name": "Mint Spring"
+  },
+  {
+    "id": "B11",
+    "family": "B",
+    "name": "Golden Pebbles"
+  },
+  {
+    "id": "B12",
+    "family": "B",
+    "name": "Periwinkle Orbit"
+  },
+  {
+    "id": "B13",
+    "family": "B",
+    "name": "Coral Horizon"
+  },
+  {
+    "id": "B14",
+    "family": "B",
+    "name": "Indigo Stack"
+  },
+  {
+    "id": "B15",
+    "family": "B",
+    "name": "Mint Button Box"
+  },
+  {
+    "id": "B16",
+    "family": "B",
+    "name": "Golden Curve"
+  },
+  {
+    "id": "B17",
+    "family": "B",
+    "name": "Loop Listener"
+  },
+  {
+    "id": "B18",
+    "family": "B",
+    "name": "Blue Twin Antenna"
+  },
+  {
+    "id": "B19",
+    "family": "B",
+    "name": "Lilac Daydream"
+  },
+  {
+    "id": "B20",
+    "family": "B",
+    "name": "Coral Toothsome"
+  },
+  {
+    "id": "B21",
+    "family": "B",
+    "name": "Ivory Satellite"
+  },
+  {
+    "id": "B22",
+    "family": "B",
+    "name": "Mint Coil"
+  },
+  {
+    "id": "B23",
+    "family": "B",
+    "name": "Golden Wonder"
+  },
+  {
+    "id": "B24",
+    "family": "B",
+    "name": "Slate Smile"
+  },
+  {
+    "id": "B25",
+    "family": "B",
+    "name": "Lilac Shield"
+  },
+  {
+    "id": "B26",
+    "family": "B",
+    "name": "Mint Diamond"
+  },
+  {
+    "id": "B27",
+    "family": "B",
+    "name": "Coral Pebble"
+  },
+  {
+    "id": "B28",
+    "family": "B",
+    "name": "Golden Horns"
+  },
+  {
+    "id": "B29",
+    "family": "B",
+    "name": "Blue Trio"
+  },
+  {
+    "id": "B30",
+    "family": "B",
+    "name": "Ivory Tower"
+  },
+  {
+    "id": "B31",
+    "family": "B",
+    "name": "Charcoal Grin"
+  },
+  {
+    "id": "B32",
+    "family": "B",
+    "name": "Teal Cheer"
+  },
+  {
+    "id": "B33",
+    "family": "B",
+    "name": "Rose Satellite"
+  },
+  {
+    "id": "B34",
+    "family": "B",
+    "name": "Blue Spool"
+  },
+  {
+    "id": "B35",
+    "family": "B",
+    "name": "Golden Band"
+  },
+  {
+    "id": "B36",
+    "family": "B",
+    "name": "Mint Beacon"
+  },
+  {
+    "id": "B37",
+    "family": "B",
+    "name": "Charcoal Crescent"
+  },
+  {
+    "id": "B38",
+    "family": "B",
+    "name": "Coral Cyclops"
+  },
+  {
+    "id": "B39",
+    "family": "B",
+    "name": "Blue Scout"
+  },
+  {
+    "id": "B40",
+    "family": "B",
+    "name": "Ivory Navigator"
+  },
+  {
+    "id": "B41",
+    "family": "B",
+    "name": "Golden Porthole"
+  },
+  {
+    "id": "B42",
+    "family": "B",
+    "name": "Lilac Windup"
+  },
+  {
+    "id": "B43",
+    "family": "B",
+    "name": "Mint Receiver"
+  },
+  {
+    "id": "B44",
+    "family": "B",
+    "name": "Coral Stack"
+  },
+  {
+    "id": "B45",
+    "family": "B",
+    "name": "Indigo Porthole"
+  },
+  {
+    "id": "B46",
+    "family": "B",
+    "name": "Stone Sprout"
+  },
+  {
+    "id": "B47",
+    "family": "B",
+    "name": "Mint Sunbeam"
+  },
+  {
+    "id": "B48",
+    "family": "B",
+    "name": "Golden Cubby"
+  },
+  {
+    "id": "C01",
+    "family": "C",
+    "name": "Violet Smile"
+  },
+  {
+    "id": "C02",
+    "family": "C",
+    "name": "Apricot Joy"
+  },
+  {
+    "id": "C03",
+    "family": "C",
+    "name": "Sage Curious"
+  },
+  {
+    "id": "C04",
+    "family": "C",
+    "name": "Golden Wink"
+  },
+  {
+    "id": "C05",
+    "family": "C",
+    "name": "Blue Sideglance"
+  },
+  {
+    "id": "C06",
+    "family": "C",
+    "name": "Charcoal Wonder"
+  },
+  {
+    "id": "C07",
+    "family": "C",
+    "name": "Lilac Specs"
+  },
+  {
+    "id": "C08",
+    "family": "C",
+    "name": "Coral Giggle"
+  },
+  {
+    "id": "C09",
+    "family": "C",
+    "name": "Mint Blush"
+  },
+  {
+    "id": "C10",
+    "family": "C",
+    "name": "Golden Button"
+  },
+  {
+    "id": "C11",
+    "family": "C",
+    "name": "Sky Smile"
+  },
+  {
+    "id": "C12",
+    "family": "C",
+    "name": "Plum Joy"
+  },
+  {
+    "id": "C13",
+    "family": "C",
+    "name": "Teal Diamond"
+  },
+  {
+    "id": "C14",
+    "family": "C",
+    "name": "Peach Dimple"
+  },
+  {
+    "id": "C15",
+    "family": "C",
+    "name": "Indigo Delight"
+  },
+  {
+    "id": "C16",
+    "family": "C",
+    "name": "Sage Sprout"
+  },
+  {
+    "id": "C17",
+    "family": "C",
+    "name": "Golden Specs"
+  },
+  {
+    "id": "C18",
+    "family": "C",
+    "name": "Lilac Stargaze"
+  },
+  {
+    "id": "C19",
+    "family": "C",
+    "name": "Blue Curiosity"
+  },
+  {
+    "id": "C20",
+    "family": "C",
+    "name": "Coral Heart"
+  },
+  {
+    "id": "C21",
+    "family": "C",
+    "name": "Mint Bud"
+  },
+  {
+    "id": "C22",
+    "family": "C",
+    "name": "Ivory Surprise"
+  },
+  {
+    "id": "C23",
+    "family": "C",
+    "name": "Rose Wink"
+  },
+  {
+    "id": "C24",
+    "family": "C",
+    "name": "Sky Giggle"
+  },
+  {
+    "id": "C25",
+    "family": "C",
+    "name": "Ivory Dreamer"
+  },
+  {
+    "id": "C26",
+    "family": "C",
+    "name": "Mint Loop"
+  },
+  {
+    "id": "C27",
+    "family": "C",
+    "name": "Violet Glasses"
+  },
+  {
+    "id": "C28",
+    "family": "C",
+    "name": "Coral Sunshine"
+  },
+  {
+    "id": "C29",
+    "family": "C",
+    "name": "Slate Sideglance"
+  },
+  {
+    "id": "C30",
+    "family": "C",
+    "name": "Golden Dimple"
+  },
+  {
+    "id": "C31",
+    "family": "C",
+    "name": "Teal Listener"
+  },
+  {
+    "id": "C32",
+    "family": "C",
+    "name": "Peach Cheer"
+  },
+  {
+    "id": "C33",
+    "family": "C",
+    "name": "Indigo Blush"
+  },
+  {
+    "id": "C34",
+    "family": "C",
+    "name": "Sage Daydream"
+  },
+  {
+    "id": "C35",
+    "family": "C",
+    "name": "Rose Wonder"
+  },
+  {
+    "id": "C36",
+    "family": "C",
+    "name": "Sky Blush"
+  },
+  {
+    "id": "C37",
+    "family": "C",
+    "name": "Peach Heart"
+  },
+  {
+    "id": "C38",
+    "family": "C",
+    "name": "Blue Button"
+  },
+  {
+    "id": "C39",
+    "family": "C",
+    "name": "Lilac Wink"
+  },
+  {
+    "id": "C40",
+    "family": "C",
+    "name": "Mint Dish"
+  },
+  {
+    "id": "C41",
+    "family": "C",
+    "name": "Ivory Wonder"
+  },
+  {
+    "id": "C42",
+    "family": "C",
+    "name": "Violet Cheer"
+  },
+  {
+    "id": "C43",
+    "family": "C",
+    "name": "Rose Specs"
+  },
+  {
+    "id": "C44",
+    "family": "C",
+    "name": "Teal Delight"
+  },
+  {
+    "id": "C45",
+    "family": "C",
+    "name": "Golden Diamond"
+  },
+  {
+    "id": "C46",
+    "family": "C",
+    "name": "Lilac Surprise"
+  },
+  {
+    "id": "C47",
+    "family": "C",
+    "name": "Sage Listener"
+  },
+  {
+    "id": "C48",
+    "family": "C",
+    "name": "Coral Crown"
+  }
+]

package/lib/public/modules/app-message-router.js

@@ -58,6 +58,10 @@ export function handleHomeProtocolMessage(msg) {
     handleHomeDebateTranscript(msg);
     return true;
   }
+  if (msg.type === "home_mcp_import_question" || msg.type === "home_mcp_import_question_resolved") {
+    if (!handleSearchClayMessage(msg)) handleHomeDebateTranscript(msg);
+    return true;
+  }
   if (msg.type === "home_debate_question" || msg.type === "home_debate_question_resolved" || msg.type === "home_debate_event") {
     handleHomeDebateTranscript(msg);
     return true;

package/lib/public/modules/app-messages.js

@@ -8,6 +8,7 @@ import { refreshProjectAssistantIdentities } from './project-chat-identity.js';
 import { handleLinearResult } from './linear-panel.js';
 import { handleSharedBrowserMessage } from './shared-browser.js';
 import { openWireframe } from './wireframe-workbench.js';
+import { handlePrimaryWorkResult } from './session-work-primary.js';
 import { syncGithubSessions } from './session-github.js';
 import { handleIssuesMessageInContext as handleIssuesMessage } from './issues-context.js';
 // app-messages.js - WebSocket message router
@@ -204,7 +205,7 @@ export function processMessage(msg) {
           if (readyMatch) {
             var newName = readyMatch[1].trim();
             store.get('dmTargetUser').displayName = newName;
-            updateMateSidebarProfile({ profile: { displayName: newName, avatarColor: store.get('dmTargetUser').avatarColor, avatarStyle: store.get('dmTargetUser').avatarStyle, avatarSeed: store.get('dmTargetUser').avatarSeed } });
+            updateMateSidebarProfile({ profile: { displayName: newName, avatarCatalogId: store.get('dmTargetUser').avatarCatalogId, avatarColor: store.get('dmTargetUser').avatarColor, avatarStyle: store.get('dmTargetUser').avatarStyle, avatarSeed: store.get('dmTargetUser').avatarSeed } });
             if (getWs() && getWs().readyState === 1) {
               getWs().send(JSON.stringify({
                 type: "mate_update",
@@ -224,7 +225,8 @@ export function processMessage(msg) {
       }
     }
 
-    store.set({ currentHistoryIndex: Number.isSafeInteger(msg._historyIndex) && msg._historyIndex >= 0 ? msg._historyIndex : null });
+    store.set({ currentHistoryIndex: Number.isSafeInteger(msg._historyIndex) && msg._historyIndex >= 0 ? msg._historyIndex : null,
+      currentHistoryIndexes: Array.isArray(msg._historyIndexes) ? msg._historyIndexes : null });
     switch (msg.type) {
       case "message_ack":
         var acknowledgedEntry = acknowledgeMessage(msg.clientMessageId);
@@ -858,6 +860,9 @@ export function processMessage(msg) {
         handleRemoteSelection(msg);
         break;
 
+      case "session_work_primary_result":
+        handlePrimaryWorkResult(msg);
+        break;
       case "linear_result":
         handleLinearResult(msg);
         break;
@@ -1274,6 +1279,11 @@ export function processMessage(msg) {
         renderGeneratedImage(msg);
         break;
 
+      case 'mcp_import_consent_expired':
+        markAskUserAnswered(msg.toolId, { 0: msg.error || 'No import was approved.' });
+        stopUrgentBlink();
+        break;
+
       case "ask_user_answered":
         markAskUserAnswered(msg.toolId, msg.answers);
         stopUrgentBlink();
@@ -1959,6 +1969,7 @@ export function processMessage(msg) {
             // Sync dmTargetUser so subsequent renders use fresh data
             var mp2 = msg.mate.profile || {};
             store.get('dmTargetUser').displayName = mp2.displayName || msg.mate.name || store.get('dmTargetUser').displayName;
+            store.get('dmTargetUser').avatarCatalogId = mp2.avatarCatalogId || '';
             store.get('dmTargetUser').avatarStyle = mp2.avatarStyle || store.get('dmTargetUser').avatarStyle;
             store.get('dmTargetUser').avatarSeed = mp2.avatarSeed || store.get('dmTargetUser').avatarSeed;
             store.get('dmTargetUser').avatarColor = mp2.avatarColor || store.get('dmTargetUser').avatarColor;

package/lib/public/modules/app-rendering.js

@@ -45,7 +45,7 @@ export function addCopyHandler(msgEl, rawText) {
 
 export function appendDelta(text) {
   var assistantEl = ensureAssistantBlock();
-  if (store.get('replayingHistory')) addHistoryIndex(assistantEl, store.get('currentHistoryIndex'));
+  if (store.get('replayingHistory')) addHistoryIndex(assistantEl, store.get('currentHistoryIndexes') || store.get('currentHistoryIndex'));
   streamBuffer += text;
   if (store.get('replayingHistory')) {
     store.set({ currentFullText: store.get('currentFullText') + streamBuffer });

package/lib/public/modules/avatar.js

@@ -1,37 +1,11 @@
 // Centralized local avatar URL builder for people and Mates.
-import { imprintDataUrl, mateMarkDataUrl } from './avatar-imprint.js';
-
-var mateMarkCache = new Map();
-
-// Historical DiceBear 9.x choices, now generated by Clay's local server.
-export var MATE_AVATAR_STYLES = [
-  { id: 'thumbs', name: 'Thumbs' },
-  { id: 'bottts', name: 'Bots' },
-  { id: 'pixel-art', name: 'Pixel' },
-  { id: 'adventurer', name: 'Adventurer' },
-  { id: 'micah', name: 'Micah' },
-  { id: 'fun-emoji', name: 'Emoji' },
-  { id: 'icons', name: 'Icons' },
-];
+import { imprintDataUrl } from './avatar-imprint.js';
 
 export function avatarUrl(style, seed, size) {
   // Legacy user styles remain part of the seed identity, never the artwork.
   return imprintDataUrl({ style: style || 'imprint', seed: seed || 'anonymous', size: size || 64 });
 }
 
-export function mateStyleAvatarUrl(style, seed, size) {
-  var normalizedStyle = style || 'imprint';
-  var normalizedSeed = seed || 'anonymous';
-  var normalizedSize = size || 64;
-  var isHistorical = MATE_AVATAR_STYLES.some(function (entry) { return entry.id === normalizedStyle; });
-  if (isHistorical) {
-    return '/api/generated-avatar?style=' + encodeURIComponent(normalizedStyle)
-      + '&seed=' + encodeURIComponent(normalizedSeed)
-      + '&size=' + encodeURIComponent(normalizedSize);
-  }
-  return imprintDataUrl({ style: normalizedStyle, seed: normalizedSeed, size: normalizedSize });
-}
-
 // Use the same bounded account identity for fresh fallbacks across every surface.
 export function userAvatarSeed(user) {
   var profile = user && user.profile ? user.profile : user;
@@ -48,24 +22,24 @@ export function userAvatarUrl(user, size) {
   return avatarUrl(style, userAvatarSeed(user), size);
 }
 
-export function mateMarkUrl(seed, size) {
-  var cacheKey = [seed || 'mate', size || 64].join('|');
-  if (mateMarkCache.has(cacheKey)) return mateMarkCache.get(cacheKey);
-  var url = mateMarkDataUrl({ seed: seed || 'mate', size: size || 64 });
-  if (mateMarkCache.size >= 256) mateMarkCache.delete(mateMarkCache.keys().next().value);
-  mateMarkCache.set(cacheKey, url);
-  return url;
+function mappedMateAvatarId(mate) {
+  var p = mate.profile || mate;
+  var key = JSON.stringify([mate.id || '', p.avatarStyle || 'imprint', p.avatarSeed || mate.id || p.displayName || mate.name || 'Mate']);
+  var hash = 2166136261;
+  for (var i = 0; i < key.length; i++) hash = Math.imul(hash ^ key.charCodeAt(i), 16777619) >>> 0;
+  var index = hash % 96;
+  return (index < 48 ? 'B' : 'C') + String(index % 48 + 1).padStart(2, '0');
+}
+
+export function mateCatalogAvatarUrl(id) {
+  if (id === 'lead-clay') return '/mate-avatars/lead-clay.png?v=4';
+  return typeof id === 'string' && /^[BC](0[1-9]|[1-3][0-9]|4[0-8])$/.test(id) ? '/mate-avatars/' + id + '.png?v=4' : '';
 }
 
 // Build avatar URL for a mate object, preferring custom avatar if set.
 export function mateAvatarUrl(mate, size) {
-  if (!mate) return mateMarkUrl('mate', size);
+  if (!mate) return mateCatalogAvatarUrl('B01');
   var p = mate.profile || mate;
   if (p.avatarCustom || mate.avatarCustom) return p.avatarCustom || mate.avatarCustom;
-  var identity = p.displayName || mate.name || mate.displayName || 'Mate';
-  var style = p.avatarStyle || mate.avatarStyle || 'imprint';
-  if (style !== 'imprint' && style !== 'initial') {
-    return mateStyleAvatarUrl(style, p.avatarSeed || mate.avatarSeed || mate.id || identity, size);
-  }
-  return mateMarkUrl(identity, size);
+  return mateCatalogAvatarUrl(p.avatarCatalogId) || mateCatalogAvatarUrl(mate.builtinKey === 'clay' ? 'lead-clay' : mappedMateAvatarId(mate));
 }

package/lib/public/modules/chat-render-runtime.js

@@ -155,13 +155,22 @@ export function setIsUserScrolledUp(value) { isUserScrolledUp = value; }
 
 export function addToMessages(element) {
   var messagesEl = getMessagesEl();
-  addHistoryIndex(element, store.get('currentHistoryIndex'));
+  addHistoryIndex(element, store.get('currentHistoryIndexes') || store.get('currentHistoryIndex'));
   if (prependAnchor) messagesEl.insertBefore(element, prependAnchor);
   else messagesEl.appendChild(element);
   keepActiveThinkingAtTail();
 }
 
 export function addHistoryIndex(element, historyIndex) {
+  if (Array.isArray(historyIndex)) {
+    if (!element) return;
+    var indexes = new Set((element.dataset.historyIndexes || "").split(",").filter(Boolean));
+    for (var i = 0; i < historyIndex.length; i++) {
+      if (Number.isSafeInteger(historyIndex[i]) && historyIndex[i] >= 0) indexes.add(String(historyIndex[i]));
+    }
+    element.dataset.historyIndexes = Array.from(indexes).join(",");
+    return;
+  }
   if (!element || !Number.isSafeInteger(historyIndex) || historyIndex < 0) return;
   var existing = element.dataset.historyIndexes || "";
   if (existing.split(",").indexOf(String(historyIndex)) !== -1) return;