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

package/lib/public/modules/vendor-login.js

@@ -1,3 +1,4 @@
+import { personalLoginCurrent } from './personal-provider-context.js';
 // vendor-login.js - Vendor login (auth_required) recovery flow.
 //
 // The server owns the login terminal (see lib/project-vendor-login.js): exactly
@@ -16,6 +17,7 @@ import { refreshIcons, iconHtml } from './icons.js';
 import { openTuiModal, closeTuiModal, getTuiModalTerminalId } from './tui-attention.js';
 import { forwardPaneAuthRequired } from './pane-bridge.js';
 import { openLoginBrowser, closeLoginBrowser } from './vendor-login-browser.js';
+import { escapeHtml } from './utils.js';
 
 // vendor -> { terminalId, startedAt } as last broadcast by the server.
 var activeFlows = Object.create(null);
@@ -45,6 +47,17 @@ function currentProjectSlug() {
   return "";
 }
 
+function workerContextMatches(target) {
+  return !!target && target.slug === store.get('currentSlug') && target.selectedSessionId === store.get('activeSessionId') &&
+    target.selectedOrigin === store.get('sessionOriginId') && target.socketGeneration === store.get('projectSplitViewSocketGeneration');
+}
+
+function forgetWorkerRequest(vendor) {
+  var requests = Object.assign({}, store.get('workerVendorLoginRequests') || {});
+  delete requests[vendor];
+  store.set({ workerVendorLoginRequests: requests });
+}
+
 // The banner surface belongs to the notification center. Query it rather than
 // importing app-notifications so the dependency stays one-directional
 // (app-notifications -> vendor-login).
@@ -80,8 +93,8 @@ function showLoginBanner(opts) {
     '<div class="notif-banner-icon">' + iconHtml(opts.icon || "check-circle") + '</div>' +
     '<div class="notif-banner-body">' +
       '<div class="notif-banner-project">CLAY</div>' +
-      '<div class="notif-banner-title">' + opts.title + '</div>' +
-      '<div class="notif-banner-text">' + opts.text + '</div>' +
+      '<div class="notif-banner-title">' + escapeHtml(opts.title) + '</div>' +
+      '<div class="notif-banner-text">' + escapeHtml(opts.text) + '</div>' +
     '</div>' +
     '<button class="notif-banner-close">' + iconHtml("x") + '</button>';
 
@@ -107,7 +120,7 @@ function showLoginStartedBanner(vendor) {
   showLoginBanner({
     icon: "check-circle",
     title: vendorDisplayName(vendor) + " login started",
-    text: "Finish sign-in in the window below. Clay reconnects your sessions automatically.",
+    text: "Finish sign-in below, then explicitly retry your task.",
     onDismiss: function () { cancelVendorLogin(vendor); },
   });
 }
@@ -159,17 +172,28 @@ function closeModalForVendor(vendor, terminalId) {
 export function requestVendorLogin(vendor, opts) {
   var options = opts || {};
   var target = vendor || "claude";
+  if (options.personalRequestId && !personalLoginCurrent({personalRequestId:options.personalRequestId})) return false;
   if (options.auto && (activeFlows[target] || pendingStarts[target])) return false;
 
   var ws = getWs();
   if (!ws || ws.readyState !== 1) return false;
+  if (options.workerAuthRequestId) {
+    var requests = Object.assign({}, store.get('workerVendorLoginRequests') || {});
+    requests[target] = { requestId: options.workerAuthRequestId, slug: store.get('currentSlug'),
+      selectedSessionId: store.get('activeSessionId'), selectedOrigin: store.get('sessionOriginId'),
+      socketGeneration: store.get('projectSplitViewSocketGeneration') };
+    store.set({ workerVendorLoginRequests: requests });
+  }
 
+  if (options.personalRequestId) store.set({personalProviderSigningIn:target});
   pendingStarts[target] = true;
   ws.send(JSON.stringify({
     type: "vendor_login_start",
     vendor: target,
     auto: !!options.auto,
-    sessionId: options.sessionId || store.get('activeSessionId') || null,
+    sessionId: options.personalRequestId ? null : options.sessionId || store.get('activeSessionId') || null,
+    personalRequestId: options.personalRequestId || null,
+    workerAuthRequestId: options.workerAuthRequestId || null,
     mode: options.mode || ((((store.get("vendorInfo") || {})[target] || {}).browserLoginSupported === true) ? "browser" : "terminal"),
   }));
   showLoginStartedBanner(target);
@@ -180,6 +204,7 @@ export function cancelVendorLogin(vendor) {
   var target = vendor || modalVendor;
   if (!target) return;
   var flow = activeFlows[target];
+  forgetWorkerRequest(target);
   var browser = store.get('vendorLoginBrowser');
   var browserId = flow && flow.browserId || (browser && browser.vendor === target ? browser.browserId : null);
   if (browser && browser.vendor === target) closeLoginBrowser();
@@ -189,7 +214,7 @@ export function cancelVendorLogin(vendor) {
   if (modalVendor === target) closeModalInternally();
   var ws = getWs();
   if (ws && ws.readyState === 1) {
-    ws.send(JSON.stringify({ type: "vendor_login_cancel", vendor: target, browserId: browserId }));
+    ws.send(JSON.stringify({ type: "vendor_login_cancel", vendor: target, browserId: browserId, workerAuthRequestId: flow && flow.workerAuthRequestId, personalRequestId: store.get('personalProviderSigningIn') === target ? store.get('personalProviderRevision') : null }));
   }
 }
 
@@ -205,12 +230,24 @@ export function autoStartLoginIfNeeded(msg) {
   if (store.get('paneMode')) {
     return forwardPaneAuthRequired({
       vendor: msg.vendor || "claude",
-      sessionId: store.get('activeSessionId') || null,
+      sessionId: msg.sessionId || store.get('activeSessionId') || null,
+      workerAuthRequestId: msg.workerAuthRequestId || null,
+      loginCommand: msg.loginCommand,
+      canAutoLogin: msg.canAutoLogin,
     });
   }
+  if (msg.canAutoLogin === false || msg.loginCommand === '') {
+    showLoginErrorBanner(msg.vendor, 'Automatic sign-in is unavailable. Sign in manually on the server, then explicitly retry the task.');
+    return false;
+  }
   var vendor = msg.vendor || "claude";
   if (activeFlows[vendor] || pendingStarts[vendor]) return false;
-  return requestVendorLogin(vendor, { auto: true, sessionId: msg.sessionId || null });
+  return requestVendorLogin(vendor, { auto: true, sessionId: msg.sessionId || null, workerAuthRequestId: msg.workerAuthRequestId || null });
+}
+
+export function handleWorkerAuthRequired(msg) {
+  if (!msg || store.get('replayingHistory') || msg.slug !== store.get('currentSlug') || store.get('paneMode')) return false;
+  return autoStartLoginIfNeeded(msg);
 }
 
 // ========================================================
@@ -218,10 +255,12 @@ export function autoStartLoginIfNeeded(msg) {
 // ========================================================
 
 export function handleVendorLoginReady(msg) {
-  if (!msg || typeof msg.terminalId !== "number") return;
+  if (!msg || typeof msg.terminalId !== "number" || !personalLoginCurrent(msg)) return;
   var vendor = msg.vendor || "claude";
+  var request = (store.get('workerVendorLoginRequests') || {})[vendor];
+  if (msg.workerAuthRequestId && (!workerContextMatches(request) || request.requestId !== msg.workerAuthRequestId)) return;
   delete pendingStarts[vendor];
-  activeFlows[vendor] = { terminalId: msg.terminalId, startedAt: Date.now(), browserId: msg.browserId || null };
+  activeFlows[vendor] = { terminalId: msg.terminalId, startedAt: Date.now(), browserId: msg.browserId || null, workerAuthRequestId: msg.workerAuthRequestId || null };
   if (msg.browserId) {
     openLoginBrowser(msg);
     return;
@@ -246,10 +285,12 @@ export function handleVendorLoginReady(msg) {
 
 export function handleVendorLoginState(msg) {
   if (!msg) return;
+  pendingStarts = Object.create(null);
   var next = Object.create(null);
   var flows = msg.flows || [];
   for (var i = 0; i < flows.length; i++) {
-    next[flows[i].vendor] = { terminalId: flows[i].terminalId, startedAt: flows[i].startedAt, browserId: flows[i].browserId || null };
+    if (!personalLoginCurrent(flows[i])) continue;
+    next[flows[i].vendor] = { terminalId: flows[i].terminalId, startedAt: flows[i].startedAt, browserId: flows[i].browserId || null, workerAuthRequestId: flows[i].workerAuthRequestId || null };
     delete pendingStarts[flows[i].vendor];
   }
 
@@ -271,8 +312,11 @@ export function handleVendorLoginState(msg) {
 }
 
 export function handleAuthRefreshed(msg) {
-  if (!msg) return;
+  if (!msg || !personalLoginCurrent(msg)) return;
   var vendor = msg.vendor || "claude";
+  var request = (store.get('workerVendorLoginRequests') || {})[vendor];
+  if (msg.workerAuthRequestId && (!workerContextMatches(request) || request.requestId !== msg.workerAuthRequestId)) return;
+  forgetWorkerRequest(vendor);
   var browser = store.get('vendorLoginBrowser');
   if (browser && browser.vendor === vendor) closeLoginBrowser();
   var flow = activeFlows[vendor];
@@ -284,8 +328,9 @@ export function handleAuthRefreshed(msg) {
 }
 
 export function handleVendorLoginError(msg) {
-  if (!msg) return;
+  if (!msg || !personalLoginCurrent(msg)) return;
   var vendor = msg.vendor || "claude";
+  forgetWorkerRequest(vendor);
   var browser = store.get('vendorLoginBrowser');
   if (browser && browser.vendor === vendor) closeLoginBrowser();
   delete pendingStarts[vendor];
@@ -304,3 +349,18 @@ export function requestVendorLoginState() {
 export function getActiveLoginFlow(vendor) {
   return activeFlows[vendor] || null;
 }
+
+store.subscribe(function (state, previous) {
+  var requests = state.workerVendorLoginRequests || {};
+  Object.keys(requests).forEach(function (vendor) {
+    if (workerContextMatches(requests[vendor]) && state.connected !== false) return;
+    if (requests[vendor].slug === state.currentSlug && requests[vendor].socketGeneration === state.projectSplitViewSocketGeneration) cancelVendorLogin(vendor);
+    else forgetWorkerRequest(vendor);
+  });
+  if (state.connected !== false || previous.connected === false) return;
+  pendingStarts = Object.create(null);
+  activeFlows = Object.create(null);
+  closeLoginBrowser();
+  closeModalInternally();
+  clearLoginBanners();
+});

package/lib/public/modules/view-workspace-state.js

@@ -81,7 +81,7 @@ export function prepareViewMutation(type, message) {
   if (type === 'project_split_view_create' || type === 'project_split_view_update') {
     if (!message.workspace) message.workspace = recomposeWorkspace(view && view.workspace, message.tree, message.activeSessionOriginId);
     message.tree = sessionTree(message.workspace);
-    message.active = true;
+    message.active = message.active !== false;
   }
   if (type === 'project_split_view_move') {
     var target = views.find(function (item) { return item.id === message.targetViewId; });

package/lib/public/modules/worker-activity-indicator.js

@@ -0,0 +1,49 @@
+import { store } from './store.js';
+import { iconHtml } from './icons.js';
+
+export function validActivity(value) {
+  return !!(value && typeof value.epoch === 'string' && value.epoch.length <= 64 && Number.isSafeInteger(value.sequence) && value.sequence > 0 &&
+    Number.isSafeInteger(value.queryGeneration) && value.queryGeneration >= 0 && Number.isFinite(value.timestamp) && value.timestamp > 0 &&
+    typeof value.summary === 'string' && value.summary.length <= 80);
+}
+export function observeWorkerActivity(key, activity, live) {
+  var all = Object.assign({}, store.get('workerActivityIndicators') || {}), previous = all[key];
+  if (activity && !validActivity(activity)) return null;
+  if (previous && activity && previous.cursor && activity.epoch === previous.cursor.epoch &&
+      (activity.sequence <= previous.cursor.sequence || activity.queryGeneration < previous.cursor.queryGeneration)) return null;
+  // Initial subscriptions/reconnects establish a baseline; never animate cached activity.
+  var fresh = !!(live && previous && activity);
+  if (previous && previous.activity && activity && previous.activity.epoch !== activity.epoch) fresh = false;
+  var generationChanged = previous && previous.activity && (!activity || previous.activity.queryGeneration !== activity.queryGeneration);
+  var angle = previous && !generationChanged ? previous.angle : 0, now = performance.now();
+  var nextStepAt = previous && !generationChanged ? previous.nextStepAt : 0;
+  if (fresh && now >= nextStepAt) { angle += 30; nextStepAt = now + 350; }
+  all[key] = { processing: previous && previous.processing, fresh: fresh, cursor: activity || previous && previous.cursor || null, activity: activity || null, angle: angle, nextStepAt: nextStepAt };
+  store.set({ workerActivityIndicators: all });
+  return fresh;
+}
+export function setWorkerActivityRuntime(key, processing) {
+  var all = Object.assign({}, store.get('workerActivityIndicators') || {}), previous = all[key];
+  if (!previous || typeof processing !== 'boolean' || previous.processing === processing) return;
+  all[key] = Object.assign({}, previous, { processing: processing }); store.set({ workerActivityIndicators: all });
+}
+export function syncWorkerActivityIndicator(chip, worker) {
+  var icon = chip.querySelector('.split-view-worker-loop'); if (!icon) return;
+  var state = (store.get('workerActivityIndicators') || {})[chip.dataset.messagePreview];
+  var angle = state ? state.angle : 0;
+  var scope = chip.dataset.messagePreview + ':' + (state && state.activity ? state.activity.epoch + ':' + state.activity.queryGeneration : 'unknown');
+  if (icon.dataset.activityScope !== scope) {
+    var initial = icon.dataset.activityScope == null ? angle : state && state.fresh ? 0 : angle;
+    icon.style.transition = 'none'; icon.style.transform = 'rotate(' + initial + 'deg)';
+    void icon.offsetWidth;
+    icon.style.transition = ''; icon.dataset.activityScope = scope;
+  }
+  icon.style.transform = 'rotate(' + angle + 'deg)';
+  var processing = state && typeof state.processing === 'boolean' ? state.processing : worker && worker.isProcessing;
+  icon.dataset.state = !store.get('connected') ? 'disconnected' : processing ? 'working' : 'ready';
+  icon.setAttribute('aria-label', !store.get('connected') ? 'Disconnected' : processing ? 'Worker running; motion indicates received activity' : 'Worker idle');
+}
+export function createWorkerActivityIndicator() {
+  var icon = document.createElement('span'); icon.className = 'split-view-worker-loop';
+  icon.innerHTML = iconHtml('refresh-cw'); icon.setAttribute('role', 'img'); return icon;
+}

package/lib/public/modules/worker-message-previews.js

@@ -1,39 +1,75 @@
 import { store } from './store.js';
 import { getWs } from './ws-ref.js';
-import { bindAgentMessageBubble, messagePreviewKey, rememberAgentMessage } from './agent-message-bubbles.js';
+import { getCachedSessions } from './sidebar-sessions.js';
+import { bindAgentMessageBubble, messagePreviewKey, rememberAgentMessage, rememberAgentActivity, forgetAgentMessage } from './agent-message-bubbles.js';
+import { observeWorkerActivity, syncWorkerActivityIndicator, setWorkerActivityRuntime } from './worker-activity-indicator.js';
 
 var scheduled = false;
+function key(target) { return messagePreviewKey('worker', [target.parentSessionOriginId, target.workerSessionOriginId, target.generation]); }
+function exactWorker(target) {
+  var list = getCachedSessions() || [];
+  var driver = list.find(function (item) { return item.sessionOriginId === target.parentSessionOriginId && item.sessionRole === 'driver' && (item.ownerId || null) === (store.get('myUserId') || null); });
+  return driver && list.find(function (item) { return item.sessionOriginId === target.workerSessionOriginId && item.sessionRole === 'worker' &&
+    item.parentAvailable && item.parentSessionId === driver.id && item.workerGeneration === target.generation && !item.hidden && (item.ownerId || null) === (driver.ownerId || null); });
+}
 function targets() {
   var found = [];
+  if (document.hidden) return found;
   document.querySelectorAll('.split-view-worker-chip[data-worker-parent]').forEach(function (chip) {
     if (!chip.getClientRects().length || chip.closest('[hidden], .split-pane-cached')) return;
     var target = { parentSessionOriginId: chip.dataset.workerParent, workerSessionOriginId: chip.dataset.workerOrigin, generation: Number(chip.dataset.workerGeneration) };
-    bindAgentMessageBubble(chip, messagePreviewKey('worker', [target.parentSessionOriginId, target.workerSessionOriginId, target.generation]));
+    var worker = exactWorker(target); if (!worker) return;
+    bindAgentMessageBubble(chip, key(target)); syncWorkerActivityIndicator(chip, worker);
     found.push(target);
   });
   return found.slice(0, 32);
 }
+function cleanup(list) {
+  var keep = new Set(list.map(key)), all = Object.assign({}, store.get('workerActivityIndicators') || {}), changed = false;
+  Object.keys(all).forEach(function (id) { if (!keep.has(id)) { delete all[id]; forgetAgentMessage(id); changed = true; } });
+  if (changed) store.set({ workerActivityIndicators: all });
+}
 export function syncWorkerMessagePreviews() {
   if (scheduled || store.get('paneMode')) return;
   scheduled = true;
   requestAnimationFrame(function () {
-    scheduled = false; var socket = getWs(); if (!store.get('connected') || !socket || socket.readyState !== 1) return;
-    var list = targets(), signature = JSON.stringify([store.get('currentSlug'), store.get('myUserId'), store.get('projectSplitViewSocketGeneration'), list]);
-    var previous = store.get('workerMessagePreviewSubscription'); if (previous && previous.signature === signature) return;
-    var requestId = crypto.randomUUID(); store.set({ workerMessagePreviewSubscription: { requestId: requestId, signature: signature, targets: list } });
+    scheduled = false; var socket = getWs(), connected = store.get('connected') && socket && socket.readyState === 1;
+    var list = connected ? targets() : []; cleanup(list);
+    if (!connected) { store.set({ workerMessagePreviewSubscription: null }); return; }
+    var signature = JSON.stringify([store.get('currentSlug'), store.get('myUserId'), store.get('projectSplitViewSocketGeneration'), list]);
+    var previous = store.get('workerMessagePreviewSubscription'); if (previous && previous.signature === signature && previous.socket === socket) return;
+    var requestId = crypto.randomUUID();
+    store.set({ workerMessagePreviewSubscription: { requestId: requestId, signature: signature, targets: list, socket: socket,
+      slug: store.get('currentSlug'), owner: store.get('myUserId'), socketGeneration: store.get('projectSplitViewSocketGeneration') } });
     socket.send(JSON.stringify({ type: 'split_worker_preview_request', requestId: requestId, targets: list }));
   });
 }
 export function handleWorkerMessagePreview(message) {
-  var state = store.get('workerMessagePreviewSubscription'); if (!state || !store.get('connected') || message.requestId !== state.requestId) return;
+  var state = store.get('workerMessagePreviewSubscription');
+  if (!state || !store.get('connected') || document.hidden || message.requestId !== state.requestId || state.socket !== getWs() ||
+      state.slug !== store.get('currentSlug') || state.owner !== store.get('myUserId') || state.socketGeneration !== store.get('projectSplitViewSocketGeneration')) return;
   if (!state.targets.some(function (target) { return target.parentSessionOriginId === message.parentSessionOriginId && target.workerSessionOriginId === message.workerSessionOriginId && target.generation === message.generation; })) return;
-  var chip = Array.from(document.querySelectorAll('.split-view-worker-chip[data-worker-parent]')).find(function (chip) { return chip.dataset.workerParent === message.parentSessionOriginId && chip.dataset.workerOrigin === message.workerSessionOriginId && Number(chip.dataset.workerGeneration) === message.generation; });
-  if (!chip || !chip.getClientRects().length) return;
-  rememberAgentMessage(messagePreviewKey('worker', [message.parentSessionOriginId, message.workerSessionOriginId, message.generation]), message.preview, message.live === true);
+  var worker = exactWorker(message); if (!worker) return;
+  var chips = Array.from(document.querySelectorAll('.split-view-worker-chip[data-worker-parent]')).filter(function (chip) {
+    return chip.dataset.workerParent === message.parentSessionOriginId && chip.dataset.workerOrigin === message.workerSessionOriginId &&
+      Number(chip.dataset.workerGeneration) === message.generation && chip.getClientRects().length && !chip.closest('[hidden], .split-pane-cached');
+  });
+  if (!chips.length) return;
+  var id = key(message), observed = observeWorkerActivity(id, message.activity || null, message.live === true);
+  var current = (store.get('workerActivityIndicators') || {})[id];
+  if (observed !== null || current && current.cursor && message.activity && current.cursor.epoch === message.activity.epoch && current.cursor.sequence === message.activity.sequence && current.cursor.queryGeneration === message.activity.queryGeneration) setWorkerActivityRuntime(id, message.isProcessing);
+  if (observed !== null) rememberAgentActivity(id, message.activity || null, message.vendor, message.observedAt);
+  rememberAgentMessage(id, message.preview, message.live === true);
+  chips.forEach(function (chip) { syncWorkerActivityIndicator(chip, Object.assign({}, worker, { isProcessing: typeof message.isProcessing === 'boolean' ? message.isProcessing : worker.isProcessing })); });
 }
 store.subscribe(function (state, previous) {
-  if (state.splitPanes !== previous.splitPanes || state.projectSplitViewActiveId !== previous.projectSplitViewActiveId || state.paneBindingSessions !== previous.paneBindingSessions || state.connected !== previous.connected || state.projectSplitViewSocketGeneration !== previous.projectSplitViewSocketGeneration) syncWorkerMessagePreviews();
+  if (state.paneBindingSessions !== previous.paneBindingSessions && state.connected) targets().forEach(function (target) {
+    var worker = exactWorker(target); if (worker) setWorkerActivityRuntime(key(target), worker.isProcessing === true);
+  });
+  if (state.splitPanes !== previous.splitPanes || state.projectSplitViewActiveId !== previous.projectSplitViewActiveId || state.paneBindingSessions !== previous.paneBindingSessions ||
+      state.currentSlug !== previous.currentSlug || state.myUserId !== previous.myUserId || state.connected !== previous.connected || state.projectSplitViewSocketGeneration !== previous.projectSplitViewSocketGeneration) syncWorkerMessagePreviews();
 });
 var observer = new MutationObserver(syncWorkerMessagePreviews);
 function observe() { var root = document.getElementById('split-host'); if (root) observer.observe(root, { childList: true, subtree: true, attributes: true, attributeFilter: ['hidden'] }); }
 if (document.readyState === 'loading') document.addEventListener('DOMContentLoaded', observe); else observe();
+document.addEventListener('visibilitychange', syncWorkerMessagePreviews);

package/lib/public/modules/worker-stop-controls.js

@@ -0,0 +1,36 @@
+import { getWs } from './ws-ref.js';
+import { iconHtml } from './icons.js';
+
+export function syncWorkerForceStop(header, worker) {
+  var button = header.querySelector('[data-worker-force-stop]');
+  if (!button) return;
+  var support = worker && worker.forceTermination;
+  button.disabled = !support || support.supported !== true;
+  button.title = button.disabled ? support && support.reason || 'Force termination is not yet supported for this vendor' : 'Force stop Worker';
+  button.setAttribute('aria-label', 'Force stop Worker' + (button.disabled ? ': ' + button.title : ''));
+}
+
+// The caller revalidates the visible Driver and exact Worker on every action.
+export function appendWorkerStopControls(header, target) {
+  ['stop', 'force_stop'].forEach(function (type) {
+    var button = document.createElement('button'), pressed = null;
+    button.type = 'button'; button.className = 'worker-conversation-stop';
+    button.setAttribute('aria-label', type === 'stop' ? 'Stop Worker' : 'Force stop Worker');
+    button.title = type === 'stop' ? 'Stop Worker' : 'Force stop Worker';
+    button.innerHTML = iconHtml(type === 'stop' ? 'square' : 'octagon-x');
+    function stamp(value) { return value && JSON.stringify(value); }
+    button.addEventListener('pointerdown', function () { pressed = stamp(target()); });
+    button.addEventListener('keydown', function () { pressed = stamp(target()); });
+    button.addEventListener('click', function (event) {
+      event.stopPropagation();
+      var current = target(), ws = getWs();
+      if (button.disabled || type === 'force_stop' && (!current || !current.forceTermination || current.forceTermination.supported !== true)) return;
+      if (!current || !ws || ws.readyState !== 1 || pressed && pressed !== stamp(current)) return;
+      pressed = null;
+      ws.send(JSON.stringify({ type: type, sessionId: current.workerId, sessionOriginId: current.workerOriginId,
+        workerGeneration: current.generation, parentSessionOriginId: current.driverOriginId }));
+    });
+    if (type === 'force_stop') button.dataset.workerForceStop = 'true';
+    header.appendChild(button);
+  });
+}

package/lib/public/modules/worktree-controls.js

@@ -0,0 +1,86 @@
+import { store } from './store.js';
+import { showConfirm } from './app-misc.js';
+import { showToast } from './utils.js';
+
+async function request(stage, data) {
+  var result;
+  try {
+    var response = await fetch('/api/worktree-removal/' + stage, {
+      method: 'POST', headers: { 'Content-Type': 'application/json', 'X-Clay-Worktree-Control': '1' },
+      credentials: 'same-origin', body: JSON.stringify(data),
+    });
+    result = await response.json();
+  } catch (error) {
+    throw new Error(stage === 'execute' ? 'The removal outcome is unknown. Inspect the worktree directory and pending operation before trying again.' : 'Could not inspect the worktree. Try again when the server is reachable.');
+  }
+  if (!result.ok) {
+    var detail = result.filesDeleted ? ' The directory was removed, but cleanup is pending.' + (result.deleteBranch && !result.branchDeleted ? ' Local branch deletion was not confirmed.' : '') : '';
+    throw new Error((result.error || 'Worktree removal failed.') + detail + (result.operationId ? ' Operation: ' + result.operationId + '. Inspect it before retrying.' : ''));
+  }
+  return result;
+}
+export async function reviewWorktreeRemoval(slug, action, anchor) {
+  if (store.get('worktreeRemoval')) return;
+  var pending = { slug: slug, action: action, projectSlug: store.get('currentSlug'), sequence: 0, deleteBranch: false, preview: null };
+  store.set({ worktreeRemoval: pending });
+  function active() { return store.get('worktreeRemoval') === pending && store.get('currentSlug') === pending.projectSlug; }
+  function cleanup() {
+    document.getElementById('confirm-text').classList.remove('worktree-removal-review');
+    var option = document.getElementById('worktree-branch-option'); if (option) option.remove();
+    document.getElementById('confirm-ok').disabled = false;
+  }
+  function reset() {
+    if (store.get('worktreeRemoval') !== pending) return;
+    cleanup(); store.set({ worktreeRemoval: null });
+    if (anchor && anchor.isConnected) anchor.focus();
+  }
+  function description(preview) {
+    return (action === 'delete' ? 'Delete worktree' : 'Exclude worktree') + '\nBranch: ' + preview.branch + '\nDirectory: ' + preview.path + '\n\n' +
+      (action === 'delete' ? 'Stop its sessions and Workers, then remove this linked Git worktree and directory from disk. ' +
+        (preview.deleteBranch ? 'Then delete the local branch ' + preview.branch + '. If that step fails, the directory stays removed and cleanup remains pending.' : 'The local branch is kept.') +
+        ' Stored history is kept. Remote branches are untouched. Changed, untracked, ignored or locked worktrees cannot be deleted.' +
+        (preview.localBranch ? '' : '\nDetached HEAD has no local branch to delete.') :
+        'Stop its sessions and Workers and hide it from Clay Studio. The worktree directory, Git branch and stored history are kept. This exclusion is saved across restarts.');
+  }
+  try {
+    pending.preview = await request('preview', { slug: slug, action: action, deleteBranch: false });
+    if (!active()) { reset(); return; }
+    showConfirm(description(pending.preview), async function () {
+      if (!active() || !pending.preview || pending.preview.deleteBranch !== pending.deleteBranch) { reset(); return; }
+      var reviewed = pending.preview; cleanup();
+      try {
+        showToast('Closing worktree runtimes…', 'info');
+        var result = await request('execute', { token: reviewed.token, deleteBranch: pending.deleteBranch });
+        showToast(result.filesDeleted ? (result.branchDeleted ? 'Worktree directory and local branch deleted' : 'Worktree directory deleted; branch kept') : 'Worktree excluded; files kept', 'success');
+        if (store.get('currentSlug') === slug) window.location.assign('/p/' + encodeURIComponent(slug.split('--')[0]) + '/');
+      } catch (error) { showConfirm(error.message, function () {}, 'Close', false); }
+      finally { reset(); }
+    }, action === 'delete' ? 'Delete worktree' : 'Exclude', true, reset);
+    var container = document.getElementById('confirm-text');
+    container.classList.add('worktree-removal-review');
+    if (action === 'delete' && pending.preview.localBranch) {
+      var copy = document.createElement('span'); copy.textContent = description(pending.preview); container.textContent = ''; container.appendChild(copy);
+      var label = document.createElement('label'); label.id = 'worktree-branch-option'; label.className = 'worktree-branch-option';
+      var checkbox = document.createElement('input'); checkbox.type = 'checkbox'; checkbox.checked = false;
+      var caption = document.createElement('span'); caption.textContent = 'Also delete the local branch';
+      label.appendChild(checkbox); label.appendChild(caption); container.appendChild(label);
+      checkbox.addEventListener('change', async function () {
+        pending.deleteBranch = checkbox.checked; pending.preview = null; pending.sequence++;
+        var sequence = pending.sequence, choice = pending.deleteBranch;
+        document.getElementById('confirm-ok').disabled = true;
+        copy.textContent = 'Checking the selected local branch choice…'; store.set({ worktreeRemoval: pending });
+        try {
+          var refreshed = await request('preview', { slug: slug, action: action, deleteBranch: choice });
+          if (!active() || pending.sequence !== sequence) return;
+          if (refreshed.deleteBranch !== choice) throw new Error('The branch choice changed. Review again.');
+          pending.preview = refreshed; copy.textContent = description(refreshed);
+          document.getElementById('confirm-ok').disabled = false;
+        } catch (error) {
+          if (!active() || pending.sequence !== sequence) return;
+          copy.textContent = error.message + '\nUncheck the option to keep the local branch, or Cancel.';
+        }
+      });
+    }
+    var cancel = document.getElementById('confirm-cancel'); if (cancel) cancel.focus();
+  } catch (error) { reset(); showToast(error.message, 'error'); }
+}