mixdog 0.9.2 → 0.9.4

package/src/runtime/shared/tool-surface.mjs

@@ -1,292 +1,71 @@
-import { displayModelName as sharedDisplayModelName } from '../../ui/model-display.mjs';
-
-// Default cap for tool-arg summaries (header parenthetical, channel tool lines).
-// Unified at 80 so every tool surface line — header arg summary and collapsed
-// detail alike — shares one width ceiling; per-call sites still clamp lower
-// (header 48, channel 50) where a tighter line is wanted.
-const DEFAULT_SUMMARY_MAX = 80;
-// Semantic cap for collapsed tool/agent/task card one-liners — the second row
-// under the ⎿ gutter (spawn, send, response, generic/shell result summaries).
-// Kept at 80 so every collapsed detail line is truncated to the same width
-// regardless of terminal columns; ctrl+o expand still shows the full body.
-export const AGENT_SURFACE_BRIEF_MAX = 80;
-const STATUS_SEPARATOR = ' · ';
-
-export function stripToolPrefix(name) {
-  const text = rawToolName(name);
-  const mcp = parseMcpToolName(text);
-  return mcp ? mcp.tool : text;
-}
-
-function rawToolName(name) {
-  return String(name || 'tool').replace(/^functions\./, '');
-}
-
-export function parseMcpToolName(name) {
-  const text = rawToolName(name);
-  const match = /^mcp__(.+?)__(.+)$/.exec(text);
-  if (!match) return null;
-  return { server: match[1], tool: match[2] };
-}
-
-export function isMcpToolName(name) {
-  return Boolean(parseMcpToolName(name));
-}
-
-export function normalizeToolName(name) {
-  return stripToolPrefix(name).replace(/-/g, '_').toLowerCase();
-}
-
-export function truncateToolText(value, max = DEFAULT_SUMMARY_MAX) {
-  const text = String(value ?? '').trim();
-  return text.length > max ? `${text.slice(0, max)}...` : text;
-}
-
-function truncateSingleLine(value, max = DEFAULT_SUMMARY_MAX) {
-  return truncateToolText(String(value ?? '').replace(/\s+/g, ' '), max);
-}
-
-function truncateCommand(value, max = DEFAULT_SUMMARY_MAX) {
-  const text = String(value ?? '').trim();
-  if (!text) return '';
-  const lines = text.split('\n');
-  let out = lines.length > 2 ? `${lines.slice(0, 2).join(' ')}...` : lines.join(' ');
-  out = out.replace(/\s+/g, ' ').trim();
-  return out.length > max ? `${out.slice(0, Math.max(1, max - 3))}...` : out;
-}
-
-export function parseToolArgs(args) {
-  if (!args) return {};
-  if (typeof args === 'string') {
-    try {
-      const parsed = JSON.parse(args);
-      return parsed && typeof parsed === 'object' ? parsed : { value: args };
-    } catch {
-      return { value: args };
-    }
-  }
-  if (typeof args === 'object') {
-    if (args.input && typeof args.input === 'object') return args.input;
-    return args;
-  }
-  return { value: args };
-}
-
-export function displayToolPath(path) {
-  const text = String(path ?? '');
-  return text.replace(/\\/g, '/').split('/').filter(Boolean).at(-1) || text;
-}
-
-function compactParts(parts) {
-  return parts.filter((part) => part != null && String(part).trim()).map((part) => String(part).trim()).join(STATUS_SEPARATOR);
-}
-
-function compactSlash(left, right) {
-  const a = String(left ?? '').trim();
-  const b = String(right ?? '').trim();
-  return a && b ? `${a}/${b}` : a || b;
-}
-
-function mcpToolTarget(name, max = DEFAULT_SUMMARY_MAX) {
-  const mcp = parseMcpToolName(name);
-  if (!mcp) return '';
-  return truncateToolText(compactSlash(mcp.server, mcp.tool), max);
-}
-
-function quoted(value, max) {
-  const text = truncateToolText(value || '', max);
-  return text ? `"${text}"` : '';
-}
-
-function firstText(...values) {
-  for (const value of values) {
-    if (value != null && String(value).trim()) return String(value).trim();
-  }
-  return '';
-}
-
-function splitToolSearchSelection(value) {
-  if (Array.isArray(value)) return value.map((item) => String(item || '').trim()).filter(Boolean);
-  return String(value || '')
-    .split(/[,\s]+/)
-    .map((item) => item.trim())
-    .filter(Boolean);
-}
-
-function toolSearchTargetKind(value) {
-  const lower = String(value || '').trim().toLowerCase();
-  if (!lower) return '';
-  if (lower.startsWith('mcp__') || lower.includes('_mcp_') || lower.includes('mcp')) return 'MCP';
-  if (lower === 'skill' || lower.startsWith('skill:') || lower.startsWith('skill_') || lower.startsWith('skills_') || lower.includes('skill')) return 'Skills';
-  return 'Tools';
-}
-
-function orderedToolSearchKinds(kinds) {
-  const set = new Set((kinds || []).filter(Boolean));
-  const order = ['Tools', 'MCP', 'Skills'];
-  const out = order.filter((kind) => set.has(kind));
-  return out.length ? out : ['Tools'];
-}
-
-function inferToolSearchKinds(args = {}) {
-  const selected = splitToolSearchSelection(args.select);
-  if (selected.length) return orderedToolSearchKinds(selected.map(toolSearchTargetKind));
-
-  const query = firstText(args.query, args.q, args.text).toLowerCase();
-  const kinds = [];
-  if (/\bmcp\b|mcp__|mcp[-_\s]?server/.test(query)) kinds.push('MCP');
-  if (/\bskills?\b|skill_|use[-_\s]?skill/.test(query)) kinds.push('Skills');
-  return orderedToolSearchKinds(kinds);
-}
-
-function toolSearchDisplayLabel(args = {}) {
-  return `Load ${inferToolSearchKinds(args).join('/')}`;
-}
-
-function displayToolSearchTarget(value) {
-  const text = String(value || '').trim();
-  if (/^skill:/i.test(text)) return text.slice('skill:'.length);
-  const mcp = /^mcp__(.*?)__(.+)$/.exec(text);
-  if (mcp) return `${mcp[1]}.${mcp[2]}`;
-  return stripToolPrefix(text);
-}
-
-function titleizeToolName(name) {
-  return stripToolPrefix(name)
-    .split(/[_\s-]+/)
-    .filter(Boolean)
-    .map((part) => {
-      const lower = part.toLowerCase();
-      if (lower === 'ui') return 'UI';
-      if (lower === 'mcp') return 'MCP';
-      if (lower === 'id') return 'ID';
-      return `${lower.slice(0, 1).toUpperCase()}${lower.slice(1)}`;
-    })
-    .join(' ') || 'Tool';
-}
-
-const AGENT_DISPLAY_NAMES = new Map([
-  ['explore', 'Explore'],
-  ['maintainer', 'Maintainer'],
-  ['worker', 'Worker'],
-  ['heavy-worker', 'Heavy Worker'],
-  ['reviewer', 'Reviewer'],
-  ['debugger', 'Debugger'],
-]);
-
-function titleizeDisplayName(value) {
-  const text = String(value || '').trim();
-  if (!text) return '';
-  return text
-    .replace(/[_-]+/g, ' ')
-    .split(/\s+/)
-    .filter(Boolean)
-    .map((part) => {
-      const lower = part.toLowerCase();
-      if (lower === 'ui') return 'UI';
-      if (lower === 'mcp') return 'MCP';
-      if (lower === 'id') return 'ID';
-      return `${lower.slice(0, 1).toUpperCase()}${lower.slice(1)}`;
-    })
-    .join(' ');
-}
-
-function displayAgentName(value) {
-  const text = String(value || '').trim();
-  if (!text) return '';
-  const key = text.toLowerCase().replace(/[\s_]+/g, '-');
-  return AGENT_DISPLAY_NAMES.get(key) || titleizeDisplayName(text);
-}
-
-export function displayModelName(model, provider, displayHint) {
-  const text = String(model ?? '').trim();
-  const modelId = text
-    ? (text.includes('/') ? (text.split('/').filter(Boolean).at(-1) || text) : text)
-    : '';
-  const shown = sharedDisplayModelName(modelId, provider, displayHint);
-  return shown || modelId;
-}
-
-function bridgeAgentModelSummary(args) {
-  const provider = firstText(args.provider, args.providerId, args.provider_id);
-  const modelId = firstText(args.model);
-  const displayHint = firstText(args.modelDisplay, args.model_display, args.displayModel);
-  return compactParts([
-    displayAgentName(firstText(args.agent, args.name, args.subagent_type)),
-    displayModelName(modelId, provider, displayHint),
-  ]);
-}
-
-function summarizeLineWindow(a) {
-  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);
-  const count = Number(limit);
-  if (Number.isFinite(start) && Number.isFinite(count) && count > 0) {
-    return `lines ${start}-${Math.max(start, start + count - 1)}`;
-  }
-  if (Number.isFinite(start)) return `from line ${start}`;
-  if (Number.isFinite(count)) return `${count} lines`;
-  return '';
-}
-
-function summarizePatch(patch, basePath) {
-  const text = String(patch ?? '');
-  const files = [];
-  for (const line of text.split('\n')) {
-    const match = /^\*\*\*\s+(?:Update|Add|Delete) File:\s+(.+)\s*$/.exec(line);
-    if (match) files.push(displayToolPath(match[1]));
-  }
-  if (files.length === 1) return files[0];
-  if (files.length > 1) return `${files.length} files`;
-  if (basePath) return displayToolPath(basePath);
-  return text ? 'patch' : '';
-}
-
-function collectionCount(...values) {
-  for (const value of values) {
-    if (Array.isArray(value)) {
-      const count = value.filter((item) => item != null && String(item).trim()).length;
-      return count || value.length || 0;
-    }
-    if (value && typeof value === 'object') return 1;
-    if (value != null && String(value).trim()) return 1;
-  }
-  return 0;
-}
-
-function formatCountedUnit(count, singular, pluralText = `${singular}s`) {
-  const n = Math.max(0, Number(count || 0));
-  return n > 0 ? `${n} ${pluralize(n, singular, pluralText)}` : '';
-}
-
-function patchFileCount(args = {}) {
-  const patchText = String(args.patch ?? '');
-  if (patchText) {
-    const files = new Set();
-    for (const line of patchText.split('\n')) {
-      const match = /^\*\*\*\s+(?:Update|Add|Delete) File:\s+(.+)\s*$/.exec(line);
-      if (match) files.add(match[1].trim());
-    }
-    if (files.size > 0) return files.size;
-  }
-  return collectionCount(args.path, args.file, args.file_path, args.base_path);
-}
-
-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') return 'Search';
-  return 'Read';
-}
-
-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),
-  ]);
-}
+// ── Facade: tool-surface primitives + result summaries are re-exported from
+// their cohesive modules so every existing importer resolves unchanged. This
+// file keeps the display-name / arg-summary and aggregate-card clusters.
+import {
+  DEFAULT_SUMMARY_MAX,
+  AGENT_SURFACE_BRIEF_MAX,
+  STATUS_SEPARATOR,
+  stripToolPrefix,
+  parseMcpToolName,
+  isMcpToolName,
+  normalizeToolName,
+  truncateToolText,
+  truncateSingleLine,
+  truncateCommand,
+  parseToolArgs,
+  displayToolPath,
+  compactParts,
+  compactSlash,
+  mcpToolTarget,
+  quoted,
+  firstText,
+  splitToolSearchSelection,
+  toolSearchDisplayLabel,
+  displayToolSearchTarget,
+  titleizeToolName,
+  displayAgentName,
+  displayModelName,
+  bridgeAgentModelSummary,
+  summarizeLineWindow,
+  summarizePatch,
+  collectionCount,
+  formatCountedUnit,
+  patchFileCount,
+  codeGraphLabel,
+  codeGraphSummary,
+  pluralize,
+  titleWord,
+  titleStatus,
+} from './tool-primitives.mjs';
+import {
+  parseLineDelta,
+  formatLineDelta,
+  parseUpdateSummary,
+  extractErrorCause,
+  summarizeToolResult,
+  isExplorerSurface,
+  summarizeAgentSurfaceBrief,
+  isMemorySurface,
+} from './tool-result-summary.mjs';
+
+export {
+  AGENT_SURFACE_BRIEF_MAX,
+  DEFAULT_SUMMARY_MAX,
+  STATUS_SEPARATOR,
+  stripToolPrefix,
+  parseMcpToolName,
+  isMcpToolName,
+  normalizeToolName,
+  truncateToolText,
+  parseToolArgs,
+  displayToolPath,
+  displayModelName,
+  extractErrorCause,
+  summarizeToolResult,
+  isExplorerSurface,
+  summarizeAgentSurfaceBrief,
+  isMemorySurface,
+};
 
 export function displayToolName(name, args = {}) {
   if (isMcpToolName(name)) return 'MCP';
@@ -315,8 +94,6 @@ export function displayToolName(name, args = {}) {
     case 'list':
     case 'ls':
       return 'Search';
-    case 'trigger_schedule':
-      return 'Schedule';
     case 'tool_search':
       return toolSearchDisplayLabel(parseToolArgs(args));
     case 'search':
@@ -329,15 +106,7 @@ export function displayToolName(name, args = {}) {
       return 'Explore';
     case 'web_fetch':
     case 'fetch':
-    case 'download_attachment':
       return 'Fetch';
-    case 'diagnostics':
-    case 'open_config':
-    case 'provider_status':
-    case 'channel_status':
-    case 'schedule_status':
-    case 'schedule_control':
-    case 'reload_config':
     case 'list_mcp_resources':
     case 'list_mcp_resource_templates':
     case 'cwd':
@@ -366,10 +135,6 @@ export function displayToolName(name, args = {}) {
     case 'code_graph':
       return codeGraphLabel(parseToolArgs(args));
     case 'reply':
-    case 'react':
-    case 'edit_message':
-    case 'activate_channel_bridge':
-    case 'inject_command':
       return 'Channel';
     default:
       return titleizeToolName(name);
@@ -472,27 +237,11 @@ export function summarizeToolArgs(name, args, { max = DEFAULT_SUMMARY_MAX } = {}
         return formatCountedUnit(collectionCount(a.url, a.uri), 'URL', 'URLs');
       }
       return truncateToolText(a.url || a.uri || '', max);
-    case 'download_attachment':
-      return displayToolPath(a.filename || a.name || a.url || '');
     case 'read_mcp_resource':
       return truncateToolText(a.uri || '', max);
     case 'list_mcp_resources':
     case 'list_mcp_resource_templates':
       return a.server ? `server "${truncateToolText(a.server, max)}"` : 'all servers';
-    case 'diagnostics':
-      return truncateToolText(a.scope || a.mode || 'runtime', max);
-    case 'open_config':
-      return truncateToolText(a.section || a.tab || 'config', max);
-    case 'provider_status':
-      return truncateToolText(a.provider || 'providers', max);
-    case 'channel_status':
-      return truncateToolText(a.channel || a.name || 'channels', max);
-    case 'schedule_status':
-    case 'schedule_control':
-    case 'trigger_schedule':
-      return compactParts([a.action || a.type || 'schedule', a.name || a.id || '']);
-    case 'reload_config':
-      return truncateToolText(a.scope || 'config', max);
     case 'cwd':
       return truncateToolText(firstText(a.path, a.cwd, a.dir), max);
     case 'memory':
@@ -524,13 +273,7 @@ export function summarizeToolArgs(name, args, { max = DEFAULT_SUMMARY_MAX } = {}
     case 'code_graph':
       return codeGraphSummary(a, max);
     case 'reply':
-    case 'react':
-    case 'edit_message':
       return truncateToolText(a.channel || a.channelId || a.messageId || a.emoji || '', max);
-    case 'activate_channel_bridge':
-      return a.active === false ? 'deactivate' : 'activate';
-    case 'inject_command':
-      return truncateToolText(firstText(a.command, a.text, a.name), max);
     case 'skill':
     case 'skill_execute':
     case 'skill_view':
@@ -566,537 +309,6 @@ export function formatToolSurface(name, args, opts = {}) {
   };
 }
 
-function pluralize(count, singular, pluralText = `${singular}s`) {
-  return count === 1 ? singular : pluralText;
-}
-
-function titleWord(value) {
-  const text = String(value || '');
-  return text ? `${text.charAt(0).toUpperCase()}${text.slice(1).toLowerCase()}` : '';
-}
-
-function titleStatus(value) {
-  const text = String(value || '').trim();
-  if (!text) return '';
-  if (/^ok$/i.test(text)) return 'Ok';
-  if (/^(done|success|completed)$/i.test(text)) return 'Finished';
-  if (/^(error|failed|fail|killed|timeout)$/i.test(text)) return 'Failed';
-  if (/^(cancelled|canceled|cancel)$/i.test(text)) return 'Cancelled';
-  return titleWord(text);
-}
-
-function countNonEmptyLines(text) {
-  return String(text ?? '')
-    .split('\n')
-    .filter((line) => line.trim()).length;
-}
-
-// Zero-result recognizer (audit HIGH): result text that SAYS "nothing found"
-// must summarize as an explicit zero, not be line-counted into "1 match".
-// Matches the shapes emitted by grep/glob/find/list/recall backends:
-//   "(no matches)", "no matches found", "(no results)", "No results",
-//   "(no fuzzy match for \"...\")", "0 matches", "(empty)", "(no entries)".
-function looksLikeZeroResultText(text) {
-  const trimmed = String(text ?? '').trim();
-  if (!trimmed) return false;
-  // Only trust short, single-line-ish payloads — a real listing that merely
-  // CONTAINS the words "no matches" somewhere must not be zeroed.
-  if (trimmed.length > 200 || trimmed.includes('\n')) return false;
-  return /^\(?\s*(?:no|0)\s+(?:fuzzy\s+)?(?:match(?:es)?|results?|files?|entries|candidates?|hits?)\b/i.test(trimmed)
-    || /^\(?\s*(?:empty|none)\s*\)?$/i.test(trimmed)
-    || /^no\s+\S+\s+(?:found|matched)\b/i.test(trimmed);
-}
-
-function splitPathAndDelta(value, explicitDelta = '') {
-  let path = String(value ?? '').trim();
-  let delta = String(explicitDelta ?? '').trim();
-  if (!delta) {
-    const sep = path.lastIndexOf(' — ');
-    if (sep !== -1) {
-      delta = path.slice(sep + 3).trim();
-      path = path.slice(0, sep).trim();
-    }
-  }
-  return { path, delta };
-}
-
-function parseLineDelta(delta) {
-  const totals = { added: 0, removed: 0, seen: false };
-  for (const match of String(delta ?? '').matchAll(/([+-])\s*(\d+)\s*(?:line|lines)?/gi)) {
-    const n = Number(match[2]) || 0;
-    totals.seen = true;
-    if (match[1] === '+') totals.added += n;
-    else totals.removed += n;
-  }
-  return totals;
-}
-
-function formatLineDelta(totals) {
-  if (!totals?.seen) return '';
-  const added = Number(totals.added) || 0;
-  const removed = Number(totals.removed) || 0;
-  if (added === 0 && removed === 0) return '';
-  const parts = [];
-  if (added > 0) parts.push(`+${added} ${pluralize(added, 'line')}`);
-  if (removed > 0) parts.push(`-${removed} ${pluralize(removed, 'line')}`);
-  return parts.join(STATUS_SEPARATOR);
-}
-
-function parseUpdateSummary(text) {
-  const match = /^(Updated|Created|Deleted)\s+(.+?)(?:\s+·\s+|$)/i.exec(String(text || '').trim());
-  if (!match) return null;
-  const action = titleWord(match[1]);
-  const target = match[2].trim();
-  const fileCountMatch = /^(\d+)\s+Files?$/i.exec(target);
-  const totals = parseLineDelta(text);
-  return {
-    action,
-    file: fileCountMatch ? '' : target,
-    fileCount: fileCountMatch ? Number(fileCountMatch[1]) || 0 : 0,
-    added: totals.added,
-    removed: totals.removed,
-    seen: totals.seen,
-  };
-}
-
-/** Heuristic: does the text look like a line-oriented listing rather than prose? */
-function looksLineOriented(text) {
-  const lines = String(text ?? '').split('\n').filter((line) => line.trim());
-  if (lines.length === 0) return false;
-  // Prose tends to be a few long sentences; listings are many shorter rows.
-  const longLines = lines.filter((line) => line.trim().length > 200).length;
-  return longLines === 0;
-}
-
-function summarizeUpdateResult(text, args) {
-  // A dry_run patch validates without writing, so the collapsed detail must not
-  // claim a real mutation ("Updated/Created/Deleted foo.js"). Map every action
-  // to "Checked" wording, matching the dry-run header (Checking/Checked).
-  const isDryRun = parseToolArgs(args)?.dry_run === true;
-  const changed = [];
-  for (const line of String(text ?? '').split('\n')) {
-    const ok = /^\s*OK\s+(modify|add|delete|create)\s+(.+?)\s*$/i.exec(line);
-    if (ok) {
-      const { path, delta } = splitPathAndDelta(ok[2]);
-      changed.push({ action: ok[1].toLowerCase(), path, delta });
-      continue;
-    }
-    const edited = /^\s*(Edited|Created|Updated|Wrote):\s+(.+?)(?:\s+\(([^)]+)\))?\s*$/i.exec(line);
-    if (edited) {
-      const { path, delta } = splitPathAndDelta(edited[2], edited[3] || '');
-      changed.push({ action: edited[1].toLowerCase(), path, delta });
-    }
-  }
-  if (changed.length === 1) {
-    const item = changed[0];
-    const action = isDryRun
-      ? 'Checked'
-      : item.action === 'delete' ? 'Deleted' : item.action === 'add' || item.action === 'create' || item.action === 'created' ? 'Created' : 'Updated';
-    return compactParts([`${action} ${displayToolPath(item.path)}`, formatLineDelta(parseLineDelta(item.delta))]);
-  }
-  if (changed.length > 1) {
-    const totals = changed.reduce((acc, item) => {
-      const delta = parseLineDelta(item.delta);
-      acc.added += delta.added;
-      acc.removed += delta.removed;
-      acc.seen = acc.seen || delta.seen;
-      return acc;
-    }, { added: 0, removed: 0, seen: false });
-    return compactParts([`${isDryRun ? 'Checked' : 'Updated'} ${changed.length} Files`, formatLineDelta(totals)]);
-  }
-
-  const parsedArgs = parseToolArgs(args);
-  const target = parsedArgs.path ?? parsedArgs.file ?? parsedArgs.file_path ?? '';
-  if (target) return `${isDryRun ? 'Checked' : 'Updated'} ${displayToolPath(target)}`;
-  return null;
-}
-
-function textBetweenTag(text, tag) {
-  const re = new RegExp(`<${tag}[^>]*>([\\s\\S]*?)<\\/${tag}>`, 'i');
-  const match = re.exec(String(text ?? ''));
-  return match ? match[1].trim() : '';
-}
-
-// Strip the most common inline-markdown markers so a one-line card summary
-// reads as plain prose ("**not clean**" → "not clean", "`x`" → "x"). Block
-// markers (#, >, -, 1.) at line start are dropped too. Whitespace is collapsed
-// by the caller's truncateSingleLine.
-function stripInlineMarkdown(value) {
-  return String(value ?? '')
-    .replace(/^\s{0,3}(?:#{1,6}\s+|>\s+|[-*+]\s+|\d+\.\s+)/, '')
-    .replace(/\*\*([^*]+)\*\*/g, '$1')
-    .replace(/__([^_]+)__/g, '$1')
-    .replace(/(?<!\*)\*(?!\*)([^*]+)\*(?!\*)/g, '$1')
-    .replace(/`([^`]+)`/g, '$1')
-    .trim();
-}
-
-function firstAgentResultLine(text) {
-  const finalAnswer = textBetweenTag(text, 'final-answer') || textBetweenTag(text, 'result');
-  const raw = finalAnswer || text;
-  for (const line of String(raw ?? '').split('\n')) {
-    const trimmed = line.trim();
-    if (!trimmed) continue;
-    if (/^agent result\b/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 (/^(?:agent task|status|type|target|role|agent|preset|model|effort|fast|limits|session|task-id|task_id|notification|queueDepth):\s*/i.test(trimmed)) continue;
-    if (/^\[[a-z-]+:\s*[^\]]*\]$/i.test(trimmed)) continue;
-    return truncateSingleLine(trimmed, AGENT_SURFACE_BRIEF_MAX);
-  }
-  return '';
-}
-
-function summarizeGenericResult(text) {
-  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 (parsed && typeof parsed === 'object') {
-        const status = firstText(parsed.status, parsed.state, parsed.result, parsed.message);
-        if (status) return truncateSingleLine(titleStatus(status), AGENT_SURFACE_BRIEF_MAX);
-        if (parsed.cwd) return truncateSingleLine(parsed.cwd, AGENT_SURFACE_BRIEF_MAX);
-        if (typeof parsed.ok === 'boolean') return parsed.ok ? 'Ok' : 'Failed';
-        for (const key of ['items', 'results', 'resources', 'templates', 'providers', 'schedules', 'channels', 'tools']) {
-          if (Array.isArray(parsed[key])) return `${parsed[key].length} ${pluralize(parsed[key].length, (key.slice(0, -1) || 'item').toLowerCase())}`;
-        }
-      }
-    } catch {
-      return null;
-    }
-  }
-
-  const line = firstAgentResultLine(text) || trimmed.split('\n').map((item) => item.trim()).find(Boolean) || '';
-  if (!line || line === '{' || line === '[') return null;
-  if (/^(ok|done|success|saved|sent|updated|reloaded|connected|enabled|disabled|active|inactive)$/i.test(line)) {
-    return titleStatus(line);
-  }
-  return truncateSingleLine(line, AGENT_SURFACE_BRIEF_MAX);
-}
-
-// Error-cause extractor (audit HIGH): when a tool result is an error, surface
-// the actual cause line instead of a bare "Failed"/raw first line. Handles
-// JSON error envelopes ({error|message|cause|detail}) and plain-text bodies
-// (first line that carries error-ish signal, else first non-empty line).
-// Exported for ToolExecution's collapsed detail row.
-export function extractErrorCause(resultText) {
-  const text = String(resultText ?? '').trim();
-  if (!text) return '';
-  // JSON envelope: prefer explicit error-ish keys.
-  if (text.startsWith('{') || text.startsWith('[')) {
-    try {
-      const parsed = JSON.parse(text);
-      const obj = Array.isArray(parsed) ? parsed[0] : parsed;
-      if (obj && typeof obj === 'object') {
-        const cause = firstText(
-          typeof obj.error === 'string' ? obj.error : obj.error?.message,
-          obj.message, obj.cause, obj.detail, obj.reason, obj.status,
-        );
-        if (cause) return truncateSingleLine(String(cause), AGENT_SURFACE_BRIEF_MAX);
-      }
-    } catch { /* fall through to text scan */ }
-  }
-  const lines = text.split('\n').map((l) => l.trim()).filter(Boolean);
-  // Prefer the first line that looks like an error statement.
-  const errorish = lines.find((l) => /\b(error|failed|failure|denied|refused|timed?\s*out|timeout|not\s+found|missing|invalid|cannot|can't|exception|exit\s+(?:code\s+)?[1-9])\b/i.test(l));
-  const picked = errorish || lines[0] || '';
-  return truncateSingleLine(stripInlineMarkdown(picked), AGENT_SURFACE_BRIEF_MAX);
-}
-
-/**
- * Derive a short semantic one-liner for a completed tool call using only the
- * tool name, parsed args, and the raw result text. Returns null when nothing
- * reliable can be derived, so the caller falls back to the raw result block.
- */
-export function summarizeToolResult(name, args, resultText, isError = false) {
-  if (isError) {
-    // Audit HIGH: errors used to disable semantic summaries entirely, leaving
-    // the UI with a raw first line or a bare "Failed". Surface the extracted
-    // cause so the collapsed card answers "why" without ctrl+o.
-    const cause = extractErrorCause(resultText);
-    return cause || null;
-  }
-  const text = String(resultText ?? '');
-  const trimmed = text.trim();
-  if (/^(?:undefined|null)$/i.test(trimmed)) return null;
-  if (isMcpToolName(name)) return trimmed ? firstAgentResultLine(text) || null : null;
-  const normalized = normalizeToolName(name);
-
-  switch (normalized) {
-    case 'read':
-    case 'view_image':
-    case 'read_mcp_resource': {
-      if (/^\[image:/i.test(trimmed)) return 'Image';
-      if (!trimmed) return null;
-      const n = text.split('\n').length;
-      return `${n} ${pluralize(n, 'line')}`;
-    }
-    case 'apply_patch': {
-      const updateSummary = summarizeUpdateResult(text, args);
-      if (updateSummary) return updateSummary;
-      // Prefer explicit additions/removals hints if the result text states them.
-      const add = /(\d+)\s+addition/i.exec(text);
-      const rem = /(\d+)\s+removal/i.exec(text);
-      if (add || rem) {
-        const a = add ? Number(add[1]) : 0;
-        const r = rem ? Number(rem[1]) : 0;
-        return `+${a} -${r}`;
-      }
-      // Else count unified-diff style +/- lines (ignore +++/--- file headers).
-      let a = 0;
-      let r = 0;
-      for (const line of text.split('\n')) {
-        if (/^\+\+\+|^---/.test(line)) continue;
-        if (/^\+/.test(line)) a += 1;
-        else if (/^-/.test(line)) r += 1;
-      }
-      if (a > 0 || r > 0) return `+${a} -${r}`;
-      return null;
-    }
-    case 'grep': {
-      if (!trimmed || !looksLineOriented(text)) return null;
-      if (looksLikeZeroResultText(text)) return '0 matches';
-      const n = countNonEmptyLines(text);
-      if (n === 0) return null;
-      return `${n} ${pluralize(n, 'match', 'matches')}`;
-    }
-    case 'glob': {
-      if (!trimmed || !looksLineOriented(text)) return null;
-      if (looksLikeZeroResultText(text)) return '0 files';
-      const n = countNonEmptyLines(text);
-      if (n === 0) return null;
-      return `${n} ${pluralize(n, 'file')}`;
-    }
-    case 'find': {
-      if (!trimmed || !looksLineOriented(text)) return null;
-      if (looksLikeZeroResultText(text)) return '0 candidates';
-      const n = countNonEmptyLines(text);
-      if (n === 0) return null;
-      return `${n} ${pluralize(n, 'candidate')}`;
-    }
-    case 'list':
-    case 'ls': {
-      if (!trimmed || !looksLineOriented(text)) return null;
-      if (looksLikeZeroResultText(text)) return '0 entries';
-      const n = countNonEmptyLines(text);
-      if (n === 0) return null;
-      return `${n} ${pluralize(n, 'entry', 'entries')}`;
-    }
-    case 'shell':
-    case 'bash':
-    case 'bash_session':
-    case 'shell_command':
-    case 'job_wait': {
-      if (!trimmed) return '(No Output)';
-      const job = /^\[(?:task_id|job):\s*([^\]]+)\]/mi.exec(text);
-      const status = /^\[status:\s*([^\]]+)\]/mi.exec(text);
-      const exit = /^\[exit:\s*([^\]]+)\]/mi.exec(text);
-      if (job || status || exit) {
-        return compactParts([
-          job ? job[1] : '',
-          status ? titleStatus(status[1]) : '',
-          exit ? `Exit ${exit[1]}` : '',
-        ]);
-      }
-      const firstLine = trimmed.split('\n').map((line) => line.trim()).find(Boolean) || trimmed;
-      return truncateSingleLine(firstLine, AGENT_SURFACE_BRIEF_MAX);
-    }
-    case 'code_graph': {
-      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';
-      return null;
-    }
-    case 'web_fetch':
-    case 'fetch': {
-      // Audit HIGH: channel `fetch` (Discord message fetch — args carry
-      // channel/messageId/limit, never url/uri) was summarized as a WEB fetch,
-      // so its result missed both the status/size probes and fell to raw JSON.
-      // Route it to the generic JSON/text summarizer instead.
-      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);
-        }
-      }
-      // Status: require a status-like context (HTTP NNN, "Status: NNN",
-      // or "NNN OK"/"NNN Not Found") rather than any bare 3-digit number.
-      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(text);
-      const size = /\b(\d+(?:\.\d+)?\s?(?:[KMGT]?B|bytes))\b/i.exec(text);
-      if (size && status) return `${size[1]} · HTTP ${status[1]}`;
-      if (size) return size[1];
-      if (status) return `HTTP ${status[1]}`;
-      return null;
-    }
-    case 'download_attachment':
-      return summarizeGenericResult(text);
-    case 'search': {
-      const match = /(\d+)\s+results?/i.exec(text);
-      if (match) {
-        const n = Number(match[1]);
-        return `${n} ${pluralize(n, 'result')}`;
-      }
-      return null;
-    }
-    case 'search_query':
-    case 'image_query':
-    case 'web_search':
-    case 'web_search_call': {
-      const match = /(\d+)\s+results?/i.exec(text);
-      if (match) {
-        const n = Number(match[1]);
-        return `${n} ${pluralize(n, 'result')}`;
-      }
-      return trimmed ? firstAgentResultLine(text) || null : null;
-    }
-    case 'explore': {
-      return trimmed ? firstAgentResultLine(text) || null : null;
-    }
-    case 'recall':
-    case 'search_memories':
-    case 'memory': {
-      if (!trimmed || trimmed === '(no results)' || looksLikeZeroResultText(text)) return '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);
-    }
-    case 'remember':
-    case 'save_memory':
-    case 'update_memory':
-    case 'reply':
-    case 'react':
-    case 'edit_message':
-    case 'activate_channel_bridge':
-    case 'inject_command':
-    case 'request_user_input':
-    case 'update_plan':
-    case 'diagnostics':
-    case 'open_config':
-    case 'provider_status':
-    case 'channel_status':
-    case 'schedule_status':
-    case 'schedule_control':
-    case 'trigger_schedule':
-    case 'reload_config':
-    case 'cwd':
-    case 'list_mcp_resources':
-    case 'list_mcp_resource_templates':
-      return summarizeGenericResult(text);
-    case 'skill':
-    case 'skill_execute':
-    case 'skill_view':
-    case 'skills_list':
-    case 'use_skill': {
-      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')}`;
-        const lines = countNonEmptyLines(text);
-        return lines > 0 ? `${lines} ${pluralize(lines, 'skill')}` : null;
-      }
-      if (target) {
-        const verb = normalized === 'skill' || normalized === 'skill_view' ? 'Loaded' : 'Used';
-        return `${verb} ${truncateToolText(target, 80)}`;
-      }
-      return trimmed ? firstAgentResultLine(text) || null : null;
-    }
-    case 'agent':
-    case 'task': {
-      // Status-check (list/status) envelopes start with "agents: N" / "tasks: M"
-      // (or "(no agents or tasks)"). Collapse them to a tight count summary
-      // instead of leaking the raw "agents: 3 …" worker dump into the card.
-      if (/^\(no agents or tasks\)$/im.test(text)) return 'No agents or tasks';
-      const agentsCount = /^agents:\s*(\d+)/im.exec(text);
-      const tasksCount = /^tasks:\s*(\d+)/im.exec(text);
-      if (agentsCount || tasksCount) {
-        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';
-      }
-      const answerLine = firstAgentResultLine(text);
-      // Agent/task result cards show only a one-liner; full report via ctrl+o.
-      if (answerLine) return truncateSingleLine(stripInlineMarkdown(answerLine), AGENT_SURFACE_BRIEF_MAX);
-      const task = /^agent task:\s*(\S+)/mi.exec(text);
-      const status = /^status:\s*([^\s(]+)/mi.exec(text);
-      const agent = /^agent:\s*(.+)$/mi.exec(text);
-      const preset = /^preset:\s*(.+)$/mi.exec(text);
-      const model = /^model:\s*(.+)$/mi.exec(text);
-      const limits = /^limits:\s*(.+)$/mi.exec(text);
-      const agentModel = compactParts([
-        displayAgentName(agent ? agent[1] : ''),
-        displayModelName(model ? model[1] : ''),
-      ]);
-      if (agentModel) return agentModel;
-      const parts = [
-        task ? task[1] : '',
-        agent ? agent[1] : '',
-        preset ? preset[1] : '',
-        model ? model[1] : '',
-        status ? titleStatus(status[1]) : '',
-        limits ? limits[1] : '',
-      ].filter(Boolean);
-      if (parts.length) return compactParts(parts);
-      if (task) return status ? `${task[1]} ${titleStatus(status[1])}` : task[1];
-      return null;
-    }
-    default:
-      return null;
-  }
-}
-
-export function isExplorerSurface(label) {
-  return label === 'Read' || label === 'Search';
-}
-
-function truncateAgentSurfaceBrief(value, max = AGENT_SURFACE_BRIEF_MAX) {
-  const text = String(value ?? '').replace(/\s+/g, ' ').trim();
-  if (!text) return '';
-  if (text.length <= max) return text;
-  return `${text.slice(0, Math.max(1, max - 1))}\u2026`;
-}
-
-// Tight one-liner for an agent/task card: prefer the inbound prompt/message for
-// spawn/send, or a stripped first line of the result when a response landed.
-export function summarizeAgentSurfaceBrief(name, args, resultText, { isError = false, isResponse = false } = {}) {
-  const a = parseToolArgs(args);
-  const action = String(a?.type || a?.action || '').toLowerCase();
-  const text = String(resultText ?? '').trim();
-  if (isResponse && text) {
-    const fromResult = summarizeToolResult(name, args, text, isError);
-    if (fromResult) return truncateAgentSurfaceBrief(stripInlineMarkdown(fromResult));
-    const line = firstAgentResultLine(text);
-    if (line) return truncateAgentSurfaceBrief(stripInlineMarkdown(line));
-  }
-  const outbound = firstText(a?.prompt, a?.message);
-  if (outbound && (action === 'spawn' || action === 'send' || !action)) {
-    return truncateAgentSurfaceBrief(outbound);
-  }
-  if ((action === 'spawn' || action === 'send') && text && !isResponse) {
-    const fromResult = summarizeToolResult(name, args, text, isError);
-    if (fromResult) return truncateAgentSurfaceBrief(stripInlineMarkdown(fromResult));
-  }
-  return '';
-}
-
-export function isMemorySurface(label) {
-  return label === 'Memory';
-}
-
 // ── Aggregate tool-card classification & formatting ──────────────
 
 export const CATEGORY_ORDER = [
@@ -1121,7 +333,6 @@ const TOOL_CATEGORY = new Map([
   ['web_search_call', 'Web Research'],
   ['web_fetch', 'Web Research'],
   ['fetch', 'Web Research'],
-  ['download_attachment', 'Web Research'],
   ['recall', 'Memory'],
   ['recall_memory', 'Memory'],
   ['search_memories', 'Memory'],
@@ -1139,23 +350,11 @@ const TOOL_CATEGORY = new Map([
   ['task', 'Task'],
   ['agent', 'Agent'],
   ['reply', 'Channel'],
-  ['react', 'Channel'],
-  ['edit_message', 'Channel'],
-  ['activate_channel_bridge', 'Channel'],
-  ['inject_command', 'Channel'],
-  ['diagnostics', 'Setup'],
-  ['open_config', 'Setup'],
-  ['provider_status', 'Setup'],
-  ['channel_status', 'Setup'],
-  ['schedule_status', 'Setup'],
-  ['schedule_control', 'Setup'],
-  ['reload_config', 'Setup'],
   ['list_mcp_resources', 'Setup'],
   ['list_mcp_resource_templates', 'Setup'],
   ['cwd', 'Setup'],
   ['request_user_input', 'Setup'],
   ['update_plan', 'Setup'],
-  ['trigger_schedule', 'Schedule'],
   ['skill', 'Skill'],
   ['skill_execute', 'Skill'],
   ['skill_view', 'Skill'],
@@ -1285,8 +484,6 @@ export function toolWorkUnit(name, args = {}, category = '') {
     case 'web_fetch':
     case 'fetch':
       return unitDescriptor('Web Research', { count: queryCount(a, 'url', 'urls', 'uri', 'uris') || 1, active: 'Fetching', done: 'Fetched', noun: 'URL', pluralNoun: 'URLs' });
-    case 'download_attachment':
-      return unitDescriptor('Web Research', { count: queryCount(a, 'url', 'urls', 'filename', 'name') || 1, active: 'Downloading', done: 'Downloaded', noun: 'attachment' });
     case 'recall':
     case 'recall_memory':
     case 'search_memories':
@@ -1317,16 +514,6 @@ export function toolWorkUnit(name, args = {}, category = '') {
       return unitDescriptor('Skill', { count: queryCount(a, 'name', 'skill', 'skill_name', 'query', 'q') || 1, noun: 'skill' });
     case 'reply':
       return unitDescriptor('Channel', { count: queryCount(a, 'messages', 'messageId', 'text') || 1, noun: 'message' });
-    case 'react':
-      return unitDescriptor('Channel', { count: queryCount(a, 'emoji', 'messageId') || 1, active: 'Reacting', done: 'Reacted', noun: 'reaction' });
-    case 'edit_message':
-      return unitDescriptor('Channel', { count: queryCount(a, 'messageId', 'text') || 1, active: 'Editing', done: 'Edited', noun: 'message' });
-    case 'activate_channel_bridge':
-      return unitDescriptor('Channel', { active: 'Toggling', done: 'Toggled', noun: 'channel bridge' });
-    case 'inject_command':
-      return unitDescriptor('Channel', { count: queryCount(a, 'command', 'text', 'name') || 1, active: 'Injecting', done: 'Injected', noun: 'command' });
-    case 'trigger_schedule':
-      return unitDescriptor('Schedule', { count: queryCount(a, 'name', 'id') || 1, noun: 'schedule' });
     case 'code_graph': {
       const mode = String(a.mode || a.action || '').toLowerCase();
       const searching = mode === 'search' || mode === 'find_symbol' || mode === 'references' || mode === 'callers' || mode === 'callees';
@@ -1341,20 +528,6 @@ export function toolWorkUnit(name, args = {}, category = '') {
       return unitDescriptor('Setup', { active: 'Asking', done: 'Asked', noun: 'user' });
     case 'update_plan':
       return unitDescriptor('Setup', { active: 'Updating', done: 'Updated', noun: 'plan' });
-    case 'diagnostics':
-      return unitDescriptor('Setup', { active: 'Checking', done: 'Checked', noun: 'diagnostic' });
-    case 'open_config':
-      return unitDescriptor('Setup', { active: 'Opening', done: 'Opened', noun: 'config' });
-    case 'provider_status':
-      return unitDescriptor('Setup', { active: 'Checking', done: 'Checked', noun: 'provider' });
-    case 'channel_status':
-      return unitDescriptor('Setup', { active: 'Checking', done: 'Checked', noun: 'channel' });
-    case 'schedule_status':
-      return unitDescriptor('Setup', { active: 'Checking', done: 'Checked', noun: 'schedule' });
-    case 'schedule_control':
-      return unitDescriptor('Setup', { active: 'Updating', done: 'Updated', noun: 'schedule' });
-    case 'reload_config':
-      return unitDescriptor('Setup', { active: 'Reloading', done: 'Reloaded', noun: 'config' });
     case 'list_mcp_resources':
       return unitDescriptor('Setup', { active: 'Listing', done: 'Listed', noun: 'MCP resource' });
     case 'list_mcp_resource_templates':
@@ -1504,9 +677,18 @@ export function formatAggregateDetail(summaries) {
     match = /^(?:Found\s+)?(\d+)\s+([a-z]+)$/i.exec(text);
     if (match) {
       const nounRaw = match[2].toLowerCase();
-      const singular = nounRaw.endsWith('ies') ? `${nounRaw.slice(0, -3)}y` : nounRaw.endsWith('s') ? nounRaw.slice(0, -1) : nounRaw;
-      const plural = nounRaw.endsWith('s') ? nounRaw : `${nounRaw}s`;
-      const key = `found_${plural}`;
+      // Normalize to a canonical singular so singular/plural variants of the
+      // SAME noun merge into one metric. Previously "48 matches" keyed as
+      // found_matches while "1 match" keyed as found_matchs (naive +s), so the
+      // detail row showed "48 matches, 1 match" instead of "49 matches".
+      const singular = nounRaw.endsWith('ies') ? `${nounRaw.slice(0, -3)}y`
+        : /(?:ch|sh|x|z|s)es$/.test(nounRaw) ? nounRaw.slice(0, -2)
+          : nounRaw.endsWith('s') ? nounRaw.slice(0, -1)
+            : nounRaw;
+      const plural = singular.endsWith('y') ? `${singular.slice(0, -1)}ies`
+        : /(?:ch|sh|x|z|s)$/.test(singular) ? `${singular}es`
+          : `${singular}s`;
+      const key = `found_${singular}`;
       const metric = addMetric(key, { count: 0, singular, plural, render: (m) => `${m.count} ${pluralize(m.count, m.singular, m.plural)}` });
       metric.count += Number(match[1]);
       continue;