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

package/lib/public/modules/split-pane-runtime.js

@@ -0,0 +1,23 @@
+import { store } from './store.js';
+import { getCachedSessions } from './sidebar-sessions.js';
+import { livePaneBinding, samePaneBinding, samePaneTarget, paneTarget } from './pane-binding.js';
+import { VENDOR_AVATARS, VENDOR_NAMES } from './app-rendering.js';
+import { modelEntryValue } from './model-picker.js';
+
+export function renderPaneRuntime(paneEl, session) {
+  var runtime = paneEl.querySelector('.split-view-runtime');
+  if (!runtime) return;
+  var vendor = session && session.vendor || 'unknown', model = modelEntryValue(session && session.model);
+  var frame = paneEl.querySelector('.split-pane-frame'), controller = frame && frame.clayPane;
+  var live = controller && controller.identity(), target = session && paneTarget(store.snap(), getCachedSessions(), session.id);
+  if (session && live && live.ready && live.sessionId === session.id && !frame.dataset.requestedSessionId &&
+      samePaneTarget(target, live.binding) && livePaneBinding(frame) && typeof controller.headerRuntime === 'function') {
+    var observed = controller.headerRuntime();
+    if (observed && observed.vendor === vendor && samePaneBinding(live.binding, observed.binding)) model = modelEntryValue(observed.model) || model;
+  }
+  var label = model || (vendor === 'unknown' ? 'Model unavailable' : 'Provider default');
+  var icon = runtime.querySelector('.split-view-runtime-icon'), text = runtime.querySelector('.split-view-model');
+  if (icon) { icon.hidden = !VENDOR_AVATARS[vendor]; if (!icon.hidden) icon.src = VENDOR_AVATARS[vendor]; icon.title = VENDOR_NAMES[vendor] || vendor; icon.alt = ''; }
+  if (text) { text.textContent = label; text.title = (VENDOR_NAMES[vendor] || vendor) + ' · ' + label; }
+  runtime.setAttribute('aria-label', (VENDOR_NAMES[vendor] || vendor) + ' · ' + label);
+}

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

@@ -71,6 +71,54 @@ export function workerRemovalTarget(container, driverOrigin, workerOrigin, gener
     bindingGeneration: source.binding.generation, bindingRequestId: source.binding.requestId,
     viewRevision: store.get('projectSplitViewRevision'), socketGeneration: store.get('projectSplitViewSocketGeneration') };
 }
+// One introduction per Driver in this page, independent of transcript refreshes.
+export function showCreatedWorkerViewer(group) {
+  var state = store.snap(), roles = splitGroupRoles(group);
+  if (!roles || state.paneMode || state.dmMode || state.replayingHistory || !state.connected ||
+      state.activeSessionId !== roles.driverId || document.hidden) return;
+  var workerId = roles.workerIds[roles.workerIds.length - 1];
+  var worker = sessions().find(function (item) { return item.id === workerId; });
+  var anchors = group.pairAnchors, anchor = anchors && (anchors.workers || [anchors.worker])[roles.workerIds.length - 1];
+  var origin = worker && worker.sessionOriginId || anchor && anchor.origin;
+  if (!origin) return;
+  var driverIdentity = sessions().find(function (item) { return item.id === roles.driverId; });
+  var driverOrigin = driverIdentity && driverIdentity.sessionOriginId || anchors && anchors.driver && anchors.driver.origin;
+  if (!driverOrigin) return;
+  var key = JSON.stringify([state.myUserId, state.currentSlug, driverOrigin]);
+  var seen = state.introducedWorkerDrivers || [];
+  if (seen.indexOf(key) >= 0) return;
+  store.set({ introducedWorkerDrivers: seen.concat(key).slice(-64) });
+  if (state.createdWorkerViewer || state.splitViewWorkerConversation) return;
+  store.set({ createdWorkerViewer: { driverId: roles.driverId, driverOrigin: driverOrigin, workerId: workerId, workerOrigin: origin,
+    generation: worker ? worker.workerGeneration : null,
+    ownerId: state.myUserId, slug: state.currentSlug, socketGeneration: state.projectSplitViewSocketGeneration } });
+  var driver = sessions().find(function (item) { return item.id === roles.driverId; });
+  var pane = driver && document.querySelector('.split-pane[data-session-origin="' + CSS.escape(driver.sessionOriginId) + '"]');
+  if (pane) renderPaneWorkers(pane, driver);
+}
+function introduceWorkerViewer(container, driver) {
+  var pending = store.get('createdWorkerViewer'), state = store.snap();
+  if (!pending || pending.driverId !== driver.id) return;
+  var worker = sessions().find(function (item) { return item.id === pending.workerId; });
+  if (!worker) return;
+  store.set({ createdWorkerViewer: null });
+  var group = (state.splitGroups || []).find(function (item) {
+    var roles = splitGroupRoles(item);
+    return roles && roles.driverId === driver.id && roles.workerIds.indexOf(worker.id) >= 0;
+  });
+  if (!group || driver.sessionOriginId !== pending.driverOrigin || worker.sessionOriginId !== pending.workerOrigin || pending.generation !== null && worker.workerGeneration !== pending.generation ||
+      state.splitViewWorkerConversation || document.hidden || !container.isConnected || container.hidden || container.inert ||
+      driver.hidden || worker.hidden || exactWorker(driver, worker.sessionOriginId, worker.workerGeneration) !== worker) return;
+  var chip = Array.from(container.querySelectorAll('.split-view-worker-chip')).find(function (item) { return item.dataset.workerOrigin === worker.sessionOriginId; });
+  if (chip) open(chip, driver, worker, false);
+}
+function syncWorkerSelection() {
+  var state = store.get('splitViewWorkerConversation');
+  document.querySelectorAll('.split-view-worker-chip').forEach(function (chip) {
+    chip.setAttribute('aria-expanded', String(!!state && chip.dataset.workerOrigin === state.workerOriginId &&
+      chip.dataset.workerGeneration === String(state.generation)));
+  });
+}
 function popover() { return document.getElementById("split-view-worker-popover"); }
 function close(returnFocus) {
   var state = store.get('splitViewWorkerConversation');
@@ -84,6 +132,7 @@ function close(returnFocus) {
   if (state.fillTimer) clearTimeout(state.fillTimer);
   if (state.requestTimer) clearTimeout(state.requestTimer);
   store.set({ splitViewWorkerConversation: null });
+  syncWorkerSelection();
   var element = popover(); if (element) element.remove();
   if (returnFocus) {
     var chip = document.querySelector('.split-pane[data-session-origin="' + CSS.escape(state.driverOriginId) + '"] [data-worker-origin="' + CSS.escape(state.workerOriginId) + '"]');
@@ -135,7 +184,7 @@ function requestPage(state, before, append, refresh) {
     }
   }
 }
-function open(chip, driver, worker) {
+function open(chip, driver, worker, takeFocus) {
   var existing = store.get('splitViewWorkerConversation');
   if (existing && existing.driverOriginId === driver.sessionOriginId && existing.workerOriginId === worker.sessionOriginId && existing.generation === worker.workerGeneration) { close(true); return; }
   if (existing) close(false);
@@ -146,7 +195,8 @@ function open(chip, driver, worker) {
   store.set({ splitViewWorkerConversation: state }); ensurePopover(); renderContent();
   var element = popover(); position(element, chip);
   requestPage(state, undefined, false);
-  var closeButton = element && element.querySelector('[aria-label="Close Worker conversation"]'); if (closeButton) closeButton.focus();
+  syncWorkerSelection();
+  var closeButton = element && element.querySelector('[aria-label="Close Worker conversation"]'); if (closeButton && takeFocus !== false) closeButton.focus();
 }
 function ensurePopover() {
   var state = store.get('splitViewWorkerConversation');
@@ -368,6 +418,7 @@ export function renderPaneWorkers(container, driver) {
     });
     root.appendChild(controls);
   }
+  introduceWorkerViewer(container, driver);
   var conversation = store.get('splitViewWorkerConversation');
   if (conversation) ensurePopover();
 }
@@ -386,6 +437,11 @@ window.addEventListener("scroll", function (event) {
   reanchorPopover();
 }, true);
 store.subscribe(function (state, previous) {
+  var introduction = state.createdWorkerViewer;
+  if (introduction && (!state.connected || introduction.slug !== state.currentSlug || introduction.ownerId !== state.myUserId ||
+      introduction.socketGeneration !== state.projectSplitViewSocketGeneration || introduction.driverId !== state.activeSessionId)) {
+    store.set({ createdWorkerViewer: null });
+  }
   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; });

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

@@ -131,21 +131,15 @@ function closePane(sessionId) {
 // Called on session_list so pane headers follow renames made elsewhere
 // (sidebar, in-pane app). Panes being renamed inline are left alone.
 export function syncPaneTitles() {
-  var split = store.get('splitPanes');
-  if (!split || !split.panes || !host) return;
-  var titleEls = host.querySelectorAll(".split-pane-title");
-  var paneEls = host.querySelectorAll('.split-pane');
-  for (var i = 0; i < split.panes.length && i < titleEls.length; i++) {
-    var session = sessionById(paneEls[i] && Number(paneEls[i].dataset.sessionId) || split.panes[i].sessionId);
-    if (!session || !session.title) continue;
-    if (titleEls[i].parentNode) titleEls[i].parentNode.title = session.title;
-    if (titleEls[i].style.display !== "none") titleEls[i].textContent = session.title;
-  }
-  var accessBtns = host.querySelectorAll(".split-pane-full-access");
-  for (var ai = 0; ai < split.panes.length && ai < accessBtns.length; ai++) {
-    updatePaneFullAccessButton(accessBtns[ai], sessionById(paneEls[ai] && Number(paneEls[ai].dataset.sessionId) || split.panes[ai].sessionId));
+  if (!host) return;
+  var panes = host.querySelectorAll('.split-pane:not(.split-pane-cached)');
+  for (var i = 0; i < panes.length; i++) {
+    var frame = panes[i].querySelector('.split-pane-frame');
+    if (frame && frame.dataset.requestedSessionId) continue;
+    var session = sessionById(Number(panes[i].dataset.sessionId));
+    if (session) updateSplitPaneMetadata(panes[i], { sessionId: session.id, slug: panes[i].dataset.projectSlug, title: session.title });
   }
-  syncPairChrome(host, split);
+  syncPairChrome(host, store.get('splitPanes'));
 }
 
 function handlePaneMessage(event) {

package/lib/public/modules/sticky-notes.js

@@ -104,11 +104,17 @@ function recomputeFlightGeometry() {
 function syncFlightControls() {
   var buttons = document.querySelectorAll("#sticky-notes-toggle-btn");
   var hidden = !!store.get("notesTemporarilyHidden");
-  var label = hidden ? "Show sticky notes" : "Hide sticky notes";
+  var count = openCount();
+  var label = hidden ? "Show sticky notes (" + count + ")" : "Hide sticky notes";
   for (var i = 0; i < buttons.length; i++) {
     buttons[i].setAttribute("aria-label", label);
     buttons[i].setAttribute("aria-pressed", hidden ? "true" : "false");
     buttons[i].title = label;
+    var badge = buttons[i].querySelector('.sticky-notes-count');
+    if (badge) {
+      badge.textContent = String(count);
+      badge.classList.toggle('hidden', !hidden || count === 0);
+    }
   }
   refreshIcons();
 }
@@ -246,15 +252,7 @@ export function createNote() {
 
 function updateBadge() {
   syncToggleAvailability();
-  var badge = document.querySelector(".sticky-notes-count");
-  if (!badge) return;
-  var count = openCount();
-  if (count > 0) {
-    badge.textContent = count;
-    badge.classList.remove("hidden");
-  } else {
-    badge.classList.add("hidden");
-  }
+  syncFlightControls();
 }
 
 // --- WS message handlers ---

package/lib/public/modules/terminal.js

@@ -3,7 +3,7 @@ import { iconHtml, refreshIcons } from './icons.js';
 import { closeSidebar } from './sidebar.js';
 import { claimRightWorkbench, registerRightWorkbench, releaseRightWorkbench } from './right-workbench.js';
 import { copyToClipboard } from './utils.js';
-import { getTerminalTheme } from './theme.js';
+import { getTerminalTheme, getDockedTerminalTheme } from './theme.js';
 import { getTerminalFontFamily, getTerminalFontSize, onTerminalFontChange } from './terminal-prefs.js';
 import { createKeyToolbar } from './terminal-toolbar.js';
 
@@ -358,7 +358,7 @@ function createXtermForTab(tab) {
     cursorBlink: true,
     fontSize: getTerminalFontSize(),
     fontFamily: getTerminalFontFamily(),
-    theme: getTerminalTheme(),
+    theme: (store.get('rightWorkbenchDockedOwners') || []).indexOf('terminal') !== -1 ? getDockedTerminalTheme() : getTerminalTheme(),
   });
 
   var fitAddon = null;
@@ -843,6 +843,7 @@ export function sendTerminalCommand(command) {
 }
 
 export function setTerminalTheme(xtermTheme) {
+  if ((store.get('rightWorkbenchDockedOwners') || []).indexOf('terminal') !== -1) xtermTheme = getDockedTerminalTheme();
   for (var tab of tabs.values()) {
     if (tab.xterm) {
       tab.xterm.options.theme = xtermTheme;
@@ -850,6 +851,10 @@ export function setTerminalTheme(xtermTheme) {
   }
 }
 
+store.subscribe(function (state, previous) {
+  if ((state.rightWorkbenchDockedOwners || []).includes('terminal') !== (previous.rightWorkbenchDockedOwners || []).includes('terminal')) setTerminalTheme(getTerminalTheme());
+});
+
 // Live font update: applies family/size to every open shell terminal
 // and refits each (cell dimensions change with font size, so cols/rows
 // shift too). Hooked via onTerminalFontChange below.

package/lib/public/modules/theme.js

@@ -267,6 +267,11 @@ export function getTerminalTheme() {
   return computeTerminalTheme(getTheme(DEFAULT_DARK_THEME_ID) || defaultDarkFallback);
 }
 
+export function getDockedTerminalTheme() {
+  var theme = getCurrentTheme();
+  return Object.assign({}, computeTerminalTheme(theme), { background: '#' + theme.base00 });
+}
+
 export function getMermaidThemeVars() {
   return computeMermaidVars(getCurrentTheme());
 }

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

@@ -1,4 +1,5 @@
 // New execution pairs keep the Driver's current presentation; Workers live in pills.
+import { showCreatedWorkerViewer } from './split-view-workers.js';
 import { store } from './store.js';
 import { getWs } from './ws-ref.js';
 import { getCachedSessions } from './sidebar-sessions.js';
@@ -24,6 +25,7 @@ function reconcileCreatedWorkerPresentation() {
     (session.ownerId || null) === (state.myUserId || null); });
   if (state.sessionListProjectSlug !== state.currentSlug || !driver || !driver.sessionOriginId || !getWs() || getWs().readyState !== 1) return false;
   store.set({ createdWorkerPresentation: null });
+  showCreatedWorkerViewer(pending.group);
   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; });

package/lib/public/modules/workspace-assignment-card.js

@@ -11,6 +11,7 @@ function textElement(tag, className, text) {
 }
 
 function statusLabel(status) {
+  if (status === "queued") return "Queued for Driver";
   if (status === "starting") return "Starting";
   if (status === "running") return "In progress";
   if (status === "completed") return "Completed";
@@ -22,7 +23,7 @@ function statusLabel(status) {
 
 function sendDecision(assignment, action, surface, context, card, opener) {
   var ws = getWs();
-  if (!ws || ws.readyState !== 1 || !assignment || assignment.status !== "proposed") return false;
+  if (!ws || ws.readyState !== 1 || !assignment || (assignment.status !== "proposed" && !(assignment.status === "queued" && action === "cancel"))) return false;
   pendingFocus[assignment.assignmentId] = opener || null;
   card.setAttribute("aria-busy", "true");
   var buttons = card.querySelectorAll("button");
@@ -79,10 +80,12 @@ export function createWorkspaceAssignmentCard(assignment, options) {
   card.appendChild(header);
 
   var targetText = followUp
-    ? "Continue “" + (assignment.targetSessionTitle || "Existing session") + "” in " + (assignment.projectTitle || assignment.projectSlug || "project")
+    ? "Send instructions to “" + (assignment.targetSessionTitle || "Existing session") + "” in " + (assignment.projectTitle || assignment.projectSlug || "project")
     : "New private session in " + (assignment.projectTitle || assignment.projectSlug || "project");
   var target = textElement("p", "workspace-assignment-target", targetText);
   card.appendChild(target);
+  if (assignment.status === 'queued' && assignment.deliveryState === 'queued') card.appendChild(textElement('p', 'workspace-assignment-result', 'Approved. Waiting for the Driver to finish its current turn.'));
+  else if (assignment.deliveryState === 'accepted' && assignment.status === 'running') card.appendChild(textElement('p', 'workspace-assignment-result', 'Accepted by the Driver runtime. Completion is still pending.'));
   card.appendChild(textElement("p", "workspace-assignment-task", assignment.task || ""));
 
   if (assignment.error) {
@@ -94,17 +97,17 @@ export function createWorkspaceAssignmentCard(assignment, options) {
 
   var actions = document.createElement("div");
   actions.className = "workspace-assignment-actions";
-  if (assignment.status === "proposed") {
-    var cancel = textElement("button", "workspace-assignment-action secondary", "Cancel");
+  if (assignment.status === "proposed" || assignment.status === "queued") {
+    var cancel = textElement("button", "workspace-assignment-action secondary", assignment.status === "queued" ? "Cancel queued update" : "Cancel");
     cancel.type = "button";
-    cancel.setAttribute("aria-label", "Cancel project assignment");
+    cancel.setAttribute("aria-label", assignment.status === "queued" ? "Cancel queued update" : "Cancel project assignment");
     cancel.addEventListener("click", function () { sendDecision(assignment, "cancel", config.home ? "home" : "project", config.context, card, cancel); });
     var approve = textElement("button", "workspace-assignment-action primary", "Approve");
     approve.type = "button";
     approve.setAttribute("aria-label", followUp ? "Approve follow-up in " + (assignment.targetSessionTitle || "the target session") : "Approve new session in " + (assignment.projectTitle || assignment.projectSlug || "the target project"));
     approve.addEventListener("click", function () { sendDecision(assignment, "approve", config.home ? "home" : "project", config.context, card, approve); });
     actions.appendChild(cancel);
-    actions.appendChild(approve);
+    if (assignment.status === "proposed") actions.appendChild(approve);
   } else {
     var resolved = textElement("span", "workspace-assignment-resolved", statusLabel(assignment.status));
     resolved.setAttribute("role", "status");