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

package/lib/public/modules/projects-hub.js

@@ -0,0 +1,105 @@
+import { store } from './store.js';
+import { getWs } from './ws-ref.js';
+import { hideHomeHub, showHomeHub } from './app-home-hub.js';
+import { openAddProjectModal, switchProject } from './app-projects.js';
+import { openUserSettings } from './user-settings.js';
+import { rememberHomePrimarySurface, updateHomeSurfacePreference } from './home-surface.js';
+import { projectsHubContent } from './projects-hub-view.js';
+import { refreshIcons } from './icons.js';
+
+function root() { return document.getElementById('projects-hub'); }
+
+function render() {
+  var element = root();
+  if (!element || !store.get('projectsHubVisible')) return;
+  var html = projectsHubContent(store.snap());
+  if (store.get('projectsHubMarkup') === html) return;
+  store.set({ projectsHubMarkup: html });
+  var active = element.contains(document.activeElement) ? document.activeElement : null;
+  var action = active && (active.dataset.projectsAction || active.dataset.projectsMode || active.dataset.projectSlug);
+  element.innerHTML = html;
+  refreshIcons();
+  if (action) {
+    var buttons = element.querySelectorAll('button, a');
+    for (var i = 0; i < buttons.length; i++) {
+      if ((buttons[i].dataset.projectsAction || buttons[i].dataset.projectsMode || buttons[i].dataset.projectSlug) === action && !buttons[i].disabled) {
+        buttons[i].focus({ preventScroll: true });
+        break;
+      }
+    }
+  }
+}
+
+function focusHeading() {
+  if (root()) root().scrollTop = 0;
+  var title = document.getElementById('projects-title');
+  if (title) title.focus({ preventScroll: true });
+}
+
+export function showProjectsHub(fromHistory) {
+  hideHomeHub();
+  store.set({ projectsHubVisible: true, pendingHomeProjectSlug: null });
+  document.body.classList.add('projects-active');
+  root().classList.remove('hidden');
+  rememberHomePrimarySurface('projects');
+  if (!fromHistory && location.pathname !== '/projects') {
+    var method = document.documentElement.classList.contains('pwa-standalone') ? 'replaceState' : 'pushState';
+    history[method](null, '', '/projects');
+  }
+  render();
+  focusHeading();
+}
+
+export function hideProjectsHub() {
+  if (!store.get('projectsHubVisible')) return;
+  store.set({ projectsHubVisible: false, projectsShowGuide: false });
+  document.body.classList.remove('projects-active');
+  if (root()) root().classList.add('hidden');
+}
+
+export function completeProjectsOnboarding() {
+  if (store.get('onboardingStep') !== 'project') return;
+  updateHomeSurfacePreference({ onboardingStep: 'complete' });
+}
+
+function handleClick(event) {
+  var button = event.target.closest('[data-projects-action], [data-projects-mode], [data-project-slug]');
+  if (!button || button.disabled) return;
+  event.preventDefault();
+  var action = button.dataset.projectsAction;
+  if (action === 'home') { showHomeHub(); return; }
+  if (action === 'settings') { openUserSettings(); return; }
+  if (action === 'guide') { store.set({ projectsShowGuide: true }); render(); focusHeading(); return; }
+  if (action === 'start' || action === 'skip') {
+    store.set({ projectsShowGuide: false });
+    updateHomeSurfacePreference({ onboardingStep: 'project' });
+    if (action === 'skip') showHomeHub();
+    else { render(); focusHeading(); }
+    return;
+  }
+  var ws = getWs();
+  if (!ws || ws.readyState !== 1) return;
+  if (button.dataset.projectSlug) { switchProject(button.dataset.projectSlug); return; }
+  if (button.dataset.projectsMode) {
+    var permissions = store.get('permissions');
+    if (!store.get('projectsAccessLoaded') || (permissions && permissions.createProject !== true)) return;
+    openAddProjectModal(button.dataset.projectsMode);
+  }
+}
+
+export function initProjectsHub() {
+  root().addEventListener('click', handleClick);
+  store.subscribe(function (state, previous) {
+    if (state.projectsHubRestoreRequested && !previous.projectsHubRestoreRequested) {
+      showProjectsHub(true);
+      if (location.pathname === '/') history.replaceState(null, '', '/projects');
+      store.set({ projectsHubRestoreRequested: false });
+      return;
+    }
+    if (!state.projectsHubVisible) return;
+    if (state.projectsHubList !== previous.projectsHubList || state.projectListLoaded !== previous.projectListLoaded ||
+        state.homeSurfaceLoaded !== previous.homeSurfaceLoaded || state.onboardingStep !== previous.onboardingStep ||
+        state.projectsAccessLoaded !== previous.projectsAccessLoaded || state.permissions !== previous.permissions ||
+        state.connected !== previous.connected || state.pendingHomeProjectSlug !== previous.pendingHomeProjectSlug) render();
+  });
+}

package/lib/public/style.css

@@ -57,3 +57,5 @@
 @import url("css/tui-attention.css?v=20260829-terminal-canvas1");
 @import url("css/pwa-mobile.css?v=20260824f");
 @import url("css/avatar-imprints.css?v=20260829-imprints1");
+
+@import url("css/projects-hub.css");

package/lib/sdk-bridge.js

@@ -1,4 +1,5 @@
 const crypto = require("crypto");
+var codexQuestionGuidance = require("./yoke/user-input-guidance").codexQuestionGuidance;
 var fs = require("fs");
 var path = require("path");
 var execSync = require("child_process").execSync;
@@ -1054,6 +1055,10 @@ function createSDKBridge(opts) {
     console.log("[sdk-bridge] processQueryStream: starting for-await loop, vendor=" + (session.vendor || adapter.vendor));
     try {
       for await (var msg of myQueryInstance) {
+        // An old iterator may drain after Stop or after a replacement query starts.
+        if (!ownsQueryRuntime(session, myQueryInstance, myQueryGeneration)) continue;
+        if ((session.taskStopRequested || (myAbortController && myAbortController.signal.aborted))
+            && msg && msg.yokeType !== "error" && msg.yokeType !== "interrupted") continue;
         if (msg && msg.yokeType !== "text_delta" && msg.yokeType !== "thinking_delta" && msg.yokeType !== "tool_input_delta") {
           console.log("[sdk-bridge] processQueryStream: received event yokeType=" + msg.yokeType);
         }
@@ -1111,6 +1116,7 @@ function createSDKBridge(opts) {
             && session.cliSessionId === msg.sessionId
             && (!sm.sessions || typeof sm.sessions.get !== "function" || sm.sessions.get(session.localId) === session)) {
           if (codexCatalogCandidate.version) session.codexDynamicToolCatalogVersion = codexCatalogCandidate.version;
+          if (codexCatalogCandidate.userInputVersion) session.codexUserInputToolCatalogVersion = codexCatalogCandidate.userInputVersion;
           if (codexCatalogCandidate.issuesVersion) session.codexIssuesToolCatalogVersion = codexCatalogCandidate.issuesVersion;
           sm.saveSessionFile(session);
           codexCatalogCandidate = null;
@@ -1804,8 +1810,10 @@ function createSDKBridge(opts) {
     var activeLoopInterview = !isDriverOperatedSession(session) && !session.loopInterviewHandoff && !activeRun && !!loopInterview.activeInterviewId(session);
     var structuredInputSession = hasScheduleInterviewTool || activeLoopInterview || (!isDriverOperatedSession(session) && session.ralphCraftingMode === true && session.loop && session.loop.role === "crafting");
     var requestedUserInputMode = session.debateSetupMode || session.mateCreationMode ? "fallback" : "auto";
-    if (structuredInputSession) requestedUserInputMode = "fallback";
+    if (structuredInputSession || sessionAdapter.vendor === "codex") requestedUserInputMode = "fallback";
     var selectedUserInputMode = yoke.userInput.selectMode(sessionAdapter, requestedUserInputMode);
+    var recoverCodexQuestionTools = sessionAdapter.vendor === "codex" && !!session.cliSessionId
+      && Number(session.codexUserInputToolCatalogVersion || 0) < 1 && queryContextAvailable();
     function structuredInputContextAvailable() {
       if (!queryContextAvailable()) return false;
       // A schedule-triggered fallback shares the schedule feature's live
@@ -1928,7 +1936,10 @@ function createSDKBridge(opts) {
       // would strip the driver session down to the two-sentence pair preset.
       // Adapters map this to their additive mechanism (claude: preset+append,
       // codex/kiro: prepend to the first message).
-      appendSystemPrompt: typeof opts.getSessionSystemPrompt === "function" ? (opts.getSessionSystemPrompt(session) || undefined) : undefined,
+      appendSystemPrompt: [
+        typeof opts.getSessionSystemPrompt === "function" ? opts.getSessionSystemPrompt(session) : "",
+        sessionAdapter.vendor === "codex" && queryContextAvailable() ? codexQuestionGuidance() : "",
+      ].filter(Boolean).join("\n\n") || undefined,
       model: queryModel,
       // Effort is remembered per vendor and clamped to the session vendor's
       // supported levels: a global value would leak codex "minimal" into
@@ -1946,7 +1957,7 @@ function createSDKBridge(opts) {
       dynamicTools: sessionToolDefs,
       // Codex persists dynamic tools with a thread. A stale authorized Driver
       // gets this exact-query bridge; its handlers still reauthorize live.
-      sessionMcpServer: recoverCodexIssueTools ? getCodexSessionMcpServer(session, queryGeneration) : undefined,
+      sessionMcpServer: (recoverCodexIssueTools || recoverCodexQuestionTools) ? getCodexSessionMcpServer(session, queryGeneration) : undefined,
       callDynamicTool: function (toolName, args) {
         var toolDef = findSessionToolDef(toolName);
         if (toolDef && typeof toolDef.handler === "function") {
@@ -2159,6 +2170,9 @@ function createSDKBridge(opts) {
       if (completeInterviewCatalog || requiredCatalogTools.report_scheduled_task_outcome) {
         codexCatalogCandidate = { generation: queryGeneration, version: yoke.sessionTools.CODEX_CATALOG_VERSION };
       }
+      if (requiredCatalogTools.ask_user_questions) {
+        codexCatalogCandidate = Object.assign({}, codexCatalogCandidate || {}, { generation: queryGeneration, userInputVersion: 1 });
+      }
       if (hasIssueCatalog) {
         codexCatalogCandidate = Object.assign({}, codexCatalogCandidate || {}, {
           generation: queryGeneration,

package/lib/server.js

@@ -814,7 +814,7 @@ function createServer(opts) {
 
     // Root path — render the default project workspace while keeping Home
     // available as an explicit client-side surface.
-    if (fullUrl === "/" && req.method === "GET") {
+    if ((fullUrl === "/" || fullUrl === "/projects" || fullUrl === "/projects/") && req.method === "GET") {
       if (!isRequestAuthed(req)) {
         res.writeHead(200, { "Content-Type": "text/html; charset=utf-8" });
         res.end(auth.getAuthPage());

package/lib/sessions.js

@@ -180,6 +180,7 @@ function createSessionManager(opts) {
       if (session.ownerId) metaObj.ownerId = session.ownerId;
       if (session.vendor) metaObj.vendor = session.vendor;
       if (session.codexDynamicToolCatalogVersion) metaObj.codexDynamicToolCatalogVersion = session.codexDynamicToolCatalogVersion;
+      if (session.codexUserInputToolCatalogVersion) metaObj.codexUserInputToolCatalogVersion = session.codexUserInputToolCatalogVersion;
       if (session.codexIssuesToolCatalogVersion) metaObj.codexIssuesToolCatalogVersion = session.codexIssuesToolCatalogVersion;
       if (session.model) metaObj.model = session.model;
       if (session.effort) metaObj.effort = session.effort;
@@ -354,6 +355,7 @@ function createSessionManager(opts) {
       };
       if (m.vendor) session.vendor = m.vendor;
       session.codexDynamicToolCatalogVersion = Number(m.codexDynamicToolCatalogVersion || 0);
+      session.codexUserInputToolCatalogVersion = Number(m.codexUserInputToolCatalogVersion || 0);
       session.codexIssuesToolCatalogVersion = Number(m.codexIssuesToolCatalogVersion || 0);
       session.model = m.model || deriveSessionModel(loaded[i].history);
       session.effort = m.effort || null;

package/lib/users-home-surface-preferences.js

@@ -31,8 +31,8 @@ function attachHomeSurfacePreferences(deps) {
       if (!validId(mateIds[i]) || !validSessionReference(sessions[mateIds[i]])) continue;
       normalizedSessions[mateIds[i]] = sessions[mateIds[i]];
     }
-    return {
-      surface: source.surface === "home" || source.surface === "project" ? source.surface : null,
+    var result = {
+      surface: source.surface === "home" || source.surface === "project" || source.surface === "projects" ? source.surface : null,
       projectSlug: validProjectSlug(source.projectSlug) ? source.projectSlug : null,
       activeMateId: validId(source.activeMateId) ? source.activeMateId : null,
       activeSessionByMate: normalizedSessions,
@@ -41,6 +41,8 @@ function attachHomeSurfacePreferences(deps) {
       chatScope: source.chatScope === "current" ? "current" : "all",
       subSurface: source.subSurface === "debates" ? "debates" : "chat",
     };
+    if (["welcome", "project", "complete"].indexOf(source.onboardingStep) !== -1) result.onboardingStep = source.onboardingStep;
+    return result;
   }
 
   function loadSingleUserPreference() {

package/lib/users-preferences.js

@@ -484,40 +484,6 @@ function attachPreferences(deps) {
     return { error: "User not found" };
   }
 
-  // --- What's New seen ids ---
-  //
-  // Per-user list of dismissed "What's New" entry ids. The whats-new
-  // service uses this to filter unseen entries on connect. Ids are stable
-  // strings authored in lib/whats-new-content.js.
-
-  function getWhatsNewSeenIds(userId) {
-    var data = loadUsers();
-    for (var i = 0; i < data.users.length; i++) {
-      if (data.users[i].id === userId) {
-        var ids = data.users[i].whatsNewSeenIds;
-        return Array.isArray(ids) ? ids.slice() : [];
-      }
-    }
-    return [];
-  }
-
-  function markWhatsNewSeen(userId, entryId) {
-    if (!entryId || typeof entryId !== "string") return { error: "bad_id" };
-    var data = loadUsers();
-    for (var i = 0; i < data.users.length; i++) {
-      if (data.users[i].id === userId) {
-        var ids = Array.isArray(data.users[i].whatsNewSeenIds) ? data.users[i].whatsNewSeenIds.slice() : [];
-        if (ids.indexOf(entryId) === -1) {
-          ids.push(entryId);
-          data.users[i].whatsNewSeenIds = ids;
-          saveUsers(data);
-        }
-        return { ok: true, seenIds: ids };
-      }
-    }
-    return { error: "User not found" };
-  }
-
   // --- Mate onboarding ---
 
   function setMateOnboarded(userId) {
@@ -556,8 +522,6 @@ function attachPreferences(deps) {
     setMatesEnabled: setMatesEnabled,
     getToolPalettes: getToolPalettes,
     setToolPalette: setToolPalette,
-    getWhatsNewSeenIds: getWhatsNewSeenIds,
-    markWhatsNewSeen: markWhatsNewSeen,
     getTerminalFont: getTerminalFont,
     setTerminalFont: setTerminalFont,
     setMateOnboarded: setMateOnboarded,

package/lib/users.js

@@ -453,8 +453,6 @@ var getMatesEnabled = preferences.getMatesEnabled;
 var setMatesEnabled = preferences.setMatesEnabled;
 var getToolPalettes = preferences.getToolPalettes;
 var setToolPalette = preferences.setToolPalette;
-var getWhatsNewSeenIds = preferences.getWhatsNewSeenIds;
-var markWhatsNewSeen = preferences.markWhatsNewSeen;
 var getTerminalFont = preferences.getTerminalFont;
 var setTerminalFont = preferences.setTerminalFont;
 var setMateOnboarded = preferences.setMateOnboarded;
@@ -541,8 +539,6 @@ module.exports = {
   setCapsulesEnabled: setCapsulesEnabled,
   getToolPalettes: getToolPalettes,
   setToolPalette: setToolPalette,
-  getWhatsNewSeenIds: getWhatsNewSeenIds,
-  markWhatsNewSeen: markWhatsNewSeen,
   getTerminalFont: getTerminalFont,
   setTerminalFont: setTerminalFont,
   getHomeDockPreference: getHomeDockPreference,

package/lib/ws-schema.js

@@ -332,9 +332,6 @@ var schema = {
   // -----------------------------------------------------------------------
   // What's New
   // -----------------------------------------------------------------------
-  "whats_new_state":          { direction: "s2c", handler: "lib/public/modules/whats-new.js", description: "Unseen What's New entries for the connecting user" },
-  "whats_new_seen":           { direction: "c2s", handler: "lib/project-sessions.js", description: "Mark a What's New entry as dismissed by the current user" },
-  "whats_new_seen_result":    { direction: "s2c", handler: "lib/public/modules/whats-new.js", description: "Result of marking a What's New entry seen" },
   "home_dock_get":            { direction: "c2s", handler: "lib/server-home-preferences.js", description: "Request the current user's home dock preference" },
   "home_dock_set":            { direction: "c2s", handler: "lib/server-home-preferences.js", description: "Persist the current user's home dock preference" },
   "home_dock_state":          { direction: "s2c", handler: "lib/public/modules/home-dock.js", description: "Current user home dock preference" },

package/lib/yoke/acp-process-manager.js

@@ -188,33 +188,41 @@ AcpProcessManager.prototype.addRequestHandler = function(method, fn) {
   this.requestHandlers[method] = fn;
 };
 
-AcpProcessManager.prototype.send = function(method, params, timeoutMs) {
+AcpProcessManager.prototype.send = function(method, params, timeoutMs, signal) {
   var self = this;
   var id = this.nextId++;
   timeoutMs = timeoutMs || 30000;
-
   return new Promise(function(resolve, reject) {
-    if (!self.proc || !self.started) {
-      reject(new Error("ACP server not started"));
-      return;
-    }
-    var timer = setTimeout(function() {
+    var timer;
+    function cleanup() {
+      if (timer) clearTimeout(timer);
       delete self.pendingRequests[id];
-      reject(new Error("Request timeout: " + method + " (id=" + id + ")"));
-    }, timeoutMs);
-    self.pendingRequests[id] = { resolve: resolve, reject: reject, timer: timer };
-
+      if (signal) signal.removeEventListener("abort", cancel);
+    }
+    function fail(error) { cleanup(); reject(error); }
+    function cancel() {
+      var error = new Error("ACP request cancelled: " + method);
+      error.name = "AbortError";
+      fail(error);
+    }
+    if (signal && signal.aborted) { cancel(); return; }
+    if (!self.proc || !self.started) { fail(new Error("ACP server not started")); return; }
+    timer = setTimeout(function() { fail(new Error("Request timeout: " + method + " (id=" + id + ")")); }, timeoutMs);
+    self.pendingRequests[id] = {
+      resolve: function (value) { cleanup(); resolve(value); }, reject: fail, timer: timer,
+    };
+    if (signal) signal.addEventListener("abort", cancel, { once: true });
     var msg = { jsonrpc: "2.0", id: id, method: method };
     if (params !== undefined) msg.params = params;
-    self._write(msg);
+    if (self._write(msg) === false) fail(new Error("ACP transport is not writable"));
   });
 };
 
 AcpProcessManager.prototype.notify = function(method, params) {
-  if (!this.proc || !this.started) return;
+  if (!this.proc || !this.started) return false;
   var msg = { jsonrpc: "2.0", method: method };
   if (params !== undefined) msg.params = params;
-  this._write(msg);
+  return this._write(msg);
 };
 
 AcpProcessManager.prototype.respond = function(id, result) {
@@ -228,11 +236,13 @@ AcpProcessManager.prototype.respondError = function(id, code, message) {
 };
 
 AcpProcessManager.prototype._write = function(msg) {
-  if (!this.proc || !this.proc.stdin || this.proc.stdin.destroyed) return;
+  if (!this.proc || !this.proc.stdin || this.proc.stdin.destroyed) return false;
   try {
     this.proc.stdin.write(JSON.stringify(msg) + "\n");
+    return true;
   } catch (e) {
     this._error("Write error:", e.message);
+    return false;
   }
 };
 

package/lib/yoke/acp-query-handle.js

@@ -1,29 +1,33 @@
 // Shared ACP Query Handle
 // -----------------------
 // Implements the YOKE QueryHandle contract with standard ACP session methods.
-
 var normalizer = require("./acp-event-normalizer");
 var driverRuntime = require("./acp-driver-runtime");
-
+var queryAbort = require("./query-abort");
 var uuidCounter = 0;
 function generateUuid(vendor) {
   uuidCounter++;
   return (vendor || "acp") + "-" + Date.now().toString(36) + "-" + uuidCounter.toString(36);
 }
-
 function isAuthError(value) {
   return /not logged in|sign in|log ?in|authenticate|authentication|credentials|unauthorized|forbidden|\b401\b/i.test(String(value || ""));
 }
-
 function isApproved(decision) {
   return decision === true || (decision && decision.behavior === "allow");
 }
-
 function createAcpQueryHandle(acp, queryOpts) {
   queryOpts = queryOpts || {};
   var vendor = queryOpts.vendor || "acp";
   var driver = queryOpts.driver || null;
   var abortController = queryOpts.abortController;
+  var cancellation = queryAbort.createAbortScope();
+  var removeAbort = function () {};
+  var pendingPermissions = new Set();
+  var stopDelivery = Promise.resolve();
+  function send(method, params, timeout) {
+    cancellation.check();
+    return cancellation.wait(acp.send(method, params, timeout, cancellation.signal));
+  }
   var canUseTool = queryOpts.canUseTool || null;
   var state = normalizer.createEventState({ vendor: vendor, contextWindow: queryOpts.contextWindow });
   state.sessionId = queryOpts.resumeSessionId || null;
@@ -76,6 +80,7 @@ function createAcpQueryHandle(acp, queryOpts) {
   function endIterator() {
     if (iteratorDone) return;
     iteratorDone = true;
+    removeAbort();
     if (eventWaiting) {
       var resolve = eventWaiting;
       eventWaiting = null;
@@ -128,7 +133,19 @@ function createAcpQueryHandle(acp, queryOpts) {
       return;
     }
 
+    var answered = false;
+    function cancelPermission() {
+      if (answered) return;
+      answered = true;
+      pendingPermissions.delete(cancelPermission);
+      acp.respond(msg.id, { outcome: { outcome: "cancelled" } });
+    }
+    pendingPermissions.add(cancelPermission);
     function respond(allowed) {
+      if (answered) return;
+      if (isCancelled()) { cancelPermission(); return; }
+      answered = true;
+      pendingPermissions.delete(cancelPermission);
       var optionId = allowed ? allowId : rejectId;
       if (!optionId) {
         acp.respond(msg.id, { outcome: { outcome: "cancelled" } });
@@ -160,7 +177,7 @@ function createAcpQueryHandle(acp, queryOpts) {
       input: input,
       options: options,
     }), function() { return { toolName: toolName, input: input }; }) || { toolName: toolName, input: input };
-    Promise.resolve(canUseTool(permission.toolName || toolName, permission.input || input, {})).then(function(decision) {
+    Promise.resolve(canUseTool(permission.toolName || toolName, permission.input || input, { signal: cancellation.signal })).then(function(decision) {
       respond(isApproved(decision));
     }).catch(function(err) {
       console.error("[yoke/" + vendor + "] canUseTool error:", err.message || err);
@@ -193,7 +210,7 @@ function createAcpQueryHandle(acp, queryOpts) {
     if (!state.sessionId || !acp.started || value === undefined || value === null) return Promise.resolve();
     var option = configOptionFor(category, fallbackId);
     if (option) {
-      return acp.send("session/set_config_option", {
+      return send("session/set_config_option", {
         sessionId: state.sessionId,
         configId: option.id,
         value: value,
@@ -202,7 +219,7 @@ function createAcpQueryHandle(acp, queryOpts) {
       });
     }
     if (category === "mode") {
-      return acp.send("session/set_mode", { sessionId: state.sessionId, modeId: value }, 15000);
+      return send("session/set_mode", { sessionId: state.sessionId, modeId: value }, 15000);
     }
     return Promise.reject(new Error("ACP session does not expose configuration option: " + fallbackId));
   }
@@ -230,7 +247,7 @@ function createAcpQueryHandle(acp, queryOpts) {
       if (safeModeValue([modes.currentModeId])) return Promise.resolve();
       var safeMode = safeModeValue(modes.availableModes || []);
       if (!safeMode) return Promise.reject(new Error("ACP agent started in an unsafe permission mode and exposed no supervised mode"));
-      return acp.send("session/set_mode", { sessionId: state.sessionId, modeId: safeMode }, 15000);
+      return send("session/set_mode", { sessionId: state.sessionId, modeId: safeMode }, 15000);
     }
     if (driver && driver.permissionModeGuaranteed === true) return Promise.resolve();
     return Promise.reject(new Error("ACP agent did not expose a verifiable supervised permission mode"));
@@ -302,6 +319,7 @@ function createAcpQueryHandle(acp, queryOpts) {
   }
 
   function applySessionResult(result) {
+    cancellation.check();
     result = result || {};
     if (result.sessionId) state.sessionId = result.sessionId;
     if (Array.isArray(result.configOptions)) state.configOptions = result.configOptions;
@@ -313,7 +331,7 @@ function createAcpQueryHandle(acp, queryOpts) {
   async function openDefaultSession(handlerEntry) {
     if (state.sessionId && queryOpts.canResumeSession) {
       handlerEntry.sessionId = state.sessionId;
-      var resumed = await acp.send("session/resume", buildSessionParams("resume", {
+      var resumed = await send("session/resume", buildSessionParams("resume", {
         sessionId: state.sessionId,
         cwd: queryOpts.cwd,
         mcpServers: queryOpts.mcpServers || [],
@@ -324,7 +342,7 @@ function createAcpQueryHandle(acp, queryOpts) {
       handlerEntry.sessionId = state.sessionId;
       state.loadingSession = true;
       try {
-        var loaded = await acp.send("session/load", buildSessionParams("load", {
+        var loaded = await send("session/load", buildSessionParams("load", {
           sessionId: state.sessionId,
           cwd: queryOpts.cwd,
           mcpServers: queryOpts.mcpServers || [],
@@ -336,7 +354,7 @@ function createAcpQueryHandle(acp, queryOpts) {
     }
 
     state.sessionId = null;
-    var result = await acp.send("session/new", buildSessionParams("new", {
+    var result = await send("session/new", buildSessionParams("new", {
       cwd: queryOpts.cwd,
       mcpServers: queryOpts.mcpServers || [],
     }), 60000);
@@ -355,7 +373,7 @@ function createAcpQueryHandle(acp, queryOpts) {
         sessionId: state.sessionId,
         prompt: asPrompt(message),
       });
-      return acp.send("session/prompt", params, 30 * 60 * 1000);
+      return send("session/prompt", params, 30 * 60 * 1000);
     });
   }
 
@@ -363,17 +381,17 @@ function createAcpQueryHandle(acp, queryOpts) {
     var currentMessage = prependSystemPrompt(initialMessage);
     var handlerEntry = acp.addHandler(handleServerEvent);
     try {
-      var sessionResult = await openSession(handlerEntry);
+      var sessionResult = await cancellation.wait(openSession(handlerEntry));
       handlerEntry.sessionId = state.sessionId;
-      await driverRuntime.callAsync(driver, "afterSessionOpen", driverContext({ sessionResult: sessionResult }), function() {});
-      await ensureSafePermissionMode();
+      await cancellation.wait(driverRuntime.callAsync(driver, "afterSessionOpen", driverContext({ sessionResult: sessionResult }), function() {}));
+      await cancellation.wait(ensureSafePermissionMode());
       if (state.model && state.model !== "auto") await setModel(state.model);
       if (queryOpts.mode) await setConfig("mode", "mode", queryOpts.mode);
 
       while (!isCancelled()) {
         normalizer.resetTurnState(state);
         pushEvent({ yokeType: "turn_start", uuid: generateUuid(vendor), messageType: "user" });
-        var result = await prompt(currentMessage);
+        var result = await cancellation.wait(prompt(currentMessage));
         var closing = normalizer.closeOpenBlocks(state);
         for (var i = 0; i < closing.length; i++) pushEvent(closing[i]);
         if (isCancelled() || (result && result.stopReason === "cancelled")) {
@@ -395,6 +413,7 @@ function createAcpQueryHandle(acp, queryOpts) {
           : { yokeType: "error", text: message });
       }
     } finally {
+      await stopDelivery;
       acp.removeHandler(handlerEntry);
       state.done = true;
       endIterator();
@@ -448,36 +467,29 @@ function createAcpQueryHandle(acp, queryOpts) {
       }; });
     },
     abort: function() {
+      if (state.aborted || iteratorDone) return;
       state.aborted = true;
-      driverRuntime.call(driver, "cancel", driverContext(), function() {
-        if (state.sessionId && acp.started) acp.notify("session/cancel", { sessionId: state.sessionId });
-      });
-      endIterator();
-    },
-    close: function() {
-      messageQueueEnded = true;
-      if (messageWaiting) {
-        var resolve = messageWaiting;
-        messageWaiting = null;
-        resolve(null);
-      }
-      endIterator();
+      cancellation.stop();
+      handle.endInput();
+      messageQueue = [];
+      pendingPermissions.forEach(function (cancel) { try { cancel(); } catch (e) {} });
+      stopDelivery = driverRuntime.callAsync(driver, "cancel", driverContext(), function() {
+        if (state.sessionId && (!acp.started || acp.notify("session/cancel", { sessionId: state.sessionId }) === false)) {
+          throw new Error("ACP transport is disconnected");
+        }
+      }).catch(function (error) {
+        pushEvent({ yokeType: "error", text: "Cancellation could not be delivered: " + error.message });
+      }).finally(endIterator);
+      return stopDelivery;
     },
+    close: function() { handle.endInput(); endIterator(); },
     endInput: function() {
       messageQueueEnded = true;
-      if (messageWaiting) {
-        var resolve = messageWaiting;
-        messageWaiting = null;
-        resolve(null);
-      }
+      if (messageWaiting) { var resolve = messageWaiting; messageWaiting = null; resolve(null); }
     },
   };
 
-  if (abortController && abortController.signal) {
-    abortController.signal.addEventListener("abort", function() {
-      if (!state.aborted) handle.abort();
-    }, { once: true });
-  }
+  removeAbort = queryAbort.bindAbort(abortController, function () { handle.abort(); });
   return handle;
 }