clay-server 4.1.0-beta.1 → 4.1.0-beta.3

package/lib/ask-user-request-identity.js

@@ -0,0 +1,23 @@
+function canonicalize(value) {
+  if (Array.isArray(value)) return value.map(canonicalize);
+  if (!value || typeof value !== "object") return value;
+  var keys = Object.keys(value).sort();
+  var result = {};
+  for (var i = 0; i < keys.length; i++) result[keys[i]] = canonicalize(value[keys[i]]);
+  return result;
+}
+
+function sameAskUserRequest(event, id, input) {
+  return !!(event && event.type === "tool_executing" && event.name === "AskUserQuestion"
+    && event.id === id && JSON.stringify(canonicalize(event.input || {})) === JSON.stringify(canonicalize(input || {})));
+}
+
+function hasRecordedAskUserRequest(history, id, input) {
+  if (!Array.isArray(history) || !id) return false;
+  for (var i = history.length - 1; i >= 0; i--) {
+    if (sameAskUserRequest(history[i], id, input)) return true;
+  }
+  return false;
+}
+
+module.exports = { canonicalize: canonicalize, sameAskUserRequest: sameAskUserRequest, hasRecordedAskUserRequest: hasRecordedAskUserRequest };

package/lib/project-ask-user.js

@@ -1,4 +1,5 @@
 var userInput = require("./yoke/user-input");
+var askUserIdentity = require("./ask-user-request-identity");
 
 function attachAskUser(ctx) {
   function isFirstDebateQuestion(session) {
@@ -41,7 +42,9 @@ function attachAskUser(ctx) {
         if (boundSession.pendingAskUser && boundSession.pendingAskUser[request.id] === pending) delete boundSession.pendingAskUser[request.id];
       });
     }
-    ctx.record(boundSession, { type: "tool_executing", id: request.id, name: "AskUserQuestion", input: input });
+    if (!askUserIdentity.hasRecordedAskUserRequest(boundSession.history, request.id, input)) {
+      ctx.record(boundSession, { type: "tool_executing", id: request.id, name: "AskUserQuestion", input: input });
+    }
   }
 
   function createHandler(boundSession) {

package/lib/project-pair-lifecycle.js

@@ -86,22 +86,47 @@ function attachPairLifecycle(ctx) {
   var store = ctx.splitStore;
   var turnControl = ctx.turnControl;
 
-  // Per-Driver ledger of the Worker generations it has run, newest last.
-  // Lives on the live Driver session object: it informs the Driver's next
-  // choice within this session and is deliberately not persisted, because a
-  // bounded observation of a session that no longer exists would only be
-  // misleading after a restart.
   function ledgerFor(driver) {
     if (!Array.isArray(driver._workerGenerations)) driver._workerGenerations = [];
+    var group = store.groupForMember(driver.localId);
+    var worker = group && group.pair && sm.sessions.get(group.pair.workerId);
+    var generation = worker && (worker._pairGeneration || worker.sessionProvenance && worker.sessionProvenance.generation);
+    if (worker && Number.isInteger(generation) && generation > 0 && !findGeneration(driver, worker)) {
+      driver._workerGenerations.push({
+        generation: generation,
+        workerSessionId: worker.localId,
+        workerOriginId: worker.sessionOriginId || null,
+        vendor: worker.vendor || null,
+        model: worker.model || null,
+        effort: worker.effort || null,
+        startedAt: worker.sessionProvenance && worker.sessionProvenance.createdAt || Date.now(),
+        endedAt: null,
+        observed: null,
+        evaluation: null,
+      });
+      while (driver._workerGenerations.length > MAX_GENERATIONS) driver._workerGenerations.shift();
+    }
     return driver._workerGenerations;
   }
-
   function recordGenerationStart(driver, worker) {
     var ledger = ledgerFor(driver);
-    var generation = ledger.length + 1;
+    var existing = findGeneration(driver, worker);
+    if (existing && !existing.endedAt) {
+      worker._pairGeneration = existing.generation;
+      return existing.generation;
+    }
+    var generation = 1;
+    for (var i = 0; i < ledger.length; i++) {
+      if (Number.isInteger(ledger[i].generation) && ledger[i].generation >= generation) generation = ledger[i].generation + 1;
+    }
+    if (worker.sessionProvenance && Number.isInteger(worker.sessionProvenance.generation) &&
+        worker.sessionProvenance.generation >= generation) {
+      generation = worker.sessionProvenance.generation;
+    }
     ledger.push({
       generation: generation,
       workerSessionId: worker.localId,
+      workerOriginId: worker.sessionOriginId || null,
       vendor: worker.vendor || null,
       model: worker.model || null,
       effort: worker.effort || null,
@@ -112,21 +137,38 @@ function attachPairLifecycle(ctx) {
     });
     while (ledger.length > MAX_GENERATIONS) ledger.shift();
     worker._pairGeneration = generation;
+    if (worker.sessionProvenance) worker.sessionProvenance.generation = generation;
+    if (typeof sm.saveSessionFile === "function") {
+      sm.saveSessionFile(driver);
+      sm.saveSessionFile(worker);
+    }
     return generation;
   }
-
-  function findGeneration(driver, workerSessionId) {
-    var ledger = ledgerFor(driver);
+  function findGeneration(driver, worker) {
+    var ledger = Array.isArray(driver._workerGenerations) ? driver._workerGenerations : [];
+    var originId = worker && worker.sessionOriginId || null;
     for (var i = ledger.length - 1; i >= 0; i--) {
-      if (ledger[i].workerSessionId === workerSessionId) return ledger[i];
+      if (originId && ledger[i].workerOriginId === originId) {
+        ledger[i].workerSessionId = worker.localId;
+        return ledger[i];
+      }
     }
-    return null;
+    if (!worker || !originId) return null;
+    var generation = worker._pairGeneration || worker.sessionProvenance && worker.sessionProvenance.generation;
+    if (!Number.isInteger(generation) || generation < 1) return null;
+    var candidates = [];
+    for (var j = 0; j < ledger.length; j++) {
+      if (!ledger[j].workerOriginId && ledger[j].generation === generation) candidates.push(ledger[j]);
+    }
+    if (candidates.length !== 1) return null;
+    candidates[0].workerOriginId = originId;
+    candidates[0].workerSessionId = worker.localId;
+    if (typeof sm.saveSessionFile === "function") sm.saveSessionFile(driver);
+    return candidates[0];
   }
-
-  // Objective signals the server already has. Recorded when a generation ends
-  // so the Driver's next decision can use them without a transcript.
   function closeGeneration(driver, worker) {
-    var record = findGeneration(driver, worker.localId);
+    ledgerFor(driver);
+    var record = findGeneration(driver, worker);
     if (!record || record.endedAt) return record;
     var continuity = continuityStatus(worker);
     var context = contextStatus(worker);
@@ -138,10 +180,9 @@ function attachPairLifecycle(ctx) {
       usedTokens: context.current.usedTokens,
       usedRatio: context.current.usedRatio,
     };
+    if (typeof sm.saveSessionFile === "function") sm.saveSessionFile(driver);
     return record;
   }
-
-  // The exact pair, with the Driver's structural capability re-checked on every call.
   function resolveDriverPair(caller) {
     if (!caller) throw new Error("pair lifecycle tools require a session-bound tool server");
     // Exact live object identity, before anything is read off the caller. A
@@ -169,8 +210,6 @@ function attachPairLifecycle(ctx) {
     return null;
   }
 
-  // Bounded status for the reuse-vs-replace decision. Exact pair only; no
-  // other user's data and no transcript.
   function partnerStatus(caller) {
     var resolved = resolveDriverPair(caller);
     var worker = resolved.worker;
@@ -229,15 +268,11 @@ function attachPairLifecycle(ctx) {
     };
   }
 
-  // Transactional replacement. Rejects an active Worker unless interrupt is
-  // explicitly true, cancels anything the old Worker was waiting on, dissolves
-  // the exact pair without deleting history, and creates a fresh Worker.
-  // Idempotent in the sense that it either completes or leaves the existing
-  // pair untouched; it never half-dissolves.
   function replacePartner(args, caller) {
     var resolved = resolveDriverPair(caller);
     var group = resolved.group;
     var oldWorker = resolved.worker;
+    ledgerFor(caller);
     turnControl.assertWorkerAction(caller);
     var replacementEntry = replacementState.begin(caller, args.transactionId, oldWorker, replacementFingerprint(args, oldWorker));
     var replay = replacementState.replayValue(replacementEntry);
@@ -344,7 +379,10 @@ function attachPairLifecycle(ctx) {
         ". " + restoreNote + interruptNote);
     }
     var closed = closeGeneration(caller, oldWorker);
-    if (closed && args.evaluation) applyEvaluation(closed, args.evaluation);
+    if (closed && args.evaluation) {
+      applyEvaluation(closed, args.evaluation);
+      if (typeof sm.saveSessionFile === "function") sm.saveSessionFile(caller);
+    }
     var generation = recordGenerationStart(caller, created.worker);
 
     var result = {
@@ -372,17 +410,15 @@ function attachPairLifecycle(ctx) {
       });
   }
 
-  // Shape check only; writes nothing. Lets a caller that is about to destroy
-  // something reject a malformed assessment first.
+  // No global or cross-user ranking is formed from Worker evaluations.
   function validateEvaluation(raw) {
-    var input = raw && typeof raw === "object" ? raw : {};
+    var input = typeof raw === "string" ? { outcome: raw } : (raw && typeof raw === "object" ? raw : {});
     var outcome = typeof input.outcome === "string" ? input.outcome.trim().toLowerCase() : "";
     if (EVALUATION_OUTCOMES.indexOf(outcome) === -1) {
       throw new Error('evaluation outcome must be one of: ' + EVALUATION_OUTCOMES.join(", "));
     }
     return { outcome: outcome, note: clampText(input.note, MAX_NOTE_CHARS) };
   }
-
   function applyEvaluation(record, raw) {
     var clean = validateEvaluation(raw);
     record.evaluation = {
@@ -393,23 +429,20 @@ function attachPairLifecycle(ctx) {
     return record.evaluation;
   }
 
-  // Attach a bounded assessment to one exact Worker generation. The Driver
-  // supplies the judgement; the server supplies the objective observations and
-  // refuses anything outside the enum. No global or cross-user ranking is
-  // formed from this.
   function recordEvaluation(args, caller) {
     var resolved = resolveDriverPair(caller);
+    var ledger = ledgerFor(caller);
     var target = Number.isInteger(args.generation)
       ? (function () {
-        var ledger = ledgerFor(caller);
         for (var i = 0; i < ledger.length; i++) {
           if (ledger[i].generation === args.generation) return ledger[i];
         }
         return null;
       })()
-      : findGeneration(caller, resolved.worker.localId);
+      : findGeneration(caller, resolved.worker);
     if (!target) throw new Error("no such Split Worker generation for this Driver");
     var evaluation = applyEvaluation(target, args);
+    if (typeof sm.saveSessionFile === "function") sm.saveSessionFile(caller);
     return {
       status: "recorded",
       generation: target.generation,
@@ -420,11 +453,6 @@ function attachPairLifecycle(ctx) {
     };
   }
 
-  // Tool handlers for the three lifecycle tools, with this module's own error
-  // shaping. Kept here so the pair coordinator only wires names to handlers.
-  // partnerStatus, or null when this session cannot legitimately ask for it.
-  // Lets read_partner fold the capacity report in without duplicating the
-  // guard chain or swallowing errors inline at the call site.
   function optionalStatus(boundSession) {
     try { return partnerStatus(boundSession); } catch (e) { return null; }
   }

package/lib/project-pair-usage.js

@@ -52,14 +52,17 @@ function contextStatus(session) {
     if (input !== null) { cumulativeInput += input; observedInput = true; }
     if (output !== null) { cumulativeOutput += output; observedOutput = true; }
     results++;
-    lastTask = { inputTokens: input, outputTokens: output, currentInputTokens: firstNumber(item.lastStreamInputTokens) };
+    lastTask = { inputTokens: input, outputTokens: output, currentInputTokens: null };
     var observedWindow = matchingWindow(item.modelUsage, session.model);
     if (observedWindow !== null) window = observedWindow;
   }
-  if (used === null && lastTask && lastTask.currentInputTokens !== null) {
-    used = lastTask.currentInputTokens;
-    source = "last_stream_input";
+  if (used !== null && window !== null && used > window) {
+    used = null;
+    source = "unavailable";
   }
+  // Older result records contain lastStreamInputTokens, but that field was
+  // populated from adapter snapshots that could be cumulative or inflated by
+  // cache accounting. It is not safe evidence of current context occupancy.
   var ratio = used !== null && window !== null && window > 0 ? Math.min(1, Math.round((used / window) * 1000) / 1000) : null;
   return {
     current: { source: source, usedTokens: used, windowTokens: window, usedRatio: ratio,

package/lib/project-worker-proposal.js

@@ -6,6 +6,18 @@ var driverOrchestration = require("./session-driver-orchestration");
 var proposalControl = require("./worker-proposal-control");
 var runtimeCatalog = require("./worker-runtime-catalog");
 var MAX_SUMMARY_CHARS = 600, MAX_PLAN_CHARS = 6000, MAX_TASK_CHARS = 30000, MAX_RATIONALE_CHARS = 1000;
+var EVALUATION_OUTCOMES = ["succeeded", "partial", "failed", "abandoned"];
+function normalizeEvaluation(raw) {
+  if (raw == null) return null;
+  var input = typeof raw === "string" ? { outcome: raw } : raw;
+  if (!input || typeof input !== "object") return { error: "evaluation must be an outcome string or object" };
+  var outcome = typeof input.outcome === "string" ? input.outcome.trim().toLowerCase() : "";
+  if (EVALUATION_OUTCOMES.indexOf(outcome) === -1) {
+    return { error: "evaluation outcome must be one of: " + EVALUATION_OUTCOMES.join(", ") };
+  }
+  var note = typeof input.note === "string" ? input.note.replace(/\s+/g, " ").trim().slice(0, 400) : "";
+  return { value: { outcome: outcome, note: note } };
+}
 function modelValue(entry) {
   if (typeof entry === "string") return entry;
   return entry && (entry.value || entry.id) || "";
@@ -227,6 +239,8 @@ function attachWorkerProposal(ctx) {
     if (!task) return toolResult({ error: "message is required so an accepted replacement delegates exactly once." });
     if (!rationale) return toolResult({ error: "recommendationRationale is required for the replacement audit trail." });
     if (task.length > MAX_TASK_CHARS) return toolResult({ error: "The Split Worker task is too long." });
+    var normalizedEvaluation = normalizeEvaluation(args.evaluation);
+    if (normalizedEvaluation && normalizedEvaluation.error) return toolResult({ error: normalizedEvaluation.error });
     await ensureModelCatalogs();
     var liveGroup = store.groupForMember(session.localId);
     if (!isLiveSession(session) || !driverEligibility.isEligibleDriverSession(session, sm) ||
@@ -261,7 +275,7 @@ function attachWorkerProposal(ctx) {
       sourceGroupId: sourceGroupId,
       sourceWorkerId: sourceWorkerId,
       interrupt: args.interrupt === true,
-      evaluation: args.evaluation || null,
+      evaluation: normalizedEvaluation ? normalizedEvaluation.value : null,
       transactionId: "replace_" + crypto.randomUUID(),
     };
     if (superseded) updateProposal(session, superseded, { status: "superseded", supersededBy: proposal.proposalId });

package/lib/public/app.js

@@ -287,6 +287,7 @@ import { initDebate, handleDebatePreparing, handleDebateStarted, handleDebateRes
     slashCommands: [],
     processing: false,
     activeSessionId: null,
+    askUserRequests: {},
     activeBackgroundTasks: [],
     sessionVendorBound: false,
     cliSessionId: null,

package/lib/public/modules/ask-user-state.js

@@ -0,0 +1,66 @@
+import { store } from './store.js';
+
+function scopeKey() {
+  var sessionId = store.get('paneSessionId') || store.get('activeSessionId') || "unknown";
+  var project = store.get('currentSlug') || "unknown-project";
+  var pane = store.get('paneMode') ? "pane" : "main";
+  return project + "\u0000" + pane + "\u0000" + String(sessionId);
+}
+
+function requestKey(toolId) {
+  return scopeKey() + "\u0000" + String(toolId);
+}
+
+function requests() {
+  return store.get('askUserRequests') || {};
+}
+
+export function getAskUserRequestKey(toolId) {
+  return requestKey(toolId);
+}
+
+export function rememberAskUserRequest(toolId) {
+  var key = requestKey(toolId);
+  var current = requests();
+  if (!current[key]) {
+    var next = Object.assign({}, current);
+    next[key] = { toolId: String(toolId), scope: scopeKey(), answered: false };
+    store.set({ askUserRequests: next });
+  }
+  return key;
+}
+
+export function hasAskUserRequest(toolId) {
+  return !!requests()[requestKey(toolId)];
+}
+
+export function markAskUserRequestAnswered(toolId) {
+  var key = requestKey(toolId);
+  var current = requests();
+  if (!current[key]) return;
+  var next = Object.assign({}, current);
+  next[key] = Object.assign({}, next[key], { answered: true });
+  store.set({ askUserRequests: next });
+}
+
+export function findAskUserCard(root, toolId) {
+  if (!root || !root.querySelectorAll) return null;
+  var key = requestKey(toolId);
+  var cards = root.querySelectorAll(".ask-user-container");
+  for (var i = 0; i < cards.length; i++) {
+    if (cards[i].dataset && cards[i].dataset.askUserRequestKey === key) return cards[i];
+  }
+  return null;
+}
+
+export function saveAskUserState() {
+  return Object.assign({}, requests());
+}
+
+export function restoreAskUserState(saved) {
+  store.set({ askUserRequests: Object.assign({}, saved || {}) });
+}
+
+export function resetAskUserState() {
+  store.set({ askUserRequests: {} });
+}

package/lib/public/modules/tools.js

@@ -8,6 +8,7 @@ import { getChatLayout } from './theme.js';
 import { store } from './store.js';
 import { VENDOR_NAMES } from './app-rendering.js';
 import { startThinkingSegment, appendThinkingText, stopThinkingSegment, resetThinkingTurn, clearThinkingState, saveThinkingState, restoreThinkingState, updateThinkingTokenEstimate } from './thinking-lifecycle.js';
+import { findAskUserCard, getAskUserRequestKey, hasAskUserRequest, rememberAskUserRequest, markAskUserRequestAnswered, saveAskUserState, restoreAskUserState, resetAskUserState } from './ask-user-state.js';
 
 var ctx;
 
@@ -227,6 +228,10 @@ function shortPath(p) {
 
 // --- AskUserQuestion ---
 export function renderAskUserQuestion(toolId, input) {
+  var existingCard = findAskUserCard(ctx.messagesEl, toolId);
+  if (existingCard) return existingCard;
+  if (hasAskUserRequest(toolId)) return null;
+
   ctx.finalizeAssistantBlock();
   stopThinking();
   closeToolGroup();
@@ -237,6 +242,9 @@ export function renderAskUserQuestion(toolId, input) {
   var container = document.createElement("div");
   container.className = "ask-user-container";
   container.dataset.toolId = toolId;
+  var requestKey = getAskUserRequestKey(toolId);
+  container.dataset.askUserRequestKey = requestKey;
+  rememberAskUserRequest(toolId);
 
   // Mate DM: wrap in avatar + content layout (same as msg-assistant)
   var mateContentWrap = null;
@@ -372,6 +380,7 @@ export function renderAskUserQuestion(toolId, input) {
   skipBtn.addEventListener("click", function () {
     if (container.classList.contains("answered")) return;
     container.classList.add("answered");
+    markAskUserRequestAnswered(toolId);
     enableMainInput();
     if (ctx.ws && ctx.connected) {
       ctx.ws.send(JSON.stringify({ type: "stop" }));
@@ -415,7 +424,7 @@ export function enableMainInput() {
 }
 
 function submitAskUserAnswer(container, toolId, questions, answers, multiSelections) {
-  if (container.classList.contains("answered")) return;
+  if (container.classList.contains("answered") || container.dataset.askUserSubmitted === "true") return;
 
   var result = {};
   for (var i = 0; i < questions.length; i++) {
@@ -430,6 +439,7 @@ function submitAskUserAnswer(container, toolId, questions, answers, multiSelecti
   if (Object.keys(result).length === 0) return;
 
   container.classList.add("answered");
+  container.dataset.askUserSubmitted = "true";
   enableMainInput();
   if (ctx.stopUrgentBlink) ctx.stopUrgentBlink();
 
@@ -471,9 +481,10 @@ function showAnswerSummary(container, questions, answers) {
 }
 
 export function markAskUserAnswered(toolId, answers) {
-  var container = document.querySelector('.ask-user-container[data-tool-id="' + toolId + '"]');
+  var container = findAskUserCard(ctx.messagesEl, toolId);
   if (container && !container.classList.contains("answered")) {
     container.classList.add("answered");
+    markAskUserRequestAnswered(toolId);
     enableMainInput();
     // Restore answers from history replay
     if (answers && Object.keys(answers).length > 0) {
@@ -2420,6 +2431,7 @@ export function saveToolState() {
     toolGroupCounter: toolGroupCounter,
     toolGroups: toolGroups,
     lastCumulativeCost: _lastCumulativeCost,
+    askUserState: saveAskUserState(),
   };
 }
 
@@ -2435,6 +2447,7 @@ export function restoreToolState(saved) {
   toolGroupCounter = saved.toolGroupCounter;
   toolGroups = saved.toolGroups;
   _lastCumulativeCost = saved.lastCumulativeCost || 0;
+  restoreAskUserState(saved.askUserState);
   if (todoWidgetEl) {
     setupTodoObserver();
   }
@@ -2442,6 +2455,7 @@ export function restoreToolState(saved) {
 
 export function resetToolState() {
   tools = {};
+  resetAskUserState();
   clearThinkingState();
   inPlanMode = false;
   planContent = null;

package/lib/sdk-message-processor.js

@@ -2,6 +2,7 @@ var usersModule = require("./users");
 var yoke = require("./yoke");
 var backgroundTaskTiming = require("./background-task-timing");
 var sessionTitlePolicy = require("./session-title-policy");
+var askUserIdentity = require("./ask-user-request-identity");
 
 var OVERLOAD_RETRY_LIMIT = 3;
 
@@ -379,7 +380,24 @@ function attachMessageProcessor(ctx) {
       if (block && block.type === "tool_use") {
         var input = {};
         try { input = JSON.parse(block.inputJson); } catch (e) {}
-        sendAndRecord(session, { type: "tool_executing", id: block.id, name: block.name, input: input });
+        // Native AskUserQuestion is recorded when canUseTool opens the
+        // request. The later block_stop is the SDK's completion notification
+        // for that same request, not a second question. Keeping both records
+        // made replay render two independently editable cards and allowed the
+        // client to submit the same request twice.
+        var alreadyRecordedAsk = false;
+        if (block.name === "AskUserQuestion" && block.id && Array.isArray(session.history)) {
+          for (var ahi = session.history.length - 1; ahi >= 0; ahi--) {
+            var priorAsk = session.history[ahi];
+            if (askUserIdentity.sameAskUserRequest(priorAsk, block.id, input)) {
+              alreadyRecordedAsk = true;
+              break;
+            }
+          }
+        }
+        if (!alreadyRecordedAsk) {
+          sendAndRecord(session, { type: "tool_executing", id: block.id, name: block.name, input: input });
+        }
 
         // Track active Task tools for sub-agent done detection
         if (block.name === "Task") {

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

@@ -1,6 +1,12 @@
 // Partner-control tools for sessions that belong to a split group.
 
 var buildShape = require("./session-spawn-mcp-server").buildShape;
+var z;
+try { z = require("zod"); } catch (e) { z = null; }
+var evaluationSchema = z ? z.union([
+  z.string(),
+  z.object({ outcome: z.string(), note: z.string().optional() }),
+]) : null;
 
 // `options.lifecycle` adds the autonomous management tools. They are omitted
 // for a plain side-by-side split, which has no Driver role to exercise them.
@@ -68,7 +74,7 @@ function getToolDefs(handlers, options) {
         workerEffort: { type: "string", description: "Optional reasoning effort for the new Worker." },
         recommendationRationale: { type: "string", description: "Concise Driver-authored explanation of why the recommended replacement vendor, model, and effort fit the next task." },
         evaluation: {
-          type: "object",
+          schema: evaluationSchema,
           description: "Optional bounded assessment of the Worker being replaced, recorded against that exact generation.",
         },
         operationId: { type: "string", description: "Optional stable id for this replacement. Reusing it within the same human turn returns the original operation instead of replacing twice." },

package/lib/session-provenance.js

@@ -69,6 +69,7 @@ function restore(meta, session) {
     createdVia: stored.createdVia === "split-worker" ? "split-worker" : null,
     createdAt: typeof stored.createdAt === "number" && isFinite(stored.createdAt) ? stored.createdAt : null,
   };
+  session._pairGeneration = session.sessionProvenance.generation;
   return storedOriginId !== session.sessionOriginId || JSON.stringify(stored) !== JSON.stringify(session.sessionProvenance);
 }
 

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

@@ -12,7 +12,8 @@ function buildShape(props, required) {
     var key = keys[i];
     var prop = props[key];
     var field;
-    if (prop.type === "number") field = z.number();
+    if (prop.schema) field = prop.schema;
+    else if (prop.type === "number") field = z.number();
     else if (prop.type === "boolean") field = z.boolean();
     else if (prop.enum) field = z.enum(prop.enum);
     else field = z.string();

package/lib/sessions.js

@@ -186,6 +186,7 @@ function createSessionManager(opts) {
       var provenanceMeta = sessionProvenance.metadata(session);
       metaObj.sessionOriginId = provenanceMeta.sessionOriginId;
       if (provenanceMeta.sessionProvenance) metaObj.sessionProvenance = provenanceMeta.sessionProvenance;
+      if (Array.isArray(session._workerGenerations)) metaObj.workerGenerations = session._workerGenerations;
       var meta = JSON.stringify(metaObj);
       var lines = [meta];
       for (var i = 0; i < session.history.length; i++) {
@@ -308,6 +309,7 @@ function createSessionManager(opts) {
       if (m.ownerId) session.ownerId = m.ownerId;
       session.sessionOriginId = m.sessionOriginId || null;
       session._provenanceMigrationNeeded = sessionProvenance.restore(m, session);
+      if (Array.isArray(m.workerGenerations)) session._workerGenerations = m.workerGenerations;
       // Born-TUI session: PTY is gone after restart, but the cliSessionId
       // is still resumable via `claude --resume <id>`. We mark the mode
       // here so it shows up in the sidebar with the right icon; the

package/lib/yoke/adapters/codex.js

@@ -193,7 +193,8 @@ function flattenEvent(notification, state) {
     if (turnStatus === "interrupted" || state.aborted) {
       events.push({ yokeType: "interrupted" });
     }
-    var inputTokens = state.lastInputTokens || (usage ? (usage.input_tokens || 0) + (usage.cached_input_tokens || 0) : 0);
+    var inputTokens = state.lastInputTokens !== null && state.lastInputTokens !== undefined
+      ? state.lastInputTokens : (usage ? (usage.input_tokens || 0) : 0);
     var outputTokens = (usage ? (usage.output_tokens || 0) : 0) || state.lastOutputTokens || 0;
     var cachedTokens = (usage ? (usage.cached_input_tokens || 0) : 0) || state.lastCachedTokens || 0;
     var hasTokenData = inputTokens > 0 || outputTokens > 0;
@@ -217,7 +218,7 @@ function flattenEvent(notification, state) {
       } : null,
       modelUsage: resultModelUsage,
       sessionId: state.threadId || null,
-      lastStreamInputTokens: state.lastInputTokens || null,
+      lastStreamInputTokens: null,
     });
     state.lastInputTokens = null;
     state.lastCachedTokens = null;
@@ -675,15 +676,28 @@ function flattenEvent(notification, state) {
   // context gauge must use the LAST turn, not the running total: each turn's
   // input already contains the whole conversation, so summing turns
   // overstates occupancy (a 5k + 8k thread reads as 13k of an 8k context).
-  // `total` is only a fallback for servers that omit lastTurn.
+  // A missing lastTurn is not evidence of current context occupancy. The
+  // protocol's total is cumulative across the thread and must never be used
+  // as the context gauge.
   if (method === "thread/tokenUsage/updated") {
     var tu = params.tokenUsage;
     if (tu) {
-      var turnUsage = tu.lastTurn || tu.total;
+      var turnUsage = tu.lastTurn;
       if (turnUsage) {
-        state.lastInputTokens = (turnUsage.inputTokens || 0) + (turnUsage.cachedInputTokens || 0);
+        var candidateInput = typeof turnUsage.inputTokens === "number" ? turnUsage.inputTokens : null;
+        var currentWindow = typeof tu.modelContextWindow === "number" ? tu.modelContextWindow : null;
+        state.lastInputTokens = candidateInput !== null && (currentWindow === null || candidateInput <= currentWindow) ? candidateInput : null;
         state.lastCachedTokens = turnUsage.cachedInputTokens || 0;
         state.lastOutputTokens = turnUsage.outputTokens || 0;
+        state.currentContextUsage = state.lastInputTokens !== null &&
+          (currentWindow === null || state.lastInputTokens <= currentWindow)
+          ? { input_tokens: state.lastInputTokens, contextWindow: currentWindow }
+          : { input_tokens: null, contextWindow: currentWindow };
+      } else {
+        state.lastInputTokens = null;
+        state.lastCachedTokens = null;
+        state.lastOutputTokens = null;
+        state.currentContextUsage = null;
       }
       if (tu.modelContextWindow) state.modelContextWindow = tu.modelContextWindow;
     }
@@ -734,6 +748,7 @@ function createEventState(model) {
     lastInputTokens: null,
     lastCachedTokens: null,
     lastOutputTokens: null,
+    currentContextUsage: null,
     modelContextWindow: null,
     done: false,
     aborted: false,
@@ -1107,6 +1122,9 @@ function createCodexQueryHandle(appServer, queryOpts) {
 
       var threadResult;
       if (queryOpts.resumeSessionId) {
+        // ThreadResumeParams in the installed app-server schema has no
+        // dynamicTools field. New tools therefore require a new Driver/Worker
+        // thread; resumed threads can only refresh handlers for persisted tools.
         threadResult = await appServer.send("thread/resume", {
           threadId: queryOpts.resumeSessionId,
           model: threadParams.model,
@@ -1269,11 +1287,7 @@ function createCodexQueryHandle(appServer, queryOpts) {
     },
 
     getContextUsage: function() {
-      if (state.lastInputTokens == null && state.modelContextWindow == null) return Promise.resolve(null);
-      return Promise.resolve({
-        input_tokens: state.lastInputTokens == null ? null : state.lastInputTokens,
-        contextWindow: state.modelContextWindow || null,
-      });
+      return Promise.resolve(state.currentContextUsage);
     },
 
     abort: function() {

package/package.json

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