clay-server 5.2.0-beta.1 → 5.2.0-beta.11

package/lib/sdk-foreground-admission.js

@@ -0,0 +1,16 @@
+// One next-message admission window, bound to the exact live provider query.
+// This is not turn completion: processing and pending terminal counts survive.
+function available(session) {
+  var credit = session && session._foregroundAdmission;
+  return !!(credit && session.queryInstance === credit.query
+    && Number(session._sdkQueryGeneration || 0) === credit.generation
+    && !session.taskStopRequested && !session._pendingMessageDrainPaused
+    && !(session.abortController && session.abortController.signal.aborted));
+}
+function offer(session) {
+  if (!session.queryInstance || session.taskStopRequested || session.abortController && session.abortController.signal.aborted) return false;
+  session._foregroundAdmission = { query: session.queryInstance, generation: Number(session._sdkQueryGeneration || 0) };
+  return true;
+}
+function take(session) { delete session._foregroundAdmission; }
+module.exports = { available: available, offer: offer, take: take };

package/lib/sdk-mcp-descriptors.js

@@ -1,37 +1,2 @@
-// Extract serializable tool descriptors from MCP server instances.
-// Used for IPC to worker processes (McpSdkServerConfigWithInstance is not serializable).
-function extractMcpDescriptors(mcpServers) {
-  if (!mcpServers) return null;
-  // Claude's adapter uses Zod v3 for JSON Schema tools; other servers use v4.
-  // Use the MCP SDK's version-aware converter for both kinds of registered tool.
-  var toJSONSchema = require("@modelcontextprotocol/sdk/server/zod-json-schema-compat.js").toJsonSchemaCompat;
-  var descriptors = [];
-  var names = Object.keys(mcpServers);
-  for (var i = 0; i < names.length; i++) {
-    var serverName = names[i];
-    var server = mcpServers[serverName];
-    if (!server || !server.instance || !server.instance._registeredTools) continue;
-    var tools = [];
-    var toolNames = Object.keys(server.instance._registeredTools);
-    for (var j = 0; j < toolNames.length; j++) {
-      var toolName = toolNames[j];
-      var toolDef = server.instance._registeredTools[toolName];
-      var inputSchema = { type: "object", properties: {} };
-      try {
-        if (toolDef._clayInputSchema) inputSchema = toolDef._clayInputSchema;
-        else if (toolDef.inputSchema) inputSchema = toJSONSchema(toolDef.inputSchema);
-      } catch (e) {
-        throw new Error("Cannot serialize MCP tool schema " + serverName + "/" + toolName + ": " + e.message);
-      }
-      tools.push({
-        name: toolName,
-        description: toolDef.description || toolName,
-        inputSchema: inputSchema,
-      });
-    }
-    if (tools.length > 0) descriptors.push({ serverName: serverName, tools: tools });
-  }
-  return descriptors.length > 0 ? descriptors : null;
-}
-
-module.exports = { extractMcpDescriptors: extractMcpDescriptors };
+// Compatibility export; SDK serialization is owned by YOKE.
+module.exports = require("./yoke/sdk-mcp-descriptors");

package/lib/sdk-message-processor.js

@@ -42,9 +42,24 @@ function attachMessageProcessor(ctx) {
   }
 
   function sendAndRecord(session, obj, clientObj) {
+    obj = require("./yoke/usage").clientEvent(obj, session.vendor || "claude");
     sm.sendAndRecord(session, obj, clientObj);
   }
 
+  function observeQuota(session, message, observedAtMs) {
+    if (typeof sm.notifyQuotaObserved === "function") sm.notifyQuotaObserved(session, message, observedAtMs);
+  }
+
+  function recordTurnActivity(session, activity) {
+    // An authoritative input card owns progress until its request settles.
+    var awaitingInput = ["pendingPermissions", "pendingAskUser", "pendingElicitations", "pendingUserDialogs"].some(function (key) {
+      return Object.keys(session[key] || {}).length > 0;
+    });
+    if (!awaitingInput && ["waiting", "running", "background"].indexOf(activity.phase) !== -1) sendAndRecord(session, {
+      type: "turn_activity", phase: activity.phase, turnId: activity.turnId || null, disposition: activity.disposition || null
+    });
+  }
+
   function parseGeneratedImage(parsed) {
     var data = parsed.data || "";
     var mediaType = parsed.mediaType || "image/png";
@@ -77,8 +92,8 @@ function attachMessageProcessor(ctx) {
       || !!authLinuxUser
       || (authUser && authUser.role === "admin");
     var vendorInfo = yoke.getVendorInfo(session.vendor);
-    var authTitle = ((vendorInfo && vendorInfo.displayName) || "Claude Code") + " is not logged in.";
-    var loginCommand = (vendorInfo && vendorInfo.loginCommand) || "claude login";
+    var authTitle = ((vendorInfo && vendorInfo.displayName) || "The provider") + " is not logged in.";
+    var loginCommand = (vendorInfo && vendorInfo.loginCommand) || "";
     var _nmLogin = getNotificationsModule();
     // Authentication recovery is transient UI state, not transcript content.
     // Recording it makes history replay look like a fresh auth failure and
@@ -163,6 +178,7 @@ function attachMessageProcessor(ctx) {
   }
 
   function processSDKMessage(session, parsed) {
+    parsed = require("./yoke/auth-events").normalize(parsed, session.responsePreview, session.vendor || "claude");
     // Timing: log key SDK milestones relative to query start
     if (session._queryStartTs) {
       var _elapsed = Date.now() - session._queryStartTs;
@@ -378,7 +394,7 @@ function attachMessageProcessor(ctx) {
       }) : [];
       sendAndRecord(session, {
         type: "tool_executing",
-        id: parsed.turnId || "codex-plan",
+        id: parsed.turnId || "provider-plan",
         name: "TodoWrite",
         input: {
           todos: todos,
@@ -430,6 +446,7 @@ function attachMessageProcessor(ctx) {
         if (pushModule && block.name === "AskUserQuestion" && input.questions) {
           var q = input.questions[0];
           pushModule.sendPush({
+            sessionId: session.localId,
             type: "ask_user",
             slug: slug,
             title: (mateDisplayName || "Claude") + " has a question",
@@ -545,7 +562,32 @@ function attachMessageProcessor(ctx) {
         }
       }
 
+    } else if (parsed.yokeType === "turn_activity") {
+      recordTurnActivity(session, parsed);
+    } else if (parsed.yokeType === "foreground_available") {
+      // A provider observed an admission boundary while background work still
+      // owns its terminal. Do not synthesize success or clear processing/tasks.
+      // Persist the presentation boundary before a synchronous next admission.
+      sendAndRecord(session, { type: "assistant_boundary" });
+      recordTurnActivity(session, { phase: "background" });
+      if (require('./sdk-foreground-admission').offer(session) && opts && typeof opts.onSessionAvailable === 'function') opts.onSessionAvailable(session);
     } else if (parsed.yokeType === "result") {
+      if (parsed.backgroundOnly === true) {
+        // Observed terminal of an older foreground turn. Account for the
+        // outstanding send without settling a newer turn's reviews/callbacks.
+        session._queuedTurnCount = turnQueue.pendingSends(session, parsed);
+        if (session._queuedTurnCount > 0) session._queuedTurnCount--;
+        else {
+          session.isProcessing = false;
+          session._awaitingTurnResult = false;
+          onProcessingChanged();
+          sendAndRecord(session, { type: "done", code: 0 });
+        }
+        sendAndRecord(session, { type: "background_result", usage: require('./yoke/usage').accounting(parsed.usage), cost: parsed.cost, duration: parsed.duration });
+        sm.broadcastSessionList();
+        if (opts && typeof opts.onSessionAvailable === 'function') opts.onSessionAvailable(session);
+        return;
+      }
       // 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
@@ -615,7 +657,7 @@ function attachMessageProcessor(ctx) {
         session._queuedTurnCount = 0;
         taskLifecycle.clearAll(session);
         onProcessingChanged();
-        sendAndRecord(session, { type: "error", text: "Claude failed to start: " + parsed.startupFailureReason });
+        sendAndRecord(session, { type: "error", text: "The provider failed to start: " + parsed.startupFailureReason });
         sendAndRecord(session, { type: "done", code: 1 });
         sm.broadcastSessionList();
         return;
@@ -656,12 +698,6 @@ function attachMessageProcessor(ctx) {
         onProcessingChanged();
       }
       // Recognize only short, zero-cost CLI login responses, not ordinary prose.
-      var previewTrimmed = (session.responsePreview || "").trim();
-      var isZeroCost = !parsed.cost || parsed.cost === 0;
-      var isLoginPrompt = isZeroCost && previewTrimmed.length < 100
-        && ((/not logged in/i.test(previewTrimmed) && /\/login/i.test(previewTrimmed))
-          || ((session.vendor || "claude") === "claude"
-            && /^Failed to authenticate: OAuth session expired and could not be refreshed\.?$/i.test(previewTrimmed)));
       // Fetch rich context usage breakdown (fire-and-forget, non-blocking)
       if (session.queryInstance && typeof session.queryInstance.getContextUsage === "function") {
         var contextQuery = session.queryInstance;
@@ -683,7 +719,8 @@ function attachMessageProcessor(ctx) {
         type: "result",
         cost: parsed.cost,
         duration: parsed.duration,
-        usage: parsed.usage || null,
+        usage: require("./yoke/usage").accounting(parsed.usage),
+        context: require("./yoke/usage").turnContext(Object.assign({}, parsed, { lastStreamInputTokens: lastStreamInput })),
         modelUsage: parsed.modelUsage || null,
         sessionId: parsed.sessionId,
         lastStreamInputTokens: lastStreamInput,
@@ -698,7 +735,7 @@ function attachMessageProcessor(ctx) {
       }
       // Recover both missing login and expired OAuth sessions from the SDK.
       // This is a short canned response with zero cost, not actual AI output.
-      if (isLoginPrompt) {
+      if (parsed.authenticationRequired === true) {
         emitAuthRequired(session);
       }
       sendAndRecord(session, { type: "done", code: 0 });
@@ -715,6 +752,7 @@ function attachMessageProcessor(ctx) {
 
       if (pushModule && !session._delegatedBy && !_suppressResponseNotification) {
         pushModule.sendPush({
+          sessionId: session.localId,
           type: "done",
           slug: slug,
           title: _doneTitle,
@@ -858,7 +896,7 @@ function attachMessageProcessor(ctx) {
     } else if (parsed.yokeType === "rate_limit") {
       var info = parsed.rateLimitInfo;
       if (info.source === "account_snapshot") {
-        quotaSnapshots.recordQuotaSnapshot(session, info, sendAndRecord);
+        quotaSnapshots.recordQuotaSnapshot(session, info, sendAndRecord, observeQuota);
         return;
       }
       console.log("[sdk-bridge] rate_limit_event for session " + session.localId + ": status=" + info.status + " resetsAt=" + info.resetsAt + " isUsingOverage=" + info.isUsingOverage + " isProcessing=" + session.isProcessing);
@@ -873,6 +911,7 @@ function attachMessageProcessor(ctx) {
           resetsAt: info.resetsAt * 1000,
           status: info.status,
         });
+        observeQuota(session, { type: "rate_limit_usage", vendor: session.vendor || "claude", rateLimitType: info.rateLimitType, resetsAt: info.resetsAt * 1000, status: info.status }, Date.now());
       }
 
       // Warning/rejection handling (existing behavior)
@@ -885,12 +924,15 @@ function attachMessageProcessor(ctx) {
           resetsAt: info.resetsAt ? info.resetsAt * 1000 : null,
           rateLimitType: info.rateLimitType || null,
           utilization: info.utilization || null,
-          isUsingOverage: info.isUsingOverage === true || info.overageInUse === true,
+          isUsingOverage: info.isUsingOverage === true,
           overageEnabled: typeof info.overageEnabled === "boolean" ? info.overageEnabled : null,
           overageStatus: info.overageStatus || null,
           overageResetsAt: info.overageResetsAt ? info.overageResetsAt * 1000 : null,
           overageDisabledReason: info.overageDisabledReason || null,
         });
+        if (info.rateLimitType && info.utilization) {
+          observeQuota(session, { type: "rate_limit", vendor: session.vendor || "claude", rateLimitType: info.rateLimitType, utilization: info.utilization }, Date.now());
+        }
         // Track rejection for auto-continue / scheduled message support
         if (info.status === "rejected" && info.resetsAt) {
           session.rateLimitResetsAt = info.resetsAt * 1000;
@@ -977,6 +1019,7 @@ function attachMessageProcessor(ctx) {
       }
 
     } else if (parsed.yokeType === "commands_changed") {
+      if (Array.isArray(parsed.skills)) session.skillNames = parsed.skills.slice();
       // Mid-session command list change: rebuild the union with skills (same as
       // init) and push a full replacement to the client.
       var cmdSeen = new Set();
@@ -1051,12 +1094,12 @@ function attachMessageProcessor(ctx) {
       // processQueryStream can finish the turn when the iterator closes.
       var adapterErrorText = parsed.text || parsed.message || parsed.error || "Agent runtime error";
       session._lastAdapterError = adapterErrorText;
-      var isSessionWriterConflict = /thread-store conflict|already has an active writer/i.test(adapterErrorText);
-      if (isSessionWriterConflict) {
+      var classifiedError = require("./yoke/errors").classify(session.vendor || "claude", adapterErrorText);
+      if (classifiedError && classifiedError.kind === "session_writer_conflict") {
         sendAndRecord(session, {
           type: "session_writer_conflict",
-          vendor: session.vendor || "codex",
-          text: "This Codex session is already open in another Clay or Codex process. Stop the other server or close the other session, then try again.",
+          vendor: session.vendor || "claude",
+          text: classifiedError.text,
         });
       } else {
         sendAndRecord(session, { type: "error", text: adapterErrorText });

package/lib/sdk-quota-snapshot.js

@@ -1,4 +1,4 @@
-function recordQuotaSnapshot(session, info, sendAndRecord) {
+function recordQuotaSnapshot(session, info, sendAndRecord, observe) {
   var message = {
     type: "rate_limit_usage",
     sessionId: session.localId,
@@ -9,6 +9,10 @@ function recordQuotaSnapshot(session, info, sendAndRecord) {
       return Object.assign({}, window, { resetsAt: window.resetsAt ? window.resetsAt * 1000 : null });
     }),
   };
+  if (Number.isFinite(info.observedAtMs)) message.observedAtMs = info.observedAtMs;
+  // The overview records every live observation, including an unchanged one:
+  // deduplication below only avoids re-recording identical history.
+  if (typeof observe === "function") observe(session, message, Number.isFinite(info.observedAtMs) ? info.observedAtMs : Date.now());
   var snapshots = session._quotaSnapshots || (session._quotaSnapshots = Object.create(null));
   var key = JSON.stringify([session.ownerId, session.vendor, info.limitId]);
   var serialized = JSON.stringify(message);
@@ -17,10 +21,24 @@ function recordQuotaSnapshot(session, info, sendAndRecord) {
   sendAndRecord(session, message);
 }
 
+// Observation listeners feed the owner-scoped vendor overview. They never
+// influence rejection handling or scheduling.
+function attachQuotaObservers(sm) {
+  // Idempotent: the processor and the overview may attach in either order.
+  if (typeof sm.addOnQuotaObserved === "function") return;
+  var listeners = [];
+  sm.addOnQuotaObserved = function (fn) { if (typeof fn === "function") listeners.push(fn); };
+  sm.notifyQuotaObserved = function (session, message, observedAtMs) {
+    for (var i = 0; i < listeners.length; i++) {
+      try { listeners[i](session, message, observedAtMs); } catch (e) { /* the overview is optional */ }
+    }
+  };
+}
+
 function attachQuotaSnapshots(sm) {
+  attachQuotaObservers(sm);
   if (typeof sm.addOnSessionViewed !== "function") return;
   sm.addOnSessionViewed(function (session, ws, send) {
-    if (session.vendor !== "codex") return;
     var seen = Object.create(null);
     var history = session.history || [];
     // A deduplicated snapshot may precede the initial page of chat history.
@@ -34,4 +52,4 @@ function attachQuotaSnapshots(sm) {
   });
 }
 
-module.exports = { recordQuotaSnapshot: recordQuotaSnapshot, attachQuotaSnapshots: attachQuotaSnapshots };
+module.exports = { recordQuotaSnapshot: recordQuotaSnapshot, attachQuotaSnapshots: attachQuotaSnapshots, attachQuotaObservers: attachQuotaObservers };

package/lib/sdk-response-recovery.js

@@ -0,0 +1 @@
+module.exports = require("./yoke/claude-response-recovery");