clay-server 5.0.2-beta.1 → 5.1.0-beta.2

package/lib/public/modules/account-island.js

@@ -0,0 +1,230 @@
+import { store } from './store.js';
+import { mountDefaultAi, unmountDefaultAi } from './default-ai.js';
+import { openUserSettings } from './user-settings.js';
+import { getProfile, updateProfileName, regenerateProfileAvatar, showAvatarPositioner, uploadAvatarBlob } from './profile.js';
+import { requestCursorSharingState, setCursorSharing } from './app-cursors.js';
+import { registerTooltip } from './tooltip.js';
+
+var popover = null;
+var trigger = null;
+var lastFocus = null;
+
+function accountName() { return document.body.dataset.myDisplayName || 'Clay user'; }
+
+function close(returnFocus) {
+  if (!popover) return;
+  var aiSection = popover.querySelector('#account-ai-section');
+  if (aiSection) unmountDefaultAi(aiSection);
+  popover.remove();
+  popover = null;
+  trigger.setAttribute('aria-expanded', 'false');
+  trigger.setAttribute('aria-label', 'Open account menu for ' + accountName());
+  document.removeEventListener('pointerdown', onOutside);
+  document.removeEventListener('focusin', onFocusOutside);
+  document.removeEventListener('keydown', onKeydown);
+  window.removeEventListener('resize', position);
+  store.set({ defaultAiInlineEditing: false });
+  if (returnFocus && lastFocus && document.contains(lastFocus)) lastFocus.focus({ preventScroll: true });
+  lastFocus = null;
+}
+
+function isAvatarPositionerTarget(target) { return target && target.closest && target.closest('.avatar-positioner-overlay'); }
+function onOutside(event) { if (!popover || popover.contains(event.target) || trigger.contains(event.target) || isAvatarPositionerTarget(event.target)) return; close(false); }
+function onFocusOutside(event) { if (!popover || popover.contains(event.target) || trigger.contains(event.target) || isAvatarPositionerTarget(event.target)) return; close(false); }
+function onKeydown(event) {
+  if (event.key !== 'Escape') return;
+  if (isAvatarPositionerTarget(event.target) || document.querySelector('.avatar-positioner-overlay')) return;
+  event.preventDefault();
+  event.stopPropagation();
+  close(true);
+}
+
+function position() {
+  if (!popover || !trigger) return;
+  var rect = trigger.getBoundingClientRect();
+  var width = Math.min(280, window.innerWidth - 24);
+  var left = Math.max(12, Math.min(window.innerWidth - width - 12, rect.left));
+  popover.style.width = width + 'px';
+  popover.style.left = left + 'px';
+  popover.style.top = Math.max(12, rect.top - popover.offsetHeight - 8) + 'px';
+}
+
+function renderNameResting(restoreFocus) {
+  var section = popover && popover.querySelector('.account-identity-copy');
+  if (!section) return;
+  section.innerHTML = '<button type="button" id="account-name-edit" class="account-name-display"><span></span><i data-lucide="pencil" aria-hidden="true"></i></button><small>Personal account</small>';
+  section.querySelector('span').textContent = accountName();
+  section.querySelector('#account-name-edit').addEventListener('click', startNameEdit);
+  if (window.lucide) window.lucide.createIcons({ nodes: [section] });
+  if (restoreFocus) section.querySelector('#account-name-edit').focus();
+}
+
+function startNameEdit() {
+  var section = popover && popover.querySelector('.account-identity-copy');
+  if (!section) return;
+  var input = document.createElement('input');
+  input.id = 'account-profile-name';
+  input.setAttribute('aria-label', 'Display name');
+  input.className = 'account-name-input';
+  input.type = 'text';
+  input.maxLength = 50;
+  input.autocomplete = 'name';
+  input.value = getProfile().name || '';
+  section.innerHTML = '';
+  section.appendChild(input);
+  var hint = document.createElement('small');
+  hint.textContent = 'Enter to save · Escape to cancel';
+  section.appendChild(hint);
+  input.addEventListener('keydown', function(event) {
+    if (event.key === 'Enter') {
+      event.preventDefault();
+      updateProfileName(input.value);
+      renderNameResting(true);
+    } else if (event.key === 'Escape') {
+      event.preventDefault();
+      renderNameResting(true);
+    }
+    event.stopPropagation();
+  });
+  input.focus();
+  input.select();
+}
+
+function toggleAvatarEditor() {
+  var editor = popover && popover.querySelector('#account-avatar-editor');
+  if (!editor) return;
+  editor.hidden = !editor.hidden;
+  if (!editor.hidden) editor.querySelector('#account-avatar-upload').focus();
+  position();
+}
+
+function bindAvatarEditor() {
+  var avatar = popover.querySelector('#account-avatar-edit');
+  var editor = popover.querySelector('#account-avatar-editor');
+  var upload = editor.querySelector('#account-avatar-upload');
+  var file = editor.querySelector('#account-avatar-file');
+  var generate = editor.querySelector('#account-avatar-generate');
+  avatar.addEventListener('click', function(event) { event.stopPropagation(); toggleAvatarEditor(); });
+  editor.addEventListener('click', function(event) { event.stopPropagation(); });
+  upload.addEventListener('click', function() { file.click(); });
+  file.addEventListener('change', function() {
+    var selected = file.files && file.files[0];
+    if (!selected) return;
+    var image = new Image();
+    var objectUrl = URL.createObjectURL(selected);
+    image.onload = function() {
+      showAvatarPositioner(image, objectUrl, function(blob) {
+        URL.revokeObjectURL(objectUrl);
+        uploadAvatarBlob(blob).then(function() { editor.hidden = true; }).catch(function() { editor.dataset.error = 'true'; });
+      });
+    };
+    image.src = objectUrl;
+  });
+  generate.addEventListener('click', function() { regenerateProfileAvatar(); editor.hidden = true; });
+}
+
+function render() {
+  popover = document.createElement('div');
+  popover.id = 'account-popover';
+  popover.className = 'account-popover';
+  popover.setAttribute('role', 'dialog');
+  popover.setAttribute('aria-label', 'Account');
+  var profile = getProfile();
+  var identity = document.createElement('div');
+  identity.className = 'account-menu-identity';
+  identity.innerHTML = '<button type="button" id="account-avatar-edit" class="account-avatar-edit" aria-label="Edit avatar"><img src="' + (document.body.dataset.myAvatarUrl || '') + '" alt=""></button><div class="account-identity-copy"></div><button type="button" class="account-settings-button" aria-label="User Settings" title="User Settings"><i data-lucide="settings" aria-hidden="true"></i></button>';
+  identity.querySelector('#account-avatar-edit img').alt = profile.name || 'Clay user';
+  var editor = document.createElement('div');
+  editor.id = 'account-avatar-editor';
+  editor.className = 'account-avatar-editor';
+  editor.hidden = true;
+  editor.innerHTML = '<button type="button" id="account-avatar-upload">Upload photo</button><button type="button" id="account-avatar-generate">Generate avatar</button><input id="account-avatar-file" type="file" accept="image/*">';
+  popover.appendChild(identity);
+  popover.appendChild(editor);
+  var aiSection = document.createElement('section');
+  aiSection.id = 'account-ai-section';
+  aiSection.className = 'account-inline-section account-ai-section';
+  aiSection.setAttribute('aria-label', 'Default AI');
+  popover.appendChild(aiSection);
+  mountDefaultAi(aiSection);
+  identity.querySelector('.account-settings-button').addEventListener('click', onSettings);
+  document.body.appendChild(popover);
+  renderNameResting();
+  bindAvatarEditor();
+  updateCursorAction();
+  if (window.lucide) window.lucide.createIcons({ nodes: [popover] });
+  position();
+}
+
+function updateCursorAction() {
+  var button = document.getElementById('cursor-share-toggle');
+  if (!button) return;
+  var hydrated = store.get('cursorSharingHydrated') === true;
+  var enabled = hydrated && store.get('cursorSharingEnabled') === true;
+  var pending = store.get('cursorSharingPending') !== null && store.get('cursorSharingPending') !== undefined;
+  var connected = store.get('connected') !== false;
+  var error = store.get('cursorSharingError');
+  var canRetry = !!error && !hydrated && connected;
+  var showOff = hydrated && !enabled && !pending && !error && connected;
+  button.hidden = store.get('isMultiUserMode') !== true;
+  button.removeAttribute('role');
+  button.removeAttribute('aria-checked');
+  button.setAttribute('aria-pressed', enabled ? 'true' : 'false');
+  button.classList.toggle('on', enabled);
+  button.classList.toggle('off', showOff);
+  button.classList.toggle('pending', pending);
+  button.disabled = pending || !connected || (!hydrated && !canRetry);
+  var stateLabel = pending ? 'waiting' : !connected ? 'offline' : error ? (canRetry ? 'error; activate to retry' : 'error') : !hydrated ? 'unavailable' : enabled ? 'on' : 'off';
+  button.setAttribute('aria-label', 'Cursor sharing ' + stateLabel);
+  var tooltipText = pending ? 'Cursor sharing is waiting for confirmation.' : !connected ? 'Cursor sharing is offline.' : error ? (canRetry ? 'Cursor sharing is unavailable. Click to retry.' : 'Cursor sharing is unavailable.') : !hydrated ? 'Cursor sharing is unavailable.' : enabled ? 'Your cursor is visible to others. Click to stop sharing.' : 'Cursor sharing is off. Click to share your cursor.';
+  registerTooltip(button, tooltipText);
+}
+
+function onSettings(event) { event.stopPropagation(); close(false); openUserSettings(); }
+function onCursorAction(event) {
+  event.stopPropagation();
+  if (event.currentTarget.disabled) return;
+  if (store.get('cursorSharingError') && store.get('cursorSharingHydrated') !== true) {
+    requestCursorSharingState();
+    return;
+  }
+  setCursorSharing(!(store.get('cursorSharingEnabled') === true));
+}
+function focusAi() { var control = popover && popover.querySelector('#account-ai-section select'); if (control) control.focus({ preventScroll: true }); }
+function onOpenDefaultAi() { if (!popover) open(); store.set({ defaultAiInlineEditing: true }); focusAi(); }
+
+function open() {
+  if (popover) { close(true); return; }
+  lastFocus = document.activeElement;
+  render();
+  trigger.setAttribute('aria-expanded', 'true');
+  trigger.setAttribute('aria-label', 'Close account menu for ' + accountName());
+  document.addEventListener('pointerdown', onOutside);
+  document.addEventListener('focusin', onFocusOutside);
+  document.addEventListener('keydown', onKeydown);
+  window.addEventListener('resize', position);
+}
+
+export function initAccountIsland() {
+  trigger = document.getElementById('user-account-trigger');
+  if (!trigger) return;
+  trigger.addEventListener('click', open);
+  document.addEventListener('clay:open-account-default-ai', onOpenDefaultAi);
+  var cursorToggle = document.getElementById('cursor-share-toggle');
+  if (cursorToggle) cursorToggle.addEventListener('click', onCursorAction);
+  updateCursorAction();
+  trigger.setAttribute('aria-label', 'Open account menu for ' + accountName());
+  store.subscribe(function(state, previous) {
+    if (state.myUserId !== previous.myUserId || state.connected === false) close(false);
+    updateCursorAction();
+    if (popover) position();
+  });
+  document.addEventListener('clay:profile-updated', function() {
+    if (!popover) return;
+    var identityName = popover.querySelector('.account-name-display span');
+    if (identityName) identityName.textContent = accountName();
+    var avatar = popover.querySelector('#account-avatar-edit img');
+    if (avatar) avatar.src = document.body.dataset.myAvatarUrl || avatar.src;
+  });
+  window.addEventListener('resize', position);
+}

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

@@ -199,50 +199,26 @@ function findClosestTurn(clientY) {
 
 // Cursor sharing toggle button in user island (multi-user only)
 export function initCursorToggle() {
-  if (!store.get('isMultiUserMode')) return;
-  var actionsEl = document.querySelector(".user-island-actions");
-  if (!actionsEl) return;
-  if (document.getElementById("cursor-share-toggle")) return;
-
-  var btn = document.createElement("button");
-  btn.id = "cursor-share-toggle";
-  btn.className = "cursor-share-btn";
-  btn.innerHTML = '<i data-lucide="mouse-pointer-2"></i>';
-  var settingsBtn = document.getElementById("user-settings-btn");
-  if (settingsBtn) {
-    actionsEl.insertBefore(btn, settingsBtn);
-  } else {
-    actionsEl.appendChild(btn);
-  }
-
-  function updateToggleStyle() {
-    if (store.get("cursorSharingHydrated") && store.get("cursorSharingEnabled")) {
-      btn.classList.remove("off");
-      btn.classList.add("on");
-      registerTooltip(btn, "Cursor sharing on");
-    } else {
-      btn.classList.remove("on");
-      btn.classList.add("off");
-      registerTooltip(btn, "Cursor sharing off");
-    }
-  }
-
-  store.subscribe(function (state, prev) {
-    if (state.cursorSharingEnabled !== prev.cursorSharingEnabled || state.cursorSharingHydrated !== prev.cursorSharingHydrated) {
-      updateToggleStyle();
-    }
-  });
+  // The labeled rail control is owned by account-island.js.
+  return;
+}
 
-  updateToggleStyle();
-  lucide.createIcons({ nodes: [btn] });
+export function setCursorSharing(enabled) {
+  if (!store.get('cursorSharingHydrated') || store.get('cursorSharingPending') !== null && store.get('cursorSharingPending') !== undefined) return false;
+  if (enabled === true && store.get('isMultiUserMode') !== true) return false;
+  var ws = getWs();
+  if (!ws || ws.readyState !== 1) return false;
+  store.set({ cursorSharingPending: enabled });
+  ws.send(JSON.stringify({ type: 'cursor_sharing_set', enabled: enabled === true, requestId: 'cursor-sharing-' + Date.now() }));
+  return true;
+}
 
-  btn.addEventListener("click", function () {
-    if (!store.get("cursorSharingHydrated")) return;
-    var next = !store.get("cursorSharingEnabled");
-    var ws = getWs();
-    if (!ws || ws.readyState !== 1) return;
-    ws.send(JSON.stringify({ type: "cursor_sharing_set", enabled: next, requestId: "cursor-sharing-" + Date.now() }));
-  });
+export function requestCursorSharingState() {
+  var ws = getWs();
+  if (!ws || ws.readyState !== 1) return false;
+  store.set({ cursorSharingPending: 'refresh' });
+  ws.send(JSON.stringify({ type: 'cursor_sharing_get', requestId: 'cursor-sharing-refresh-' + Date.now() }));
+  return true;
 }
 
 // --- Exported functions ---
@@ -393,7 +369,7 @@ export function initCursors() {
       if (cursorThrottleTimer) { clearTimeout(cursorThrottleTimer); cursorThrottleTimer = null; }
       if (selectionThrottleTimer) { clearTimeout(selectionThrottleTimer); selectionThrottleTimer = null; }
       lastSelectionKey = "";
-      store.set({ cursorSharingEnabled: false, cursorSharingHydrated: false, cursorSharingAccountId: null });
+      store.set({ cursorSharingEnabled: false, cursorSharingHydrated: false, cursorSharingAccountId: null, cursorSharingPending: null, cursorSharingError: disconnected ? "disconnected" : "account-changed" });
       if (identityChanged && state.myUserId && state.connected) {
         var ws = getWs();
         if (ws && ws.readyState === 1) ws.send(JSON.stringify({ type: "cursor_sharing_get", requestId: "cursor-sharing-refresh-" + Date.now() }));

package/lib/public/modules/app-debate-ui.js

@@ -6,6 +6,7 @@ import { store } from './store.js';
 import { getWs } from './ws-ref.js';
 import { scrollToBottom } from './app-rendering.js';
 import { exportDebateAsPdf } from './debate.js';
+import { getProjectAssistantPlaceholder } from './project-chat-identity.js';
 
 // Module-internal UI var (not in store)
 var debateHandRaiseOpen = false;
@@ -64,7 +65,7 @@ export function exitDebateConcludeMode() {
   if (banner) banner.remove();
   var inputEl = document.getElementById("input");
   if (inputEl && inputEl._origPlaceholder) {
-    inputEl.placeholder = inputEl._origPlaceholder;
+    inputEl.placeholder = getProjectAssistantPlaceholder(store.snap(), store.get('currentVendor'));
     delete inputEl._origPlaceholder;
   }
 }
@@ -129,7 +130,7 @@ export function exitDebateEndedMode() {
   if (banner) banner.remove();
   var inputEl2 = document.getElementById("input");
   if (inputEl2 && inputEl2._origPlaceholder) {
-    inputEl2.placeholder = inputEl2._origPlaceholder;
+    inputEl2.placeholder = getProjectAssistantPlaceholder(store.snap(), store.get('currentVendor'));
     delete inputEl2._origPlaceholder;
   }
 }
@@ -191,7 +192,7 @@ export function exitDebateFloorMode() {
   if (banner) banner.remove();
   var inputEl = document.getElementById("input");
   if (inputEl && inputEl._origPlaceholder) {
-    inputEl.placeholder = inputEl._origPlaceholder;
+    inputEl.placeholder = getProjectAssistantPlaceholder(store.snap(), store.get('currentVendor'));
     delete inputEl._origPlaceholder;
   }
 }

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

@@ -1,3 +1,4 @@
+import { beginProjectDebatePrepend, endProjectDebatePrepend } from './project-debate-workspace.js';
 // app-header.js - Session rename, session info popover, progressive history loading
 // Extracted from app.js (PR-34)
 
@@ -12,6 +13,9 @@ import { saveToolState, resetToolState, restoreToolState } from './tools.js';
 import { getSessionUsage, setSessionUsage, getContextData, setContextData, updateContextPanel, updateUsagePanel } from './app-panels.js';
 import { onHistoryPrepended as onSessionSearchHistoryPrepended } from './session-search.js';
 import { getCachedSessions } from './sidebar-sessions.js';
+import { buildSessionHierarchy } from './session-hierarchy.js';
+import { splitGroupRoles } from './split-group-helpers.js';
+import { createWorkerHistoryControl } from './sidebar-session-hierarchy.js';
 import { bindPermissionControl, renderPermissionControl } from './permission-control.js';
 import { startHeaderSessionInlineRename } from './session-context-menu.js';
 
@@ -19,11 +23,104 @@ import { startHeaderSessionInlineRename } from './session-context-menu.js';
 var sessionInfoPopover = null;
 var historySentinelObserver = null;
 
+function splitHistoryOwner(state, sessions) {
+  var split = state.splitPanes;
+  if (!split || !Array.isArray(split.panes)) return null;
+  var groups = state.splitGroups || [];
+  var group = null;
+  var roles = null;
+  for (var gi = 0; gi < groups.length; gi++) {
+    var candidateRoles = splitGroupRoles(groups[gi]);
+    if (!candidateRoles) continue;
+    var matches = false;
+    for (var pi = 0; pi < split.panes.length; pi++) {
+      if (candidateRoles.orderedIds.indexOf(split.panes[pi].sessionId) !== -1) matches = true;
+    }
+    if (matches) { group = groups[gi]; roles = candidateRoles; break; }
+  }
+  if (!group || !roles) return null;
+  var hierarchy = buildSessionHierarchy(sessions || []);
+  for (var hi = 0; hi < hierarchy.roots.length; hi++) {
+    var root = hierarchy.roots[hi];
+    if (root.driver.id === roles.driverId && root.workers.length) return { root: root, group: group, roles: roles };
+  }
+  return null;
+}
+
+function splitPaneHistoryUrl(slug, sessionId) {
+  return "/p/" + encodeURIComponent(slug) + "/?pane=1&session=" + encodeURIComponent(sessionId);
+}
+
+function createHeaderWorkerHistoryControl(root, context) {
+  var capturedWs = context.ws;
+  var capturedSlug = context.slug;
+  var capturedMateId = context.mateId;
+  var capturedActiveSessionId = context.activeSessionId;
+  var capturedSplit = context.split;
+  var historyControl = createWorkerHistoryControl(root.driver, root.workers, {
+    className: "header-worker-history-btn",
+    label: "Show Split Worker history",
+    validate: function (driver) {
+      var current = store.snap();
+      var ws = getWs();
+      if (!ws || ws !== capturedWs || ws.readyState !== 1 || !current.connected || current.currentSlug !== capturedSlug ||
+          (current.activeProjectMateId || null) !== capturedMateId || current.dmMode) return false;
+      if (!capturedSplit) return current.activeSessionId === driver.id && !current.splitPanes;
+      var split = current.splitPanes;
+      if (!split || split.groupId !== capturedSplit.groupId || !Array.isArray(split.panes) || split.panes.length !== capturedSplit.panes.length) return false;
+      if (current.activeSessionId !== capturedActiveSessionId) return false;
+      for (var i = 0; i < split.panes.length; i++) {
+        if (split.panes[i].sessionId !== capturedSplit.panes[i].sessionId || split.panes[i].slug !== capturedSplit.panes[i].slug) return false;
+      }
+      return true;
+    },
+    navigate: capturedSplit ? function (worker) {
+      var opened = window.open(splitPaneHistoryUrl(capturedSlug, worker.id), "_blank", "noopener");
+      return !!opened;
+    } : null,
+  });
+  return historyControl;
+}
+
 export function initHeader() {
   var headerRenameBtn = document.getElementById("header-rename-btn");
   var headerTitleEl = document.getElementById("header-title");
   var headerInfoBtn = document.getElementById("header-info-btn");
   var headerFullAccessBtn = document.getElementById("header-full-access-btn");
+  var headerSearchBtn = document.getElementById("find-in-session-btn");
+  var headerWorkerHistoryBtn = null;
+
+  function refreshHeaderWorkerHistory() {
+    if (!headerSearchBtn) return;
+    if (headerWorkerHistoryBtn) {
+      headerWorkerHistoryBtn.remove();
+      headerWorkerHistoryBtn = null;
+    }
+    var state = store.snap();
+    var sessions = getCachedSessions() || [];
+    var hierarchy = buildSessionHierarchy(sessions);
+    var owner = null;
+    var context = null;
+    if (state.splitPanes && state.splitPanes.panes) {
+      var splitOwner = splitHistoryOwner(state, sessions);
+      owner = splitOwner ? splitOwner.root : null;
+      if (owner) {
+        context = {
+          ws: getWs(), slug: state.currentSlug, mateId: state.activeProjectMateId || null,
+          activeSessionId: state.activeSessionId,
+          split: { groupId: state.splitPanes.groupId, panes: state.splitPanes.panes.map(function (pane) { return { sessionId: pane.sessionId, slug: pane.slug }; }) },
+        };
+      }
+    } else {
+      for (var hi = 0; hi < hierarchy.roots.length; hi++) {
+        if (hierarchy.roots[hi].driver.id === state.activeSessionId && hierarchy.roots[hi].workers.length) { owner = hierarchy.roots[hi]; break; }
+      }
+      if (owner) context = { ws: getWs(), slug: state.currentSlug, mateId: state.activeProjectMateId || null, activeSessionId: state.activeSessionId, split: null };
+    }
+    if (!owner || !context) return;
+    headerWorkerHistoryBtn = createHeaderWorkerHistoryControl(owner, context);
+    if (headerWorkerHistoryBtn) headerSearchBtn.insertAdjacentElement("afterend", headerWorkerHistoryBtn);
+  }
 
   function permissionControlState() {
     var s = store.snap();
@@ -121,6 +218,12 @@ export function initHeader() {
 
   // --- Session info popover ---
   if (headerInfoBtn) {
+    store.subscribe(function (state, prev) {
+      if (state.activeSessionId !== prev.activeSessionId || state.currentSlug !== prev.currentSlug || state.activeProjectMateId !== prev.activeProjectMateId || state.splitPanes !== prev.splitPanes) {
+        closeSessionInfoPopover();
+        refreshHeaderWorkerHistory();
+      }
+    });
     headerInfoBtn.addEventListener("click", function (e) {
       e.stopPropagation();
       if (sessionInfoPopover) { closeSessionInfoPopover(); return; }
@@ -193,6 +296,7 @@ export function initHeader() {
       }
     });
   }
+  refreshHeaderWorkerHistory();
 }
 
 export function closeSessionInfoPopover() {
@@ -269,11 +373,13 @@ export function prependOlderHistory(items, meta) {
   var anchorEl = getPrependAnchor();
   var anchorOffset = anchorEl ? anchorEl.getBoundingClientRect().top : 0;
 
+  beginProjectDebatePrepend();
   // Process each item through the rendering pipeline
   for (var i = 0; i < items.length; i++) {
     processMessage(items[i]);
   }
 
+  endProjectDebatePrepend();
   // Finalize any open assistant block from the batch
   finalizeAssistantBlock();
 

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

@@ -2,11 +2,11 @@ import { handleIssueReference } from './clay-issue-links.js';
 // Narrow pre-router for Home and Capsule protocol responses kept out of the legacy router.
 
 import { processMessage as processAppMessage } from './app-messages.js';
-import { handleHomeMateModelsState, handleHomeMateModelResult } from './home-mate-settings.js';
+import { handleMateInstructionsResult, handleHomeMateModelsState, handleHomeMateModelResult } from './home-mate-settings.js';
 import { handleHomeMateSessionIdentity, handleHomeDebateTranscript, handleHomeWorkspaceAssignment } from './home-mate-chat.js';
 import { handleToolLlmConfigState } from './tool-llm-status.js';
 import { handleToolSourceState, handleToolMateAccessState } from './home-tools.js';
-import { handleHomeDebatesState } from './home-debates-archive.js';
+import { handleDebatesWorkbenchState } from './debates-workbench.js';
 import { renderProjectWorkspaceAssignment, showProjectWorkspaceAssignmentError } from './project-workspace-assignment.js';
 import { isHomeWorkspaceAssignmentMessage } from './workspace-assignment-routing.js';
 import { handleSearchClayMessage } from './search-clay-chat.js';
@@ -15,6 +15,8 @@ import { handleDefaultAiMessage } from './default-ai.js';
 import { handleCursorSharingMessage } from './cursor-sharing-preference.js';
 import { handlePendingMessageQueueMessage } from './pending-message-queue.js';
 import { receiveHistoryReplay } from './history-replay-batch.js';
+import { handleProjectMateCreationMessage } from './project-mate-creation-workspace.js';
+import { handleProjectDebatePlanningMessage } from './project-debate-planning-workspace.js';
 
 export function handleHomeProtocolMessage(msg) {
   if (handleIssueReference(msg)) return true;
@@ -32,9 +34,10 @@ export function handleHomeProtocolMessage(msg) {
     return true;
   }
   if (msg.type === "home_debates_state") {
-    handleHomeDebatesState(msg);
+    handleDebatesWorkbenchState(msg);
     return true;
   }
+  if (msg.type === "mate_instructions_result") { handleMateInstructionsResult(msg); return true; }
   if (msg.type === "home_mate_models_state") {
     handleHomeMateModelsState(msg);
     return true;
@@ -87,6 +90,12 @@ export function processMessage(msg) {
 }
 
 function dispatchMessage(msg) {
+  if (typeof handleProjectDebatePlanningMessage === "function" && handleProjectDebatePlanningMessage(msg)) return;
+  if (msg.type === "home_debate_event" && msg.eventType) {
+    processAppMessage(Object.assign({}, msg, { type: msg.eventType, mateId: msg.speakerMateId || null }));
+    return;
+  }
+  if (handleProjectMateCreationMessage(msg)) return;
   if (handlePendingMessageQueueMessage(msg)) return;
   if (handleDefaultAiMessage(msg)) return;
   if (handleCursorSharingMessage(msg)) return;