mixdog 1.0.10 → 1.0.12

package/src/tui/dist/index.mjs

@@ -33669,7 +33669,7 @@ var SLASH_COMMANDS = [
   { name: "theme", usage: "/theme", params: "[id]", description: "Change the TUI color theme" },
   { name: "agents", usage: "/agents", params: "[refresh]", description: "Show available workflow agents" },
   { name: "effort", usage: "/effort", params: "[level]", description: "Set reasoning effort for the current model" },
-  { name: "fast", usage: "/fast", params: "[on|off]", description: "Toggle Fast mode for the current model" },
+  { name: "fast", usage: "/fast", params: "[on|off|ultra]", description: "Set Fast or Ultrafast mode for the current model" },
   { name: "mcp", usage: "/mcp", description: "Manage MCP servers and tools" },
   { name: "skills", usage: "/skills", description: "Choose a skill for the next request" },
   { name: "memory", usage: "/memory", params: "[status|core ...]", description: "List and edit core memories" },
@@ -37344,11 +37344,10 @@ function bridgeAgentModelSummary(args) {
   ]);
 }
 function summarizeLineWindow(a) {
-  const hasOffset = a.offset != null;
   const offset = a.offset ?? a.start_line ?? a.startLine ?? a.line;
   const limit = a.limit ?? a.line_count ?? a.lineCount ?? a.lines;
   if (offset == null && limit == null) return "";
-  const start = Number(offset) + (hasOffset ? 1 : 0);
+  const start = Number(offset);
   const count = Number(limit);
   if (Number.isFinite(start) && Number.isFinite(count) && count > 0) {
     return `lines ${start}-${Math.max(start, start + count - 1)}`;
@@ -37400,24 +37399,21 @@ function patchFileCount(args = {}) {
 function codeGraphLabel(args) {
   const mode = String(args.mode || args.action || "").toLowerCase();
   if (mode === "prewarm" || mode === "index" || mode === "build" || mode === "refresh") return "Setup";
-  if (mode === "search" || mode === "find_symbol" || mode === "references" || mode === "callers" || mode === "callees")
+  if (mode === "search" || mode === "symbol_search" || mode === "find_symbol" || mode === "references" || mode === "callers" || mode === "callees")
     return "Search";
   return "Read";
 }
+var CODE_GRAPH_FILE_MODES = /* @__PURE__ */ new Set(["overview", "imports", "dependents", "related", "impact"]);
+function listOf(value) {
+  const items = Array.isArray(value) ? value : [value];
+  return items.map((item) => String(item ?? "").trim()).filter(Boolean);
+}
 function codeGraphSummary(args, max) {
-  return compactParts([
-    args.mode || args.action || "",
-    truncateToolText(
-      firstText(
-        args.symbol,
-        Array.isArray(args.symbols) ? args.symbols.join(", ") : "",
-        args.file,
-        args.path,
-        args.query
-      ),
-      max
-    )
-  ]);
+  const mode = String(args.mode || args.action || "");
+  const symbols = listOf(args.symbols ?? args.symbol);
+  const files = listOf(args.files ?? args.file ?? args.path).map(displayToolPath);
+  const targets = CODE_GRAPH_FILE_MODES.has(mode) ? files.concat(symbols) : symbols.concat(files);
+  return compactParts([mode, truncateToolText(targets.join(", ") || firstText(args.query), max)]);
 }
 function pluralize(count, singular, pluralText = `${singular}s`) {
   return count === 1 ? singular : pluralText;
@@ -37512,16 +37508,20 @@ function isUserControlCancellation(text) {
 function hasBenignExitOutcome(text) {
   return /^\[outcome:\s*(?:no-match|no-change)\]\s*$/im.test(String(text || ""));
 }
-function toolResultTerminalStatus(text) {
-  const body = String(text || "");
-  const tagged = body.match(/<status[^>]*>([\s\S]*?)<\/status>/i)?.[1]?.trim();
-  if (tagged) return normalizeToolTerminalStatus(tagged);
-  const head = leadingResultBlock(body);
+var ENVELOPE_TAG_HEAD_RE = /^<(?:task-notification|task-id|tool-use-id|output-file|status)[\s>]/i;
+function toolResultEnvelopeStatus(text) {
+  const head = leadingResultBlock(String(text || ""));
+  if (ENVELOPE_TAG_HEAD_RE.test(head.trimStart())) {
+    const tagged = head.match(/<status[^>]*>([\s\S]*?)<\/status>/i)?.[1]?.trim();
+    if (tagged) return normalizeToolTerminalStatus(tagged);
+  }
   const bracketed = head.match(/^\[status:\s*([^\]]*)\]/im)?.[1]?.trim();
   if (bracketed) return normalizeToolTerminalStatus(bracketed);
   const inline = head.match(/^(?:status|state):\s*([^\s·,;]+)/im)?.[1]?.trim();
-  const fromInline = normalizeToolTerminalStatus(inline);
-  if (fromInline) return fromInline;
+  return normalizeToolTerminalStatus(inline);
+}
+function toolResultControlStatus(text) {
+  const body = String(text || "");
   if (isUserControlCancellation(body)) return "cancelled";
   const trimmed = body.trim();
   if (/^(?:cancelled|canceled)$/i.test(trimmed)) return "cancelled";
@@ -37533,6 +37533,9 @@ function toolResultTerminalStatus(text) {
   if (/^the user doesn't want to proceed with this tool use\b/i.test(trimmed)) return "cancelled";
   return "";
 }
+function toolResultTerminalStatus(text) {
+  return toolResultEnvelopeStatus(text) || toolResultControlStatus(text);
+}
 
 // src/runtime/shared/tool-card-model/git-result.mjs
 function gitResultExitCode(text) {
@@ -37548,7 +37551,98 @@ function gitTerminalStatus(text) {
   return "";
 }
 
+// src/runtime/shared/tool-card-model/media-result.mjs
+function parseMediaOutcome(text) {
+  const body = String(text || "").trim();
+  if (!body.startsWith("{")) return null;
+  try {
+    const parsed = JSON.parse(body);
+    if (!parsed || typeof parsed !== "object" || Array.isArray(parsed)) return null;
+    return {
+      ok: parsed.ok !== false,
+      job: String(parsed.job || ""),
+      jobStatus: normalizeToolTerminalStatus(parsed.status),
+      error: typeof parsed.error === "string" ? parsed.error.trim() : "",
+      canceled: parsed.canceled === true
+    };
+  } catch {
+    return null;
+  }
+}
+function mediaTerminalStatus(args, text) {
+  const outcome = parseMediaOutcome(text);
+  if (!outcome) return "";
+  if (!outcome.ok) return "failed";
+  const action = String(args?.action || "").toLowerCase();
+  if (action === "cancel") return outcome.canceled || outcome.jobStatus === "cancelled" ? "cancelled" : "completed";
+  return "completed";
+}
+var JOB_WORDS = /* @__PURE__ */ new Map([
+  ["running", "running"],
+  ["completed", "done"],
+  ["failed", "failed"],
+  ["cancelled", "cancelled"]
+]);
+function mediaResultSummary(args, text) {
+  const outcome = parseMediaOutcome(text);
+  if (!outcome) return null;
+  if (!outcome.ok) return outcome.error || "Failed";
+  const action = String(args?.action || "").toLowerCase();
+  if (action === "cancel" && (outcome.canceled || outcome.jobStatus === "cancelled")) return "Cancelled";
+  if ((action === "status" || action === "cancel") && JOB_WORDS.has(outcome.jobStatus)) {
+    return `Job ${JOB_WORDS.get(outcome.jobStatus)}`;
+  }
+  return null;
+}
+
 // src/runtime/shared/tool-result-summary.mjs
+var keepOriginal = (_key, original) => original;
+var COUNT_KEYS = new Map(
+  [
+    "lines",
+    "matches",
+    "files",
+    "entries",
+    "candidates",
+    "results",
+    "skills",
+    "memories",
+    "messages",
+    "agents",
+    "tasks",
+    "references",
+    "definitions",
+    "symbols",
+    "callers",
+    "callees"
+  ].map((noun) => [noun, `{{count}} ${noun}`])
+);
+var STATUS_KEYS = new Map(
+  ["Completed", "Failed", "Cancelled", "Finished"].map((status) => [status.toLowerCase(), status])
+);
+var TOOL_RESULT_UI_KEYS = Object.freeze([
+  ...COUNT_KEYS.values(),
+  ...STATUS_KEYS.values(),
+  "Image",
+  "No output",
+  "No results",
+  "No agents or tasks",
+  "Exit {{code}}",
+  "Loaded {{name}}",
+  "Used {{name}}"
+]);
+function countLabel(translate, n, singular, plural) {
+  const noun = pluralize(n, singular, plural);
+  const original = `${n} ${noun}`;
+  const key = COUNT_KEYS.get(pluralize(2, singular, plural).toLowerCase());
+  return key ? translate(key, original, { count: n }) : original;
+}
+function exitLabel(translate, code) {
+  return translate("Exit {{code}}", `Exit ${code}`, { code });
+}
+function noOutput(translate) {
+  return translate("No output", "(No Output)");
+}
 function countNonEmptyLines(text) {
   return String(text ?? "").split("\n").filter((line) => line.trim()).length;
 }
@@ -37670,17 +37764,17 @@ function firstAgentResultLine(text) {
   }
   return "";
 }
-function summarizeGenericResult(text) {
+function summarizeGenericResult(text, translate = keepOriginal) {
   const trimmed = String(text ?? "").trim();
   if (!trimmed) return null;
   if (/^(?:undefined|null)$/i.test(trimmed)) return null;
   if (/^[[{]/.test(trimmed)) {
     try {
       const parsed = JSON.parse(trimmed);
-      if (Array.isArray(parsed)) return `${parsed.length} ${pluralize(parsed.length, "item")}`;
+      if (Array.isArray(parsed)) return countLabel(translate, parsed.length, "item");
       if (parsed && typeof parsed === "object") {
         if (parsed.cwd) return truncateSingleLine(parsed.cwd, AGENT_SURFACE_BRIEF_MAX);
-        if (typeof parsed.ok === "boolean") return parsed.ok ? "Ok" : "Failed";
+        if (typeof parsed.ok === "boolean") return parsed.ok ? "Ok" : translate("Failed", "Failed");
         for (const key of [
           "items",
           "results",
@@ -37692,7 +37786,7 @@ function summarizeGenericResult(text) {
           "tools"
         ]) {
           if (Array.isArray(parsed[key]))
-            return `${parsed[key].length} ${pluralize(parsed[key].length, (key.slice(0, -1) || "item").toLowerCase())}`;
+            return countLabel(translate, parsed[key].length, (key.slice(0, -1) || "item").toLowerCase());
         }
         if (firstText(parsed.status, parsed.state)) return null;
         const message = firstText(parsed.result, parsed.message);
@@ -37737,21 +37831,47 @@ function extractErrorCause(resultText) {
     )
   );
   const picked = errorish || lines[0] || "";
-  return truncateSingleLine(stripInlineMarkdown(picked), AGENT_SURFACE_BRIEF_MAX);
+  return truncateSingleLine(stripInlineMarkdown(picked).replace(/^error\s*:\s*/i, ""), AGENT_SURFACE_BRIEF_MAX);
 }
-function summarizeLineCount({ text, trimmed }, { zero, singular, plural }) {
+function summarizeLineCount({ text, trimmed, translate }, { singular, plural }) {
   if (!trimmed || !looksLineOriented(text)) return null;
-  if (looksLikeZeroResultText(text)) return zero;
+  if (looksLikeZeroResultText(text)) return countLabel(translate, 0, singular, plural);
   const n = countNonEmptyLines(text);
   if (n === 0) return null;
-  return `${n} ${pluralize(n, singular, plural)}`;
+  return countLabel(translate, n, singular, plural);
 }
-function summarizeReadResult({ text, trimmed }) {
-  if (/^\[image:/i.test(trimmed)) return "Image";
+function summarizeGrepResult(result) {
+  const { text, trimmed, args, translate } = result;
+  if (!trimmed || !looksLineOriented(text)) return null;
+  if (looksLikeZeroResultText(text)) return countLabel(translate, 0, "match", "matches");
+  const a = parseToolArgs(args);
+  const mode = String(a.output_mode ?? a.mode ?? "").toLowerCase();
+  const rows2 = text.split("\n").map((line) => line.trim()).filter((line) => line && !line.startsWith("[") && !line.startsWith("\u2026"));
+  if (mode === "count") {
+    let matches = 0;
+    let files = 0;
+    for (const row of rows2) {
+      const count = /(?:^|:)(\d+)$/.exec(row);
+      if (!count) continue;
+      matches += Number(count[1]);
+      files += 1;
+    }
+    if (files === 0) return null;
+    const files_ = countLabel(translate, files, "file");
+    return `${countLabel(translate, matches, "match", "matches")} in ${files_}`;
+  }
+  if (mode === "files" || mode === "files_with_matches") {
+    return countLabel(translate, rows2.filter((row) => !row.startsWith("#")).length, "file");
+  }
+  const matchRows = rows2.filter((row) => !/^(?:#|--$)/.test(row) && !/^(?:\d+|[^\s:]+?-\d+)-/.test(row));
+  return matchRows.length ? countLabel(translate, matchRows.length, "match", "matches") : null;
+}
+function summarizeReadResult({ text, trimmed, translate }) {
+  if (/^\[image:/i.test(trimmed)) return translate("Image", "Image");
   if (!trimmed) return null;
-  if (trimmed.startsWith("(no lines in range")) return "0 lines";
+  if (trimmed.startsWith("(no lines in range")) return countLabel(translate, 0, "line");
   const n = text.split("\n").length;
-  return `${n} ${pluralize(n, "line")}`;
+  return countLabel(translate, n, "line");
 }
 function summarizePatchResult({ text, args }) {
   const updateSummary = summarizeUpdateResult(text, args);
@@ -37773,47 +37893,56 @@ function summarizePatchResult({ text, args }) {
   if (a > 0 || r > 0) return `+${a} -${r}`;
   return null;
 }
-function summarizeShellResult({ text, trimmed }) {
-  if (!trimmed) return "(No Output)";
+function summarizeShellResult({ text, trimmed, translate }) {
+  if (!trimmed) return noOutput(translate);
   const job = /^\[(?:task_id|job):\s*([^\]]+)\]/im.exec(text);
   const status = /^\[status:\s*([^\]]+)\]/im.exec(text);
   const exit = /^\[exit(?:\s+code)?:\s*([^\]]+)\]/im.exec(text);
   if (job || status || exit) {
-    return compactParts([job ? job[1] : "", status ? titleStatus(status[1]) : "", exit ? `Exit ${exit[1]}` : ""]);
+    let statusText2 = "";
+    if (status) {
+      statusText2 = titleStatus(status[1]);
+      const statusKey = STATUS_KEYS.get(statusText2.toLowerCase());
+      if (statusKey) statusText2 = translate(statusKey, statusText2);
+    }
+    return compactParts([job ? job[1] : "", statusText2, exit ? exitLabel(translate, exit[1]) : ""]);
   }
   const firstLine = trimmed.split("\n").map((line) => line.trim()).find(Boolean) || trimmed;
   return truncateSingleLine(firstLine, AGENT_SURFACE_BRIEF_MAX);
 }
-function summarizeGitResult({ text, trimmed }) {
+function summarizeGitResult({ text, trimmed, translate }) {
   const exit = gitResultExitCode(text);
-  if (exit !== null) return `Exit ${exit}`;
+  if (exit !== null) return exitLabel(translate, exit);
   const error = gitResultError(text);
   if (error) return truncateSingleLine(error, AGENT_SURFACE_BRIEF_MAX);
-  if (!trimmed) return "(No Output)";
+  if (!trimmed) return noOutput(translate);
   if (trimmed.startsWith("{")) {
     try {
       const stored = JSON.parse(trimmed);
-      if (typeof stored.ok === "boolean") return summarizeGenericResult(text);
+      if (typeof stored.ok === "boolean") return summarizeGenericResult(text, translate);
     } catch {
     }
   }
   const firstLine = text.split("\n").find((line) => line.trim() && !/^## .*git(?:\.exe)?(?:\s|$)/i.test(line));
-  return firstLine ? truncateSingleLine(firstLine, AGENT_SURFACE_BRIEF_MAX) : "(No Output)";
+  return firstLine ? truncateSingleLine(firstLine, AGENT_SURFACE_BRIEF_MAX) : noOutput(translate);
 }
-function summarizeCodeGraphResult({ text }) {
+function summarizeCodeGraphResult({ text, translate }) {
   const match = /(\d+)\s+(references|definitions|symbols|callers|callees|results|matches)/i.exec(text);
-  if (match) return `${match[1]} ${String(match[2]).toLowerCase()}`;
-  if (looksLikeZeroResultText(text)) return "No results";
+  if (match) {
+    const noun = String(match[2]).toLowerCase();
+    return translate(COUNT_KEYS.get(noun), `${match[1]} ${noun}`, { count: Number(match[1]) });
+  }
+  if (looksLikeZeroResultText(text)) return translate("No results", "No results");
   return null;
 }
-function summarizeFetchResult({ text, trimmed, args, normalized }) {
+function summarizeFetchResult({ text, trimmed, args, normalized, translate }) {
   if (normalized === "fetch") {
     const a = parseToolArgs(args);
     const isChannelFetch = !firstText(a.url, a.uri) && Boolean(firstText(a.channel, a.channelId, a.chatId, a.messageId) || a.limit != null);
     if (isChannelFetch) {
       const n = countNonEmptyLines(text);
-      if (trimmed && looksLineOriented(text) && n > 0) return `${n} ${pluralize(n, "message")}`;
-      return summarizeGenericResult(text);
+      if (trimmed && looksLineOriented(text) && n > 0) return countLabel(translate, n, "message");
+      return summarizeGenericResult(text, translate);
     }
   }
   const status = /(?:HTTP[\s/]*\d?\.?\d?\s*|status[:\s]+)([1-5]\d{2})\b/i.exec(text) || /\b([1-5]\d{2})\s+(?:OK|Not\s+Found|Forbidden|Moved|Found|Created|No\s+Content|Bad\s+Request|Unauthorized|Internal)/.exec(
@@ -37825,72 +37954,68 @@ function summarizeFetchResult({ text, trimmed, args, normalized }) {
   if (status) return `HTTP ${status[1]}`;
   return null;
 }
-function summarizeSearchResult({ text, trimmed }) {
+function summarizeSearchResult({ text, trimmed, translate }) {
   const match = /(\d+)\s+results?/i.exec(text);
-  if (match) {
-    const n = Number(match[1]);
-    return `${n} ${pluralize(n, "result")}`;
-  }
+  if (match) return countLabel(translate, Number(match[1]), "result");
   return trimmed ? firstAgentResultLine(text) || null : null;
 }
-function summarizeMemoryResult({ text, trimmed }) {
-  if (!trimmed || trimmed === "(no results)" || looksLikeZeroResultText(text)) return "No Results";
+function summarizeMemoryResult({ text, trimmed, translate }) {
+  if (!trimmed || trimmed === "(no results)" || looksLikeZeroResultText(text)) {
+    return translate("No results", "No Results");
+  }
   let n = 0;
   for (const line of text.split("\n")) {
     if (/#\d+\s*$/.test(line)) n += 1;
   }
-  if (n > 0) return `${n} ${pluralize(n, "Memory", "Memories")}`;
-  return summarizeGenericResult(text);
+  if (n > 0) return countLabel(translate, n, "Memory", "Memories");
+  return summarizeGenericResult(text, translate);
 }
-function summarizeSkillResult({ text, trimmed, args, normalized }) {
+function summarizeSkillResult({ text, trimmed, args, normalized, translate }) {
   const parsedArgs = parseToolArgs(args);
   const target = firstText(parsedArgs.name, parsedArgs.skill, parsedArgs.skill_name);
   if (normalized === "skills_list") {
     const count = /(\d+)\s+skills?/i.exec(text);
-    if (count) return `${Number(count[1]) || count[1]} ${pluralize(Number(count[1]) || 0, "skill")}`;
+    if (count) return countLabel(translate, Number(count[1]) || 0, "skill");
     const lines = countNonEmptyLines(text);
-    return lines > 0 ? `${lines} ${pluralize(lines, "skill")}` : null;
+    return lines > 0 ? countLabel(translate, lines, "skill") : null;
   }
   if (target) {
     const verb = normalized === "skill" || normalized === "skill_view" ? "Loaded" : "Used";
-    return `${verb} ${truncateToolText(target, 80)}`;
+    const name = truncateToolText(target, 80);
+    return translate(`${verb} {{name}}`, `${verb} ${name}`, { name });
   }
   return trimmed ? firstAgentResultLine(text) || null : null;
 }
-function summarizeAgentCounts(text) {
-  if (/^\(no agents or tasks\)$/im.test(text)) return "No agents or tasks";
+function summarizeAgentCounts(text, translate = keepOriginal) {
+  const none = () => translate("No agents or tasks", "No agents or tasks");
+  if (/^\(no agents or tasks\)$/im.test(text)) return none();
   const agentsCount = /^agents:\s*(\d+)/im.exec(text);
   const tasksCount = /^tasks:\s*(\d+)/im.exec(text);
   if (!agentsCount && !tasksCount) return null;
   const a = agentsCount ? Number(agentsCount[1]) : 0;
   const t = tasksCount ? Number(tasksCount[1]) : 0;
   const parts = [];
-  if (agentsCount) parts.push(`${a} ${pluralize(a, "agent")}`);
-  if (tasksCount && t > 0) parts.push(`${t} ${pluralize(t, "task")}`);
-  return compactParts(parts) || "No agents or tasks";
+  if (agentsCount) parts.push(countLabel(translate, a, "agent"));
+  if (tasksCount && t > 0) parts.push(countLabel(translate, t, "task"));
+  return compactParts(parts) || none();
 }
-function summarizeAgentResult({ text }) {
-  const counts = summarizeAgentCounts(text);
+function summarizeAgentResult({ text, translate }) {
+  const counts = summarizeAgentCounts(text, translate);
   if (counts) return counts;
   const answerLine = firstAgentResultLine(text);
   if (answerLine) return truncateSingleLine(stripInlineMarkdown(answerLine), AGENT_SURFACE_BRIEF_MAX);
   return null;
 }
-var summarizeGeneric = ({ text }) => summarizeGenericResult(text);
+var summarizeGeneric = ({ text, translate }) => summarizeGenericResult(text, translate);
 var TOOL_RESULT_SUMMARIZERS = new Map(
   [
     [["read", "view_image", "read_mcp_resource"], summarizeReadResult],
     [["apply_patch"], summarizePatchResult],
-    [["grep"], (result) => summarizeLineCount(result, { zero: "0 matches", singular: "match", plural: "matches" })],
-    [["glob"], (result) => summarizeLineCount(result, { zero: "0 files", singular: "file", plural: "files" })],
-    [
-      ["find"],
-      (result) => summarizeLineCount(result, { zero: "0 candidates", singular: "candidate", plural: "candidates" })
-    ],
-    [
-      ["list", "ls"],
-      (result) => summarizeLineCount(result, { zero: "0 entries", singular: "entry", plural: "entries" })
-    ],
+    [["grep"], summarizeGrepResult],
+    [["media"], ({ args, text }) => mediaResultSummary(parseToolArgs(args), text)],
+    [["glob"], (result) => summarizeLineCount(result, { singular: "file", plural: "files" })],
+    [["find"], (result) => summarizeLineCount(result, { singular: "candidate", plural: "candidates" })],
+    [["list", "ls"], (result) => summarizeLineCount(result, { singular: "entry", plural: "entries" })],
     [["shell", "bash", "bash_session", "shell_command", "job_wait"], summarizeShellResult],
     [["git"], summarizeGitResult],
     [["code_graph"], summarizeCodeGraphResult],
@@ -37914,12 +38039,12 @@ var TOOL_RESULT_SUMMARIZERS = new Map(
     [["agent", "task"], summarizeAgentResult]
   ].flatMap(([names, summarize]) => names.map((name) => [name, summarize]))
 );
-function summarizeToolResult(name, args, resultText, isError = false) {
+function summarizeToolResult(name, args, resultText, isError = false, translate = keepOriginal) {
   const notification = parseTaskNotification(resultText);
   if (notification) {
     if (isError) return notification.error || notification.summary;
     if (notification.surface === "shell") return notification.summary;
-    return summarizeToolResult(name, args, notification.result, false);
+    return summarizeToolResult(name, args, notification.result, false, translate);
   }
   if (isError) {
     return extractErrorCause(resultText) || null;
@@ -37930,7 +38055,7 @@ function summarizeToolResult(name, args, resultText, isError = false) {
   if (isMcpToolName(name)) return trimmed ? firstAgentResultLine(text) || null : null;
   const normalized = normalizeToolName(name);
   const summarize = TOOL_RESULT_SUMMARIZERS.get(normalized);
-  return summarize ? summarize({ text, trimmed, args, normalized }) : null;
+  return summarize ? summarize({ text, trimmed, args, normalized, translate }) : null;
 }
 function truncateAgentSurfaceBrief(value, max = AGENT_SURFACE_BRIEF_MAX) {
   const text = String(value ?? "").replace(/\s+/g, " ").trim();
@@ -37942,6 +38067,10 @@ function summarizeAgentSurfaceBrief(name, args, resultText, { isError = false, i
   const a = parseToolArgs(args);
   const action = String(a?.type || a?.action || "").toLowerCase();
   const text = String(resultText ?? "").trim();
+  if (isError && text) {
+    const cause = extractErrorCause(text);
+    if (cause) return truncateAgentSurfaceBrief(cause);
+  }
   if (isResponse && text) {
     const fromResult = summarizeToolResult(name, args, text, isError);
     if (fromResult) return truncateAgentSurfaceBrief(stripInlineMarkdown(fromResult));
@@ -37976,6 +38105,7 @@ var CATEGORY_ORDER = [
   "Setup",
   "Browser",
   "Computer",
+  "Terminal",
   "Office",
   "Media",
   "Tidy",
@@ -38024,12 +38154,15 @@ var TOOL_CATEGORY = /* @__PURE__ */ new Map([
   ["browser", "Browser"],
   ["browser_devtools", "Browser"],
   ["computer", "Computer"],
+  ["terminal", "Terminal"],
   ["office", "Office"],
   ["media", "Media"],
   ["tidy", "Tidy"],
   ["list_mcp_resources", "Setup"],
   ["list_mcp_resource_templates", "Setup"],
   ["cwd", "Setup"],
+  ["setup", "Setup"],
+  ["goal", "Setup"],
   ["request_user_input", "Setup"],
   ["update_plan", "Setup"],
   ["skill", "Skill"],
@@ -38060,6 +38193,7 @@ var CATEGORY_COPY = /* @__PURE__ */ new Map([
   ["Setup", { active: "Setting up", done: "Set up", noun: "item" }],
   ["Browser", { active: "Browsing", done: "Browsed", noun: "action" }],
   ["Computer", { active: "Operating", done: "Operated", noun: "action" }],
+  ["Terminal", { active: "Reading", done: "Read", noun: "terminal output" }],
   ["Office", { active: "Editing", done: "Edited", noun: "document action" }],
   ["Media", { active: "Generating", done: "Generated", noun: "media action" }],
   ["Tidy", { active: "Tidying", done: "Tidied", noun: "cleanup pass" }],
@@ -38076,7 +38210,9 @@ function unitDescriptor(category, overrides = {}) {
     done: overrides.done || copy.done,
     noun: overrides.noun || copy.noun || "item",
     pluralNoun: overrides.pluralNoun || copy.pluralNoun || `${overrides.noun || copy.noun || "item"}s`,
-    count: Math.max(1, Number(overrides.count || 1))
+    count: Math.max(1, Number(overrides.count || 1)),
+    // An effect unit changes state: a failed call must not claim its done verb.
+    effect: overrides.effect === true
   };
 }
 function queryCount(args, ...keys) {
@@ -38131,7 +38267,8 @@ function patchMutationUnits(args = {}) {
       count,
       active: copy[kind]?.active || "Editing",
       done: copy[kind]?.done || "Edited",
-      noun: "file"
+      noun: "file",
+      effect: true
     })
   );
 }
@@ -38142,7 +38279,8 @@ function applyPatchUnit(a) {
     count: units.reduce((total, unit) => total + unit.count, 0),
     active: "Changing",
     done: "Changed",
-    noun: "file"
+    noun: "file",
+    effect: true
   });
 }
 function listUnit(a) {
@@ -38156,11 +38294,12 @@ function listUnit(a) {
 }
 function loadToolUnit(a) {
   const selected = [...splitToolSearchSelection(a.names), ...splitToolSearchSelection(a.select)];
-  if (selected.length) return unitDescriptor("Load", { count: selected.length, noun: "tool" });
+  if (selected.length) return unitDescriptor("Load", { count: selected.length, noun: "tool", effect: true });
   return unitDescriptor("Load", {
     count: queryCount(a, "query", "q", "text") || 1,
     noun: "query",
-    pluralNoun: "queries"
+    pluralNoun: "queries",
+    effect: true
   });
 }
 function webSearchUnit(a) {
@@ -38171,14 +38310,162 @@ function webSearchUnit(a) {
   });
 }
 function mediaUnit(a) {
-  if (a.action !== "generate") {
-    return unitDescriptor("Media", { count: 1, active: "Checking", done: "Checked", noun: "media action" });
+  const action = String(a.action || "").toLowerCase();
+  if (action === "generate") {
+    const noun = a.kind === "video" ? "video" : "image";
+    return unitDescriptor("Media", { count: 1, active: "Generating", done: "Generated", noun, effect: true });
+  }
+  if (action === "cancel") {
+    return unitDescriptor("Media", {
+      count: 1,
+      active: "Cancelling",
+      done: "Cancelled",
+      noun: "media job",
+      effect: true
+    });
+  }
+  if (action === "list") {
+    return unitDescriptor("Media", { count: 1, active: "Listing", done: "Listed", noun: "media catalog" });
   }
-  const noun = a.kind === "video" ? "video" : "image";
-  return unitDescriptor("Media", { count: 1, active: "Generating", done: "Generated", noun });
+  return unitDescriptor("Media", { count: 1, active: "Checking", done: "Checked", noun: "media job" });
 }
 function tidyUnit(a) {
-  return a.action === "fix" ? unitDescriptor("Tidy", { count: 1, active: "Tidying", done: "Tidied", noun: "cleanup pass" }) : unitDescriptor("Tidy", { count: 1, active: "Checking", done: "Checked", noun: "cleanup action" });
+  const action = String(a.action || "").toLowerCase();
+  if (action === "install") {
+    return unitDescriptor("Tidy", {
+      count: 1,
+      active: "Installing",
+      done: "Installed",
+      noun: "cleanup engine",
+      effect: true
+    });
+  }
+  if (action === "fix") {
+    return a.apply === true ? unitDescriptor("Tidy", { count: 1, active: "Tidying", done: "Tidied", noun: "cleanup pass", effect: true }) : unitDescriptor("Tidy", { count: 1, active: "Previewing", done: "Previewed", noun: "cleanup pass" });
+  }
+  if (action === "scan") {
+    return unitDescriptor("Tidy", { count: 1, active: "Scanning", done: "Scanned", noun: "project" });
+  }
+  if (action === "rules" || action === "results") {
+    return unitDescriptor("Tidy", { count: 1, active: "Reading", done: "Read", noun: `cleanup ${action}` });
+  }
+  return unitDescriptor("Tidy", { count: 1, active: "Checking", done: "Checked", noun: "cleanup action" });
+}
+var OFFICE_READ_ACTIONS = /* @__PURE__ */ new Set([
+  "snapshot",
+  "get",
+  "query",
+  "describe",
+  "detect",
+  "issues",
+  "qa",
+  "validate",
+  "render",
+  "diff",
+  "transactions"
+]);
+var OFFICE_ACTION_VERBS = /* @__PURE__ */ new Map([
+  ["author", ["Authoring", "Authored"]],
+  ["batch", ["Editing", "Edited"]],
+  ["create", ["Creating", "Created"]],
+  ["attach", ["Attaching", "Attached"]],
+  ["open", ["Opening", "Opened"]],
+  ["secure", ["Securing", "Secured"]],
+  ["begin", ["Starting", "Started"]],
+  ["commit", ["Committing", "Committed"]],
+  ["rollback", ["Rolling back", "Rolled back"]],
+  ["recover", ["Recovering", "Recovered"]],
+  ["save", ["Saving", "Saved"]],
+  ["finalize", ["Finalizing", "Finalized"]],
+  ["close", ["Closing", "Closed"]]
+]);
+function officeUnit(a) {
+  const action = String(a.action || "").toLowerCase();
+  if (OFFICE_READ_ACTIONS.has(action)) {
+    return unitDescriptor("Office", { count: 1, active: "Reading", done: "Read", noun: "document action" });
+  }
+  const [active, done] = OFFICE_ACTION_VERBS.get(action) || ["Editing", "Edited"];
+  return unitDescriptor("Office", { count: 1, active, done, noun: "document action", effect: true });
+}
+function terminalUnit(a) {
+  return String(a.action || "").toLowerCase() === "list" ? unitDescriptor("Terminal", { count: 1, active: "Listing", done: "Listed", noun: "terminal tab" }) : unitDescriptor("Terminal", { count: 1, active: "Reading", done: "Read", noun: "terminal output" });
+}
+var GITHUB_VERBS = /* @__PURE__ */ new Map([
+  ["list", ["Listing", "Listed"]],
+  ["view", ["Viewing", "Viewed"]],
+  ["comments", ["Reading", "Read"]],
+  ["logs", ["Reading", "Read"]],
+  ["create", ["Creating", "Created"]],
+  ["edit", ["Editing", "Edited"]],
+  ["close", ["Closing", "Closed"]],
+  ["reopen", ["Reopening", "Reopened"]],
+  ["comment", ["Commenting on", "Commented on"]],
+  ["merge", ["Merging", "Merged"]],
+  ["review", ["Reviewing", "Reviewed"]],
+  ["checkout", ["Checking out", "Checked out"]],
+  ["clone", ["Cloning", "Cloned"]],
+  ["fork", ["Forking", "Forked"]],
+  ["run", ["Running", "Ran"]],
+  ["rerun", ["Rerunning", "Reran"]],
+  ["cancel", ["Cancelling", "Cancelled"]],
+  ["read", ["Marking read", "Marked read"]]
+]);
+var GITHUB_READ_VERBS = /* @__PURE__ */ new Set(["list", "view", "comments", "logs"]);
+function githubActionParts(action) {
+  const [noun = "", verb = ""] = String(action || "").toLowerCase().split(".");
+  return { noun, verb };
+}
+function githubUnit(a) {
+  const { noun, verb } = githubActionParts(a.action);
+  const [active, done] = GITHUB_VERBS.get(verb) || ["Running", "Ran"];
+  if (!noun || !GITHUB_VERBS.has(verb)) {
+    return unitDescriptor("Git", { count: 1, noun: "GitHub operation" });
+  }
+  const label = noun === "pr" ? "PR" : noun;
+  return unitDescriptor("Git", {
+    count: 1,
+    active,
+    done,
+    noun: label,
+    effect: !GITHUB_READ_VERBS.has(verb)
+  });
+}
+function goalUnit(a) {
+  const action = String(a.action || "").toLowerCase();
+  const verbs = {
+    status: ["Checking", "Checked"],
+    create: ["Creating", "Created"],
+    pause: ["Pausing", "Paused"],
+    resume: ["Resuming", "Resumed"],
+    set_tasks: ["Planning", "Planned"],
+    update_tasks: ["Updating", "Updated"],
+    complete: ["Completing", "Completed"],
+    block: ["Blocking", "Blocked"],
+    abandon: ["Abandoning", "Abandoned"]
+  }[action] || ["Updating", "Updated"];
+  return unitDescriptor("Setup", {
+    count: 1,
+    active: verbs[0],
+    done: verbs[1],
+    noun: "goal",
+    effect: action !== "status"
+  });
+}
+var SETUP_VERB_PREFIXES = [
+  [/^status$/, ["Checking", "Checked", false]],
+  [/^open$/, ["Opening", "Opened", false]],
+  [/^(?:search|inspect|local_model_details)/, ["Inspecting", "Inspected", false]],
+  [/^(?:install|start)_/, ["Installing", "Installed", true]],
+  [/^(?:add|register|save)_/, ["Adding", "Added", true]],
+  [/^(?:remove|delete|forget)_/, ["Removing", "Removed", true]],
+  [/^cancel_/, ["Cancelling", "Cancelled", true]],
+  [/^(?:reconnect|enable|maintain|update)_/, ["Updating", "Updated", true]]
+];
+function setupUnit(a) {
+  const action = String(a.action || "").toLowerCase();
+  const match = SETUP_VERB_PREFIXES.find(([re]) => re.test(action));
+  const [active, done, effect] = match ? match[1] : ["Changing", "Changed", true];
+  return unitDescriptor("Setup", { count: 1, active, done, noun: "setting", effect });
 }
 function fetchUnit(a) {
   const fetchLimit = Number(a.limit ?? a.messages);
@@ -38192,7 +38479,7 @@ function fetchUnit(a) {
 }
 function memoryReadUnit(a) {
   return unitDescriptor("Memory", {
-    count: queryCount(a, "query", "queries", "text", "input") || 1,
+    count: queryCount(a, "query", "queries", "text", "input", "id") || 1,
     noun: "memory item",
     pluralNoun: "memory items"
   });
@@ -38202,17 +38489,26 @@ function memoryWriteUnit(a) {
     count: queryCount(a, "entries", "items", "memories", "query", "text", "value") || 1,
     active: "Writing",
     done: "Wrote",
-    noun: "memory item"
+    noun: "memory item",
+    effect: true
   });
 }
 function memoryToolUnit(a) {
-  const op = String(a.op || "").toLowerCase();
-  const isMutation = op === "add" || op === "edit" || op === "delete";
-  if (isMutation) return memoryWriteUnit(a);
+  const op = String(a.op || a.action || "").toLowerCase();
+  if (op === "delete") {
+    return unitDescriptor("Memory", {
+      count: queryCount(a, "id", "ids") || 1,
+      active: "Deleting",
+      done: "Deleted",
+      noun: "memory item",
+      effect: true
+    });
+  }
+  if (op === "add" || op === "edit") return memoryWriteUnit(a);
   return unitDescriptor("Memory", {
     count: queryCount(a, "entries", "items", "memories", "query", "text", "value") || 1,
-    active: "Checking",
-    done: "Checked",
+    active: op === "list" ? "Listing" : "Checking",
+    done: op === "list" ? "Listed" : "Checked",
     noun: "memory item"
   });
 }
@@ -38232,6 +38528,9 @@ function agentUnit(a) {
     }
     return unitDescriptor("Agent", { count, active: "Finishing", done: "Completed", noun: "agent" });
   }
+  if (/^(?:status|read|list)$/.test(type)) {
+    return unitDescriptor("Agent", { count, active: "Checking", done: "Checked", noun: "agent" });
+  }
   return unitDescriptor("Agent", { count, noun: "agent" });
 }
 function taskUnit(a) {
@@ -38248,7 +38547,8 @@ function taskUnit(a) {
 function skillUnit(a) {
   return unitDescriptor("Skill", {
     count: queryCount(a, "name", "skill", "skill_name", "query", "q") || 1,
-    noun: "skill"
+    noun: "skill",
+    effect: true
   });
 }
 function codeGraphUnit(a) {
@@ -38270,13 +38570,24 @@ function gitStageUnit(a) {
     count: queryCount(a, "change_ids", "change_id") || 1,
     active: "Staging",
     done: "Staged",
-    noun: "change"
+    noun: "change",
+    effect: true
   });
 }
 function cwdUnit(a) {
   const action = String(a.action || a.type || "").toLowerCase();
-  const verbs = action === "set" ? { active: "Setting", done: "Set" } : { active: "Checking", done: "Checked" };
-  return unitDescriptor("Setup", { ...verbs, noun: "working directory", pluralNoun: "working directories" });
+  if (action === "set" || !action && a.path) {
+    return unitDescriptor("Setup", {
+      active: "Selecting",
+      done: "Selected",
+      noun: "project",
+      effect: true
+    });
+  }
+  if (action === "list") {
+    return unitDescriptor("Setup", { active: "Listing", done: "Listed", noun: "project" });
+  }
+  return unitDescriptor("Setup", { active: "Checking", done: "Checked", noun: "working directory", pluralNoun: "working directories" });
 }
 var TOOL_UNITS = /* @__PURE__ */ new Map([
   [
@@ -38340,7 +38651,10 @@ var TOOL_UNITS = /* @__PURE__ */ new Map([
   ["browser", browserUnit],
   ["browser_devtools", browserUnit],
   ["computer", () => unitDescriptor("Computer", { count: 1, active: "Operating", done: "Operated", noun: "action" })],
-  ["office", () => unitDescriptor("Office", { count: 1, active: "Editing", done: "Edited", noun: "document action" })],
+  ["terminal", terminalUnit],
+  ["office", officeUnit],
+  ["goal", goalUnit],
+  ["setup", setupUnit],
   ["media", mediaUnit],
   ["tidy", tidyUnit],
   ["fetch", fetchUnit],
@@ -38360,7 +38674,7 @@ var TOOL_UNITS = /* @__PURE__ */ new Map([
     "git",
     (a) => a.action === "stage" ? gitStageUnit(a) : unitDescriptor("Git", { count: queryCount(a, "command", "commands") || 1, noun: "Git command" })
   ],
-  ["github", () => unitDescriptor("Git", { count: 1, noun: "GitHub operation" })],
+  ["github", githubUnit],
   // Preserve the staging work unit when rendering historical transcripts.
   ["git_stage", gitStageUnit],
   ["agent", agentUnit],
@@ -38448,6 +38762,8 @@ function displayToolName(name, args = {}) {
       return "Browser";
     case "computer":
       return "Computer";
+    case "terminal":
+      return "Terminal";
     case "office":
       return "Office";
     case "media":
@@ -38535,6 +38851,13 @@ function summarizeToolArgs(name, args, { max = DEFAULT_SUMMARY_MAX } = {}) {
       return truncateCommand(a.description || a.command || a.cmd || "", max);
     case "task":
       return compactParts([a.action || a.type || "task", a.task_id || ""]);
+    case "git":
+      if (a.action === "stage") return formatCountedUnit(collectionCount(a.change_ids, a.change_id), "change");
+      return genericArgsSummary(a, max);
+    case "github":
+      return summarizeGithub(a, max);
+    case "goal":
+      return compactParts([String(a.action || ""), truncateToolText(a.objective, max)]);
     case "list":
     case "ls":
       if (Array.isArray(a.path) || Array.isArray(a.dir) || Array.isArray(a.cwd)) {
@@ -38591,7 +38914,10 @@ function summarizeToolArgs(name, args, { max = DEFAULT_SUMMARY_MAX } = {}) {
     case "browser":
     case "browser_devtools": {
       const call = bridgeToolCall(args);
-      return compactParts([call.action, pathOrId(call.input.url, call.input.ref, max)]);
+      const { input } = call;
+      const action = input.operation ? [call.action, input.operation].filter(Boolean).join(" ") : call.action;
+      const tab2 = input.tab != null && String(input.tab).trim() ? ` (tab ${String(input.tab).trim()})` : "";
+      return `${compactParts([action, pathOrId(input.url, input.ref ?? input.selector, max)])}${tab2}`.trim();
     }
     case "computer": {
       const call = bridgeToolCall(args);
@@ -38603,6 +38929,8 @@ function summarizeToolArgs(name, args, { max = DEFAULT_SUMMARY_MAX } = {}) {
         )
       ]);
     }
+    case "terminal":
+      return compactParts([String(a.action || ""), a.tab ? `tab ${a.tab}` : ""]);
     case "office":
       return compactParts([String(a.action || ""), pathOrId(a.path, a.session, max)]);
     case "media":
@@ -38620,11 +38948,28 @@ function summarizeToolArgs(name, args, { max = DEFAULT_SUMMARY_MAX } = {}) {
     case "list_mcp_resource_templates":
       return a.server ? `server "${truncateToolText(a.server, max)}"` : "all servers";
     case "cwd":
-      return truncateToolText(firstText(a.path, a.cwd, a.dir), max);
+      return compactParts([String(a.action || a.type || ""), truncateToolText(firstText(a.path, a.cwd, a.dir), max)]);
     case "setup":
       return compactParts([
         String(a.action || ""),
-        truncateToolText(firstText(a.domain, a.target, a.name, a.agent, a.workflow, a.style), max)
+        truncateToolText(
+          firstText(
+            a.domain,
+            a.target,
+            a.name,
+            a.server?.name,
+            a.modelId,
+            a.workflow,
+            a.style,
+            a.profile,
+            a.source,
+            a.query,
+            a.repository,
+            a.jobId,
+            a.agent
+          ),
+          max
+        )
       ]);
     case "memory":
     case "remember":
@@ -38636,11 +38981,17 @@ function summarizeToolArgs(name, args, { max = DEFAULT_SUMMARY_MAX } = {}) {
         truncateToolText(firstText(a.query, a.summary, a.element, a.key, a.name, a.text, a.value), Math.min(max, 80))
       ]);
     case "recall":
-    case "search_memories":
+    case "search_memories": {
+      const ids = (Array.isArray(a.id) ? a.id : [a.id]).filter((id) => id != null && id !== "");
+      const queries = (Array.isArray(a.query) ? a.query : [a.query ?? a.text ?? a.input]).filter(
+        (query) => query != null && String(query).trim()
+      );
       return compactParts([
-        quoted(firstText(a.query, a.text, a.input), max),
+        ids.length ? ids.map((id) => `#${id}`).join(", ") : "",
+        queries.length > 1 ? formatCountedUnit(queries.length, "query", "queries") : quoted(queries[0], max),
         a.limit || a.topK ? `top ${a.limit ?? a.topK}` : ""
       ]);
+    }
     case "bridge":
     case "agent": {
       const agentModel = bridgeAgentModelSummary(a);
@@ -38660,25 +39011,45 @@ function summarizeToolArgs(name, args, { max = DEFAULT_SUMMARY_MAX } = {}) {
         firstText(a.name, a.skill, a.skill_name, a.query, a.q, normalized === "skills_list" ? "all skills" : ""),
         max
       );
-    default: {
-      const primary = firstText(a.name, a.skill, a.query, a.title, a.path, a.file, a.target, a.id, a.action);
-      if (primary) return truncateToolText(primary, Math.min(max, 80));
-      const keys = Object.keys(a).slice(0, 2);
-      const pairs = keys.map((key) => {
-        const value = a[key];
-        if (value == null || typeof value === "object") return "";
-        const text = truncateToolText(value, 40);
-        return text ? `${key}=${text}` : "";
-      }).filter(Boolean);
-      return compactParts(pairs);
-    }
-  }
+    default:
+      return genericArgsSummary(a, max);
+  }
+}
+function genericArgsSummary(a, max) {
+  const primary = firstText(a.name, a.skill, a.query, a.title, a.path, a.file, a.target, a.id, a.action);
+  if (primary) return truncateToolText(primary, Math.min(max, 80));
+  const keys = Object.keys(a).slice(0, 2);
+  const pairs = keys.map((key) => {
+    const value = a[key];
+    if (value == null || typeof value === "object") return "";
+    const text = truncateToolText(value, 40);
+    return text ? `${key}=${text}` : "";
+  }).filter(Boolean);
+  return compactParts(pairs);
+}
+var GITHUB_PHRASES = /* @__PURE__ */ new Map([
+  ["comments", (noun) => `Read ${noun} comments`],
+  ["logs", (noun) => `Read ${noun} logs`],
+  ["comment", (noun) => `Comment on ${noun}`],
+  ["read", (noun) => `Mark ${noun} read`]
+]);
+function summarizeGithub(a, max) {
+  const { noun, verb } = githubActionParts(a.action);
+  if (!noun || !verb) return truncateToolText(firstText(a.action, a.repo), max);
+  const object = noun === "pr" ? "PR" : noun;
+  const phrase = GITHUB_PHRASES.get(verb)?.(object) ?? `${titleWord(verb)} ${object}`;
+  const repo = firstText(a.repo);
+  const id = a.number ?? a.id;
+  const hasId = id != null && String(id).trim() !== "";
+  const title = truncateToolText(firstText(a.title, a.workflow, a.tag), Math.min(max, 60));
+  return hasId ? compactParts([`${phrase} ${String(id).trim()}`, repo, title]) : compactParts([repo ? `${phrase} ${repo}` : phrase, title]);
 }
 function formatToolSurface(name, args, opts = {}) {
   const parsed = parseToolArgs(args);
   return {
     label: displayToolName(name, parsed),
-    summary: summarizeToolArgs(name, parsed, opts),
+    // The raw args: bridge tools keep their action beside the nested `input`.
+    summary: summarizeToolArgs(name, args, opts),
     normalizedName: normalizeToolName(name),
     args: parsed
   };
@@ -38710,15 +39081,17 @@ function lifecycleVerb(unit, pending, { stableVerbWidth = false } = {}) {
   if (!stableVerbWidth) return verb;
   return verb.padEnd(Math.max(active.length, done.length), " ");
 }
-function formatToolActionHeader(name, args = {}, { pending = false, count = 1, category = "", stableVerbWidth = false } = {}) {
+function formatToolActionHeader(name, args = {}, { pending = false, count = 1, category = "", stableVerbWidth = false, failed = false } = {}) {
   const loadingTargets = toolLoadingTargets(name, args);
   if (loadingTargets.length) {
+    if (failed && !pending) return `Failed while loading ${loadingTargets.join(", ")}`;
     return `${pending ? "Loading" : "Loaded"} ${loadingTargets.join(", ")}`;
   }
   const unit = toolWorkUnit(name, args, category);
   const n = Math.max(1, Number(unit.count || count || 1));
-  const verb = lifecycleVerb(unit, pending, { stableVerbWidth });
-  return `${verb} ${n} ${pluralize(n, unit.noun, unit.pluralNoun)}`;
+  const object = `${n} ${pluralize(n, unit.noun, unit.pluralNoun)}`;
+  if (failed && !pending && unit.effect) return `Failed while ${String(unit.active).toLowerCase()} ${object}`;
+  return `${lifecycleVerb(unit, pending, { stableVerbWidth })} ${object}`;
 }
 function aggregateCount(value) {
   if (value && typeof value === "object") return Math.max(0, Number(value.count || 0));
@@ -38735,7 +39108,8 @@ function aggregateDescriptor(key, value) {
       done: value.done || copy2.done,
       noun: noun2,
       pluralNoun: value.pluralNoun || copy2.pluralNoun || `${noun2}s`,
-      count: aggregateCount(value)
+      count: aggregateCount(value),
+      effect: value.effect === true
     };
   }
   const category = String(key || "");
@@ -38750,7 +39124,7 @@ function aggregateDescriptor(key, value) {
     count: aggregateCount(value)
   };
 }
-function formatAggregateHeader(categories, { pending = false, order = null, stableVerbWidth = false } = {}) {
+function formatAggregateHeader(categories, { pending = false, order = null, stableVerbWidth = false, failed = false } = {}) {
   const categoryKeys = Object.keys(categories || {});
   const preferred = Array.isArray(order) && order.length ? order : categoryKeys;
   const seen = /* @__PURE__ */ new Set();
@@ -38765,8 +39139,9 @@ function formatAggregateHeader(categories, { pending = false, order = null, stab
   for (const cat of Object.keys(categories || {})) add(cat);
   return ordered.map((cat) => {
     const item = aggregateDescriptor(cat, categories[cat]);
-    const label = lifecycleVerb(item, pending, { stableVerbWidth });
-    return `${label} ${item.count} ${pluralize(item.count, item.noun, item.pluralNoun)}`;
+    const object = `${item.count} ${pluralize(item.count, item.noun, item.pluralNoun)}`;
+    if (failed && !pending && item.effect) return `Failed while ${String(item.active).toLowerCase()} ${object}`;
+    return `${lifecycleVerb(item, pending, { stableVerbWidth })} ${object}`;
   }).join(", ");
 }
 function pathOrId(path2, id, max) {
@@ -39340,15 +39715,23 @@ function unwrap(value) {
   const code = String(nested?.code || nested?.type || envelope?.code || "");
   return { raw, message, status, code };
 }
+function isRejected429(value) {
+  return /\bAPI 429 request rejected\b/.test(messageOf2(value));
+}
 function describeError(value) {
   const { raw, message, status, code } = unwrap(value);
+  const rejected429 = isRejected429(value);
   const details = safeErrorDetails(raw);
   const clean2 = safeErrorDetails(message).replace(/^(?:Error invoking remote method ['"][^'"]+['"]:\s*)?(?:Error:\s*)?/i, "").trim();
   let kind = "unknown";
   let summary = "";
   let recovery = "";
   const transport = transportErrorText(value) || transportErrorText(raw);
-  if (status === 401 || status === 403 || /\b(?:invalid|expired)\s+(?:api[ _-]?key|access token|credentials?)\b|Provider authentication failed/i.test(clean2)) {
+  if (value?.reauthRequired === true || /invalid_grant|refresh token (?:expired|revoked|not available)|sign in again|sign-in expired|Reauth Required/i.test(raw)) {
+    kind = "reauth";
+    summary = "Sign-in expired.";
+    recovery = "Sign in again from Providers.";
+  } else if (status === 401 || status === 403 || /\b(?:invalid|expired)\s+(?:api[ _-]?key|access token|credentials?)\b|Provider authentication failed/i.test(clean2)) {
     kind = "authentication";
     summary = "Provider authentication failed";
     recovery = "Check your sign-in or API key, then try again.";
@@ -39362,7 +39745,7 @@ function describeError(value) {
     kind = "payload-size";
     summary = "The request exceeds the size limit.";
     recovery = "Reduce the attachments or request size, then try again.";
-  } else if (status === 429 || /rate[_ -]?limit|quota.*(?:hit|exceed)|too many requests|The provider usage limit was reached/i.test(clean2)) {
+  } else if (!rejected429 && (status === 429 || /rate[_ -]?limit|quota.*(?:hit|exceed)|too many requests|The provider usage limit was reached/i.test(clean2))) {
     kind = "rate-limit";
     summary = "The provider usage limit was reached.";
     recovery = "Wait for the limit to reset or choose another account.";
@@ -39370,7 +39753,7 @@ function describeError(value) {
     kind = "connection";
     summary = transport.replace(/\.$/, "");
     recovery = "Check the connection, then try again.";
-  } else if (status === 400 || status === 422 || code === "invalid_request_error" || clean2 === "The provider rejected this request.") {
+  } else if (rejected429 || status === 400 || status === 422 || code === "invalid_request_error" || clean2 === "The provider rejected this request.") {
     kind = "request";
     summary = "The provider rejected this request.";
     recovery = "Review the request details before trying again.";
@@ -39388,7 +39771,7 @@ function describeError(value) {
     details,
     // Known structured failures ignore volatile indexes; unknown failures
     // retain their diagnostic identity rather than merging unrelated work.
-    fingerprint: kind === "unknown" ? details : `${kind}:${status || ""}`
+    fingerprint: kind === "unknown" ? details : `${kind}:${kind === "reauth" ? "" : status || ""}`
   };
 }
 
@@ -39771,6 +40154,12 @@ function displayTerminalStatus(value) {
 function resultTerminalStatus(value) {
   return toolResultTerminalStatus(value);
 }
+function resultEnvelopeStatus(value) {
+  return toolResultEnvelopeStatus(value);
+}
+function resultControlStatus(value) {
+  return toolResultControlStatus(value);
+}
 var LEADING_STATUS_MARKER_LINE_RE = /^\[status:\s*[^\]]*\]\s*$/i;
 function stripLeadingStatusMarkerLines(lines) {
   const out = Array.isArray(lines) ? lines.slice() : [];
@@ -39805,6 +40194,7 @@ function mergeTerminalDetail(status, detail = "") {
   if (label === "Finished" && text) return text;
   if (!text) return label;
   if (text.toLowerCase().startsWith(label.toLowerCase())) return text;
+  if (label === "Running" && /^queued\b/i.test(text)) return text;
   if (BARE_STATUS_WORDS.has(text.toLowerCase())) return label;
   return `${label} \xB7 ${text}`;
 }
@@ -39902,7 +40292,11 @@ function aggregateLabel(base) {
   const loadingVerb = headerPending ? "Loading" : "Loaded";
   const headerCategories = (headerPending ? displayCategories : displayDone) || {};
   return safeInlineText(
-    loadingTargets.length ? `${loadingVerb} ${loadingTargets.join(", ")}` : formatAggregateHeader(headerCategories, { pending: headerPending, order: headerOrder })
+    loadingTargets.length ? `${loadingVerb} ${loadingTargets.join(", ")}` : formatAggregateHeader(headerCategories, {
+      pending: headerPending,
+      order: headerOrder,
+      failed: base.failedCount > 0 && base.failedCount >= base.groupCount
+    })
   );
 }
 function deriveAggregateCardModel(base) {
@@ -39916,7 +40310,7 @@ function deriveAggregateCardModel(base) {
     labelText: aggregateLabel(base),
     summaryText: "",
     headerFailureText: "",
-    detailLine: detailText || (pending ? "Running" : "Finished"),
+    detailLine: detailText || (pending ? "Running" : displayTerminalStatus(terminalStatus) || "Finished"),
     detailIsPlaceholder: !detailText,
     displayedResultBodyText: rt || "",
     firstResultLine: detailText,
@@ -39986,8 +40380,12 @@ function titleizeAgentName(value) {
   if (AGENT_DISPLAY_NAMES2.has(key)) return AGENT_DISPLAY_NAMES2.get(key);
   return text.replace(/[_-]+/g, " ").split(/\s+/).filter(Boolean).map(titleWord).join(" ");
 }
-function agentDisplayName(args) {
-  return titleizeAgentName(args?.agent || args?.subagent_type || args?.name || "");
+function agentNameFromResult(resultText) {
+  const line = /^agent:\s*(\S.*)$/im.exec(leadingResultBlock(resultText));
+  return line ? titleizeAgentName(line[1]) : "";
+}
+function agentDisplayName(args, resultText = "") {
+  return titleizeAgentName(args?.agent || args?.subagent_type || args?.name || "") || agentNameFromResult(resultText);
 }
 function agentModelLabel(args) {
   const a = args && typeof args === "object" ? args : {};
@@ -40008,10 +40406,10 @@ function withModelAndTag(label, args) {
 function joinActionAgent(action, agent) {
   return agent ? `${action} ${agent}` : action;
 }
-function agentResponseTitle(args, count = 1) {
+function agentResponseTitle(args, count = 1, resultText = "") {
   const total = Math.max(1, Number(count) || 1);
   if (total > 1) return `Responses ${total} agents`;
-  const name = agentDisplayName(args) || "Agent";
+  const name = agentDisplayName(args, resultText) || "Agent";
   return withModelAndTag(joinActionAgent("Response", name), args);
 }
 var AGENT_ACTION_VERBS = /* @__PURE__ */ new Map([
@@ -40020,11 +40418,15 @@ var AGENT_ACTION_VERBS = /* @__PURE__ */ new Map([
   ["cancel", "Cancel"],
   ["close", "Close"],
   ["cleanup", "Cleanup"],
-  ["read", "Status"],
+  ["read", "Read"],
   ["status", "Status"]
 ]);
-function agentActionTitle(args) {
-  const name = agentDisplayName(args);
+function isAgentResponseResult(args, resultText) {
+  if (String(args?.type || args?.action || "").toLowerCase() === "result") return true;
+  return Boolean(parseTaskNotification(String(resultText || "").trim()));
+}
+function agentActionTitle(args, resultText = "") {
+  const name = agentDisplayName(args, resultText);
   const action = String(args?.type || args?.action || "spawn").toLowerCase();
   if (action === "list") return "Agent status";
   const verb = AGENT_ACTION_VERBS.get(action);
@@ -40035,48 +40437,16 @@ function agentActionSummary(args, summary) {
   if (!text) return "";
   const name = agentDisplayName(args);
   if (name && text === name) return "";
-  const rest = name && text.startsWith(`${name} \xB7 `) ? text.slice(name.length + 3).trim() : text;
+  let rest = name && text.startsWith(`${name} \xB7 `) ? text.slice(name.length + 3).trim() : text;
+  const action = String(args?.type || args?.action || "").trim();
+  if (action && rest === action) return "";
+  if (action && rest.startsWith(`${action} \xB7 `)) rest = rest.slice(action.length + 3).trim();
   const model = agentModelLabel(args);
   if (model && rest === model) return "";
   const tag = agentTagLabel(args);
   if (tag && rest === tag) return "";
   return rest;
 }
-var BRIDGE_ENVELOPE_TAG_RE = /^<\/?(?:final-answer|task-id|tool-use-id|output-file|result|status|summary|usage|total_tokens|tool_uses|duration_ms|worktree|worktreePath|worktreeBranch)[^>]*>$/i;
-var BRIDGE_ENVELOPE_HEAD_FIELD_RE = /^(?:agent task|background task|agent message queued\b|agent close:|task_id|surface|operation|label|status|type|target|agent|preset|model|effort|fast|limits|started|finished|error|notification|queueDepth):?\s*/i;
-function isBridgeEnvelope(text) {
-  return /^(?:agent task:|background task\b|agent message queued\b|agent close:)/i.test(text) || /^(?:agents|tasks):\s*\d/i.test(text) || /^\(no agents or tasks\)$/i.test(text) || /^task_id:\s*\S+/im.test(text) && /^(?:surface|operation|status):\s*/im.test(text);
-}
-function envelopeHasResponseLine(text) {
-  let sawBlank = false;
-  for (const line of text.split("\n")) {
-    const trimmed = line.trim();
-    if (!trimmed) {
-      sawBlank = true;
-      continue;
-    }
-    if (/^agent result\b/i.test(trimmed)) continue;
-    if (/^(?:undefined|null)$/i.test(trimmed)) continue;
-    if (BRIDGE_ENVELOPE_TAG_RE.test(trimmed)) continue;
-    if (!sawBlank && BRIDGE_ENVELOPE_HEAD_FIELD_RE.test(trimmed)) continue;
-    if (!sawBlank && /^(?:agents|tasks):\s*/i.test(trimmed)) continue;
-    if (/^\(no agents or tasks\)$/i.test(trimmed)) continue;
-    if (!sawBlank && /^-\s+\S+/i.test(trimmed)) continue;
-    return true;
-  }
-  return false;
-}
-function hasAgentResponseResult(value) {
-  const text = String(value || "").trim();
-  if (!text) return false;
-  const notification = parseTaskNotification(text);
-  if (notification) return Boolean(notification.result);
-  if (/^(?:undefined|null)$/i.test(text)) return false;
-  if (/^status:\s*(?:running|pending|queued|completed|failed|cancelled|canceled)(?:\s*·\s*task_id:\s*\S+)?$/i.test(text))
-    return false;
-  if (!isBridgeEnvelope(text)) return true;
-  return envelopeHasResponseLine(text);
-}
 function agentTerminalDetail(status, isError, elapsed, error = "") {
   const failureDetail = isError && error ? backgroundTaskFailureStatusLabel(status, error, { surface: "agent" }) : "";
   if (failureDetail) return failureDetail;
@@ -40182,6 +40552,17 @@ function backgroundTaskDisplayName(normalizedName, meta = {}) {
   if (SHELL_TASK_SURFACES.has(surface)) return "Shell";
   return titleizeAgentName(surface || normalizedName || "Task");
 }
+var TASK_CONTROL_TITLES = /* @__PURE__ */ new Map([
+  ["list", "List tasks"],
+  ["read", "Read task"],
+  ["status", "Read task"],
+  ["wait", "Wait for task"],
+  ["cancel", "Cancel task"]
+]);
+function taskControlTitle(normalizedName, args = {}) {
+  if (String(normalizedName || "").toLowerCase() !== "task") return "";
+  return TASK_CONTROL_TITLES.get(String(args?.action || args?.type || "").toLowerCase()) || "";
+}
 function backgroundTaskResultTitle(normalizedName, meta = {}) {
   const display = backgroundTaskDisplayName(normalizedName, meta);
   if (display === "Shell") return "Shell output";
@@ -40190,6 +40571,7 @@ function backgroundTaskResultTitle(normalizedName, meta = {}) {
 }
 function backgroundTaskActionTitle(normalizedName, meta = {}) {
   const display = backgroundTaskDisplayName(normalizedName, meta);
+  if (/^queued$/i.test(meta.status || "")) return `Queued ${display}`;
   if (/^(running|pending|queued)$/i.test(meta.status || "")) {
     return String(meta.type || "").toLowerCase() === "progress" ? `${display} progress` : `Started ${display}`;
   }
@@ -40205,7 +40587,7 @@ function backgroundTaskFailureDetail(meta = {}, parsedArgs = {}) {
 }
 function backgroundTaskDetail(meta = {}, elapsed = "") {
   const parts = [];
-  const status = displayTerminalStatus(meta.status);
+  const status = /^queued$/i.test(meta.status || "") ? "Queued" : displayTerminalStatus(meta.status);
   if (status) parts.push(status);
   if (meta.taskId) parts.push(`task_id: ${meta.taskId}`);
   const firstBodyLine = String(meta.body || "").split("\n").map((line) => line.trim()).find(Boolean) || "";
@@ -40242,12 +40624,12 @@ function readRowsForDisplay(text) {
 }
 
 // src/runtime/shared/tool-card-model/displayed-result.mjs
-function resolveDisplayedResult(base, { normalizedName, parsedArgs }) {
+function resolveDisplayedResult(base, { normalizedName, parsedArgs }, translate) {
   const { name, args, rt, pending, isError } = base;
   const isBackgroundTool = isBackgroundTaskTool(normalizedName);
   const backgroundMeta = !pending && isBackgroundTool ? resolveBackgroundTaskMeta(parsedArgs, rt || "") : null;
   const backgroundError = backgroundMeta?.error || parsedArgs?.error || "";
-  const errorOnlyResult = Boolean(rt) && isBackgroundErrorOnlyBody(rt, backgroundError);
+  const errorOnlyResult = Boolean(rt) && (Boolean(backgroundMeta) && isBackgroundErrorOnlyBody(rt, backgroundError) || isUserControlCancellation(rt));
   const backgroundResultText = backgroundMeta?.hasResponse ? backgroundMeta.body : "";
   const displayedResultText = backgroundResultText || (errorOnlyResult ? "" : rt || "");
   const hasDisplayResult = Boolean(String(displayedResultText || "").trim());
@@ -40257,6 +40639,7 @@ function resolveDisplayedResult(base, { normalizedName, parsedArgs }) {
   const lines = displayedResultBodyText ? displayedResultBodyText.split("\n") : [];
   const isBackgroundResult = !pending && isBackgroundTool && Boolean(backgroundMeta);
   const isBackgroundResponse = isBackgroundResult && (backgroundMeta?.hasResponse || isBackgroundTaskResponseArgs(normalizedName, parsedArgs));
+  const summarize = (localize) => !pending && (hasDisplayBody || normalizedName === "git") ? summarizeToolResult(name, args, displayedResultBodyText, isError, localize) : null;
   return {
     backgroundMeta,
     displayedResultText,
@@ -40264,7 +40647,8 @@ function resolveDisplayedResult(base, { normalizedName, parsedArgs }) {
     displayedResultBodyText,
     hasDisplayBody,
     totalLines: lines.length,
-    resultSummary: !pending && (hasDisplayBody || normalizedName === "git") ? summarizeToolResult(name, args, displayedResultBodyText, isError) : null,
+    resultSummary: summarize(),
+    ...translate ? { resultSummaryDisplay: summarize(translate) } : {},
     firstResultLine: hasDisplayResult ? String(lines[0] ?? "") : "",
     isBackgroundResult,
     isBackgroundResponse,
@@ -40273,6 +40657,7 @@ function resolveDisplayedResult(base, { normalizedName, parsedArgs }) {
 }
 
 // src/runtime/shared/tool-card-model/card-status.mjs
+var ENVELOPE_STATUS_TOOLS = /* @__PURE__ */ new Set(["agent", "bridge", "task", "web_search", "search_query", "image_query", "web_search_call"]);
 function shellFragments(base, display, isShellSurface) {
   if (!isShellSurface) return { shellStatus: "", shellElapsed: "" };
   const { pending, failedCount, exitFailedCount, isError, elapsed } = base;
@@ -40310,8 +40695,14 @@ function deriveCardStatus(base, { normalizedName, parsedArgs, isShellSurface },
   );
   const agentCompletionDetail = !pending && isAgentTool(normalizedName) && !agentHeaderFailure ? agentTerminalDetail(parsedArgs?.status, isError, elapsed, parsedArgs?.error) : "";
   const gitStatus = normalizedName === "git" ? gitTerminalStatus(display.displayedResultText) : "";
-  const failedOrCompleted = isError || failedCount > 0 ? "failed" : "completed";
-  const terminalStatus = pending ? "running" : shellStatus || gitStatus || normalizeTerminalStatus(display.backgroundMeta?.status) || normalizeTerminalStatus(parsedArgs?.status) || resultTerminalStatus(display.displayedResultText) || // A one-line error body is hidden from display, so read the raw result.
+  const callFailed = !pending && (isError || failedCount > 0);
+  const reported = (value) => {
+    const status = normalizeTerminalStatus(value);
+    return callFailed && status === "completed" ? "" : status;
+  };
+  const failedOrCompleted = callFailed ? "failed" : "completed";
+  const envelopeStatus = ENVELOPE_STATUS_TOOLS.has(normalizedName) ? resultEnvelopeStatus(display.displayedResultText) : "";
+  const terminalStatus = pending ? "running" : shellStatus || gitStatus || (normalizedName === "media" ? mediaTerminalStatus(parsedArgs, display.displayedResultText) : "") || reported(display.backgroundMeta?.status) || reported(parsedArgs?.status) || reported(envelopeStatus) || resultControlStatus(display.displayedResultText) || // A one-line error body is hidden from display, so read the raw result.
   (isUserControlCancellation(base.rt) ? "cancelled" : "") || failedOrCompleted;
   return {
     shellStatus,
@@ -40322,7 +40713,8 @@ function deriveCardStatus(base, { normalizedName, parsedArgs, isShellSurface },
     headerFailureText: backgroundMetadataHeaderFailure || agentHeaderFailure || "",
     agentCompletionDetail,
     agentDetail: !pending && isAgentTool(normalizedName) && !display.hasDisplayResult ? agentCompletionDetail : "",
-    terminalStatus
+    terminalStatus,
+    callFailed
   };
 }
 
@@ -40412,13 +40804,14 @@ function nonShellDetail(base, surface, display, status, imageDetail) {
   const syncElapsedDetail = !display.isBackgroundResponse && shouldPrefixSyncElapsed(normalizedName, label) ? prefixElapsed(backgroundResponseDetail, elapsed) : backgroundResponseDetail;
   return backgroundMetadataDetail || (/^(Cancelled|Failed|Finished)$/i.test(resultSummary || "") && agentCompletionDetail ? agentCompletionDetail : syncElapsedDetail) || agentDetail || imageDetail || genericDetail;
 }
-function agentDetailLine(base, { collapsedDetail, pendingDetailPlaceholder, agentSurfaceBrief, agentHeaderFailure }) {
+function agentDetailLine(base, { collapsedDetail, pendingDetailPlaceholder, agentSurfaceBrief, agentHeaderFailure, terminalStatus }) {
   const { pending, isError, truncate, maxResultChars } = base;
   const agentDetailFallback = collapsedDetail || (pending ? pendingDetailPlaceholder || "Running" : "Finished");
   const line = agentSurfaceBrief || truncate(String(agentDetailFallback), Math.min(AGENT_SURFACE_BRIEF_MAX, maxResultChars));
   const agentFailureText = /\b(Cancelled|Canceled|Failed)\b/i.test(agentSurfaceBrief || collapsedDetail || "");
   const keepAgentDetail = (isError || agentFailureText) && !(agentHeaderFailure && !agentSurfaceBrief);
-  return keepAgentDetail ? line : "";
+  if (!keepAgentDetail) return "";
+  return isError && agentSurfaceBrief ? mergeTerminalDetail(terminalStatus, line) : line;
 }
 function deriveCardDetail(base, surface, display, status) {
   const { name, pending, isError, elapsed, rt, truncate, maxResultChars } = base;
@@ -40441,7 +40834,7 @@ function deriveCardDetail(base, surface, display, status) {
     );
   }
   const isAgentResult = !display.isBackgroundResult && !pending && isAgentTool(normalizedName) && hasDisplayResult;
-  const isAgentResponse = isAgentResult && hasAgentResponseResult(rt);
+  const isAgentResponse = isAgentResult && isAgentResponseResult(parsedArgs, rt);
   const isAgentSurfaceCard = isAgentTool(normalizedName);
   const agentSurfaceBriefRaw = isAgentSurfaceCard ? summarizeAgentSurfaceBrief(name, parsedArgs, displayedResultText || "", { isError, isResponse: isAgentResponse }) : "";
   const agentSurfaceBrief = agentSurfaceBriefRaw ? truncate(agentSurfaceBriefRaw, Math.min(AGENT_SURFACE_BRIEF_MAX, maxResultChars)) : "";
@@ -40455,7 +40848,8 @@ function deriveCardDetail(base, surface, display, status) {
       collapsedDetail,
       pendingDetailPlaceholder,
       agentSurfaceBrief,
-      agentHeaderFailure: status.agentHeaderFailure
+      agentHeaderFailure: status.agentHeaderFailure,
+      terminalStatus: status.terminalStatus
     });
   }
   return {
@@ -40473,13 +40867,19 @@ function deriveCardDetail(base, surface, display, status) {
 function headerLabel(base, surface, display, status, detail) {
   const { name, args, headerPending, groupCount } = base;
   const { normalizedName, parsedArgs, isShellSurface } = surface;
-  if (detail.isAgentResponse) return agentResponseTitle(parsedArgs, groupCount);
+  const taskControl = taskControlTitle(normalizedName, parsedArgs);
+  if (taskControl) return taskControl;
+  if (detail.isAgentResponse) return agentResponseTitle(parsedArgs, groupCount, base.rt);
   if (display.isBackgroundResponse) {
     return backgroundTaskResultTitle(normalizedName, display.backgroundMeta || parsedArgs);
   }
   if (display.isBackgroundMetadataResult) return backgroundTaskActionTitle(normalizedName, display.backgroundMeta);
   if (isShellSurface) return shellHeader(status.shellStatus, groupCount, parsedArgs?.verifyShell === true);
-  return (isAgentTool(normalizedName) ? agentActionTitle(parsedArgs) : "") || formatToolActionHeader(name, args, { pending: headerPending, count: groupCount });
+  return (isAgentTool(normalizedName) ? agentActionTitle(parsedArgs, display.displayedResultText) : "") || formatToolActionHeader(name, args, {
+    pending: headerPending,
+    count: groupCount,
+    failed: !base.pending && base.failedCount > 0 && base.failedCount >= groupCount
+  });
 }
 function deriveCardHeader(base, surface, display, status, detail) {
   const { pending, hasResult } = base;
@@ -40513,7 +40913,7 @@ function deriveToolCardModel(input = {}, options = {}) {
     isShellSurface: isShellTool(normalizedName, label),
     isSkillSurface: SKILL_SURFACE_NAMES.has(String(normalizedName || "").toLowerCase())
   };
-  const display = resolveDisplayedResult(base, surface);
+  const display = resolveDisplayedResult(base, surface, options.translate);
   const status = deriveCardStatus(base, surface, display);
   const detail = deriveCardDetail(base, surface, display, status);
   const header = deriveCardHeader(base, surface, display, status, detail);
@@ -40531,6 +40931,7 @@ function deriveToolCardModel(input = {}, options = {}) {
     firstResultLine: display.firstResultLine,
     totalLines: display.totalLines,
     resultSummary: display.resultSummary,
+    ...options.translate ? { resultSummaryDisplay: display.resultSummaryDisplay } : {},
     shellCollapsedSummary: detail.shellCollapsedSummary,
     agentSurfaceBrief: detail.agentSurfaceBrief,
     toolArgPath: String(detail.toolArgPath || ""),
@@ -40572,18 +40973,6 @@ function aggregateRawResultForDisplay(text) {
   return out.join("\n");
 }
 
-// src/runtime/agent/orchestrator/session/transcript-restore/agent-envelope.mjs
-function hasAgentResponseResultText(text) {
-  const value = String(text || "").trim();
-  if (!value) return false;
-  const notification = parseTaskNotification(value);
-  if (notification) return Boolean(notification.result);
-  if (/^status:\s*(?:running|pending|queued|completed|failed|cancelled|canceled)(?:\s*·\s*task_id:\s*\S+)?$/i.test(value))
-    return false;
-  if (/^(?:background task\b|agent task:|task_id:)/i.test(value) && !/\n\s*\n[\s\S]*\S/.test(value)) return false;
-  return true;
-}
-
 // src/tui/components/tool-output-format.mjs
 import stringWidth4 from "string-width";
 import stripAnsi8 from "strip-ansi";
@@ -41064,12 +41453,16 @@ function toolItemPendingForRows(item) {
   const done = Math.max(0, Math.min(count, Number(item?.completedCount || (item?.result == null ? 0 : count))));
   return done < count;
 }
+function hasBackgroundMetaForRows(normalizedName, bgArgs, rt) {
+  if (!isBackgroundTaskTool(normalizedName)) return false;
+  return Boolean(parseBackgroundTaskResult(rt) || String(bgArgs?.task_id || bgArgs?.taskId || "").trim());
+}
 function toolDisplayedResultTextForRows(item) {
   const rt = item?.result == null ? "" : String(item.result).replace(/\s+$/, "");
   const bgArgs = backgroundArgsForRows(item?.args);
   const backgroundError = String(bgArgs.error || "");
-  const errorOnlyResult = Boolean(rt) && isBackgroundErrorOnlyBody(rt, backgroundError);
   const normalizedName = String(normalizeToolName(item?.name) || "").toLowerCase();
+  const errorOnlyResult = Boolean(rt) && hasBackgroundMetaForRows(normalizedName, bgArgs, rt) && isBackgroundErrorOnlyBody(rt, backgroundError);
   if (!toolItemPendingForRows(item) && isBackgroundTaskTool(normalizedName)) {
     const meta = parseBackgroundTaskResultForRows(rt);
     if (meta?.hasResponse && String(meta.body || "").trim()) {
@@ -41084,8 +41477,10 @@ function toolHasDisplayResultForRows(item) {
   const trimmed = String(rt || "").trim();
   if (!trimmed) return false;
   const bgArgs = backgroundArgsForRows(item.args);
-  if (isBackgroundErrorOnlyBody(trimmed, bgArgs.error || "")) return false;
   const normalizedName = String(normalizeToolName(item.name) || "").toLowerCase();
+  if (hasBackgroundMetaForRows(normalizedName, bgArgs, trimmed) && isBackgroundErrorOnlyBody(trimmed, bgArgs.error || "")) {
+    return false;
+  }
   if (isBackgroundTaskTool(normalizedName)) {
     const meta = parseBackgroundTaskResultForRows(trimmed);
     if (meta) return Boolean(meta.hasResponse && String(meta.body || "").trim());
@@ -41127,7 +41522,7 @@ function agentCardKeepsCollapsedDetailForRows(item, normalizedName) {
   const hasDisplayResult = toolHasDisplayResultForRows(item);
   const displayedResultText = toolDisplayedResultTextForRows(item);
   const rt = item.result == null ? "" : String(item.result).replace(/\s+$/, "");
-  const isAgentResponse = hasDisplayResult && hasAgentResponseResultText(rt);
+  const isAgentResponse = hasDisplayResult && isAgentResponseResult(bgArgs, rt);
   const briefRaw = summarizeAgentSurfaceBrief(item.name, bgArgs, displayedResultText, {
     isError,
     isResponse: isAgentResponse
@@ -43601,6 +43996,7 @@ async function resizeImageBuffer(buffer, ext, { maxTokens = DEFAULT_IMAGE_MAX_TO
     throw new InvalidImageDataError(error);
   }
 }
+var TOOL_IMAGE_TARGET_BASE64_SIZE = 256 * 1024;
 
 // src/tui/paste-text-policy.mjs
 var PASTE_TOKEN_MIN_LINES = 10;
@@ -43687,7 +44083,7 @@ function buildPromptContentWithImages(text, pastedImages = {}) {
   const imageParts = Object.values(pastedImages || {}).filter((img) => img && img.type === "image" && refs.has(Number(img.id))).flatMap((img) => {
     const parts2 = [];
     if (img.metadataText) parts2.push({ type: "text", text: img.metadataText });
-    parts2.push({ type: "image", data: img.content, mimeType: img.mediaType || "image/png" });
+    parts2.push({ type: "image", data: img.content, mimeType: img.mediaType || "image/png", pasteId: img.id });
     return parts2;
   });
   if (imageParts.length === 0) return value;
@@ -44867,7 +45263,9 @@ function contextDetail(m) {
 }
 function buildContextPanelModel(input) {
   const metrics = contextMetrics(input);
-  return { rows: contextRows(metrics), detail: contextDetail(metrics) };
+  const detail = contextDetail(metrics);
+  detail.speed = { outputTokensPerSecond: input.sessionUsage?.outputTokensPerSecond ?? null };
+  return { rows: contextRows(metrics), detail };
 }
 
 // src/tui/app/usage-context-panels/usage-panel.mjs
@@ -44930,12 +45328,13 @@ function createUsageContextPanels({
   });
   const openContextPicker = async () => {
     const own = surface.claim();
-    const [toolsStatus, mcpStatus, skillsStatus, pluginsStatus, contextStatus] = await Promise.all([
+    const [toolsStatus, mcpStatus, skillsStatus, pluginsStatus, contextStatus, sessionUsage] = await Promise.all([
       Promise.resolve(store.toolsStatus?.()).catch(() => null),
       Promise.resolve(store.mcpStatus?.()).catch(() => null),
       Promise.resolve(store.skillsStatus?.()).catch(() => null),
       Promise.resolve(store.pluginsStatus?.()).catch(() => null),
-      Promise.resolve(store.contextStatus?.({ inspect: true })).catch(() => null)
+      Promise.resolve(store.contextStatus?.({ inspect: true })).catch(() => null),
+      Promise.resolve(store.getSessionUsage?.()).catch(() => null)
     ]);
     const { rows: rows2, detail } = buildContextPanelModel({
       toolsStatus,
@@ -44943,6 +45342,7 @@ function createUsageContextPanels({
       skillsStatus,
       pluginsStatus,
       contextStatus,
+      sessionUsage,
       state
     });
     if (!own.owns()) return;
@@ -47699,7 +48099,7 @@ function projectLitellmRow(row) {
     if (typeof value === "number" && Number.isFinite(value)) out[field] = value;
   }
   for (const [field, value] of Object.entries(row)) {
-    if ((/^(?:input_cost_per_token|output_cost_per_token|cache_read_input_token_cost|cache_creation_input_token_cost)(?:_above_\d+k_tokens)?(?:_priority)?$/.test(
+    if ((/^(?:input_cost_per_token|output_cost_per_token|cache_read_input_token_cost|cache_creation_input_token_cost)(?:_above_\d+k_tokens)?(?:_priority|_ultrafast)?$/.test(
       field
     ) || /^output_cost_per_second_\w+$/.test(field)) && typeof value === "number" && Number.isFinite(value))
       out[field] = value;
@@ -50952,10 +51352,12 @@ function ContextUsageView({ detail, columns, panelRows, onInspect, onRefresh })
     compaction.pressureTokens ? `pressure ${formatTokens(compaction.pressureTokens)}` : "",
     compaction.reserveTokens ? `reserve ${formatTokens(compaction.reserveTokens)}` : ""
   ]);
+  const speed = detail?.speed?.outputTokensPerSecond;
   const sourceLine = metricValue([
     contextMeasurementLabel(usage.measurementSource),
     usage.effective ? `effective ${formatTokens(windowTokens)}` : `window ${formatTokens(windowTokens)}`,
-    usage.rawWindowTokens && usage.rawWindowTokens !== usage.windowTokens ? `raw ${formatTokens(usage.rawWindowTokens)}` : ""
+    usage.rawWindowTokens && usage.rawWindowTokens !== usage.windowTokens ? `raw ${formatTokens(usage.rawWindowTokens)}` : "",
+    speed == null ? "" : `${speed < 10 ? speed.toFixed(1) : Math.round(speed)} tok/s`
   ]);
   const apiLine = metricValue([
     `last ctx ${formatTokens(lastApi.contextTokens)}`,
@@ -52474,7 +52876,8 @@ function renderAggregateToolCard(card) {
   const headerText = safeInlineText(
     formatAggregateHeader((headerPending ? displayCategories : displayDoneCategories) || {}, {
       pending: headerPending,
-      order: headerOrder
+      order: headerOrder,
+      failed: failedCount > 0 && failedCount >= groupCount
     })
   );
   const detailText = hasResult ? safeInlineText(rt) : "";
@@ -52505,7 +52908,7 @@ function renderAggregateToolCard(card) {
   const clippedHeader = stringWidth15(headerText) > avail ? truncateToWidth(headerText, avail) : headerText;
   const isPlaceholderDetail = !(expanded && hasRawResult) && !detailText;
   const showRawAggregate = expanded && hasRawResult;
-  const pendingPlaceholder = pending ? "Running" : "Finished";
+  const pendingPlaceholder = pending ? "Running" : displayTerminalStatus(aggregateTerminalStatus) || "Finished";
   const detailLines = showRawAggregate ? [] : [detailText || pendingPlaceholder];
   const aggregateDetailColor = isPlaceholderDetail ? theme.subtle : theme.text;
   return /* @__PURE__ */ jsxs16(Box_default, { flexDirection: "column", marginTop: attached ? 0 : 1, width: rowWidth, overflow: "hidden", children: [
@@ -56552,10 +56955,10 @@ function modelFooter(selection, model = null) {
     fastLine = {
       glyph: fastOn ? "\u25CF" : "\u25CB",
       color: fastOn ? theme.fastMode : theme.inactive,
-      text: `${fastDisplayLabel(fastOn)} \xB7 Tab Toggle`
+      text: `${selection.isUltrafast?.(model) ? "Ultrafast" : fastDisplayLabel(fastOn)} \xB7 Tab Toggle`
     };
   }
-  const parameterLines = (model?.modelParameterOptions || []).filter((parameter) => parameter.id !== "context").map((parameter) => {
+  const parameterLines = (model?.modelParameterOptions || []).filter((parameter) => parameter.id !== "context" && parameter.id !== "serviceTier").map((parameter) => {
     const value = selection.modelParametersFor(model)[parameter.id] || "";
     return {
       glyph: "\u25C7",
@@ -56659,9 +57062,23 @@ function createFastParameterSelection({ state, currentRoute, isCurrentRoute, isS
     selectedFast.set(key, fast);
     return fast;
   };
+  const ultrafastOffered = (model) => (model?.modelParameterOptions || []).some(
+    (parameter) => parameter.id === "serviceTier" && parameter.options?.some((o) => o.value === "ultrafast")
+  );
+  const isUltrafast = (model) => ultrafastOffered(model) && getSelectedFast(model) && modelParametersFor(model).serviceTier === "ultrafast";
+  const setSpeed = (model, fast, tier) => {
+    selectedFast.set(modelKey(model), fast);
+    selectedModelParameters.set(modelKey(model), { ...modelParametersFor(model), serviceTier: tier });
+  };
   const toggleFast = (model) => {
     if (!fastAvailableFor(model)) return false;
-    selectedFast.set(modelKey(model), !getSelectedFast(model));
+    if (!ultrafastOffered(model)) {
+      selectedFast.set(modelKey(model), !getSelectedFast(model));
+      return true;
+    }
+    if (!getSelectedFast(model)) setSpeed(model, true, "priority");
+    else if (!isUltrafast(model)) setSpeed(model, true, "ultrafast");
+    else setSpeed(model, false, "priority");
     return true;
   };
   const cycleThinking = (model) => {
@@ -56678,7 +57095,7 @@ function createFastParameterSelection({ state, currentRoute, isCurrentRoute, isS
     if (!fastAvailableFor(model)) selectedFast.set(modelKey(model), false);
     return true;
   };
-  return { modelParametersFor, fastAvailableFor, getSelectedFast, toggleFast, cycleThinking };
+  return { modelParametersFor, fastAvailableFor, getSelectedFast, isUltrafast, toggleFast, cycleThinking };
 }
 
 // src/tui/app/model-picker/route-selection.mjs
@@ -56693,6 +57110,8 @@ function createRouteSelection({ providerModels, state, currentRoute }) {
     const coercedEffort = effort.coerceEffort(selected);
     const fastCapable = fast.fastAvailableFor(selected, coercedEffort);
     const contextSelection = context.contextSelectionFor(selected);
+    const { serviceTier, ...otherParameters } = fast.modelParametersFor(selected);
+    const modelParameters = serviceTier && fastCapable && fast.getSelectedFast(selected) ? { ...otherParameters, serviceTier } : otherParameters;
     return {
       effort: coercedEffort,
       routeInput: {
@@ -56701,7 +57120,7 @@ function createRouteSelection({ providerModels, state, currentRoute }) {
         ...coercedEffort ? { effort: coercedEffort } : {},
         ...contextSelection ? { contextPercent: contextSelection.percent } : {},
         ...selected.fastCapable ? { fast: fastCapable && fast.getSelectedFast(selected) } : {},
-        ...(selected.modelParameterOptions || []).length ? { modelParameters: fast.modelParametersFor(selected) } : {}
+        ...(selected.modelParameterOptions || []).length ? { modelParameters } : {}
       }
     };
   };
@@ -56715,6 +57134,7 @@ function createRouteSelection({ providerModels, state, currentRoute }) {
     stepContext: context.stepContext,
     fastAvailableFor: fast.fastAvailableFor,
     getSelectedFast: fast.getSelectedFast,
+    isUltrafast: fast.isUltrafast,
     toggleFast: fast.toggleFast,
     cycleEffort: effort.cycleEffort,
     cycleThinking: fast.cycleThinking,
@@ -58586,10 +59006,11 @@ var routeCommands = {
     const value = String(arg || "").trim().toLowerCase();
     let setTo = null;
     if (!value) setTo = void 0;
+    else if (["ultra", "ultrafast"].includes(value)) setTo = "ultrafast";
     else if (["1", "true", "yes", "on", "enable", "enabled"].includes(value)) setTo = true;
     else if (["0", "false", "no", "off", "disable", "disabled"].includes(value)) setTo = false;
     if (setTo === null) {
-      store.pushNotice("usage: /fast [on|off]", "warn");
+      store.pushNotice("usage: /fast [on|off|ultra]", "warn");
       return true;
     }
     const action = setTo === void 0 ? store.toggleFast?.() : store.setFast?.(setTo);
@@ -58599,7 +59020,7 @@ var routeCommands = {
         return;
       }
       store.pushNotice(
-        `Fast mode ${enabled ? "on" : "off"} for ${state.provider}/${state.model}` + (state.busy ? " (applies from the next turn)" : ""),
+        `${setTo === "ultrafast" ? "Ultrafast" : `Fast mode ${enabled ? "on" : "off"}`} for ${state.provider}/${state.model}` + (state.busy ? " (applies from the next turn)" : ""),
         "info"
       );
     }).catch((e) => store.pushNotice(`Couldn\u2019t update fast mode: ${e?.message || e}`, "error"));
@@ -59096,6 +59517,7 @@ function runRestoreQueuedToPrompt(options, deps) {
     } else {
       clearPromptHint();
     }
+    if (restored2.notice) showPromptHint(restored2.notice, "error");
     return true;
   };
   let restored;