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

package/MANIFEST.json

@@ -1,7 +1,7 @@
 {
   "name": "@super-one/cli",
-  "version": "0.50.3-alpha",
+  "version": "0.50.5-alpha",
   "kind": "npm",
   "minNodeMajor": 20,
-  "builtAt": "2026-08-07T01:09:21.908Z"
+  "builtAt": "2026-08-07T07:57:09.216Z"
 }

package/lib/cli.mjs

@@ -170,7 +170,7 @@ var init_host_action_superone_descriptors = __esm({
     HOST_ACTION_SUPERONE_TOOL_DESCRIPTORS = [
       {
         "name": "session_collab_list_agents",
-        "description": "List the built-in agent profiles (harness + config) available for user-approved child sessions. Each profile includes defaultConfig with the model/effort inherited when a request omits them. Call this before session_collab_request. The same profile may be requested more than once.",
+        "description": "List the agent profiles available for user-approved child sessions. Inspect each profile's harness and defaultConfig before session_collab_request. You may reuse one agentId for multiple launches.",
         "inputSchema": {
           "type": "object",
           "properties": {},
@@ -179,7 +179,7 @@ var init_host_action_superone_descriptors = __esm({
       },
       {
         "name": "session_collab_request",
-        "description": 'Request approval for one or more child-agent launches. Repeat an agentId to launch multiple sessions from one profile. Every launch must include name (an agent-chosen human label, not the harness name) and role (for example, Reviewer or Implementer). config is optional; omitted model/effort fields inherit the selected profile defaultConfig, while explicit values override it. Session title becomes "Name - Role". The user reviews and may edit model/effort/AI provider/permission/sandbox (task, name, role, agent profile, cwd, worktree stay as requested). On approval each launch returns a bearer credential. Each credential can create exactly one session and must be kept private.',
+        "description": 'Request user approval for one or more child sessions. Call session_collab_list_agents first; repeat an agentId to reuse a profile. Invent a human-friendly name and a task-specific role for every launch. Omitted config fields inherit profile defaults. Before setting config.cwd or config.worktree, call read_manual({ domain: "product", topic: "collaboration" }); same-repo isolation belongs in config.worktree, not a worktree-leaf cwd. The user may edit model, effort, provider, permission, and sandbox settings. Each approved launch returns a private one-shot credential for session_collab_start.',
         "inputSchema": {
           "type": "object",
           "properties": {
@@ -251,10 +251,12 @@ var init_host_action_superone_descriptors = __esm({
                         ]
                       },
                       "cwd": {
-                        "type": "string"
+                        "type": "string",
+                        "description": 'Set only to a genuinely different project root. Omit for the current project. Never pass ~/.worktrees/... or another same-repo worktree leaf; use config.worktree for same-repo isolation. See read_manual({ domain: "product", topic: "collaboration" }).'
                       },
                       "worktree": {
                         "type": "object",
+                        "description": 'Request a host-managed worktree for same-repo isolation while cwd stays omitted or at the project root. Set enabled, baseBranch, and mode; use a unique branchName with branch. See read_manual({ domain: "product", topic: "collaboration" }) for implementer and reviewer recipes.',
                         "properties": {
                           "enabled": {
                             "type": "boolean"
@@ -272,7 +274,7 @@ var init_host_action_superone_descriptors = __esm({
                           },
                           "branchName": {
                             "type": "string",
-                            "description": "Branch to create for this worktree. Must be unique across launches \u2014 git cannot check out one branch in two worktrees."
+                            "description": 'With mode "branch", create this unique branch. Git cannot check out one branch in two worktrees.'
                           },
                           "carryLocalChanges": {
                             "type": "boolean"
@@ -310,7 +312,7 @@ var init_host_action_superone_descriptors = __esm({
       },
       {
         "name": "session_collab_start",
-        "description": "Create the real, user-visible collaboration child session authorized by one credential and deliver the approved launch task. Returns as soon as the child agent begins replying (does not wait for the full first turn). A credential creates at most one session; repeated calls are idempotent and return the same session id. The child then works asynchronously \u2014 start every child you need back to back, and never block on one before starting the next.",
+        "description": "Start the approved child session for one credential and deliver its task. The call returns when the child begins replying, not when its first turn finishes. A credential starts at most one session; retries return the same session id. Start all approved children back-to-back, then continue other work while they run asynchronously.",
         "inputSchema": {
           "type": "object",
           "properties": {
@@ -326,7 +328,7 @@ var init_host_action_superone_descriptors = __esm({
       },
       {
         "name": "session_collab_send",
-        "description": "Send a persistent mailbox message between the parent and child sessions authorized by a credential. Direction is derived from the calling session. Write content as Markdown (headings, lists, code fences, emphasis, tables when useful) so peer agents and the SuperOne UI can render a structured handoff. Use clientMessageId for retry-safe idempotency. Delivery is push-based both ways: the peer is woken by a task notification (even mid-turn), and when it replies the host wakes you the same way \u2014 a fresh turn starts, telling you to call session_collab_retrieve. So after sending, move on to other work or end your turn; ending the turn IS how you wait here, and no reply is missed. Never sleep, re-send, or poll session_collab_retrieve while waiting.",
+        "description": "Send a persistent Markdown message through one parent-child mailbox. Use clientMessageId for retry-safe delivery. The host wakes the peer and later wakes you when it replies. After sending, continue other work or end your turn. Never sleep, resend, or poll session_collab_retrieve while waiting.",
         "inputSchema": {
           "type": "object",
           "properties": {
@@ -351,7 +353,7 @@ var init_host_action_superone_descriptors = __esm({
       },
       {
         "name": "session_collab_retrieve",
-        "description": 'Retrieve persistent mailbox messages addressed to this session. Non-blocking single read: returns the messages already waiting (status "messages") or nothing (status "empty"). Each message content is Markdown written by the peer \u2014 parse structure (headings, lists, code) rather than treating it as plain text. Pass multiple credentials to drain several parent/child mailboxes in one call. Returned messages advance only this agent endpoint cursor. Call it when a collaboration wake notification arrives, or once to drain the inbox before you act on peer input. Status "empty" means no peer has replied yet \u2014 it is NOT a retry signal: do not call again, do not sleep, do not spin. End your turn and the wake notification will start a new one the moment a message actually arrives.',
+        "description": 'Retrieve queued Markdown messages for this session from one or more parent-child mailboxes. Call after a collaboration wake, or once before acting on peer input. This is a non-blocking read: status "empty" is not a retry signal. Do not sleep or poll; end your turn and wait for the next wake.',
         "inputSchema": {
           "type": "object",
           "properties": {
@@ -3268,7 +3270,13 @@ var init_auth = __esm({
       /** WebSocket ticket: 30 seconds, single /ws upgrade. */
       wsTicketMs: 30 * 1e3,
       /** Refresh family expires after 90 days of inactivity. */
-      refreshInactivityMs: 90 * 24 * 60 * 60 * 1e3
+      refreshInactivityMs: 90 * 24 * 60 * 60 * 1e3,
+      /**
+       * Immediately-previous refresh token remains redeemable this long after
+       * rotation. Mitigates lost-response / concurrent-refresh races without
+       * disabling reuse detection for older generations (RFC 6819 §5.2.2.3).
+       */
+      refreshReuseGraceMs: 60 * 1e3
     };
     OPERATION_SCOPES = {
       readEnvironment: ["environment:read"],
@@ -40133,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 "";
@@ -40201,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"]);
@@ -40484,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 };
     }
@@ -40585,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",
@@ -40679,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;
@@ -40957,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();
   }
 });
@@ -40968,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(),
@@ -40977,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;
@@ -41023,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;
@@ -41032,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();
@@ -41380,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;
 }
@@ -42215,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) {
@@ -42223,6 +42343,7 @@ function createAcpAgentEventMapper(options) {
         }
         options.emit(event);
       }
+      for (const event of migrate) options.emit(event);
       return { textDelta: textDelta || null };
     },
     applyXaiNotification(method, params) {
@@ -42233,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;
@@ -57179,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.3-alpha".trim()) {
-    return "0.50.3-alpha".trim();
+  if ("0.50.5-alpha".trim()) {
+    return "0.50.5-alpha".trim();
   }
   const fromDist = readDistManifestVersion();
   if (fromDist) return fromDist;
@@ -57525,26 +57647,52 @@ var AuthService = class {
     return exchange();
   }
   /**
-   * Rotate refresh credential; reuse of an old refresh hash revokes the family.
-   * Requires proof signature over `proofPayload` with the registered device key
-   * (caller validates signature separately or passes already-verified flag).
+   * Rotate refresh credential.
+   *
+   * Reuse of a rotated refresh hash outside
+   * {@link AUTH_CREDENTIAL_LIFETIMES.refreshReuseGraceMs} is treated as theft
+   * and permanently revokes the family. Inside the grace window, presenting any
+   * previously rotated hash re-rotates the *current* session and returns a fresh
+   * pair (lost-response / concurrent-refresh races — RFC 6819 §5.2.2.3 style).
+   *
+   * Requires proof signature over `proofPayload` with the registered device key.
    */
   refreshAccess(input) {
     const refreshHash = this.hashSecret(input.refreshToken);
     const now = Date.now();
-    const row = this.db.prepare(
+    const loadByHash = (hash2) => this.db.prepare(
       `SELECT client_session_id, device_public_key_pem, device_public_key_fingerprint,
-                scopes_json, refresh_family_id, refresh_hash, refresh_expires_at, revoked_at
-         FROM client_sessions WHERE refresh_hash = ?`
-    ).get(refreshHash);
+                  scopes_json, refresh_family_id, refresh_hash, refresh_expires_at, revoked_at
+           FROM client_sessions WHERE refresh_hash = ?`
+    ).get(hash2);
+    const loadBySessionId = (clientSessionId) => this.db.prepare(
+      `SELECT client_session_id, device_public_key_pem, device_public_key_fingerprint,
+                  scopes_json, refresh_family_id, refresh_hash, refresh_expires_at, revoked_at
+           FROM client_sessions WHERE client_session_id = ?`
+    ).get(clientSessionId);
+    let row = loadByHash(refreshHash);
     if (!row) {
-      const reused = this.db.prepare("SELECT client_session_id FROM refresh_reuse_log WHERE refresh_hash = ?").get(refreshHash);
-      if (reused) {
-        this.db.prepare("UPDATE client_sessions SET revoked_at = ? WHERE client_session_id = ? AND revoked_at IS NULL").run(now, reused.client_session_id);
+      const reused = this.db.prepare(
+        `SELECT client_session_id, seen_at FROM refresh_reuse_log WHERE refresh_hash = ?`
+      ).get(refreshHash);
+      if (!reused) {
+        throw Object.assign(new Error("invalid refresh token"), { code: "unauthorized" });
+      }
+      const withinGrace = now - reused.seen_at <= AUTH_CREDENTIAL_LIFETIMES.refreshReuseGraceMs;
+      if (withinGrace) {
+        row = loadBySessionId(reused.client_session_id);
+        if (!row) {
+          throw Object.assign(new Error("invalid refresh token"), { code: "unauthorized" });
+        }
+      } else {
+        this.db.prepare(
+          "UPDATE client_sessions SET revoked_at = ? WHERE client_session_id = ? AND revoked_at IS NULL"
+        ).run(now, reused.client_session_id);
         this.onRevoke?.(reused.client_session_id);
-        throw Object.assign(new Error("refresh token reuse detected; session revoked"), { code: "unauthorized" });
+        throw Object.assign(new Error("refresh token reuse detected; session revoked"), {
+          code: "unauthorized"
+        });
       }
-      throw Object.assign(new Error("invalid refresh token"), { code: "unauthorized" });
     }
     if (row.revoked_at) throw Object.assign(new Error("client session revoked"), { code: "unauthorized" });
     if (row.refresh_expires_at < now) {
@@ -57566,20 +57714,21 @@ var AuthService = class {
     if (!Number.isFinite(proofTs) || Math.abs(now - proofTs) > 12e4) {
       throw Object.assign(new Error("proof timestamp out of window"), { code: "unauthorized" });
     }
+    const session = row;
     return this.db.transaction(() => {
-      const scopes = parseScopes(row.scopes_json);
+      const scopes = parseScopes(session.scopes_json);
       const newRefresh = randomToken(32);
       const newRefreshHash = this.hashSecret(newRefresh);
       const refreshExpiresAt = now + AUTH_CREDENTIAL_LIFETIMES.refreshInactivityMs;
       this.db.prepare(
         `INSERT OR IGNORE INTO refresh_reuse_log (refresh_hash, client_session_id, seen_at)
            VALUES (?, ?, ?)`
-      ).run(row.refresh_hash, row.client_session_id, now);
+      ).run(session.refresh_hash, session.client_session_id, now);
       const updated = this.db.prepare(
         `UPDATE client_sessions
            SET refresh_hash = ?, refresh_expires_at = ?, last_used_at = ?
            WHERE client_session_id = ? AND refresh_hash = ? AND revoked_at IS NULL`
-      ).run(newRefreshHash, refreshExpiresAt, now, row.client_session_id, row.refresh_hash);
+      ).run(newRefreshHash, refreshExpiresAt, now, session.client_session_id, session.refresh_hash);
       if (updated.changes !== 1) {
         throw Object.assign(new Error("refresh race; retry"), { code: "conflict" });
       }
@@ -57589,15 +57738,15 @@ var AuthService = class {
         aud: "superone",
         exp: expiresAt,
         iat: now,
-        clientSessionId: row.client_session_id,
+        clientSessionId: session.client_session_id,
         scopes,
-        proofKeyThumbprint: row.device_public_key_fingerprint
+        proofKeyThumbprint: session.device_public_key_fingerprint
       });
       return {
         accessToken,
         expiresAt,
         scopes,
-        clientSessionId: row.client_session_id,
+        clientSessionId: session.client_session_id,
         refreshToken: newRefresh
       };
     })();
@@ -61195,7 +61344,12 @@ function defaultProbeModels(ctx) {
   return async (harnessId, cwd) => {
     if (harnessId !== "claude") return [];
     const binaryPath = resolveClaudeBinaryPath({ harnesses: ctx.harnesses });
-    if (!binaryPath) return [];
+    if (!binaryPath) {
+      console.warn(
+        "[harness.resources] claude model probe skipped: no Agent SDK binary on this node (reinstall the optional platform package or set SUPERONE_CLAUDE_BINARY)"
+      );
+      return [];
+    }
     return getNodeClaudeModelCatalog({ cwd, binaryPath });
   };
 }
@@ -61233,6 +61387,9 @@ async function handleHarnessResources(payload, ctx) {
       const probe = ctx.probeModels ?? defaultProbeModels(ctx);
       const probed = await probe(hid, project.path);
       if (probed.length > 0) return probed;
+      console.warn(
+        `[harness.resources] ${hid} probe returned no models; serving the built-in fallback table`
+      );
       return listHarnessModels(ctx.providers, hid, apiProviderId ?? null);
     };
     const bundle = await collectHarnessResources({

package/package.json

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