clay-server 4.7.0-beta.5 → 4.7.0

package/lib/project-session-spawn.js

@@ -150,6 +150,7 @@ function rebuildMessageUUIDs(history) {
         uuid: history[i].uuid,
         type: history[i].messageType,
         historyIndex: i,
+        turnId: history[i].turnId || null,
       });
     }
   }

package/lib/project-sessions.js

@@ -1489,14 +1489,26 @@ function attachSessions(ctx) {
               }
             }
 
-            // Count turns to roll back BEFORE trimming local history
-            var turnsToRollBack = 0;
+            // Codex's thread/revert cuts at a turn id, not a count. Read the
+            // target entry's turnId BEFORE trimming local history below.
+            var hasTurnsToRollBack = false;
+            var targetTurnId = null;
             if (targetIdx >= 0) {
+              targetTurnId = session.messageUUIDs[targetIdx].turnId || null;
               for (var ri = targetIdx; ri < session.messageUUIDs.length; ri++) {
-                if (session.messageUUIDs[ri].type === "user") turnsToRollBack++;
+                if (session.messageUUIDs[ri].type === "user") { hasTurnsToRollBack = true; break; }
               }
             }
 
+            // Notify adapter of conversation rollback (e.g. Codex thread/revert)
+            // BEFORE trimming local history below. Deliberately not caught
+            // here: a failed or impossible (missing turnId) provider-side
+            // rollback must abort the whole rewind via the outer catch, never
+            // leave local history trimmed ahead of the real provider thread.
+            if (hasTurnsToRollBack) {
+              await sdk.rollbackConversation(session, targetTurnId);
+            }
+
             if (targetIdx >= 0) {
               var trimTo = session.messageUUIDs[targetIdx].historyIndex;
               for (var k = trimTo - 1; k >= 0; k--) {
@@ -1513,15 +1525,6 @@ function attachSessions(ctx) {
               }
             }
 
-            // Notify adapter of conversation rollback (e.g. Codex thread/rollback)
-            if (turnsToRollBack > 0) {
-              try {
-                await sdk.rollbackConversation(session, turnsToRollBack);
-              } catch (rbErr) {
-                console.error("[project-sessions] conversation rollback failed:", rbErr.message || rbErr);
-              }
-            }
-
             var kept = session.messageUUIDs;
             session.lastRewindUuid = kept.length > 0 ? kept[kept.length - 1].uuid : null;
           }
@@ -1588,7 +1591,7 @@ function attachSessions(ctx) {
           forked.messageUUIDs = [];
           for (var hi = 0; hi < forkHistory.length; hi++) {
             if (forkHistory[hi].type === "message_uuid") {
-              forked.messageUUIDs.push({ uuid: forkHistory[hi].uuid, type: forkHistory[hi].messageType, historyIndex: hi });
+              forked.messageUUIDs.push({ uuid: forkHistory[hi].uuid, type: forkHistory[hi].messageType, historyIndex: hi, turnId: forkHistory[hi].turnId || null });
             }
           }
           sm.saveSessionFile(forked);

package/lib/public/css/input.css

@@ -1718,21 +1718,17 @@ body.tui-composer-active #config-chip-wrap {
   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; }
+/* Stop remains available when Send is occupied by a draft or a locked
+   configured Worker pane. One button, two homes, moved (never duplicated) by
+   generation-stop.js: beside Send in the ordinary composer action row, or a
+   direct child of #input-area -- outside the composer that worker-pane-lock.js
+   hides with #input-wrapper { display: none } -- when the pane is locked. */
 #generation-stop {
   display: inline-flex;
   align-items: center;
   gap: 6px;
-  min-height: 36px;
-  padding: 6px 12px;
+  height: 36px;
+  padding: 0 12px;
   border: 1px solid var(--border);
   border-radius: 18px;
   background: var(--sidebar-bg);
@@ -1740,7 +1736,19 @@ body:not(.worker-pane-locked) #input-area:has(#send-btn.stop:not(:disabled)) #ge
   font: inherit;
   font-size: 12px;
   cursor: pointer;
+  flex-shrink: 0;
 }
+#generation-stop.hidden { display: none; }
+body:not(.worker-pane-locked) #input-bottom-right:has(#send-btn.stop:not(:disabled)) #generation-stop { display: none; }
 #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; }
+
+/* Locked placement: a direct child of #input-area, centered under the
+   "Controlled by Driver" status line rather than inline in a hidden row. */
+#input-area > #generation-stop {
+  display: flex;
+  width: fit-content;
+  margin: 8px auto 0;
+}
+#input-area > #generation-stop.hidden { display: none; }

package/lib/public/index.html

@@ -630,14 +630,12 @@
                 </div>
               </div>
               <button id="stt-btn" type="button" aria-label="Voice input" title="Voice input"><i data-lucide="mic"></i></button>
+              <button id="generation-stop" type="button" class="hidden" aria-label="Stop generating"><i data-lucide="square"></i><span>Stop</span></button>
               <button id="send-btn" disabled aria-label="Send"><i data-lucide="arrow-up"></i></button>
             </div>
           </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-messages.js

@@ -35,6 +35,7 @@ import { renderWorkerProposal, updateWorkerProposal } from './worker-proposal.js
 import { renderDriverContinuation, updateDriverContinuation, renderDriverContinuationContext } from './driver-continuation.js';
 import { handleInputSync, autoResize, builtinCommands, setScheduleBtnDisabled, sendShellResultToAgent, handleAcceptedOrdinaryMessage, handleScheduleMessageResult } from './input.js';
 import { startThinking, appendThinking, stopThinking, resetThinkingGroup, createToolItem, updateToolExecuting, updateToolResult, markAllToolsDone, closeToolGroup, removeToolFromGroup, resetToolState, getTools, getPlanContent, setPlanContent, renderPlanBanner, renderPlanCard, getTodoTools, handleTodoWrite, handleTaskCreate, handleTaskUpdate, applyDeadSessionTodoCompaction, isPlanFilePath, enableMainInput, addTurnMeta, updateSubagentActivity, addSubagentToolEntry, markSubagentDone, initSubagentStop, updateSubagentProgress, updateSubagentTaskStatus, renderAskUserQuestion, markAskUserAnswered, renderPermissionRequest, markPermissionCancelled, markPermissionResolved, renderElicitationRequest, markElicitationResolved, renderUserDialogRequest, markUserDialogResolved, updateThinkingTokens } from './tools.js';
+import { isInterimToolResult } from './tool-result-lifecycle.js';
 import { finishThinkingTurn, resumeThinkingAfterReplay } from './thinking-lifecycle.js';
 import { showDoneNotification, playDoneSound, isNotifAlertEnabled, isNotifSoundEnabled } from './notifications.js';
 import { handleFsList, handleFsRead, handleFileChanged, handleDirChanged, handleFileHistory, handleGitDiff, handleFileAt, refreshIfOpen, getPendingNavigate, handleFsSearch, presentMarkdownEdit } from './filebrowser.js';
@@ -1194,6 +1195,12 @@ export function processMessage(msg) {
       case "tool_result": {
           var tr = getTools()[msg.id];
           if (tr && tr.hidden) break; // skip hidden plan tools
+          // A detached SDK placeholder means this exact tool call is still
+          // running. Leave its card and label untouched; history replay and
+          // split panes use this same router, so a later real result can
+          // complete the original card everywhere without a false
+          // "(no output)" terminal state.
+          if (isInterimToolResult(msg)) break;
           if (msg.is_error && tr && tr.name === "ImageGen") clearImageGenerationProgress(msg.id);
           // Always call updateToolResult for Edit (to show diff from input), or when content exists
           if (msg.content != null || msg.images || (tr && tr.name === "Edit" && tr.input && tr.input.old_string)) {

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

@@ -1,16 +1,35 @@
 import { store } from './store.js';
 import { getWs } from './ws-ref.js';
+import { isDriverOperatedView } from './worker-pane-lock.js';
 
-// This control lives outside the composer so drafts and Worker locks cannot
-// take away the human's ability to stop the displayed session.
+// Fallback Stop control for when Send cannot double as Stop: a draft sitting
+// in the composer (Send stays Send so the draft can still go out), or a
+// locked configured Worker pane (Send and the rest of the composer are
+// hidden entirely). One button, two homes, moved rather than duplicated:
+// beside Send in the ordinary composer action row, or a direct child of
+// #input-area -- outside the composer that worker-pane-lock.js hides with
+// #input-wrapper { display: none } -- when the pane is locked. Either way
+// there is never more than one visible Stop, and a locked pane's hidden
+// composer never takes the human's cancellation away with it.
 export function initGenerationStop() {
-  var row = document.getElementById('generation-stop-row');
   var button = document.getElementById('generation-stop');
-  if (!row || !button) return;
+  if (!button) return;
+  var inputArea = document.getElementById('input-area');
+  var actionRow = document.getElementById('input-bottom-right');
+  var sendBtn = document.getElementById('send-btn');
+
+  function place() {
+    if (isDriverOperatedView()) {
+      if (inputArea && button.parentNode !== inputArea) inputArea.appendChild(button);
+    } else if (actionRow && button.parentNode !== actionRow) {
+      actionRow.insertBefore(button, sendBtn || null);
+    }
+  }
   function sync() {
-    row.classList.toggle('hidden', !store.get('processing'));
+    button.classList.toggle('hidden', !store.get('processing'));
     button.disabled = !store.get('connected');
     button.title = store.get('connected') ? 'Stop generating' : 'Reconnect to stop generating';
+    place();
   }
   button.addEventListener('click', function () {
     var ws = getWs();
@@ -18,7 +37,9 @@ export function initGenerationStop() {
     ws.send(JSON.stringify({ type: 'stop' }));
   });
   store.subscribe(function (state, previous) {
-    if (state.processing !== previous.processing || state.connected !== previous.connected) sync();
+    if (state.processing !== previous.processing || state.connected !== previous.connected
+      || state.splitGroups !== previous.splitGroups || state.activeSessionId !== previous.activeSessionId
+      || state.paneSessionId !== previous.paneSessionId) sync();
   });
   sync();
 }

package/lib/public/modules/tool-result-lifecycle.js

@@ -0,0 +1,3 @@
+export function isInterimToolResult(msg) {
+  return !!msg && msg.detached === true;
+}

package/lib/public/style.css

@@ -13,7 +13,7 @@
 @import url("css/messages.css?v=20260828-delegated-muted1");
 @import url("css/generated-images.css?v=20260829-save-details1");
 @import url("css/rewind.css");
-@import url("css/input.css?v=20260828-composer-depth1");
+@import url("css/input.css?v=20261002-stop-inline1");
 @import url("css/pending-message-queue.css?v=20260914-queue1");
 @import url("css/filebrowser.css?v=20260829-terminal-canvas1");
 @import url("css/git-panel.css");

package/lib/sdk-bridge.js

@@ -12,6 +12,7 @@ var skillDiscovery = require("./yoke/skill-discovery");
 var { isSafeBashSegment } = require("./safe-bash-commands");
 var { createMessageQueue } = require("./sdk-message-queue");
 var { attachMessageProcessor } = require("./sdk-message-processor");
+var taskLifecycle = require("./sdk-task-lifecycle");
 var homeDebateToolPolicy = require("./home-debate-tool-policy");
 var yoke = require("./yoke");
 var sessionTitlePolicy = require("./session-title-policy");
@@ -851,6 +852,14 @@ function createSDKBridge(opts) {
     }
 
     // Regular tool permission request: send to client and wait
+    // mcpServer (name/source) is SDK-reported metadata about which MCP
+    // server actually served the tool call. It comes from the trusted CLI
+    // subprocess boundary in opts, never from the model-controlled `input`,
+    // so it is safe to surface informationally; it is not used to grant or
+    // widen any permission decision made above.
+    var mcpServerMeta = (opts.mcpServer && typeof opts.mcpServer === "object")
+      ? { name: opts.mcpServer.name || null, source: opts.mcpServer.source || null }
+      : null;
     return new Promise(function(resolve) {
       var requestId = crypto.randomUUID();
       sm.permissionRequestIndex[requestId] = session.localId;
@@ -863,6 +872,7 @@ function createSDKBridge(opts) {
         decisionReason: opts.decisionReason || "",
         defaultToNo: opts.defaultToNo === true,
         suppressAlwaysAllowRule: opts.suppressAlwaysAllowRule === true,
+        mcpServer: mcpServerMeta,
       };
 
       var permMsg = {
@@ -874,6 +884,7 @@ function createSDKBridge(opts) {
         decisionReason: opts.decisionReason || "",
         defaultToNo: opts.defaultToNo === true,
         suppressAlwaysAllowRule: opts.suppressAlwaysAllowRule === true,
+        mcpServer: mcpServerMeta,
         vendor: session.vendor || (adapter && adapter.vendor) || "claude",
       };
       sendAndRecord(session, permMsg);
@@ -1103,6 +1114,7 @@ function createSDKBridge(opts) {
         session.isProcessing = false;
         session._awaitingTurnResult = false;
         session._queuedTurnCount = 0;
+        taskLifecycle.clearForeground(session);
         onProcessingChanged();
         send({ type: "status", processing: false });
         sendAndRecord(session, { type: "thinking_stop" });
@@ -1119,6 +1131,7 @@ function createSDKBridge(opts) {
         session.isProcessing = false;
         session._awaitingTurnResult = false;
         session._queuedTurnCount = 0;
+        taskLifecycle.clearAll(session);
         onProcessingChanged();
         if (!session._lastAdapterError) {
           sendAndRecord(session, {
@@ -1138,6 +1151,7 @@ function createSDKBridge(opts) {
         session._queuedTurnCount = 0;
         onProcessingChanged();
         if (err.name === "AbortError" || (myAbortController && myAbortController.signal.aborted) || session.taskStopRequested) {
+          taskLifecycle.clearForeground(session);
           session._lastTurnInterrupted = true;
           if (!session.destroying) {
             sendAndRecord(session, { type: "thinking_stop" });
@@ -1148,9 +1162,11 @@ function createSDKBridge(opts) {
             sendAndRecord(session, { type: "done", code: 0 });
           }
         } else if (session.destroying) {
+          taskLifecycle.clearAll(session);
           // Suppress error messages during shutdown
           console.log("[sdk-bridge] Suppressing stream error during shutdown for session " + session.localId);
         } else {
+          taskLifecycle.clearAll(session);
           var errDetail = err.message || String(err);
           if (err.stderr) errDetail += "\nstderr: " + err.stderr;
           if (err.exitCode != null) errDetail += " (exitCode: " + err.exitCode + ")";
@@ -1370,10 +1386,19 @@ function createSDKBridge(opts) {
     }
   }
 
-  async function rollbackConversation(session, numTurns) {
+  async function rollbackConversation(session, turnId) {
     var sessionAdapter = getAdapterForSession(session);
     if (sessionAdapter && typeof sessionAdapter.rollbackThread === "function") {
-      await sessionAdapter.rollbackThread(session.cliSessionId, numTurns, {
+      // Codex's thread/revert requires its own turnId (beforeTurnId), not a
+      // turn count. A session whose target turn predates turnId capture (or
+      // whose persisted record lost it) has nothing valid to send: throwing
+      // here -- rather than guessing or silently skipping -- lets the caller
+      // abort the whole rewind instead of leaving local history trimmed
+      // ahead of the real, un-rolled-back provider thread.
+      if (!turnId) {
+        throw new Error("No turn id recorded for this turn; cannot roll back the Codex thread.");
+      }
+      await sessionAdapter.rollbackThread(session.cliSessionId, turnId, {
         linuxUser: getSessionLinuxUser(session) || undefined,
       });
     }
@@ -1620,7 +1645,7 @@ function createSDKBridge(opts) {
 
     session.blocks = {};
     session.sentToolResults = {};
-    session.activeTaskToolIds = {};
+    taskLifecycle.clearAll(session);
     session.pendingElicitations = {};
     session.streamedText = false;
     session.responsePreview = "";
@@ -1685,9 +1710,16 @@ function createSDKBridge(opts) {
       else if (session.acceptEditsAfterStart) effectiveDefault = "acceptEdits";
       else effectiveDefault = globalMode;
       var modeToApply = session._loopPermissionMode || effectiveDefault;
-      if (modeToApply && modeToApply !== "default") {
-        claudeOpts.permissionMode = modeToApply;
-      }
+      // Always set permissionMode explicitly, including "default". SDK
+      // 0.3.286+ leaves an omitted permissionMode to Claude Code itself,
+      // which can apply a settings defaultMode or start in auto mode on
+      // third-party providers / with telemetry off -- silently widening
+      // past Clay's Ask policy. Sending "default" keeps the SDK's own
+      // decision point at the same "default" behavior Clay has always run
+      // under: a tool the SDK's own allowed/denied rules or allowedTools
+      // list already settles is not re-asked, but anything left undecided
+      // still reaches Clay's canUseTool callback, as before.
+      claudeOpts.permissionMode = modeToApply || "default";
     }
     // Clear one-shot acceptEditsAfterStart regardless of which branch ran above,
     // so the flag does not linger into subsequent turns.
@@ -2022,6 +2054,7 @@ function createSDKBridge(opts) {
       session.isProcessing = false;
       session._awaitingTurnResult = false;
       session._queuedTurnCount = 0;
+      taskLifecycle.clearAll(session);
       onProcessingChanged();
       session.queryInstance = null;
       session.messageQueue = null;
@@ -2079,6 +2112,7 @@ function createSDKBridge(opts) {
       session.isProcessing = false;
       session._awaitingTurnResult = false;
       session._queuedTurnCount = 0;
+      taskLifecycle.clearAll(session);
       onProcessingChanged();
       sm.broadcastSessionList();
       return false;
@@ -2096,6 +2130,7 @@ function createSDKBridge(opts) {
       session.isProcessing = false;
       session._awaitingTurnResult = false;
       session._queuedTurnCount = 0;
+      taskLifecycle.clearAll(session);
       onProcessingChanged();
       sendAndRecord(session, { type: "error", text: "The agent connection closed before it received your message. Please send it again." });
       sendAndRecord(session, { type: "done", code: 1 });
@@ -2499,6 +2534,7 @@ function createSDKBridge(opts) {
     var session = sm.getActiveSession();
     if (!session) return;
     session.taskStopRequested = true;
+    taskLifecycle.finish(session, null, taskId);
     if (!session.queryInstance) return;
     try {
       // Route through QueryHandle (works for both in-process and worker paths)
@@ -2582,6 +2618,10 @@ function createSDKBridge(opts) {
           CLAUDE: {
             settingSources: ["user"],
             includePartialMessages: true,
+            // Explicit, not omitted: SDK 0.3.286+ leaves an omitted
+            // permissionMode to Claude Code's own default/auto behavior,
+            // which could bypass the deny-by-default canUseTool above.
+            permissionMode: "default",
           },
         },
       });

package/lib/sdk-message-processor.js

@@ -1,5 +1,6 @@
 var usersModule = require("./users");
 var turnQueue = require("./sdk-turn-queue");
+var taskLifecycle = require("./sdk-task-lifecycle");
 var contextUsage = require("./context-usage");
 var yoke = require("./yoke");
 var backgroundTaskTiming = require("./background-task-timing");
@@ -193,8 +194,11 @@ function attachMessageProcessor(ctx) {
     // Capture message UUIDs for rewind support
     if (parsed.uuid) {
       if (parsed.messageType === "user" && !parsed.parentToolUseId) {
-        session.messageUUIDs.push({ uuid: parsed.uuid, type: "user", historyIndex: session.history.length });
-        sendAndRecord(session, { type: "message_uuid", uuid: parsed.uuid, messageType: "user" });
+        // turnId (Codex's own turn identifier, distinct from this uuid) is
+        // stored so a later rewind can send Codex's thread/revert
+        // beforeTurnId instead of a turn count. Undefined for Claude.
+        session.messageUUIDs.push({ uuid: parsed.uuid, type: "user", historyIndex: session.history.length, turnId: parsed.turnId || null });
+        sendAndRecord(session, { type: "message_uuid", uuid: parsed.uuid, messageType: "user", turnId: parsed.turnId || null });
       } else if (parsed.messageType === "assistant") {
         session.messageUUIDs.push({ uuid: parsed.uuid, type: "assistant", historyIndex: session.history.length });
         sendAndRecord(session, { type: "message_uuid", uuid: parsed.uuid, messageType: "assistant" });
@@ -252,6 +256,14 @@ function attachMessageProcessor(ctx) {
       if (parsed.fastModeState) {
         sendAndRecord(session, { type: "fast_mode_state", state: parsed.fastModeState });
       }
+      if (Array.isArray(parsed.pluginErrors) && parsed.pluginErrors.length > 0) {
+        var pluginPaths = parsed.pluginErrors.map(function (e) { return e && e.path; }).filter(Boolean);
+        sendAndRecord(session, {
+          type: "informational",
+          level: "warning",
+          content: "Plugin failed to load: " + (pluginPaths.join(", ") || "unknown path"),
+        });
+      }
     }
 
     if (parsed.yokeType === "turn_start") {
@@ -474,13 +486,29 @@ function attachMessageProcessor(ctx) {
         for (var i = 0; i < content.length; i++) {
           var block = content[i];
           if (block.type === "tool_result" && !session.sentToolResults[block.tool_use_id]) {
-            // Clear active Task tool when its result arrives
-            if (session.activeTaskToolIds && session.activeTaskToolIds[block.tool_use_id]) {
+            // SDK: a WebFetch/WebSearch call that stepped aside for a
+            // priority message carries { detachedToolCall: true } here "in
+            // place of its Output: the call is still running, and its result
+            // reaches the model in a later turn" under the same tool_use_id.
+            // Do not mark it sent, or that later real tool_result for the
+            // same id would be silently dropped by the dedup check above;
+            // do not clear its active-task bookkeeping either, since it has
+            // not actually finished.
+            var isDetached = !!(parsed.toolUseResult
+              && parsed.toolUseResult.detachedToolCall === true
+              && parsed.detachedToolId === block.tool_use_id);
+
+            // Clear both lifecycle indexes when the real terminal result
+            // arrives. A later duplicate task_notification will then be
+            // recognized as already settled.
+            var finishedTask = isDetached
+              ? { matched: false }
+              : taskLifecycle.finish(session, block.tool_use_id, null);
+            if (finishedTask.matched) {
               sendAndRecord(session, {
                 type: "subagent_done",
                 parentToolId: block.tool_use_id,
               });
-              delete session.activeTaskToolIds[block.tool_use_id];
             }
             var resultText = "";
             var resultImages = [];
@@ -501,13 +529,14 @@ function attachMessageProcessor(ctx) {
                 }
               }
             }
-            session.sentToolResults[block.tool_use_id] = true;
+            if (!isDetached) session.sentToolResults[block.tool_use_id] = true;
             var toolResultMsg = {
               type: "tool_result",
               id: block.tool_use_id,
               content: resultText,
               is_error: block.is_error || false,
             };
+            if (isDetached) toolResultMsg.detached = true;
             if (resultImages.length > 0) toolResultMsg.images = resultImages;
             sendAndRecord(session, toolResultMsg);
           }
@@ -515,6 +544,22 @@ function attachMessageProcessor(ctx) {
       }
 
     } else if (parsed.yokeType === "result") {
+      // SDK 0.3.274 batches queued background-task completion wakes into one
+      // model call. Every wake still emits a result, but all results before
+      // the final wake are successful task-notification-origin placeholders
+      // with no model turns and no result text. They are not user-turn
+      // completion boundaries: queued_turn_count cannot identify them because
+      // that field counts user sends only. Keep permissions, elicitations,
+      // processing state, completion callbacks and notifications intact until
+      // the real result arrives.
+      var isIntermediateBackgroundResult = parsed.subtype === "success"
+        && parsed.is_error !== true
+        && parsed.numTurns === 0
+        && parsed.origin && parsed.origin.kind === "task-notification"
+        && !parsed.localCommand
+        && parsed.resultText === "";
+      if (isIntermediateBackgroundResult) return;
+
       var overloadAbortRequested = !!session._overloadAbortRequested;
       session._overloadAbortRequested = false;
       session.blocks = {};
@@ -539,8 +584,16 @@ function attachMessageProcessor(ctx) {
         sendAndRecord(session, { type: "ask_user_answered", toolId: lid });
       }
       session.pendingAskUser = keptAskUser;
-      session.activeTaskToolIds = {};
-      session.taskIdMap = {};
+      // activeTaskToolIds / taskIdMap are deliberately NOT reset here. A
+      // backgrounded Task/agent/MCP call (SDK 0.3.286: a priority "now"
+      // message can move a running tool to the background and let the turn's
+      // own result fire without waiting for it) can still be genuinely
+      // running when this result arrives. Clearing these maps here would
+      // orphan that task:
+      // its real tool_result / task_notification would arrive later with no
+      // matching entry, and the client would never get subagent_done. Both
+      // maps are self-cleaning at the point each tracked task actually
+      // finishes (see the tool_result and task_notification handlers below).
       // Only clear rateLimitResetsAt on genuine success (non-zero cost).
       // When rate-limited, the SDK sends result with zero cost right after
       // rate_limit_event; clearing here would prevent auto-continue scheduling.
@@ -549,6 +602,23 @@ function attachMessageProcessor(ctx) {
       }
       console.log("[sdk-bridge] result handler: session " + session.localId + " cost=" + parsed.cost + " rateLimitResetsAt=" + session.rateLimitResetsAt);
 
+      // A known, named startup failure (e.g. auth, provider_not_allowed) the
+      // CLI reports on the error result it writes before exiting -- distinct
+      // from an ordinary in-turn execution error, and not gated on a specific
+      // subtype since it marks the run never got past startup at all.
+      if (parsed.startupFailureReason) {
+        console.error("[sdk-bridge] Startup failure for session " + session.localId + ": " + parsed.startupFailureReason);
+        session.isProcessing = false;
+        session._awaitingTurnResult = false;
+        session._queuedTurnCount = 0;
+        taskLifecycle.clearAll(session);
+        onProcessingChanged();
+        sendAndRecord(session, { type: "error", text: "Claude failed to start: " + parsed.startupFailureReason });
+        sendAndRecord(session, { type: "done", code: 1 });
+        sm.broadcastSessionList();
+        return;
+      }
+
       // Handle SDK execution errors: show the error to the user instead of
       // silently swallowing it. These have subtype "error_during_execution".
       if (parsed.subtype === "error_during_execution") {
@@ -561,6 +631,7 @@ function attachMessageProcessor(ctx) {
         session.isProcessing = false;
         session._awaitingTurnResult = false;
         session._queuedTurnCount = 0;
+        taskLifecycle.clearAll(session);
         onProcessingChanged();
         if (!overloadAbortRequested) {
           sendAndRecord(session, { type: "error", text: "Claude error: " + execError });
@@ -768,8 +839,9 @@ function attachMessageProcessor(ctx) {
       }
 
     } else if (parsed.yokeType === "task_notification") {
-      var parentId = parsed.parentToolId;
-      if (parentId) {
+      var finishedTask = taskLifecycle.finish(session, parsed.parentToolId, parsed.taskId);
+      var parentId = finishedTask.parentToolId;
+      if (parentId && finishedTask.matched) {
         sendAndRecord(session, {
           type: "subagent_done",
           parentToolId: parentId,
@@ -778,14 +850,6 @@ function attachMessageProcessor(ctx) {
           usage: parsed.usage || null,
         });
       }
-      if (session.taskIdMap) {
-        for (var k in session.taskIdMap) {
-          if (session.taskIdMap[k] === parsed.taskId) {
-            delete session.taskIdMap[k];
-            break;
-          }
-        }
-      }
 
     } else if (parsed.yokeType === "rate_limit") {
       var info = parsed.rateLimitInfo;
@@ -965,6 +1029,7 @@ function attachMessageProcessor(ctx) {
       session.isProcessing = false;
       session._awaitingTurnResult = false;
       session._queuedTurnCount = 0;
+      taskLifecycle.clearAll(session);
       onProcessingChanged();
       emitAuthRequired(session);
 

package/lib/sdk-task-lifecycle.js

@@ -0,0 +1,52 @@
+function clearAll(session) {
+  session.activeTaskToolIds = {};
+  session.taskIdMap = {};
+}
+
+function clearForeground(session) {
+  var backgroundIds = {};
+  var backgroundTasks = Array.isArray(session.activeBackgroundTasks) ? session.activeBackgroundTasks : [];
+  for (var i = 0; i < backgroundTasks.length; i++) {
+    if (backgroundTasks[i] && backgroundTasks[i].task_id) backgroundIds[backgroundTasks[i].task_id] = true;
+  }
+
+  var keptTaskIds = {};
+  var keptToolIds = {};
+  var taskIdMap = session.taskIdMap || {};
+  for (var parentToolId in taskIdMap) {
+    var taskId = taskIdMap[parentToolId];
+    if (!backgroundIds[taskId]) continue;
+    keptTaskIds[parentToolId] = taskId;
+    if (session.activeTaskToolIds && session.activeTaskToolIds[parentToolId]) keptToolIds[parentToolId] = true;
+  }
+  session.activeTaskToolIds = keptToolIds;
+  session.taskIdMap = keptTaskIds;
+}
+
+function finish(session, parentToolId, taskId) {
+  var parentId = parentToolId || null;
+  var matched = false;
+
+  if (parentId && session.activeTaskToolIds && session.activeTaskToolIds[parentId]) {
+    matched = true;
+    delete session.activeTaskToolIds[parentId];
+  }
+  if (parentId && session.taskIdMap && session.taskIdMap[parentId]) {
+    matched = true;
+    delete session.taskIdMap[parentId];
+  }
+
+  if (taskId && session.taskIdMap) {
+    for (var key in session.taskIdMap) {
+      if (session.taskIdMap[key] !== taskId) continue;
+      matched = true;
+      delete session.taskIdMap[key];
+      if (session.activeTaskToolIds) delete session.activeTaskToolIds[key];
+      if (!parentId) parentId = key;
+    }
+  }
+
+  return { matched: matched, parentToolId: parentId };
+}
+
+module.exports = { clearAll: clearAll, clearForeground: clearForeground, finish: finish };

package/lib/sessions.js

@@ -323,7 +323,7 @@ function createSessionManager(opts) {
       var messageUUIDs = [];
       for (var k = 0; k < loaded[i].history.length; k++) {
         if (loaded[i].history[k].type === "message_uuid") {
-          messageUUIDs.push({ uuid: loaded[i].history[k].uuid, type: loaded[i].history[k].messageType, historyIndex: k });
+          messageUUIDs.push({ uuid: loaded[i].history[k].uuid, type: loaded[i].history[k].messageType, historyIndex: k, turnId: loaded[i].history[k].turnId || null });
         }
       }
       var hasTitleProvenance = Object.prototype.hasOwnProperty.call(m, "titleProvisional")

package/lib/yoke/adapters/claude-worker.js

@@ -337,6 +337,9 @@ function canUseTool(toolName, input, opts) {
     decisionReason: opts.decisionReason || "",
     defaultToNo: opts.defaultToNo === true,
     suppressAlwaysAllowRule: opts.suppressAlwaysAllowRule === true,
+    mcpServer: (opts.mcpServer && typeof opts.mcpServer === "object")
+      ? { name: opts.mcpServer.name || null, source: opts.mcpServer.source || null }
+      : null,
   });
   return new Promise(function(resolve) {
     pendingPermissions[requestId] = resolve;

package/lib/yoke/adapters/claude.js

@@ -257,6 +257,7 @@ function flattenEvent(raw) {
   if (raw.resume_reason) base.resumeReason = raw.resume_reason;
   if (Number.isInteger(raw.result_index)) base.resultIndex = raw.result_index;
   if (raw.local_command) base.localCommand = raw.local_command;
+  if (raw.origin && typeof raw.origin === "object") base.origin = raw.origin;
   if (raw.session_id) base.sessionId = raw.session_id;
   if (raw.uuid) {
     base.uuid = raw.uuid;
@@ -342,6 +343,10 @@ function flattenEvent(raw) {
       base.slashCommands = raw.slash_commands;
       base.fastModeState = raw.fast_mode_state || null;
       base.permissionMode = raw.permissionMode || raw.permission_mode || null;
+      // SDK 0.3.283: entries for a --plugin-dir that did not load, each with
+      // a `path`. Forwarded so the user can see a plugin silently failed
+      // instead of finding its commands/skills simply missing.
+      base.pluginErrors = Array.isArray(raw.plugin_errors) ? raw.plugin_errors : null;
       return base;
     }
     if (raw.subtype === "status") {
@@ -392,7 +397,7 @@ function flattenEvent(raw) {
     }
     if (raw.subtype === "task_notification") {
       base.yokeType = "task_notification";
-      base.parentToolId = raw.parent_tool_use_id;
+      base.parentToolId = raw.tool_use_id || raw.parent_tool_use_id;
       base.taskId = raw.task_id;
       base.status = raw.status || "completed";
       base.summary = raw.summary || "";
@@ -475,6 +480,8 @@ function flattenEvent(raw) {
   if (raw.type === "result") {
     base.yokeType = "result";
     base.is_error = raw.is_error === true;
+    base.numTurns = Number.isInteger(raw.num_turns) ? raw.num_turns : null;
+    base.resultText = typeof raw.result === "string" ? raw.result : null;
     if (Number.isInteger(raw.queued_turn_count) && raw.queued_turn_count >= 0) base.queuedTurnCount = raw.queued_turn_count;
     base.cost = raw.total_cost_usd;
     base.duration = raw.duration_ms;
@@ -483,6 +490,10 @@ function flattenEvent(raw) {
     base.subtype = raw.subtype;
     base.errors = raw.errors;
     base.terminalReason = raw.terminal_reason;
+    // SDK 0.3.280: a known, named reason a stream-json run failed to start
+    // (e.g. auth, provider_not_allowed) carried on the error result the CLI
+    // writes before exiting, distinct from an ordinary in-turn execution error.
+    base.startupFailureReason = raw.startup_failure_reason || null;
     base.fastModeState = raw.fast_mode_state || null;
     return base;
   }
@@ -499,6 +510,17 @@ function flattenEvent(raw) {
     base.yokeType = "message";
     base.messageRole = raw.type;
     base.content = raw.message ? raw.message.content : null;
+    // Structured sibling metadata for the single tool_result this message
+    // carries (SDK type docs: "the tool's full Output object, not the string
+    // content sent to the model" -- never the text Clay actually renders).
+    // Its only use here is detecting `{ detachedToolCall: true }`: a call
+    // that stepped aside for a priority message, whose real result "reaches
+    // the model in a later turn" under the same tool_use_id.
+    base.toolUseResult = raw.tool_use_result || null;
+    if (raw.tool_use_result && raw.tool_use_result.detachedToolCall === true && Array.isArray(base.content)) {
+      var detachedResults = base.content.filter(function(block) { return block && block.type === "tool_result"; });
+      if (detachedResults.length === 1) base.detachedToolId = detachedResults[0].tool_use_id || null;
+    }
     return base;
   }
 
@@ -519,7 +541,7 @@ function flattenEvent(raw) {
   // --- task_notification ---
   if (raw.type === "task_notification") {
     base.yokeType = "task_notification";
-    base.parentToolId = raw.parent_tool_use_id;
+    base.parentToolId = raw.tool_use_id || raw.parent_tool_use_id;
     base.taskId = raw.task_id;
     base.status = raw.status || "completed";
     base.summary = raw.summary || "";
@@ -1134,6 +1156,7 @@ function createWorkerQueryHandle(worker, canUseTool, onElicitation, callMcpTool,
             decisionReason: msg.decisionReason,
             defaultToNo: msg.defaultToNo === true,
             suppressAlwaysAllowRule: msg.suppressAlwaysAllowRule === true,
+            mcpServer: msg.mcpServer || null,
             signal: interactionAbort.signal,
           }).then(function(result) {
             if (interactionAbort.signal.aborted) result = { behavior: "deny", message: "Query cancelled" };

package/lib/yoke/adapters/codex.js

@@ -190,7 +190,10 @@ function flattenEvent(notification, state) {
     state.lastOutputTokens = null;
     state.currentContextUsage = null;
     var userUuid = generateUuid();
-    events.push({ yokeType: "turn_start", uuid: userUuid, messageType: "user" });
+    // turnId (Codex's own id, distinct from Clay's local uuid) is required
+    // by thread/revert's beforeTurnId; without it this turn can never be
+    // the target of a later rollback.
+    events.push({ yokeType: "turn_start", uuid: userUuid, messageType: "user", turnId: state.currentTurnId });
     return events;
   }
 
@@ -2145,14 +2148,37 @@ function createCodexAdapter(opts) {
         return { sessionId: newThreadId };
       });
     },
-    rollbackThread: function(threadId, numTurns, opts) {
+    // Codex 0.160+ replaced the count-based `thread/rollback` (threadId,
+    // numTurns) with `thread/revert` (threadId, beforeTurnId): the turn
+    // excluded from the replacement history, together with every later turn.
+    rollbackThread: async function(threadId, beforeTurnId, opts) {
       var requestedLinuxUser = opts && opts.linuxUser;
       if (!_runtimeLinuxUser && requestedLinuxUser) {
-        return getUserRuntime(requestedLinuxUser).rollbackThread(threadId, numTurns, withoutLinuxUser(opts));
+        return getUserRuntime(requestedLinuxUser).rollbackThread(threadId, beforeTurnId, withoutLinuxUser(opts));
       }
       if (_requiresLinuxUser) return Promise.reject(new Error("Codex requires a mapped Linux user while OS-user isolation is enabled"));
-      if (!_appServer || !_appServer.started) return Promise.resolve(null);
-      return _appServer.send("thread/rollback", { threadId: threadId, numTurns: numTurns }, 30000);
+      // A missing/stopped app-server means the revert was never sent, so the
+      // Codex thread was never touched. Resolving null here (as this used to)
+      // reads as success to the caller, which then trims Clay's own local
+      // history to match a rollback that never happened. Lazily (re)start the
+      // app-server first, as createQuery does, and only fail if that does not
+      // bring it up -- never silently report success without sending anything.
+      if (!_appServer || !_appServer.started) await adapter.init(opts || {});
+      if (!_appServer || !_appServer.started) {
+        throw new Error("Codex app-server is not running; the thread was not rolled back.");
+      }
+      var revertResult = await _appServer.send("thread/revert", { threadId: threadId, beforeTurnId: beforeTurnId }, 30000);
+      // Confirm the server actually reports the exact thread it was asked to
+      // cut, rather than trusting any truthy response: ThreadRevertResponse's
+      // `thread` field is required and always carries that thread's own `id`
+      // (per the app-server's generated protocol schema). A response for a
+      // different thread id -- e.g. misrouted after a resume/fork -- or a
+      // malformed/empty response is treated the same as a failure, never as
+      // a silent success.
+      if (!revertResult || !revertResult.thread || revertResult.thread.id !== threadId) {
+        throw new Error("Codex did not confirm the thread revert.");
+      }
+      return revertResult;
     },
 
     // Shutdown the app-server process

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "clay-server",
-  "version": "4.7.0-beta.5",
+  "version": "4.7.0",
   "description": "Self-hosted team workspace for Claude Code and Codex. Multi-user, browser-based, with persistent AI mates.",
   "bin": {
     "clay-server": "./bin/cli.js"
@@ -47,9 +47,9 @@
   "homepage": "https://github.com/chadbyte/clay#readme",
   "author": "Chad",
   "dependencies": {
-    "@anthropic-ai/claude-agent-sdk": "^0.3.272",
+    "@anthropic-ai/claude-agent-sdk": "^0.3.287",
     "@lydell/node-pty": "^1.2.0-beta.3",
-    "@openai/codex": "^0.154.0",
+    "@openai/codex": "^0.160.0",
     "@seald-io/nedb": "^4.1.2",
     "imapflow": "^1.7.8",
     "nodemailer": "^9.1.1",