@qredence/fleet 0.7.4 → 0.8.0

package/dist/web/server/{chunk-XA7EOCHM.js → chunk-SGAQVAYL.js}

@@ -2,9 +2,9 @@ import {
   Skeleton,
   getResourceChipTitle,
   resourceKey
-} from "./chunk-EBC7QORX.js";
+} from "./chunk-5GUEYYYO.js";
 
-// web/app/dist/server/assets/skeleton-loaders-C5ksoZ1T.js
+// web/app/dist/server/assets/skeleton-loaders-CzpLPfNw.js
 import { jsx, jsxs } from "react/jsx-runtime";
 function ResourceNotice({ description, icon: Icon, title }) {
   return /* @__PURE__ */ jsxs("div", {

package/dist/web/server/chunk-SI5IQSG4.js

@@ -0,0 +1,206 @@
+import {
+  Trace,
+  TraceCollapsible,
+  TraceCollapsibleContent,
+  TraceCollapsibleTrigger,
+  TraceDescription,
+  TraceIcon,
+  TraceLine,
+  TraceTitle,
+  normalizeToolPart$1,
+  toolActionIconForName
+} from "./chunk-5GUEYYYO.js";
+import {
+  cn
+} from "./chunk-OAYEN3JV.js";
+
+// web/app/dist/server/assets/tool-timeline-5q0Z8R6U.js
+import { Suspense, lazy, useMemo, useState } from "react";
+import { jsx, jsxs } from "react/jsx-runtime";
+var LazySessionToolRenderer = lazy(() => import("./session-tool-renderer-BZiOxtt1-T3ZGAQKX.js").then((n) => n.n).then(({ SessionToolRenderer }) => ({ default: SessionToolRenderer })));
+var NO_ARTIFACTS = [];
+function artifactPanel(kind) {
+  return kind === "ipython" ? "repl" : "artifacts";
+}
+function withArtifact(step, artifact) {
+  if (!artifact) return step;
+  return {
+    ...step,
+    artifactId: artifact.id,
+    artifactTitle: artifact.title,
+    artifactTarget: artifactPanel(artifact.kind)
+  };
+}
+function record(value) {
+  return typeof value === "object" && value !== null && !Array.isArray(value) ? value : void 0;
+}
+function status(part, streaming) {
+  const state = part.state;
+  if (state === "output-error" || state === "error") return "error";
+  if (state === "cancelled" || state === "canceled" || state === "aborted" || state === "interrupted") return "cancelled";
+  if (state === "input-streaming" || state === "streaming") return streaming ? "running" : "cancelled";
+  if (state === "input-available" || state === "pending" || state === "queued") return "pending";
+  return streaming && part.output === void 0 && part.result === void 0 ? "running" : "complete";
+}
+function toolStep(part, fallbackId, streaming, nestedTools = [], isNestedTaskTool = false) {
+  const type = part.type;
+  if (typeof type !== "string" || !type.startsWith("tool-") || type === "tool-FleetReasoning" || type === "tool-Thinking" || isNestedTaskTool) return void 0;
+  const name = type.slice(5);
+  const lower = name.toLowerCase();
+  const verb = lower.includes("edit") || lower.includes("write") || lower.includes("patch") ? "Edited" : lower.includes("read") ? "Read" : lower.includes("search") || lower.includes("grep") || lower.includes("glob") ? "Searched" : lower.includes("bash") || lower.includes("shell") || lower.includes("python") || lower.includes("ipython") ? "Ran" : name;
+  const normalized = normalizeToolPart$1(part);
+  return {
+    id: typeof part.toolCallId === "string" ? part.toolCallId : fallbackId,
+    verb,
+    target: name,
+    status: status(part, streaming),
+    part,
+    nestedTools,
+    traceDescription: normalized?.traceDescription,
+    durationLabel: normalized?.durationLabel,
+    reportedError: normalized?.outputSummary.isError
+  };
+}
+function artifactStep(artifact) {
+  return {
+    id: `artifact:${artifact.id}`,
+    verb: artifact.kind === "compaction" ? "Compacted" : artifact.kind === "refinement" ? "Refined" : artifact.kind === "recap" ? "Recapped" : artifact.kind === "rlm" ? "Delegated" : artifact.kind === "diff" ? "Edited" : "Completed",
+    target: artifact.kind === "bash" ? "Bash output" : artifact.kind === "ipython" ? "IPython result" : artifact.kind === "diff" ? "File change" : artifact.kind === "rlm" ? "Child task" : artifact.kind === "recap" ? "Session recap" : artifact.kind === "refinement" ? "Refinement" : "Session activity",
+    status: artifact.status === "success" ? "complete" : artifact.status
+  };
+}
+function TimelineStepRow({ step, onOpenArtifact, renderToolDetails }) {
+  const Icon = toolActionIconForName(step.part?.type.replace(/^tool-/, "") ?? step.target);
+  const artifactId = step.artifactId;
+  const openLabel = artifactId && step.artifactTitle ? step.artifactTarget === "repl" ? `Open ${step.artifactTitle} in REPL` : `Open ${step.artifactTitle} in artifacts` : void 0;
+  const detailLabel = `Details for ${step.target}${step.id ? ` (${step.id})` : ""}`;
+  const statusLabel = step.reportedError ? "reported error" : step.status === "error" ? "failed" : step.status === "running" ? "running" : step.status === "pending" ? "waiting" : step.status === "cancelled" ? "cancelled" : "done";
+  const line = /* @__PURE__ */ jsxs(TraceLine, {
+    status: step.status === "running" ? "running" : step.status === "error" ? "error" : step.status === "pending" ? "pending" : void 0,
+    children: [
+      /* @__PURE__ */ jsx(TraceIcon, { children: /* @__PURE__ */ jsx(Icon, { className: cn("size-3.5", step.status === "running" && "animate-pulse text-primary", step.status === "error" && "text-destructive") }) }),
+      /* @__PURE__ */ jsxs(TraceTitle, { children: [
+        step.verb,
+        " ",
+        step.target
+      ] }),
+      /* @__PURE__ */ jsx(TraceDescription, {
+        className: step.reportedError ? "text-destructive" : void 0,
+        children: statusLabel
+      }),
+      step.traceDescription ? /* @__PURE__ */ jsx(TraceDescription, {
+        className: "max-w-48 truncate",
+        title: step.traceDescription,
+        children: step.traceDescription
+      }) : null,
+      step.durationLabel ? /* @__PURE__ */ jsx(TraceDescription, { children: step.durationLabel }) : null
+    ]
+  });
+  return /* @__PURE__ */ jsxs("div", {
+    className: "flex min-w-0 items-start gap-2",
+    children: [step.part ? /* @__PURE__ */ jsxs(TraceCollapsible, {
+      className: "min-w-0 flex-1",
+      children: [/* @__PURE__ */ jsx(TraceCollapsibleTrigger, {
+        "aria-label": detailLabel,
+        children: line
+      }), /* @__PURE__ */ jsx(TraceCollapsibleContent, { children: renderToolDetails ? renderToolDetails(step.part, step.status === "running", step.nestedTools) : /* @__PURE__ */ jsx(Suspense, {
+        fallback: null,
+        children: /* @__PURE__ */ jsx(LazySessionToolRenderer, {
+          part: step.part,
+          nestedTools: step.nestedTools,
+          chatStatus: step.status === "running" ? "streaming" : void 0,
+          insideTrace: true
+        })
+      }) })]
+    }) : /* @__PURE__ */ jsx("div", {
+      className: "min-w-0 flex-1",
+      children: line
+    }), openLabel && artifactId && onOpenArtifact ? /* @__PURE__ */ jsx("button", {
+      type: "button",
+      className: "shrink-0 text-micro underline",
+      "aria-label": openLabel,
+      onClick: () => onOpenArtifact(artifactId, step.artifactTarget),
+      children: "Open"
+    }) : null]
+  });
+}
+function ToolTimeline({ messages, artifacts = NO_ARTIFACTS, streaming, className, onOpenArtifact, renderToolDetails }) {
+  const steps = useMemo(() => {
+    const seen = /* @__PURE__ */ new Set();
+    const artifactByToolCallId = new Map(artifacts.flatMap((artifact) => artifact.sourceToolCallId ? [[artifact.sourceToolCallId, artifact]] : []));
+    const fromMessages = messages.flatMap((message) => {
+      const taskPartIds = new Set(message.parts.flatMap((part) => {
+        const source = record(part);
+        return (source?.type === "tool-Task" || source?.type === "tool-Agent") && typeof source.toolCallId === "string" ? [source.toolCallId] : [];
+      }));
+      const nestedToolsByTask = /* @__PURE__ */ new Map();
+      const nestedToolIds = /* @__PURE__ */ new Set();
+      for (const part of message.parts) {
+        const source = record(part);
+        const toolCallId = typeof source?.toolCallId === "string" ? source.toolCallId : void 0;
+        const separator = toolCallId?.indexOf(":") ?? -1;
+        if (!toolCallId || separator <= 0) continue;
+        const parentId = toolCallId.slice(0, separator);
+        if (!taskPartIds.has(parentId)) continue;
+        nestedToolIds.add(toolCallId);
+        const children = nestedToolsByTask.get(parentId) ?? [];
+        children.push(source);
+        nestedToolsByTask.set(parentId, children);
+      }
+      return message.parts.flatMap((part, index) => {
+        const source = record(part) ?? {};
+        const toolCallId = typeof source.toolCallId === "string" ? source.toolCallId : void 0;
+        const step = toolStep(source, `${message.id}:${index}`, streaming, toolCallId ? nestedToolsByTask.get(toolCallId) ?? [] : [], toolCallId ? nestedToolIds.has(toolCallId) : false);
+        if (!step || seen.has(step.id)) return [];
+        seen.add(step.id);
+        return [withArtifact(step, artifactByToolCallId.get(step.id))];
+      });
+    });
+    const fromArtifacts = artifacts.flatMap((artifact) => {
+      if (artifact.sourceToolCallId && seen.has(artifact.sourceToolCallId)) return [];
+      const step = withArtifact(artifactStep(artifact), artifact);
+      if (seen.has(step.id)) return [];
+      seen.add(step.id);
+      return [step];
+    });
+    return [...fromMessages, ...fromArtifacts];
+  }, [
+    artifacts,
+    messages,
+    streaming
+  ]);
+  const [open, setOpen] = useState(true);
+  if (steps.length === 0) return null;
+  const active = [...steps].reverse().find((step) => step.status === "running") ?? steps.at(-1);
+  const StatusIcon = toolActionIconForName(active?.part?.type.replace(/^tool-/, "") ?? active?.target ?? "activity");
+  return /* @__PURE__ */ jsx(Trace, {
+    className: cn("mb-2", className),
+    "data-testid": "tool-trace",
+    children: /* @__PURE__ */ jsxs(TraceCollapsible, {
+      open,
+      onOpenChange: setOpen,
+      children: [/* @__PURE__ */ jsx(TraceCollapsibleTrigger, {
+        "aria-label": `${steps.length} tool ${steps.length === 1 ? "action" : "actions"}`,
+        children: /* @__PURE__ */ jsxs(TraceLine, {
+          status: active?.status === "running" ? "running" : active?.status === "error" ? "error" : void 0,
+          children: [
+            /* @__PURE__ */ jsx(TraceIcon, { children: /* @__PURE__ */ jsx(StatusIcon, { className: cn("size-3.5", active?.status === "running" && "animate-spin") }) }),
+            /* @__PURE__ */ jsx(TraceTitle, { children: streaming && active ? `${active.verb} ${active.target}` : `${steps.length} tool ${steps.length === 1 ? "action" : "actions"}` }),
+            /* @__PURE__ */ jsx(TraceDescription, { children: steps.length })
+          ]
+        })
+      }), /* @__PURE__ */ jsx(TraceCollapsibleContent, { children: /* @__PURE__ */ jsx(Trace, {
+        className: "gap-1",
+        children: steps.map((step) => /* @__PURE__ */ jsx(TimelineStepRow, {
+          step,
+          onOpenArtifact,
+          renderToolDetails
+        }, step.id))
+      }) })]
+    })
+  });
+}
+
+export {
+  ToolTimeline
+};

package/dist/web/server/{chunk-AKSDWYJY.js → chunk-SYS5FDNA.js}

@@ -4,7 +4,7 @@ import {
   toJSONSchema
 } from "./chunk-6JOAWERA.js";
 
-// node_modules/.pnpm/@openuidev+lang-core@0.3.2_@modelcontextprotocol+sdk@1.30.1_supports-color@8.1.1_zod@4.6.5__zod@4.6.5/node_modules/@openuidev/lang-core/dist/shared-Dzgc28Wo.mjs
+// node_modules/.pnpm/@openuidev+lang-core@0.3.2_@modelcontextprotocol+sdk@1.32.1_supports-color@8.1.1_zod@4.6.5__zod@4.6.5/node_modules/@openuidev/lang-core/dist/shared-Dzgc28Wo.mjs
 var TELEMETRY_REQUEST_TIMEOUT_MS = 2e3;
 function getPostHogConfig(env) {
   const host = env?.["OPENUI_POSTHOG_HOST"] ?? "https://dgoeivjus9jfp.cloudfront.net";
@@ -46,7 +46,7 @@ function normalizeRepositoryPath(repositoryPath) {
   return repositoryPath.trim().replace(/\\/g, "/").replace(/^\/+|\/+$/g, "").replace(/\.git$/i, "");
 }
 
-// node_modules/.pnpm/@openuidev+lang-core@0.3.2_@modelcontextprotocol+sdk@1.30.1_supports-color@8.1.1_zod@4.6.5__zod@4.6.5/node_modules/@openuidev/lang-core/dist/index.mjs
+// node_modules/.pnpm/@openuidev+lang-core@0.3.2_@modelcontextprotocol+sdk@1.32.1_supports-color@8.1.1_zod@4.6.5__zod@4.6.5/node_modules/@openuidev/lang-core/dist/index.mjs
 var SYSTEM_PROMPT_EVENT_NAME = "lang_core_system_prompt_generation_used";
 var PARSER_PARSE_EVENT_NAME = "lang_core_parser_parse_used";
 var SYSTEM_PROMPT_SAMPLE_RATE = 0.1;
@@ -4137,7 +4137,7 @@ var BUS_KEY = /* @__PURE__ */ Symbol.for("openui.observability");
 var store = globalThis;
 var observability = store[BUS_KEY] ??= createObservability();
 
-// node_modules/.pnpm/@openuidev+react-lang@0.3.2_@modelcontextprotocol+sdk@1.30.1_supports-color@8.1.1_zod@4_e86a1cf9bd4b14cb3a6d4a18e5a652a0/node_modules/@openuidev/react-lang/dist/exports-Cab8UG5o.mjs
+// node_modules/.pnpm/@openuidev+react-lang@0.3.2_@modelcontextprotocol+sdk@1.32.1_supports-color@8.1.1_zod@4_1de775beb5d918be551c4d5e0aa840f9/node_modules/@openuidev/react-lang/dist/exports-Cab8UG5o.mjs
 import { Component, Fragment, createContext, useCallback, useContext, useEffect, useInsertionEffect, useMemo, useRef, useState, useSyncExternalStore } from "react";
 import { jsx, jsxs } from "react/jsx-runtime";
 var DEVTOOLS_LIBRARIES_KEY = /* @__PURE__ */ Symbol.for("openui.devtools.libraries");
@@ -4897,7 +4897,7 @@ function useCreateFormValidation() {
   ]);
 }
 
-// node_modules/.pnpm/@openuidev+react-lang@0.3.2_@modelcontextprotocol+sdk@1.30.1_supports-color@8.1.1_zod@4_e86a1cf9bd4b14cb3a6d4a18e5a652a0/node_modules/@openuidev/react-lang/dist/index.mjs
+// node_modules/.pnpm/@openuidev+react-lang@0.3.2_@modelcontextprotocol+sdk@1.32.1_supports-color@8.1.1_zod@4_1de775beb5d918be551c4d5e0aa840f9/node_modules/@openuidev/react-lang/dist/index.mjs
 if (process.env.NODE_ENV === "development") {
   const AUTO_MOUNT_FLAG = /* @__PURE__ */ Symbol.for("openui.devtools.autoMount");
   const flags = globalThis;
@@ -4906,7 +4906,7 @@ if (process.env.NODE_ENV === "development") {
     Promise.resolve().then(() => {
       if (typeof document === "undefined") return;
       Promise.all([
-        import("./dist-7G2NZPF4.js"),
+        import("./dist-GQUZLXN5.js"),
         import("react"),
         import("react-dom/client")
       ]).then(([{ OpenUIDevtools }, React, ReactDOMClient]) => {

package/dist/web/server/{chunk-QSM3BRMA.js → chunk-WSK55TKE.js}

@@ -3,11 +3,19 @@ import {
   AgentDisclosure,
   SPRING_PRESS,
   SPRING_SWAP
-} from "./chunk-EBC7QORX.js";
+} from "./chunk-5GUEYYYO.js";
 import {
   m,
   useReducedMotion
-} from "./chunk-ZUZPJNLY.js";
+} from "./chunk-OSPDNT7S.js";
+import {
+  CodeBlock,
+  CodeBlockActions,
+  CodeBlockContent,
+  CodeBlockCopyButton,
+  CodeBlockHeader,
+  CodeBlockTitle
+} from "./chunk-LTTBT3J7.js";
 import {
   Ban,
   Braces,
@@ -20,12 +28,12 @@ import {
   LoaderCircle,
   SquareTerminal,
   Wrench
-} from "./chunk-GLH2GWMG.js";
+} from "./chunk-7L5PCCYR.js";
 import {
   cn
-} from "./chunk-TMQ3MT3D.js";
+} from "./chunk-OAYEN3JV.js";
 
-// web/app/dist/server/assets/tool-result-CWKqHr9Q.js
+// web/app/dist/server/assets/tool-result-aTgYW1-y.js
 import { useCallback, useEffect, useId, useLayoutEffect, useMemo, useRef, useState } from "react";
 import { jsx, jsxs } from "react/jsx-runtime";
 var LIGHT_THEME = "github-light-high-contrast";
@@ -113,127 +121,17 @@ function useAgentCodeTokens(code, language) {
   if (result?.language === language && code.startsWith(result.code)) return result.lines;
   return null;
 }
-function AgentCodeLine({ code, tokens, className }) {
-  return /* @__PURE__ */ jsx("span", {
+function AgentCodeLine({ code, tokens, suffix, className }) {
+  return /* @__PURE__ */ jsxs("span", {
     className,
-    children: tokens ? tokens.map((token) => /* @__PURE__ */ jsx("span", {
+    children: [tokens ? tokens.map((token) => /* @__PURE__ */ jsx("span", {
       style: {
         "--agent-code-light": token.light ?? "currentColor",
         "--agent-code-dark": token.dark ?? token.light ?? "currentColor"
       },
       className: "text-[var(--agent-code-light)] dark:text-[var(--agent-code-dark)]",
       children: token.content
-    }, `${token.offset}-${token.content}`)) : code
-  });
-}
-var EMPTY_HIGHLIGHT_LINES = [];
-function CodeBlock({ code, language = "typescript", languageLabel, filename, status = "complete", showStatus = true, showLineNumbers = true, highlightLines = EMPTY_HIGHLIGHT_LINES, maxHeight = 280, wrap = false, copyable = true, onCopy, className }) {
-  const reduce = useReducedMotion() ?? false;
-  const viewportRef = useRef(null);
-  const copyTimer = useRef(void 0);
-  const [copied, setCopied] = useState(false);
-  const streaming = status === "streaming";
-  const tokens = useAgentCodeTokens(code, language);
-  const highlighted = useMemo(() => new Set(highlightLines), [highlightLines]);
-  let offset = 0;
-  const lines = code.split("\n").map((content) => {
-    const line = {
-      content,
-      offset
-    };
-    offset += content.length + 1;
-    return line;
-  });
-  const resolvedLanguageLabel = languageLabel ?? {
-    bash: "Bash",
-    diff: "Diff",
-    json: "JSON",
-    python: "Python",
-    text: "Text",
-    tsx: "TSX",
-    typescript: "TypeScript"
-  }[language];
-  useEffect(() => () => {
-    if (copyTimer.current) window.clearTimeout(copyTimer.current);
-  }, []);
-  useLayoutEffect(() => {
-    const viewport = viewportRef.current;
-    if (!viewport || !streaming) return;
-    const frame = requestAnimationFrame(() => {
-      if (viewport.scrollHeight <= viewport.clientHeight) return;
-      if (typeof viewport.scrollTo === "function") viewport.scrollTo({
-        top: viewport.scrollHeight,
-        behavior: reduce ? "auto" : "smooth"
-      });
-      else viewport.scrollTop = viewport.scrollHeight;
-    });
-    return () => cancelAnimationFrame(frame);
-  });
-  const handleCopy = useCallback(async () => {
-    if (onCopy) await onCopy();
-    else await navigator.clipboard?.writeText(code);
-    setCopied(true);
-    if (copyTimer.current) window.clearTimeout(copyTimer.current);
-    copyTimer.current = window.setTimeout(() => setCopied(false), 1600);
-  }, [code, onCopy]);
-  return /* @__PURE__ */ jsxs("div", {
-    "data-state": status,
-    "aria-busy": streaming,
-    className: cn("w-full overflow-hidden rounded-2xl bg-muted/80 text-sm", className),
-    children: [/* @__PURE__ */ jsxs("div", {
-      className: "flex h-10 items-center gap-2.5 px-3",
-      children: [
-        /* @__PURE__ */ jsx(FileCodeCorner, {
-          "aria-hidden": "true",
-          className: "size-3.5 shrink-0 text-muted-foreground/70"
-        }),
-        filename ? /* @__PURE__ */ jsx("span", {
-          className: "min-w-0 truncate font-mono text-xs text-foreground/80",
-          children: filename
-        }) : null,
-        /* @__PURE__ */ jsx("span", {
-          className: "text-micro font-medium uppercase tracking-wide text-muted-foreground/55",
-          children: resolvedLanguageLabel
-        }),
-        showStatus ? /* @__PURE__ */ jsxs("span", {
-          className: cn("ml-auto inline-flex shrink-0 items-center gap-1 text-micro font-medium", streaming ? "text-info" : "text-success"),
-          children: [streaming ? /* @__PURE__ */ jsx(LoaderCircle, { className: cn("size-3", !reduce && "animate-spin") }) : /* @__PURE__ */ jsx(Check, { className: "size-3" }), streaming ? "Writing" : "Ready"]
-        }) : null,
-        copyable || onCopy ? /* @__PURE__ */ jsx(m.button, {
-          type: "button",
-          "aria-label": copied ? "Copied" : "Copy code",
-          title: copied ? "Copied" : "Copy code",
-          onClick: handleCopy,
-          whileTap: reduce ? void 0 : { scale: 0.96 },
-          transition: SPRING_PRESS,
-          className: cn("grid size-7 shrink-0 place-items-center rounded-full text-muted-foreground outline-none transition-colors hover:bg-background/70 hover:text-foreground focus-visible:ring-2 focus-visible:ring-ring", !showStatus && "ml-auto"),
-          children: copied ? /* @__PURE__ */ jsx(Check, { className: "size-3.5" }) : /* @__PURE__ */ jsx(Copy, { className: "size-3.5" })
-        }) : null
-      ]
-    }), /* @__PURE__ */ jsx("div", {
-      ref: viewportRef,
-      role: streaming ? "log" : void 0,
-      "aria-live": streaming ? "off" : void 0,
-      className: "overflow-auto border-t border-foreground/[0.06] py-2 [scrollbar-color:color-mix(in_oklab,var(--muted-foreground)_35%,transparent)_transparent] [scrollbar-width:thin]",
-      style: { maxHeight },
-      children: /* @__PURE__ */ jsx("pre", {
-        className: "m-0 min-w-max font-mono text-xs leading-5 text-foreground/85",
-        children: /* @__PURE__ */ jsx("code", { children: lines.map((line, index) => {
-          const lineNumber = index + 1;
-          return /* @__PURE__ */ jsxs("span", {
-            className: cn("grid min-h-5", showLineNumbers ? "grid-cols-[2.75rem_minmax(0,1fr)]" : "grid-cols-1", highlighted.has(lineNumber) && "bg-primary/[0.07]"),
-            children: [showLineNumbers ? /* @__PURE__ */ jsx("span", {
-              className: "select-none pr-3 text-right tabular-nums text-muted-foreground/35",
-              children: lineNumber
-            }) : null, /* @__PURE__ */ jsx(AgentCodeLine, {
-              code: line.content,
-              tokens: tokens?.[index],
-              className: cn("pr-4", showLineNumbers ? "pl-1" : "pl-4", wrap ? "whitespace-pre-wrap break-words" : "whitespace-pre")
-            })]
-          }, line.offset);
-        }) })
-      })
-    })]
+    }, `${token.offset}-${token.content}`)) : code, suffix]
   });
 }
 function ChangeCount({ value, type }) {
@@ -413,6 +311,117 @@ function FileDiff({ file, lines, status = "streaming", open, defaultOpen = true,
     })]
   });
 }
+var EMPTY_HIGHLIGHT_LINES = [];
+function CodeBlock2({ code, language = "typescript", languageLabel, filename, status = "complete", showStatus = true, showLineNumbers = true, highlightLines = EMPTY_HIGHLIGHT_LINES, maxHeight = 280, wrap = false, copyable = true, onCopy }) {
+  const reduce = useReducedMotion() ?? false;
+  const viewportRef = useRef(null);
+  const copyTimer = useRef(void 0);
+  const [copied, setCopied] = useState(false);
+  const streaming = status === "streaming";
+  const tokens = useAgentCodeTokens(code, language);
+  const highlighted = useMemo(() => new Set(highlightLines), [highlightLines]);
+  let offset = 0;
+  const lines = code.split("\n").map((content) => {
+    const line = {
+      content,
+      offset
+    };
+    offset += content.length + 1;
+    return line;
+  });
+  const resolvedLanguageLabel = languageLabel ?? {
+    bash: "Bash",
+    diff: "Diff",
+    json: "JSON",
+    python: "Python",
+    text: "Text",
+    tsx: "TSX",
+    typescript: "TypeScript"
+  }[language];
+  useEffect(() => () => {
+    if (copyTimer.current) window.clearTimeout(copyTimer.current);
+  }, []);
+  useLayoutEffect(() => {
+    const viewport = viewportRef.current;
+    if (!viewport || !streaming) return;
+    const frame = requestAnimationFrame(() => {
+      if (viewport.scrollHeight <= viewport.clientHeight) return;
+      if (typeof viewport.scrollTo === "function") viewport.scrollTo({
+        top: viewport.scrollHeight,
+        behavior: reduce ? "auto" : "smooth"
+      });
+      else viewport.scrollTop = viewport.scrollHeight;
+    });
+    return () => cancelAnimationFrame(frame);
+  });
+  const handleCopy = useCallback(async () => {
+    if (onCopy) await onCopy();
+    else await navigator.clipboard?.writeText(code);
+    setCopied(true);
+    if (copyTimer.current) window.clearTimeout(copyTimer.current);
+    copyTimer.current = window.setTimeout(() => setCopied(false), 1600);
+  }, [code, onCopy]);
+  return /* @__PURE__ */ jsxs(CodeBlock, {
+    "data-state": status,
+    "aria-busy": streaming,
+    size: "sm",
+    className: "bg-muted/80",
+    children: [/* @__PURE__ */ jsxs(CodeBlockHeader, {
+      className: "h-10 gap-2.5 px-3 pt-0",
+      children: [
+        /* @__PURE__ */ jsx(FileCodeCorner, {
+          "aria-hidden": "true",
+          className: "size-3.5 shrink-0 text-muted-foreground/70"
+        }),
+        filename ? /* @__PURE__ */ jsx(CodeBlockTitle, {
+          className: "font-mono text-xs text-foreground/80",
+          children: filename
+        }) : null,
+        /* @__PURE__ */ jsx("span", {
+          className: "text-micro font-medium uppercase tracking-wide text-muted-foreground/55",
+          children: resolvedLanguageLabel
+        }),
+        showStatus ? /* @__PURE__ */ jsxs("span", {
+          className: cn(!copyable && !onCopy && "ml-auto", "inline-flex shrink-0 items-center gap-1 text-micro font-medium", streaming ? "text-info" : "text-success"),
+          children: [streaming ? /* @__PURE__ */ jsx(LoaderCircle, { className: cn("size-3", !reduce && "animate-spin") }) : /* @__PURE__ */ jsx(Check, { className: "size-3" }), streaming ? "Writing" : "Ready"]
+        }) : null,
+        copyable || onCopy ? /* @__PURE__ */ jsx(CodeBlockActions, {
+          className: cn("-my-0 -me-0", showStatus ? "ms-0" : "ms-auto"),
+          children: /* @__PURE__ */ jsx(m.button, {
+            type: "button",
+            "aria-label": copied ? "Copied" : "Copy code",
+            title: copied ? "Copied" : "Copy code",
+            onClick: handleCopy,
+            whileTap: reduce ? void 0 : { scale: 0.96 },
+            transition: SPRING_PRESS,
+            className: "grid size-7 shrink-0 place-items-center rounded-full text-muted-foreground outline-none transition-colors hover:bg-background/70 hover:text-foreground focus-visible:ring-2 focus-visible:ring-ring",
+            children: copied ? /* @__PURE__ */ jsx(Check, { className: "size-3.5" }) : /* @__PURE__ */ jsx(Copy, { className: "size-3.5" })
+          })
+        }) : null
+      ]
+    }), /* @__PURE__ */ jsx(CodeBlockContent, {
+      ref: viewportRef,
+      role: streaming ? "log" : void 0,
+      "aria-live": streaming ? "off" : void 0,
+      className: "max-w-full overflow-auto border-t border-foreground/[0.06] px-0 py-2 font-mono text-xs leading-5 text-foreground/85 [scrollbar-color:color-mix(in_oklab,var(--muted-foreground)_35%,transparent)_transparent] [scrollbar-width:thin]",
+      style: { maxHeight },
+      wrap,
+      children: lines.map((line, index) => {
+        const lineNumber = index + 1;
+        return /* @__PURE__ */ jsx("span", {
+          "data-line-number": showLineNumbers ? lineNumber : void 0,
+          className: cn("grid min-h-5", showLineNumbers ? "grid-cols-[2.75rem_minmax(0,1fr)] before:content-[attr(data-line-number)] before:select-none before:pr-3 before:text-right before:tabular-nums before:text-muted-foreground/35" : "grid-cols-1", highlighted.has(lineNumber) && "bg-primary/[0.07]"),
+          children: /* @__PURE__ */ jsx(AgentCodeLine, {
+            code: line.content,
+            tokens: tokens?.[index],
+            suffix: index < lines.length - 1 ? "\n" : void 0,
+            className: cn("pr-4", showLineNumbers ? "pl-1" : "pl-4", wrap ? "whitespace-pre-wrap break-words" : "whitespace-pre")
+          })
+        }, line.offset);
+      })
+    })]
+  });
+}
 function getStatusLabel(status) {
   if (status === "running") return "Running";
   if (status === "success") return "Completed";
@@ -449,15 +458,25 @@ function ToolResultAction({ label, onClick, children }) {
     children
   });
 }
-function ToolResultOutput({ children, language: _language = "bash", label, className }) {
-  return /* @__PURE__ */ jsxs("div", {
-    className: "space-y-1.5",
-    children: [label ? /* @__PURE__ */ jsx("div", {
-      className: "px-0.5 text-micro font-medium uppercase tracking-[0.12em] text-muted-foreground/60",
-      children: label
-    }) : null, /* @__PURE__ */ jsx("pre", {
-      className: cn("m-0 whitespace-pre-wrap break-words font-mono text-xs leading-5 text-foreground/80", className),
-      children: /* @__PURE__ */ jsx("code", { children })
+function ToolResultOutput({ children, language: _language = "bash", label, error = false, className }) {
+  return /* @__PURE__ */ jsxs(CodeBlock, {
+    "data-error": error || void 0,
+    variant: error ? "destructive" : "default",
+    size: "sm",
+    className,
+    children: [/* @__PURE__ */ jsxs(CodeBlockHeader, {
+      className: "py-1",
+      children: [label ? /* @__PURE__ */ jsx(CodeBlockTitle, {
+        className: cn("text-micro uppercase tracking-[0.12em]", error ? "text-destructive" : "text-muted-foreground/60"),
+        children: error ? "Reported error" : label
+      }) : null, /* @__PURE__ */ jsx(CodeBlockActions, { children: /* @__PURE__ */ jsx(CodeBlockCopyButton, {
+        value: children,
+        "aria-label": "Copy result"
+      }) })]
+    }), /* @__PURE__ */ jsx(CodeBlockContent, {
+      wrap: true,
+      className: cn("max-h-60 text-xs leading-5", error ? "text-destructive" : "text-foreground/80"),
+      children
     })]
   });
 }
@@ -519,7 +538,7 @@ function ToolResult({ tool, title, children, status = "running", kind = "custom"
       "aria-expanded": currentOpen,
       "aria-controls": contentId,
       onClick: () => setOpen(!currentOpen),
-      className: "group flex min-h-9 w-full items-center gap-2 rounded-md py-1 text-left outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 focus-visible:ring-offset-background",
+      className: "group flex min-h-9 w-full items-center gap-2 py-1 text-left outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 focus-visible:ring-offset-background",
       children: [
         /* @__PURE__ */ jsx("span", {
           "aria-hidden": "true",
@@ -568,41 +587,35 @@ function ToolResult({ tool, title, children, status = "running", kind = "custom"
       open: currentOpen,
       children: /* @__PURE__ */ jsx("div", {
         className: "pl-6 pt-1.5",
-        children: /* @__PURE__ */ jsxs("div", {
-          className: "overflow-hidden rounded-xl bg-muted/80",
-          children: [/* @__PURE__ */ jsx("div", {
-            ref: viewportRef,
-            role: "log",
-            "aria-live": "polite",
-            className: "scrollbar-hide overflow-y-auto overscroll-contain",
-            style: { maxHeight },
-            children: /* @__PURE__ */ jsx("div", {
-              className: "p-3",
-              children
+        children: /* @__PURE__ */ jsxs("div", { children: [/* @__PURE__ */ jsx("div", {
+          ref: viewportRef,
+          role: "log",
+          "aria-live": "polite",
+          className: "scrollbar-hide overflow-y-auto overscroll-contain",
+          style: { maxHeight },
+          children
+        }), canCopy ? /* @__PURE__ */ jsxs("div", {
+          className: "flex items-center gap-0.5 px-2 pb-1.5",
+          children: [/* @__PURE__ */ jsx(ToolResultAction, {
+            label: copied ? "Copied" : "Copy result",
+            onClick: handleCopy,
+            children: copied ? /* @__PURE__ */ jsx(Check, { className: "size-3.5" }) : /* @__PURE__ */ jsx(Copy, { className: "size-3.5" })
+          }), /* @__PURE__ */ jsx("span", {
+            className: "ml-auto text-caption text-muted-foreground/55",
+            children: /* @__PURE__ */ jsx(ActionSwapRollText, {
+              value: status,
+              children: statusLabel
             })
-          }), canCopy ? /* @__PURE__ */ jsxs("div", {
-            className: "flex items-center gap-0.5 px-2 pb-1.5",
-            children: [/* @__PURE__ */ jsx(ToolResultAction, {
-              label: copied ? "Copied" : "Copy result",
-              onClick: handleCopy,
-              children: copied ? /* @__PURE__ */ jsx(Check, { className: "size-3.5" }) : /* @__PURE__ */ jsx(Copy, { className: "size-3.5" })
-            }), /* @__PURE__ */ jsx("span", {
-              className: "ml-auto text-caption text-muted-foreground/55",
-              children: /* @__PURE__ */ jsx(ActionSwapRollText, {
-                value: status,
-                children: statusLabel
-              })
-            })]
-          }) : null]
-        })
+          })]
+        }) : null] })
       })
     })]
   });
 }
 
 export {
-  CodeBlock,
   FileDiff,
+  CodeBlock2 as CodeBlock,
   ToolResultOutput,
   ToolResult
 };