mixdog 0.9.2 → 0.9.4

package/src/tui/components/ToolExecution.jsx

@@ -11,9 +11,7 @@
 import React, { useEffect, useState } from 'react';
 import { Box, Text } from 'ink';
 import stringWidth from 'string-width';
-import stripAnsi from 'strip-ansi';
-import { displayWidth } from '../display-width.mjs';
-import { theme, TURN_MARKER, RESULT_GUTTER, RESULT_GUTTER_CONT } from '../theme.mjs';
+import { theme, TURN_MARKER, AGENT_CALL_MARKER, AGENT_RESPONSE_MARKER } from '../theme.mjs';
 import { formatElapsed } from '../time-format.mjs';
 import { BULLET_OPERATOR } from '../figures.mjs';
 import {
@@ -22,23 +20,52 @@ import {
   summarizeToolResult as surfaceSummarizeToolResult,
   formatAggregateHeader,
   formatToolActionHeader,
-  displayModelName,
   summarizeAgentSurfaceBrief,
   AGENT_SURFACE_BRIEF_MAX,
 } from '../../runtime/shared/tool-surface.mjs';
-import { backgroundTaskFailureStatusLabel, isBackgroundErrorOnlyBody } from '../../runtime/shared/err-text.mjs';
-import { formatExpandedResult, wrapExpandedResultLines } from './tool-output-format.mjs';
-
-const MIN_RESULT_LINE_CHARS = 24;
-// Hard cap for the collapsed result detail row (the second line under the ⎿
-// gutter). Independent of terminal width so a wide terminal never lets a long
-// line (e.g. an agent response brief) stretch the whole row — anything past
-// this is truncated with an ellipsis. ctrl+o expand still shows the full body.
-const RESULT_LINE_HARD_MAX = 80;
-// Hard cap for the parenthesized header arg summary so a long path/query does
-// not eat the whole header line; anything longer is truncated with an ellipsis.
-const SUMMARY_MAX_CHARS = 48;
-const HEADER_FAILURE_STATUS_MAX = 32;
+import { isBackgroundErrorOnlyBody, backgroundTaskFailureStatusLabel } from '../../runtime/shared/err-text.mjs';
+import {
+  MIN_RESULT_LINE_CHARS,
+  RESULT_LINE_HARD_MAX,
+  SUMMARY_MAX_CHARS,
+  HEADER_FAILURE_STATUS_MAX,
+  safeInlineText,
+  normalizeCountMap,
+  truncateToWidth,
+  shellResultElapsed,
+  normalizeTerminalStatus,
+  resultTerminalStatus,
+  stripLeadingStatusMarkerLines,
+  stripLeadingStatusMarkerFromText,
+} from './tool-execution/text-format.mjs';
+import {
+  SKILL_SURFACE_NAMES,
+  isShellTool,
+  shellDisplayStatus,
+  shellHeader,
+  isAgentTool,
+  isBackgroundTaskTool,
+  agentResponseTitle,
+  agentActionTitle,
+  agentActionSummary,
+  hasAgentResponseResult,
+  resolveBackgroundTaskMeta,
+  backgroundTaskElapsed,
+  prefixElapsed,
+  mergeTerminalDetail,
+  shouldPrefixSyncElapsed,
+  backgroundTaskResultTitle,
+  backgroundTaskActionTitle,
+  backgroundTaskFailureDetail,
+  backgroundTaskDetail,
+  isBackgroundTaskResponseArgs,
+  genericCompletedDetail,
+  toolSearchLoadedSummary,
+  agentTerminalDetail,
+  clampFailureCount,
+  toolStatusColor,
+} from './tool-execution/surface-detail.mjs';
+import { ResultBody } from './tool-execution/ResultBody.jsx';
 
 export function displayToolName(name, args) {
   return surfaceDisplayToolName(name, args);
@@ -47,193 +74,6 @@ export function displayToolName(name, args) {
 const TOOL_BLINK_MS = 500;
 const TOOL_BLINK_LIMIT_MS = 3000;
 const TOOL_PENDING_SHOW_DELAY_MS = 1000;
-// Read `theme.subtle` at use-time (not captured here) so a live `/theme`
-// switch re-tones the tool hints. `theme` is mutated in-place on switch.
-// Collapsed tool headers/details are laid out as single terminal rows. Never let
-// raw C0/control bytes (CR, tabs, cursor escapes, etc.) reach those rows: a
-// terminal can apply them after Ink has already clipped/measured the row, which
-// makes a scrolled tool card appear to write through the prompt/statusline.
-const INLINE_CONTROL_RE = /[\u0000-\u001F\u007F]/g;
-
-function safeInlineText(value) {
-  return stripAnsi(String(value ?? ''))
-    .replace(/\r\n?/g, '\n')
-    .replace(/\t/g, ' ')
-    .replace(/\n+/g, ' ')
-    .replace(INLINE_CONTROL_RE, ' ')
-    .replace(/\s+/g, ' ')
-    .trim();
-}
-
-function normalizeCount(value) {
-  const n = Number(value || 0);
-  return Number.isFinite(n) ? Math.max(0, Math.floor(n)) : 0;
-}
-
-function normalizeCountMap(value = {}) {
-  const out = {};
-  for (const [key, raw] of Object.entries(value || {})) {
-    if (raw && typeof raw === 'object') {
-      out[key] = { ...raw, count: normalizeCount(raw.count) };
-    } else {
-      out[key] = normalizeCount(raw);
-    }
-  }
-  return out;
-}
-
-function deltaColor(token) {
-  return String(token || '').startsWith('+') ? theme.success : theme.error;
-}
-
-function deltaTextParts(text) {
-  const value = String(text ?? '');
-  const parts = [];
-  const re = /(^|[\s([,{·])([+-]\s*\d+)(?=\s+Lines?\b)/gi;
-  let last = 0;
-  let match;
-  while ((match = re.exec(value))) {
-    const prefix = match[1] || '';
-    const token = (match[2] || '').replace(/\s+/g, '');
-    const tokenStart = match.index + prefix.length;
-    if (match.index > last) parts.push({ text: value.slice(last, match.index) });
-    if (prefix) parts.push({ text: prefix });
-    if (token) parts.push({ text: token, color: deltaColor(token) });
-    last = tokenStart + (match[2] || '').length;
-  }
-  if (last < value.length) parts.push({ text: value.slice(last) });
-  return parts;
-}
-
-function renderDeltaText(text) {
-  return deltaTextParts(text).map((part, index) => (
-    part.color ? <Text key={index} color={part.color}>{part.text}</Text> : part.text
-  ));
-}
-
-// Shared multi-line result body: `└` on the first row, `│` continuation rail on
-// every following row, body text in one flex column so wrapping stays aligned
-// under the head gutter.
-//
-// Two render paths:
-//   - COLLAPSED (raw=false): a single fitted summary line, diff(+/-) colored via
-//     renderDeltaText.
-//   - EXPANDED (raw=true): formatExpandedResult then wrapExpandedResultLines so
-//     each physical row fits the body width before render (rail rows stay 1:1;
-//     ink does not re-wrap). Physical row mount cap: MIXDOG_TUI_TOOL_OUTPUT_MAX_RENDER_LINES
-//     (default 600; 0 disables). Shell/script bodies keep the newest tail when capped.
-function ResultBody({ lines, rawText, pathArg = '', isShell = false, columns, color, raw }) {
-  const renderLines = raw
-    ? wrapExpandedResultLines(
-      formatExpandedResult(rawText, { pathArg, isShell }),
-      columns,
-      { isShell },
-    )
-    : (lines || []);
-  if (!renderLines || renderLines.length === 0) return null;
-  return (
-    <Box flexDirection="row">
-      <Box flexShrink={0} flexDirection="column">
-        {renderLines.map((_, i) => (
-          <Text key={i} color={theme.subtle}>{i === 0 ? RESULT_GUTTER : RESULT_GUTTER_CONT}</Text>
-        ))}
-      </Box>
-      <Box flexDirection="column" flexShrink={1} flexGrow={1}>
-        {renderLines.map((line, i) => (
-          <Text key={i} color={raw ? undefined : color} wrap="truncate">
-            {raw
-              ? (line || ' ')
-              : renderDeltaText(fitResultLine(line || ' ', columns))}
-          </Text>
-        ))}
-      </Box>
-    </Box>
-  );
-}
-
-function plural(count, singular, pluralText = `${singular}s`) {
-  return count === 1 ? singular : pluralText;
-}
-
-function isShellTool(normalizedName, label = '') {
-  const n = String(normalizedName || '').toLowerCase();
-  const l = String(label || '').toLowerCase();
-  return n === 'shell' || n === 'bash' || n === 'bash_session' || n === 'shell_command' || n === 'job_wait' || l === 'run';
-}
-
-function shellResultStatus(value) {
-  const match = String(value || '').match(/(?:^|\b)status:\s*(running|pending|queued|completed|failed|cancelled|canceled)\b/im);
-  return match ? String(match[1] || '').toLowerCase() : '';
-}
-
-function normalizeTerminalStatus(value) {
-  const raw = String(value || '').trim().toLowerCase();
-  if (!raw) return '';
-  if (/^(running|pending|queued|in_progress|in-progress)$/.test(raw)) return 'running';
-  if (/^(completed|complete|done|success|succeeded|ok)$/.test(raw)) return 'completed';
-  if (/^(failed|fail|error|errored|timeout|timed_out|killed)$/.test(raw)) return 'failed';
-  if (/^(cancelled|canceled|cancel)$/.test(raw)) return 'cancelled';
-  return '';
-}
-
-function displayTerminalStatus(value) {
-  const status = normalizeTerminalStatus(value);
-  if (status === 'running') return 'Running';
-  if (status === 'completed') return 'Finished';
-  if (status === 'failed') return 'Failed';
-  if (status === 'cancelled') return 'Cancelled';
-  return '';
-}
-
-function resultTerminalStatus(value) {
-  const text = String(value || '');
-  const tagged = text.match(/<status[^>]*>([\s\S]*?)<\/status>/i)?.[1]?.trim();
-  if (tagged) return normalizeTerminalStatus(tagged);
-  const bracketed = text.match(/^\[status:\s*([^\]]*)\]/mi)?.[1]?.trim();
-  if (bracketed) return normalizeTerminalStatus(bracketed);
-  // Loose inline `status: x` / `state: x` matches are a last-resort fallback —
-  // prefer the engine-controlled `<status>` tag or `[status: …]` marker above.
-  // A loose match can false-positive on prose that happens to start with
-  // "status:" (rare, but shellResultStatus below already owns real shell
-  // output parsing; this fallback stays narrow and unchanged in behavior).
-  const inline = text.match(/^(?:status|state):\s*([^\s·,;]+)/mi)?.[1]?.trim();
-  return normalizeTerminalStatus(inline);
-}
-
-const LEADING_STATUS_MARKER_LINE_RE = /^\[status:\s*[^\]]*\]\s*$/i;
-
-function stripLeadingStatusMarkerLines(lines) {
-  const out = Array.isArray(lines) ? lines.slice() : [];
-  if (out.length > 0 && LEADING_STATUS_MARKER_LINE_RE.test(String(out[0] ?? '').trim())) out.shift();
-  return out;
-}
-
-function stripLeadingStatusMarkerFromText(text) {
-  return stripLeadingStatusMarkerLines(String(text || '').split('\n')).join('\n');
-}
-
-function shellDisplayStatus({ pending = false, failedCount = 0, isError = false, result = '' } = {}) {
-  const status = shellResultStatus(result);
-  if (pending || /^(running|pending|queued)$/.test(status)) return 'running';
-  if (/^cancel/.test(status)) return 'cancelled';
-  if (/^(failed|error|killed|timeout)$/.test(status) || isError || failedCount > 0) return 'failed';
-  return 'completed';
-}
-
-function shellHeader(status, count = 1) {
-  const n = Math.max(1, Number(count) || 1);
-  const object = `${n} ${plural(n, 'command')}`;
-  if (status === 'running') return `Running ${object}`;
-  return `Ran ${object}`;
-}
-
-function shellResultElapsed(value) {
-  const match = String(value || '').match(/^\[elapsed:\s*(\d+)\s*ms\]/mi);
-  if (!match) return '';
-  const elapsedMs = Number(match[1]);
-  return Number.isFinite(elapsedMs) && elapsedMs >= 1000 ? formatElapsed(elapsedMs) : '';
-}
-
 function statusCopy(name, label, count, doneCount, pending, isError, args = {}) {
   // No stableVerbWidth padding: it padded the done verb to the active ("-ing")
   // width, which Ink trims at the line END (vendor output trimEnd) so it never
@@ -243,388 +83,6 @@ function statusCopy(name, label, count, doneCount, pending, isError, args = {})
   // dropping the pad just normalizes the spacing.
   return formatToolActionHeader(name, args, { pending, count });
 }
-
-function fitResultLine(line, columns) {
-  const max = Math.min(RESULT_LINE_HARD_MAX, Math.max(MIN_RESULT_LINE_CHARS, Number(columns || 80) - 7));
-  const text = safeInlineText(line);
-  return displayWidth(text) > max ? truncateToWidth(text, max) : text;
-}
-
-/** Trim text from the end (by display width) so it fits maxWidth, appending '…'. */
-function truncateToWidth(text, maxWidth) {
-  const str = safeInlineText(text);
-  if (maxWidth < 1) return '';
-  if (displayWidth(str) <= maxWidth) return str;
-  const chars = Array.from(str);
-  let out = '';
-  for (const ch of chars) {
-    if (displayWidth(out + ch + '…') > maxWidth) break;
-    out += ch;
-  }
-  return `${out}…`;
-}
-
-function isAgentTool(normalizedName) {
-  return normalizedName === 'agent';
-}
-
-const SKILL_SURFACE_NAMES = new Set([
-  'skill', 'skill_execute', 'skill_view', 'skills_list', 'use_skill',
-]);
-
-function isBackgroundTaskTool(normalizedName) {
-  return new Set(['explore', 'search', 'shell', 'bash', 'bash_session', 'shell_command', 'task']).has(String(normalizedName || '').toLowerCase());
-}
-
-const AGENT_DISPLAY_NAMES = new Map([
-  ['explore', 'Explore'],
-  ['maintainer', 'Maintainer'],
-  ['worker', 'Worker'],
-  ['heavy-worker', 'Heavy Worker'],
-  ['reviewer', 'Reviewer'],
-  ['debugger', 'Debugger'],
-]);
-
-function titleizeAgentName(value) {
-  const text = String(value || '').trim();
-  if (!text) return '';
-  const key = text.toLowerCase().replace(/[\s_]+/g, '-');
-  if (AGENT_DISPLAY_NAMES.has(key)) return AGENT_DISPLAY_NAMES.get(key);
-  return text
-    .replace(/[_-]+/g, ' ')
-    .split(/\s+/)
-    .filter(Boolean)
-    .map((part) => `${part.slice(0, 1).toUpperCase()}${part.slice(1).toLowerCase()}`)
-    .join(' ');
-}
-
-function agentModelLabel(args) {
-  const a = args && typeof args === 'object' ? args : {};
-  const provider = String(a.provider || a.providerId || a.provider_id || '').trim();
-  const model = String(a.model || '').trim();
-  const displayHint = String(a.modelDisplay || a.model_display || a.displayModel || '').trim();
-  return displayModelName(model, provider, displayHint);
-}
-
-function agentTagLabel(args) {
-  // The real spawn tag (engine fills parsedArgs.tag from the envelope target).
-  // Never fall back to task_id — only the human-meaningful spawn tag belongs in
-  // the header parentheses.
-  return String(args?.tag || '').trim();
-}
-
-function withModelAndTag(label, args) {
-  const model = agentModelLabel(args);
-  const tag = agentTagLabel(args);
-  const inner = [model, tag].filter(Boolean).join(', ');
-  return inner ? `${label} (${inner})` : label;
-}
-
-// Append an agent name to a base action word without leaving a trailing space
-// when the agent is unknown (no generic "Agent" fallback).
-function joinActionAgent(action, agent) {
-  return agent ? `${action} ${agent}` : action;
-}
-
-function agentResponseTitle(args) {
-  const name = titleizeAgentName(args?.agent || args?.subagent_type || args?.name || '');
-  // The agent + model identify the responder; the response summary itself
-  // is hidden in the collapsed card (ctrl+o expand still shows the full body).
-  // No generic "Agent" fallback — render just "Response" when the agent is empty.
-  return withModelAndTag(joinActionAgent('Response', name), args);
-}
-
-function agentActionTitle(args) {
-  const name = titleizeAgentName(args?.agent || args?.subagent_type || args?.name || '');
-  // Runtime treats an omitted type/action as "spawn" (see agent-tool.mjs default),
-  // so mirror that contract here instead of falling through to the generic
-  // "Called agent" status copy.
-  const action = String(args?.type || args?.action || 'spawn').toLowerCase();
-  // Fixed action verbs regardless of running/completed status. No generic
-  // "Agent" fallback for the agent: when the agent is unknown render the action
-  // word alone ("Spawn") instead of "Spawn Agent".
-  if (action === 'spawn') return withModelAndTag(joinActionAgent('Spawn', name), args);
-  if (action === 'send') return withModelAndTag(joinActionAgent('Send', name), args);
-  if (action === 'list') return 'Agent status';
-  if (action === 'cancel') return withModelAndTag(joinActionAgent('Cancel', name), args);
-  if (action === 'close') return withModelAndTag(joinActionAgent('Close', name), args);
-  if (action === 'cleanup') return withModelAndTag(joinActionAgent('Cleanup', name), args);
-  if (action === 'read' || action === 'status') return withModelAndTag(joinActionAgent('Status', name), args);
-  return '';
-}
-
-function agentActionSummary(args, summary) {
-  const text = String(summary || '').trim();
-  if (!text) return '';
-  const name = titleizeAgentName(args?.agent || args?.subagent_type || args?.name || '');
-  if (name && text === name) return '';
-  let rest = name && text.startsWith(`${name} · `) ? text.slice(name.length + 3).trim() : text;
-  // The agent/model/tag surface summary ("Heavy Worker · Opus 4.8") is now folded
-  // into the header label itself ("Spawn Heavy Worker (Opus 4.8, tag)"), so drop
-  // the model and tag tokens from the parenthesized summary to avoid showing
-  // them twice.
-  const model = agentModelLabel(args);
-  if (model && rest === model) return '';
-  const tag = agentTagLabel(args);
-  if (tag && rest === tag) return '';
-  return rest;
-}
-
-function hasAgentResponseResult(value) {
-  const text = String(value || '').trim();
-  if (!text) return false;
-  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;
-  const isBridgeEnvelope = /^(?: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+/mi.test(text) && /^(?:surface|operation|status):\s*/mi.test(text));
-  if (!isBridgeEnvelope) return true;
-  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 (/^<\/?(?:final-answer|task-notification|task-id|tool-use-id|output-file|result|status|summary|usage|total_tokens|tool_uses|duration_ms|worktree|worktreePath|worktreeBranch)[^>]*>$/i.test(trimmed)) continue;
-    if (!sawBlank && /^(?: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.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 parseBackgroundTaskResult(value) {
-  const text = String(value || '').trim();
-  if (!text) return null;
-  const allLines = text.split('\n');
-  const start = allLines.findIndex((line) => line.trim() === 'background task');
-  if (start < 0) return null;
-  const rest = allLines.slice(start + 1);
-  const blank = rest.findIndex((line) => !line.trim());
-  const headLines = blank >= 0 ? rest.slice(0, blank) : rest;
-  const body = blank >= 0 ? rest.slice(blank + 1).join('\n').trim() : '';
-  const fields = {};
-  for (const line of headLines) {
-    const match = /^([a-zA-Z][\w-]*):\s*(.*)$/.exec(line.trim());
-    if (match) fields[match[1].toLowerCase()] = match[2].trim();
-  }
-  const status = String(fields.status || '').toLowerCase();
-  const error = fields.error || '';
-  return {
-    taskId: fields.task_id || fields.taskid || '',
-    surface: fields.surface || '',
-    operation: fields.operation || '',
-    label: fields.label || '',
-    status,
-    startedAt: fields.started || fields.startedat || '',
-    finishedAt: fields.finished || fields.finishedat || '',
-    body,
-    error,
-    hasResponse: Boolean(body) && !isBackgroundErrorOnlyBody(body, error) && !/^(running|pending|queued)$/i.test(status),
-  };
-}
-
-function backgroundTaskMetaFromArgs(args = {}) {
-  const taskId = String(args.task_id || args.taskId || '').trim();
-  if (!taskId) return null;
-  return {
-    taskId,
-    surface: args.surface || '',
-    operation: args.operation || '',
-    label: args.label || '',
-    status: String(args.status || '').toLowerCase(),
-    startedAt: args.startedAt || args.started || '',
-    finishedAt: args.finishedAt || args.finished || '',
-    error: args.error || '',
-    body: '',
-    hasResponse: false,
-  };
-}
-
-function resolveBackgroundTaskMeta(parsedArgs = {}, resultText = '') {
-  const parsed = parseBackgroundTaskResult(resultText);
-  if (parsed) {
-    if (!parsed.error && parsedArgs?.error) parsed.error = parsedArgs.error;
-    if (!parsed.status && parsedArgs?.status) parsed.status = String(parsedArgs.status).toLowerCase();
-    if (!parsed.surface && parsedArgs?.surface) parsed.surface = parsedArgs.surface;
-    return parsed;
-  }
-  return backgroundTaskMetaFromArgs(parsedArgs);
-}
-
-function backgroundTaskElapsed(meta = {}, fallback = '') {
-  const startedMs = Date.parse(meta.startedAt || '');
-  const finishedMs = Date.parse(meta.finishedAt || '');
-  if (Number.isFinite(startedMs) && Number.isFinite(finishedMs) && finishedMs >= startedMs) {
-    const elapsedMs = finishedMs - startedMs;
-    return elapsedMs >= 1000 ? formatElapsed(elapsedMs) : '';
-  }
-  return fallback || '';
-}
-
-function prefixElapsed(detail, elapsed = '') {
-  const text = String(detail || '').trim();
-  const time = String(elapsed || '').trim();
-  if (!time) return text;
-  // Unified convention: the elapsed time ALWAYS goes at the END, ` · ` separated.
-  // Guard against a double-append when the text already ends with the same time.
-  if (text && text.endsWith(`· ${time}`)) return text;
-  return text ? `${text} · ${time}` : time;
-}
-
-function mergeTerminalDetail(status, detail = '') {
-  const label = displayTerminalStatus(status);
-  const text = String(detail || '').trim();
-  if (!label) return text;
-  if (label === 'Finished' && text) return text;
-  if (!text) return label;
-  if (text.toLowerCase().startsWith(label.toLowerCase())) return text;
-  return `${label} · ${text}`;
-}
-
-function shouldPrefixSyncElapsed(normalizedName, label) {
-  const n = String(normalizedName || '').toLowerCase();
-  const l = String(label || '').toLowerCase();
-  return n === 'explore' || l === 'explore' || n === 'search' || l === 'search' || l === 'web search';
-}
-
-function backgroundTaskDisplayName(normalizedName, meta = {}) {
-  const surface = String(meta.surface || normalizedName || '').toLowerCase();
-  if (surface === 'explore') return 'Explore';
-  if (surface === 'search') return 'Search';
-  if (surface === 'shell' || surface === 'bash' || surface === 'bash_session' || surface === 'shell_command' || surface === 'task') return 'Shell';
-  return titleizeAgentName(surface || normalizedName || 'Task');
-}
-
-function backgroundTaskResultTitle(normalizedName, meta = {}) {
-  const display = backgroundTaskDisplayName(normalizedName, meta);
-  if (display === 'Shell') return 'Shell output';
-  if (display === 'Search') return 'Search results';
-  return `${display} response`;
-}
-
-function backgroundTaskActionTitle(normalizedName, meta = {}) {
-  const display = backgroundTaskDisplayName(normalizedName, meta);
-  if (/^(running|pending|queued)$/i.test(meta.status || '')) return `Started ${display}`;
-  if (meta.hasResponse) return backgroundTaskResultTitle(normalizedName, meta);
-  return `${display} status`;
-}
-
-function backgroundTaskFailureDetail(meta = {}, parsedArgs = {}) {
-  const status = meta.status || parsedArgs?.status;
-  const error = meta.error || parsedArgs?.error;
-  if (!error) return '';
-  const surface = meta.surface || parsedArgs?.surface || '';
-  return backgroundTaskFailureStatusLabel(status, error, { surface });
-}
-
-function backgroundTaskDetail(meta = {}, elapsed = '', parsedArgs = {}) {
-  const parts = [];
-  const status = 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) || '';
-  if (firstBodyLine && /^(running|pending|queued)$/i.test(meta.status || '')) parts.push(firstBodyLine);
-  return prefixElapsed(parts.join(' · '), elapsed);
-}
-
-function isBackgroundTaskResponseArgs(normalizedName, args = {}) {
-  if (!isBackgroundTaskTool(normalizedName)) return false;
-  const type = String(args?.type || args?.action || '').toLowerCase();
-  const status = String(args?.status || '').toLowerCase();
-  return type === 'result' || type === 'completion' || (/^(completed|cancelled|canceled)$/i.test(status) && Boolean(args?.task_id));
-}
-
-function isOutputDetailTool(normalizedName, label) {
-  const n = String(normalizedName || '').toLowerCase();
-  const l = String(label || '').toLowerCase();
-  return new Set([
-    'shell', 'bash', 'bash_session', 'shell_command', 'job_wait',
-    'read', 'view_image', 'read_mcp_resource',
-    'grep', 'glob', 'search', 'search_query', 'image_query', 'web_search', 'web_search_call', 'explore', 'web_fetch', 'fetch', 'download_attachment',
-    'list', 'ls', 'code_graph',
-    'recall', 'recall_memory', 'search_memories', 'remember', 'save_memory', 'update_memory',
-  ]).has(n) || l === 'read' || l === 'search' || l === 'web search' || l === 'run';
-}
-
-function genericCompletedDetail({ normalizedName, label, hasResult, firstResultLine, isError }) {
-  const n = String(normalizedName || '').toLowerCase();
-  const l = String(label || '').toLowerCase();
-  if (isError) return hasResult ? firstResultLine : 'Failed';
-  if (n === 'shell' || n === 'bash' || n === 'bash_session' || n === 'shell_command' || n === 'job_wait') {
-    return '';
-  }
-  if (isOutputDetailTool(n, l)) {
-    return hasResult ? firstResultLine : '';
-  }
-  return '';
-}
-
-function toolSearchLoadedSummary(resultText) {
-  let parsed;
-  try {
-    parsed = JSON.parse(String(resultText || ''));
-  } catch {
-    return '';
-  }
-  const tools = parsed?.selected?.tools;
-  if (!tools || typeof tools !== 'object') return '';
-  const names = [
-    ...(Array.isArray(tools.added) ? tools.added : []),
-    ...(Array.isArray(tools.already) ? tools.already : []),
-  ]
-    .map((name) => String(name || '').trim())
-    .filter(Boolean);
-  return [...new Set(names)].join(', ');
-}
-
-function agentTerminalDetail(status, isError, elapsed, error = '') {
-  const failureDetail = isError && error
-    ? backgroundTaskFailureStatusLabel(status, error, { surface: 'agent' })
-    : '';
-  if (failureDetail) return failureDetail;
-  const s = String(status || '').toLowerCase();
-  const word = /cancel/.test(s)
-    ? 'Cancelled'
-    : /error|fail|killed|timeout/.test(s) || isError
-      ? 'Failed'
-      : /done|success|complete|closed/.test(s)
-        ? 'Finished'
-        : '';
-  // Unified ` · <time>` convention (previously "Finished after 12s").
-  return word ? `${word}${elapsed ? ` · ${elapsed}` : ''}` : '';
-}
-
-function clampFailureCount(errorCount, groupCount, isError) {
-  const explicit = Number(errorCount);
-  if (Number.isFinite(explicit)) return Math.max(0, Math.min(groupCount, Math.floor(explicit)));
-  return isError ? groupCount : 0;
-}
-
-// Single source of truth for the tool-card dot (●) color. Both the aggregate
-// and normal (single-tool) render paths must call this with a resolved
-// `terminalStatus` — do not recompute color inline elsewhere.
-//   running/pending      -> mixdogOrange || warning (blink handled by caller)
-// success               -> theme.success
-//   partial failure       -> mixdogOrange (some, not all, of the group failed)
-//   all failed            -> theme.error
-//   cancelled             -> theme.warning
-function toolStatusColor({ pending, groupCount, failedCount, terminalStatus = '' }) {
-  if (pending) return theme.mixdogOrange || theme.warning;
-  const status = normalizeTerminalStatus(terminalStatus);
-  if (status === 'cancelled') return theme.warning;
-  if (status === 'failed') return theme.error;
-  if (failedCount <= 0) return theme.success;
-  if (groupCount > 1 && failedCount < groupCount) return theme.mixdogOrange || theme.warning;
-  return theme.error;
-}
-
 export function ToolExecution({ name, args, result, rawResult, isError, errorCount, expanded, columns = 80, attached = false, count = 1, completedCount = 0, startedAt = 0, completedAt = 0, aggregate = false, categories = {}, headerFinalized = true, deferredDisplayReady = false }) {
   const rowWidth = Math.max(1, Number(columns || 80));
   const [blinkOn, setBlinkOn] = useState(true);
@@ -809,7 +267,10 @@ export function ToolExecution({ name, args, result, rawResult, isError, errorCou
     // Aggregate cards intentionally omit elapsed time once grouped. A brief
     // `Running · 1s` tick during the grouped→finished handoff reads as visual
     // noise, and the grouped header already communicates that work is active.
-    const pendingPlaceholder = headerPending
+    // The placeholder tracks `pending` (real completion), NOT headerPending:
+    // the header verb stays active until the block seals, but the detail row
+    // must not keep saying "Running" after every call already resolved.
+    const pendingPlaceholder = pending
       ? 'Running'
       : 'Finished';
     const detailLines = showRawAggregate
@@ -978,7 +439,14 @@ export function ToolExecution({ name, args, result, rawResult, isError, errorCou
   }
   const finalStatusColor = toolStatusColor({ pending, groupCount, failedCount, terminalStatus });
   const dotColor = finalStatusColor;
-  const dotText = pending && !blinkExpired && !blinkOn ? ' ' : TURN_MARKER;
+  // Agent surface cards use directional markers: `←` for requests going OUT
+  // (spawn/send/etc.) and `→` for the response coming back IN. Background
+  // task cards (shell async / explore / search / task) and every other tool
+  // keep the BLACK_CIRCLE turn marker. Blink behavior is shared.
+  const markerGlyph = isAgentResponse
+    ? AGENT_RESPONSE_MARKER
+    : (isAgentSurfaceCard ? AGENT_CALL_MARKER : TURN_MARKER);
+  const dotText = pending && !blinkExpired && !blinkOn ? ' ' : markerGlyph;
   let labelText;
   if (isAgentResponse) labelText = agentResponseTitle(parsedArgs);
   else if (isBackgroundResponse) labelText = backgroundTaskResultTitle(normalizedName, backgroundMeta || parsedArgs);