clay-server 3.4.0-beta.20 → 3.4.0-beta.22

package/lib/project-session-pair.js

@@ -98,10 +98,15 @@ function attachSessionPair(ctx) {
     token.delivered = true;
     var failure = token.failure || null;
     var response = token.response || "";
-    var text = "A Worker task delegated through send_to_partner has finished.\n\n" +
-      "Original task:\n" + token.message + "\n\n" +
-      (failure ? "Worker error:\n" + failure : "Worker result:\n" + (response || "(No text response was recorded.)")) +
-      "\n\nReview the result, verify it as needed, and continue the task.";
+    var text;
+    if (token.interrupted) {
+      text = "[Worker execution interrupted] The user interrupted the Worker mid-turn. Its work is PARTIAL and unverified — do not treat it as finished. Review what was done and decide next steps with the user.";
+    } else {
+      text = "A Worker task delegated through send_to_partner has finished.\n\n" +
+        "Original task:\n" + token.message + "\n\n" +
+        (failure ? "Worker error:\n" + failure : "Worker result:\n" + (response || "(No text response was recorded.)")) +
+        "\n\nReview the result, verify it as needed, and continue the task.";
+    }
     sm.sendAndRecord(caller, {
       type: "user_message",
       text: text,
@@ -146,6 +151,7 @@ function attachSessionPair(ctx) {
     }
     token.response = responseText(partner.history || [], token.startIndex);
     token.failure = errorSince(partner.history || [], token.startIndex);
+    token.interrupted = !token.failure && !!partner._lastTurnInterrupted;
     finishDelegation(group, caller, partner, token);
     return resumeDriverWithResult(caller, partner, token);
   }
@@ -165,8 +171,9 @@ function attachSessionPair(ctx) {
           clearInterval(timer);
           finishDelegation(group, caller, partner, token);
           var failure = errorSince(partner.history || [], token.startIndex);
+          var interrupted = !failure && !!partner._lastTurnInterrupted;
           resolve({
-            status: failure ? "error" : "complete",
+            status: failure ? "error" : (interrupted ? "interrupted" : "complete"),
             response: responseText(partner.history || [], token.startIndex),
             error: failure || undefined,
           });
@@ -260,7 +267,7 @@ function attachSessionPair(ctx) {
       var count = Number.isFinite(args.lastTurns) ? Math.floor(args.lastTurns) : 1;
       count = Math.max(1, Math.min(5, count));
       return toolResult({
-        status: resolved.partner.isProcessing ? "running" : "idle",
+        status: resolved.partner.isProcessing ? "running" : (resolved.partner._lastTurnInterrupted ? "interrupted" : "idle"),
         partnerId: resolved.partner.localId,
         title: resolved.partner.title || "New Session",
         turns: recentTurns(resolved.partner, count),
@@ -383,7 +390,7 @@ function attachSessionPair(ctx) {
     var group = store.groupForMember(session.localId);
     var pairPrompt = "";
     if (group && group.pair && group.pair.driverId === session.localId) {
-      pairPrompt = "You are the Driver in a two-agent pair. The tools send_to_partner and read_partner are provided directly to you. Use send_to_partner to delegate concrete bounded work to the Worker. A completed Worker turn leaves the Worker session available for more work. If review or user feedback requires corrections to the Worker's implementation, delegate a follow-up turn to that Worker instead of editing the Worker-owned files yourself. If send_to_partner reports that the Worker is no longer available, create a replacement with spawn_sessions and delegate the remaining implementation rather than taking it over. If a non-waiting delegation finishes later, Clay pushes the result back and resumes you automatically; use read_partner only when you need an interim status check. Integrate and verify the final outcome. Do not search the project for implementations of these tools, and do not delegate work that must be performed sequentially in this same session.";
+      pairPrompt = "You are the Driver in a two-agent pair. The tools send_to_partner and read_partner are provided directly to you. Use send_to_partner to delegate concrete bounded work to the Worker. A completed Worker turn leaves the Worker session available for more work. If a Worker turn is interrupted, its work is partial and unverified; review it and decide next steps with the user. If review or user feedback requires corrections to the Worker's implementation, delegate a follow-up turn to that Worker instead of editing the Worker-owned files yourself. If send_to_partner reports that the Worker is no longer available, create a replacement with spawn_sessions and delegate the remaining implementation rather than taking it over. If a non-waiting delegation finishes later, Clay pushes the result back and resumes you automatically; use read_partner only when you need an interim status check. Integrate and verify the final outcome. Do not search the project for implementations of these tools, and do not delegate work that must be performed sequentially in this same session.";
     }
     return [pairPrompt, workerProposal.getSystemPrompt(session)].filter(Boolean).join("\n\n");
   }

package/lib/project-session-spawn.js

@@ -319,7 +319,7 @@ function attachSessionSpawn(ctx) {
         statuses.push({
           localId: session.localId,
           title: session.title || "New Session",
-          status: session.isProcessing ? "running" : (hasSessionError(session) ? "error" : "done"),
+          status: session.isProcessing ? "running" : (session._lastTurnInterrupted ? "interrupted" : (hasSessionError(session) ? "error" : "done")),
           turnCount: session.turnCount || 0,
           lastActivity: session.lastActivity || session.createdAt || 0,
         });

package/lib/project-worker-proposal.js

@@ -248,6 +248,8 @@ function attachWorkerProposal(ctx) {
     var followup;
     if (result.status === "complete") {
       followup = "[Worker execution completed]\nReview and verify the Worker's result. The Worker session remains available: if the implementation needs corrections or additional edits, send a follow-up with send_to_partner instead of taking over the Worker-owned files yourself. If that Worker is no longer available, create a replacement with spawn_sessions for the remaining implementation.\n\n" + (result.response || "The Worker completed without a text summary.");
+    } else if (result.status === "interrupted") {
+      followup = "[Worker execution interrupted]\nThe user interrupted the Worker mid-turn. Its work is PARTIAL and unverified — do not treat it as finished. Review what was done and decide next steps with the user.";
     } else if (result.status === "running") {
       followup = "[Worker execution is still running]\nUse read_partner to inspect progress before completing the task.";
     } else {

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

@@ -95,6 +95,7 @@ function statusLabel(status) {
   if (status === "starting") return "Starting Worker";
   if (status === "running") return "Worker running";
   if (status === "completed") return "Completed";
+  if (status === "interrupted") return "Interrupted";
   if (status === "declined") return "Continuing here";
   if (status === "error") return "Needs attention";
   return "Suggested by Fable";

package/lib/sdk-bridge.js

@@ -885,6 +885,7 @@ function createSDKBridge(opts) {
       console.log("[sdk-bridge] processQueryStream ended: isProcessing=" + session.isProcessing + " taskStopRequested=" + session.taskStopRequested);
       var stillOwnsRuntime = session.queryInstance === myQueryInstance;
       if (session.isProcessing && session.taskStopRequested && stillOwnsRuntime) {
+        session._lastTurnInterrupted = true;
         session.isProcessing = false;
         session._awaitingTurnResult = false;
         session._queuedTurnCount = 0;
@@ -922,6 +923,7 @@ function createSDKBridge(opts) {
         session._queuedTurnCount = 0;
         onProcessingChanged();
         if (err.name === "AbortError" || (myAbortController && myAbortController.signal.aborted) || session.taskStopRequested) {
+          session._lastTurnInterrupted = true;
           if (!session.destroying) {
             sendAndRecord(session, { type: "thinking_stop" });
             var interruptMsg2 = (session.vendor && session.vendor !== "claude")
@@ -1189,6 +1191,7 @@ function createSDKBridge(opts) {
   // Wrapper: marks the boot window so pushMessage can buffer instead of
   // dropping messages that arrive while createQuery is still awaiting.
   async function startQuery(session, text, images, linuxUser) {
+    delete session._lastTurnInterrupted;
     session._queryStarting = true;
     try {
       return await startQueryInner(session, text, images, linuxUser);
@@ -1707,6 +1710,7 @@ function createSDKBridge(opts) {
         console.error("[sdk-bridge] QueryHandle rejected message for session " + session.localId + ":", e.message || e);
       }
       if (delivered) {
+        delete session._lastTurnInterrupted;
         if (session._awaitingTurnResult) {
           session._queuedTurnCount = (session._queuedTurnCount || 0) + 1;
         } else {

package/lib/yoke/adapters/codex.js

@@ -8,6 +8,7 @@ var fs = require("fs");
 var { CodexAppServer } = require("../codex-app-server");
 var skillDiscovery = require("../skill-discovery");
 var { resolveOsUserInfo } = require("../../os-users");
+var backgroundTasks = require("../codex-background-tasks");
 
 // --- Event flattening ---
 // Converts app-server JSON-RPC notifications into flat objects with a yokeType field.
@@ -672,6 +673,7 @@ function createEventState(model) {
     toolBlocks: {},
     commandInputs: {},
     planTexts: {},
+    backgroundTasks: backgroundTasks.createState(),
   };
 }
 
@@ -698,6 +700,7 @@ function createCodexQueryHandle(appServer, queryOpts) {
   var eventWaiting = null;
   var iteratorDone = false;
   var finishedNotified = false;
+  var removeBackgroundTaskReset = null;
 
   function notifyFinished() {
     if (finishedNotified) return;
@@ -722,6 +725,12 @@ function createCodexQueryHandle(appServer, queryOpts) {
     }
   }
 
+  if (typeof queryOpts.registerBackgroundTaskReset === "function") {
+    removeBackgroundTaskReset = queryOpts.registerBackgroundTaskReset(function() {
+      backgroundTasks.emitReset(state.backgroundTasks, pushEvent);
+    });
+  }
+
   function endIterator() {
     iteratorDone = true;
     if (eventWaiting) {
@@ -729,6 +738,10 @@ function createCodexQueryHandle(appServer, queryOpts) {
       eventWaiting = null;
       resolve({ value: undefined, done: true });
     }
+    if (removeBackgroundTaskReset) {
+      removeBackgroundTaskReset();
+      removeBackgroundTaskReset = null;
+    }
     notifyFinished();
   }
 
@@ -934,6 +947,10 @@ function createCodexQueryHandle(appServer, queryOpts) {
       pushEvent(yokeEvents[i]);
     }
 
+    if (method === "turn/completed" || method === "turn/failed") {
+      backgroundTasks.poll(appServer, state.threadId, state.backgroundTasks, pushEvent).catch(function() {});
+    }
+
     // Resolve turn promise when turn ends
     if (method === "turn/completed" || method === "turn/failed") {
       if (turnResolve) {
@@ -1246,6 +1263,20 @@ function createCodexAdapter(opts) {
   ];
   var _cachedModels = CODEX_MODELS.slice();
   var _appServer = null;
+  var _backgroundTaskResetListeners = [];
+
+  function registerBackgroundTaskReset(listener) {
+    _backgroundTaskResetListeners.push(listener);
+    return function() {
+      var index = _backgroundTaskResetListeners.indexOf(listener);
+      if (index !== -1) _backgroundTaskResetListeners.splice(index, 1);
+    };
+  }
+
+  function emitBackgroundTaskReset() {
+    var listeners = _backgroundTaskResetListeners.slice();
+    for (var i = 0; i < listeners.length; i++) listeners[i]();
+  }
   var _initPromise = null;
   var _shutdownPromise = null;
   var _refCount = 0;
@@ -1541,6 +1572,7 @@ function createCodexAdapter(opts) {
         // Spawn and initialize app-server
         _appServer = _createAppServer(serverOpts);
         await _appServer.start();
+        emitBackgroundTaskReset();
 
         await _appServer.send("initialize", {
           clientInfo: { name: "clay", title: "Clay", version: "1.0.0" },
@@ -1676,6 +1708,7 @@ function createCodexAdapter(opts) {
         canUseTool: queryOpts.canUseTool || null,
         onElicitation: queryOpts.onElicitation || null,
         resumeSessionId: queryOpts.resumeSessionId || null,
+        registerBackgroundTaskReset: registerBackgroundTaskReset,
       };
 
       // Reasoning effort

package/lib/yoke/codex-background-tasks.js

@@ -0,0 +1,84 @@
+function terminalList(result) {
+  if (Array.isArray(result)) return result;
+  if (!result || typeof result !== "object") return [];
+  if (Array.isArray(result.terminals)) return result.terminals;
+  if (Array.isArray(result.backgroundTerminals)) return result.backgroundTerminals;
+  if (Array.isArray(result.items)) return result.items;
+  return [];
+}
+
+function isLiveTerminal(terminal) {
+  var status = String((terminal && (terminal.status || terminal.state)) || "").toLowerCase();
+  return status !== "exited" && status !== "terminated" && status !== "completed" && status !== "failed";
+}
+
+function mapTerminals(result) {
+  var terminals = terminalList(result);
+  var tasks = [];
+  for (var i = 0; i < terminals.length; i++) {
+    var terminal = terminals[i] || {};
+    var taskId = terminal.id || terminal.terminalId || terminal.taskId || "";
+    if (!taskId || !isLiveTerminal(terminal)) continue;
+    tasks.push({
+      task_id: String(taskId),
+      task_type: "shell",
+      description: terminal.commandLine || terminal.command || terminal.name || "",
+    });
+  }
+  return tasks;
+}
+
+function taskIds(tasks) {
+  var ids = {};
+  for (var i = 0; i < tasks.length; i++) ids[tasks[i].task_id] = true;
+  return ids;
+}
+
+function sameMembership(first, second) {
+  var firstKeys = Object.keys(first || {});
+  var secondKeys = Object.keys(second || {});
+  if (firstKeys.length !== secondKeys.length) return false;
+  for (var i = 0; i < firstKeys.length; i++) {
+    if (!second[firstKeys[i]]) return false;
+  }
+  return true;
+}
+
+function createState() {
+  return { taskIds: null };
+}
+
+function emitIfChanged(state, tasks, pushEvent) {
+  var ids = taskIds(tasks);
+  if (state.taskIds === null && tasks.length === 0) {
+    state.taskIds = ids;
+    return false;
+  }
+  if (state.taskIds && sameMembership(state.taskIds, ids)) return false;
+  state.taskIds = ids;
+  pushEvent({ yokeType: "background_tasks_changed", tasks: tasks });
+  return true;
+}
+
+function poll(appServer, threadId, state, pushEvent) {
+  if (!appServer || !threadId || appServer._clayBackgroundTasksPollingDisabled) return Promise.resolve(false);
+  return appServer.send("thread/backgroundTerminals/list", { threadId: threadId }).then(function(result) {
+    return emitIfChanged(state, mapTerminals(result), pushEvent);
+  }).catch(function() {
+    appServer._clayBackgroundTasksPollingDisabled = true;
+    return false;
+  });
+}
+
+function emitReset(state, pushEvent) {
+  state.taskIds = {};
+  pushEvent({ yokeType: "background_tasks_changed", tasks: [] });
+}
+
+module.exports = {
+  createState: createState,
+  mapTerminals: mapTerminals,
+  emitIfChanged: emitIfChanged,
+  poll: poll,
+  emitReset: emitReset,
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "clay-server",
-  "version": "3.4.0-beta.20",
+  "version": "3.4.0-beta.22",
   "description": "Self-hosted team workspace for Claude Code and Codex. Multi-user, browser-based, with persistent AI mates.",
   "bin": {
     "clay-server": "./bin/cli.js",