clay-server 5.3.0-beta.1 → 5.3.0-beta.3

package/lib/public/modules/split-view-worker-activity.js

@@ -20,71 +20,15 @@ export function workerActivityLabel(message, names) {
     WebSearch: 'Search the web', WebFetch: 'Read web page' };
   return definition ? definition.noun : (Object.prototype.hasOwnProperty.call(generic, name) ? generic[name] : null) || (typeof name === 'string' ? name.slice(0, 120) : 'Tool activity');
 }
-function workerActivityActionIcon(message, names) {
-  var match = message.toolId && names[message.toolId];
-  var name = message.toolName || match && match.name;
-  var definition = clayToolDefinition(name);
-  if (definition && typeof definition.icon === 'string' && definition.icon) return definition.icon;
-  var generic = { Read: 'file-text', read_file: 'file-text', Edit: 'pencil', Write: 'file-plus-2',
-    Bash: 'square-terminal', exec_command: 'square-terminal', Grep: 'search', Glob: 'search', WebSearch: 'globe', WebFetch: 'globe' };
-  return Object.prototype.hasOwnProperty.call(generic, name) ? generic[name] : null;
-}
-export function appendWorkerActivity(body, messages, names) {
-  var group = document.createElement('section'); group.className = 'worker-activity-group';
-  var key = String(messages[messages.length - 1].recordIndex);
-  group.dataset.activityKey = key;
-  var toggle = document.createElement('button'); toggle.type = 'button'; toggle.className = 'worker-activity-summary';
-  toggle.dataset.disclosureKey = 'activity-' + key;
-  var activityIcon = document.createElement('i'); activityIcon.setAttribute('data-lucide', 'activity'); activityIcon.setAttribute('aria-hidden', 'true');
-  var heading = document.createElement('span'); heading.className = 'worker-activity-heading'; heading.textContent = 'Activity';
-  var count = document.createElement('span'); count.className = 'worker-activity-count'; count.textContent = messages.length + (messages.length === 1 ? ' recorded step' : ' recorded steps');
-  var chevron = document.createElement('i'); chevron.className = 'worker-activity-chevron';
-  chevron.setAttribute('data-lucide', 'chevron-down'); chevron.setAttribute('aria-hidden', 'true');
-  toggle.append(activityIcon, heading, count, chevron);
-  toggle.setAttribute('aria-expanded', 'false'); toggle.disabled = messages.length <= 2;
-  var list = document.createElement('div'); list.className = 'worker-activity-list';
-  var items = [];
-  messages.forEach(function (message) {
-    var item = document.createElement('article'); item.className = 'worker-activity-item worker-tool-message';
-    item.dataset.recordIndex = String(message.recordIndex);
-    var phase = message.isError ? 'failed' : message.recordType === 'tool_result' ? 'returned' : 'recorded';
-    item.dataset.phase = phase;
-    var row = document.createElement('div'); row.className = 'worker-activity-row';
-    var actionIcon = workerActivityActionIcon(message, names);
-    var statusIcon = phase === 'failed' ? 'circle-alert' : phase === 'returned' ? 'corner-down-left' : 'circle-dot';
-    var glyph = document.createElement('i'); glyph.className = actionIcon ? 'worker-activity-glyph' : 'worker-activity-glyph worker-activity-status'; glyph.setAttribute('aria-hidden', 'true');
-    glyph.setAttribute('data-lucide', actionIcon || statusIcon);
-    var label = document.createElement('span'); label.className = 'worker-activity-label'; label.textContent = workerActivityLabel(message, names);
-    var detail = document.createElement('span'); detail.className = 'worker-activity-detail';
-    detail.textContent = phase === 'failed' ? 'Failed' : phase === 'returned' ? 'Result returned' : 'Call recorded';
-    row.append(glyph, label, detail);
-    if (actionIcon) {
-      var status = document.createElement('i'); status.className = 'worker-activity-status';
-      status.setAttribute('data-lucide', statusIcon); status.setAttribute('aria-hidden', 'true'); row.appendChild(status);
-    }
-    var evidence = document.createElement('details'); evidence.className = 'worker-activity-evidence'; evidence.dataset.disclosureKey = 'record-' + message.recordIndex;
-    var summary = document.createElement('summary'); summary.textContent = 'Technical details';
-    var output = document.createElement('pre'); output.textContent = message.text;
-    evidence.append(summary, output); item.append(row, evidence); items.push(item); list.appendChild(item);
-  });
-  function expand(open) {
-    toggle.setAttribute('aria-expanded', String(open));
-    items.forEach(function (item, index) { item.hidden = !open && index < items.length - 2; item.inert = item.hidden; });
-  }
-  toggle.addEventListener('click', function () { expand(toggle.getAttribute('aria-expanded') !== 'true'); });
-  expand(false); group.append(toggle, list); body.appendChild(group);
-}
 export function captureWorkerDisclosures(body) {
   return {
     open: Array.from(body.querySelectorAll('details[open]')).map(function (node) { return node.dataset.disclosureKey; }),
-    groups: Array.from(body.querySelectorAll('.worker-activity-summary[aria-expanded="true"]')).map(function (node) { return node.dataset.disclosureKey; }),
     focus: document.activeElement && body.contains(document.activeElement) && (document.activeElement.dataset.disclosureKey || document.activeElement.parentElement && document.activeElement.parentElement.dataset.disclosureKey)
   };
 }
 export function restoreWorkerDisclosures(body, saved) {
   Array.from(body.querySelectorAll('[data-disclosure-key]')).forEach(function (node) {
     var key = node.dataset.disclosureKey;
-    if (saved.groups.indexOf(key) >= 0 && node.getAttribute('aria-expanded') === 'false') node.click();
     if (saved.open.indexOf(key) >= 0) node.open = true;
     if (saved.focus === key) {
       var target = node.tagName === 'DETAILS' ? node.querySelector('summary') : node;

package/lib/public/modules/split-view-worker-transcript.js

@@ -1,4 +1,4 @@
-import { appendWorkerActivity, workerActivityNames } from './split-view-worker-activity.js';
+import { workerActivityLabel, workerActivityNames } from './split-view-worker-activity.js';
 import { renderMarkdown } from './markdown.js';
 
 // Reassemble bounded record fragments and contiguous streaming deltas before
@@ -17,13 +17,26 @@ export function workerTranscriptRows(messages) {
   return rows;
 }
 
-export function appendWorkerMessage(body, message) {
-  if (message.role === 'tool') { appendWorkerActivity(body, [message], workerActivityNames([message])); return; }
+export function appendWorkerMessage(body, message, names) {
+  if (message.role === 'tool') {
+    var article = document.createElement('article');
+    article.className = 'message worker-readonly-message worker-tool-message';
+    article.dataset.recordIndex = String(message.recordIndex);
+    article.dataset.phase = message.isError ? 'failed' : message.recordType === 'tool_result' ? 'returned' : 'recorded';
+    var details = document.createElement('details');
+    details.dataset.disclosureKey = 'record-' + message.recordIndex;
+    var summary = document.createElement('summary');
+    summary.textContent = workerActivityLabel(message, names || workerActivityNames([message])) +
+      (message.isError ? ' · Failed' : message.recordType === 'tool_result' ? ' · Result returned' : ' · Call recorded');
+    var output = document.createElement('pre'); output.textContent = message.text;
+    details.append(summary, output); article.appendChild(details); body.appendChild(article);
+    return;
+  }
   var article = document.createElement('article');
   article.className = 'message worker-readonly-message ' + (message.role === 'user' ? 'msg-user' : 'msg-assistant');
   if (Number.isInteger(message.recordIndex)) article.dataset.recordIndex = String(message.recordIndex);
   var author = document.createElement('strong'); author.className = 'author';
-  author.textContent = message.role === 'user' ? 'You' : 'Worker';
+  author.textContent = message.role === 'user' ? 'Driver' : 'Worker';
   var content = document.createElement('div'); content.className = 'message-body md-content';
   // Recorded HTML must not create controls, scoped overlays or active embeds.
   // Keep the shared Markdown parser and its sanitization, with a narrower
@@ -36,11 +49,6 @@ export function appendWorkerMessage(body, message) {
 }
 
 export function appendWorkerTranscript(body, messages) {
-  var rows = workerTranscriptRows(messages), names = workerActivityNames(rows), pending = [];
-  function flush() { if (pending.length) appendWorkerActivity(body, pending, names); pending = []; }
-  rows.forEach(function (message) {
-    if (message.role === 'tool') pending.push(message);
-    else { flush(); appendWorkerMessage(body, message); }
-  });
-  flush();
+  var rows = workerTranscriptRows(messages), names = workerActivityNames(rows);
+  rows.forEach(function (message) { appendWorkerMessage(body, message, names); });
 }

package/lib/public/modules/split-view-workers.js

@@ -75,6 +75,12 @@ function popover() { return document.getElementById("split-view-worker-popover")
 function close(returnFocus) {
   var state = store.get('splitViewWorkerConversation');
   if (!state) return;
+  var socket = getWs();
+  if (state.subscriptionId && socket && socket === state.socket && socket.readyState === 1) {
+    try { socket.send(JSON.stringify({ type: 'split_worker_conversation_request', watch: false,
+      requestId: state.subscriptionId, parentSessionOriginId: state.driverOriginId,
+      workerSessionOriginId: state.workerOriginId, generation: state.generation })); } catch (_error) {}
+  }
   if (state.fillTimer) clearTimeout(state.fillTimer);
   if (state.requestTimer) clearTimeout(state.requestTimer);
   store.set({ splitViewWorkerConversation: null });
@@ -91,7 +97,7 @@ function position(element, anchor) {
   element.style.left = Math.max(10, Math.min(rect.left, window.innerWidth - width - 10)) + "px";
   element.style.top = Math.max(10, Math.min(rect.bottom + 6, window.innerHeight - height - 10)) + "px";
 }
-function requestPage(state, before, append) {
+function requestPage(state, before, append, refresh) {
   var current = store.get('splitViewWorkerConversation');
   if (!state || !current || state.requestId !== current.requestId || current.inFlight || workerCursorKey(before) === null || !ensurePopover()) return;
   state = store.get('splitViewWorkerConversation');
@@ -103,8 +109,9 @@ function requestPage(state, before, append) {
     renderContent(); return;
   }
   var requestId = "worker-read-" + Date.now().toString(36) + "-" + Math.random().toString(36).slice(2, 9);
-  var pending = Object.assign({}, state, { requestId: requestId, socket: ws, projectSlug: store.get('currentSlug'), ownerId: store.get('myUserId') || null,
-    socketGeneration: store.get('projectSplitViewSocketGeneration') || 0, status: "loading", error: null, inFlight: true, fillTimer: null, requestedBefore: before == null ? null : before, append: append === true });
+  var subscribe = !state.subscriptionId || !state.subscriptionConfirmed;
+  var pending = Object.assign({}, state, { subscriptionId: subscribe ? requestId : state.subscriptionId, requestId: requestId, socket: ws, projectSlug: store.get('currentSlug'), ownerId: store.get('myUserId') || null,
+    socketGeneration: store.get('projectSplitViewSocketGeneration') || 0, status: "loading", error: null, inFlight: true, fillTimer: null, requestedBefore: before == null ? null : before, append: append === true, refreshing: refresh === true, refreshPending: false });
   pending.requestTimer = setTimeout(function () {
     var current = store.get('splitViewWorkerConversation');
     if (!current || current.requestId !== requestId || !current.inFlight) return;
@@ -113,10 +120,12 @@ function requestPage(state, before, append) {
     renderContent();
   }, 15000);
   store.set({ splitViewWorkerConversation: pending }); renderContent();
+  var last = refresh && state.messages[state.messages.length - 1];
+  var after = last && Number.isInteger(last.recordIndex) && Number.isInteger(last.end) ? { index: last.recordIndex, offset: last.end } : undefined;
   try {
     ws.send(JSON.stringify({ type: "split_worker_conversation_request", requestId: requestId,
       parentSessionOriginId: state.driverOriginId, workerSessionOriginId: state.workerOriginId,
-      generation: state.generation, before: before }));
+      generation: state.generation, before: before, after: after, watch: subscribe ? true : undefined }));
   } catch (_error) {
     var current = store.get('splitViewWorkerConversation');
     if (current && current.requestId === requestId) {
@@ -176,6 +185,7 @@ function renderContent() {
   if (body && (state.renderedMessages !== state.messages || !state.messages.length)) {
     var anchor = state.prepend ? captureWorkerAnchor(body) : null;
     var disclosures = captureWorkerDisclosures(body);
+    var followTail = body.scrollHeight - body.clientHeight - body.scrollTop < 48;
     var oldTop = body.scrollTop, wasFocused = document.activeElement === body;
     body.textContent = "";
     if (state.status === "loading" && !state.messages.length) body.textContent = "Loading conversation…";
@@ -183,18 +193,18 @@ function renderContent() {
     else if (!state.messages.length) body.textContent = "No recorded conversation.";
     appendWorkerTranscript(body, state.messages);
     restoreWorkerDisclosures(body, disclosures);
-    if (state.initialPage && state.status === 'ready') body.scrollTop = body.scrollHeight;
+    if ((state.initialPage || state.liveRefresh && followTail) && state.status === 'ready') body.scrollTop = body.scrollHeight;
     else if (anchor) restoreWorkerAnchor(body, anchor);
     else body.scrollTop = oldTop;
     if (wasFocused) body.focus({ preventScroll: true });
   }
-  if (body) store.set({ splitViewWorkerConversation: Object.assign({}, state, { renderedMessages: state.messages, prepend: false,
+  if (body) store.set({ splitViewWorkerConversation: Object.assign({}, state, { renderedMessages: state.messages, prepend: false, liveRefresh: false,
     initialPage: state.status === 'ready' ? false : state.initialPage }) });
   if (footer) {
-    footer.textContent = "Read-only conversation";
+    footer.textContent = state.status === 'error' ? 'Read-only conversation' : state.refreshing ? 'Updating live conversation…' : state.subscriptionConfirmed ? 'Read-only · Live updates' : 'Read-only conversation';
     if (state.status === "error") { var status = document.createElement('span'); status.setAttribute('role', 'status'); status.textContent = state.error || "Conversation is unavailable."; footer.appendChild(status); }
     var status = document.createElement('span'); status.className = 'split-view-worker-page-status'; status.setAttribute('role', 'status');
-    status.textContent = state.inFlight ? (state.messages.length ? 'Loading earlier messages…' : 'Loading conversation…') : state.hasMore ? 'Scroll up for earlier messages' : state.messages.length ? 'Beginning of conversation' : '';
+    status.textContent = state.inFlight ? (state.refreshing ? 'Receiving Worker activity…' : state.messages.length ? 'Loading earlier messages…' : 'Loading conversation…') : state.hasMore ? 'Scroll up for earlier messages' : state.messages.length ? 'Beginning of conversation' : '';
     footer.appendChild(status);
     if (state.status === 'error') {
       var retry = document.createElement('button'); retry.type = 'button'; retry.textContent = 'Retry loading conversation';
@@ -245,10 +255,56 @@ export function handleSplitWorkerConversation(message) {
   if (!error && (!Array.isArray(message.messages) || message.hasMore && !workerCursorAdvances(state.requestedBefore, message.nextBefore))) error = 'Worker history page did not advance. Retry loading conversation.';
   var incoming = error ? [] : message.messages;
   var messages = error ? state.messages : state.append ? incoming.concat(state.messages || []) : incoming.slice();
+  if (!error && state.refreshing && incoming.length) {
+    var first = incoming[0];
+    messages = state.messages.filter(function (item) {
+      return item.recordIndex < first.recordIndex || item.recordIndex === first.recordIndex && item.end <= first.start;
+    }).concat(incoming);
+  }
+  if (!error && state.refreshing && !incoming.length) messages = state.messages;
+  var refreshAgain = state.refreshPending || message.moreRecent === true;
   store.set({ splitViewWorkerConversation: Object.assign({}, state, { status: error ? 'error' : 'ready', error: error,
-    messages: messages, inFlight: false, requestTimer: null, hasMore: error ? state.hasMore : message.hasMore === true,
-    nextBefore: error ? state.nextBefore : message.nextBefore, prepend: !error && state.append, append: false }) });
-  renderContent(); return true;
+    messages: messages, subscriptionConfirmed: !error || state.subscriptionConfirmed, inFlight: false, requestTimer: null, nextBefore: error || state.refreshing && state.messages.length ? state.nextBefore : message.nextBefore,
+    hasMore: error || state.refreshing && state.messages.length ? state.hasMore : message.hasMore === true,
+    liveRefresh: !error && state.refreshing, refreshing: false, refreshPending: false, prepend: !error && state.append, append: false }) });
+  renderContent();
+  if (refreshAgain && !error) refreshWorkerConversation();
+  return true;
+}
+function refreshWorkerConversation() {
+  var state = store.get('splitViewWorkerConversation');
+  if (!state || !store.get('connected') || !ensurePopover()) return;
+  if (state.inFlight) {
+    if (!state.refreshPending) store.set({ splitViewWorkerConversation: Object.assign({}, state, { refreshPending: true }) });
+    return;
+  }
+  requestPage(state, undefined, false, true);
+}
+export function handleWorkerConversationChanged(message) {
+  var state = store.get('splitViewWorkerConversation');
+  if (!state || !store.get('connected') || state.socket !== getWs() || state.projectSlug !== store.get('currentSlug') ||
+      state.ownerId !== (store.get('myUserId') || null) || state.socketGeneration !== (store.get('projectSplitViewSocketGeneration') || 0) ||
+      message.subscriptionId !== state.subscriptionId || message.parentSessionOriginId !== state.driverOriginId ||
+      message.workerSessionOriginId !== state.workerOriginId || message.generation !== state.generation || !ensurePopover()) return false;
+  document.querySelectorAll('.split-view-worker-chip').forEach(function (chip) {
+    if (chip.dataset.workerOrigin === state.workerOriginId) {
+      var dot = chip.querySelector('.split-view-worker-dot');
+      if (dot) dot.dataset.state = message.isProcessing ? 'working' : 'ready';
+    }
+  });
+  refreshWorkerConversation();
+  return true;
+}
+export function handleWorkerSessionActivity(message) {
+  var worker = sessions().find(function (item) { return item.id === message.id && item.sessionRole === 'worker'; });
+  if (!worker || !store.get('connected')) return;
+  document.querySelectorAll('.split-view-worker-chip').forEach(function (chip) {
+    if (chip.dataset.workerOrigin !== worker.sessionOriginId) return;
+    var dot = chip.querySelector('.split-view-worker-dot');
+    if (dot) { dot.dataset.state = 'working'; dot.setAttribute('aria-label', 'Worker activity received'); }
+  });
+  var state = store.get('splitViewWorkerConversation');
+  if (state && state.workerOriginId === worker.sessionOriginId && state.generation === worker.workerGeneration) refreshWorkerConversation();
 }
 export function renderPaneWorkers(container, driver) {
   if (!container || !driver) return;
@@ -270,7 +326,8 @@ export function renderPaneWorkers(container, driver) {
     button.title = (VENDOR_NAMES[worker.vendor] || worker.vendor || "Unknown vendor") + " · " + modelLabel + " · Split Worker #" + worker.id +
       (current ? "" : " · Archived · Gen " + worker.workerGeneration) + " · " + (worker.title || "Worker");
     button.setAttribute("aria-label", button.title + " conversation");
-    var dot = document.createElement("span"); dot.className = "split-view-worker-dot"; dot.dataset.state = current && worker.isProcessing ? "working" : "ready";
+    var dot = document.createElement("span"); dot.className = "split-view-worker-dot"; dot.dataset.state = !store.get('connected') ? 'disconnected' : worker.isProcessing ? 'working' : 'ready';
+    dot.setAttribute('aria-label', !store.get('connected') ? 'Disconnected' : worker.isProcessing ? 'Worker is working' : 'Worker is idle');
     if (VENDOR_AVATARS[worker.vendor]) {
       var vendorIcon = document.createElement("img"); vendorIcon.className = "split-view-worker-vendor";
       vendorIcon.src = VENDOR_AVATARS[worker.vendor]; vendorIcon.alt = ""; vendorIcon.setAttribute("aria-hidden", "true"); button.appendChild(vendorIcon);
@@ -282,6 +339,7 @@ export function renderPaneWorkers(container, driver) {
       var generation = document.createElement("span"); generation.className = "split-view-worker-generation";
       generation.textContent = "Gen " + worker.workerGeneration; button.appendChild(generation);
     }
+    button.dataset.workerSessionId = String(worker.id);
     button.appendChild(dot);
     var state = store.get('splitViewWorkerConversation');
     button.setAttribute("aria-expanded", state && state.driverOriginId === driver.sessionOriginId && state.workerOriginId === worker.sessionOriginId ? "true" : "false");
@@ -328,6 +386,14 @@ window.addEventListener("scroll", function (event) {
   reanchorPopover();
 }, true);
 store.subscribe(function (state, previous) {
+  if (state.paneBindingSessions !== previous.paneBindingSessions || state.connected !== previous.connected) {
+    document.querySelectorAll('.split-view-worker-chip').forEach(function (chip) {
+      var worker = sessions().find(function (item) { return item.sessionOriginId === chip.dataset.workerOrigin; });
+      var dot = chip.querySelector('.split-view-worker-dot');
+      if (dot) dot.dataset.state = !state.connected ? 'disconnected' : worker && worker.isProcessing ? 'working' : 'ready';
+    });
+    if (state.connected && state.splitViewWorkerConversation) refreshWorkerConversation();
+  }
   if (state.splitViewWorkerConversation && (state.currentSlug !== previous.currentSlug || state.myUserId !== previous.myUserId ||
       state.projectSplitViewSocketGeneration !== previous.projectSplitViewSocketGeneration)) {
     close(false);

package/lib/public/modules/worker-created-presentation.js

@@ -0,0 +1,37 @@
+// New execution pairs keep the Driver's current presentation; Workers live in pills.
+import { store } from './store.js';
+import { getWs } from './ws-ref.js';
+import { getCachedSessions } from './sidebar-sessions.js';
+import { splitGroupRoles } from './split-group-helpers.js';
+import { setActiveView, switchToStandalone } from './split-view-presentations.js';
+
+export function showCreatedWorkerPresentation(group) {
+  var roles = splitGroupRoles(group), state = store.snap();
+  if (!roles || state.paneMode || state.dmMode) return false;
+  store.set({ createdWorkerPresentation: { group: group, slug: state.currentSlug, ownerId: state.myUserId,
+    activeSessionId: state.activeSessionId, socketGeneration: state.projectSplitViewSocketGeneration } });
+  return reconcileCreatedWorkerPresentation();
+}
+function reconcileCreatedWorkerPresentation() {
+  var pending = store.get('createdWorkerPresentation'), state = store.snap();
+  if (!pending) return false;
+  if (pending.slug !== state.currentSlug || pending.ownerId !== state.myUserId || pending.activeSessionId !== state.activeSessionId ||
+      pending.socketGeneration !== state.projectSplitViewSocketGeneration || !state.connected) {
+    store.set({ createdWorkerPresentation: null }); return false;
+  }
+  var roles = splitGroupRoles(pending.group), sessions = getCachedSessions() || [];
+  var driver = sessions.find(function (session) { return session.id === roles.driverId && session.sessionRole === 'driver' &&
+    (session.ownerId || null) === (state.myUserId || null); });
+  if (state.sessionListProjectSlug !== state.currentSlug || !driver || !driver.sessionOriginId || !getWs() || getWs().readyState !== 1) return false;
+  store.set({ createdWorkerPresentation: null });
+  if (state.activeSessionId === driver.id && !state.splitPanes) return true;
+  var view = (state.projectSplitViews || []).find(function (item) {
+    return item.sessions.some(function (ref) { return ref.id === driver.id && ref.sessionOriginId === driver.sessionOriginId; });
+  });
+  return view ? setActiveView(view.id, driver.sessionOriginId) : switchToStandalone(driver.id);
+}
+store.subscribe(function (state, previous) {
+  if (state.createdWorkerPresentation && (state.paneBindingSessions !== previous.paneBindingSessions ||
+      state.activeSessionId !== previous.activeSessionId || state.projectSplitViewSocketGeneration !== previous.projectSplitViewSocketGeneration ||
+      state.currentSlug !== previous.currentSlug || state.myUserId !== previous.myUserId || state.connected !== previous.connected)) reconcileCreatedWorkerPresentation();
+});