clay-server 4.0.0-beta.8 → 4.0.0

package/lib/public/modules/sidebar-sessions.js

@@ -16,6 +16,12 @@ import { VENDOR_AVATARS, VENDOR_NAMES, VENDOR_ORDER, VENDOR_HOMEPAGES, isExperim
 import { openGroup, separateGroup } from './split-view.js';
 import { groupedSessionIds } from './split-group-helpers.js';
 import { openPairDialog } from './split-pair-ui.js';
+import {
+  hierarchyItemMatches,
+  prepareSidebarHierarchy,
+  renderDesktopDriverHierarchy,
+  renderDesktopOrphanHierarchy
+} from './sidebar-session-hierarchy.js';
 
 
 // --- Session state ---
@@ -49,8 +55,8 @@ function sendSessionBookmark(sessionId, bookmarked) {
 }
 
 function compareSessionListItems(a, b) {
-  var aData = a && a.type === "session" ? a.data : a;
-  var bData = b && b.type === "session" ? b.data : b;
+  var aData = a && (a.type === "session" || a.type === "driver-hierarchy") ? a.data : a;
+  var bData = b && (b.type === "session" || b.type === "driver-hierarchy") ? b.data : b;
   var aBookmarked = !!(aData && aData.bookmarked);
   var bBookmarked = !!(bData && bData.bookmarked);
   if (aBookmarked !== bBookmarked) return aBookmarked ? -1 : 1;
@@ -236,6 +242,14 @@ function collectItemSessionIds(item) {
   if (item.type === "split-group" && Array.isArray(item.members)) {
     return item.members.map(function (session) { return session.id; });
   }
+  if (item.type === "driver-hierarchy" && item.root) {
+    var hierarchyIds = [item.root.driver.id];
+    for (var j = 0; j < item.root.workers.length; j++) hierarchyIds.push(item.root.workers[j].id);
+    return hierarchyIds;
+  }
+  if (item.type === "orphan-workers" && Array.isArray(item.workers)) {
+    return item.workers.map(function (session) { return session.id; });
+  }
   return [];
 }
 
@@ -683,7 +697,7 @@ function showSessionCtxMenu(anchorBtn, sessionId, title, cliSid, sessionData) {
 
   // Session visibility toggle (only the session owner can change)
   if (store.get('isMultiUserMode') && sessionData && sessionData.ownerId && sessionData.ownerId === store.get('myUserId')) {
-    var currentVis = (sessionData && sessionData.sessionVisibility) || "shared";
+    var currentVis = (sessionData && sessionData.sessionVisibility) || "private";
     var isPrivate = currentVis === "private";
     var visItem = document.createElement("button");
     visItem.className = "session-ctx-item";
@@ -1246,10 +1260,12 @@ function renderLoopRun(parentGk, startedAtKey, sessions, isRalph) {
 
 // --- Session item rendering ---
 
-function renderSessionItem(s) {
+function renderSessionItem(s, options) {
+  var itemOptions = options || {};
   var el = document.createElement("div");
   var isMatch = searchMatchIds !== null && searchMatchIds.has(s.id);
   el.className = "session-item" + (s.active ? " active" : "") + (isMatch ? " search-match" : "");
+  if (itemOptions.worker) el.classList.add("session-worker-item");
   el.dataset.sessionId = s.id;
 
   // Keep agent identity separate from the title so each row has a stable
@@ -1274,13 +1290,20 @@ function renderSessionItem(s) {
   if (s.loop && s.loop.source === "debate") {
     textHtml += '<span class="session-debate-icon" title="Debate">' + iconHtml("mic") + '</span>';
   }
-  if (store.get('isMultiUserMode') && s.sessionVisibility === "private") {
-    textHtml += '<span class="session-private-icon" title="Private session">' + iconHtml("lock") + '</span>';
+  if (store.get('isMultiUserMode') && s.sessionVisibility === "shared") {
+    textHtml += '<span class="session-shared-icon" title="Shared session" aria-label="Shared session">' + iconHtml("users") + '</span>';
   }
   textHtml += highlightMatch(s.title || "New Session", searchQuery);
   textSpan.innerHTML = textHtml;
   el.appendChild(textSpan);
 
+  if (itemOptions.worker) {
+    var workerLabel = document.createElement("span");
+    workerLabel.className = "session-worker-generation" + (itemOptions.current ? " current" : "");
+    workerLabel.textContent = itemOptions.current ? "Current" : (s.workerGeneration ? "Gen " + s.workerGeneration : "Worker");
+    el.appendChild(workerLabel);
+  }
+
   var ageText = relativeTime(s.lastActivity || 0);
   if (ageText) {
     var age = document.createElement("span");
@@ -1325,7 +1348,7 @@ function renderSessionItem(s) {
 
   // Presence avatars (multi-user)
   renderPresenceAvatars(el, String(s.id));
-  setupSessionDragHandlers(el, s);
+  if (!itemOptions.worker) setupSessionDragHandlers(el, s);
 
   return el;
 }
@@ -1376,8 +1399,29 @@ function renderSplitGroupItem(group, members) {
 
 // --- Main session list ---
 
+// Fingerprint of the last completed render: the whole session payload plus the
+// two store values this render also reads. Nothing is cherry-picked, so the
+// guard can only skip a frame that is byte-identical to what is already on
+// screen. A re-render triggered by other state (sessions === null) always
+// runs and resets the fingerprint afterwards.
+var lastRenderFingerprint = null;
+
+function sessionRenderFingerprint(sessions) {
+  try {
+    return JSON.stringify([sessions, store.get('splitGroups') || [], store.get('splitPanes') || null]);
+  } catch (e) {
+    return null;
+  }
+}
+
 export function renderSessionList(sessions) {
-  if (sessions) cachedSessions = sessions;
+  if (sessions) {
+    // A reconnect and a streaming turn both re-send this list unchanged;
+    // rebuilding the sidebar for an identical frame is what made it flicker.
+    var incoming = sessionRenderFingerprint(sessions);
+    if (incoming !== null && incoming === lastRenderFingerprint) return;
+    cachedSessions = sessions;
+  }
 
   // If mobile chat sheet is open, refresh it
   if (refreshMobileChatSheet) refreshMobileChatSheet();
@@ -1388,12 +1432,17 @@ export function renderSessionList(sessions) {
   // Group by loopId + date so all runs of the same task on the same day are merged
   var splitGroups = store.get('splitGroups') || [];
   var groupedIds = groupedSessionIds(splitGroups);
+  var hierarchy = prepareSidebarHierarchy(cachedSessions);
+  var hierarchyByDriver = hierarchy.byDriver;
+  var hierarchySessionIds = hierarchy.sessionIds;
+  hierarchySessionIds.forEach(function (id) { groupedIds.delete(id); });
   var sessionsById = new Map();
   for (var si = 0; si < cachedSessions.length; si++) sessionsById.set(cachedSessions[si].id, cachedSessions[si]);
   var loopGroups = {}; // groupKey -> [sessions]
   var normalSessions = [];
   for (var i = 0; i < cachedSessions.length; i++) {
     var s = cachedSessions[i];
+    if (s.sessionRole === "worker") continue;
     if (groupedIds.has(s.id)) continue;
     if (s.loop && s.loop.loopId && s.loop.role === "crafting" && s.loop.source !== "ralph" && s.loop.source !== "debate") {
       // Task crafting sessions live in the scheduler calendar, not the main list (except debate)
@@ -1412,13 +1461,21 @@ export function renderSessionList(sessions) {
   // Build virtual items: normal sessions + one entry per loop group (using latest child's lastActivity)
   var items = [];
   for (var j = 0; j < normalSessions.length; j++) {
-    items.push({ type: "session", data: normalSessions[j], lastActivity: normalSessions[j].lastActivity || 0 });
+    var driverRoot = hierarchyByDriver.get(normalSessions[j].id);
+    if (driverRoot) items.push({ type: "driver-hierarchy", root: driverRoot, data: driverRoot.driver, lastActivity: driverRoot.lastActivity });
+    else items.push({ type: "session", data: normalSessions[j], lastActivity: normalSessions[j].lastActivity || 0 });
+  }
+  if (hierarchy.orphans.length) {
+    var orphanActivity = 0;
+    for (var oi = 0; oi < hierarchy.orphans.length; oi++) orphanActivity = Math.max(orphanActivity, hierarchy.orphans[oi].lastActivity || 0);
+    items.push({ type: "orphan-workers", workers: hierarchy.orphans, lastActivity: orphanActivity });
   }
   for (var sg = 0; sg < splitGroups.length; sg++) {
     var splitGroup = splitGroups[sg];
     var leftMember = sessionsById.get(splitGroup.members[0]);
     var rightMember = sessionsById.get(splitGroup.members[1]);
     if (!leftMember || !rightMember) continue;
+    if (hierarchySessionIds.has(leftMember.id) || hierarchySessionIds.has(rightMember.id)) continue;
     items.push({
       type: "split-group",
       group: splitGroup,
@@ -1449,9 +1506,10 @@ export function renderSessionList(sessions) {
     if (item.type === "session" && item.data && !isSessionVisibleBySearch(item.data.id)) {
       continue;
     }
+    if ((item.type === "driver-hierarchy" || item.type === "orphan-workers") && !hierarchyItemMatches(item, searchMatchIds)) continue;
     if (item.type === "split-group" && searchMatchIds !== null &&
         !searchMatchIds.has(item.members[0].id) && !searchMatchIds.has(item.members[1].id)) continue;
-    if (item.type === "session" && item.data && item.data.bookmarked) {
+    if ((item.type === "session" || item.type === "driver-hierarchy") && item.data && item.data.bookmarked) {
       bookmarkedItems.push(item);
     } else {
       regularItems.push(item);
@@ -1468,7 +1526,8 @@ export function renderSessionList(sessions) {
     favoritesContainer.appendChild(emptyHint);
   }
   for (var bi = 0; bi < bookmarkedItems.length; bi++) {
-    favoritesContainer.appendChild(renderSessionItem(bookmarkedItems[bi].data));
+    if (bookmarkedItems[bi].type === "driver-hierarchy") favoritesContainer.appendChild(renderDesktopDriverHierarchy(bookmarkedItems[bi].root, renderSessionItem, function () { renderSessionList(null); }, searchMatchIds));
+    else favoritesContainer.appendChild(renderSessionItem(bookmarkedItems[bi].data));
   }
 
   var divider = document.createElement("div");
@@ -1508,6 +1567,10 @@ export function renderSessionList(sessions) {
       }
     } else if (item.type === "split-group") {
       regularContainer.appendChild(renderSplitGroupItem(item.group, item.members));
+    } else if (item.type === "driver-hierarchy") {
+      regularContainer.appendChild(renderDesktopDriverHierarchy(item.root, renderSessionItem, function () { renderSessionList(null); }, searchMatchIds));
+    } else if (item.type === "orphan-workers") {
+      regularContainer.appendChild(renderDesktopOrphanHierarchy(item.workers, renderSessionItem, function () { renderSessionList(null); }, searchMatchIds));
     } else {
       regularContainer.appendChild(renderSessionItem(item.data));
     }
@@ -1516,6 +1579,9 @@ export function renderSessionList(sessions) {
   refreshIcons();
   if (updatePageTitle) updatePageTitle();
   syncHeaderSearchUi();
+  // Recorded from the sessions actually rendered, so a null-argument re-render
+  // driven by other state refreshes the fingerprint rather than stranding it.
+  lastRenderFingerprint = sessionRenderFingerprint(cachedSessions);
 }
 
 // --- Search results ---

package/lib/public/modules/sidebar.js

@@ -1,4 +1,4 @@
-import { closeArchive } from './sticky-notes.js';
+import { closeNotesBrowser } from './sticky-notes-browser.js';
 import { closeScheduler } from './scheduler.js';
 import { initSidebarSessions } from './sidebar-sessions.js';
 import { focusFileTree } from './filebrowser.js';
@@ -23,7 +23,7 @@ export function syncResizeHandles() {
 }
 
 export function dismissOverlayPanels() {
-  closeArchive();
+  closeNotesBrowser();
   closeScheduler();
 }
 
@@ -119,7 +119,10 @@ export function initSidebar(_ctx) {
 
   // --- Panel switch (sessions / files / projects) ---
   var fileBrowserBtn = ctx.$("file-browser-btn");
-  var gitBtn = ctx.$("git-sidebar-btn");
+  // Git has no tool-palette tile. The repository placard's More control is
+  // the entry point into the same panel, with the same lifecycle.
+  var gitPlacard = ctx.$("git-placard");
+  var gitPlacardMore = ctx.$("git-placard-more");
   var projectsPanel = ctx.$("sidebar-panel-projects");
   var sessionsPanel = ctx.$("sidebar-panel-sessions");
   var filesPanel = ctx.$("sidebar-panel-files");
@@ -216,14 +219,23 @@ export function initSidebar(_ctx) {
       });
     });
   }
-  if (gitBtn) {
-    gitBtn.addEventListener("click", function () {
+  if (gitPlacardMore) {
+    gitPlacardMore.addEventListener("click", function () {
       if (gitPanel && !gitPanel.classList.contains("hidden")) {
         hideGitPanel(function () { showSessionsPanel(); });
       }
       else showGitPanel();
     });
   }
+  if (gitPlacard && gitPlacardMore) {
+    // Clicking the block itself is a pointer convenience only; it forwards to
+    // the More control so every listener bound there runs exactly once, and
+    // the keyboard path stays the single focusable button.
+    gitPlacard.addEventListener("click", function (event) {
+      if (event.target.closest("#git-placard-more")) return;
+      gitPlacardMore.click();
+    });
+  }
   if (gitPanelClose) {
     gitPanelClose.addEventListener("click", function () {
       hideGitPanel(function () { showSessionsPanel(); });

package/lib/public/modules/split-group-helpers.js

@@ -16,3 +16,11 @@ export function findSplitGroup(groups, memberIds) {
   }
   return null;
 }
+
+export function isConfiguredWorker(groups, sessionId) {
+  var list = groups || [];
+  for (var i = 0; i < list.length; i++) {
+    if (list[i].pair && list[i].pair.workerId === sessionId) return true;
+  }
+  return false;
+}

package/lib/public/modules/split-pair-ui.js

@@ -3,6 +3,8 @@ import { getWs } from './ws-ref.js';
 import { VENDOR_AVATARS } from './app-rendering.js';
 import { buildAgentVendorSelect, fillAgentModels, buildAgentEffortSelect, fillAgentEffort } from './agent-config-selects.js';
 import { showToast } from './utils.js';
+import { getCachedSessions } from './sidebar-sessions.js';
+import { appendWorkerRuntime } from './split-worker-runtime.js';
 
 var pairDialog = null;
 // Set when the dialog was opened via "Add Split Worker" on an existing session:
@@ -190,8 +192,7 @@ export function handlePairCreated(msg) {
 
 // --- Worker-pane composer notice -------------------------------------
 // Shown inside a pane iframe while ITS session is processing a delegated
-// turn: typing is allowed (queueing is correct behavior), the bar just
-// makes it visible that a new message joins the Driver's turn.
+// turn. Identifies the Driver responsible for the current task.
 var workerNoticeEl = null;
 
 export function showWorkerDelegationNotice(driverTitle) {
@@ -205,7 +206,7 @@ export function showWorkerDelegationNotice(driverTitle) {
     inputArea.insertBefore(workerNoticeEl, inputWrapper);
   }
   var who = driverTitle ? "“" + driverTitle + "”" : "the Driver";
-  workerNoticeEl.textContent = "Following an instruction from " + who + " — messages you send now join the same turn.";
+  workerNoticeEl.textContent = "Working on a task from " + who + ".";
   workerNoticeEl.classList.add("visible");
 }
 
@@ -239,8 +240,10 @@ export function syncPairChrome(host, split) {
   for (var i = 0; i < groups.length; i++) {
     if (groups[i].id === split.groupId) { group = groups[i]; break; }
   }
-  var oldBadges = host.querySelectorAll(".split-pair-role, .split-pair-live, .split-pair-set-driver");
+  var oldBadges = host.querySelectorAll(".split-pair-role, .split-pair-live, .split-pair-set-driver, .split-worker-runtime");
   for (var bi = 0; bi < oldBadges.length; bi++) oldBadges[bi].remove();
+  var runtimeHeaders = host.querySelectorAll(".has-worker-runtime");
+  for (var ri = 0; ri < runtimeHeaders.length; ri++) runtimeHeaders[ri].classList.remove("has-worker-runtime");
   host.classList.remove("split-delegating", "split-direction-right", "split-direction-left");
   if (!group) return;
   var headers = host.querySelectorAll(".split-pane-header");
@@ -272,6 +275,14 @@ export function syncPairChrome(host, split) {
       var title = header.querySelector(".split-pane-title");
       var access = header.querySelector(".split-pane-full-access");
       header.insertBefore(badge, access ? access.nextSibling : (title ? title.nextSibling : null));
+      if (!isDriver) {
+        var sessions = getCachedSessions() || [];
+        var workerSession = null;
+        for (var wi = 0; wi < sessions.length; wi++) {
+          if (sessions[wi].id === sessionId) { workerSession = sessions[wi]; break; }
+        }
+        appendWorkerRuntime(header, workerSession);
+      }
     })(split.panes[pi].sessionId, headers[pi]);
   }
   var active = (store.get('splitDelegations') || {})[group.id];

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

@@ -7,7 +7,7 @@ import { iconHtml, refreshIcons } from './icons.js';
 import { detachTuiView } from './session-tui-view.js';
 import { formatTokens } from './app-panels.js';
 import { VENDOR_AVATARS, VENDOR_NAMES } from './app-rendering.js';
-import { groupedSessionIds, findSplitGroup } from './split-group-helpers.js';
+import { groupedSessionIds, findSplitGroup, isConfiguredWorker } from './split-group-helpers.js';
 import { showConfirm } from './app-misc.js';
 import { syncPairChrome } from './split-pair-ui.js';
 import { presentMarkdownEdit } from './filebrowser.js';
@@ -159,7 +159,10 @@ export function syncPaneTitles() {
 function updatePaneFullAccessButton(button, session) {
   if (!button) return;
   var mode = session && (session.runtimeMode || session.mode || "gui");
-  var visible = !!session && !store.get('skipPermsEnabled') && mode === "gui";
+  var worker = !!session && isConfiguredWorker(store.get('splitGroups'), session.id);
+  // Permission policy belongs to the Driver. A configured Worker inherits it
+  // server-side and must not present a second, misleading control.
+  var visible = !!session && !worker && !store.get('skipPermsEnabled') && mode === "gui";
   var enabled = visible && session.permissionMode === "bypassPermissions";
   button.classList.toggle("hidden", !visible);
   button.classList.toggle("active", enabled);

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

@@ -0,0 +1,24 @@
+// Read the Worker's own session metadata, never the active Driver's settings.
+export function workerRuntimeLabels(session) {
+  var model = session && typeof session.model === "string" ? session.model : "";
+  var effort = session && typeof session.effort === "string" ? session.effort : "";
+  var level = effort === "xhigh" ? "X-High" : (effort ? effort.charAt(0).toUpperCase() + effort.slice(1) : "Default");
+  return { model: model || "Default model", thinking: "Thinking: " + level };
+}
+
+export function appendWorkerRuntime(header, session) {
+  var labels = workerRuntimeLabels(session);
+  var runtime = document.createElement("div");
+  runtime.className = "split-worker-runtime";
+  var model = document.createElement("span");
+  model.className = "split-worker-runtime-model";
+  model.textContent = labels.model;
+  model.title = "Model: " + labels.model;
+  var thinking = document.createElement("span");
+  thinking.className = "split-worker-runtime-thinking";
+  thinking.textContent = labels.thinking;
+  runtime.appendChild(model);
+  runtime.appendChild(thinking);
+  header.classList.add("has-worker-runtime");
+  header.appendChild(runtime);
+}

package/lib/public/modules/sticky-note-markdown.js

@@ -58,6 +58,11 @@ function nodeToMarkdown(node) {
       return "\n" + inner;
     case "P": return "\n" + inner;
     case "A": return node.getAttribute("href") || inner;
+    case "BUTTON":
+      if (node.classList.contains("clayos-log-link") && node.dataset && node.dataset.logRef) {
+        return "`" + node.dataset.logRef + "`";
+      }
+      return inner;
     case "SPAN":
       if (node.classList.contains("sn-check")) {
         return node.classList.contains("checked") ? "- [x]" : "- [ ]";