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

package/MANIFEST.json

@@ -1,7 +1,7 @@
 {
   "name": "@super-one/cli",
-  "version": "0.53.6-alpha",
+  "version": "0.53.8-alpha",
   "kind": "npm",
   "minNodeMajor": 20,
-  "builtAt": "2026-08-15T09:53:30.001Z"
+  "builtAt": "2026-08-16T03:47:08.751Z"
 }

package/lib/cli.mjs

@@ -257,9 +257,10 @@ var init_host_action_superone_descriptors = __esm({
                           "bypassPermissions",
                           "plan",
                           "dontAsk",
-                          "auto"
+                          "auto",
+                          "agent"
                         ],
-                        "description": 'How autonomous the child session is. Prefer the most autonomous mode it can finish the task under \u2014 "bypassPermissions" (shown as Bypass on Claude-family harnesses, Full Access on Codex), or "auto" for ACP agents. Nobody watches a child session, so a conservative mode strands it on an approval prompt that is never answered. Requesting an autonomous mode is safe by construction: nothing runs until the user approves this very request, and that approval dialog is where they downgrade permission or sandbox per launch. Pick "plan" or "default" only when stopping for human review is the point of the launch.'
+                        "description": 'How autonomous the child session is. Prefer the most autonomous mode it can finish the task under \u2014 "bypassPermissions" (shown as Bypass on Claude-family harnesses, Full Access on Codex/Cursor), "agent" for Cursor, or "auto" for ACP agents. Nobody watches a child session, so a conservative mode strands it on an approval prompt that is never answered. Requesting an autonomous mode is safe by construction: nothing runs until the user approves this very request, and that approval dialog is where they downgrade permission or sandbox per launch. Pick "plan" or "default" only when stopping for human review is the point of the launch.'
                       },
                       "sandboxMode": {
                         "type": "string",
@@ -411,7 +412,7 @@ var init_host_action_superone_descriptors = __esm({
             "modules": {
               "type": "array",
               "minItems": 1,
-              "maxItems": 5,
+              "maxItems": 6,
               "uniqueItems": true,
               "items": {
                 "type": "string",
@@ -420,7 +421,8 @@ var init_host_action_superone_descriptors = __esm({
                   "mockup",
                   "interactive",
                   "chart",
-                  "art"
+                  "art",
+                  "native"
                 ]
               },
               "description": "Widget only: one or more guideline modules. Mutually exclusive with topic."
@@ -659,7 +661,11 @@ var init_host_action_superone_descriptors = __esm({
       },
       {
         "name": "session_rename",
-        "description": 'Rename the current chat session to a concise topic label shown in the sidebar. Optional tags (set) label it for session_list/session_search \u2014 discover names with session_tag_list.\n\nOnly the top-level agent talking directly to the user may call this. If you were launched as a Task/subagent worker, do NOT call it \u2014 you do not own the user-facing session title.\n\nIf the tool returns an error containing "user_locked", the user has manually named this session \u2014 do not call session_rename again. Tags in the same call were still applied; use session_tag for later tag edits.',
+        "description": `Rename the current chat session to a concise topic label shown in the sidebar. Always pass tags (set): 1\u20134 short kebab-case labels you choose so session_list/session_search can find this chat. Reuse names from session_tag_list when they fit; invent one when they don't.
+
+Only the top-level agent talking directly to the user may call this. If you were launched as a Task/subagent worker, do NOT call it \u2014 you do not own the user-facing session title.
+
+If the tool returns an error containing "user_locked", the user has manually named this session \u2014 do not call session_rename again. Tags in the same call were still applied; use session_tag for later tag edits.`,
         "inputSchema": {
           "type": "object",
           "properties": {
@@ -673,7 +679,7 @@ var init_host_action_superone_descriptors = __esm({
               "type": "array",
               "items": { "type": "string" },
               "maxItems": 8,
-              "description": "Replace this session's tags (set). Discover names with session_tag_list. Empty array clears. Applied even when the title is user_locked."
+              "description": "Replace this session's tags (set). Pass 1\u20134 short kebab-case labels you choose. Reuse names from session_tag_list when they fit; invent when they don't. Empty array clears. Applied even when the title is user_locked."
             }
           },
           "required": [
@@ -684,7 +690,7 @@ var init_host_action_superone_descriptors = __esm({
       },
       {
         "name": "session_tag",
-        "description": "Tag SuperOne sessions so session_list/session_search can filter by tag. Default: current session. Pass sessionId for one other session, or sessionIds with add to tag many. Use add, remove, or set (exactly one). set: [] clears. Discover existing labels with session_tag_list first \u2014 do not invent names. Only the top-level agent may call this; subagents must not. Not session_rename (titles) and not live collab.",
+        "description": "Tag SuperOne sessions so session_list/session_search can filter by tag. Default: current session. Pass sessionId for one other session, or sessionIds with add to tag many. Use add, remove, or set (exactly one). set: [] clears. Pick 1\u20134 short kebab-case labels; reuse names from session_tag_list when they fit, otherwise invent. Only the top-level agent may call this; subagents must not. Not session_rename (titles) and not live collab.",
         "inputSchema": {
           "type": "object",
           "properties": {
@@ -3373,7 +3379,7 @@ var init_host_action_superone_descriptors = __esm({
       },
       {
         "name": "widget_show",
-        "description": 'Render SVG, diagrams, charts, or interactive HTML inline in chat. Pass widget_code for new content, or template + data to reuse a saved template. Before the first new widget in a session, load the relevant design modules with read_manual({ domain: "widget", modules: [...] }).',
+        "description": `Render SVG, diagrams, charts, or interactive HTML inline in chat. Pass widget_code for new content, or template + data to reuse a saved template. To show media you produced yourself, pass a @native/* template so it renders in SuperOne's own gallery (viewer, download, drag-out) instead of a lookalike you build in widget_code \u2014 call widget_list_templates for the list. Before the first new widget in a session, load the relevant design modules with read_manual({ domain: "widget", modules: [...] }).`,
         "inputSchema": {
           "type": "object",
           "properties": {
@@ -3538,7 +3544,7 @@ var init_host_action_superone_descriptors = __esm({
                 },
                 "permissionMode": {
                   "type": "string",
-                  "enum": ["default", "acceptEdits", "bypassPermissions", "plan", "dontAsk", "auto"],
+                  "enum": ["default", "acceptEdits", "bypassPermissions", "plan", "dontAsk", "auto", "agent"],
                   "description": "Unified permission mode. Prefer bypassPermissions for unattended runs."
                 },
                 "sandboxMode": {
@@ -12757,7 +12763,7 @@ var SUPERONE_SYSTEM_PROMPT_APPEND;
 var init_superone_system_prompt = __esm({
   "../../packages/shared/src/superone-system-prompt.ts"() {
     "use strict";
-    SUPERONE_SYSTEM_PROMPT_APPEND = 'You are running inside SuperOne, a desktop GUI app \u2014 not a terminal. Your replies render as rich Markdown in a chat panel.\n\nPrefer the `widget_show` tool over plain markdown when the user wants something visual, data-heavy, or interactive. For mermaid diagrams, use fenced ```mermaid blocks instead \u2014 the host renders those natively.\n\nTwo markdown forms get special rendering from the host:\n- When you reference a project file, write it as a markdown link with an absolute path \u2014 it renders as a clickable chip. Add `:N` or `#LN` for a line, e.g. `[file.ts](/abs/path/file.ts:42)`.\n- `![alt](path)` embeds an image/video/audio file as an inline player. Use it ONLY when the user explicitly asks to see a file (e.g. "show me ..."), at most once per file per reply. If they only want a path or location, give a plain link instead \u2014 never the embed.\n- Media you create with a generation tool (e.g. `media_generate_image`, `media_generate_video`) is shown to the user inline by the host automatically. Never re-embed or link the result in your reply with Markdown (`![...]` or `[...]`) \u2014 that duplicates it. Just describe the result briefly in words.\n\nOn the first substantive user request, call `session_rename` as your first tool call, before answering \u2014 until you do, the title falls back to a noisy slice of the first message. Also rename when the user approves a plan, when the conversation shifts to a substantially different topic, or every ~10 user turns if the title has drifted. Title rules: 4-8 words, prefer "verb + object" over abstract nouns, match the user\'s conversation language, no surrounding quotes or trailing punctuation.';
+    SUPERONE_SYSTEM_PROMPT_APPEND = 'You are running inside SuperOne, a desktop GUI app \u2014 not a terminal. Your replies render as rich Markdown in a chat panel.\n\nPrefer the `widget_show` tool over plain markdown when the user wants something visual, data-heavy, or interactive. For mermaid diagrams, use fenced ```mermaid blocks instead \u2014 the host renders those natively.\n\nTwo markdown forms get special rendering from the host:\n- When you reference a project file, write it as a markdown link with an absolute path \u2014 it renders as a clickable chip. Add `:N` or `#LN` for a line, e.g. `[file.ts](/abs/path/file.ts:42)`.\n- `![alt](path)` embeds an image/video/audio file as an inline player. Use it ONLY when the user explicitly asks to see a file (e.g. "show me ..."), at most once per file per reply. If they only want a path or location, give a plain link instead \u2014 never the embed.\n- Media you create with a generation tool (e.g. `media_generate_image`, `media_generate_video`) is shown to the user inline by the host automatically. Never re-embed or link the result in your reply with Markdown (`![...]` or `[...]`) \u2014 that duplicates it. Just describe the result briefly in words.\n\nOn the first substantive user request, call `session_rename` as your first tool call, before answering \u2014 until you do, the title falls back to a noisy slice of the first message. Always include `tags` on that call: 1\u20134 short kebab-case labels you pick so session_list/session_search can find this chat later. Reuse names from `session_tag_list` when they fit; invent one when they don\'t. Update tags with `session_tag` if the topic shifts. Also rename when the user approves a plan, when the conversation shifts to a substantially different topic, or every ~10 user turns if the title has drifted. Title rules: 4-8 words, prefer "verb + object" over abstract nouns, match the user\'s conversation language, no surrounding quotes or trailing punctuation.';
   }
 });
 
@@ -41931,6 +41937,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")) {
@@ -41984,9 +42027,94 @@ function formatSearchToolPayload(obj) {
   }
   return lines.join("\n").trim() || null;
 }
+function isShellCommandResult(obj) {
+  const hasStream = typeof obj.stdout === "string" || typeof obj.stderr === "string";
+  if (!hasStream) return false;
+  return typeof obj.exitCode === "number" || typeof obj.exit_code === "number" || typeof obj.signal === "string" || typeof obj.executionTime === "number";
+}
+function formatShellCommandResult(obj) {
+  const stdout = typeof obj.stdout === "string" ? obj.stdout : "";
+  const stderr = typeof obj.stderr === "string" ? obj.stderr : "";
+  if (stdout && stderr) {
+    return stdout.endsWith("\n") ? `${stdout}${stderr}` : `${stdout}
+${stderr}`;
+  }
+  if (stdout || stderr) return stdout || stderr;
+  const code = typeof obj.exitCode === "number" ? obj.exitCode : obj.exit_code;
+  if (typeof code === "number" && code !== 0) return `Exit code ${code}`;
+  return "";
+}
+function isCursorGrepResult(obj) {
+  const workspaces = obj.workspaceResults;
+  if (workspaces && typeof workspaces === "object" && !Array.isArray(workspaces)) return true;
+  return obj.activeEditorResult != null && typeof obj.activeEditorResult === "object";
+}
+function formatGrepUnion(result) {
+  const rec = result && typeof result === "object" && !Array.isArray(result) ? result : null;
+  if (!rec) return "";
+  const output = rec.output && typeof rec.output === "object" && !Array.isArray(rec.output) ? rec.output : rec;
+  const type = typeof rec.type === "string" ? rec.type : "";
+  if (type === "files" || Array.isArray(output.files)) {
+    const files = Array.isArray(output.files) ? output.files.filter((f2) => typeof f2 === "string") : [];
+    return files.join("\n");
+  }
+  if (type === "count" || Array.isArray(output.counts)) {
+    const counts = Array.isArray(output.counts) ? output.counts : [];
+    const lines2 = [];
+    for (const entry of counts) {
+      if (!entry || typeof entry !== "object") continue;
+      const row = entry;
+      const file2 = typeof row.file === "string" ? row.file : "";
+      const count = typeof row.count === "number" ? row.count : "";
+      if (file2) lines2.push(count === "" ? file2 : `${file2}:${count}`);
+    }
+    return lines2.join("\n");
+  }
+  const matches = Array.isArray(output.matches) ? output.matches : [];
+  const lines = [];
+  for (const entry of matches) {
+    if (!entry || typeof entry !== "object") continue;
+    const row = entry;
+    const file2 = typeof row.file === "string" ? row.file : "";
+    if (!file2) continue;
+    const lineNo = typeof row.lineNumber === "number" ? row.lineNumber : null;
+    const line = typeof row.line === "string" ? row.line : "";
+    if (lineNo != null && line) lines.push(`${file2}:${lineNo}:${line}`);
+    else if (line) lines.push(`${file2}:${line}`);
+    else lines.push(file2);
+  }
+  return lines.join("\n");
+}
+function formatCursorGrepResult(obj) {
+  const chunks = [];
+  const editor = formatGrepUnion(obj.activeEditorResult);
+  if (editor) chunks.push(editor);
+  const workspaces = asPlainRecord(obj.workspaceResults);
+  if (workspaces) {
+    const roots = Object.keys(workspaces);
+    const multi = roots.length > 1;
+    for (const root of roots) {
+      const body = formatGrepUnion(workspaces[root]);
+      if (!body) continue;
+      chunks.push(multi ? `${root}
+${body}` : body);
+    }
+  }
+  return chunks.join("\n");
+}
+function asPlainRecord(value) {
+  if (!value || typeof value !== "object" || Array.isArray(value)) return null;
+  return value;
+}
+function isCursorGlobResult(obj) {
+  return Array.isArray(obj.files) && obj.files.every((f2) => typeof f2 === "string") && typeof obj.totalFiles === "number";
+}
+function formatCursorGlobResult(obj) {
+  return obj.files.join("\n");
+}
 function isAgentOutputEnvelope(obj) {
   const t = obj.type;
-  return t === "MCP" || t === "ListDir" || t === "list_dir" || t === "LS" || t === "Todo" || t === "SearchTool" || t === "GrepSearch" || t === "grep" || obj.TodosUpdated != null || obj.Content != null && typeof obj.Content === "object" || Array.isArray(obj.results) || obj.action != null && typeof obj.action === "object";
+  return t === "MCP" || t === "ListDir" || t === "list_dir" || t === "LS" || t === "Todo" || t === "SearchTool" || t === "GrepSearch" || t === "grep" || obj.TodosUpdated != null || obj.Content != null && typeof obj.Content === "object" || Array.isArray(obj.results) || obj.action != null && typeof obj.action === "object" || isShellCommandResult(obj) || isCursorGrepResult(obj) || isCursorGlobResult(obj);
 }
 function formatAgentToolOutput(raw) {
   if (raw == null) return "";
@@ -42042,6 +42170,15 @@ function formatAgentToolOutput(raw) {
     const text = bytesOrStringToText(obj.stdout ?? obj.content ?? obj.output);
     if (text) return text;
   }
+  if (isShellCommandResult(obj)) {
+    return formatShellCommandResult(obj);
+  }
+  if (isCursorGrepResult(obj)) {
+    return formatCursorGrepResult(obj);
+  }
+  if (isCursorGlobResult(obj)) {
+    return formatCursorGlobResult(obj);
+  }
   const action = obj.action;
   if (action && typeof action === "object") {
     const a = action;
@@ -42096,7 +42233,20 @@ function formatAgentToolOutput(raw) {
     return String(raw);
   }
 }
-var TOOL_ID_TO_UI_NAME;
+function truncateTranscriptToolResult(text, max = MAX_TRANSCRIPT_TOOL_RESULT_CHARS) {
+  if (text.length <= max) return text;
+  const omitted = text.length - max;
+  return `${text.slice(0, max)}
+
+\u2026 truncated ${omitted.toLocaleString()} characters`;
+}
+function formatTranscriptToolResult(content, opts) {
+  const formatted = formatAgentToolOutput(content);
+  if (!formatted) return "";
+  const max = opts?.maxChars ?? MAX_TRANSCRIPT_TOOL_RESULT_CHARS;
+  return truncateTranscriptToolResult(formatted, max);
+}
+var TOOL_ID_TO_UI_NAME, MAX_TRANSCRIPT_TOOL_RESULT_CHARS;
 var init_tool_ui = __esm({
   "../../packages/shared/src/tool-ui.ts"() {
     "use strict";
@@ -42177,6 +42327,7 @@ var init_tool_ui = __esm({
       scheduler_delete: "SchedulerDelete",
       scheduler_list: "SchedulerList"
     };
+    MAX_TRANSCRIPT_TOOL_RESULT_CHARS = 48e3;
   }
 });
 
@@ -51483,7 +51634,7 @@ function mapPermissionToCursorLocal(mode) {
   if (mode === "plan") {
     return { mode: "plan", autoReview: false };
   }
-  if (mode === "auto" || mode === "acceptEdits" || mode === "default") {
+  if (mode === "agent" || mode === "auto" || mode === "acceptEdits" || mode === "default") {
     return { mode: "agent", autoReview: true };
   }
   return { mode: "agent", autoReview: false };
@@ -51717,6 +51868,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 +51889,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];
@@ -51746,13 +51907,21 @@ function stableIdField(obj, ...keys) {
   if (!obj || typeof obj !== "object") return null;
   const rec = obj;
   for (const key of keys) {
-    if (typeof rec[key] === "string" && rec[key]) return rec[key];
+    const v2 = rec[key];
+    if (typeof v2 === "string" && v2) return v2;
+    if (typeof v2 === "number" && Number.isFinite(v2)) return String(v2);
   }
   return null;
 }
 function idField(obj, ...keys) {
   return stableIdField(obj, ...keys) ?? `tool_${Date.now()}`;
 }
+function extractCursorCallId(update) {
+  const rec = asRecord9(update);
+  if (!rec) return null;
+  const nested = asRecord9(rec.toolCall) ?? asRecord9(rec.message);
+  return stableIdField(rec, ...TOOL_CALL_ID_KEYS) ?? (nested ? stableIdField(nested, ...TOOL_CALL_ID_KEYS) : null);
+}
 function asRecord9(value) {
   if (!value || typeof value !== "object" || Array.isArray(value)) return null;
   return value;
@@ -51768,7 +51937,7 @@ function stringifyPayload(value) {
 }
 function extractToolCallParts(update) {
   const rec = asRecord9(update) ?? {};
-  const callId = idField(rec, "callId", "toolCallId", "id", "call_id");
+  const callId = extractCursorCallId(update);
   const nested = asRecord9(rec.toolCall);
   if (nested) {
     const toolType2 = typeof nested.type === "string" && nested.type ? nested.type : "Tool";
@@ -51809,19 +51978,53 @@ 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);
+  if (!res) return args;
+  const rec = asRecord9(args);
+  if (!rec) return args;
+  const diff = typeof res.diffString === "string" ? res.diffString : void 0;
+  const linesAdded = typeof res.linesAdded === "number" ? res.linesAdded : void 0;
+  const linesRemoved = typeof res.linesRemoved === "number" ? res.linesRemoved : void 0;
+  if (!diff && linesAdded == null && linesRemoved == null) return args;
+  const next = { ...rec };
+  let changed = false;
+  if (diff && rec.diffString == null && rec.diff == null) {
+    next.diffString = diff;
+    changed = true;
+  }
+  if (linesAdded != null && rec.linesAdded == null) {
+    next.linesAdded = linesAdded;
+    changed = true;
+  }
+  if (linesRemoved != null && rec.linesRemoved == null) {
+    next.linesRemoved = linesRemoved;
+    changed = true;
+  }
+  return changed ? next : rec;
+}
 function toolResultEvent(messageId, callId, result, isError) {
   return {
     type: "content_delta",
@@ -51829,21 +52032,35 @@ function toolResultEvent(messageId, callId, result, isError) {
     delta: {
       type: "tool_result",
       toolUseId: callId,
-      summary: stringifyPayload(result),
+      summary: formatTranscriptToolResult(result) || stringifyPayload(result),
       isError
     }
   };
 }
-function usageFromTurn(messageId, usage2, extras) {
+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: usage2.inputTokens,
+    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 stampParentToolUseId(events, parentToolUseId) {
+  if (!parentToolUseId) return events;
+  return events.map((event) => {
+    if (event.type !== "content_delta") return event;
+    const delta = event.delta;
+    if ("parentToolUseId" in delta && delta.parentToolUseId) return event;
+    return { ...event, delta: { ...delta, parentToolUseId } };
+  });
+}
 function mapInteractionUpdate(messageId, update, options) {
   const events = [];
   const type = String(update.type ?? "");
@@ -51884,6 +52101,7 @@ function mapInteractionUpdate(messageId, update, options) {
     case "tool-call-started":
     case "partial-tool-call": {
       const parts = extractToolCallParts(update);
+      if (!parts.callId) break;
       events.push(toolUseEvent(messageId, parts.callId, parts.toolType, parts.args, "streaming"));
       if (parts.toolType === "updateTodos" || parts.toolType === "update_todos") {
         const todos = asRecord9(parts.args)?.todos;
@@ -51895,6 +52113,7 @@ function mapInteractionUpdate(messageId, update, options) {
         events.push({
           type: "task_started",
           taskId: parts.callId,
+          toolUseId: parts.callId,
           description
         });
       }
@@ -51907,24 +52126,19 @@ function mapInteractionUpdate(messageId, update, options) {
         if (nestedType === "shell-output-delta") {
           break;
         }
-        if (nestedType === "text-delta") {
-          const text = strField2(taskUpdate, "text");
-          if (text) {
-            events.push({
-              type: "content_delta",
-              messageId,
-              delta: { type: "text", text }
-            });
-          }
-          break;
-        }
-        events.push(...mapInteractionUpdate(messageId, taskUpdate, options));
+        const parentCallId = extractCursorCallId(rec) ?? options?.parentToolUseId;
+        events.push(...mapInteractionUpdate(messageId, taskUpdate, {
+          ...options,
+          ...parentCallId ? { parentToolUseId: parentCallId } : {}
+        }));
       }
       break;
     }
     case "tool-call-completed": {
       const parts = extractToolCallParts(update);
-      events.push(toolUseEvent(messageId, parts.callId, parts.toolType, parts.args, "complete"));
+      if (!parts.callId) break;
+      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;
@@ -51932,12 +52146,14 @@ function mapInteractionUpdate(messageId, update, options) {
         if (todoEvent) events.push(todoEvent);
       }
       if (parts.toolType === "task") {
+        const transcriptPath = strField2(parts.result, "transcriptPath");
         events.push({
           type: "task_notification",
           taskId: parts.callId,
+          toolUseId: parts.callId,
           taskStatus: parts.isError ? "failed" : "completed",
-          outputFile: "",
-          summary: stringifyPayload(parts.result) || strField2(parts.args, "description") || "Task"
+          outputFile: transcriptPath,
+          summary: strField2(parts.result, "resultSuffix") || stringifyPayload(parts.result) || strField2(parts.args, "description") || "Task"
         });
       }
       break;
@@ -51945,13 +52161,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 +52175,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;
@@ -52012,7 +52242,7 @@ ${text}
       break;
     }
   }
-  return events;
+  return stampParentToolUseId(events, options?.parentToolUseId);
 }
 function mapConversationStep(messageId, step, options) {
   const events = [];
@@ -52025,14 +52255,21 @@ function mapConversationStep(messageId, step, options) {
   if (stepType === "toolCall") {
     const message = rec.message ?? rec.toolCall ?? rec;
     const nested = asRecord9(message);
-    const explicitCallId = stableIdField(rec, "callId", "toolCallId", "id", "call_id") || stableIdField(nested, "callId", "toolCallId", "id", "call_id");
-    const callId = explicitCallId || options?.resolveCallId?.(step) || null;
+    const callId = extractCursorCallId(rec) || options?.resolveCallId?.(step) || null;
     if (!callId) {
       return events;
     }
     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 +52301,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 +52334,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,45 +52366,56 @@ 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 TOOL_CALL_ID_KEYS, CursorTurnUsage, CursorTurnCallIdBridge;
 var init_cursor_event_map = __esm({
   "../../packages/cursor/src/cursor-event-map.ts"() {
     "use strict";
+    init_tool_ui();
+    TOOL_CALL_ID_KEYS = ["callId", "toolCallId", "call_id"];
+    CursorTurnUsage = class {
+      input = 0;
+      output = 0;
+      context = 0;
+      addTokenDelta(tokens) {
+        if (Number.isFinite(tokens) && tokens > 0) this.output += tokens;
+      }
+      applyInternalTurn(usage2) {
+        this.input += usage2.inputTokens;
+        if (usage2.outputTokens > this.output) this.output = usage2.outputTokens;
+        this.context = contextTokensFromUsage(usage2);
+      }
+      applyRunTotals(usage2) {
+        if (usage2.inputTokens > this.input) this.input = usage2.inputTokens;
+        if (usage2.outputTokens > this.output) this.output = usage2.outputTokens;
+      }
+    };
     CursorTurnCallIdBridge = class {
       queue = [];
       seen = /* @__PURE__ */ new Set();
       /** Observe a live InteractionUpdate; record callIds from tool-call events. */
       observeDelta(update) {
         const type = String(update.type ?? "");
+        if (type === "tool-call-delta") {
+          const taskUpdate = asRecord9(update)?.taskUpdate;
+          if (taskUpdate && typeof taskUpdate === "object") {
+            this.observeDelta(taskUpdate);
+          }
+          return;
+        }
         if (type !== "tool-call-started" && type !== "partial-tool-call" && type !== "tool-call-completed") {
           return;
         }
-        const callId = stableIdField(update, "callId", "toolCallId", "id", "call_id");
+        const callId = extractCursorCallId(update);
         if (!callId || this.seen.has(callId)) return;
         this.seen.add(callId);
         this.queue.push(callId);
@@ -53090,6 +53328,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 +53345,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 +53448,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 +61387,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.8-alpha".trim()) {
+    return "0.53.8-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.8-alpha",
   "description": "SuperOne headless node CLI — remote execution environment (RPC, workspaces, sessions).",
   "type": "module",
   "license": "BUSL-1.1",