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

package/lib/public/modules/tools.js

@@ -9,6 +9,7 @@ import { store } from './store.js';
 import { applyPermissionHints } from './permission-hints.js';
 import { VENDOR_NAMES } from './app-rendering.js';
 import { startThinkingSegment, appendThinkingText, stopThinkingSegment, resetThinkingTurn, clearThinkingState, saveThinkingState, restoreThinkingState, updateThinkingTokenEstimate } from './thinking-lifecycle.js';
+import { buildElicitationCard, markElicitationCard, showElicitationError } from './elicitation-form.js';
 import { findAskUserCard, getAskUserRequestKey, hasAskUserRequest, rememberAskUserRequest, markAskUserRequestAnswered, saveAskUserState, restoreAskUserState, resetAskUserState } from './ask-user-state.js';
 
 var ctx;
@@ -1026,204 +1027,38 @@ export function markPermissionCancelled(requestId) {
 }
 
 // --- MCP elicitation rendering ---
+// Form building, validation and resolved states live in elicitation-form.js.
 
 var pendingElicitations = {};
 
+function findElicitationCard(requestId) {
+  return pendingElicitations[requestId]
+    || ctx.messagesEl.querySelector('.elicitation-container[data-request-id="' + requestId + '"]');
+}
+
 export function renderElicitationRequest(msg) {
   if (pendingElicitations[msg.requestId]) return;
   ctx.finalizeAssistantBlock();
   stopThinking();
   closeToolGroup();
-
-  var container = document.createElement("div");
-  container.className = "permission-container elicitation-container";
-  container.dataset.requestId = msg.requestId;
-
-  // Header
-  var header = document.createElement("div");
-  header.className = "permission-header";
-  header.innerHTML =
-    '<span class="permission-icon">' + iconHtml("key") + '</span>' +
-    '<span class="permission-title">' + escapeHtml(msg.serverName || "MCP Server") + ' requests input</span>';
-
-  // Body
-  var body = document.createElement("div");
-  body.className = "permission-body";
-
-  if (msg.message) {
-    var messageEl = document.createElement("div");
-    messageEl.className = "permission-reason";
-    messageEl.textContent = msg.message;
-    body.appendChild(messageEl);
-  }
-
-  // Form fields (form mode) or URL button (url mode)
-  var formData = {};
-
-  if (msg.mode === "url" && msg.url) {
-    var urlInfo = document.createElement("div");
-    urlInfo.className = "elicitation-url-info";
-    urlInfo.style.cssText = "margin-top: 8px; font-size: 12px; color: var(--text-muted);";
-    urlInfo.textContent = "Opens: " + msg.url;
-    body.appendChild(urlInfo);
-  } else if (msg.requestedSchema && msg.requestedSchema.properties) {
-    var formEl = document.createElement("div");
-    formEl.className = "elicitation-form";
-    formEl.style.cssText = "margin-top: 8px; display: flex; flex-direction: column; gap: 8px;";
-
-    var props = msg.requestedSchema.properties;
-    var required = msg.requestedSchema.required || [];
-    var propNames = Object.keys(props);
-    for (var i = 0; i < propNames.length; i++) {
-      var propName = propNames[i];
-      var prop = props[propName];
-      var isRequired = required.indexOf(propName) !== -1;
-
-      var fieldWrapper = document.createElement("div");
-      fieldWrapper.style.cssText = "display: flex; flex-direction: column; gap: 2px;";
-
-      var label = document.createElement("label");
-      label.style.cssText = "font-size: 12px; font-weight: 500; color: var(--text-secondary);";
-      label.textContent = propName + (isRequired ? " *" : "");
-      if (prop.description) {
-        label.title = prop.description;
-      }
-
-      var input;
-      if (prop.type === "boolean") {
-        input = document.createElement("input");
-        input.type = "checkbox";
-        input.dataset.propName = propName;
-        input.dataset.propType = "boolean";
-      } else if (prop.enum) {
-        input = document.createElement("select");
-        input.dataset.propName = propName;
-        input.dataset.propType = "enum";
-        input.style.cssText = "padding: 4px 8px; border-radius: 4px; border: 1px solid var(--border); background: var(--input-bg); color: var(--text-primary); font-size: 13px;";
-        for (var ei = 0; ei < prop.enum.length; ei++) {
-          var opt = document.createElement("option");
-          opt.value = prop.enum[ei];
-          opt.textContent = prop.enum[ei];
-          input.appendChild(opt);
-        }
-      } else {
-        input = document.createElement("input");
-        input.type = prop.type === "number" || prop.type === "integer" ? "number" : "text";
-        input.dataset.propName = propName;
-        input.dataset.propType = prop.type || "string";
-        input.placeholder = prop.description || propName;
-        input.style.cssText = "padding: 4px 8px; border-radius: 4px; border: 1px solid var(--border); background: var(--input-bg); color: var(--text-primary); font-size: 13px;";
-      }
-
-      fieldWrapper.appendChild(label);
-      fieldWrapper.appendChild(input);
-      formEl.appendChild(fieldWrapper);
-    }
-    body.appendChild(formEl);
-  }
-
-  // Actions
-  var actions = document.createElement("div");
-  actions.className = "permission-actions";
-
-  var acceptBtn = document.createElement("button");
-  acceptBtn.className = "permission-btn permission-allow";
-
-  if (msg.mode === "url" && msg.url) {
-    acceptBtn.textContent = "Open & Approve";
-    acceptBtn.addEventListener("click", function () {
-      window.open(msg.url, "_blank");
-      sendElicitationResponse(container, msg.requestId, "accept", {});
-    });
-  } else {
-    acceptBtn.textContent = "Submit";
-    acceptBtn.addEventListener("click", function () {
-      // Collect form values
-      var content = {};
-      var inputs = container.querySelectorAll("[data-prop-name]");
-      for (var j = 0; j < inputs.length; j++) {
-        var inp = inputs[j];
-        var name = inp.dataset.propName;
-        var pType = inp.dataset.propType;
-        if (pType === "boolean") {
-          content[name] = inp.checked;
-        } else if (pType === "number" || pType === "integer") {
-          content[name] = Number(inp.value);
-        } else {
-          content[name] = inp.value;
-        }
-      }
-      sendElicitationResponse(container, msg.requestId, "accept", content);
-    });
-  }
-
-  var denyBtn = document.createElement("button");
-  denyBtn.className = "permission-btn permission-deny";
-  denyBtn.textContent = "Deny";
-  denyBtn.addEventListener("click", function () {
-    sendElicitationResponse(container, msg.requestId, "reject", null);
+  var container = buildElicitationCard(msg, function () {
+    if (ctx.stopUrgentBlink) ctx.stopUrgentBlink();
   });
-
-  actions.appendChild(acceptBtn);
-  actions.appendChild(denyBtn);
-
-  container.appendChild(header);
-  container.appendChild(body);
-  container.appendChild(actions);
   ctx.addToMessages(container);
-
   pendingElicitations[msg.requestId] = container;
   refreshIcons();
   ctx.setActivity(null);
   maybeScrollToBottom();
 }
 
-function sendElicitationResponse(container, requestId, action, content) {
-  if (container.classList.contains("resolved")) return;
-  container.classList.add("resolved");
-  if (ctx.stopUrgentBlink) ctx.stopUrgentBlink();
-
-  var label = action === "reject" ? "Denied" : "Submitted";
-  var resolvedClass = action === "reject" ? "resolved-denied" : "resolved-allowed";
-  container.classList.add(resolvedClass);
-
-  var actions = container.querySelector(".permission-actions");
-  if (actions) {
-    actions.innerHTML = '<span class="permission-decision-label">' + label + '</span>';
-  }
-
-  if (ctx.ws && ctx.connected) {
-    var msg = {
-      type: "elicitation_response",
-      requestId: requestId,
-      action: action,
-    };
-    if (action === "accept" && content) {
-      msg.content = content;
-    }
-    ctx.ws.send(JSON.stringify(msg));
-  }
-
+export function markElicitationResolved(requestId, action) {
+  markElicitationCard(findElicitationCard(requestId), action);
   delete pendingElicitations[requestId];
 }
 
-export function markElicitationResolved(requestId, action) {
-  var container = pendingElicitations[requestId];
-  if (!container) {
-    container = ctx.messagesEl.querySelector('.elicitation-container[data-request-id="' + requestId + '"]');
-  }
-  if (!container || container.classList.contains("resolved")) return;
-
-  container.classList.add("resolved");
-  var isDeny = action === "reject";
-  container.classList.add(isDeny ? "resolved-denied" : "resolved-allowed");
-
-  var label = isDeny ? "Denied" : "Submitted";
-  var actionsEl = container.querySelector(".permission-actions");
-  if (actionsEl) {
-    actionsEl.innerHTML = '<span class="permission-decision-label">' + label + '</span>';
-  }
-  delete pendingElicitations[requestId];
+export function markElicitationError(requestId, error, expired) {
+  showElicitationError(findElicitationCard(requestId), error, expired);
+  if (expired) delete pendingElicitations[requestId];
 }
 
 // --- Host user dialog (SDK request_user_dialog) ---

package/lib/public/style.css

@@ -13,6 +13,7 @@
 @import url("css/messages.css?v=20260828-delegated-muted1");
 @import url("css/generated-images.css?v=20260829-save-details1");
 @import url("css/rewind.css");
+@import url("css/elicitation-form.css");
 @import url("css/input.css?v=20261002-stop-inline1");
 @import url("css/pending-message-queue.css?v=20260914-queue1");
 @import url("css/filebrowser.css?v=20260829-terminal-canvas1");

package/lib/sdk-bridge.js

@@ -392,9 +392,9 @@ function createSDKBridge(opts) {
   // --- MCP elicitation ---
 
   function handleElicitation(session, request, opts) {
-    // Ralph Loop: auto-reject elicitation in autonomous mode
+    // Ralph Loop: autonomous mode explicitly declines elicitation.
     if (session.loop && session.loop.active && session.loop.role !== "crafting") {
-      return Promise.resolve({ action: "reject" });
+      return Promise.resolve({ action: "decline" });
     }
 
     return new Promise(function(resolve) {
@@ -427,8 +427,10 @@ function createSDKBridge(opts) {
 
       if (opts.signal) {
         opts.signal.addEventListener("abort", function() {
+          if (!session.pendingElicitations || !session.pendingElicitations[requestId]) return;
           delete session.pendingElicitations[requestId];
-          resolve({ action: "reject" });
+          sendAndRecord(session, { type: "elicitation_resolved", requestId: requestId, action: "cancel" });
+          resolve({ action: "cancel" });
         });
       }
     });
@@ -539,9 +541,10 @@ function createSDKBridge(opts) {
       return { behavior: "allow", updatedInput: input };
     }
 
-    // Session search is read-only; its handler enforces project and session access.
-    if (toolName === "search_other_driver_sessions"
-        || toolName === "mcp__clay-handoff__search_other_driver_sessions") {
+    // Session discovery and reads enforce project and session access in their handlers.
+    if (["list_other_driver_sessions", "search_other_driver_sessions", "read_other_driver_session"].some(function (name) {
+      return toolName === name || toolName === "mcp__clay-handoff__" + name;
+    })) {
       return { behavior: "allow", updatedInput: input };
     }
 
@@ -1848,7 +1851,8 @@ function createSDKBridge(opts) {
         }
         return handleElicitation(session, request.diagnostics.elicitation, { signal: elicitationController.signal }).then(function(result) {
           if (result && result.action === "accept") return respond.submitContent(result.content || {});
-          return respond.cancel("Elicitation rejected");
+          if (result && (result.action === "decline" || result.action === "reject")) return respond.decline("Elicitation declined");
+          return respond.cancel("Elicitation cancelled");
         });
       }
       if (typeof opts.onUserInputRequest !== "function") return respond.cancel("Structured user input is unavailable.");

package/lib/sdk-worker.js

@@ -186,7 +186,7 @@ function onElicitation(request, opts) {
     if (opts.signal) {
       opts.signal.addEventListener("abort", function() {
         delete pendingElicitations[requestId];
-        resolve({ action: "reject" });
+        resolve({ action: "cancel" });
       });
     }
   });

package/lib/ws-schema.js

@@ -194,6 +194,7 @@ var schema = {
   "elicitation_request":      { direction: "s2c", handler: "lib/public/modules/app-messages.js", description: "Structured form elicitation request from assistant" },
   "elicitation_response":     { direction: "c2s", handler: "lib/project-sessions.js", description: "User response to an elicitation form" },
   "elicitation_resolved":     { direction: "s2c", handler: "lib/public/modules/app-messages.js", description: "Elicitation request resolved" },
+  "elicitation_error":        { direction: "s2c", handler: "lib/public/modules/app-messages.js", description: "Submitted elicitation form failed server validation; the request stays pending" },
   "user_dialog_request":      { direction: "s2c", handler: "lib/public/modules/app-messages.js", description: "Host dialog request from assistant (SDK request_user_dialog)" },
   "user_dialog_response":     { direction: "c2s", handler: "lib/project-sessions.js", description: "User response to a host dialog request" },
   "user_dialog_resolved":     { direction: "s2c", handler: "lib/public/modules/app-messages.js", description: "Host dialog request resolved" },

package/lib/yoke/acp-agent-profiles.js

@@ -185,7 +185,7 @@ var ACP_AGENT_PROFILES = {
     displayName: "Grok Build",
     binaryName: "grok",
     overrideName: "GROK_CLI_PATH",
-    args: ["--no-auto-update", "--permission-mode", "ask", "agent", "stdio"],
+    args: ["--no-auto-update", "--permission-mode", "default", "agent", "stdio"],
     defaultModels: ["auto"],
     defaultModel: "auto",
     sessionResume: null,

package/lib/yoke/acp-event-normalizer.js

@@ -95,9 +95,14 @@ function normalizeAcpUpdate(update, state) {
 
   if (type === "tool_call" || type === "tool_call_update") {
     var callId = update.toolCallId;
-    var name = toolNameForKind(update.kind, update.title);
-    if (callId && update.kind) {
-      state.toolMeta[callId] = { kind: update.kind, title: update.title, rawInput: update.rawInput || {} };
+    var name = update.name || toolNameForKind(update.kind, update.title);
+    if (callId) {
+      state.toolMeta[callId] = Object.assign({}, state.toolMeta[callId] || {}, {
+        kind: update.kind || (state.toolMeta[callId] && state.toolMeta[callId].kind),
+        name: update.name || (state.toolMeta[callId] && state.toolMeta[callId].name),
+        title: update.title || (state.toolMeta[callId] && state.toolMeta[callId].title),
+        rawInput: update.rawInput || (state.toolMeta[callId] && state.toolMeta[callId].rawInput) || {},
+      });
     }
     if (callId && !state.toolBlocks[callId]) {
       state.toolBlocks[callId] = "blk_" + (++state.blockCounter);
@@ -142,6 +147,15 @@ function normalizeAcpUpdate(update, state) {
     return events;
   }
 
+  if (type === "available_commands_update") {
+    var commands = Array.isArray(update.availableCommands) ? update.availableCommands : [];
+    events.push({
+      yokeType: "commands_changed",
+      commandNames: commands.map(function(command) { return command && command.name; }).filter(Boolean),
+    });
+    return events;
+  }
+
   events.push({
     yokeType: "runtime_specific",
     vendor: state.vendor,

package/lib/yoke/acp-query-handle.js

@@ -1,9 +1,7 @@
-// Shared ACP Query Handle
-// -----------------------
-// Implements the YOKE QueryHandle contract with standard ACP session methods.
 var normalizer = require("./acp-event-normalizer");
 var driverRuntime = require("./acp-driver-runtime");
 var queryAbort = require("./query-abort");
+var acpUserInput = require("./acp-user-input");
 var uuidCounter = 0;
 function generateUuid(vendor) {
   uuidCounter++;
@@ -31,12 +29,11 @@ function createAcpQueryHandle(acp, queryOpts) {
   var canUseTool = queryOpts.canUseTool || null;
   var state = normalizer.createEventState({ vendor: vendor, contextWindow: queryOpts.contextWindow });
   state.sessionId = queryOpts.resumeSessionId || null;
-  state.model = queryOpts.model || "auto";
+  state.model = queryOpts.model || "auto"; state.effort = queryOpts.effort || null;
   state.done = false;
   state.aborted = false;
   state.loadingSession = false;
   state.toolPolicy = "ask";
-
   var eventBuffer = [];
   var eventWaiting = null;
   var iteratorDone = false;
@@ -45,7 +42,6 @@ function createAcpQueryHandle(acp, queryOpts) {
   var messageQueueEnded = false;
   var loopStarted = false;
   var finishedNotified = false;
-
   function driverContext(extra) {
     return Object.assign({
       vendor: vendor,
@@ -55,7 +51,6 @@ function createAcpQueryHandle(acp, queryOpts) {
       queryOpts: queryOpts,
     }, extra || {});
   }
-
   function notifyFinished() {
     if (finishedNotified) return;
     finishedNotified = true;
@@ -169,7 +164,7 @@ function createAcpQueryHandle(acp, queryOpts) {
       return;
     }
 
-    var toolName = normalizer.toolNameForKind(toolCall.kind || meta.kind, toolCall.title || meta.title);
+    var toolName = toolCall.name || meta.name || normalizer.toolNameForKind(toolCall.kind || meta.kind, toolCall.title || meta.title);
     var input = toolCall.rawInput || meta.rawInput || { title: toolCall.title || meta.title };
     var permission = driverRuntime.call(driver, "mapPermissionRequest", driverContext({
       message: msg,
@@ -186,6 +181,10 @@ function createAcpQueryHandle(acp, queryOpts) {
   }
 
   function handleServerEvent(msg) {
+    if (msg.method === "elicitation/create") {
+      acpUserInput.handleElicitation(acp, msg, queryOpts.onUserInputRequest, queryOpts.onElicitation, cancellation.signal, vendor, driver && driver.displayName);
+      return;
+    }
     if (msg.method === "session/request_permission") {
       handlePermission(msg);
       return;
@@ -386,6 +385,7 @@ function createAcpQueryHandle(acp, queryOpts) {
       await cancellation.wait(driverRuntime.callAsync(driver, "afterSessionOpen", driverContext({ sessionResult: sessionResult }), function() {}));
       await cancellation.wait(ensureSafePermissionMode());
       if (state.model && state.model !== "auto") await setModel(state.model);
+      if (state.effort) await setEffort(state.effort);
       if (queryOpts.mode) await setConfig("mode", "mode", queryOpts.mode);
 
       while (!isCancelled()) {
@@ -451,7 +451,7 @@ function createAcpQueryHandle(acp, queryOpts) {
       return setModel(model).then(function() { state.model = model; });
     },
     setEffort: function(effort) {
-      return setEffort(effort);
+      return setEffort(effort).then(function() { state.effort = effort; });
     },
     setToolPolicy: function(policy) {
       state.toolPolicy = policy === "allow-all" ? "allow-all" : "ask";

package/lib/yoke/acp-user-input.js

@@ -0,0 +1,70 @@
+// ACP elicitation/create mapping (form mode only; Clay advertises
+// clientCapabilities.elicitation.form and never url).
+var userInput = require("./user-input");
+var elicitationSchema = require("./elicitation-schema");
+
+var INVALID_PARAMS = -32602;
+
+// Maps a host elicitation result to an ACP response. Legacy "reject" is an
+// explicit refusal; anything that is not accept or decline is a dismissal.
+function protocolResponse(response, schema) {
+  var action = response && response.action;
+  if (action === "accept") return { action: "accept", content: elicitationSchema.validateContent(response.content || {}, schema) };
+  if (action === "decline" || action === "reject") return { action: "decline" };
+  return { action: "cancel" };
+}
+
+function handleElicitation(acp, msg, handler, elicitationHandler, signal, provider, displayName) {
+  var params = msg.params || {};
+  var mode = params.mode || "form";
+  if (mode !== "form") {
+    acp.respondError(msg.id, INVALID_PARAMS, "Unsupported elicitation mode: " + mode + ". Clay advertises form mode only.");
+    return;
+  }
+  if (typeof handler !== "function" && typeof elicitationHandler !== "function") {
+    acp.respond(msg.id, { action: "cancel" });
+    return;
+  }
+  var request = {
+    serverName: params.serverName || displayName || "Agent",
+    message: params.message || "",
+    mode: "form",
+    requestedSchema: params.requestedSchema || null,
+  };
+  var settled = false;
+  var abortHandler = null;
+  function finish(response, error) {
+    if (settled) return;
+    settled = true;
+    if (signal && abortHandler && typeof signal.removeEventListener === "function") signal.removeEventListener("abort", abortHandler);
+    if (error) acp.respondError(msg.id, INVALID_PARAMS, error.message);
+    else acp.respond(msg.id, response);
+  }
+  if (typeof handler !== "function") {
+    abortHandler = function () { finish({ action: "cancel" }); };
+    if (signal && signal.aborted) return abortHandler();
+    if (signal && typeof signal.addEventListener === "function") signal.addEventListener("abort", abortHandler, { once: true });
+    Promise.resolve().then(function () {
+      return elicitationHandler(request, { signal: signal });
+    }).then(function (response) {
+      finish(protocolResponse(response, request.requestedSchema));
+    }).catch(function (error) {
+      finish(null, error);
+    });
+    return;
+  }
+  userInput.dispatchElicitation(handler, request, {
+    requestId: String(msg.id),
+    signal: signal,
+    source: "acp_elicitation",
+    native: true,
+    provider: provider,
+    diagnostics: { elicitation: Object.assign({}, params, { serverName: request.serverName, mode: "form" }) },
+  }).then(function (result) {
+    finish(userInput.elicitationResponse(result, request.requestedSchema));
+  }).catch(function (error) {
+    finish(null, error);
+  });
+}
+
+module.exports = { handleElicitation: handleElicitation, protocolResponse: protocolResponse };

package/lib/yoke/adapters/acp.js

@@ -16,15 +16,24 @@ function modelValues(configOptions) {
     var option = options[i];
     if (option.category !== "model" && option.id !== "model") continue;
     var values = Array.isArray(option.options) ? option.options : [];
-    for (var j = 0; j < values.length; j++) {
-      var value = values[j] && values[j].value;
-      if (value && models.indexOf(value) === -1) models.push(value);
-    }
+    collectModelValues(values, models);
     break;
   }
   return models;
 }
 
+function collectModelValues(options, models) {
+  for (var i = 0; i < options.length; i++) {
+    var option = options[i] || {};
+    if (Array.isArray(option.options)) {
+      collectModelValues(option.options, models);
+      continue;
+    }
+    var value = option.value || option.id;
+    if (value && models.indexOf(value) === -1) models.push(value);
+  }
+}
+
 function createAcpAdapter(vendor, opts) {
   opts = opts || {};
   var driver = opts._profile || opts._driver || profiles.getAcpAgentDriver(vendor);
@@ -87,7 +96,7 @@ function createAcpAdapter(vendor, opts) {
       rewind: false,
       sessionResume: canResumeSession() || canLoadSession(),
       promptSuggestions: false,
-      elicitation: false,
+      elicitation: true,
       fileCheckpointing: false,
       contextCompacting: false,
       skillSharing: true,
@@ -130,6 +139,10 @@ function createAcpAdapter(vendor, opts) {
 
   var adapter = {
     vendor: vendor,
+    // Structured questions use the ask_user_questions fallback tool: shared ACP
+    // agents have no standard native question method. Agent-initiated forms
+    // still arrive natively through elicitation/create.
+    userInputCapability: { mode: "fallback", native: false, nativeElicitation: true, source: "acp_elicitation" },
 
     init: function(initOpts) {
       if (shuttingDown) return Promise.reject(new Error(driver.displayName + " adapter is shutting down"));
@@ -177,6 +190,7 @@ function createAcpAdapter(vendor, opts) {
             clientInfo: { name: "clay", version: "1.0.0" },
             clientCapabilities: {
               fs: { readTextFile: false, writeTextFile: false },
+              elicitation: { form: {} },
               session: { configOptions: { boolean: {} } },
             },
           });
@@ -230,11 +244,14 @@ function createAcpAdapter(vendor, opts) {
         driver: driver,
         cwd: queryOpts.cwd || cwd,
         model: queryOpts.model || defaultModel,
+        effort: queryOpts.effort || null,
         mode: queryOpts.mode || null,
         systemPrompt: queryOpts.systemPrompt || "",
         appendSystemPrompt: [queryOpts.appendSystemPrompt, skillIndex].filter(function(part) { return !!part; }).join("\n\n"),
         abortController: controller,
         canUseTool: queryOpts.canUseTool || null,
+        onUserInputRequest: queryOpts.onUserInputRequest || null,
+        onElicitation: queryOpts.onElicitation || null,
         resumeSessionId: queryOpts.resumeSessionId || null,
         canLoadSession: canLoadSession(),
         canResumeSession: canResumeSession(),

package/lib/yoke/adapters/antigravity.js

@@ -74,6 +74,23 @@ function toolName(name) {
   return name || "Tool";
 }
 
+var USAGE_FIELDS = ["input_tokens", "output_tokens", "cache_read_tokens"];
+var ZERO_USAGE = { input_tokens: 0, output_tokens: 0, cache_read_tokens: 0 };
+
+// Result counters are cumulative for the conversation. A per-turn delta is
+// trustworthy only against a known baseline that has not gone backwards.
+function usageDelta(current, baseline) {
+  if (!current || !baseline) return null;
+  var result = {};
+  for (var i = 0; i < USAGE_FIELDS.length; i++) {
+    var field = USAGE_FIELDS[i];
+    var delta = (current[field] || 0) - (baseline[field] || 0);
+    if (delta < 0) return null;
+    result[field] = delta;
+  }
+  return result;
+}
+
 function createAntigravityQueryHandle(binaryPath, queryOpts, onFinished) {
   var processHandle = null;
   var removeAbort = function () {};
@@ -97,6 +114,14 @@ function createAntigravityQueryHandle(binaryPath, queryOpts, onFinished) {
   var textBlockId = null;
   var toolBlocks = {};
   var latestUsage = null;
+  // Trusted cumulative counters from the previous result. A fresh conversation
+  // starts at zero; a resumed one has no trustworthy baseline until its first
+  // result, and a result without counters invalidates the baseline again.
+  var usageBaseline = queryOpts.resumeSessionId ? null : ZERO_USAGE;
+  var durationBaseline = queryOpts.resumeSessionId ? null : 0;
+  var turnUsage = null;
+  var turnDurationSeconds = null;
+  var countedStepIndexes = {};
   var firstMessage = true;
 
   function notifyFinished() {
@@ -146,6 +171,9 @@ function createAntigravityQueryHandle(binaryPath, queryOpts, onFinished) {
     activeTurn = true;
     textBlockId = null;
     toolBlocks = {};
+    turnUsage = null;
+    turnDurationSeconds = null;
+    countedStepIndexes = {};
     pushEvent({ yokeType: "turn_start", messageType: "user" });
     processHandle.stdin.write(JSON.stringify({
       event: "user",
@@ -156,7 +184,17 @@ function createAntigravityQueryHandle(binaryPath, queryOpts, onFinished) {
   function finishTurn(result) {
     result = result || {};
     if (result.conversation_id) sessionId = result.conversation_id;
-    if (result.usage) latestUsage = result.usage;
+    // Prefer the cumulative counter delta; otherwise fall back to this turn's
+    // completed-step totals, or leave the turn unknown.
+    var resultUsage = result.usage || null;
+    var emittedUsage = usageDelta(resultUsage, usageBaseline) || turnUsage;
+    usageBaseline = resultUsage;
+    if (resultUsage) latestUsage = resultUsage;
+    var totalSeconds = typeof result.duration_seconds === "number" ? result.duration_seconds : null;
+    var durationSeconds = totalSeconds != null && durationBaseline != null && totalSeconds >= durationBaseline
+      ? totalSeconds - durationBaseline
+      : turnDurationSeconds;
+    durationBaseline = totalSeconds;
     var status = result.status || "SUCCESS";
     if (status !== "SUCCESS") {
       if (status === "CANCELED" || status === "INTERRUPTED") {
@@ -172,11 +210,11 @@ function createAntigravityQueryHandle(binaryPath, queryOpts, onFinished) {
       yokeType: "result",
       messageType: "assistant",
       cost: null,
-      duration: typeof result.duration_seconds === "number" ? result.duration_seconds * 1000 : null,
-      usage: latestUsage ? {
-        input_tokens: latestUsage.input_tokens || 0,
-        output_tokens: latestUsage.output_tokens || 0,
-        cache_read_input_tokens: latestUsage.cache_read_tokens || 0,
+      duration: typeof durationSeconds === "number" ? durationSeconds * 1000 : null,
+      usage: emittedUsage ? {
+        input_tokens: emittedUsage.input_tokens || 0,
+        output_tokens: emittedUsage.output_tokens || 0,
+        cache_read_input_tokens: emittedUsage.cache_read_tokens || 0,
         cache_creation_input_tokens: 0,
       } : null,
       sessionId: sessionId,
@@ -189,6 +227,17 @@ function createAntigravityQueryHandle(binaryPath, queryOpts, onFinished) {
 
   function handleStep(step) {
     if (!step) return;
+    var stepKey = step.step_index == null ? null : String(step.step_index);
+    if (step.state === "DONE" && (stepKey == null || !countedStepIndexes[stepKey])) {
+      if (stepKey != null) countedStepIndexes[stepKey] = true;
+      if (step.usage) {
+        if (!turnUsage) turnUsage = {};
+        USAGE_FIELDS.forEach(function(field) {
+          turnUsage[field] = (turnUsage[field] || 0) + (step.usage[field] || 0);
+        });
+      }
+      if (typeof step.duration_seconds === "number") turnDurationSeconds = (turnDurationSeconds || 0) + step.duration_seconds;
+    }
     if (step.step_type === "agent_response") {
       if (!textBlockId) {
         textBlockId = "agy_blk_" + (++blockCounter);