@tangle-network/ui 11.0.0 → 11.2.0

package/src/run/expandable-content.test.tsx

@@ -0,0 +1,52 @@
+import { render, screen } from "@testing-library/react";
+import userEvent from "@testing-library/user-event";
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import { ExpandableContent } from "./expandable-content";
+
+describe("ExpandableContent", () => {
+  let scrollHeightSpy: ReturnType<typeof vi.spyOn> | undefined;
+
+  afterEach(() => {
+    scrollHeightSpy?.mockRestore();
+    scrollHeightSpy = undefined;
+  });
+
+  it("renders no toggle when content fits within the cap", () => {
+    render(
+      <ExpandableContent collapsedMaxPx={180}>
+        <div>short</div>
+      </ExpandableContent>,
+    );
+    expect(
+      screen.queryByRole("button", { name: /show more/i }),
+    ).not.toBeInTheDocument();
+  });
+
+  describe("when content overflows", () => {
+    beforeEach(() => {
+      scrollHeightSpy = vi
+        .spyOn(HTMLElement.prototype, "scrollHeight", "get")
+        .mockReturnValue(999);
+    });
+
+    it("clamps with a Show more toggle that expands and collapses", async () => {
+      const user = userEvent.setup();
+      render(
+        <ExpandableContent collapsedMaxPx={180}>
+          <div>tall content</div>
+        </ExpandableContent>,
+      );
+
+      const showMore = screen.getByRole("button", { name: /show more/i });
+      await user.click(showMore);
+      expect(
+        screen.getByRole("button", { name: /show less/i }),
+      ).toBeInTheDocument();
+
+      await user.click(screen.getByRole("button", { name: /show less/i }));
+      expect(
+        screen.getByRole("button", { name: /show more/i }),
+      ).toBeInTheDocument();
+    });
+  });
+});

package/src/run/expandable-content.tsx

@@ -0,0 +1,73 @@
+import { useEffect, useRef, useState, type ReactNode } from "react";
+import { cn } from "../lib/utils";
+
+export interface ExpandableContentProps {
+  children: ReactNode;
+  /** Height (px) the content is clamped to while collapsed. */
+  collapsedMaxPx?: number;
+  /**
+   * Gradient from-color for the bottom fade, so it blends with the surface
+   * behind the content (e.g. `from-muted`, `from-card`, `from-[var(--surface-danger-bg)]`).
+   */
+  fadeClassName?: string;
+  className?: string;
+}
+
+/**
+ * Clamps tall content to a fixed height with a bottom fade and a
+ * "Show more / Show less" toggle. Content shorter than the cap renders
+ * as-is with no toggle.
+ */
+export function ExpandableContent({
+  children,
+  collapsedMaxPx = 180,
+  fadeClassName = "from-muted",
+  className,
+}: ExpandableContentProps) {
+  const [expanded, setExpanded] = useState(false);
+  const [overflowing, setOverflowing] = useState(false);
+  const contentRef = useRef<HTMLDivElement>(null);
+
+  useEffect(() => {
+    const el = contentRef.current;
+    if (!el) return;
+    const measure = () =>
+      setOverflowing(el.scrollHeight > collapsedMaxPx + 4);
+    measure();
+    if (typeof ResizeObserver === "undefined") return;
+    const observer = new ResizeObserver(measure);
+    observer.observe(el);
+    return () => observer.disconnect();
+  }, [collapsedMaxPx]);
+
+  const clamped = overflowing && !expanded;
+
+  return (
+    <div className={className}>
+      <div
+        ref={contentRef}
+        className="relative overflow-hidden"
+        style={clamped ? { maxHeight: collapsedMaxPx } : undefined}
+      >
+        {children}
+        {clamped ? (
+          <div
+            className={cn(
+              "pointer-events-none absolute inset-x-0 bottom-0 h-10 bg-gradient-to-t to-transparent",
+              fadeClassName,
+            )}
+          />
+        ) : null}
+      </div>
+      {overflowing ? (
+        <button
+          type="button"
+          onClick={() => setExpanded((value) => !value)}
+          className="mt-1 text-[11px] font-medium text-muted-foreground transition-colors hover:text-foreground"
+        >
+          {expanded ? "Show less" : "Show more"}
+        </button>
+      ) : null}
+    </div>
+  );
+}

package/src/run/expanded-tool-detail.tsx

@@ -17,6 +17,7 @@ import { WebSearchPreview } from "../tool-previews/web-search-preview";
 import { QuestionPreview } from "../tool-previews/question-preview";
 import { DiffPreview } from "../tool-previews/diff-preview";
 import { cn } from "../lib/utils";
+import { ExpandableContent } from "./expandable-content";
 
 export interface ExpandedToolDetailProps {
   part: ToolPart;
@@ -146,15 +147,17 @@ export const ExpandedToolDetail = memo(({ part }: ExpandedToolDetailProps) => {
               Output
             </span>
           </div>
-          <CodeBlock
-            code={
-              outputStr.length > 2000
-                ? outputStr.slice(0, 2000) + "\n...(truncated)"
-                : outputStr
-            }
-            language="json"
-            className="rounded-none border-0"
-          />
+          <ExpandableContent fadeClassName="from-card">
+            <CodeBlock
+              code={
+                outputStr.length > 2000
+                  ? outputStr.slice(0, 2000) + "\n...(truncated)"
+                  : outputStr
+              }
+              language="json"
+              className="rounded-none border-0"
+            />
+          </ExpandableContent>
         </div>
       )}
 
@@ -167,9 +170,11 @@ export const ExpandedToolDetail = memo(({ part }: ExpandedToolDetailProps) => {
               Error
             </span>
           </div>
-          <pre className="bg-[var(--surface-danger-bg)] p-3 text-xs font-mono whitespace-pre-wrap break-all text-[var(--surface-danger-text)]">
-            {error}
-          </pre>
+          <ExpandableContent fadeClassName="from-[var(--surface-danger-bg)]">
+            <pre className="bg-[var(--surface-danger-bg)] p-3 text-xs font-mono whitespace-pre-wrap break-all text-[var(--surface-danger-text)]">
+              {error}
+            </pre>
+          </ExpandableContent>
         </div>
       )}
 

package/src/run/inline-thinking-item.stories.tsx

@@ -1,6 +1,7 @@
 import type { Meta, StoryObj } from '@storybook/react'
 import { InlineThinkingItem } from './inline-thinking-item'
-import type { ReasoningPart } from '../types/parts'
+import { InlineToolItem } from './inline-tool-item'
+import type { ReasoningPart, ToolPart } from '../types/parts'
 
 const NOW = Date.now()
 
@@ -122,6 +123,34 @@ export const EmptyText: Story = {
   ),
 }
 
+const bashTool: ToolPart = {
+  type: 'tool',
+  id: 'tool-shell-demo',
+  tool: 'bash',
+  state: {
+    status: 'completed',
+    input: { command: 'npx tsc --noEmit' },
+    output: '✓ No type errors',
+    time: { start: NOW - 2040, end: NOW - 200 },
+  },
+}
+
+// Reasoning and tool rows adjacent — they must read as one family (shared
+// badge geometry, trailing status/duration, chevron), not two designs.
+export const UnifiedWithToolRow: Story = {
+  name: 'Unified shell (reasoning + tool)',
+  render: () => (
+    <div className="p-6 max-w-2xl space-y-2">
+      <InlineThinkingItem
+        part={thinkingComplete}
+        defaultOpen={false}
+        autoCollapse={false}
+      />
+      <InlineToolItem part={bashTool} />
+    </div>
+  ),
+}
+
 export const AllStates: Story = {
   render: () => (
     <div className="p-6 max-w-2xl space-y-3">

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

@@ -1,11 +1,10 @@
 import { memo, useEffect, useRef, useState } from "react";
-import * as Collapsible from "@radix-ui/react-collapsible";
-import { Brain, ChevronRight } from "lucide-react";
-import { cn } from "../lib/utils";
-import { formatDuration, truncateText } from "../utils/format";
+import { Brain } from "lucide-react";
+import { truncateText } from "../utils/format";
 import type { ReasoningPart } from "../types/parts";
 import { Markdown } from "../markdown/markdown";
-import { LiveDuration } from "./run-item-primitives";
+import { RunRowShell } from "./run-row-shell";
+import { ExpandableContent } from "./expandable-content";
 
 export interface InlineThinkingItemProps {
   part: ReasoningPart;
@@ -28,7 +27,8 @@ export const InlineThinkingItem = memo(
 
     const startTime = part.time?.start;
     const endTime = part.time?.end;
-    const durationMs = startTime && endTime ? endTime - startTime : undefined;
+    const durationMs =
+      startTime != null && endTime != null ? endTime - startTime : undefined;
     const isActive = startTime != null && endTime == null;
     const preview = part.text ? truncateText(part.text, 120) : undefined;
 
@@ -50,70 +50,34 @@ export const InlineThinkingItem = memo(
     }, [autoCollapse, durationMs, isActive]);
 
     return (
-      <Collapsible.Root open={open} onOpenChange={setOpen}>
-        <div
-          className={cn(
-            "overflow-hidden rounded-[var(--radius-lg)] border bg-card transition-colors",
-            isActive
-              ? "border-[var(--border-accent)]"
-              : "border-border hover:border-[var(--border-accent)]",
-            className,
-          )}
-        >
-          <Collapsible.Trigger asChild>
-            <button
-              className="flex w-full items-center gap-2.5 px-3 py-2 text-left text-sm cursor-pointer"
-            >
-              <div
-                className={cn(
-                  "flex h-6 w-6 shrink-0 items-center justify-center rounded-[var(--radius-sm)] border",
-                  isActive
-                    ? "border-[var(--border-accent)] bg-[var(--accent-surface-soft)] text-primary"
-                    : "border-border bg-muted text-muted-foreground",
-                )}
-              >
-                <Brain className={cn("h-3 w-3 shrink-0", isActive && "animate-pulse")} />
-              </div>
-
-              <p className="min-w-0 flex-1 truncate font-[var(--font-sans)] text-muted-foreground">
-                {preview ?? (isActive ? "Thinking…" : "Reasoning")}
-              </p>
-
-              <div className="flex shrink-0 items-center gap-2">
-                {isActive && startTime ? <LiveDuration startTime={startTime} /> : null}
-                {!isActive && durationMs != null ? (
-                  <span className="shrink-0 text-xs tabular-nums text-muted-foreground">
-                    {formatDuration(durationMs)}
-                  </span>
-                ) : null}
-                <ChevronRight
-                  className={cn(
-                    "h-3 w-3 text-muted-foreground transition-transform shrink-0",
-                    open && "rotate-90",
-                  )}
-                />
-              </div>
-            </button>
-          </Collapsible.Trigger>
-
-          <Collapsible.Content className="overflow-hidden data-[state=open]:animate-slideDown data-[state=closed]:animate-slideUp">
-            {part.text ? (
-              <div
-                className={cn(
-                  "max-h-60 overflow-y-auto border-t border-border bg-muted px-3 py-3 text-sm leading-relaxed text-muted-foreground",
-                  contentClassName,
-                )}
-              >
-                <Markdown>{part.text}</Markdown>
-              </div>
-            ) : (
-              <div className="border-t border-border bg-muted px-3 py-2.5 text-xs text-muted-foreground">
-                No reasoning text provided.
-              </div>
-            )}
-          </Collapsible.Content>
-        </div>
-      </Collapsible.Root>
+      <RunRowShell
+        icon={<Brain className="h-3.5 w-3.5" />}
+        title={isActive ? "Thinking…" : "Reasoning"}
+        description={preview}
+        status={isActive ? "running" : "idle"}
+        startTime={startTime}
+        durationMs={durationMs}
+        open={open}
+        onOpenChange={setOpen}
+        className={className}
+      >
+        {part.text ? (
+          <ExpandableContent
+            fadeClassName="from-[var(--md3-surface-container)]"
+            className={
+              contentClassName ? `px-3 py-3 ${contentClassName}` : "px-3 py-3"
+            }
+          >
+            <div className="text-sm leading-relaxed text-foreground">
+              <Markdown>{part.text}</Markdown>
+            </div>
+          </ExpandableContent>
+        ) : (
+          <div className="px-3 py-2.5 text-xs text-muted-foreground">
+            No reasoning text provided.
+          </div>
+        )}
+      </RunRowShell>
     );
   },
 );

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();
+  });
+});