@tangle-network/ui 10.0.0 → 11.1.0

package/src/run/inline-tool-item.tsx

@@ -1,11 +1,5 @@
-import { memo, useState, type ComponentType, type ReactNode } from "react";
-import * as Collapsible from "@radix-ui/react-collapsible";
+import { memo, type ComponentType, type ReactNode } from "react";
 import {
-  Loader2,
-  CheckCircle2,
-  AlertCircle,
-  ChevronDown,
-  ChevronRight,
   Terminal,
   FileEdit,
   FileSearch,
@@ -23,12 +17,11 @@ import {
   getToolErrorText,
   getToolCategory,
 } from "../utils/tool-display";
-import { formatDuration } from "../utils/format";
 import type { ToolPart } from "../types/parts";
 import type { ToolCategory } from "../types/run";
 import type { CustomToolRenderer } from "../types/tool-display";
 import { ExpandedToolDetail } from "./expanded-tool-detail";
-import { LiveDuration } from "./run-item-primitives";
+import { RunRowShell, type RunRowStatus } from "./run-row-shell";
 
 /** Map tool category to a lucide-react icon component. */
 const TOOL_CATEGORY_ICON_MAP: Record<
@@ -59,10 +52,18 @@ export interface InlineToolItemProps {
   description?: string;
 }
 
+/** Map the tool part status onto the shared row status vocabulary. */
+function toRowStatus(status: ToolPart["state"]["status"]): RunRowStatus {
+  if (status === "pending" || status === "running") return "running";
+  if (status === "error") return "error";
+  return "success";
+}
+
 /**
- * Compact single-line tool call display (32px height).
- * Shows icon, title, description, duration, and status indicator.
- * Expands on click to show ExpandedToolDetail.
+ * Compact single-line tool call display. Shows a category icon, title,
+ * description, duration and status, and expands on click to show
+ * ExpandedToolDetail. Rendered through the shared RunRowShell so it stays
+ * consistent with the reasoning row.
  */
 export const InlineToolItem = memo(
   ({
@@ -75,123 +76,36 @@ export const InlineToolItem = memo(
     title: titleOverride,
     description: descriptionOverride,
   }: InlineToolItemProps) => {
-    const [open, setOpen] = useState(false);
     const meta = getToolDisplayMetadata(part);
     const title = titleOverride ?? meta.title;
     const description = descriptionOverride ?? meta.description;
-    const { status } = part.state;
     const errorText = getToolErrorText(part);
 
-    const isRunning = status === "pending" || status === "running";
-    const isError = status === "error";
-    const isComplete = status === "completed";
-
-    // Duration
     const startTime = part.state.time?.start;
     const endTime = part.state.time?.end;
     const durationMs =
-      startTime && endTime ? endTime - startTime : undefined;
+      startTime != null && endTime != null ? endTime - startTime : undefined;
 
-    // Determine the default icon based on tool category
     const category = getToolCategory(part.tool);
     const DefaultIcon = TOOL_CATEGORY_ICON_MAP[category] ?? Settings;
-    const shapeClass = {
-      single: "rounded-[var(--radius-lg)]",
-      first: "rounded-t-[var(--radius-lg)] rounded-b-[var(--radius-sm)]",
-      middle: "rounded-[var(--radius-sm)]",
-      last: "rounded-t-[var(--radius-sm)] rounded-b-[var(--radius-lg)]",
-    }[groupPosition];
 
     return (
-      <Collapsible.Root open={open} onOpenChange={setOpen}>
-        <div className="flex items-start gap-2">
-          <Collapsible.Trigger asChild>
-            <button
-              className={cn(
-                "w-full border text-left transition-colors",
-                "border-[var(--border-subtle)] bg-[var(--md3-surface-container)] hover:border-border hover:bg-[var(--md3-surface-container-high)]",
-                open && "border-border bg-[var(--md3-surface-container-high)]",
-                shapeClass,
-                className,
-              )}
-            >
-              <div className="flex items-center gap-2.5 px-3 py-2.5">
-                <div className={cn(
-                  "shrink-0",
-                  isRunning && "text-[var(--accent-text)]",
-                  isComplete && "text-[var(--surface-success-text)]",
-                  isError && "text-[var(--surface-danger-text)]",
-                  !isRunning && !isComplete && !isError && "text-muted-foreground",
-                )}>
-                  {isRunning ? (
-                    <Loader2 className="h-3.5 w-3.5 animate-spin" />
-                  ) : isComplete ? (
-                    <CheckCircle2 className="h-3.5 w-3.5" />
-                  ) : isError ? (
-                    <AlertCircle className="h-3.5 w-3.5" />
-                  ) : (
-                    <DefaultIcon className="h-3.5 w-3.5" />
-                  )}
-                </div>
-
-                <span className="truncate text-xs font-medium text-foreground">
-                  {title}
-                </span>
-                {description ? (
-                  <span className="hidden truncate text-xs font-mono text-muted-foreground sm:inline">
-                    {description}
-                  </span>
-                ) : null}
-
-                <div className="ml-auto flex shrink-0 items-center gap-1.5">
-                  {isRunning && startTime ? <LiveDuration startTime={startTime} /> : null}
-                  {!isRunning && durationMs != null ? (
-                    <span className="text-[10px] font-mono tabular-nums text-muted-foreground">
-                      {formatDuration(durationMs)}
-                    </span>
-                  ) : null}
-                  {isError ? (
-                    <span className="text-[10px] font-medium text-[var(--surface-danger-text)]">
-                      failed
-                    </span>
-                  ) : null}
-                  {isRunning ? (
-                    <span className="text-[10px] font-medium text-[var(--accent-text)]">
-                      running
-                    </span>
-                  ) : null}
-                  {open ? (
-                    <ChevronDown className="h-3 w-3 text-muted-foreground" />
-                  ) : (
-                    <ChevronRight className="h-3 w-3 text-muted-foreground" />
-                  )}
-                </div>
-              </div>
-
-              {errorText && !open ? (
-                <div className="border-t border-border px-3 py-2 text-xs text-red-200">
-                  {errorText}
-                </div>
-              ) : null}
-            </button>
-          </Collapsible.Trigger>
-
-          {actions ? (
-            <div
-              className="flex shrink-0 flex-wrap items-center justify-end gap-1.5 pt-1"
-              onClick={(event) => event.stopPropagation()}
-            >
-              {actions}
-            </div>
-          ) : null}
-        </div>
-
-        <Collapsible.Content className="overflow-hidden data-[state=open]:animate-slideDown data-[state=closed]:animate-slideUp">
-          <div className={cn("mt-1.5 ml-2.5 border-l-2 border-primary/15 pl-3.5", contentClassName)}>
-            {renderToolDetail?.(part) ?? <ExpandedToolDetail part={part} />}
-          </div>
-        </Collapsible.Content>
-      </Collapsible.Root>
+      <RunRowShell
+        icon={<DefaultIcon className="h-3.5 w-3.5" />}
+        title={title}
+        description={description}
+        descriptionMono
+        status={toRowStatus(part.state.status)}
+        startTime={startTime}
+        durationMs={durationMs}
+        groupPosition={groupPosition}
+        collapsedError={errorText ?? undefined}
+        actions={actions}
+        className={className}
+        contentClassName={cn("p-2", contentClassName)}
+      >
+        {renderToolDetail?.(part) ?? <ExpandedToolDetail part={part} />}
+      </RunRowShell>
     );
   },
 );

package/src/run/run-row-shell.test.tsx

@@ -0,0 +1,38 @@
+import { render, screen } from "@testing-library/react";
+import { describe, expect, it } from "vitest";
+import { RunRowShell } from "./run-row-shell";
+
+function renderShell(status: "running" | "success" | "error" | "idle") {
+  return render(
+    <RunRowShell
+      icon={<span data-testid="lead-icon">icon</span>}
+      title="Ran command"
+      status={status}
+    >
+      <div>body</div>
+    </RunRowShell>,
+  );
+}
+
+describe("RunRowShell", () => {
+  it("keeps the semantic lead icon visible in every status (no hijack)", () => {
+    for (const status of ["running", "success", "error", "idle"] as const) {
+      const { unmount } = renderShell(status);
+      expect(screen.getByTestId("lead-icon")).toBeInTheDocument();
+      expect(screen.getByText("Ran command")).toBeInTheDocument();
+      unmount();
+    }
+  });
+
+  it("shows a spinner while running", () => {
+    const { container } = renderShell("running");
+    expect(container.querySelector(".animate-spin")).not.toBeNull();
+  });
+
+  it("is not expandable and has no chevron when no children are provided", () => {
+    render(<RunRowShell icon={<span>i</span>} title="Reasoning" />);
+    // The trigger button is disabled when there is no expandable body.
+    const button = screen.getByRole("button", { name: /reasoning/i });
+    expect(button).toBeDisabled();
+  });
+});

package/src/run/run-row-shell.tsx

@@ -0,0 +1,191 @@
+import { useState, type ReactNode } from "react";
+import * as Collapsible from "@radix-ui/react-collapsible";
+import { Loader2, ChevronRight } from "lucide-react";
+import { cn } from "../lib/utils";
+import { formatDuration } from "../utils/format";
+import { LiveDuration } from "./run-item-primitives";
+
+export type RunRowStatus = "running" | "success" | "error" | "idle";
+
+/**
+ * Trailing status indicator shared by every run row: a spinner while running,
+ * a green/red dot on terminal states, nothing when idle. Status is shown here
+ * — it never replaces the row's semantic lead icon.
+ */
+export function RunRowStatusDot({ status }: { status: RunRowStatus }) {
+  if (status === "running") {
+    return <Loader2 className="h-3 w-3 shrink-0 animate-spin text-[var(--accent-text)]" />;
+  }
+  if (status === "success") {
+    return (
+      <span className="h-1.5 w-1.5 shrink-0 rounded-full bg-[var(--surface-success-text)]" />
+    );
+  }
+  if (status === "error") {
+    return (
+      <span className="h-1.5 w-1.5 shrink-0 rounded-full bg-[var(--surface-danger-text)]" />
+    );
+  }
+  return null;
+}
+
+export interface RunRowShellProps {
+  /** Semantic lead glyph — always visible; never replaced by status. */
+  icon: ReactNode;
+  title: string;
+  /** Secondary inline text (tool path/command, or a reasoning preview). */
+  description?: string;
+  /** Render the description in mono (tools) vs prose (reasoning). */
+  descriptionMono?: boolean;
+  status?: RunRowStatus;
+  /** Live-ticks a duration while running. */
+  startTime?: number;
+  /** Static duration shown once the row is no longer running. */
+  durationMs?: number;
+  /** Radius shaping when rows are stacked into a group. */
+  groupPosition?: "single" | "first" | "middle" | "last";
+  /** Message shown below the header while collapsed (tool errors). */
+  collapsedError?: string;
+  actions?: ReactNode;
+  /** Controlled open state. Omit for internal (uncontrolled) state. */
+  open?: boolean;
+  onOpenChange?: (open: boolean) => void;
+  defaultOpen?: boolean;
+  className?: string;
+  contentClassName?: string;
+  /** Expanded body. When absent the row is not expandable. */
+  children?: ReactNode;
+}
+
+const SHAPE_CLASS: Record<
+  NonNullable<RunRowShellProps["groupPosition"]>,
+  string
+> = {
+  single: "rounded-[var(--radius-lg)]",
+  first: "rounded-t-[var(--radius-lg)] rounded-b-[var(--radius-sm)]",
+  middle: "rounded-[var(--radius-sm)]",
+  last: "rounded-t-[var(--radius-sm)] rounded-b-[var(--radius-lg)]",
+};
+
+/**
+ * Shared shell for the agent activity rows (reasoning + tool). Owns the
+ * bordered container, the lead icon badge, title/description, the trailing
+ * meta cluster (duration + status + chevron) and the collapsible body, so
+ * both row kinds read as one family instead of two bespoke layouts.
+ */
+export function RunRowShell({
+  icon,
+  title,
+  description,
+  descriptionMono = false,
+  status = "idle",
+  startTime,
+  durationMs,
+  groupPosition = "single",
+  collapsedError,
+  actions,
+  open: openProp,
+  onOpenChange,
+  defaultOpen = false,
+  className,
+  contentClassName,
+  children,
+}: RunRowShellProps) {
+  const [openState, setOpenState] = useState(defaultOpen);
+  const isControlled = openProp !== undefined;
+  const open = isControlled ? openProp : openState;
+  const setOpen = (next: boolean) => {
+    if (!isControlled) setOpenState(next);
+    onOpenChange?.(next);
+  };
+
+  const isRunning = status === "running";
+  const expandable = children != null;
+
+  return (
+    <Collapsible.Root open={open} onOpenChange={setOpen}>
+      <div className="flex items-start gap-2">
+        <div
+          className={cn(
+            "min-w-0 flex-1 overflow-hidden border transition-colors",
+            "border-[var(--border-subtle)] bg-[var(--md3-surface-container)]",
+            expandable && "hover:border-border",
+            open && "border-border",
+            SHAPE_CLASS[groupPosition],
+            className,
+          )}
+        >
+          <Collapsible.Trigger asChild disabled={!expandable}>
+            <button
+              type="button"
+              className={cn(
+                "flex w-full items-center gap-2.5 px-3 py-2 text-left",
+                expandable ? "cursor-pointer" : "cursor-default",
+              )}
+            >
+              <span className="flex h-6 w-6 shrink-0 items-center justify-center rounded-[var(--radius-sm)] border border-border bg-muted text-muted-foreground">
+                {icon}
+              </span>
+
+              <span className="shrink-0 whitespace-nowrap text-xs font-medium text-foreground">
+                {title}
+              </span>
+              {description ? (
+                <span
+                  className={cn(
+                    "hidden min-w-0 flex-1 truncate text-xs text-muted-foreground sm:inline",
+                    descriptionMono && "font-mono",
+                  )}
+                >
+                  {description}
+                </span>
+              ) : null}
+
+              <div className="ml-auto flex shrink-0 items-center gap-1.5">
+                {isRunning && startTime != null ? (
+                  <LiveDuration startTime={startTime} />
+                ) : durationMs != null ? (
+                  <span className="text-[10px] font-mono tabular-nums text-muted-foreground">
+                    {formatDuration(durationMs)}
+                  </span>
+                ) : null}
+                <RunRowStatusDot status={status} />
+                {expandable ? (
+                  <ChevronRight
+                    className={cn(
+                      "h-3 w-3 shrink-0 text-muted-foreground transition-transform",
+                      open && "rotate-90",
+                    )}
+                  />
+                ) : null}
+              </div>
+            </button>
+          </Collapsible.Trigger>
+
+          {collapsedError && !open ? (
+            <div className="border-t border-border px-3 py-2 text-xs text-[var(--surface-danger-text)]">
+              {collapsedError}
+            </div>
+          ) : null}
+
+          {expandable ? (
+            <Collapsible.Content className="overflow-hidden data-[state=open]:animate-slideDown data-[state=closed]:animate-slideUp">
+              <div className={cn("border-t border-border", contentClassName)}>
+                {children}
+              </div>
+            </Collapsible.Content>
+          ) : null}
+        </div>
+
+        {actions ? (
+          <div
+            className="flex shrink-0 flex-wrap items-center justify-end gap-1.5 pt-1"
+            onClick={(event) => event.stopPropagation()}
+          >
+            {actions}
+          </div>
+        ) : null}
+      </div>
+    </Collapsible.Root>
+  );
+}