clay-server 2.33.1 → 2.34.0-beta.10

package/lib/yoke/adapters/claude.js

@@ -600,7 +600,7 @@ function spawnWorker(linuxUser, workerScriptPath, cwd) {
   worker.send = function(msg) {
     if (!worker.connection || worker.connection.destroyed) return;
     try {
-      worker.connection.write(JSON.stringify(msg) + "\n");
+      worker.connection.write(JSON.stringify(serializeWorkerValue(msg)) + "\n");
     } catch (e) {
       console.error("[yoke/claude] Failed to send to worker:", e.message);
     }
@@ -643,12 +643,45 @@ function cleanupWorker(worker) {
   worker.ready = false;
 }
 
+function serializeWorkerValue(value, seen) {
+  if (value == null) return value;
+  if (typeof value === "string" || typeof value === "number" || typeof value === "boolean") return value;
+  if (typeof value === "bigint") return String(value);
+  if (typeof value === "function" || typeof value === "symbol" || typeof value === "undefined") return undefined;
+  if (value instanceof Date) return value.toISOString();
+  if (Buffer.isBuffer(value)) return value.toString("base64");
+
+  if (!seen) seen = new WeakSet();
+  if (typeof value === "object") {
+    if (seen.has(value)) return undefined;
+    seen.add(value);
+  }
+
+  if (Array.isArray(value)) {
+    var arr = [];
+    for (var i = 0; i < value.length; i++) {
+      var item = serializeWorkerValue(value[i], seen);
+      if (item !== undefined) arr.push(item);
+    }
+    return arr;
+  }
+
+  var out = {};
+  var keys = Object.keys(value);
+  for (var j = 0; j < keys.length; j++) {
+    var key = keys[j];
+    var child = serializeWorkerValue(value[key], seen);
+    if (child !== undefined) out[key] = child;
+  }
+  return out;
+}
+
 // --- Worker QueryHandle ---
 // Wraps worker IPC into the same async iterable + control interface as the
 // in-process QueryHandle. This allows processQueryStream to iterate a worker
 // query identically to an in-process query.
 
-function createWorkerQueryHandle(worker, canUseTool, onElicitation) {
+function createWorkerQueryHandle(worker, canUseTool, onElicitation, callMcpTool) {
   // Async iterable state
   var iterQueue = [];
   var iterWaiting = null;
@@ -741,6 +774,20 @@ function createWorkerQueryHandle(worker, canUseTool, onElicitation) {
         }
         break;
 
+      case "mcp_tool_call":
+        if (callMcpTool) {
+          callMcpTool(msg.serverName, msg.toolName, msg.args || {}).then(function(result) {
+            worker.send({ type: "mcp_tool_result", requestId: msg.requestId, result: result });
+          }).catch(function(e) {
+            worker.send({
+              type: "mcp_tool_result",
+              requestId: msg.requestId,
+              error: (e && e.message) ? e.message : String(e),
+            });
+          });
+        }
+        break;
+
       case "context_usage":
       case "model_changed":
       case "effort_changed":
@@ -943,6 +990,7 @@ function createClaudeAdapter(opts) {
         cwd: (initOpts && initOpts.cwd) || _cwd,
         settingSources: ["user", "project", "local"],
         abortController: ac,
+        settings: { disableAllHooks: true },
       };
       if (_claudeBinaryPath) warmupOptions.pathToClaudeCodeExecutable = _claudeBinaryPath;
 
@@ -1102,6 +1150,7 @@ function createClaudeAdapter(opts) {
       if (co.permissionMode) sdkOptions.permissionMode = co.permissionMode;
       if (co.allowDangerouslySkipPermissions) sdkOptions.allowDangerouslySkipPermissions = true;
       if (co.resumeSessionAt) sdkOptions.resumeSessionAt = co.resumeSessionAt;
+      if (co.settings) sdkOptions.settings = co.settings;
 
       var rawQuery = sdk.query({ prompt: mq, options: sdkOptions });
       return createQueryHandle(rawQuery, mq, ac);
@@ -1229,7 +1278,7 @@ function createClaudeAdapter(opts) {
     }
 
     // Create the worker query handle (sets up message handler on worker)
-    var handle = createWorkerQueryHandle(worker, queryOpts.canUseTool, queryOpts.onElicitation);
+    var handle = createWorkerQueryHandle(worker, queryOpts.canUseTool, queryOpts.onElicitation, queryOpts.callMcpTool);
 
     // Wait for worker to be ready before sending query_start
     if (!reusingWorker) {
@@ -1250,8 +1299,9 @@ function createClaudeAdapter(opts) {
     if (claudeOpts.betas && claudeOpts.betas.length > 0) queryOptions.betas = claudeOpts.betas;
     if (claudeOpts.permissionMode) queryOptions.permissionMode = claudeOpts.permissionMode;
     if (claudeOpts.allowDangerouslySkipPermissions) queryOptions.allowDangerouslySkipPermissions = true;
+    if (claudeOpts.settings) queryOptions.settings = claudeOpts.settings;
 
-    if (queryOpts.toolServers) queryOptions.mcpServers = queryOpts.toolServers;
+    if (queryOpts.toolServerDescriptors) queryOptions.mcpServerDescriptors = queryOpts.toolServerDescriptors;
     if (queryOpts.model) queryOptions.model = queryOpts.model;
     if (queryOpts.effort) queryOptions.effort = queryOpts.effort;
     if (queryOpts.resumeSessionId) queryOptions.resume = queryOpts.resumeSessionId;
@@ -1356,6 +1406,7 @@ function createClaudeAdapter(opts) {
         cwd: (initOpts && initOpts.cwd) || _cwd,
         settingSources: ["user", "project", "local"],
         abortController: ac,
+        settings: { disableAllHooks: true },
       };
       if (_claudeBinaryPath) warmupOptions.pathToClaudeCodeExecutable = _claudeBinaryPath;
 
@@ -1430,7 +1481,7 @@ function createClaudeAdapter(opts) {
       throw new Error("Warmup worker failed to connect: " + (e.message || e));
     }
 
-    var warmupOptions = { cwd: workerCwd, settingSources: ["user", "project", "local"] };
+    var warmupOptions = { cwd: workerCwd, settingSources: ["user", "project", "local"], settings: { disableAllHooks: true } };
     if (_claudeBinaryPath) warmupOptions.pathToClaudeCodeExecutable = _claudeBinaryPath;
     if (initOpts && initOpts.dangerouslySkipPermissions) {
       warmupOptions.permissionMode = "bypassPermissions";

package/lib/yoke/adapters/codex.js

@@ -89,6 +89,56 @@ function generateUuid() {
   return "codex-" + ts + "-" + cnt + "-" + rnd;
 }
 
+function waitMs(ms) {
+  return new Promise(function(resolve) {
+    setTimeout(resolve, ms);
+  });
+}
+
+function waitForProcessExit(proc, timeoutMs) {
+  return new Promise(function(resolve) {
+    if (!proc) {
+      resolve(true);
+      return;
+    }
+
+    if (proc.exitCode !== null || proc.signalCode !== null) {
+      resolve(true);
+      return;
+    }
+
+    var done = false;
+    var timer = null;
+
+    function cleanup() {
+      if (done) return;
+      done = true;
+      if (timer) clearTimeout(timer);
+      proc.removeListener("exit", onDone);
+      proc.removeListener("close", onDone);
+    }
+
+    function onDone() {
+      cleanup();
+      resolve(true);
+    }
+
+    proc.once("exit", onDone);
+    proc.once("close", onDone);
+
+    timer = setTimeout(function() {
+      cleanup();
+      resolve(false);
+    }, timeoutMs || 5000);
+  });
+}
+
+function createShutdownError() {
+  var err = new Error("Codex adapter is shutting down, retry shortly");
+  err.code = "CODEX_ADAPTER_SHUTTING_DOWN";
+  return err;
+}
+
 function normalizePlanStatus(status) {
   if (status === "inProgress") return "in_progress";
   if (status === "completed") return "completed";
@@ -164,6 +214,7 @@ function flattenEvent(notification, state) {
       yokeType: "plan_updated",
       turnId: params.turnId || null,
       explanation: params.explanation || "",
+      title: "Plan",
       plan: Array.isArray(params.plan) ? params.plan.map(function(step) {
         return {
           step: step && step.step ? step.step : "",
@@ -309,16 +360,33 @@ function flattenEvent(notification, state) {
         state.thinkingBlocks[item.id] = "blk_" + state.blockCounter;
         events.push({ yokeType: "thinking_start", blockId: "blk_" + state.blockCounter });
       }
-      if (item.text) {
+      // Codex reasoning items may expose plain text via `text`, a short
+      // `summary`, or nested `content` parts. Prefer whichever is present;
+      // many turns arrive with only encrypted reasoning and no readable
+      // text at all, in which case the UI will hide the expand affordance.
+      var reasoningText = "";
+      if (typeof item.text === "string" && item.text.length > 0) {
+        reasoningText = item.text;
+      } else if (typeof item.summary === "string" && item.summary.length > 0) {
+        reasoningText = item.summary;
+      } else if (Array.isArray(item.content)) {
+        var parts = [];
+        for (var rpi = 0; rpi < item.content.length; rpi++) {
+          var rp = item.content[rpi];
+          if (rp && typeof rp.text === "string") parts.push(rp.text);
+        }
+        reasoningText = parts.join("\n");
+      }
+      if (reasoningText) {
         var thinkBlockId = state.thinkingBlocks[item.id];
         var prevThinkLen = state.thinkingLengths[item.id] || 0;
-        if (item.text.length > prevThinkLen) {
+        if (reasoningText.length > prevThinkLen) {
           events.push({
             yokeType: "thinking_delta",
             blockId: thinkBlockId,
-            text: item.text.substring(prevThinkLen),
+            text: reasoningText.substring(prevThinkLen),
           });
-          state.thinkingLengths[item.id] = item.text.length;
+          state.thinkingLengths[item.id] = reasoningText.length;
         }
       }
       if (evtPhase === "completed") {
@@ -502,6 +570,7 @@ function createCodexQueryHandle(appServer, queryOpts) {
   var systemPrompt = queryOpts.systemPrompt || "";
   var canUseTool = queryOpts.canUseTool || null;
   var onElicitation = queryOpts.onElicitation || null;
+  var onFinished = queryOpts.onFinished || null;
 
   // Check if the query was cancelled (either via handle.abort() or direct signal abort)
   function isCancelled() {
@@ -532,6 +601,19 @@ function createCodexQueryHandle(appServer, queryOpts) {
   var eventBuffer = [];
   var eventWaiting = null;
   var iteratorDone = false;
+  var finishedNotified = false;
+
+  function notifyFinished() {
+    if (finishedNotified) return;
+    finishedNotified = true;
+    if (typeof onFinished === "function") {
+      try {
+        onFinished();
+      } catch (e) {
+        console.error("[yoke/codex] onFinished error:", e.message || e);
+      }
+    }
+  }
 
   function pushEvent(evt) {
     if (iteratorDone) return;
@@ -551,6 +633,7 @@ function createCodexQueryHandle(appServer, queryOpts) {
       eventWaiting = null;
       resolve({ value: undefined, done: true });
     }
+    notifyFinished();
   }
 
   // Message queue for multi-turn
@@ -710,10 +793,37 @@ function createCodexQueryHandle(appServer, queryOpts) {
 
   // --- Main query loop ---
   async function runQueryLoop(initialMessage) {
-    // Prepend system prompt (project instructions from YOKE layer) to first message
-    var currentMessage = systemPrompt
-      ? systemPrompt + "\n\n" + initialMessage
-      : initialMessage;
+    // Prepend system prompt (project instructions from YOKE layer) to first message.
+    // initialMessage may be a string (text-only) or an array of content items
+    // (e.g. [{ type: "text", text: "..." }, ...] when images/attachments are present).
+    // Naive string concatenation on an array coerces it via toString(), producing
+    // "[object Object]" inside the prompt, so we must branch on the shape.
+    var currentMessage;
+    if (!systemPrompt) {
+      currentMessage = initialMessage;
+    } else if (typeof initialMessage === "string") {
+      currentMessage = systemPrompt + "\n\n" + initialMessage;
+    } else if (Array.isArray(initialMessage)) {
+      // Prepend systemPrompt to the first text item; if none exists, insert one.
+      var cloned = initialMessage.slice();
+      var injected = false;
+      for (var i = 0; i < cloned.length; i++) {
+        if (cloned[i] && cloned[i].type === "text") {
+          cloned[i] = {
+            type: "text",
+            text: systemPrompt + "\n\n" + (cloned[i].text || ""),
+          };
+          injected = true;
+          break;
+        }
+      }
+      if (!injected) {
+        cloned.unshift({ type: "text", text: systemPrompt });
+      }
+      currentMessage = cloned;
+    } else {
+      currentMessage = initialMessage;
+    }
 
     try {
       // Set event handler on app-server
@@ -935,48 +1045,182 @@ function createCodexQueryHandle(appServer, queryOpts) {
 
 function createCodexAdapter(opts) {
   var _cwd = (opts && opts.cwd) || process.cwd();
+  var _slug = (opts && opts.slug) || "";
+  var _defaultInitOpts = Object.assign({}, opts || {});
   var _cachedModels = [];
   var _appServer = null;
   var _initPromise = null;
-  var _initOpts = null; // stored for query-time access
+  var _shutdownPromise = null;
+  var _refCount = 0;
+  var _lastActiveAt = Date.now();
+  var _shuttingDown = false;
+  var _activeQueries = [];
+
+  function updateLastActiveAt() {
+    _lastActiveAt = Date.now();
+  }
+
+  function registerActiveQuery(entry) {
+    _activeQueries.push(entry);
+  }
+
+  function removeActiveQuery(entry) {
+    var next = [];
+    for (var i = 0; i < _activeQueries.length; i++) {
+      if (_activeQueries[i] !== entry) next.push(_activeQueries[i]);
+    }
+    _activeQueries = next;
+  }
+
+  function decrementRefCount() {
+    if (_refCount > 0) {
+      _refCount--;
+    } else {
+      console.error("[yoke/codex] refCount negative, bug!");
+      _refCount = 0;
+    }
+    updateLastActiveAt();
+  }
+
+  function buildReadyResponse(skillNames) {
+    return {
+      models: _cachedModels,
+      defaultModel: "gpt-5.4",
+      skills: skillNames || [],
+      slashCommands: skillNames || [],
+      fastModeState: null,
+      capabilities: {
+        thinking: true,
+        betas: false,
+        rewind: false,
+        sessionResume: true,
+        promptSuggestions: true,
+        elicitation: true,
+        fileCheckpointing: false,
+        contextCompacting: false,
+        toolPolicy: ["ask", "allow-all"],
+      },
+    };
+  }
+
+  function clearRuntimeState() {
+    _appServer = null;
+    _initPromise = null;
+    _cachedModels = [];
+    _refCount = 0;
+    _activeQueries = [];
+    updateLastActiveAt();
+  }
+
+  function waitForRefCount(targetCount, timeoutMs) {
+    var deadline = Date.now() + (timeoutMs || 5000);
+    return new Promise(function(resolve) {
+      function tick() {
+        if (_refCount <= targetCount) {
+          resolve(true);
+          return;
+        }
+        if (Date.now() >= deadline) {
+          resolve(false);
+          return;
+        }
+        setTimeout(tick, 50);
+      }
+      tick();
+    });
+  }
+
+  function stopAppServer(deadlineMs) {
+    var proc = _appServer && _appServer.proc ? _appServer.proc : null;
+    if (!_appServer) return Promise.resolve(true);
+    try {
+      _appServer.stop();
+    } catch (e) {
+      console.error("[yoke/codex] App-server stop error:", e.message || e);
+    }
+    if (!proc) return Promise.resolve(true);
+    var remaining = (typeof deadlineMs === "number") ? Math.max(0, deadlineMs - Date.now()) : 5000;
+    return waitForProcessExit(proc, remaining).then(function(exited) {
+      if (!exited) {
+        try {
+          proc.kill("SIGKILL");
+        } catch (e) {}
+      }
+      return exited;
+    });
+  }
+
+  function beginShutdown(force, idleMs) {
+    if (_shutdownPromise) return _shutdownPromise;
+    if (_shuttingDown) return null;
+
+    _shuttingDown = true;
+
+    _shutdownPromise = (async function() {
+      var deadline = Date.now() + 5000;
+      var shouldAbort = !!force;
+
+      if (_initPromise) {
+        try {
+          await Promise.race([
+            _initPromise.catch(function() { return null; }),
+            waitMs(Math.max(0, deadline - Date.now())),
+          ]);
+        } catch (e) {}
+      }
+
+      if (shouldAbort && _activeQueries.length > 0) {
+        var active = _activeQueries.slice();
+        for (var i = 0; i < active.length; i++) {
+          try {
+            if (active[i] && active[i].abort) active[i].abort();
+          } catch (e) {}
+        }
+        await waitForRefCount(0, Math.max(0, deadline - Date.now()));
+      }
+
+      if (_appServer) {
+        await stopAppServer(deadline);
+      }
+
+      clearRuntimeState();
+      _shuttingDown = false;
+      _shutdownPromise = null;
+      return true;
+    })().catch(function(err) {
+      clearRuntimeState();
+      _shuttingDown = false;
+      _shutdownPromise = null;
+      throw err;
+    });
+
+    return _shutdownPromise;
+  }
 
   var adapter = {
     vendor: "codex",
 
     init: function(initOpts) {
+      if (_shuttingDown) {
+        return Promise.reject(createShutdownError());
+      }
+
+      var effectiveInitOpts = Object.assign({}, _defaultInitOpts, initOpts || {});
+
       // Already initialized - return cached result
       if (_appServer && _appServer.started && _cachedModels.length > 0) {
-        return Promise.resolve({
-          models: _cachedModels,
-          defaultModel: "gpt-5.4",
-          skills: [],
-          slashCommands: [],
-          fastModeState: null,
-          capabilities: {
-            thinking: true,
-            betas: false,
-            rewind: false,
-            sessionResume: true,
-            promptSuggestions: true,
-            elicitation: true,
-            fileCheckpointing: false,
-            contextCompacting: false,
-            toolPolicy: ["ask", "allow-all"],
-          },
-        });
+        return Promise.resolve(buildReadyResponse([]));
       }
 
       // Deduplicate concurrent init calls
       if (_initPromise) return _initPromise;
 
       _initPromise = (async function() {
-        _initOpts = initOpts;
-
         var serverOpts = { cwd: _cwd };
 
         // Extract adapter options
-        if (initOpts && initOpts.adapterOptions && initOpts.adapterOptions.CODEX) {
-          var co = initOpts.adapterOptions.CODEX;
+        if (effectiveInitOpts && effectiveInitOpts.adapterOptions && effectiveInitOpts.adapterOptions.CODEX) {
+          var co = effectiveInitOpts.adapterOptions.CODEX;
           if (co.apiKey) serverOpts.env = Object.assign({}, serverOpts.env || {}, { OPENAI_API_KEY: co.apiKey });
           if (co.baseUrl) serverOpts.env = Object.assign({}, serverOpts.env || {}, { OPENAI_BASE_URL: co.baseUrl });
           if (co.config) serverOpts.config = co.config;
@@ -1004,10 +1248,10 @@ function createCodexAdapter(opts) {
 
         // Track 2: Add clay-tools bridge server for in-app + remote MCP tools.
         var bridgePath = require("path").join(__dirname, "..", "mcp-bridge-server.js");
-        var clayPort = (initOpts && initOpts.clayPort) || process.env.CLAY_PORT || 2633;
-        var clayTls = (initOpts && initOpts.clayTls) || false;
-        var clayAuthToken = (initOpts && initOpts.clayAuthToken) || "";
-        var claySlug = (initOpts && initOpts.slug) || "";
+        var clayPort = effectiveInitOpts.clayPort || process.env.CLAY_PORT || 2633;
+        var clayTls = effectiveInitOpts.clayTls || false;
+        var clayAuthToken = effectiveInitOpts.clayAuthToken || "";
+        var claySlug = effectiveInitOpts.slug || _slug || "";
         try {
           if (require("fs").existsSync(bridgePath)) {
             var bridgeArgs = [bridgePath, "--port", String(clayPort), "--slug", claySlug];
@@ -1048,6 +1292,11 @@ function createCodexAdapter(opts) {
         });
         _appServer.notify("initialized", {});
 
+        if (_shuttingDown) {
+          await stopAppServer(Date.now() + 1000);
+          throw createShutdownError();
+        }
+
         console.log("[codex] App-server initialized, models: gpt-5.4, gpt-5.4-mini, gpt-5.3-codex, gpt-5.3-codex-spark, gpt-5.2");
 
         _cachedModels = [
@@ -1096,26 +1345,15 @@ function createCodexAdapter(opts) {
           console.error("[codex] Failed to discover skills:", e.message);
         }
 
+        if (_shuttingDown) {
+          await stopAppServer(Date.now() + 1000);
+          throw createShutdownError();
+        }
+
         _initPromise = null;
+        updateLastActiveAt();
 
-        return {
-          models: _cachedModels,
-          defaultModel: "gpt-5.4",
-          skills: skillNames,
-          slashCommands: skillNames,
-          fastModeState: null,
-          capabilities: {
-            thinking: true,
-            betas: false,
-            rewind: false,
-            sessionResume: true,
-            promptSuggestions: true,
-            elicitation: true,
-            fileCheckpointing: false,
-            contextCompacting: false,
-            toolPolicy: ["ask", "allow-all"],
-          },
-        };
+        return buildReadyResponse(skillNames);
       })();
 
       return _initPromise;
@@ -1133,12 +1371,31 @@ function createCodexAdapter(opts) {
     },
 
     createQuery: async function(queryOpts) {
+      if (_shuttingDown) {
+        throw createShutdownError();
+      }
+
+      if (!_appServer || !_appServer.started) {
+        await adapter.init(queryOpts || {});
+      }
+
+      if (_shuttingDown) {
+        throw createShutdownError();
+      }
+
       if (!_appServer || !_appServer.started) {
         throw new Error("[yoke/codex] Adapter not initialized. Call init() first.");
       }
 
       var model = queryOpts.model || "gpt-5.4";
       var ac = queryOpts.abortController || new AbortController();
+      var activeEntry = {
+        abort: function() {
+          try {
+            ac.abort();
+          } catch (e) {}
+        },
+      };
 
       // Map YOKE options to Codex thread options
       var codexOpts = (queryOpts.adapterOptions && queryOpts.adapterOptions.CODEX) || {};
@@ -1175,7 +1432,33 @@ function createCodexAdapter(opts) {
 
       console.log("[yoke/codex] createQuery: model=" + model + " approval=" + handleOpts.approvalPolicy + " sandbox=" + handleOpts.sandboxMode);
 
-      var handle = createCodexQueryHandle(_appServer, handleOpts);
+      _refCount++;
+      registerActiveQuery(activeEntry);
+
+      var handle;
+      try {
+        handleOpts.onFinished = function() {
+          removeActiveQuery(activeEntry);
+          decrementRefCount();
+        };
+        handle = createCodexQueryHandle(_appServer, handleOpts);
+      } catch (e) {
+        removeActiveQuery(activeEntry);
+        decrementRefCount();
+        throw e;
+      }
+
+      activeEntry.handle = handle;
+      activeEntry.abort = function() {
+        try {
+          if (handle && typeof handle.abort === "function") {
+            handle.abort();
+          } else {
+            ac.abort();
+          }
+        } catch (e) {}
+      };
+
       return handle;
     },
 
@@ -1242,10 +1525,19 @@ function createCodexAdapter(opts) {
 
     // Shutdown the app-server process
     shutdown: function() {
-      if (_appServer) {
-        _appServer.stop();
-        _appServer = null;
-      }
+      return beginShutdown(true);
+    },
+
+    shutdownIfIdle: function(idleMs) {
+      if (_shuttingDown || _shutdownPromise) return Promise.resolve(false);
+      if (_initPromise) return Promise.resolve(false);
+      if (!_appServer) return Promise.resolve(false);
+      if (_refCount > 0) return Promise.resolve(false);
+      if (Date.now() - _lastActiveAt < (idleMs || 0)) return Promise.resolve(false);
+      return beginShutdown(false).then(function() {
+        console.log("[yoke/codex] Reclaimed idle adapter for project " + (_slug || _cwd));
+        return true;
+      });
     },
   };