1- import { RefreshIcon } from "~/components/ui/refresh-icon" ;
21import { useAtomValue } from "@effect/atom-react" ;
32import type { FileDiffContentsLoader , FileDiffMetadata } from "@pierre/diffs" ;
43import { useParams } from "@tanstack/react-router" ;
76 squashAtomCommandFailure ,
87} from "@t3tools/client-runtime/state/runtime" ;
98import { safeErrorLogAttributes } from "@t3tools/client-runtime/errors" ;
10- import type { ScopedThreadRef , RunId } from "@t3tools/contracts" ;
9+ import type { RunId } from "@t3tools/contracts" ;
1110import {
1211 ArrowRightIcon ,
1312 CheckIcon ,
@@ -23,43 +22,21 @@ import {
2322} from "lucide-react" ;
2423import * as Schema from "effect/Schema" ;
2524import * as DateTime from "effect/DateTime" ;
26- import { useCallback , useEffect , useMemo , useRef , useState } from "react" ;
27- import { useCodeViewFileReveal } from "./diffs/useCodeViewFileReveal" ;
28- import { useOpenInPreferredEditor } from "../editorPreferences" ;
29- import { useFileContextMenuHandler } from "../fileContextMenu" ;
30- import { type DraftId } from "../composerDraftStore" ;
31- import { openDiffFilePrimaryAction } from "../diffFileActions" ;
32- import { useCheckpointDiff } from "~/lib/checkpointDiffState" ;
33- import { cn } from "~/lib/utils" ;
34- import { selectThreadDiffPanelSelection , useDiffPanelStore } from "../diffPanelStore" ;
35- import { useLocalStorage } from "../hooks/useLocalStorage" ;
36- import { useTheme } from "../hooks/useTheme" ;
25+ import { useCallback , useEffect , useMemo , useRef , useState , type ReactNode } from "react" ;
26+
27+ import { RefreshIcon } from "~/components/ui/refresh-icon" ;
28+ import { useCodeViewFileReveal } from "~/components/diffs/useCodeViewFileReveal" ;
29+ import { DiffFilePathCopyButton } from "~/components/DiffFilePathCopyButton" ;
30+ import { DiffStatLabel } from "~/components/chat/DiffStatLabel" ;
3731import {
38- buildFileDiffContentVersion ,
39- buildFileDiffIdentityKey ,
40- getDiffCollapseIconClassName ,
41- getDiffLineStat ,
42- getRenderablePatch ,
43- resolveDiffThemeName ,
44- resolveFileDiffPath ,
45- } from "../lib/diffRendering" ;
46- import { PREFERRED_HIGHLIGHTER } from "../lib/syntaxHighlighting" ;
47- import { areAllDiffFilesCollapsed , toggleAllDiffFiles } from "../lib/diffCollapse" ;
48- import { useTurnDiffSummaries } from "../hooks/useTurnDiffSummaries" ;
49- import { useWorkspaceMutationRefresh } from "../hooks/useWorkspaceMutationRefresh" ;
50- import { useProject , useThreadProjection , useThreadShell } from "../state/entities" ;
51- import { resolveThreadRouteRef } from "../threadRoutes" ;
52- import { useClientSettings , useUpdateClientSettings } from "../hooks/useSettings" ;
53- import { formatShortTimestamp } from "../timestampFormat" ;
54- import { DiffFilePathCopyButton } from "./DiffFilePathCopyButton" ;
55- import { DiffPanelLoadingState , DiffPanelShell , type DiffPanelMode } from "./DiffPanelShell" ;
56- import { DiffStatLabel } from "./chat/DiffStatLabel" ;
57- import { AnnotatableCodeView , type AnnotatableCodeViewHandle } from "./diffs/AnnotatableCodeView" ;
58- import { DiffFileTree } from "./diffs/DiffFileTree" ;
59- import { diffFileTreeEntries } from "./diffs/diffFileTree.logic" ;
60- import { Button } from "./ui/button" ;
61- import { ToggleGroup , Toggle } from "./ui/toggle-group" ;
62- import { Switch } from "./ui/switch" ;
32+ AnnotatableCodeView ,
33+ type AnnotatableCodeViewHandle ,
34+ } from "~/components/diffs/AnnotatableCodeView" ;
35+ import { DiffFileTree } from "~/components/diffs/DiffFileTree" ;
36+ import { diffFileTreeEntries } from "~/components/diffs/diffFileTree.logic" ;
37+ import { Button } from "~/components/ui/button" ;
38+ import { ToggleGroup , Toggle } from "~/components/ui/toggle-group" ;
39+ import { Switch } from "~/components/ui/switch" ;
6340import {
6441 Combobox ,
6542 ComboboxEmpty ,
@@ -68,7 +45,7 @@ import {
6845 ComboboxList ,
6946 ComboboxPopup ,
7047 ComboboxTrigger ,
71- } from ". /ui/combobox" ;
48+ } from "~/components /ui/combobox" ;
7249import {
7350 DropdownMenu ,
7451 DropdownMenuContent ,
@@ -78,19 +55,48 @@ import {
7855 DropdownMenuSubContent ,
7956 DropdownMenuSubTrigger ,
8057 DropdownMenuTrigger ,
81- } from "./ui/menu" ;
82- import { Tooltip , TooltipPopup , TooltipTrigger } from "./ui/tooltip" ;
83- import { useEnvironmentQuery } from "../state/query" ;
84- import { useAtomCommand } from "../state/use-atom-command" ;
85- import { serverEnvironment } from "../state/server" ;
86- import { reviewEnvironment } from "../state/review" ;
87- import { vcsEnvironment } from "../state/vcs" ;
88- import { buildBaseRefChoices , filterBaseRefChoices } from "../lib/baseRefChoices" ;
89- import { createGitDiffFileContentsLoader } from "../lib/diffFileContents" ;
58+ } from "~/components/ui/menu" ;
59+ import { Tooltip , TooltipPopup , TooltipTrigger } from "~/components/ui/tooltip" ;
60+ import { useReviewFilePatches } from "~/components/diffs/useReviewFilePatches" ;
61+ import { DiffFileLoadingBoundary } from "~/components/diffs/DiffFileLoadingBoundary" ;
62+ import { DiffFileStatus } from "~/components/diffs/DiffFileStatus" ;
63+ import { DiffPanelLoadingState } from "~/components/diffs/DiffLoadingState" ;
9064
91- import { useReviewFilePatches } from "./diffs/useReviewFilePatches" ;
92- import { DiffFileLoadingBoundary } from "./diffs/DiffFileLoadingBoundary" ;
93- import { DiffFileStatus } from "./diffs/DiffFileStatus" ;
65+ import type { SidePanelProps } from "../bundledPanels" ;
66+
67+ import { useOpenInPreferredEditor } from "~/editorPreferences" ;
68+ import { useFileContextMenuHandler } from "~/fileContextMenu" ;
69+ import { openDiffFilePrimaryAction } from "~/diffFileActions" ;
70+ import { useCheckpointDiff } from "~/lib/checkpointDiffState" ;
71+ import { cn } from "~/lib/utils" ;
72+ import { selectThreadDiffPanelSelection , useDiffPanelStore } from "~/diffPanelStore" ;
73+ import { useLocalStorage } from "~/hooks/useLocalStorage" ;
74+ import { useTheme } from "~/hooks/useTheme" ;
75+ import {
76+ buildFileDiffContentVersion ,
77+ buildFileDiffIdentityKey ,
78+ getDiffCollapseIconClassName ,
79+ getDiffLineStat ,
80+ getRenderablePatch ,
81+ resolveDiffThemeName ,
82+ resolveFileDiffPath ,
83+ } from "~/lib/diffRendering" ;
84+ import { PREFERRED_HIGHLIGHTER } from "~/lib/syntaxHighlighting" ;
85+ import { areAllDiffFilesCollapsed , toggleAllDiffFiles } from "~/lib/diffCollapse" ;
86+ import { useTurnDiffSummaries } from "~/hooks/useTurnDiffSummaries" ;
87+ import { useWorkspaceMutationRefresh } from "~/hooks/useWorkspaceMutationRefresh" ;
88+ import { useProject , useThreadProjection , useThreadShell } from "~/state/entities" ;
89+ import { resolveThreadRouteRef } from "~/threadRoutes" ;
90+ import { useClientSettings , useUpdateClientSettings } from "~/hooks/useSettings" ;
91+ import { formatShortTimestamp } from "~/timestampFormat" ;
92+
93+ import { useEnvironmentQuery } from "~/state/query" ;
94+ import { useAtomCommand } from "~/state/use-atom-command" ;
95+ import { serverEnvironment } from "~/state/server" ;
96+ import { reviewEnvironment } from "~/state/review" ;
97+ import { vcsEnvironment } from "~/state/vcs" ;
98+ import { buildBaseRefChoices , filterBaseRefChoices } from "~/lib/baseRefChoices" ;
99+ import { createGitDiffFileContentsLoader } from "~/lib/diffFileContents" ;
94100
95101type DiffThemeType = "light" | "dark" ;
96102const AUTOMATIC_BASE_REF = "__automatic_base_ref__" ;
@@ -119,17 +125,25 @@ interface CollapsedDiffFilesState {
119125
120126const EMPTY_COLLAPSED_DIFF_FILE_KEYS : ReadonlySet < string > = new Set ( ) ;
121127
122- interface DiffPanelProps {
123- mode ?: DiffPanelMode ;
124- composerDraftTarget : ScopedThreadRef | DraftId ;
125- workspaceMutationId : string | null ;
128+ // RightPanelTabs owns placement and desktop chrome; Diff keeps its embedded toolbar.
129+ function DiffSidePanelFrame ( { header, children } : { header : ReactNode ; children : ReactNode } ) {
130+ return (
131+ < div className = "flex h-full min-w-0 flex-col bg-background w-full" >
132+ < div
133+ className = "flex items-center justify-between gap-2 px-2 h-10 min-h-10 shrink-0 border-b border-border/60 bg-background in-data-[preview-panel-mode=inline]:mb-3 in-data-[preview-panel-mode=inline]:h-7 in-data-[preview-panel-mode=inline]:min-h-7 in-data-[preview-panel-mode=inline]:border-b-transparent"
134+ data-surface-subheader
135+ >
136+ { header }
137+ </ div >
138+ { children }
139+ </ div >
140+ ) ;
126141}
127142
128- export default function DiffPanel ( {
129- mode = "inline" ,
143+ export default function DiffSidePanel ( {
130144 composerDraftTarget,
131145 workspaceMutationId,
132- } : DiffPanelProps ) {
146+ } : SidePanelProps ) {
133147 const { resolvedTheme } = useTheme ( ) ;
134148 const settings = useClientSettings ( ) ;
135149 const diffLayout = settings . diffLayout ;
@@ -970,7 +984,7 @@ export default function DiffPanel({
970984 ) ;
971985
972986 return (
973- < DiffPanelShell mode = { mode } header = { headerRow } >
987+ < DiffSidePanelFrame header = { headerRow } >
974988 { ! activeThread ? (
975989 < div className = "flex flex-1 items-center justify-center px-5 text-center text-xs text-muted-foreground/70" >
976990 Select a thread to inspect turn diffs.
@@ -1195,6 +1209,6 @@ export default function DiffPanel({
11951209 </ div >
11961210 </ >
11971211 ) }
1198- </ DiffPanelShell >
1212+ </ DiffSidePanelFrame >
11991213 ) ;
12001214}
0 commit comments