clay-server 3.2.2-beta.3 → 3.3.0-beta.2

package/lib/sdk-bridge.js

@@ -559,7 +559,7 @@ function createSDKBridge(opts) {
     // split partner, and a prompt on every delegation hop defeats the
     // driver/worker workflow. spawn_sessions is NOT here: it creates new
     // sessions and keeps its prompt.
-    var pairPartnerTools = { send_to_partner: true, read_partner: true };
+    var pairPartnerTools = { send_to_partner: true, read_partner: true, propose_worker: true };
     if (toolName.indexOf("mcp__clay-sessions__") === 0) {
       var sessionsToolName = toolName.substring(toolName.lastIndexOf("__") + 2);
       if (pairPartnerTools[sessionsToolName]) {
@@ -863,7 +863,8 @@ function createSDKBridge(opts) {
       // Stream ended normally after a task stop — no "result" message was sent,
       // so the session is still marked as processing. Send interrupted feedback.
       console.log("[sdk-bridge] processQueryStream ended: isProcessing=" + session.isProcessing + " taskStopRequested=" + session.taskStopRequested);
-      if (session.isProcessing && session.taskStopRequested) {
+      var stillOwnsRuntime = session.queryInstance === myQueryInstance;
+      if (session.isProcessing && session.taskStopRequested && stillOwnsRuntime) {
         session.isProcessing = false;
         onProcessingChanged();
         send({ type: "status", processing: false });
@@ -874,9 +875,24 @@ function createSDKBridge(opts) {
         sendAndRecord(session, { type: "info", text: interruptMsg });
         sendAndRecord(session, { type: "done", code: 0 });
         sm.broadcastSessionList();
+      } else if (session.isProcessing && stillOwnsRuntime) {
+        // Codex and Kiro can report a protocol error and then close their
+        // iterator without a result event. Treat any result-less stream end as
+        // a failed turn so the UI cannot remain on processing forever.
+        session.isProcessing = false;
+        onProcessingChanged();
+        if (!session._lastAdapterError) {
+          sendAndRecord(session, {
+            type: "error",
+            text: "The agent connection ended before completing the response.",
+          });
+        }
+        session._lastAdapterError = null;
+        sendAndRecord(session, { type: "done", code: 1 });
+        sm.broadcastSessionList();
       }
     } catch (err) {
-      if (session.isProcessing) {
+      if (session.isProcessing && session.queryInstance === myQueryInstance) {
         session.isProcessing = false;
         onProcessingChanged();
         if (err.name === "AbortError" || (myAbortController && myAbortController.signal.aborted) || session.taskStopRequested) {
@@ -1310,6 +1326,7 @@ function createSDKBridge(opts) {
     session.pendingElicitations = {};
     session.streamedText = false;
     session.responsePreview = "";
+    session._lastAdapterError = null;
 
     // For in-process path, create AbortController. For worker path, the adapter
     // handles abort internally and exposes it via handle.abort().
@@ -1574,7 +1591,22 @@ function createSDKBridge(opts) {
 
     // Push initial user message through the QueryHandle
     console.log("[sdk-bridge] pushing initial message via handle.pushMessage...");
-    handle.pushMessage(text, images);
+    var initialMessageAccepted = handle.pushMessage(text, images) !== false;
+    if (!initialMessageAccepted) {
+      console.error("[sdk-bridge] Query rejected initial message for session " + session.localId);
+      try { handle.close(); } catch (e) {}
+      if (session.queryInstance === handle) session.queryInstance = null;
+      session.messageQueue = null;
+      session.abortController = null;
+      session.isProcessing = false;
+      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 });
+      sm.broadcastSessionList();
+      return;
+    }
+    session._awaitingTurnResult = true;
+    session._queuedTurnCount = 0;
     console.log("[sdk-bridge] pushMessage done, starting processQueryStream...");
 
     // Flush messages that arrived while createQuery was still awaiting
@@ -1585,7 +1617,9 @@ function createSDKBridge(opts) {
       session.pendingPush = [];
       console.log("[sdk-bridge] flushing " + backlog.length + " buffered message(s) into new query");
       for (var bi = 0; bi < backlog.length; bi++) {
-        handle.pushMessage(backlog[bi].text, backlog[bi].images);
+        if (handle.pushMessage(backlog[bi].text, backlog[bi].images) !== false) {
+          session._queuedTurnCount++;
+        }
       }
     }
 
@@ -1634,7 +1668,14 @@ function createSDKBridge(opts) {
       } catch (e) {
         console.error("[sdk-bridge] QueryHandle rejected message for session " + session.localId + ":", e.message || e);
       }
-      if (delivered) return true;
+      if (delivered) {
+        if (session._awaitingTurnResult) {
+          session._queuedTurnCount = (session._queuedTurnCount || 0) + 1;
+        } else {
+          session._awaitingTurnResult = true;
+        }
+        return true;
+      }
 
       // The handle object can outlive its underlying input queue or worker.
       // Retire it before the caller starts a resumed replacement query; the

package/lib/sdk-message-processor.js

@@ -451,6 +451,8 @@ function attachMessageProcessor(ctx) {
         if (parsed.terminalReason) execError += " (reason: " + parsed.terminalReason + ")";
         console.error("[sdk-bridge] Execution error for session " + session.localId + ": " + execError);
         session.isProcessing = false;
+        session._awaitingTurnResult = false;
+        session._queuedTurnCount = 0;
         onProcessingChanged();
         sendAndRecord(session, { type: "error", text: "Claude error: " + execError });
         sendAndRecord(session, { type: "done", code: 1 });
@@ -458,8 +460,17 @@ function attachMessageProcessor(ctx) {
         return;
       }
 
-      session.isProcessing = false;
-      onProcessingChanged();
+      session._lastAdapterError = null;
+      var hasQueuedTurn = (session._queuedTurnCount || 0) > 0;
+      if (hasQueuedTurn) {
+        session._queuedTurnCount--;
+        session._awaitingTurnResult = true;
+      } else {
+        session.isProcessing = false;
+        session._awaitingTurnResult = false;
+        session._queuedTurnCount = 0;
+        onProcessingChanged();
+      }
       // Detect "Not logged in" scenario early for the check below
       var previewTrimmed = (session.responsePreview || "").trim();
       var isZeroCost = !parsed.cost || parsed.cost === 0;
@@ -494,6 +505,11 @@ function attachMessageProcessor(ctx) {
         emitAuthRequired(session);
       }
       sendAndRecord(session, { type: "done", code: 0 });
+      if (hasQueuedTurn) {
+        // The adapter immediately continues with the already queued user turn.
+        // Restore the client stop state after the previous turn's done event.
+        sendToSession(session, { type: "status", status: "processing" });
+      }
       var _donePreviewText = (session.responsePreview || "").replace(/\s+/g, " ").trim();
       if (_donePreviewText.length > 140) _donePreviewText = _donePreviewText.substring(0, 140) + "...";
       var _doneTitle = mateDisplayName ? (mateDisplayName + " responded") : (session.title || "Claude");
@@ -770,6 +786,14 @@ function attachMessageProcessor(ctx) {
       onProcessingChanged();
       emitAuthRequired(session);
 
+    } else if (parsed.yokeType === "error") {
+      // Adapters use a neutral error event for turn failures that arrive as
+      // protocol messages instead of thrown iterator errors. Remember it so
+      // processQueryStream can finish the turn when the iterator closes.
+      var adapterErrorText = parsed.text || parsed.message || parsed.error || "Agent runtime error";
+      session._lastAdapterError = adapterErrorText;
+      sendAndRecord(session, { type: "error", text: adapterErrorText });
+
     } else if (parsed.yokeType === "model_refusal") {
       // Model declined the request. "fallback" => the CLI retried on another
       // model; "no_fallback" => the turn ended with a refusal.

package/lib/session-pair-mcp-server.js

@@ -6,7 +6,7 @@ function getToolDefs(handlers) {
   return [
     {
       name: "send_to_partner",
-      description: "Delegate one concrete task to the other session in this split. The partner works visibly in its own pane. A delegated turn cannot delegate back, so keep orchestration one hop deep.",
+      description: "Delegate one concrete task to the other session in this split. The partner works visibly in its own pane. Detached completions are pushed back automatically. A delegated turn cannot delegate back, so keep orchestration one hop deep.",
       inputSchema: buildShape({
         message: { type: "string", description: "The complete task or question for the partner." },
         wait: { type: "boolean", description: "Wait for the partner's turn to finish. Defaults to true." },
@@ -16,7 +16,7 @@ function getToolDefs(handlers) {
     },
     {
       name: "read_partner",
-      description: "Read the partner's current status and recent conversation turns. Use this after a non-waiting delegation or timeout.",
+      description: "Read the partner's current status and recent conversation turns. Use this for an interim check after a non-waiting delegation or timeout; completed results are pushed automatically.",
       inputSchema: buildShape({
         lastTurns: { type: "number", description: "Number of recent user-message-delimited turns, from 1 to 5. Defaults to 1." },
       }),

package/lib/sessions.js

@@ -926,7 +926,7 @@ function createSessionManager(opts) {
       }
     }
     // Notify server for cross-project unread tracking
-    if (obj.type === "done") onSessionDone();
+    if (obj.type === "done") onSessionDone(session);
   }
 
   function resumeSession(cliSessionId, opts, targetWs) {

package/lib/ws-schema.js

@@ -38,6 +38,7 @@ var schema = {
   "split_group_set_pair":     { direction: "c2s", handler: "lib/session-split-groups.js", description: "Assign Driver/Worker roles on a split group (driverId null clears them)" },
   "pair_session_options":     { direction: "c2s", handler: "lib/project-session-pair.js", description: "Request vendors/models for the pair-session dialog (response reuses the same type)" },
   "pair_session_create":      { direction: "c2s", handler: "lib/project-session-pair.js", description: "Create a Driver/Worker session pair as a split group" },
+  "worker_proposal_response": { direction: "c2s", handler: "lib/project-worker-proposal.js", description: "Accept or decline a Fable Worker suggestion with the selected runtime" },
 
   "session_list":             { direction: "s2c", handler: "lib/public/modules/app-messages.js", description: "Full list of sessions for the sidebar" },
   "session_switched":         { direction: "s2c", handler: "lib/public/modules/app-messages.js", description: "Confirmation that active session changed" },
@@ -53,6 +54,8 @@ var schema = {
   "split_groups":             { direction: "s2c", handler: "lib/public/modules/app-messages.js", description: "Full persistent split-group list for the current user" },
   "split_group_result":       { direction: "s2c", handler: "lib/public/modules/app-messages.js", description: "Result of a split-group mutation" },
   "pair_session_created":     { direction: "s2c", handler: "lib/public/modules/app-messages.js", description: "Result of pair_session_create; carries the new group" },
+  "worker_proposal":          { direction: "s2c", handler: "lib/public/modules/app-messages.js", description: "Inline Fable suggestion to delegate execution to a Worker" },
+  "worker_proposal_update":   { direction: "s2c", handler: "lib/public/modules/app-messages.js", description: "Worker suggestion lifecycle update" },
   "split_delegation":         { direction: "s2c", handler: "lib/public/modules/app-messages.js", description: "A pair delegation started or ended (drives the split-view flow indicator)" },
 
   // -----------------------------------------------------------------------

package/lib/yoke/adapters/claude.js

@@ -701,12 +701,7 @@ function spawnWorker(linuxUser, workerScriptPath, cwd) {
   });
 
   worker.send = function(msg) {
-    if (!worker.connection || worker.connection.destroyed) return;
-    try {
-      worker.connection.write(JSON.stringify(serializeWorkerValue(msg)) + "\n");
-    } catch (e) {
-      console.error("[yoke/claude] Failed to send to worker:", e.message);
-    }
+    return sendWorkerMessage(worker, msg);
   };
 
   worker.onMessage = function(handler) {
@@ -732,6 +727,36 @@ function spawnWorker(linuxUser, workerScriptPath, cwd) {
   return worker;
 }
 
+function hasWritableWorkerConnection(worker) {
+  var connection = worker && worker.connection;
+  return !!connection
+    && !connection.destroyed
+    && !connection.writableEnded
+    && connection.writable !== false;
+}
+
+function sendWorkerMessage(worker, msg) {
+  if (!hasWritableWorkerConnection(worker)) return false;
+  try {
+    // A false return from socket.write means backpressure, not rejection. The
+    // bytes are still queued, so delivery is accepted unless write throws.
+    worker.connection.write(JSON.stringify(serializeWorkerValue(msg)) + "\n");
+    return true;
+  } catch (e) {
+    console.error("[yoke/claude] Failed to send to worker:", e.message);
+    return false;
+  }
+}
+
+function canReuseWorker(worker) {
+  return !!worker
+    && worker.ready
+    && worker.process
+    && !worker.process.killed
+    && worker.process.exitCode == null
+    && hasWritableWorkerConnection(worker);
+}
+
 function cleanupWorker(worker) {
   console.log("[yoke/claude] cleanupWorker() called, pid=" + (worker.process ? worker.process.pid : "?") + " stack=" + new Error().stack.split("\n").slice(1, 4).join(" | "));
   if (worker._abortTimeout) { clearTimeout(worker._abortTimeout); worker._abortTimeout = null; }
@@ -1009,12 +1034,7 @@ function createWorkerQueryHandle(worker, canUseTool, onElicitation, callMcpTool,
       }
       if (text) content.push({ type: "text", text: text });
       var userMsg = { type: "user", message: { role: "user", content: content } };
-      try {
-        worker.send({ type: "push_message", content: userMsg });
-        return true;
-      } catch (e) {
-        return false;
-      }
+      return worker.send({ type: "push_message", content: userMsg }) === true;
     },
 
     setModel: function(model) {
@@ -1498,7 +1518,8 @@ function createClaudeAdapter(opts) {
     var reusingWorker = false;
 
     // Wait for previous worker exit if needed
-    if (workerState && workerState.exitPromise && !workerState.worker) {
+    if (workerState && workerState.exitPromise
+        && (!workerState.worker || !canReuseWorker(workerState.worker))) {
       await Promise.race([
         workerState.exitPromise,
         new Promise(function(resolve) { setTimeout(resolve, 3000); }),
@@ -1506,8 +1527,7 @@ function createClaudeAdapter(opts) {
     }
 
     // Reuse existing worker if alive
-    if (workerState && workerState.worker && workerState.worker.ready &&
-        workerState.worker.process && !workerState.worker.process.killed) {
+    if (workerState && canReuseWorker(workerState.worker)) {
       worker = workerState.worker;
       reusingWorker = true;
       // Clear old message handlers so they don't fire for the new query
@@ -1564,7 +1584,7 @@ function createClaudeAdapter(opts) {
     // will push the initial message and the worker receives it via push_message.
     // Instead, we send query_start with no prompt; the worker starts a query with
     // the message queue, and the first push_message will arrive.
-    worker.send({
+    if (!worker.send({
       type: "query_start",
       prompt: null,
       options: queryOptions,
@@ -1572,7 +1592,9 @@ function createClaudeAdapter(opts) {
       originalHome: claudeOpts.originalHome || null,
       projectPath: claudeOpts.projectPath || null,
       _perfT0: claudeOpts._perfT0 || Date.now(),
-    });
+    })) {
+      throw new Error("Claude worker IPC connection closed before query start");
+    }
 
     return handle;
   }
@@ -1808,6 +1830,10 @@ module.exports = {
   contractTestKit: {
     createMessageQueue: createMessageQueue,
     createQueryHandle: createQueryHandle,
+    createWorkerQueryHandle: createWorkerQueryHandle,
+    hasWritableWorkerConnection: hasWritableWorkerConnection,
+    sendWorkerMessage: sendWorkerMessage,
+    canReuseWorker: canReuseWorker,
     normalizeEvent: flattenEvent,
   },
 };

package/lib/yoke/index.js

@@ -8,6 +8,23 @@ var createClaudeAdapter = require("./adapters/claude").createClaudeAdapter;
 var createCodexAdapter = require("./adapters/codex").createCodexAdapter;
 var createKiroAdapter = require("./adapters/kiro").createKiroAdapter;
 
+// Keep the first session in a new project predictable. This order is also
+// used by the UI when a project has no remembered vendor yet.
+var DEFAULT_VENDOR_ORDER = ["claude", "codex", "kiro"];
+
+function resolveDefaultVendor(availableVendors) {
+  availableVendors = availableVendors || {};
+  for (var i = 0; i < DEFAULT_VENDOR_ORDER.length; i++) {
+    var vendor = DEFAULT_VENDOR_ORDER[i];
+    if (Array.isArray(availableVendors)) {
+      if (availableVendors.indexOf(vendor) !== -1) return vendor;
+    } else if (availableVendors[vendor]) {
+      return vendor;
+    }
+  }
+  return "claude";
+}
+
 /**
  * Wrap adapter.createQuery to inject cross-vendor project instructions.
  *
@@ -371,6 +388,8 @@ async function lazyCreateAdapter(adapters, vendor, opts) {
 module.exports = {
   createAdapter: createAdapter,
   createAdapters: createAdapters,
+  resolveDefaultVendor: resolveDefaultVendor,
+  DEFAULT_VENDOR_ORDER: DEFAULT_VENDOR_ORDER,
   lazyCreateAdapter: lazyCreateAdapter,
   checkAuth: checkAuth,
   checkInstalled: checkInstalled,

package/package.json

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