@super-one/cli 0.53.6-alpha → 0.53.7-alpha

package/MANIFEST.json

@@ -1,7 +1,7 @@
 {
   "name": "@super-one/cli",
-  "version": "0.53.6-alpha",
+  "version": "0.53.7-alpha",
   "kind": "npm",
   "minNodeMajor": 20,
-  "builtAt": "2026-08-15T09:53:30.001Z"
+  "builtAt": "2026-08-15T15:41:36.101Z"
 }

package/lib/cli.mjs

@@ -41931,6 +41931,43 @@ function uiToolNameFromId(id) {
   const key = normalizeToolIdKey(id);
   return TOOL_ID_TO_UI_NAME[key] ?? null;
 }
+function normalizeTranscriptTool(rawName, rawInput) {
+  const envelopeId = typeof rawInput.tool_name === "string" ? rawInput.tool_name : "";
+  const isUseTool = normalizeToolIdKey(rawName) === "use_tool" || rawInput.variant === "UseTool";
+  if (isUseTool && envelopeId.includes("__")) {
+    const mcpInput = rawInput.tool_input && typeof rawInput.tool_input === "object" && !Array.isArray(rawInput.tool_input) ? rawInput.tool_input : {};
+    return { toolName: `mcp__${envelopeId}`, input: mcpInput };
+  }
+  const toolName = uiToolNameFromId(rawName) ?? rawName;
+  const input = { ...rawInput };
+  if (toolName === "Read") {
+    if (input.file_path == null && input.target_file != null) input.file_path = input.target_file;
+    if (input.file_path == null && input.path != null) input.file_path = input.path;
+  } else if (toolName === "Edit" || toolName === "Write" || toolName === "Delete" || toolName === "FileChange") {
+    if (input.file_path == null && input.target_file != null) input.file_path = input.target_file;
+    if (input.file_path == null && input.path != null) input.file_path = input.path;
+    if (toolName === "Write" && input.content == null && input.contents != null) input.content = input.contents;
+    if (toolName === "Write" && input.content == null && input.fileText != null) input.content = input.fileText;
+    if (toolName === "Edit" && input.diff == null && input.diffString != null) input.diff = input.diffString;
+  } else if (toolName === "Bash") {
+    if (input.command == null && input.cmd != null) input.command = input.cmd;
+  } else if (toolName === "LS") {
+    if (input.path == null && input.target_directory != null) input.path = input.target_directory;
+    if (input.path == null && input.directory != null) input.path = input.directory;
+  } else if (toolName === "Grep") {
+    if (input.pattern == null && input.query != null) input.pattern = input.query;
+  } else if (toolName === "Glob") {
+    if (input.pattern == null && input.globPattern != null) input.pattern = input.globPattern;
+    if (input.pattern == null && input.glob_pattern != null) input.pattern = input.glob_pattern;
+    if (input.path == null && input.targetDirectory != null) input.path = input.targetDirectory;
+    if (input.path == null && input.target_directory != null) input.path = input.target_directory;
+  } else if (toolName === "WebFetch") {
+    if (input.url == null && input.uri != null) input.url = input.uri;
+  } else if (toolName === "WebSearch" || toolName === "SearchTools" || toolName === "ToolSearch" || toolName === "SemanticSearch") {
+    if (input.query == null && input.q != null) input.query = input.q;
+  }
+  return { toolName, input };
+}
 function bytesOrStringToText(value) {
   if (typeof value === "string") return value;
   if (Array.isArray(value) && value.length > 0 && value.every((n) => typeof n === "number")) {
@@ -51717,6 +51754,7 @@ var init_cursor_custom_tools = __esm({
 
 // ../../packages/cursor/src/cursor-event-map.ts
 function toolDisplayName(name) {
+  if (name.startsWith("mcp__")) return name;
   const n = name.toLowerCase();
   if (n.includes("shell") || n === "bash") return "Bash";
   if (n.includes("read") && !n.includes("lint")) return "Read";
@@ -51737,6 +51775,15 @@ function toolDisplayName(name) {
   if (n === "recordscreen") return "RecordScreen";
   return name;
 }
+function unwrapCursorMcpTool(toolType, args) {
+  if (toolType.toLowerCase() !== "mcp") return { toolType, args };
+  const rec = asRecord9(args);
+  if (!rec) return { toolType, args };
+  const server = typeof rec.providerIdentifier === "string" ? rec.providerIdentifier.trim() : "";
+  const name = typeof rec.toolName === "string" ? rec.toolName.trim() : "";
+  if (!server || !name) return { toolType, args };
+  return { toolType: `mcp__${server}__${name}`, args: rec.args ?? {} };
+}
 function strField2(obj, key) {
   if (!obj || typeof obj !== "object") return "";
   const v2 = obj[key];
@@ -51809,19 +51856,37 @@ function mapTodosPayload(todos) {
   };
 }
 function toolUseEvent(messageId, callId, toolType, args, status) {
+  const unwrapped = unwrapCursorMcpTool(toolType, args);
+  const toolName = toolDisplayName(unwrapped.toolType);
   return {
     type: "content_delta",
     messageId,
     delta: {
       type: "tool_use",
-      toolName: toolDisplayName(toolType),
+      toolName,
       toolUseId: callId,
-      input: stringifyPayload(args ?? {}),
+      input: stringifyPayload(normalizeCursorToolInput(toolName, unwrapped.args)),
       status,
       ...status === "streaming" ? { startedAt: Date.now() } : {}
     }
   };
 }
+function normalizeCursorToolInput(toolName, args) {
+  if (toolName.startsWith("mcp__")) return args;
+  const rec = asRecord9(args);
+  if (!rec) return args ?? {};
+  return normalizeTranscriptTool(toolName, rec).input;
+}
+function mergeCursorToolResultArgs(toolType, args, result) {
+  if (toolType.toLowerCase() === "mcp") return args;
+  const res = asRecord9(result);
+  const diff = typeof res?.diffString === "string" ? res.diffString : void 0;
+  if (!diff) return args;
+  const rec = asRecord9(args);
+  if (!rec) return args;
+  if (rec.diffString != null || rec.diff != null) return rec;
+  return { ...rec, diffString: diff };
+}
 function toolResultEvent(messageId, callId, result, isError) {
   return {
     type: "content_delta",
@@ -51834,14 +51899,22 @@ function toolResultEvent(messageId, callId, result, isError) {
     }
   };
 }
-function usageFromTurn(messageId, usage2, extras) {
+function billedInputTokens(usage2) {
+  return usage2.inputTokens + usage2.cacheWriteTokens;
+}
+function contextTokensFromUsage(usage2) {
+  return usage2.inputTokens + usage2.cacheReadTokens + usage2.cacheWriteTokens;
+}
+function mapCursorTokenUsage(messageId, usage2, extras) {
+  const contextTokens = extras?.contextTokens && extras.contextTokens > 0 ? extras.contextTokens : contextTokensFromUsage(usage2);
   return {
     type: "message_usage",
     messageId,
-    inputTokens: usage2.inputTokens + usage2.cacheReadTokens + usage2.cacheWriteTokens,
-    outputTokens: usage2.outputTokens + (usage2.reasoningTokens ?? 0),
+    inputTokens: billedInputTokens(usage2),
+    outputTokens: usage2.outputTokens,
     cacheReadTokens: usage2.cacheReadTokens,
-    ...extras?.contextWindow && extras.contextWindow > 0 ? { contextWindow: extras.contextWindow, contextTokens: usage2.inputTokens + usage2.cacheReadTokens + usage2.cacheWriteTokens } : {}
+    contextTokens,
+    ...extras?.contextWindow && extras.contextWindow > 0 ? { contextWindow: extras.contextWindow } : {}
   };
 }
 function mapInteractionUpdate(messageId, update, options) {
@@ -51924,7 +51997,8 @@ function mapInteractionUpdate(messageId, update, options) {
     }
     case "tool-call-completed": {
       const parts = extractToolCallParts(update);
-      events.push(toolUseEvent(messageId, parts.callId, parts.toolType, parts.args, "complete"));
+      const args = mergeCursorToolResultArgs(parts.toolType, parts.args, parts.result);
+      events.push(toolUseEvent(messageId, parts.callId, parts.toolType, args, "complete"));
       events.push(toolResultEvent(messageId, parts.callId, parts.result, parts.isError));
       if (parts.toolType === "updateTodos" || parts.toolType === "update_todos") {
         const todos = asRecord9(parts.args)?.todos ?? asRecord9(parts.result)?.todos;
@@ -51945,13 +52019,13 @@ function mapInteractionUpdate(messageId, update, options) {
     case "token-delta": {
       const tokens = Number(update.tokens);
       if (Number.isFinite(tokens) && tokens > 0) {
+        const turnUsage = options?.turnUsage;
+        if (turnUsage) turnUsage.addTokenDelta(tokens);
         events.push({
           type: "message_usage",
           messageId,
-          inputTokens: tokens,
-          outputTokens: 0,
-          contextTokens: tokens,
-          ...options?.contextWindow && options.contextWindow > 0 ? { contextWindow: options.contextWindow } : {}
+          inputTokens: turnUsage?.input ?? 0,
+          outputTokens: turnUsage?.output ?? tokens
         });
       }
       break;
@@ -51959,7 +52033,21 @@ function mapInteractionUpdate(messageId, update, options) {
     case "turn-ended": {
       const usage2 = update.usage;
       if (usage2) {
-        events.push(usageFromTurn(messageId, usage2, { contextWindow: options?.contextWindow }));
+        const turnUsage = options?.turnUsage;
+        if (turnUsage) {
+          turnUsage.applyInternalTurn(usage2);
+          events.push({
+            type: "message_usage",
+            messageId,
+            inputTokens: turnUsage.input,
+            outputTokens: turnUsage.output,
+            cacheReadTokens: usage2.cacheReadTokens,
+            contextTokens: turnUsage.context,
+            ...options?.contextWindow && options.contextWindow > 0 ? { contextWindow: options.contextWindow } : {}
+          });
+        } else {
+          events.push(mapCursorTokenUsage(messageId, usage2, { contextWindow: options?.contextWindow }));
+        }
       }
       events.push({ type: "status_change", status: "idle" });
       break;
@@ -52032,7 +52120,15 @@ function mapConversationStep(messageId, step, options) {
     }
     const toolType = nested && typeof nested.type === "string" && nested.type ? nested.type : strField2(rec, "name") || "Tool";
     const args = nested?.args ?? nested?.input ?? {};
-    events.push(toolUseEvent(messageId, callId, toolType, args, "complete"));
+    const resultRec = asRecord9(nested?.result);
+    const resultValue = resultRec?.status === "success" ? resultRec.value ?? nested?.result : nested?.result;
+    events.push(toolUseEvent(
+      messageId,
+      callId,
+      toolType,
+      mergeCursorToolResultArgs(toolType, args, resultValue),
+      "complete"
+    ));
     if (toolType === "updateTodos" || toolType === "update_todos") {
       const todos = asRecord9(args)?.todos;
       const todoEvent = mapTodosPayload(todos);
@@ -52064,7 +52160,7 @@ function mapSdkMessageLifecycle(messageId, message, options) {
     }
     case "usage": {
       const u = message.usage;
-      events.push(usageFromTurn(messageId, {
+      events.push(mapCursorTokenUsage(messageId, {
         inputTokens: u.inputTokens,
         outputTokens: u.outputTokens,
         cacheReadTokens: u.cacheReadTokens,
@@ -52097,17 +52193,7 @@ function mapSdkMessageLifecycle(messageId, message, options) {
               delta: { type: "text", text: block.text }
             });
           } else if (block.type === "tool_use") {
-            events.push({
-              type: "content_delta",
-              messageId,
-              delta: {
-                type: "tool_use",
-                toolName: toolDisplayName(block.name),
-                toolUseId: block.id,
-                input: JSON.stringify(block.input ?? {}),
-                status: "streaming"
-              }
-            });
+            events.push(toolUseEvent(messageId, block.id, block.name, block.input, "streaming"));
           }
         }
       }
@@ -52139,35 +52225,39 @@ function mapSdkMessageLifecycle(messageId, message, options) {
   return events;
 }
 function mapToolCallMessage(messageId, message) {
-  const events = [{
-    type: "content_delta",
-    messageId,
-    delta: {
-      type: "tool_use",
-      toolName: toolDisplayName(message.name),
-      toolUseId: message.call_id,
-      input: JSON.stringify(message.args ?? {}),
-      status: message.status === "completed" || message.status === "error" ? "complete" : "streaming"
-    }
-  }];
+  const status = message.status === "completed" || message.status === "error" ? "complete" : "streaming";
+  const args = status === "complete" ? mergeCursorToolResultArgs(message.name, message.args, message.result) : message.args;
+  const events = [
+    toolUseEvent(messageId, message.call_id, message.name, args, status)
+  ];
   if (message.status === "completed" || message.status === "error") {
-    events.push({
-      type: "content_delta",
-      messageId,
-      delta: {
-        type: "tool_result",
-        toolUseId: message.call_id,
-        summary: message.result === void 0 ? "" : typeof message.result === "string" ? message.result : JSON.stringify(message.result),
-        isError: message.status === "error"
-      }
-    });
+    events.push(toolResultEvent(messageId, message.call_id, message.result, message.status === "error"));
   }
   return events;
 }
-var CursorTurnCallIdBridge;
+var CursorTurnUsage, CursorTurnCallIdBridge;
 var init_cursor_event_map = __esm({
   "../../packages/cursor/src/cursor-event-map.ts"() {
     "use strict";
+    init_tool_ui();
+    CursorTurnUsage = class {
+      input = 0;
+      output = 0;
+      context = 0;
+      addTokenDelta(tokens) {
+        if (Number.isFinite(tokens) && tokens > 0) this.output += tokens;
+      }
+      applyInternalTurn(usage2) {
+        this.input += billedInputTokens(usage2);
+        if (usage2.outputTokens > this.output) this.output = usage2.outputTokens;
+        this.context = contextTokensFromUsage(usage2);
+      }
+      applyRunTotals(usage2) {
+        const billed = billedInputTokens(usage2);
+        if (billed > this.input) this.input = billed;
+        if (usage2.outputTokens > this.output) this.output = usage2.outputTokens;
+      }
+    };
     CursorTurnCallIdBridge = class {
       queue = [];
       seen = /* @__PURE__ */ new Set();
@@ -53090,6 +53180,7 @@ async function createCursorRuntime(opts) {
       lastMcpServers = servers;
       const contextWindow = resolveContextWindow(modelSelection);
       const callIdBridge = new CursorTurnCallIdBridge();
+      const turnUsage = new CursorTurnUsage();
       const sendStarted = Date.now();
       log2.info("[CursorRuntime] send start", { messageId });
       tracer.sdk("user_send", cursorUserSendTracePayload(userMessage2), messageId);
@@ -53106,7 +53197,7 @@ async function createCursorRuntime(opts) {
         onDelta: ({ update }) => {
           tracer.sdk(cursorSdkType(update, "delta"), update, messageId);
           callIdBridge.observeDelta(update);
-          for (const event of mapInteractionUpdate(messageId, update, { contextWindow })) {
+          for (const event of mapInteractionUpdate(messageId, update, { contextWindow, turnUsage })) {
             opts.onEvent(event);
           }
         },
@@ -53209,17 +53300,16 @@ async function createCursorRuntime(opts) {
       currentRun = null;
       lastRunId = result.id || lastRunId;
       if (result.usage) {
+        turnUsage.applyRunTotals(result.usage);
         opts.onEvent({
           type: "message_usage",
           messageId,
-          inputTokens: result.usage.inputTokens + result.usage.cacheReadTokens + result.usage.cacheWriteTokens,
-          outputTokens: result.usage.outputTokens + (result.usage.reasoningTokens ?? 0),
+          inputTokens: turnUsage.input,
+          outputTokens: turnUsage.output,
           cacheReadTokens: result.usage.cacheReadTokens,
           model: result.model?.id ?? modelSelection?.id,
-          ...contextWindow && contextWindow > 0 ? {
-            contextWindow,
-            contextTokens: result.usage.inputTokens + result.usage.cacheReadTokens + result.usage.cacheWriteTokens
-          } : {}
+          ...turnUsage.context > 0 ? { contextTokens: turnUsage.context } : {},
+          ...contextWindow && contextWindow > 0 ? { contextWindow } : {}
         });
       }
       if (result.git?.branches?.length) {
@@ -61149,8 +61239,8 @@ import { fileURLToPath } from "node:url";
 function resolveCliReleaseVersion() {
   const fromEnv = process.env.SUPERONE_CLI_VERSION?.trim();
   if (fromEnv) return fromEnv;
-  if ("0.53.6-alpha".trim()) {
-    return "0.53.6-alpha".trim();
+  if ("0.53.7-alpha".trim()) {
+    return "0.53.7-alpha".trim();
   }
   const fromDist = readDistManifestVersion();
   if (fromDist) return fromDist;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@super-one/cli",
-  "version": "0.53.6-alpha",
+  "version": "0.53.7-alpha",
   "description": "SuperOne headless node CLI — remote execution environment (RPC, workspaces, sessions).",
   "type": "module",
   "license": "BUSL-1.1",