@stigmer/react 3.0.9-dev.20260615153829 → 3.1.0

package/execution/ToolCallGroup.js

@@ -1,94 +1,12 @@
 "use client";
-import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-import { memo, useEffect, useMemo, useRef, useState } from "react";
-import { ApprovalAction, ToolCallStatus, } from "@stigmer/protos/ai/stigmer/agentic/agentexecution/v1/enum_pb";
+import { jsx as _jsx } from "react/jsx-runtime";
+import { memo, useMemo } from "react";
 import { cn } from "@stigmer/theme";
 import { useRenderTracer } from "../internal/dev";
 import { ToolCallItem } from "./ToolCallItem";
-import { resolveToolCategoryFromCall, extractPrimaryArg } from "./tool-categories";
-function isResolvedApproval(tc) {
-    return (tc.approvalAction === ApprovalAction.APPROVE ||
-        tc.approvalAction === ApprovalAction.SKIP ||
-        tc.approvalAction === ApprovalAction.REJECT);
-}
-function deriveAggregateStatus(toolCalls) {
-    let hasRunning = false;
-    let hasWaiting = false;
-    let hasFailed = false;
-    let allTerminal = true;
-    for (const tc of toolCalls) {
-        switch (tc.status) {
-            case ToolCallStatus.TOOL_CALL_RUNNING:
-                hasRunning = true;
-                allTerminal = false;
-                break;
-            case ToolCallStatus.TOOL_CALL_WAITING_APPROVAL:
-                if (isResolvedApproval(tc)) {
-                    break;
-                }
-                hasWaiting = true;
-                allTerminal = false;
-                break;
-            case ToolCallStatus.TOOL_CALL_FAILED:
-                hasFailed = true;
-                break;
-            case ToolCallStatus.TOOL_CALL_COMPLETED:
-            case ToolCallStatus.TOOL_CALL_SKIPPED:
-                break;
-            default:
-                allTerminal = false;
-                break;
-        }
-    }
-    if (hasRunning)
-        return "running";
-    if (hasWaiting)
-        return "waiting";
-    if (hasFailed)
-        return "failed";
-    if (allTerminal)
-        return "completed";
-    return "pending";
-}
-function defaultFormatSummary(toolCalls, status) {
-    if (toolCalls.length === 1) {
-        const tc = toolCalls[0];
-        const cat = resolveToolCategoryFromCall(tc);
-        const primary = extractPrimaryArg(tc);
-        if (primary) {
-            const truncated = primary.length > 60 ? primary.slice(0, 57) + "\u2026" : primary;
-            return `${cat.label}: ${truncated}`;
-        }
-        return cat.label;
-    }
-    const noun = toolCalls.length === 1 ? "tool" : "tools";
-    switch (status) {
-        case "running":
-            return `Running ${toolCalls.length} ${noun}`;
-        case "waiting":
-            return "Waiting for approval";
-        case "failed":
-            return `Ran ${toolCalls.length} ${noun} (with errors)`;
-        case "completed":
-            return `Ran ${toolCalls.length} ${noun}`;
-        case "pending":
-            return `${toolCalls.length} ${noun} pending`;
-    }
-}
-const STATUS_ICON = {
-    running: SpinnerIcon,
-    waiting: ClockIcon,
-    failed: XCircleIcon,
-    completed: CheckCircleIcon,
-    pending: DotIcon,
-};
-const STATUS_COLOR = {
-    running: "text-foreground",
-    waiting: "text-warning",
-    failed: "text-destructive",
-    completed: "text-success",
-    pending: "text-muted-foreground",
-};
+import { ToolRunGroup } from "./ToolRunGroup";
+import { segmentToolCalls } from "./segment-tool-calls";
+import { isCollapsedToolCall } from "./tool-categories";
 /**
  * Shallow comparison for `ToolCallGroupProps`.
  *
@@ -112,49 +30,42 @@ export function toolCallGroupPropsEqual(prev, next) {
         prev.className === next.className);
 }
 /**
- * Renders a summary line for a group of tool calls from a single
- * AI turn. Click to expand and see individual tool calls.
+ * Renders one AI turn's tool activity as a **persistent-row timeline** rather
+ * than a collapsible "Ran N tools" box. Each call stays visible after it
+ * settles, so completed work is never hidden behind a pill — the thread reads
+ * like a virtual human at work.
  *
- * Two-level progressive disclosure:
- * 1. **Collapsed** — aggregate status icon + summary label.
- * 2. **Expanded** — list of {@link ToolCallItem} rows, each
- *    expandable to show detail (args, result, error, timing) or
- *    a nested sub-agent thread.
+ * The turn is segmented by {@link segmentToolCalls}:
+ * - high-signal calls (edits, shell, MCP, sub-agents, …) render as persistent
+ *   {@link ToolCallItem} rows; a content-bearing call shows its body inline
+ *   (no card chevron), bounded by a single in-place reveal;
+ * - runs of consecutive low-signal same-category calls (read / list / search)
+ *   fold into one collapsible {@link ToolRunGroup} chip — the *only* collapse,
+ *   because that is the only genuine noise.
  *
- * Default summaries use active-voice phrasing ("Ran 3 tools",
- * "Running 2 tools") with category-aware labels for single tools
- * (e.g., "Shell: ls -la /tmp"). Platform builders can override
- * via the `formatSummary` prop.
+ * The rows are clustered under a light left rail (the neutral counterpart to
+ * {@link SubAgentSection}'s primary-tinted rail for delegated work), keeping a
+ * turn's tools visually associated with their AI message without a tab that
+ * hides things.
  *
- * Wrapped in `React.memo` with a custom comparator that checks
- * `toolCalls` elements by reference (structural sharing keeps
- * individual `ToolCall` objects stable for unchanged calls).
+ * Wrapped in `React.memo` with a custom comparator that checks `toolCalls`
+ * elements by reference (structural sharing keeps individual `ToolCall` objects
+ * stable for unchanged calls), so settled rows skip re-renders while siblings
+ * stream (DD-009/010).
  *
  * @example
  * ```tsx
  * <ToolCallGroup toolCalls={message.toolCalls} />
  * ```
  */
-export const ToolCallGroup = memo(function ToolCallGroup({ toolCalls, subAgentExecutions, formatSummary, defaultExpanded = false, className, }) {
+export const ToolCallGroup = memo(function ToolCallGroup({ toolCalls, subAgentExecutions, formatSummary, className, }) {
     useRenderTracer("ToolCallGroup", { toolCallCount: toolCalls.length });
-    const status = deriveAggregateStatus(toolCalls);
-    const isActive = status === "running" || status === "pending" || status === "waiting";
-    const [expanded, setExpanded] = useState(defaultExpanded || isActive);
-    const userToggledRef = useRef(false);
-    useEffect(() => {
-        if (userToggledRef.current)
-            return;
-        if (isActive) {
-            setExpanded(true);
-        }
-        else {
-            setExpanded(false);
-        }
-    }, [isActive]);
-    const handleToggle = () => {
-        userToggledRef.current = true;
-        setExpanded((v) => !v);
-    };
+    // Drop runner-collapsed duplicates (a superseded same-turn denial twin of an
+    // approval gate) so one gated resource renders one card, not two. The blanked
+    // twin is kept in the persisted transcript (the backend's append-only guard
+    // forbids dropping it); it is simply not drawn.
+    const visibleToolCalls = useMemo(() => toolCalls.filter((tc) => !isCollapsedToolCall(tc)), [toolCalls]);
+    const segments = useMemo(() => segmentToolCalls(visibleToolCalls), [visibleToolCalls]);
     const subAgentMap = useMemo(() => {
         if (!subAgentExecutions || subAgentExecutions.length === 0)
             return null;
@@ -164,34 +75,14 @@ export const ToolCallGroup = memo(function ToolCallGroup({ toolCalls, subAgentEx
         }
         return map;
     }, [subAgentExecutions]);
-    if (toolCalls.length === 0)
+    if (visibleToolCalls.length === 0)
         return null;
-    const summary = formatSummary
-        ? formatSummary(toolCalls)
-        : defaultFormatSummary(toolCalls, status);
-    const Icon = STATUS_ICON[status];
-    const ariaLabel = `${summary}, ${status}`;
-    return (_jsxs("div", { role: "group", "aria-label": ariaLabel, className: cn("rounded-md border border-border bg-muted-faint", className), children: [_jsxs("button", { type: "button", "aria-expanded": expanded, onClick: handleToggle, className: cn("flex w-full items-center gap-2 px-2.5 py-1.5 text-left text-xs text-muted-foreground transition-colors", "hover:bg-muted-subtle", "cursor-pointer"), children: [_jsx("span", { className: cn("shrink-0", STATUS_COLOR[status]), "aria-hidden": "true", children: _jsx(Icon, {}) }), _jsx("span", { className: "min-w-0 flex-1 truncate", children: summary }), _jsx(ChevronIcon, { expanded: expanded })] }), _jsx("div", { className: cn("grid transition-[grid-template-rows] duration-150 ease-out", expanded ? "grid-rows-[1fr]" : "grid-rows-[0fr]"), children: _jsx("div", { className: "overflow-hidden", children: expanded && (_jsx("div", { className: "border-t border-border-muted", children: toolCalls.map((tc) => (_jsx(ToolCallItem, { toolCall: tc, subAgentExecution: subAgentMap?.get(tc.id) ?? null }, tc.id || tc.name))) })) }) })] }));
+    const ariaLabel = `${visibleToolCalls.length} tool ${visibleToolCalls.length === 1 ? "call" : "calls"}`;
+    return (_jsx("div", { role: "group", "aria-label": ariaLabel, "data-cursor-target": "tool-call-group", className: cn(
+        // Cursor-style: each tool call (and folded run chip) is its own
+        // self-contained card; the turn's tools stack with a small gap between
+        // them rather than sharing a left rail, so the thread reads as a column
+        // of discrete cards.
+        "flex flex-col gap-2", className), children: segments.map((segment) => segment.kind === "run" ? (_jsx(ToolRunGroup, { category: segment.category, toolCalls: segment.toolCalls, formatLabel: formatSummary }, segment.key)) : (_jsx(ToolCallItem, { toolCall: segment.toolCall, subAgentExecution: subAgentMap?.get(segment.toolCall.id) ?? null }, segment.key))) }));
 }, toolCallGroupPropsEqual);
-// ---------------------------------------------------------------------------
-// Inline SVG icons — same as SP1, kept inline for SDK independence
-// ---------------------------------------------------------------------------
-function SpinnerIcon() {
-    return (_jsx("svg", { width: "12", height: "12", viewBox: "0 0 12 12", fill: "none", stroke: "currentColor", strokeWidth: "1.5", className: "animate-spin", children: _jsx("path", { d: "M6 1.5A4.5 4.5 0 1 1 1.5 6", strokeLinecap: "round" }) }));
-}
-function ClockIcon() {
-    return (_jsxs("svg", { width: "12", height: "12", viewBox: "0 0 12 12", fill: "none", stroke: "currentColor", strokeWidth: "1.5", strokeLinecap: "round", strokeLinejoin: "round", children: [_jsx("circle", { cx: "6", cy: "6", r: "4.5" }), _jsx("path", { d: "M6 3.5V6L7.5 7.5" })] }));
-}
-function CheckCircleIcon() {
-    return (_jsxs("svg", { width: "12", height: "12", viewBox: "0 0 12 12", fill: "none", stroke: "currentColor", strokeWidth: "1.5", strokeLinecap: "round", strokeLinejoin: "round", children: [_jsx("circle", { cx: "6", cy: "6", r: "4.5" }), _jsx("path", { d: "M4 6L5.5 7.5L8 4.5" })] }));
-}
-function XCircleIcon() {
-    return (_jsxs("svg", { width: "12", height: "12", viewBox: "0 0 12 12", fill: "none", stroke: "currentColor", strokeWidth: "1.5", strokeLinecap: "round", strokeLinejoin: "round", children: [_jsx("circle", { cx: "6", cy: "6", r: "4.5" }), _jsx("path", { d: "M4.5 4.5L7.5 7.5M7.5 4.5L4.5 7.5" })] }));
-}
-function DotIcon() {
-    return (_jsx("svg", { width: "8", height: "8", viewBox: "0 0 8 8", fill: "currentColor", children: _jsx("circle", { cx: "4", cy: "4", r: "3" }) }));
-}
-function ChevronIcon({ expanded }) {
-    return (_jsx("svg", { width: "12", height: "12", viewBox: "0 0 12 12", fill: "none", stroke: "currentColor", strokeWidth: "1.5", strokeLinecap: "round", strokeLinejoin: "round", className: cn("shrink-0 text-muted-foreground transition-transform duration-150", expanded && "rotate-90"), "aria-hidden": "true", children: _jsx("path", { d: "M4.5 2.5L7.5 6L4.5 9.5" }) }));
-}
 //# sourceMappingURL=ToolCallGroup.js.map

package/execution/ToolCallGroup.js.map

@@ -1 +1 @@
-{"version":3,"file":"ToolCallGroup.js","sourceRoot":"","sources":["../../src/execution/ToolCallGroup.tsx"],"names":[],"mappings":"AAAA,YAAY,CAAC;;AAEb,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AAGnE,OAAO,EACL,cAAc,EACd,cAAc,GACf,MAAM,8DAA8D,CAAC;AACtE,OAAO,EAAE,EAAE,EAAE,MAAM,gBAAgB,CAAC;AACpC,OAAO,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC;AAClD,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAC9C,OAAO,EAAE,2BAA2B,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;AA6BnF,SAAS,kBAAkB,CAAC,EAAY;IACtC,OAAO,CACL,EAAE,CAAC,cAAc,KAAK,cAAc,CAAC,OAAO;QAC5C,EAAE,CAAC,cAAc,KAAK,cAAc,CAAC,IAAI;QACzC,EAAE,CAAC,cAAc,KAAK,cAAc,CAAC,MAAM,CAC5C,CAAC;AACJ,CAAC;AAED,SAAS,qBAAqB,CAAC,SAA8B;IAC3D,IAAI,UAAU,GAAG,KAAK,CAAC;IACvB,IAAI,UAAU,GAAG,KAAK,CAAC;IACvB,IAAI,SAAS,GAAG,KAAK,CAAC;IACtB,IAAI,WAAW,GAAG,IAAI,CAAC;IAEvB,KAAK,MAAM,EAAE,IAAI,SAAS,EAAE,CAAC;QAC3B,QAAQ,EAAE,CAAC,MAAM,EAAE,CAAC;YAClB,KAAK,cAAc,CAAC,iBAAiB;gBACnC,UAAU,GAAG,IAAI,CAAC;gBAClB,WAAW,GAAG,KAAK,CAAC;gBACpB,MAAM;YACR,KAAK,cAAc,CAAC,0BAA0B;gBAC5C,IAAI,kBAAkB,CAAC,EAAE,CAAC,EAAE,CAAC;oBAC3B,MAAM;gBACR,CAAC;gBACD,UAAU,GAAG,IAAI,CAAC;gBAClB,WAAW,GAAG,KAAK,CAAC;gBACpB,MAAM;YACR,KAAK,cAAc,CAAC,gBAAgB;gBAClC,SAAS,GAAG,IAAI,CAAC;gBACjB,MAAM;YACR,KAAK,cAAc,CAAC,mBAAmB,CAAC;YACxC,KAAK,cAAc,CAAC,iBAAiB;gBACnC,MAAM;YACR;gBACE,WAAW,GAAG,KAAK,CAAC;gBACpB,MAAM;QACV,CAAC;IACH,CAAC;IAED,IAAI,UAAU;QAAE,OAAO,SAAS,CAAC;IACjC,IAAI,UAAU;QAAE,OAAO,SAAS,CAAC;IACjC,IAAI,SAAS;QAAE,OAAO,QAAQ,CAAC;IAC/B,IAAI,WAAW;QAAE,OAAO,WAAW,CAAC;IACpC,OAAO,SAAS,CAAC;AACnB,CAAC;AAED,SAAS,oBAAoB,CAC3B,SAA8B,EAC9B,MAAuB;IAEvB,IAAI,SAAS,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC3B,MAAM,EAAE,GAAG,SAAS,CAAC,CAAC,CAAC,CAAC;QACxB,MAAM,GAAG,GAAG,2BAA2B,CAAC,EAAE,CAAC,CAAC;QAC5C,MAAM,OAAO,GAAG,iBAAiB,CAAC,EAAE,CAAC,CAAC;QACtC,IAAI,OAAO,EAAE,CAAC;YACZ,MAAM,SAAS,GACb,OAAO,CAAC,MAAM,GAAG,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,GAAG,QAAQ,CAAC,CAAC,CAAC,OAAO,CAAC;YAClE,OAAO,GAAG,GAAG,CAAC,KAAK,KAAK,SAAS,EAAE,CAAC;QACtC,CAAC;QACD,OAAO,GAAG,CAAC,KAAK,CAAC;IACnB,CAAC;IAED,MAAM,IAAI,GAAG,SAAS,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC;IACvD,QAAQ,MAAM,EAAE,CAAC;QACf,KAAK,SAAS;YACZ,OAAO,WAAW,SAAS,CAAC,MAAM,IAAI,IAAI,EAAE,CAAC;QAC/C,KAAK,SAAS;YACZ,OAAO,sBAAsB,CAAC;QAChC,KAAK,QAAQ;YACX,OAAO,OAAO,SAAS,CAAC,MAAM,IAAI,IAAI,gBAAgB,CAAC;QACzD,KAAK,WAAW;YACd,OAAO,OAAO,SAAS,CAAC,MAAM,IAAI,IAAI,EAAE,CAAC;QAC3C,KAAK,SAAS;YACZ,OAAO,GAAG,SAAS,CAAC,MAAM,IAAI,IAAI,UAAU,CAAC;IACjD,CAAC;AACH,CAAC;AAED,MAAM,WAAW,GAAqD;IACpE,OAAO,EAAE,WAAW;IACpB,OAAO,EAAE,SAAS;IAClB,MAAM,EAAE,WAAW;IACnB,SAAS,EAAE,eAAe;IAC1B,OAAO,EAAE,OAAO;CACjB,CAAC;AAEF,MAAM,YAAY,GAAoC;IACpD,OAAO,EAAE,iBAAiB;IAC1B,OAAO,EAAE,cAAc;IACvB,MAAM,EAAE,kBAAkB;IAC1B,SAAS,EAAE,cAAc;IACzB,OAAO,EAAE,uBAAuB;CACjC,CAAC;AAEF;;;;;;;;;GASG;AACH,MAAM,UAAU,uBAAuB,CACrC,IAAkC,EAClC,IAAkC;IAElC,IAAI,IAAI,CAAC,SAAS,CAAC,MAAM,KAAK,IAAI,CAAC,SAAS,CAAC,MAAM;QAAE,OAAO,KAAK,CAAC;IAClE,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;QAC/C,IAAI,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,KAAK,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC;YAAE,OAAO,KAAK,CAAC;IAC5D,CAAC;IACD,OAAO,CACL,IAAI,CAAC,kBAAkB,KAAK,IAAI,CAAC,kBAAkB;QACnD,IAAI,CAAC,aAAa,KAAK,IAAI,CAAC,aAAa;QACzC,IAAI,CAAC,eAAe,KAAK,IAAI,CAAC,eAAe;QAC7C,IAAI,CAAC,SAAS,KAAK,IAAI,CAAC,SAAS,CAClC,CAAC;AACJ,CAAC;AAED;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AACH,MAAM,CAAC,MAAM,aAAa,GAAG,IAAI,CAAC,SAAS,aAAa,CAAC,EACvD,SAAS,EACT,kBAAkB,EAClB,aAAa,EACb,eAAe,GAAG,KAAK,EACvB,SAAS,GACU;IACnB,eAAe,CAAC,eAAe,EAAE,EAAE,aAAa,EAAE,SAAS,CAAC,MAAM,EAAE,CAAC,CAAC;IAEtE,MAAM,MAAM,GAAG,qBAAqB,CAAC,SAAS,CAAC,CAAC;IAChD,MAAM,QAAQ,GAAG,MAAM,KAAK,SAAS,IAAI,MAAM,KAAK,SAAS,IAAI,MAAM,KAAK,SAAS,CAAC;IAEtF,MAAM,CAAC,QAAQ,EAAE,WAAW,CAAC,GAAG,QAAQ,CAAC,eAAe,IAAI,QAAQ,CAAC,CAAC;IACtE,MAAM,cAAc,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC;IAErC,SAAS,CAAC,GAAG,EAAE;QACb,IAAI,cAAc,CAAC,OAAO;YAAE,OAAO;QACnC,IAAI,QAAQ,EAAE,CAAC;YACb,WAAW,CAAC,IAAI,CAAC,CAAC;QACpB,CAAC;aAAM,CAAC;YACN,WAAW,CAAC,KAAK,CAAC,CAAC;QACrB,CAAC;IACH,CAAC,EAAE,CAAC,QAAQ,CAAC,CAAC,CAAC;IAEf,MAAM,YAAY,GAAG,GAAG,EAAE;QACxB,cAAc,CAAC,OAAO,GAAG,IAAI,CAAC;QAC9B,WAAW,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;IACzB,CAAC,CAAC;IAEF,MAAM,WAAW,GAAG,OAAO,CAAC,GAAG,EAAE;QAC/B,IAAI,CAAC,kBAAkB,IAAI,kBAAkB,CAAC,MAAM,KAAK,CAAC;YAAE,OAAO,IAAI,CAAC;QACxE,MAAM,GAAG,GAAG,IAAI,GAAG,EAA6B,CAAC;QACjD,KAAK,MAAM,GAAG,IAAI,kBAAkB,EAAE,CAAC;YACrC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,EAAE,GAAG,CAAC,CAAC;QACvB,CAAC;QACD,OAAO,GAAG,CAAC;IACb,CAAC,EAAE,CAAC,kBAAkB,CAAC,CAAC,CAAC;IAEzB,IAAI,SAAS,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,IAAI,CAAC;IAExC,MAAM,OAAO,GAAG,aAAa;QAC3B,CAAC,CAAC,aAAa,CAAC,SAAS,CAAC;QAC1B,CAAC,CAAC,oBAAoB,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC;IAC5C,MAAM,IAAI,GAAG,WAAW,CAAC,MAAM,CAAC,CAAC;IACjC,MAAM,SAAS,GAAG,GAAG,OAAO,KAAK,MAAM,EAAE,CAAC;IAE1C,OAAO,CACL,eACE,IAAI,EAAC,OAAO,gBACA,SAAS,EACrB,SAAS,EAAE,EAAE,CACX,gDAAgD,EAChD,SAAS,CACV,aAGD,kBACE,IAAI,EAAC,QAAQ,mBACE,QAAQ,EACvB,OAAO,EAAE,YAAY,EACrB,SAAS,EAAE,EAAE,CACX,wGAAwG,EACxG,uBAAuB,EACvB,gBAAgB,CACjB,aAED,eAAM,SAAS,EAAE,EAAE,CAAC,UAAU,EAAE,YAAY,CAAC,MAAM,CAAC,CAAC,iBAAc,MAAM,YACvE,KAAC,IAAI,KAAG,GACH,EACP,eAAM,SAAS,EAAC,yBAAyB,YAAE,OAAO,GAAQ,EAC1D,KAAC,WAAW,IAAC,QAAQ,EAAE,QAAQ,GAAI,IAC5B,EAGT,cACE,SAAS,EAAE,EAAE,CACX,4DAA4D,EAC5D,QAAQ,CAAC,CAAC,CAAC,iBAAiB,CAAC,CAAC,CAAC,iBAAiB,CACjD,YAED,cAAK,SAAS,EAAC,iBAAiB,YAC7B,QAAQ,IAAI,CACX,cAAK,SAAS,EAAC,8BAA8B,YAC1C,SAAS,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,CACrB,KAAC,YAAY,IAEX,QAAQ,EAAE,EAAE,EACZ,iBAAiB,EAAE,WAAW,EAAE,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC,IAAI,IAAI,IAF7C,EAAE,CAAC,EAAE,IAAI,EAAE,CAAC,IAAI,CAGrB,CACH,CAAC,GACE,CACP,GACG,GACF,IACF,CACP,CAAC;AACJ,CAAC,EAAE,uBAAuB,CAAC,CAAC;AAE5B,8EAA8E;AAC9E,mEAAmE;AACnE,8EAA8E;AAE9E,SAAS,WAAW;IAClB,OAAO,CACL,cACE,KAAK,EAAC,IAAI,EACV,MAAM,EAAC,IAAI,EACX,OAAO,EAAC,WAAW,EACnB,IAAI,EAAC,MAAM,EACX,MAAM,EAAC,cAAc,EACrB,WAAW,EAAC,KAAK,EACjB,SAAS,EAAC,cAAc,YAExB,eACE,CAAC,EAAC,4BAA4B,EAC9B,aAAa,EAAC,OAAO,GACrB,GACE,CACP,CAAC;AACJ,CAAC;AAED,SAAS,SAAS;IAChB,OAAO,CACL,eACE,KAAK,EAAC,IAAI,EACV,MAAM,EAAC,IAAI,EACX,OAAO,EAAC,WAAW,EACnB,IAAI,EAAC,MAAM,EACX,MAAM,EAAC,cAAc,EACrB,WAAW,EAAC,KAAK,EACjB,aAAa,EAAC,OAAO,EACrB,cAAc,EAAC,OAAO,aAEtB,iBAAQ,EAAE,EAAC,GAAG,EAAC,EAAE,EAAC,GAAG,EAAC,CAAC,EAAC,KAAK,GAAG,EAChC,eAAM,CAAC,EAAC,kBAAkB,GAAG,IACzB,CACP,CAAC;AACJ,CAAC;AAED,SAAS,eAAe;IACtB,OAAO,CACL,eACE,KAAK,EAAC,IAAI,EACV,MAAM,EAAC,IAAI,EACX,OAAO,EAAC,WAAW,EACnB,IAAI,EAAC,MAAM,EACX,MAAM,EAAC,cAAc,EACrB,WAAW,EAAC,KAAK,EACjB,aAAa,EAAC,OAAO,EACrB,cAAc,EAAC,OAAO,aAEtB,iBAAQ,EAAE,EAAC,GAAG,EAAC,EAAE,EAAC,GAAG,EAAC,CAAC,EAAC,KAAK,GAAG,EAChC,eAAM,CAAC,EAAC,oBAAoB,GAAG,IAC3B,CACP,CAAC;AACJ,CAAC;AAED,SAAS,WAAW;IAClB,OAAO,CACL,eACE,KAAK,EAAC,IAAI,EACV,MAAM,EAAC,IAAI,EACX,OAAO,EAAC,WAAW,EACnB,IAAI,EAAC,MAAM,EACX,MAAM,EAAC,cAAc,EACrB,WAAW,EAAC,KAAK,EACjB,aAAa,EAAC,OAAO,EACrB,cAAc,EAAC,OAAO,aAEtB,iBAAQ,EAAE,EAAC,GAAG,EAAC,EAAE,EAAC,GAAG,EAAC,CAAC,EAAC,KAAK,GAAG,EAChC,eAAM,CAAC,EAAC,kCAAkC,GAAG,IACzC,CACP,CAAC;AACJ,CAAC;AAED,SAAS,OAAO;IACd,OAAO,CACL,cACE,KAAK,EAAC,GAAG,EACT,MAAM,EAAC,GAAG,EACV,OAAO,EAAC,SAAS,EACjB,IAAI,EAAC,cAAc,YAEnB,iBAAQ,EAAE,EAAC,GAAG,EAAC,EAAE,EAAC,GAAG,EAAC,CAAC,EAAC,GAAG,GAAG,GAC1B,CACP,CAAC;AACJ,CAAC;AAED,SAAS,WAAW,CAAC,EAAE,QAAQ,EAAyB;IACtD,OAAO,CACL,cACE,KAAK,EAAC,IAAI,EACV,MAAM,EAAC,IAAI,EACX,OAAO,EAAC,WAAW,EACnB,IAAI,EAAC,MAAM,EACX,MAAM,EAAC,cAAc,EACrB,WAAW,EAAC,KAAK,EACjB,aAAa,EAAC,OAAO,EACrB,cAAc,EAAC,OAAO,EACtB,SAAS,EAAE,EAAE,CACX,kEAAkE,EAClE,QAAQ,IAAI,WAAW,CACxB,iBACW,MAAM,YAElB,eAAM,CAAC,EAAC,wBAAwB,GAAG,GAC/B,CACP,CAAC;AACJ,CAAC"}
+{"version":3,"file":"ToolCallGroup.js","sourceRoot":"","sources":["../../src/execution/ToolCallGroup.tsx"],"names":[],"mappings":"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"}

package/execution/ToolCallItem.d.ts

@@ -12,33 +12,61 @@ export interface ToolCallItemProps {
      */
     readonly subAgentExecution?: SubAgentExecution | null;
     /**
-     * Initial expansion state. Defaults to `false`.
+     * Forces the detail panel open on first render regardless of the
+     * auto-disclosure policy. Defaults to `false`.
      */
     readonly defaultExpanded?: boolean;
+    /**
+     * Whether the row renders as its own self-contained card (a thin rounded
+     * border). Defaults to `true`. Set to `false` when the row is nested inside a
+     * container that already provides the border — e.g. the folded
+     * `ToolRunGroup` chip — where the row falls back to a divider-separated
+     * row to avoid a card-in-a-card.
+     */
+    readonly bordered?: boolean;
     /** Additional CSS class names for the root container. */
     readonly className?: string;
 }
 /**
  * Renders a single tool call as a row in the tool call group.
  *
- * Two rendering modes:
+ * Three rendering modes, set by one rule — **does the body carry content the
+ * one-line row cannot?**
  *
- * - **Non-expandable** (completed/skipped Read): a static `<div>` row
- *   with a clickable {@link FilePathLink}. No chevron, no expansion.
- *   The clickable path IS the complete information.
- * - **Expandable** (all other tools): a `<button>` row that toggles a
- *   {@link ToolCallDetail} or {@link SubAgentSection} detail panel.
+ * - **Non-expandable** (completed/skipped Read): a static `<div>` row with a
+ *   clickable {@link FilePathLink}. The path IS the complete information.
+ * - **Preview** (content-bearing: shell / edit / write / fetch / web-search /
+ *   unknown / mcp): a plain (non-button) header above an **always-visible**
+ *   {@link ToolCallDetail} body — Cursor-style "previews aren't collapsible".
+ *   There is no header chevron; each content block self-bounds with its own
+   *   single in-place reveal (`RevealToggle`), so a long diff or output
+ *   never floods the thread. The body is suppressed only for an `empty` result
+ *   (e.g. a no-output shell), which stays a clean one-line row.
+ * - **Summary / sub-agent** (read / list / search / delete / think, and
+ *   sub-agent delegations): a chevron-gated `div[role=button]` header that
+ *   discloses a body hidden by default — {@link ToolCallDetail}, a
+ *   {@link SubAgentSection}, or, when gated, an inline {@link ApprovalCardBody}.
+ *   {@link useAutoDisclosure} force-opens it while *running* or *awaiting
+ *   approval*, then settles it closed; a manual click always wins thereafter.
+ *
+ * The two disclosure axes — the card-level chevron and a block's
+ * content-overflow reveal — never govern the same body, which is what removes
+ * the old "expand, then Show more" double control.
  *
  * Shows category-aware labels (e.g., "Shell", "Read", "Edit") with
  * the primary argument as a subtitle, a category-specific icon, and
  * an inline approval decision badge when applicable.
  *
+ * Wrapped in `React.memo` — structural sharing (DD-009/010) preserves
+ * the `ToolCall` reference when unchanged, so a settled row skips
+ * re-renders while sibling tools stream.
+ *
  * @example
  * ```tsx
  * <ToolCallItem toolCall={tc} />
  * <ToolCallItem toolCall={tc} subAgentExecution={sub} />
  * ```
  */
-export declare function ToolCallItem({ toolCall, subAgentExecution, defaultExpanded, className, }: ToolCallItemProps): import("react/jsx-runtime").JSX.Element;
+export declare const ToolCallItem: import("react").NamedExoticComponent<ToolCallItemProps>;
 export declare const CATEGORY_ICON: Record<ToolCategory, () => React.JSX.Element>;
 //# sourceMappingURL=ToolCallItem.d.ts.map

package/execution/ToolCallItem.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ToolCallItem.d.ts","sourceRoot":"","sources":["../../src/execution/ToolCallItem.tsx"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,iEAAiE,CAAC;AAChG,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,kEAAkE,CAAC;AAS1G,OAAO,EAAE,KAAK,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAKtD,sCAAsC;AACtC,MAAM,WAAW,iBAAiB;IAChC,gDAAgD;IAChD,QAAQ,CAAC,QAAQ,EAAE,QAAQ,CAAC;IAC5B;;;;OAIG;IACH,QAAQ,CAAC,iBAAiB,CAAC,EAAE,iBAAiB,GAAG,IAAI,CAAC;IACtD;;OAEG;IACH,QAAQ,CAAC,eAAe,CAAC,EAAE,OAAO,CAAC;IACnC,yDAAyD;IACzD,QAAQ,CAAC,SAAS,CAAC,EAAE,MAAM,CAAC;CAC7B;AAED;;;;;;;;;;;;;;;;;;;;GAoBG;AACH,wBAAgB,YAAY,CAAC,EAC3B,QAAQ,EACR,iBAAiB,EACjB,eAAuB,EACvB,SAAS,GACV,EAAE,iBAAiB,2CAuKnB;AAkED,eAAO,MAAM,aAAa,EAAE,MAAM,CAAC,YAAY,EAAE,MAAM,KAAK,CAAC,GAAG,CAAC,OAAO,CAevE,CAAC"}
+{"version":3,"file":"ToolCallItem.d.ts","sourceRoot":"","sources":["../../src/execution/ToolCallItem.tsx"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,iEAAiE,CAAC;AAChG,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,kEAAkE,CAAC;AAgB1G,OAAO,EAAkB,KAAK,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAItE,sCAAsC;AACtC,MAAM,WAAW,iBAAiB;IAChC,gDAAgD;IAChD,QAAQ,CAAC,QAAQ,EAAE,QAAQ,CAAC;IAC5B;;;;OAIG;IACH,QAAQ,CAAC,iBAAiB,CAAC,EAAE,iBAAiB,GAAG,IAAI,CAAC;IACtD;;;OAGG;IACH,QAAQ,CAAC,eAAe,CAAC,EAAE,OAAO,CAAC;IACnC;;;;;;OAMG;IACH,QAAQ,CAAC,QAAQ,CAAC,EAAE,OAAO,CAAC;IAC5B,yDAAyD;IACzD,QAAQ,CAAC,SAAS,CAAC,EAAE,MAAM,CAAC;CAC7B;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAuCG;AACH,eAAO,MAAM,YAAY,yDA+TvB,CAAC;AAmFH,eAAO,MAAM,aAAa,EAAE,MAAM,CAAC,YAAY,EAAE,MAAM,KAAK,CAAC,GAAG,CAAC,OAAO,CAevE,CAAC"}

package/execution/ToolCallItem.js

@@ -1,49 +1,114 @@
 "use client";
 import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-runtime";
-import { useState } from "react";
+import { memo } from "react";
 import { ApprovalAction, ToolCallStatus, } from "@stigmer/protos/ai/stigmer/agentic/agentexecution/v1/enum_pb";
 import { cn } from "@stigmer/theme";
+import { useRenderTracer } from "../internal/dev";
+import { useAutoDisclosure } from "../internal/useAutoDisclosure";
+import { useIsTextTruncated } from "../internal/useIsTextTruncated";
 import { ToolCallDetail, formatDuration } from "./ToolCallDetail";
 import { SubAgentSection } from "./SubAgentSection";
+import { ApprovalCardBody } from "./ApprovalCard";
+import { useApproval } from "./ApprovalContext";
+import { useFileReviewRowState } from "./FileReviewContext";
 import { FilePathLink } from "./FilePathLink";
+import { isFileCategory } from "./tool-categories";
 import { useToolPresentation } from "./tool-presenter";
-import { useSandboxNormalize } from "./SandboxContext";
 import { useThreadSelection } from "./useThreadSelection";
 /**
  * Renders a single tool call as a row in the tool call group.
  *
- * Two rendering modes:
+ * Three rendering modes, set by one rule — **does the body carry content the
+ * one-line row cannot?**
  *
- * - **Non-expandable** (completed/skipped Read): a static `<div>` row
- *   with a clickable {@link FilePathLink}. No chevron, no expansion.
- *   The clickable path IS the complete information.
- * - **Expandable** (all other tools): a `<button>` row that toggles a
- *   {@link ToolCallDetail} or {@link SubAgentSection} detail panel.
+ * - **Non-expandable** (completed/skipped Read): a static `<div>` row with a
+ *   clickable {@link FilePathLink}. The path IS the complete information.
+ * - **Preview** (content-bearing: shell / edit / write / fetch / web-search /
+ *   unknown / mcp): a plain (non-button) header above an **always-visible**
+ *   {@link ToolCallDetail} body — Cursor-style "previews aren't collapsible".
+ *   There is no header chevron; each content block self-bounds with its own
+   *   single in-place reveal (`RevealToggle`), so a long diff or output
+ *   never floods the thread. The body is suppressed only for an `empty` result
+ *   (e.g. a no-output shell), which stays a clean one-line row.
+ * - **Summary / sub-agent** (read / list / search / delete / think, and
+ *   sub-agent delegations): a chevron-gated `div[role=button]` header that
+ *   discloses a body hidden by default — {@link ToolCallDetail}, a
+ *   {@link SubAgentSection}, or, when gated, an inline {@link ApprovalCardBody}.
+ *   {@link useAutoDisclosure} force-opens it while *running* or *awaiting
+ *   approval*, then settles it closed; a manual click always wins thereafter.
+ *
+ * The two disclosure axes — the card-level chevron and a block's
+ * content-overflow reveal — never govern the same body, which is what removes
+ * the old "expand, then Show more" double control.
  *
  * Shows category-aware labels (e.g., "Shell", "Read", "Edit") with
  * the primary argument as a subtitle, a category-specific icon, and
  * an inline approval decision badge when applicable.
  *
+ * Wrapped in `React.memo` — structural sharing (DD-009/010) preserves
+ * the `ToolCall` reference when unchanged, so a settled row skips
+ * re-renders while sibling tools stream.
+ *
  * @example
  * ```tsx
  * <ToolCallItem toolCall={tc} />
  * <ToolCallItem toolCall={tc} subAgentExecution={sub} />
  * ```
  */
-export function ToolCallItem({ toolCall, subAgentExecution, defaultExpanded = false, className, }) {
-    const [expanded, setExpanded] = useState(defaultExpanded);
+export const ToolCallItem = memo(function ToolCallItem({ toolCall, subAgentExecution, defaultExpanded = false, bordered = true, className, }) {
+    useRenderTracer("ToolCallItem", { status: toolCall.status, id: toolCall.id });
     const status = mapToolCallStatus(toolCall);
     const StatusIcon = STATUS_ICON[status];
     const duration = formatDuration(toolCall.startedAt, toolCall.completedAt);
     const isSubAgent = subAgentExecution != null;
-    const { category, label, primaryArg, resultSummary } = useToolPresentation(toolCall);
+    const { category, label, primaryArg, result, resultSummary, disclosure } = useToolPresentation(toolCall);
     const CategoryIcon = CATEGORY_ICON[category];
+    // An unresolved approval gating this exact call (parent or nested sub-agent),
+    // or null. Drives the inline approval panel and forces the row open.
+    const approval = useApproval(toolCall.id);
+    // The card-level disclosure for *summary* rows (preview rows ignore it — their
+    // body is always visible). Force-open only while the row carries live or
+    // actionable content: while it runs, or while it awaits approval; a manual
+    // toggle takes over from there. Called unconditionally to honour the rules of
+    // hooks even though preview rows do not read `expanded`.
+    const autoOpen = toolCall.status === ToolCallStatus.TOOL_CALL_RUNNING || approval != null;
+    const [expanded, handleToggle] = useAutoDisclosure(autoOpen, {
+        initialOpen: defaultExpanded || autoOpen,
+    });
     const displayLabel = isSubAgent
         ? subAgentExecution.subject || subAgentExecution.name || label
         : label;
-    const normalize = useSandboxNormalize();
     const approvalBadge = getApprovalBadge(toolCall);
+    // A flowed file edit stamped with its change set id badges the set's live
+    // review state (pending review / kept / discarded) right on the row — the
+    // observational record stays in place while the decision surface is the
+    // set's own bar. Null for unstamped rows and honest-degradation cases.
+    const reviewState = useFileReviewRowState(toolCall.fileChangeSetId, primaryArg);
+    const reviewBadge = reviewState ? REVIEW_BADGE[reviewState] : null;
     const selection = useThreadSelection("tool-call", toolCall.id);
+    // Search/list show their query/path as the header subtitle (truncated). Track
+    // whether it actually clips so the expanded detail can restate the full,
+    // wrapping value only when needed — avoiding a redundant repeat of a short
+    // value the header already shows in full. Gated to these two categories so
+    // only the rows that consume the signal pay for the measurement.
+    const measuresSubtitle = category === "search" || category === "list";
+    const { ref: subtitleRef, isTruncated: primaryArgTruncated } = useIsTextTruncated(measuresSubtitle);
+    // Cursor-style chrome: each tool call is its own self-contained card — a thin
+    // rounded neutral border. A pending gate carries a restrained left accent on
+    // the card itself (warning, or destructive for a delete); that accent is the
+    // only "awaiting you" cue now that the amber fill is gone. Nested inside a
+    // folded run chip the card degrades to a divider-separated row (via
+    // `bordered={false}`) so we never draw a card inside a card.
+    const cardClass = bordered
+        ? cn(
+        // border-prominent (not border): a transparent card needs a line the eye
+        // actually catches — the default border token is white at 14% opacity,
+        // which vanishes on the dark thread surface.
+        "rounded-lg border border-border-prominent overflow-hidden", approval != null &&
+            (category === "delete"
+                ? "border-l-2 border-l-destructive"
+                : "border-l-2 border-l-warning"), selection?.isSelected && "ring-1 ring-primary/40")
+        : cn("border-b border-border-muted last:border-b-0", selection?.isSelected && "ring-1 ring-primary/40 rounded-sm");
     // Completed/skipped Read items are non-expandable — the clickable
     // path in the row is the complete information. Failed reads remain
     // expandable to show the error.
@@ -51,20 +116,59 @@ export function ToolCallItem({ toolCall, subAgentExecution, defaultExpanded = fa
         category === "read" &&
         (toolCall.status === ToolCallStatus.TOOL_CALL_COMPLETED ||
             toolCall.status === ToolCallStatus.TOOL_CALL_SKIPPED);
-    const trailingContent = (_jsxs(_Fragment, { children: [approvalBadge && (_jsx("span", { className: cn("shrink-0 rounded px-1 py-0.5 text-[10px] font-medium leading-none", approvalBadge.colorClass), children: approvalBadge.label })), toolCall.mcpServerSlug && (_jsx("span", { className: "shrink-0 rounded bg-muted px-1 py-0.5 font-mono text-muted-foreground", children: toolCall.mcpServerSlug })), _jsx("span", { className: cn("shrink-0", STATUS_COLOR[status]), "aria-hidden": "true", children: _jsx(StatusIcon, {}) }), duration && (_jsx("span", { className: "shrink-0 tabular-nums text-muted-foreground", children: duration })), selection && (_jsx("button", { type: "button", onClick: (e) => {
+    const trailingContent = (_jsxs(_Fragment, { children: [approvalBadge && (_jsx("span", { className: cn("shrink-0 rounded px-1 py-0.5 text-[10px] font-medium leading-none", approvalBadge.colorClass), children: approvalBadge.label })), reviewBadge && (_jsx("span", { className: cn("shrink-0 rounded px-1 py-0.5 text-[10px] font-medium leading-none", reviewBadge.colorClass), "data-cursor-target": "file-review-row-badge", children: reviewBadge.label })), toolCall.mcpServerSlug && (_jsx("span", { className: "shrink-0 rounded bg-muted px-1 py-0.5 font-mono text-muted-foreground", children: toolCall.mcpServerSlug })), _jsx("span", { className: cn("shrink-0", STATUS_COLOR[status]), "aria-hidden": "true", children: _jsx(StatusIcon, {}) }), duration && (_jsx("span", { className: "shrink-0 tabular-nums text-muted-foreground", children: duration })), selection && (_jsx("button", { type: "button", onClick: (e) => {
                     e.stopPropagation();
                     selection.select();
                 }, className: cn("shrink-0 rounded p-0.5 text-muted-foreground hover:text-foreground hover:bg-muted transition-colors", selection.isSelected && "text-primary"), "aria-label": "Inspect tool call", "aria-pressed": selection.isSelected, children: _jsx(InspectIcon, {}) }))] }));
     if (isNonExpandableRead) {
-        return (_jsx("div", { className: cn("border-b border-border-muted last:border-b-0", selection?.isSelected && "ring-1 ring-primary/40 rounded-sm", className), children: _jsxs("div", { className: "flex w-full items-center gap-2 px-2.5 py-1.5 text-xs", children: [_jsx("span", { className: "shrink-0 text-muted-foreground", "aria-hidden": "true", children: _jsx(CategoryIcon, {}) }), _jsxs("span", { className: "min-w-0 flex-1 flex items-center gap-1.5 overflow-hidden", children: [_jsx("span", { className: "shrink-0 font-medium text-foreground", children: displayLabel }), primaryArg && (_jsx(FilePathLink, { path: primaryArg, className: "min-w-0 text-xs" }))] }), trailingContent] }) }));
+        return (_jsx("div", { "data-cursor-target": "tool-call-row", className: cn(cardClass, className), children: _jsxs("div", { className: "flex w-full items-center gap-2 px-2.5 py-1.5 text-xs", children: [_jsx("span", { className: "shrink-0 text-muted-foreground", "aria-hidden": "true", children: _jsx(CategoryIcon, {}) }), _jsxs("span", { className: "min-w-0 flex-1 flex items-center gap-1.5 overflow-hidden", children: [_jsx("span", { className: "shrink-0 font-medium text-foreground", children: displayLabel }), primaryArg && (_jsx(FilePathLink, { path: primaryArg, className: "min-w-0 text-xs" }))] }), trailingContent] }) }));
     }
-    const displaySubtitle = isSubAgent
-        ? null
-        : category === "shell" && primaryArg
-            ? normalize(primaryArg)
-            : primaryArg;
-    return (_jsxs("div", { className: cn("border-b border-border-muted last:border-b-0", selection?.isSelected && "ring-1 ring-primary/40 rounded-sm", className), children: [_jsxs("button", { type: "button", "aria-expanded": expanded, onClick: () => setExpanded((v) => !v), className: cn("flex w-full items-center gap-2 px-2.5 py-1.5 text-left text-xs transition-colors", "hover:bg-muted-subtle", expanded && "bg-muted-faint"), children: [_jsx("span", { className: "shrink-0 text-muted-foreground", "aria-hidden": "true", children: _jsx(CategoryIcon, {}) }), _jsxs("span", { className: "min-w-0 flex-1 flex items-baseline gap-1.5 overflow-hidden", children: [_jsx("span", { className: "shrink-0 font-medium text-foreground", children: displayLabel }), displaySubtitle && (_jsx("span", { className: "min-w-0 truncate text-muted-foreground font-mono", children: displaySubtitle })), !isSubAgent && resultSummary && (_jsx("span", { className: "shrink-0 tabular-nums text-muted-foreground", children: resultSummary }))] }), trailingContent, _jsx(ChevronIcon, { expanded: expanded })] }), expanded && (_jsx("div", { className: "px-2.5 pb-2.5 pt-1", children: isSubAgent ? (_jsx(SubAgentSection, { subAgentExecution: subAgentExecution, collapsible: false })) : (_jsx(ToolCallDetail, { toolCall: toolCall })) }))] }));
-}
+    // Shell shows neither a command subtitle nor an exit summary in the header —
+    // both live in the terminal session body below, so the header stays minimal
+    // (icon + label + status + duration).
+    const displaySubtitle = isSubAgent || category === "shell" ? null : primaryArg;
+    // For file tools the subtitle is a path: render it filename-first through
+    // FilePathLink (full path on hover) rather than the raw, often-absolute string
+    // that buried the file name behind a long prefix.
+    const subtitleIsFilePath = !isSubAgent && primaryArg != null && isFileCategory(category);
+    // Preview categories (shell, edit, write, fetch, web-search, unknown, mcp)
+    // render their body ALWAYS — Cursor-style "previews aren't collapsible" — so
+    // no header chevron competes with the body's own in-place reveal. Summary
+    // categories and sub-agents keep the chevron: their body is genuinely hidden
+    // by default, so the chevron has a real job. The two disclosure axes
+    // (card-level chevron vs. content-overflow reveal) never govern one body.
+    const isPreviewCategory = !isSubAgent && disclosure === "preview";
+    // The disclosed body, shared by both layouts: a pending gate decides inline,
+    // a sub-agent shows its delegation, otherwise the category detail.
+    const body = isSubAgent ? (_jsx(SubAgentSection, { subAgentExecution: subAgentExecution, collapsible: false })) : approval ? (
+    // The row above is this approval's header, so render only the body (preview
+    // + actions). The enclosing card already carries the border + warning/
+    // destructive accent for a pending gate, so the body renders borderless.
+    _jsx(ApprovalCardBody, { pendingApproval: approval.pendingApproval, onSubmit: approval.onSubmit, isSubmitting: approval.isSubmitting, error: approval.error })) : (_jsx(ToolCallDetail, { toolCall: toolCall, primaryArgTruncated: primaryArgTruncated }));
+    // The header's metadata, identical in both layouts (the chevron is appended
+    // only by the summary layout below).
+    const headerInner = (_jsxs(_Fragment, { children: [_jsx("span", { className: "shrink-0 text-muted-foreground", "aria-hidden": "true", children: _jsx(CategoryIcon, {}) }), _jsxs("span", { className: "min-w-0 flex-1 flex items-baseline gap-1.5 overflow-hidden", children: [_jsx("span", { className: "shrink-0 font-medium text-foreground", children: displayLabel }), subtitleIsFilePath && primaryArg ? (_jsx(FilePathLink, { path: primaryArg, className: "min-w-0 text-xs text-muted-foreground" })) : (displaySubtitle && (_jsx("span", { ref: measuresSubtitle ? subtitleRef : undefined, title: displaySubtitle, className: "min-w-0 truncate text-muted-foreground font-mono", children: displaySubtitle }))), !isSubAgent && category !== "shell" && resultSummary && (_jsx("span", { className: "shrink-0 tabular-nums text-muted-foreground", children: resultSummary }))] }), trailingContent] }));
+    // Preview layout: a plain (non-button) header above an always-visible body.
+    // The body renders only when it has something to show — a pending gate, or a
+    // non-empty result — so a no-output shell (which normalizes to an `empty`
+    // result) stays a clean one-line row, never an empty padded box.
+    if (isPreviewCategory) {
+        const showBody = approval != null || result.type !== "empty";
+        return (_jsxs("div", { "data-cursor-target": "tool-call-row", className: cn(cardClass, className), children: [_jsx("div", { className: "flex w-full items-center gap-2 px-2.5 py-1.5 text-xs", children: headerInner }), showBody && (_jsx("div", { className: "px-2.5 pb-2.5 pt-1", "data-cursor-target": "tool-preview", children: body }))] }));
+    }
+    // Summary / sub-agent layout: a chevron-gated header disclosing a body hidden
+    // by default. The header is a div[role=button], not a <button>, because it
+    // carries the nested "Inspect tool call" <button> (a <button> may not contain
+    // another); Enter/Space drive the toggle for keyboard parity.
+    return (_jsxs("div", { "data-cursor-target": "tool-call-row", className: cn(cardClass, className), children: [_jsxs("div", { role: "button", tabIndex: 0, "aria-expanded": expanded, onClick: handleToggle, onKeyDown: (e) => {
+                    if (e.key === "Enter" || e.key === " ") {
+                        e.preventDefault();
+                        handleToggle();
+                    }
+                }, className: cn("flex w-full cursor-pointer items-center gap-2 px-2.5 py-1.5 text-left text-xs transition-colors", "hover:bg-muted-subtle", 
+                // ring-inset so the card's overflow-hidden does not clip the focus ring.
+                "focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-inset focus-visible:ring-ring", expanded && "bg-muted-faint"), children: [headerInner, _jsx(ChevronIcon, { expanded: expanded })] }), expanded && _jsx("div", { className: "px-2.5 pb-2.5 pt-1", children: body })] }));
+});
 function getApprovalBadge(toolCall) {
     if (!toolCall.requiresApproval)
         return null;
@@ -79,6 +183,21 @@ function getApprovalBadge(toolCall) {
             return null;
     }
 }
+// ---------------------------------------------------------------------------
+// File-review badge — a stamped edit row's live review state
+// ---------------------------------------------------------------------------
+/**
+ * The badge pill for each {@link FileReviewRowState}, in the approval badge's
+ * visual vocabulary. "Kept"/"Discarded" match the decision surface's verdict
+ * copy (see FileReviewCard's VerdictBadge) so the row and the bar always speak
+ * the same language.
+ */
+const REVIEW_BADGE = {
+    pending: { label: "Pending review", colorClass: "bg-warning/15 text-warning" },
+    kept: { label: "Kept", colorClass: "bg-success/15 text-success" },
+    discarded: { label: "Discarded", colorClass: "bg-destructive/15 text-destructive" },
+    failed: { label: "Review failed", colorClass: "bg-destructive/15 text-destructive" },
+};
 function mapToolCallStatus(toolCall) {
     switch (toolCall.status) {
         case ToolCallStatus.TOOL_CALL_RUNNING: