Skip to content

Open-source Grok Bot alternative for named AI teammates. Local-first desktop, web, and mobile clients with per-bot tools, instructions, and memory. Independent fork of T3 Code.

Extract changed files card with compact aligned diff stats (#3023)

Julius Marminge0b40ea62e12e
diff --git a/apps/web/src/components/chat/ChangedFilesTree.tsx b/apps/web/src/components/chat/ChangedFilesTree.tsx
index 29bd96ea0..ae5b43173 100644
--- a/apps/web/src/components/chat/ChangedFilesTree.tsx
+++ b/apps/web/src/components/chat/ChangedFilesTree.tsx
@@ -1,14 +1,85 @@
import { type TurnId } from "@t3tools/contracts";
import { memo, useCallback, useMemo, useState } from "react";
import { type TurnDiffFileChange } from "../../types";
-import { buildTurnDiffTree, type TurnDiffTreeNode } from "../../lib/turnDiffTree";
+import {
+ buildTurnDiffTree,
+ summarizeTurnDiffStats,
+ type TurnDiffTreeNode,
+} from "../../lib/turnDiffTree";
import { ChevronRightIcon, FolderIcon, FolderClosedIcon } from "lucide-react";
import { cn } from "~/lib/utils";
import { DiffStatLabel, hasNonZeroStat } from "./DiffStatLabel";
import { VscodeEntryIcon } from "./VscodeEntryIcon";
+import { Button } from "../ui/button";
const EMPTY_DIRECTORY_OVERRIDES: Record<string, boolean> = {};
+export const ChangedFilesCard = memo(function ChangedFilesCard(props: {
+ turnId: TurnId;
+ files: ReadonlyArray<TurnDiffFileChange>;
+ allDirectoriesExpanded: boolean;
+ resolvedTheme: "light" | "dark";
+ onToggleAllDirectories: () => void;
+ onOpenTurnDiff: (turnId: TurnId, filePath?: string) => void;
+}) {
+ const {
+ turnId,
+ files,
+ allDirectoriesExpanded,
+ resolvedTheme,
+ onToggleAllDirectories,
+ onOpenTurnDiff,
+ } = props;
+ const summaryStat = useMemo(() => summarizeTurnDiffStats(files), [files]);
+
+ return (
+ <div className="relative mt-4 rounded-2xl bg-card/40 shadow-xs/5 not-dark:bg-clip-padding after:pointer-events-none after:absolute after:inset-0 after:z-20 after:rounded-2xl after:border after:border-input">
+ <div className="sticky top-0 z-10 mb-3 flex items-center justify-between gap-2 rounded-t-2xl bg-card/72 p-3 backdrop-blur-md">
+ <p className="flex items-center gap-1 font-medium text-foreground text-xs leading-4">
+ <span>{files.length} changed files</span>
+ {hasNonZeroStat(summaryStat) && (
+ <DiffStatLabel
+ additions={summaryStat.additions}
+ className="text-xs leading-4"
+ deletions={summaryStat.deletions}
+ layout="inline"
+ />
+ )}
+ </p>
+ <div className="flex items-center gap-1.5">
+ <Button
+ type="button"
+ size="xs"
+ variant="outline"
+ data-scroll-anchor-ignore
+ onClick={onToggleAllDirectories}
+ >
+ {allDirectoriesExpanded ? "Collapse all" : "Expand all"}
+ </Button>
+ <Button
+ type="button"
+ size="xs"
+ variant="outline"
+ onClick={() => onOpenTurnDiff(turnId, files[0]?.path)}
+ >
+ View diff
+ </Button>
+ </div>
+ </div>
+ <div className="px-2 pb-2">
+ <ChangedFilesTree
+ key={`changed-files-tree:${turnId}`}
+ turnId={turnId}
+ files={files}
+ allDirectoriesExpanded={allDirectoriesExpanded}
+ resolvedTheme={resolvedTheme}
+ onOpenTurnDiff={onOpenTurnDiff}
+ />
+ </div>
+ </div>
+ );
+});
+
export const ChangedFilesTree = memo(function ChangedFilesTree(props: {
turnId: TurnId;
files: ReadonlyArray<TurnDiffFileChange>;
@@ -22,6 +93,7 @@ export const ChangedFilesTree = memo(function ChangedFilesTree(props: {
() => collectDirectoryPaths(treeNodes).join("\u0000"),
[treeNodes],
);
+ const hasDirectoryNodes = directoryPathsKey.length > 0;
const expansionStateKey = `${allDirectoriesExpanded ? "expanded" : "collapsed"}\u0000${directoryPathsKey}`;
const [directoryExpansionState, setDirectoryExpansionState] = useState<{
key: string;
@@ -60,7 +132,7 @@ export const ChangedFilesTree = memo(function ChangedFilesTree(props: {
<button
type="button"
data-scroll-anchor-ignore
- className="group flex w-full items-center gap-1.5 rounded-md py-1 pr-2 text-left hover:bg-background/80"
+ className="group flex w-full items-center gap-1.5 rounded-xl py-1 pr-3 text-left transition-colors hover:bg-accent/60 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-1 focus-visible:ring-offset-background"
style={{ paddingLeft: `${leftPadding}px` }}
onClick={() => toggleDirectory(node.path)}
>
@@ -98,11 +170,13 @@ export const ChangedFilesTree = memo(function ChangedFilesTree(props: {
<button
key={`file:${node.path}`}
type="button"
- className="group flex w-full items-center gap-1.5 rounded-md py-1 pr-2 text-left hover:bg-background/80"
+ className="group flex w-full items-center gap-1.5 rounded-xl py-1 pr-3 text-left transition-colors hover:bg-accent/60 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-1 focus-visible:ring-offset-background"
style={{ paddingLeft: `${leftPadding}px` }}
onClick={() => onOpenTurnDiff(turnId, node.path)}
>
- <span aria-hidden="true" className="size-3.5 shrink-0" />
+ {hasDirectoryNodes || depth > 0 ? (
+ <span aria-hidden="true" className="size-3.5 shrink-0" />
+ ) : null}
<VscodeEntryIcon
pathValue={node.path}
kind="file"
diff --git a/apps/web/src/components/chat/DiffStatLabel.tsx b/apps/web/src/components/chat/DiffStatLabel.tsx
index 2dda06fd9..8fd7e90e3 100644
--- a/apps/web/src/components/chat/DiffStatLabel.tsx
+++ b/apps/web/src/components/chat/DiffStatLabel.tsx
@@ -1,21 +1,46 @@
import { memo } from "react";
+import { cn } from "~/lib/utils";
export function hasNonZeroStat(stat: { additions: number; deletions: number }): boolean {
return stat.additions > 0 || stat.deletions > 0;
}
+function formatCompactDiffCount(value: number): string {
+ if (value < 1000) return String(value);
+ if (value < 1_000_000) {
+ const k = value / 1000;
+ return `${k < 10 ? k.toFixed(1).replace(/\.0$/, "") : Math.round(k)}k`;
+ }
+ if (value < 1_000_000_000) {
+ const m = value / 1_000_000;
+ return `${m < 10 ? m.toFixed(1).replace(/\.0$/, "") : Math.round(m)}m`;
+ }
+ const b = value / 1_000_000_000;
+ return `${b < 10 ? b.toFixed(1).replace(/\.0$/, "") : Math.round(b)}b`;
+}
+
export const DiffStatLabel = memo(function DiffStatLabel(props: {
additions: number;
deletions: number;
+ className?: string;
showParentheses?: boolean;
+ layout?: "aligned" | "inline";
}) {
- const { additions, deletions, showParentheses = false } = props;
+ const { additions, deletions, className, showParentheses = false, layout = "aligned" } = props;
return (
<>
{showParentheses && <span className="text-muted-foreground/70">(</span>}
- <span className="text-success">+{additions}</span>
- <span className="mx-0.5 text-muted-foreground/70">/</span>
- <span className="text-destructive">-{deletions}</span>
+ <span
+ className={cn(
+ layout === "inline"
+ ? "inline-flex items-center gap-1 tabular-nums align-middle"
+ : "inline-grid grid-cols-[4ch_4ch] gap-2 text-right tabular-nums align-middle",
+ className,
+ )}
+ >
+ <span className="font-mono text-success">+{formatCompactDiffCount(additions)}</span>
+ <span className="font-mono text-destructive">-{formatCompactDiffCount(deletions)}</span>
+ </span>
{showParentheses && <span className="text-muted-foreground/70">)</span>}
</>
);
diff --git a/apps/web/src/components/chat/MessagesTimeline.tsx b/apps/web/src/components/chat/MessagesTimeline.tsx
index 976506949..dd5ea85ce 100644
--- a/apps/web/src/components/chat/MessagesTimeline.tsx
+++ b/apps/web/src/components/chat/MessagesTimeline.tsx
@@ -20,7 +20,6 @@ import { LegendList, type LegendListRef } from "@legendapp/list/react";
import { FileDiff } from "@pierre/diffs/react";
import { deriveTimelineEntries, formatElapsed } from "../../session-logic";
import { type TurnDiffSummary } from "../../types";
-import { summarizeTurnDiffStats } from "../../lib/turnDiffTree";
import {
getRenderablePatch,
resolveDiffThemeName,
@@ -44,8 +43,7 @@ import {
import { Button } from "../ui/button";
import { buildExpandedImagePreview, ExpandedImagePreview } from "./ExpandedImagePreview";
import { ProposedPlanCard } from "./ProposedPlanCard";
-import { ChangedFilesTree } from "./ChangedFilesTree";
-import { DiffStatLabel, hasNonZeroStat } from "./DiffStatLabel";
+import { ChangedFilesCard } from "./ChangedFilesTree";
import { MessageCopyButton } from "./MessageCopyButton";
import {
computeStableMessagesTimelineRows,
@@ -708,50 +706,18 @@ function AssistantChangedFilesSectionInner({
(store) => store.threadChangedFilesExpandedById[routeThreadKey]?.[turnSummary.turnId] ?? true,
);
const setExpanded = useUiStateStore((store) => store.setThreadChangedFilesExpanded);
- const summaryStat = summarizeTurnDiffStats(checkpointFiles);
- const changedFileCountLabel = String(checkpointFiles.length);
return (
- <div className="mt-2 rounded-lg border border-border/80 bg-card/45 p-2.5">
- <div className="sticky top-2 z-10 mb-1.5 flex items-center justify-between gap-2 bg-[color-mix(in_srgb,var(--card)_45%,var(--background))] before:absolute before:inset-x-0 before:-top-2 before:h-2 before:bg-[color-mix(in_srgb,var(--card)_45%,var(--background))] before:content-['']">
- <p className="text-[10px] uppercase tracking-[0.12em] text-muted-foreground/65">
- <span>Changed files ({changedFileCountLabel})</span>
- {hasNonZeroStat(summaryStat) && (
- <>
- <span className="mx-1">•</span>
- <DiffStatLabel additions={summaryStat.additions} deletions={summaryStat.deletions} />
- </>
- )}
- </p>
- <div className="flex items-center gap-1.5">
- <Button
- type="button"
- size="xs"
- variant="outline"
- data-scroll-anchor-ignore
- onClick={() => setExpanded(routeThreadKey, turnSummary.turnId, !allDirectoriesExpanded)}
- >
- {allDirectoriesExpanded ? "Collapse all" : "Expand all"}
- </Button>
- <Button
- type="button"
- size="xs"
- variant="outline"
- onClick={() => onOpenTurnDiff(turnSummary.turnId, checkpointFiles[0]?.path)}
- >
- View diff
- </Button>
- </div>
- </div>
- <ChangedFilesTree
- key={`changed-files-tree:${turnSummary.turnId}`}
- turnId={turnSummary.turnId}
- files={checkpointFiles}
- allDirectoriesExpanded={allDirectoriesExpanded}
- resolvedTheme={resolvedTheme}
- onOpenTurnDiff={onOpenTurnDiff}
- />
- </div>
+ <ChangedFilesCard
+ turnId={turnSummary.turnId}
+ files={checkpointFiles}
+ allDirectoriesExpanded={allDirectoriesExpanded}
+ resolvedTheme={resolvedTheme}
+ onToggleAllDirectories={() =>
+ setExpanded(routeThreadKey, turnSummary.turnId, !allDirectoriesExpanded)
+ }
+ onOpenTurnDiff={onOpenTurnDiff}
+ />
);
}