clay-server 4.0.0-beta.13 → 4.0.0-beta.15

package/lib/public/modules/sidebar-session-hierarchy.js

@@ -0,0 +1,206 @@
+// Shared Driver/Worker hierarchy behavior for the project desktop and mobile lists.
+
+import { iconHtml } from './icons.js';
+import { store } from './store.js';
+import { buildSessionHierarchy } from './session-hierarchy.js';
+
+var expansionBySurface = {
+  desktop: new Map(),
+  mobile: new Map(),
+};
+
+export function prepareSidebarHierarchy(sessions) {
+  var hierarchy = buildSessionHierarchy(sessions);
+  var byDriver = new Map();
+  var sessionIds = new Set();
+  for (var i = 0; i < hierarchy.roots.length; i++) {
+    var root = hierarchy.roots[i];
+    if (!root.workers.length) continue;
+    byDriver.set(root.driver.id, root);
+    sessionIds.add(root.driver.id);
+    for (var j = 0; j < root.workers.length; j++) sessionIds.add(root.workers[j].id);
+  }
+  for (var k = 0; k < hierarchy.orphans.length; k++) sessionIds.add(hierarchy.orphans[k].id);
+  return {
+    byDriver: byDriver,
+    orphans: hierarchy.orphans,
+    sessionIds: sessionIds,
+  };
+}
+
+export function currentWorkerIds() {
+  var result = new Set();
+  var groups = store.get('splitGroups') || [];
+  for (var i = 0; i < groups.length; i++) {
+    if (groups[i].pair && Number.isInteger(groups[i].pair.workerId)) result.add(groups[i].pair.workerId);
+  }
+  return result;
+}
+
+export function hierarchyItemMatches(item, matchIds) {
+  if (matchIds === null) return true;
+  if (item.type === "driver-hierarchy") {
+    if (matchIds.has(item.root.driver.id)) return true;
+    for (var i = 0; i < item.root.workers.length; i++) {
+      if (matchIds.has(item.root.workers[i].id)) return true;
+    }
+    return false;
+  }
+  if (item.type === "orphan-workers") {
+    for (var j = 0; j < item.workers.length; j++) {
+      if (matchIds.has(item.workers[j].id)) return true;
+    }
+    return false;
+  }
+  return true;
+}
+
+function expanded(surface, key, workers, matchIds) {
+  var state = expansionBySurface[surface];
+  if (state.has(key)) return state.get(key);
+  return defaultHierarchyExpanded(workers, matchIds, currentWorkerIds());
+}
+
+export function defaultHierarchyExpanded(workers, matchIds, current) {
+  var currentIds = current || new Set();
+  for (var i = 0; i < workers.length; i++) {
+    if (workers[i].active || currentIds.has(workers[i].id) || (matchIds !== null && matchIds.has(workers[i].id))) return true;
+  }
+  return false;
+}
+
+function toggle(surface, key, wasExpanded, rerender) {
+  expansionBySurface[surface].set(key, !wasExpanded);
+  rerender();
+}
+
+function visibleWorker(worker, driver, matchIds) {
+  return matchIds === null || matchIds.has(worker.id) || matchIds.has(driver.id);
+}
+
+export function renderDesktopDriverHierarchy(root, renderSession, rerender, matchIds) {
+  var wrapper = document.createElement("div");
+  wrapper.className = "session-driver-hierarchy";
+  var key = "driver:" + root.driver.id;
+  var isExpanded = expanded("desktop", key, root.workers, matchIds);
+  var childrenId = "session-workers-" + root.driver.id;
+  var row = renderSession(root.driver);
+  row.classList.add("session-driver-item");
+  var control = document.createElement("button");
+  control.type = "button";
+  control.className = "session-driver-toggle";
+  control.setAttribute("aria-expanded", String(isExpanded));
+  control.setAttribute("aria-controls", childrenId);
+  control.setAttribute("aria-label", (isExpanded ? "Collapse" : "Expand") + " Workers for " + (root.driver.title || "New Session"));
+  control.innerHTML = iconHtml("chevron-right");
+  control.addEventListener("click", function (event) {
+    event.preventDefault();
+    event.stopPropagation();
+    toggle("desktop", key, isExpanded, rerender);
+  });
+  row.insertBefore(control, row.firstChild);
+  wrapper.appendChild(row);
+
+  var children = document.createElement("div");
+  children.id = childrenId;
+  children.className = "session-worker-children";
+  children.setAttribute("role", "group");
+  children.setAttribute("aria-label", "Workers for " + (root.driver.title || "New Session"));
+  children.hidden = !isExpanded;
+  var current = currentWorkerIds();
+  for (var i = 0; i < root.workers.length; i++) {
+    if (!visibleWorker(root.workers[i], root.driver, matchIds)) continue;
+    children.appendChild(renderSession(root.workers[i], { worker: true, current: current.has(root.workers[i].id) }));
+  }
+  wrapper.appendChild(children);
+  return wrapper;
+}
+
+export function renderDesktopOrphanHierarchy(workers, renderSession, rerender, matchIds) {
+  var wrapper = document.createElement("div");
+  wrapper.className = "session-driver-hierarchy session-orphan-hierarchy";
+  var isExpanded = expanded("desktop", "orphan", workers, matchIds);
+  var control = document.createElement("button");
+  control.type = "button";
+  control.className = "session-orphan-toggle";
+  control.setAttribute("aria-expanded", String(isExpanded));
+  control.setAttribute("aria-controls", "session-orphan-workers");
+  control.innerHTML = iconHtml("chevron-right") + '<span class="session-orphan-title">Unavailable Driver</span><span class="session-worker-count">' + workers.length + "</span>";
+  control.addEventListener("click", function () { toggle("desktop", "orphan", isExpanded, rerender); });
+  wrapper.appendChild(control);
+
+  var children = document.createElement("div");
+  children.id = "session-orphan-workers";
+  children.className = "session-worker-children";
+  children.setAttribute("role", "group");
+  children.setAttribute("aria-label", "Workers whose Driver is unavailable");
+  children.hidden = !isExpanded;
+  var current = currentWorkerIds();
+  for (var i = 0; i < workers.length; i++) {
+    if (matchIds !== null && !matchIds.has(workers[i].id)) continue;
+    children.appendChild(renderSession(workers[i], { worker: true, current: current.has(workers[i].id) }));
+  }
+  wrapper.appendChild(children);
+  return wrapper;
+}
+
+export function renderMobileDriverHierarchy(root, renderSession, rerender) {
+  var wrapper = document.createElement("div");
+  wrapper.className = "mobile-driver-hierarchy";
+  var key = "driver:" + root.driver.id;
+  var isExpanded = expanded("mobile", key, root.workers, null);
+  var childrenId = "mobile-session-workers-" + root.driver.id;
+  var header = document.createElement("div");
+  header.className = "mobile-driver-header";
+  var control = document.createElement("button");
+  control.type = "button";
+  control.className = "mobile-driver-toggle";
+  control.setAttribute("aria-expanded", String(isExpanded));
+  control.setAttribute("aria-controls", childrenId);
+  control.setAttribute("aria-label", (isExpanded ? "Collapse" : "Expand") + " Workers for " + (root.driver.title || "New Session"));
+  control.innerHTML = iconHtml("chevron-right");
+  control.addEventListener("click", function () { toggle("mobile", key, isExpanded, rerender); });
+  header.appendChild(control);
+  header.appendChild(renderSession(root.driver));
+  wrapper.appendChild(header);
+
+  var children = document.createElement("div");
+  children.id = childrenId;
+  children.className = "mobile-worker-children";
+  children.setAttribute("role", "group");
+  children.setAttribute("aria-label", "Workers for " + (root.driver.title || "New Session"));
+  children.hidden = !isExpanded;
+  var current = currentWorkerIds();
+  for (var i = 0; i < root.workers.length; i++) {
+    children.appendChild(renderSession(root.workers[i], { worker: true, current: current.has(root.workers[i].id) }));
+  }
+  wrapper.appendChild(children);
+  return wrapper;
+}
+
+export function renderMobileOrphanHierarchy(workers, renderSession, rerender) {
+  var wrapper = document.createElement("div");
+  wrapper.className = "mobile-driver-hierarchy mobile-orphan-hierarchy";
+  var isExpanded = expanded("mobile", "orphan", workers, null);
+  var control = document.createElement("button");
+  control.type = "button";
+  control.className = "mobile-orphan-toggle";
+  control.setAttribute("aria-expanded", String(isExpanded));
+  control.setAttribute("aria-controls", "mobile-orphan-workers");
+  control.innerHTML = iconHtml("chevron-right") + "<span>Unavailable Driver</span><span>" + workers.length + "</span>";
+  control.addEventListener("click", function () { toggle("mobile", "orphan", isExpanded, rerender); });
+  wrapper.appendChild(control);
+
+  var children = document.createElement("div");
+  children.id = "mobile-orphan-workers";
+  children.className = "mobile-worker-children";
+  children.setAttribute("role", "group");
+  children.setAttribute("aria-label", "Workers whose Driver is unavailable");
+  children.hidden = !isExpanded;
+  var current = currentWorkerIds();
+  for (var i = 0; i < workers.length; i++) {
+    children.appendChild(renderSession(workers[i], { worker: true, current: current.has(workers[i].id) }));
+  }
+  wrapper.appendChild(children);
+  return wrapper;
+}

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 [];
 }
 
@@ -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
@@ -1281,6 +1297,13 @@ function renderSessionItem(s) {
   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;
 }
@@ -1409,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)
@@ -1433,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,
@@ -1470,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);
@@ -1489,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");
@@ -1529,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));
     }

package/lib/public/modules/worker-proposal-state.js

@@ -0,0 +1,16 @@
+export function workerProposalSelection(msg) {
+  var hasSelection = typeof msg.selectedVendor === "string" ||
+    typeof msg.selectedModel === "string" || typeof msg.selectedEffort === "string";
+  return {
+    selected: hasSelection,
+    vendor: hasSelection ? (msg.selectedVendor || "") : (msg.recommendedVendor || ""),
+    model: hasSelection ? (msg.selectedModel || "") : (msg.recommendedModel || ""),
+    effort: hasSelection ? (msg.selectedEffort || "") : (msg.recommendedEffort || "medium"),
+  };
+}
+
+export function syncWorkerProposalSelection(msg, sync) {
+  var selection = workerProposalSelection(msg);
+  if (selection.selected && typeof sync === "function") sync(selection);
+  return selection;
+}

package/lib/public/modules/worker-proposal.js

@@ -2,6 +2,7 @@ import { getWs } from './ws-ref.js';
 import { addToMessages, scrollToBottom, VENDOR_AVATARS, VENDOR_NAMES } from './app-rendering.js';
 import { effortLevelsFor, effortDisplayName } from './app-panels.js';
 import { iconHtml, refreshIcons } from './icons.js';
+import { workerProposalSelection, syncWorkerProposalSelection } from './worker-proposal-state.js';
 
 function optionValue(entry) {
   if (typeof entry === "string") return entry;
@@ -27,7 +28,7 @@ function planSteps(plan) {
   }).filter(Boolean).slice(0, 8);
 }
 
-function buildVendorSelect(msg) {
+function buildVendorSelect(msg, preferred) {
   var select = document.createElement("select");
   select.className = "worker-proposal-select worker-proposal-vendor";
   var installed = (msg.options && msg.options.installedVendors) || [];
@@ -37,7 +38,7 @@ function buildVendorSelect(msg) {
     option.textContent = VENDOR_NAMES[installed[i]] || installed[i];
     select.appendChild(option);
   }
-  if (installed.indexOf(msg.recommendedVendor) !== -1) select.value = msg.recommendedVendor;
+  if (installed.indexOf(preferred) !== -1) select.value = preferred;
   return select;
 }
 
@@ -98,16 +99,30 @@ function statusLabel(status) {
   if (status === "interrupted") return "Interrupted";
   if (status === "declined") return "Continuing here";
   if (status === "error") return "Needs attention";
-  return "Suggested by Fable";
+  return "Awaiting your choice";
+}
+
+function decisionLabel(status, autoAccepted) {
+  if (autoAccepted) return "Driver recommendation auto-accepted under Full auto";
+  if (status === "pending") return "Runtime choice remains with you";
+  if (status === "declined") return "Runtime proposal declined by user";
+  return "Runtime configuration accepted by user";
 }
 
 function applyState(card, msg) {
   var status = msg.status || "pending";
   card.dataset.status = status;
-  if (msg.autoApproved) card.dataset.autoApproved = "true";
-  var autoApproved = card.dataset.autoApproved === "true";
+  if (msg.autoAccepted || msg.autoApproved) card.dataset.autoAccepted = "true";
+  if (msg.autoAccepted === false || msg.autoApproved === false) card.dataset.autoAccepted = "false";
+  var autoAccepted = card.dataset.autoAccepted === "true";
+  syncWorkerProposalSelection(msg, card._syncWorkerProposalSelection);
   var badge = card.querySelector(".worker-proposal-status");
-  if (badge) badge.textContent = statusLabel(status) + (autoApproved ? " · auto-approved" : "");
+  if (badge) badge.textContent = statusLabel(status) + (autoAccepted ? " · auto-accepted" : "");
+  var decision = card.querySelector(".worker-proposal-decision");
+  if (decision) {
+    decision.textContent = decisionLabel(status, autoAccepted);
+    decision.classList.toggle("automatic", autoAccepted);
+  }
   var error = card.querySelector(".worker-proposal-error");
   if (error) {
     error.textContent = msg.error || "";
@@ -120,7 +135,7 @@ function applyState(card, msg) {
   }
   setControlsDisabled(card, status !== "pending");
   var actions = card.querySelector(".worker-proposal-actions");
-  if (actions) actions.classList.toggle("hidden", autoApproved);
+  if (actions) actions.classList.toggle("hidden", autoAccepted);
 }
 
 function sendDecision(card, accepted) {
@@ -150,10 +165,12 @@ export function renderWorkerProposal(msg) {
   card.className = "worker-proposal-card";
   card.dataset.proposalId = msg.proposalId;
   card.dataset.status = msg.status || "pending";
+  var runtimeSelection = workerProposalSelection(msg);
 
   var header = document.createElement("div");
   header.className = "worker-proposal-header";
-  header.innerHTML = '<div class="worker-proposal-mark">' + iconHtml("git-branch") + '</div><div class="worker-proposal-heading"><span class="worker-proposal-kicker">DRIVER / WORKER</span><strong>Let a Worker handle the execution</strong></div><span class="worker-proposal-status"></span>';
+  var replacing = msg.action === "replace";
+  header.innerHTML = '<div class="worker-proposal-mark">' + iconHtml("git-branch") + '</div><div class="worker-proposal-heading"><span class="worker-proposal-kicker">DRIVER / SPLIT WORKER</span><strong>' + (replacing ? "Configure a replacement Split Worker" : "Configure a Split Worker") + '</strong></div><span class="worker-proposal-status"></span>';
   card.appendChild(header);
 
   var summary = document.createElement("p");
@@ -173,12 +190,24 @@ export function renderWorkerProposal(msg) {
     card.appendChild(plan);
   }
 
+  if (msg.recommendationRationale) {
+    var rationale = document.createElement("div");
+    rationale.className = "worker-proposal-rationale";
+    var rationaleLabel = document.createElement("span");
+    rationaleLabel.textContent = "Driver's recommendation rationale";
+    var rationaleText = document.createElement("p");
+    rationaleText.textContent = msg.recommendationRationale;
+    rationale.appendChild(rationaleLabel);
+    rationale.appendChild(rationaleText);
+    card.appendChild(rationale);
+  }
+
   var config = document.createElement("div");
   config.className = "worker-proposal-config";
   var vendorField = document.createElement("label");
   vendorField.className = "worker-proposal-field worker-proposal-vendor-field";
   vendorField.innerHTML = '<span>Worker</span><span class="worker-proposal-vendor-control"><img alt=""></span>';
-  var vendorSelect = buildVendorSelect(msg);
+  var vendorSelect = buildVendorSelect(msg, runtimeSelection.vendor);
   vendorField.querySelector(".worker-proposal-vendor-control").appendChild(vendorSelect);
   config.appendChild(vendorField);
   var modelField = document.createElement("label");
@@ -194,6 +223,10 @@ export function renderWorkerProposal(msg) {
   config.appendChild(effortField);
   card.appendChild(config);
 
+  var decision = document.createElement("div");
+  decision.className = "worker-proposal-decision";
+  card.appendChild(decision);
+
   function syncVendor(preferredModel, preferredEffort) {
     var vendor = vendorSelect.value;
     var avatar = vendorField.querySelector("img");
@@ -201,12 +234,16 @@ export function renderWorkerProposal(msg) {
     fillModels(modelSelect, vendor, msg, preferredModel);
     fillEffort(card, vendor, modelSelect.value, msg, preferredEffort);
   }
+  card._syncWorkerProposalSelection = function (selection) {
+    if (selection.vendor && vendorSelect.value !== selection.vendor) vendorSelect.value = selection.vendor;
+    syncVendor(selection.model, selection.effort);
+  };
   vendorSelect.addEventListener("change", function () { syncVendor("", "medium"); });
   modelSelect.addEventListener("change", function () {
     var active = card.querySelector(".worker-proposal-effort-btn.active");
     fillEffort(card, vendorSelect.value, modelSelect.value, msg, active ? active.dataset.effort : "medium");
   });
-  syncVendor(msg.recommendedModel || "", msg.recommendedEffort || "medium");
+  syncVendor(runtimeSelection.model, runtimeSelection.effort);
 
   var error = document.createElement("div");
   error.className = "worker-proposal-error hidden";
@@ -220,12 +257,12 @@ export function renderWorkerProposal(msg) {
   var decline = document.createElement("button");
   decline.type = "button";
   decline.className = "worker-proposal-action secondary";
-  decline.textContent = "Continue here";
+  decline.textContent = replacing ? "Keep current Worker" : "Continue here";
   decline.addEventListener("click", function () { sendDecision(card, false); });
   var accept = document.createElement("button");
   accept.type = "button";
   accept.className = "worker-proposal-action primary";
-  accept.innerHTML = iconHtml("panel-right-open") + "<span>Run with Split Worker</span>";
+  accept.innerHTML = iconHtml("panel-right-open") + "<span>" + (replacing ? "Replace Split Worker" : "Run with Split Worker") + "</span>";
   accept.addEventListener("click", function () { sendDecision(card, true); });
   actions.appendChild(decline);
   actions.appendChild(accept);

package/lib/sdk-bridge.js

@@ -605,14 +605,12 @@ function createSDKBridge(opts) {
       return { behavior: "allow", updatedInput: input };
     }
 
-    // Auto-approve the visible Driver/Split Worker pair tools, including the
-    // Driver's answer to a Worker permission request. The pair is
-    // user-constructed and both panes are on screen; every one of these tools
-    // is structurally confined to the caller's own exact pair and re-checks
-    // Driver eligibility, ownership and the live pair inside its handler, so
-    // the whitelist grants no authority the handler would not already demand.
-    // A prompt on each hop would reinstate exactly the approval gate the
-    // autonomous lifecycle exists to remove.
+    // Auto-approve the non-mutating configuration proposal and the visible
+    // Driver/Split Worker pair tools, including the Driver's answer to a Worker
+    // permission request. Creation and replacement still require a separate
+    // human decision in the proposal card; skip-permissions is never treated as
+    // that product choice. Every handler is confined to the caller's exact
+    // session/pair and re-checks eligibility, ownership and live identity.
     //
     // spawn_sessions is deliberately absent: it creates arbitrary sessions.
     //
@@ -628,6 +626,7 @@ function createSDKBridge(opts) {
     //                              can legitimately arrive bare.
     var PAIR_MCP_PREFIX = "mcp__clay-sessions__";
     var pairMcpTools = {
+      propose_worker: true,
       send_to_partner: true,
       read_partner: true,
       partner_status: true,
@@ -638,6 +637,7 @@ function createSDKBridge(opts) {
       respond_to_worker_permission: true,
     };
     var pairDynamicTools = {
+      propose_worker: true,
       partner_status: true,
       replace_partner: true,
       interrupt_partner: true,
@@ -664,6 +664,14 @@ function createSDKBridge(opts) {
       return { behavior: "allow", updatedInput: input };
     }
 
+    // Project Logs are exact-session, project-bound tools whose authority is
+    // enforced again by the server binding. Canonical changes are append-only
+    // revisions, and the surface exposes no destructive delete operation, so
+    // a second provider permission prompt adds no additional safety.
+    if (toolName.indexOf("mcp__clay-logs__") === 0) {
+      return { behavior: "allow", updatedInput: input };
+    }
+
     // This tool only prepares a read-only UI projection for the document the
     // agent is about to edit. The subsequent Edit/Write keeps its own normal
     // permission behavior.

package/lib/sdk-message-processor.js

@@ -3,6 +3,8 @@ var yoke = require("./yoke");
 var backgroundTaskTiming = require("./background-task-timing");
 var sessionTitlePolicy = require("./session-title-policy");
 
+var OVERLOAD_RETRY_LIMIT = 3;
+
 function attachMessageProcessor(ctx) {
   var sm = ctx.sm;
   var send = ctx.send;
@@ -487,6 +489,8 @@ function attachMessageProcessor(ctx) {
       }
 
     } else if (parsed.yokeType === "result") {
+      var overloadAbortRequested = !!session._overloadAbortRequested;
+      session._overloadAbortRequested = false;
       session.blocks = {};
       session.sentToolResults = {};
       session.pendingPermissions = {};
@@ -532,7 +536,9 @@ function attachMessageProcessor(ctx) {
         session._awaitingTurnResult = false;
         session._queuedTurnCount = 0;
         onProcessingChanged();
-        sendAndRecord(session, { type: "error", text: "Claude error: " + execError });
+        if (!overloadAbortRequested) {
+          sendAndRecord(session, { type: "error", text: "Claude error: " + execError });
+        }
         sendAndRecord(session, { type: "done", code: 1 });
         sm.broadcastSessionList();
         return;
@@ -819,9 +825,33 @@ function attachMessageProcessor(ctx) {
       }
 
     } else if (parsed.yokeType === "api_retry") {
-      // Transient retry notification, show in UI but don't persist in history
-      var retryText = parsed.message || parsed.error || "Retrying API request...";
-      sendToSession(session, { type: "system_info", text: retryText });
+      // The Claude SDK may otherwise paint one persistent red error for every
+      // retry and remain busy for many minutes. Show one transient status, and
+      // stop a repeatedly overloaded turn after a small bounded number of
+      // attempts so the user regains control and can retry or change models.
+      var apiRetryAttempt = parsed.attempt || 1;
+      if (parsed.error === "overloaded") {
+        if (apiRetryAttempt === 1) {
+          session._overloadAbortRequested = false;
+          sendToSession(session, {
+            type: "system_info",
+            text: "The model is overloaded. Retrying briefly...",
+          });
+        }
+        if (apiRetryAttempt >= OVERLOAD_RETRY_LIMIT && !session._overloadAbortRequested) {
+          session._overloadAbortRequested = true;
+          sendAndRecord(session, {
+            type: "error",
+            text: "The model remained overloaded after " + apiRetryAttempt +
+              " attempts, so this turn was stopped. Try again or choose another model.",
+          });
+          if (session.abortController && typeof session.abortController.abort === "function") {
+            try { session.abortController.abort(); } catch (e) {}
+          }
+        }
+      } else if (apiRetryAttempt === 1) {
+        sendToSession(session, { type: "system_info", text: "The model request failed temporarily. Retrying..." });
+      }
 
     } else if (parsed.yokeType === "commands_changed") {
       // Mid-session command list change: rebuild the union with skills (same as