clay-server 4.7.0-beta.2 → 4.7.0-beta.4

package/lib/project-pair-result-outbox.js

@@ -387,6 +387,7 @@ function attachPairResultOutbox(options) {
     markRestartUncertain: markRestartUncertain,
     authorizeHumanTurn: authorizeHumanTurn,
     grantManualRetry: grantManualRetry,
+    dismissNotice: function (key, revision) { return transition(key, { dismissedNoticeRevision: revision }); },
     status: status,
     list: function () { return Object.keys(records).map(function (key) { return copy(records[key]); }); },
     get: function (key) { return records[key] ? copy(records[key]) : null; },

package/lib/project-pair-result-recovery.js

@@ -146,6 +146,11 @@ function attachPairResultRecovery(ctx) {
       confirmDuplicate: completed && state === "uncertain",
     };
   }
+  function noticeItem(record) {
+    var item = publicItem(record);
+    item.revision = opaqueId(JSON.stringify(item));
+    return item;
+  }
   function canRead(ws, session) {
     if (!ws || !session || ws._clayActiveSession !== session.localId) return false;
     if (ownerId(session)) return !!(ws._clayUser && String(ws._clayUser.id) === String(ownerId(session)));
@@ -153,7 +158,9 @@ function attachPairResultRecovery(ctx) {
   }
   function sendState(session, ws, sendFn) {
     if (!canRead(ws, session)) return false;
-    var items = recordsFor(session).map(publicItem);
+    var items = recordsFor(session).filter(function (record) {
+      return record.dismissedNoticeRevision !== noticeItem(record).revision;
+    }).map(noticeItem);
     (sendFn || ctx.sendTo.bind(null, ws))({ type: "pair_result_status", sessionId: session.localId, items: items });
     return true;
   }
@@ -204,7 +211,7 @@ function attachPairResultRecovery(ctx) {
     changed(session);
   }
   function handleMessage(ws, msg) {
-    if (!msg || (msg.type !== "pair_result_state_request" && msg.type !== "pair_result_retry")) return false;
+    if (!msg || (msg.type !== "pair_result_state_request" && msg.type !== "pair_result_retry" && msg.type !== "pair_result_dismiss")) return false;
     var session = ctx.sm.sessions.get(ws._clayActiveSession);
     if (!canRead(ws, session)) return true;
     if (msg.sessionId != null && msg.sessionId !== session.localId) return true;
@@ -213,6 +220,12 @@ function attachPairResultRecovery(ctx) {
     var records = recordsFor(session), record = null;
     for (var i = 0; i < records.length; i++) if (opaqueId(records[i].key) === msg.id) record = records[i];
     if (!record) { sendState(session, ws); return true; }
+    if (msg.type === "pair_result_dismiss") {
+      if (msg.revision === noticeItem(record).revision) ctx.outbox.dismissNotice(record.key, msg.revision);
+      changed(session);
+      sendState(session, ws);
+      return true;
+    }
     if (record.deliveryState === "uncertain" && msg.confirmDuplicate !== true) { sendState(session, ws); return true; }
     var granted = ctx.outbox.grantManualRetry(record.key);
     if (granted.ok) schedule(record.key);

package/lib/public/app.js

@@ -1,3 +1,4 @@
+import { initGenerationStop } from './modules/generation-stop.js';
 import { initIssueLinks } from './modules/clay-issue-links.js';
 import { initIssues, closeIssues } from './modules/issues.js';
 import { initIssuesContext } from './modules/issues-context.js';
@@ -821,6 +822,7 @@ import { initDebate, handleDebatePreparing, handleDebateStarted, handleDebateRes
 
   // --- Notifications module ---
   initAppNotifications();
+  initGenerationStop();
 
   // --- Panels module ---
   initPanels();

package/lib/public/css/input.css

@@ -1717,3 +1717,30 @@ body.tui-composer-active #config-chip-wrap {
   font-weight: 600;
   color: inherit;
 }
+
+/* Stop remains available when Send is occupied by a draft or Worker lock. */
+#generation-stop-row {
+  max-width: var(--content-width);
+  margin: 6px auto 0;
+  display: flex;
+  justify-content: flex-end;
+}
+#generation-stop-row.hidden { display: none; }
+body:not(.worker-pane-locked) #input-area:has(#send-btn.stop:not(:disabled)) #generation-stop-row { display: none; }
+#generation-stop {
+  display: inline-flex;
+  align-items: center;
+  gap: 6px;
+  min-height: 36px;
+  padding: 6px 12px;
+  border: 1px solid var(--border);
+  border-radius: 18px;
+  background: var(--sidebar-bg);
+  color: var(--text-secondary);
+  font: inherit;
+  font-size: 12px;
+  cursor: pointer;
+}
+#generation-stop:hover:not(:disabled) { color: var(--text); background: var(--code-bg); }
+#generation-stop:disabled { opacity: 0.5; cursor: default; }
+#generation-stop .lucide { width: 12px; height: 12px; }

package/lib/public/css/messages.css

@@ -1387,17 +1387,24 @@ pre.mermaid-error {
 .plan-banner.plan-exit { color: var(--success); }
 .plan-banner.plan-exit .plan-banner-icon { color: var(--success); }
 
-.pair-result-status { display: grid; gap: 8px; padding: 10px 16px 0; }
-.pair-result-status-card { border: 1px solid var(--border); border-radius: 10px; background: var(--bg-alt); padding: 10px 12px; color: var(--text-secondary); font-size: 12px; }
+/* Recovery notices use the same quiet surface as session work references. */
+.pair-result-status { flex: 0 0 auto; margin: 8px 16px 0; padding: 8px 10px; border: 1px solid var(--border); border-radius: 6px; background: var(--bg-alt); color: var(--text-muted); font-size: 12px; line-height: 1.5; max-height: 35vh; overflow-y: auto; }
+.pair-result-status-header { display: flex; align-items: center; justify-content: space-between; gap: 12px; color: var(--text-secondary); }
+.pair-result-status button { font: inherit; color: var(--text-secondary); background: transparent; border: 1px solid var(--border); border-radius: 5px; cursor: pointer; }
+.pair-result-status .pair-result-status-dismiss { display: grid; place-items: center; flex: 0 0 28px; width: 28px; height: 28px; padding: 0; border: 0; font-size: 20px; line-height: 1; }
+.pair-result-status button:hover { background: var(--input-bg); color: var(--text); }
+.pair-result-status button:focus-visible, .pair-result-status summary:focus-visible { outline: 2px solid var(--accent); outline-offset: 2px; }
+.pair-result-status-details > summary { cursor: pointer; width: fit-content; }
+.pair-result-status-card { padding: 10px 0; border-top: 1px solid var(--border); margin-top: 8px; }
 .pair-result-status-card > strong, .pair-result-status-card > span { display: block; }
-.pair-result-status-card > strong { color: var(--text); margin-bottom: 3px; }
+.pair-result-status-card > strong { color: var(--text-secondary); font-weight: 500; margin-bottom: 3px; }
 .pair-result-status-card details { margin-top: 7px; }
-.pair-result-status-card summary { cursor: pointer; color: var(--accent); }
-.pair-result-status-card pre { max-height: 180px; overflow: auto; white-space: pre-wrap; font: inherit; }
-.pair-result-status-card button { margin-top: 8px; }
-.pair-result-status-retry:focus-visible { outline: 2px solid var(--accent); outline-offset: 2px; }
+.pair-result-status-card summary { cursor: pointer; }
+.pair-result-status-card pre { max-height: 180px; overflow: auto; white-space: pre-wrap; overflow-wrap: anywhere; font: inherit; }
+.pair-result-status-retry { margin-top: 8px; padding: 4px 8px; }
 .pair-result-status-retry:disabled { cursor: not-allowed; opacity: 0.55; }
-.pair-result-status-uncertain, .pair-result-status-blocked { border-color: color-mix(in srgb, var(--warning) 45%, var(--border)); }
+@media (max-width: 600px) { .pair-result-status { margin: 6px 8px 0; } .pair-result-status .pair-result-status-dismiss { min-width: 36px; height: 36px; } }
+
 
 /* --- Plan card --- */
 .plan-card {

package/lib/public/index.html

@@ -635,6 +635,9 @@
           </div>
         </div>
       </div>
+      <div id="generation-stop-row" class="hidden">
+        <button id="generation-stop" type="button" aria-label="Stop generating"><i data-lucide="square"></i><span>Stop</span></button>
+      </div>
     </div>
   </div>
   <!-- Mobile input-more bottom sheet: attach / image + context sources -->

package/lib/public/modules/app-connection.js

@@ -151,7 +151,19 @@ function suspendSocketWatchdogs() {
   watchdog.suspend();
 }
 
+function refreshBackgroundPane() {
+  if (document.hidden || !store.get('paneNeedsSnapshot')) return false;
+  store.set({ paneNeedsSnapshot: false });
+  if (!store.get('paneMode') || !store.get('paneSessionId') || lifecycle.isOffline()) return false;
+  // A fresh socket discards browser-queued deltas and re-pins the exact pane.
+  // Server replay supplies current history, status and pending interactions.
+  watchdog.resume();
+  connect();
+  return true;
+}
+
 function resumeSocketWatchdogs(reason) {
+  if (refreshBackgroundPane()) return;
   var resumed = watchdog.resume();
   var socket = getWs();
   if (socket && socket.readyState === 1 && resumed) startHeartbeat(socket, lifecycle.getEpoch());
@@ -178,10 +190,13 @@ export function initConnection() {
     });
   });
   document.addEventListener("visibilitychange", function () {
-    if (document.hidden) suspendSocketWatchdogs();
-    else resumeSocketWatchdogs("visible");
+    if (document.hidden) {
+      if (store.get('paneMode') && store.get('paneSessionId')) store.set({ paneNeedsSnapshot: true });
+      suspendSocketWatchdogs();
+    } else resumeSocketWatchdogs("visible");
   });
   document.addEventListener("freeze", function () {
+    if (store.get('paneMode') && store.get('paneSessionId')) store.set({ paneNeedsSnapshot: true });
     suspendSocketWatchdogs();
   });
   document.addEventListener("resume", function () {
@@ -387,6 +402,12 @@ export function connect() {
 
   newWs.onmessage = function (event) {
     if (getWs() !== newWs || !lifecycle.current(attemptEpoch)) return;
+    // Hidden pane deltas are replaced by a current server snapshot on return.
+    if (store.get('paneMode') && store.get('paneSessionId') && document.hidden) {
+      store.set({ paneNeedsSnapshot: true });
+      return;
+    }
+    if (refreshBackgroundPane()) return;
     // Backup: if we're receiving messages, we're connected
     if (!store.get('connected')) {
       setStatus("connected");

package/lib/public/modules/app-favicon.js

@@ -83,6 +83,7 @@ export function drawFaviconAnimFrame() {
 
 export function setSendBtnMode(mode) {
   var sendBtn = getSendBtn();
+  sendBtn.setAttribute("aria-label", mode === "stop" ? "Stop generating" : "Send");
   if (mode === "stop") {
     sendBtn.disabled = false;
     sendBtn.classList.add("stop");

package/lib/public/modules/app-messages.js

@@ -66,7 +66,7 @@ import { renderGeneratedImage, renderImageGenerationProgress, clearImageGenerati
 import { clearPairResultStatus, handlePairResultStatus } from './pair-result-status.js';
 
 // --- App module imports ---
-import { scrollToBottom, addToMessages, addUserMessage, addSystemMessage, removeMatePreThinking, appendDelta, finalizeAssistantBlock, addConflictMessage, addContextOverflowMessage, showSuggestionChips, armStickyBottom, VENDOR_AVATARS, VENDOR_NAMES } from './app-rendering.js';
+import { scrollToBottom, addToMessages, addUserMessage, addSystemMessage, removeMatePreThinking, resetStreamBuffer, appendDelta, finalizeAssistantBlock, addConflictMessage, addContextOverflowMessage, showSuggestionChips, armStickyBottom, VENDOR_AVATARS, VENDOR_NAMES } from './app-rendering.js';
 import { setActivity, startUrgentBlink, stopUrgentBlink, blinkSessionDot, updateCrossProjectBlink } from './app-favicon.js';
 import { setStatus } from './app-connection.js';
 import { resolvePaneSession, resolveSwitchedVendor } from './pane-session.js';
@@ -834,6 +834,7 @@ export function processMessage(msg) {
 
       case "session_switched":
         clearPairResultStatus();
+        resetStreamBuffer();
         syncAutonomousRunForSession(msg.autonomousRun || null);
         // Save draft from outgoing session
         var _prevSid = store.get('activeSessionId');

package/lib/public/modules/app-rendering.js

@@ -45,6 +45,11 @@ export function addCopyHandler(msgEl, rawText) {
 export function appendDelta(text) {
   ensureAssistantBlock();
   streamBuffer += text;
+  if (store.get('replayingHistory')) {
+    store.set({ currentFullText: store.get('currentFullText') + streamBuffer });
+    streamBuffer = "";
+    return;
+  }
   if (!streamDrainTimer) {
     streamDrainTimer = requestAnimationFrame(drainStreamTick);
   }
@@ -55,16 +60,9 @@ function drainStreamTick() {
   var _s = store.snap();
   if (!_s.currentMsgEl || streamBuffer.length === 0) return;
 
-  var n;
-  var len = streamBuffer.length;
-  if (len > 200) { n = Math.ceil(len / 4); }
-  else if (len > 80) { n = 8; }
-  else if (len > 30) { n = 5; }
-  else if (len > 10) { n = 2; }
-  else { n = 1; }
-
-  var chunk = streamBuffer.slice(0, n);
-  streamBuffer = streamBuffer.slice(n);
+  // Render everything received by this frame; never replay a typing backlog.
+  var chunk = streamBuffer;
+  streamBuffer = "";
   var newText = _s.currentFullText + chunk;
   store.set({ currentFullText: newText });
 
@@ -82,6 +80,14 @@ function drainStreamTick() {
   }
 }
 
+export function resetStreamBuffer() {
+  if (streamDrainTimer) cancelAnimationFrame(streamDrainTimer);
+  if (highlightTimer) clearTimeout(highlightTimer);
+  streamDrainTimer = null;
+  highlightTimer = null;
+  streamBuffer = "";
+}
+
 export function flushStreamBuffer() {
   if (streamDrainTimer) { cancelAnimationFrame(streamDrainTimer); streamDrainTimer = null; }
   if (streamBuffer.length > 0) {

package/lib/public/modules/generation-stop.js

@@ -0,0 +1,24 @@
+import { store } from './store.js';
+import { getWs } from './ws-ref.js';
+
+// This control lives outside the composer so drafts and Worker locks cannot
+// take away the human's ability to stop the displayed session.
+export function initGenerationStop() {
+  var row = document.getElementById('generation-stop-row');
+  var button = document.getElementById('generation-stop');
+  if (!row || !button) return;
+  function sync() {
+    row.classList.toggle('hidden', !store.get('processing'));
+    button.disabled = !store.get('connected');
+    button.title = store.get('connected') ? 'Stop generating' : 'Reconnect to stop generating';
+  }
+  button.addEventListener('click', function () {
+    var ws = getWs();
+    if (!store.get('processing') || !store.get('connected') || !ws || ws.readyState !== 1) return;
+    ws.send(JSON.stringify({ type: 'stop' }));
+  });
+  store.subscribe(function (state, previous) {
+    if (state.processing !== previous.processing || state.connected !== previous.connected) sync();
+  });
+  sync();
+}

package/lib/public/modules/pair-result-status.js

@@ -33,6 +33,16 @@ function retry(item) {
   sendRetry(source, false);
 }
 
+function dismiss(items) {
+  var ws = getWs();
+  if (!ws || ws.readyState !== 1) return;
+  items.forEach(function (item) {
+    ws.send(JSON.stringify({ type: "pair_result_dismiss", id: item.id, revision: item.revision,
+      sessionId: store.get("activeSessionId"),
+      projectSlug: store.get("currentSlug") || store.get("activeProjectSlug") || null }));
+  });
+}
+
 function renderPairResultStatus() {
   var existing = document.getElementById("pair-result-status");
   if (existing) existing.remove();
@@ -44,6 +54,21 @@ function renderPairResultStatus() {
   section.id = "pair-result-status";
   section.className = "pair-result-status";
   section.setAttribute("role", "status");
+  var header = document.createElement("div");
+  header.className = "pair-result-status-header";
+  var heading = document.createElement("span");
+  heading.textContent = items.length === 1 ? "Worker update needs attention" : items.length + " Worker updates need attention";
+  var close = document.createElement("button");
+  close.type = "button"; close.className = "pair-result-status-dismiss";
+  close.textContent = "×";
+  close.setAttribute("aria-label", "Dismiss Worker notices");
+  close.title = "Dismiss notices. Retained tasks and results are kept.";
+  close.addEventListener("click", dismiss.bind(null, items));
+  header.appendChild(heading); header.appendChild(close); section.appendChild(header);
+  var content = document.createElement("details"), toggle = document.createElement("summary");
+  content.className = "pair-result-status-details";
+  toggle.textContent = "Review updates";
+  content.appendChild(toggle); section.appendChild(content);
   for (var i = 0; i < items.length; i++) {
     var item = items[i], card = document.createElement("div");
     card.className = "pair-result-status-card pair-result-status-" + item.state;
@@ -61,11 +86,11 @@ function renderPairResultStatus() {
     }
     if (item.canRetry) {
       var button = document.createElement("button");
-      button.type = "button"; button.className = "confirm-btn confirm-ok pair-result-status-retry"; button.textContent = "Retry delivery";
+      button.type = "button"; button.className = "pair-result-status-retry"; button.textContent = "Retry delivery";
       button.addEventListener("click", retry.bind(null, item));
       card.appendChild(button);
     }
-    section.appendChild(card);
+    content.appendChild(card);
   }
   messages.parentElement.insertBefore(section, messages);
 }

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/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/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;
   }
 };