@super-one/cli 0.50.4-alpha → 0.50.5-alpha

package/MANIFEST.json

@@ -1,7 +1,7 @@
 {
   "name": "@super-one/cli",
-  "version": "0.50.4-alpha",
+  "version": "0.50.5-alpha",
   "kind": "npm",
   "minNodeMajor": 20,
-  "builtAt": "2026-08-07T04:11:13.179Z"
+  "builtAt": "2026-08-07T07:57:09.216Z"
 }

package/lib/cli.mjs

@@ -40141,6 +40141,265 @@ var init_slash_filter = __esm({
   }
 });
 
+// ../../packages/shared/src/tool-ui.ts
+function normalizeToolIdKey(id) {
+  return id.trim().toLowerCase().replace(/[\s-]+/g, "_");
+}
+function uiToolNameFromId(id) {
+  if (!id || typeof id !== "string") return null;
+  if (/[\s`/:]/.test(id) && !TOOL_ID_TO_UI_NAME[normalizeToolIdKey(id)]) return null;
+  const key = normalizeToolIdKey(id);
+  return TOOL_ID_TO_UI_NAME[key] ?? null;
+}
+function bytesOrStringToText(value) {
+  if (typeof value === "string") return value;
+  if (Array.isArray(value) && value.length > 0 && value.every((n) => typeof n === "number")) {
+    try {
+      return new TextDecoder("utf-8", { fatal: false }).decode(Uint8Array.from(value));
+    } catch {
+      return "";
+    }
+  }
+  return "";
+}
+function formatSearchToolPayload(obj) {
+  let data = obj;
+  if (typeof obj.content === "string" && obj.content.trim()) {
+    try {
+      data = JSON.parse(obj.content);
+    } catch {
+      if (!obj.results) return obj.content;
+    }
+  }
+  if (!data || typeof data !== "object") return null;
+  const root = data;
+  const results = root.results;
+  if (!Array.isArray(results)) {
+    if (typeof root.content === "string") return root.content;
+    return null;
+  }
+  const lines = [];
+  const count = typeof obj.result_count === "number" ? obj.result_count : results.length;
+  lines.push(`Found ${count} tool${count === 1 ? "" : "s"}`);
+  for (const entry of results) {
+    if (!entry || typeof entry !== "object") continue;
+    const group = entry;
+    const server = typeof group.server === "string" ? group.server : "MCP";
+    lines.push("");
+    lines.push(`[${server}]`);
+    const tools = group.tools;
+    if (!Array.isArray(tools)) continue;
+    for (const tool of tools) {
+      if (!tool || typeof tool !== "object") continue;
+      const t = tool;
+      const name = typeof t.tool_name === "string" ? t.tool_name : typeof t.name === "string" ? t.name : "tool";
+      const desc = typeof t.description === "string" ? t.description : "";
+      const score = typeof t.score === "number" ? ` \xB7 ${t.score.toFixed(1)}` : "";
+      lines.push(desc ? `  ${name}${score} \u2014 ${desc}` : `  ${name}${score}`);
+    }
+  }
+  if (typeof root.note === "string" && root.note.trim()) {
+    lines.push("");
+    lines.push(root.note);
+  }
+  return lines.join("\n").trim() || null;
+}
+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";
+}
+function formatAgentToolOutput(raw) {
+  if (raw == null) return "";
+  if (typeof raw === "string") {
+    const trimmed = raw.trim();
+    if (trimmed.startsWith("{") && trimmed.endsWith("}") || trimmed.startsWith("[") && trimmed.endsWith("]")) {
+      try {
+        const parsed = JSON.parse(trimmed);
+        if (parsed && typeof parsed === "object" && !Array.isArray(parsed) && isAgentOutputEnvelope(parsed)) {
+          return formatAgentToolOutput(parsed);
+        }
+        return raw;
+      } catch {
+        return raw;
+      }
+    }
+    return raw;
+  }
+  if (typeof raw !== "object") return String(raw);
+  const obj = raw;
+  if (obj.type === "MCP" && obj.output != null) {
+    if (typeof obj.output === "string") return obj.output;
+    if (typeof obj.output === "object") {
+      const values = Object.values(obj.output);
+      if (values.length === 1 && typeof values[0] === "string") return values[0];
+    }
+  }
+  const listContent = obj.Content ?? obj.content;
+  if ((obj.type === "ListDir" || obj.type === "list_dir" || obj.type === "LS") && listContent && typeof listContent === "object") {
+    const body = listContent;
+    if (typeof body.content === "string" && body.content.trim()) return body.content;
+    if (typeof body.text === "string" && body.text.trim()) return body.text;
+  }
+  if ((obj.type === "ListDir" || obj.type === "list_dir") && typeof obj.Content === "string") {
+    return obj.Content;
+  }
+  if (typeof obj.content === "string" && obj.content.includes("\n") && (obj.type === "ListDir" || obj.absolute_root_path != null)) {
+    return obj.content;
+  }
+  if (obj.type === "Todo" || obj.TodosUpdated != null) {
+    const todos = obj.TodosUpdated;
+    if (todos && typeof todos === "object") {
+      const t = todos;
+      if (typeof t.summary_for_prompt === "string" && t.summary_for_prompt.trim()) return t.summary_for_prompt;
+      if (typeof t.summary === "string" && t.summary.trim()) return t.summary;
+    }
+  }
+  if (obj.type === "SearchTool" || Array.isArray(obj.results) || obj.result_count != null && (obj.content != null || obj.results != null)) {
+    const formatted = formatSearchToolPayload(obj);
+    if (formatted) return formatted;
+  }
+  if (obj.type === "GrepSearch" || obj.type === "grep" || Array.isArray(obj.stdout)) {
+    const text = bytesOrStringToText(obj.stdout ?? obj.content ?? obj.output);
+    if (text) return text;
+  }
+  const action = obj.action;
+  if (action && typeof action === "object") {
+    const a = action;
+    if (a.type === "search") {
+      const lines = [];
+      if (typeof a.query === "string") lines.push(`Query: ${a.query}`);
+      const sources = a.sources;
+      if (Array.isArray(sources)) {
+        for (const s2 of sources) {
+          if (s2 && typeof s2 === "object") {
+            const src = s2;
+            if (typeof src.url === "string") lines.push(src.url);
+            else if (typeof src.title === "string") lines.push(src.title);
+          }
+        }
+      }
+      if (typeof a.result === "string") lines.push(a.result);
+      if (typeof a.snippet === "string") lines.push(a.snippet);
+      if (lines.length > 0) return lines.join("\n");
+    }
+  }
+  if (listContent && typeof listContent === "object") {
+    const body = listContent;
+    for (const key of ["content", "text", "output", "result"]) {
+      if (typeof body[key] === "string" && body[key].trim()) {
+        if (obj.type === "ListDir" || obj.type === "list_dir" || obj.type === "LS" || body.absolute_root_path != null || /^[\s-]*\//.test(body[key])) {
+          return body[key];
+        }
+      }
+    }
+  }
+  if (typeof obj.run_id === "string" || typeof obj.runId === "string") {
+    try {
+      return JSON.stringify(raw);
+    } catch {
+      return String(raw);
+    }
+  }
+  for (const key of ["result", "output", "text", "stdout", "message", "summary"]) {
+    const v2 = obj[key];
+    if (typeof v2 === "string" && v2.trim()) return v2;
+  }
+  if (listContent && typeof listContent === "object") {
+    const body = listContent;
+    for (const key of ["content", "text", "output", "result"]) {
+      if (typeof body[key] === "string" && body[key].trim()) return body[key];
+    }
+  }
+  try {
+    return JSON.stringify(raw, null, 2);
+  } catch {
+    return String(raw);
+  }
+}
+var TOOL_ID_TO_UI_NAME;
+var init_tool_ui = __esm({
+  "../../packages/shared/src/tool-ui.ts"() {
+    "use strict";
+    TOOL_ID_TO_UI_NAME = {
+      read: "Read",
+      read_file: "Read",
+      readfile: "Read",
+      edit: "Edit",
+      search_replace: "Edit",
+      str_replace: "Edit",
+      apply_patch: "Edit",
+      write: "Write",
+      write_file: "Write",
+      writefile: "Write",
+      create_file: "Write",
+      bash: "Bash",
+      shell: "Bash",
+      run_terminal_command: "Bash",
+      run_terminal_cmd: "Bash",
+      run_command: "Bash",
+      execute: "Bash",
+      command: "Bash",
+      grep: "Grep",
+      search: "Grep",
+      ripgrep: "Grep",
+      glob: "Glob",
+      find_files: "Glob",
+      list_dir: "LS",
+      listdir: "LS",
+      ls: "LS",
+      web_fetch: "WebFetch",
+      webfetch: "WebFetch",
+      fetch: "WebFetch",
+      open_page: "WebFetch",
+      open_page_with_find: "WebFetch",
+      web_search: "WebSearch",
+      websearch: "WebSearch",
+      todo_write: "TodoWrite",
+      todowrite: "TodoWrite",
+      todo: "TodoWrite",
+      search_tool: "SearchTools",
+      searchtool: "SearchTools",
+      tool_search: "SearchTools",
+      toolsearch: "SearchTools",
+      use_tool: "UseTool",
+      usetool: "UseTool",
+      call_tool: "UseTool",
+      spawn_subagent: "Agent",
+      spawn_agent: "Agent",
+      agent: "Agent",
+      task: "Task",
+      workflow: "Workflow",
+      run_workflow: "Workflow",
+      memory_search: "MemorySearch",
+      memorysearch: "MemorySearch",
+      search_memory: "MemorySearch",
+      ask_user_question: "AskUserQuestion",
+      askuserquestion: "AskUserQuestion",
+      get_task_output: "TaskOutput",
+      get_command_or_subagent_output: "TaskOutput",
+      get_terminal_command_output: "TaskOutput",
+      wait_tasks: "TaskOutput",
+      wait_commands_or_subagents: "TaskOutput",
+      kill_task: "KillTask",
+      kill_command_or_subagent: "KillTask",
+      kill_terminal_command: "KillTask",
+      enter_plan_mode: "EnterPlanMode",
+      exit_plan_mode: "ExitPlanMode",
+      skill: "Skill",
+      image_gen: "ImageGen",
+      image_edit: "ImageEdit",
+      image_to_video: "ImageToVideo",
+      reference_to_video: "ReferenceToVideo",
+      video_gen: "VideoGen",
+      monitor: "Monitor",
+      update_goal: "UpdateGoal",
+      scheduler_create: "SchedulerCreate",
+      scheduler_delete: "SchedulerDelete",
+      scheduler_list: "SchedulerList"
+    };
+  }
+});
+
 // ../../packages/acp/src/tool-normalization.ts
 function textFromContent(content) {
   if (!content) return "";
@@ -40209,14 +40468,8 @@ function extractFilePath(tool, raw, diffs) {
     "to"
   ]);
 }
-function normalizeToolId(id) {
-  return id.trim().toLowerCase().replace(/[\s-]+/g, "_");
-}
 function nameFromToolId(id) {
-  if (!id || typeof id !== "string") return null;
-  if (/[\s`/:]/.test(id) && !TOOL_ID_TO_NAME[normalizeToolId(id)]) return null;
-  const key = normalizeToolId(id);
-  return TOOL_ID_TO_NAME[key] ?? null;
+  return uiToolNameFromId(id);
 }
 function nameFromVariant(raw) {
   const variant = pickString(raw, ["variant", "tool", "name", "toolName", "tool_name"]);
@@ -40492,12 +40745,17 @@ function normalizeInput(toolName, kind, raw, filePath, diffs, terminalCommand) {
       if (raw.limit != null) out.limit = raw.limit;
       return Object.keys(out).length > 0 ? out : { ...raw };
     }
+    case "Agent":
     case "Task": {
       const out = {};
       const desc = pickString(raw, ["description", "prompt", "name", "task", "objective"]);
       if (desc) out.description = desc;
       const sub = pickString(raw, ["subagent_type", "agent_type", "agent", "type"]);
       if (sub) out.subagent_type = sub;
+      const prompt = pickString(raw, ["prompt"]);
+      if (prompt) out.prompt = prompt;
+      const model = pickString(raw, ["model"]);
+      if (model) out.model = model;
       if (raw.run_in_background === true || raw.background === true) out.run_in_background = true;
       return Object.keys(out).length > 0 ? out : { ...raw };
     }
@@ -40593,87 +40851,11 @@ function toolUseBlock(tool, opts) {
     toolFilePath: normalized.toolFilePath
   };
 }
-var TOOL_ID_TO_NAME, GREP_NON_PATTERN_TITLES;
+var GREP_NON_PATTERN_TITLES;
 var init_tool_normalization = __esm({
   "../../packages/acp/src/tool-normalization.ts"() {
     "use strict";
-    TOOL_ID_TO_NAME = {
-      read: "Read",
-      read_file: "Read",
-      readfile: "Read",
-      edit: "Edit",
-      search_replace: "Edit",
-      str_replace: "Edit",
-      apply_patch: "Edit",
-      write: "Write",
-      write_file: "Write",
-      writefile: "Write",
-      create_file: "Write",
-      bash: "Bash",
-      shell: "Bash",
-      run_terminal_command: "Bash",
-      run_terminal_cmd: "Bash",
-      run_command: "Bash",
-      execute: "Bash",
-      command: "Bash",
-      grep: "Grep",
-      search: "Grep",
-      ripgrep: "Grep",
-      glob: "Glob",
-      find_files: "Glob",
-      list_dir: "LS",
-      listdir: "LS",
-      ls: "LS",
-      web_fetch: "WebFetch",
-      webfetch: "WebFetch",
-      fetch: "WebFetch",
-      open_page: "WebFetch",
-      open_page_with_find: "WebFetch",
-      web_search: "WebSearch",
-      websearch: "WebSearch",
-      todo_write: "TodoWrite",
-      todowrite: "TodoWrite",
-      todo: "TodoWrite",
-      search_tool: "SearchTools",
-      searchtool: "SearchTools",
-      tool_search: "SearchTools",
-      toolsearch: "SearchTools",
-      use_tool: "UseTool",
-      usetool: "UseTool",
-      call_tool: "UseTool",
-      spawn_subagent: "Task",
-      spawn_agent: "Task",
-      task: "Task",
-      agent: "Task",
-      workflow: "Workflow",
-      run_workflow: "Workflow",
-      memory_search: "MemorySearch",
-      memorysearch: "MemorySearch",
-      search_memory: "MemorySearch",
-      ask_user_question: "AskUserQuestion",
-      askuserquestion: "AskUserQuestion",
-      get_task_output: "TaskOutput",
-      get_command_or_subagent_output: "TaskOutput",
-      get_terminal_command_output: "TaskOutput",
-      wait_tasks: "TaskOutput",
-      wait_commands_or_subagents: "TaskOutput",
-      kill_task: "KillTask",
-      kill_command_or_subagent: "KillTask",
-      kill_terminal_command: "KillTask",
-      enter_plan_mode: "EnterPlanMode",
-      exit_plan_mode: "ExitPlanMode",
-      skill: "Skill",
-      image_gen: "ImageGen",
-      image_edit: "ImageEdit",
-      image_to_video: "ImageToVideo",
-      reference_to_video: "ReferenceToVideo",
-      video_gen: "VideoGen",
-      monitor: "Monitor",
-      update_goal: "UpdateGoal",
-      scheduler_create: "SchedulerCreate",
-      scheduler_delete: "SchedulerDelete",
-      scheduler_list: "SchedulerList"
-    };
+    init_tool_ui();
     GREP_NON_PATTERN_TITLES = /* @__PURE__ */ new Set([
       "grep",
       "Grep",
@@ -40687,170 +40869,8 @@ var init_tool_normalization = __esm({
 });
 
 // ../../packages/acp/src/tool-result-map.ts
-function bytesOrStringToText(value) {
-  if (typeof value === "string") return value;
-  if (Array.isArray(value) && value.every((n) => typeof n === "number")) {
-    try {
-      return Buffer.from(value).toString("utf8");
-    } catch {
-      return "";
-    }
-  }
-  return "";
-}
-function formatSearchToolPayload(obj) {
-  let data = obj;
-  if (typeof obj.content === "string" && obj.content.trim()) {
-    try {
-      data = JSON.parse(obj.content);
-    } catch {
-      if (!obj.results) return obj.content;
-    }
-  }
-  if (!data || typeof data !== "object") return null;
-  const root = data;
-  const results = root.results;
-  if (!Array.isArray(results)) {
-    if (typeof root.content === "string") return root.content;
-    return null;
-  }
-  const lines = [];
-  const count = typeof obj.result_count === "number" ? obj.result_count : results.length;
-  lines.push(`Found ${count} tool${count === 1 ? "" : "s"}`);
-  for (const entry of results) {
-    if (!entry || typeof entry !== "object") continue;
-    const group = entry;
-    const server = typeof group.server === "string" ? group.server : "MCP";
-    lines.push("");
-    lines.push(`[${server}]`);
-    const tools = group.tools;
-    if (!Array.isArray(tools)) continue;
-    for (const tool of tools) {
-      if (!tool || typeof tool !== "object") continue;
-      const t = tool;
-      const name = typeof t.tool_name === "string" ? t.tool_name : typeof t.name === "string" ? t.name : "tool";
-      const desc = typeof t.description === "string" ? t.description : "";
-      const score = typeof t.score === "number" ? ` \xB7 ${t.score.toFixed(1)}` : "";
-      lines.push(desc ? `  ${name}${score} \u2014 ${desc}` : `  ${name}${score}`);
-    }
-  }
-  if (typeof root.note === "string" && root.note.trim()) {
-    lines.push("");
-    lines.push(root.note);
-  }
-  return lines.join("\n").trim() || null;
-}
-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";
-}
 function formatAcpRawOutput(raw) {
-  if (raw == null) return "";
-  if (typeof raw === "string") {
-    const trimmed = raw.trim();
-    if (trimmed.startsWith("{") && trimmed.endsWith("}") || trimmed.startsWith("[") && trimmed.endsWith("]")) {
-      try {
-        const parsed = JSON.parse(trimmed);
-        if (parsed && typeof parsed === "object" && !Array.isArray(parsed) && isAgentOutputEnvelope(parsed)) {
-          return formatAcpRawOutput(parsed);
-        }
-        return raw;
-      } catch {
-        return raw;
-      }
-    }
-    return raw;
-  }
-  if (typeof raw !== "object") return String(raw);
-  const obj = raw;
-  if (obj.type === "MCP" && obj.output != null) {
-    if (typeof obj.output === "string") return obj.output;
-    if (typeof obj.output === "object") {
-      const values = Object.values(obj.output);
-      if (values.length === 1 && typeof values[0] === "string") return values[0];
-    }
-  }
-  const listContent = obj.Content ?? obj.content;
-  if ((obj.type === "ListDir" || obj.type === "list_dir" || obj.type === "LS") && listContent && typeof listContent === "object") {
-    const body = listContent;
-    if (typeof body.content === "string" && body.content.trim()) return body.content;
-    if (typeof body.text === "string" && body.text.trim()) return body.text;
-  }
-  if ((obj.type === "ListDir" || obj.type === "list_dir") && typeof obj.Content === "string") {
-    return obj.Content;
-  }
-  if (typeof obj.content === "string" && obj.content.includes("\n") && (obj.type === "ListDir" || obj.absolute_root_path != null)) {
-    return obj.content;
-  }
-  if (obj.type === "Todo" || obj.TodosUpdated != null) {
-    const todos = obj.TodosUpdated;
-    if (todos && typeof todos === "object") {
-      const t = todos;
-      if (typeof t.summary_for_prompt === "string" && t.summary_for_prompt.trim()) return t.summary_for_prompt;
-      if (typeof t.summary === "string" && t.summary.trim()) return t.summary;
-    }
-  }
-  if (obj.type === "SearchTool" || Array.isArray(obj.results) || obj.result_count != null && (obj.content != null || obj.results != null)) {
-    const formatted = formatSearchToolPayload(obj);
-    if (formatted) return formatted;
-  }
-  if (obj.type === "GrepSearch" || obj.type === "grep" || Array.isArray(obj.stdout)) {
-    const text = bytesOrStringToText(obj.stdout ?? obj.content ?? obj.output);
-    if (text) return text;
-  }
-  const action = obj.action;
-  if (action && typeof action === "object") {
-    const a = action;
-    if (a.type === "search") {
-      const lines = [];
-      if (typeof a.query === "string") lines.push(`Query: ${a.query}`);
-      const sources = a.sources;
-      if (Array.isArray(sources)) {
-        for (const s2 of sources) {
-          if (s2 && typeof s2 === "object") {
-            const src = s2;
-            if (typeof src.url === "string") lines.push(src.url);
-            else if (typeof src.title === "string") lines.push(src.title);
-          }
-        }
-      }
-      if (typeof a.result === "string") lines.push(a.result);
-      if (typeof a.snippet === "string") lines.push(a.snippet);
-      if (lines.length > 0) return lines.join("\n");
-    }
-  }
-  if (listContent && typeof listContent === "object") {
-    const body = listContent;
-    for (const key of ["content", "text", "output", "result"]) {
-      if (typeof body[key] === "string" && body[key].trim()) {
-        if (obj.type === "ListDir" || obj.type === "list_dir" || obj.type === "LS" || body.absolute_root_path != null || /^[\s-]*\//.test(body[key])) {
-          return body[key];
-        }
-      }
-    }
-  }
-  if (typeof obj.run_id === "string" || typeof obj.runId === "string") {
-    try {
-      return JSON.stringify(raw);
-    } catch {
-      return String(raw);
-    }
-  }
-  for (const key of ["result", "output", "text", "stdout", "message", "summary"]) {
-    const v2 = obj[key];
-    if (typeof v2 === "string" && v2.trim()) return v2;
-  }
-  if (listContent && typeof listContent === "object") {
-    const body = listContent;
-    for (const key of ["content", "text", "output", "result"]) {
-      if (typeof body[key] === "string" && body[key].trim()) return body[key];
-    }
-  }
-  try {
-    return JSON.stringify(raw, null, 2);
-  } catch {
-    return String(raw);
-  }
+  return formatAgentToolOutput(raw);
 }
 function mediaGenGallerySummary(raw) {
   if (!raw || typeof raw !== "object" || Array.isArray(raw)) return null;
@@ -40965,6 +40985,7 @@ var init_tool_result_map = __esm({
   "../../packages/acp/src/tool-result-map.ts"() {
     "use strict";
     init_capability_prompt_tags();
+    init_tool_ui();
     init_tool_normalization();
   }
 });
@@ -40976,6 +40997,8 @@ function createXaiCorrelationState() {
     workflowRevision: /* @__PURE__ */ new Map(),
     workflowStarted: /* @__PURE__ */ new Set(),
     workflowOwnedSubagents: /* @__PURE__ */ new Set(),
+    smokeWorkflowToolIds: /* @__PURE__ */ new Set(),
+    pendingToolNamesById: /* @__PURE__ */ new Map(),
     subagentToolById: /* @__PURE__ */ new Map(),
     subagentStarted: /* @__PURE__ */ new Set(),
     bgTaskById: /* @__PURE__ */ new Map(),
@@ -40985,6 +41008,27 @@ function createXaiCorrelationState() {
     lastMessageId: null
   };
 }
+function isSubagentLaunchToolName(name) {
+  if (!name) return false;
+  const n = name.toLowerCase();
+  return n === "agent" || n === "task" || n === "spawn_subagent" || n === "spawn_agent";
+}
+function bindSubagentToolId(state, subagentId, toolUseId, description, migrateOut) {
+  if (state.workflowOwnedSubagents.has(subagentId)) return;
+  const existing = state.subagentToolById.get(subagentId);
+  if (existing && existing !== toolUseId) return;
+  const isNew = !existing;
+  if (isNew) state.subagentToolById.set(subagentId, toolUseId);
+  if (isNew && state.subagentStarted.has(subagentId)) {
+    migrateOut.push({
+      type: "task_progress",
+      taskId: subagentId,
+      toolUseId,
+      description: description ?? subagentId,
+      usage: { totalTokens: 0, toolUses: 0, durationMs: 0 }
+    });
+  }
+}
 function asRecord7(v2) {
   if (!v2 || typeof v2 !== "object" || Array.isArray(v2)) return null;
   return v2;
@@ -41031,7 +41075,22 @@ function parseXaiSessionNotificationEnvelope(raw) {
 function parseXaiExtParams(raw) {
   return asRecord7(raw) ?? {};
 }
+function parsePlainTextTaskAck(text) {
+  const subagentId = text.match(/subagent_id:\s*(\S+)/i)?.[1] ?? text.match(/task_ids?\s*=\s*\[\s*"([^"]+)"/i)?.[1];
+  const taskId = text.match(/(?:^|\n)\s*task_id:\s*(\S+)/i)?.[1] ?? subagentId;
+  const outputFile = text.match(/output_file:\s*(\S+)/i)?.[1];
+  const description = text.match(/(?:^|\n)\s*description:\s*(.+)$/im)?.[1]?.trim();
+  const subagentType = text.match(/(?:^|\n)\s*(?:type|subagent_type):\s*(\S+)/i)?.[1];
+  return {
+    ...subagentId ? { subagentId } : {},
+    ...taskId ? { taskId } : {},
+    ...outputFile ? { outputFile } : {},
+    ...description ? { description } : {},
+    ...subagentType ? { subagentType } : {}
+  };
+}
 function noteToolCorrelationFromAgentEvents(events, state) {
+  const migrate = [];
   for (const event of events) {
     if (event.type === "message_usage") {
       state.lastMessageId = event.messageId;
@@ -41040,32 +41099,79 @@ function noteToolCorrelationFromAgentEvents(events, state) {
     if (event.type !== "content_delta") continue;
     const d = event.delta;
     if (d.type === "tool_use") {
+      if (d.toolUseId && d.toolName) {
+        state.pendingToolNamesById.set(d.toolUseId, d.toolName);
+      }
+      const toolName = (d.toolName ?? "").toLowerCase();
+      if ((toolName === "workflow" || toolName === "run_workflow") && d.toolUseId && isValidateOnlyToolInput(d.input)) {
+        state.smokeWorkflowToolIds.add(d.toolUseId);
+      }
       continue;
     }
     if (d.type !== "tool_result" || !d.summary) continue;
     const toolUseId = d.toolUseId;
+    const launchName = state.pendingToolNamesById.get(toolUseId);
+    const isSpawnLaunch = isSubagentLaunchToolName(launchName);
     const parsed = tryParseJsonObject(d.summary);
-    if (!parsed) continue;
-    const runId = strField(parsed, "run_id", "runId");
-    if (runId) {
-      state.workflowToolByRunId.set(runId, toolUseId);
-    }
-    const subagentId = strField(parsed, "subagent_id", "subagentId") ?? strField(parsed, "agent_id", "agentId") ?? strField(parsed, "task_id", "taskId");
-    if (subagentId && (strField(parsed, "subagent_id", "subagentId") || strField(parsed, "subagent_type", "subagentType"))) {
-      state.subagentToolById.set(subagentId, toolUseId);
-    } else if (subagentId && strField(parsed, "agent_id", "agentId") && !runId) {
-      state.subagentToolById.set(subagentId, toolUseId);
-    }
-    const taskId = strField(parsed, "task_id", "taskId");
-    if (taskId && !runId) {
-      const existing = state.bgTaskById.get(taskId);
-      state.bgTaskById.set(taskId, {
-        toolUseId: toolUseId ?? existing?.toolUseId,
-        description: existing?.description ?? strField(parsed, "description", "name") ?? taskId,
-        outputFile: strField(parsed, "output_file", "outputFile") ?? existing?.outputFile
-      });
+    if (parsed) {
+      const runId = strField(parsed, "run_id", "runId");
+      if (runId && toolUseId && !state.smokeWorkflowToolIds.has(toolUseId)) {
+        state.workflowToolByRunId.set(runId, toolUseId);
+      }
+      const explicitSubagentId = strField(parsed, "subagent_id", "subagentId");
+      const agentId = strField(parsed, "agent_id", "agentId");
+      const hasSubagentShape = !!(explicitSubagentId || strField(parsed, "subagent_type", "subagentType") || agentId && !runId);
+      const subagentId = explicitSubagentId ?? agentId ?? strField(parsed, "task_id", "taskId");
+      if (subagentId && (explicitSubagentId || strField(parsed, "subagent_type", "subagentType"))) {
+        if (isSpawnLaunch || !launchName) {
+          bindSubagentToolId(state, subagentId, toolUseId, strField(parsed, "description", "name"), migrate);
+        }
+      } else if (subagentId && agentId && !runId) {
+        if (isSpawnLaunch || !launchName) {
+          bindSubagentToolId(state, subagentId, toolUseId, strField(parsed, "description", "name"), migrate);
+        }
+      }
+      const taskId = strField(parsed, "task_id", "taskId");
+      if (taskId && !runId && !hasSubagentShape) {
+        const existing = state.bgTaskById.get(taskId);
+        if (!existing?.toolUseId || existing.toolUseId === toolUseId) {
+          state.bgTaskById.set(taskId, {
+            toolUseId: toolUseId ?? existing?.toolUseId,
+            description: existing?.description ?? strField(parsed, "description", "name") ?? taskId,
+            outputFile: strField(parsed, "output_file", "outputFile") ?? existing?.outputFile
+          });
+        }
+      }
+      continue;
     }
+    const plain = parsePlainTextTaskAck(d.summary);
+    const allowPlain = isSpawnLaunch || /started in background/i.test(d.summary);
+    if (allowPlain && plain.subagentId) {
+      bindSubagentToolId(state, plain.subagentId, toolUseId, plain.description, migrate);
+    }
+    const explicitTaskId = d.summary.match(/(?:^|\n)\s*task_id:\s*(\S+)/i)?.[1];
+    const bgTaskId = plain.outputFile ? explicitTaskId ?? plain.taskId : explicitTaskId && explicitTaskId !== plain.subagentId ? explicitTaskId : explicitTaskId && !plain.subagentId ? explicitTaskId : void 0;
+    if (allowPlain && bgTaskId) {
+      const existing = state.bgTaskById.get(bgTaskId);
+      if (!existing?.toolUseId || existing.toolUseId === toolUseId) {
+        state.bgTaskById.set(bgTaskId, {
+          toolUseId: toolUseId ?? existing?.toolUseId,
+          description: plain.description ?? existing?.description ?? bgTaskId,
+          outputFile: plain.outputFile ?? existing?.outputFile
+        });
+      }
+    }
+  }
+  return migrate;
+}
+function isValidateOnlyToolInput(input) {
+  if (!input) return false;
+  try {
+    const o = tryParseJsonObject(input);
+    if (o) return o.validate_only === true || o.validateOnly === true;
+  } catch {
   }
+  return /"validate_only"\s*:\s*true/.test(input) || /"validateOnly"\s*:\s*true/.test(input);
 }
 function tryParseJsonObject(text) {
   const trimmed = text.trim();
@@ -41388,16 +41494,22 @@ function mapSubagentProgress(u, state) {
   const durationMs = numField(u, "duration_ms", "durationMs") ?? 0;
   const toolCalls = numField(u, "tool_call_count", "toolCallCount") ?? 0;
   const tokens = numField(u, "tokens_used", "tokensUsed") ?? 0;
-  const toolsUsed = arrField(u, "tools_used", "toolsUsed");
-  const activityText = toolsUsed?.filter((t) => typeof t === "string").slice(-5).join(", ");
+  const toolsUsed = (arrField(u, "tools_used", "toolsUsed") ?? []).filter((t) => typeof t === "string" && t.length > 0);
+  const recent = toolsUsed.slice(-8);
+  const lastTool = recent[recent.length - 1];
+  const activityText = recent.length ? recent.join(", ") : void 0;
+  const toolEntries = recent.map((toolName) => ({ toolName, description: "" }));
   const toolUseId = state.subagentToolById.get(id);
   events.push({
     type: "task_progress",
     taskId: id,
     ...toolUseId ? { toolUseId } : {},
-    description: id,
+    // Prefer last tool name as description so reducer toolHistory advances.
+    description: lastTool ?? id,
+    ...lastTool ? { lastToolName: lastTool } : {},
     usage: { totalTokens: tokens, toolUses: toolCalls, durationMs },
-    ...activityText ? { activityText } : {}
+    ...activityText ? { activityText } : {},
+    ...toolEntries.length ? { toolEntries } : {}
   });
   return events;
 }
@@ -42223,7 +42335,7 @@ function createAcpAgentEventMapper(options) {
         });
       }
       trackOpenAcpTools(openTools, events);
-      noteToolCorrelationFromAgentEvents(events, xaiCorrelation);
+      const migrate = noteToolCorrelationFromAgentEvents(events, xaiCorrelation);
       let textDelta = "";
       for (const event of events) {
         if (event.type === "content_delta" && event.delta.type === "text" && !event.delta.parentToolUseId) {
@@ -42231,6 +42343,7 @@ function createAcpAgentEventMapper(options) {
         }
         options.emit(event);
       }
+      for (const event of migrate) options.emit(event);
       return { textDelta: textDelta || null };
     },
     applyXaiNotification(method, params) {
@@ -42241,8 +42354,9 @@ function createAcpAgentEventMapper(options) {
         { messageId: currentMessageId }
       );
       trackOpenAcpTools(openTools, events);
-      noteToolCorrelationFromAgentEvents(events, xaiCorrelation);
+      const migrate = noteToolCorrelationFromAgentEvents(events, xaiCorrelation);
       for (const event of events) options.emit(event);
+      for (const event of migrate) options.emit(event);
     },
     complete(stopReason = "end_turn") {
       if (terminal) return;
@@ -57187,8 +57301,8 @@ import { fileURLToPath } from "node:url";
 function resolveCliReleaseVersion() {
   const fromEnv = process.env.SUPERONE_CLI_VERSION?.trim();
   if (fromEnv) return fromEnv;
-  if ("0.50.4-alpha".trim()) {
-    return "0.50.4-alpha".trim();
+  if ("0.50.5-alpha".trim()) {
+    return "0.50.5-alpha".trim();
   }
   const fromDist = readDistManifestVersion();
   if (fromDist) return fromDist;

package/package.json

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