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.
Add diff scope switching and provider update settings (#3169)
Julius Marminged2c0a6a48f50
diff --git a/apps/server/src/vcs/GitVcsDriverCore.test.ts b/apps/server/src/vcs/GitVcsDriverCore.test.tsindex 41f5d595f..5be6427fe 100644--- a/apps/server/src/vcs/GitVcsDriverCore.test.ts+++ b/apps/server/src/vcs/GitVcsDriverCore.test.ts@@ -100,6 +100,41 @@ it.layer(TestLayer)("GitVcsDriver core integration", (it) => {assert.deepStrictEqual(paths, ["complete.txt", "final.txt"]);}),);++ it.effect("honors whitespace filtering for worktree and branch previews", () =>+ Effect.gen(function* () {+ const cwd = yield* makeTmpDir();+ const { initialBranch } = yield* initRepoWithCommit(cwd);+ const driver = yield* GitVcsDriver.GitVcsDriver;+ yield* git(cwd, ["checkout", "-b", "feature/whitespace"]);+ yield* writeTextFile(cwd, "README.md", "# test\n");+ yield* git(cwd, ["add", "README.md"]);+ yield* git(cwd, ["commit", "-m", "change whitespace"]);+ yield* writeTextFile(cwd, "README.md", "# test\n");++ const included = yield* driver.getReviewDiffPreview({+ cwd,+ baseRef: initialBranch,+ ignoreWhitespace: false,+ });+ const ignored = yield* driver.getReviewDiffPreview({+ cwd,+ baseRef: initialBranch,+ ignoreWhitespace: true,+ });++ assert.isNotEmpty(included.sources.find((source) => source.kind === "working-tree")?.diff);+ assert.isNotEmpty(included.sources.find((source) => source.kind === "branch-range")?.diff);+ assert.strictEqual(+ ignored.sources.find((source) => source.kind === "working-tree")?.diff,+ "",+ );+ assert.strictEqual(+ ignored.sources.find((source) => source.kind === "branch-range")?.diff,+ "",+ );+ }),+ );});describe("repository status", () => {@@ -342,6 +377,44 @@ it.layer(TestLayer)("GitVcsDriver core integration", (it) => {});describe("refName operations", () => {+ it.effect("optionally includes remote refs that match local branches", () =>+ Effect.gen(function* () {+ const cwd = yield* makeTmpDir();+ const remote = yield* makeTmpDir("git-vcs-driver-remote-");+ const { initialBranch } = yield* initRepoWithCommit(cwd);+ yield* git(remote, ["init", "--bare"]);+ yield* git(cwd, ["remote", "add", "origin", remote]);+ yield* git(cwd, ["push", "-u", "origin", initialBranch]);+ const driver = yield* GitVcsDriver.GitVcsDriver;++ const deduplicated = yield* driver.listRefs({ cwd });+ assert.equal(+ deduplicated.refs.some((ref) => ref.name === `origin/${initialBranch}`),+ false,+ );++ const complete = yield* driver.listRefs({ cwd, includeMatchingRemoteRefs: true });+ assert.equal(+ complete.refs.some((ref) => ref.name === initialBranch),+ true,+ );+ assert.equal(+ complete.refs.some((ref) => ref.name === `origin/${initialBranch}`),+ true,+ );++ const remoteOnly = yield* driver.listRefs({+ cwd,+ includeMatchingRemoteRefs: true,+ refKind: "remote",+ limit: 1,+ });+ assert.equal(remoteOnly.refs.length, 1);+ assert.equal(remoteOnly.refs[0]?.name, `origin/${initialBranch}`);+ assert.equal(remoteOnly.refs[0]?.isRemote, true);+ }),+ );+it.effect("creates, checks out, renames, and lists refs", () =>Effect.gen(function* () {const cwd = yield* makeTmpDir();diff --git a/apps/server/src/vcs/GitVcsDriverCore.ts b/apps/server/src/vcs/GitVcsDriverCore.tsindex 5c2407205..b78fba103 100644--- a/apps/server/src/vcs/GitVcsDriverCore.ts+++ b/apps/server/src/vcs/GitVcsDriverCore.ts@@ -1817,7 +1817,14 @@ export const makeGitVcsDriverCore = Effect.fn("makeGitVcsDriverCore")(function*const dirtyTrackedResult = yield* executeGit("GitVcsDriver.getReviewDiffPreview.dirtyTracked",input.cwd,- ["diff", "--patch", "--minimal", "HEAD", "--"],+ [+ "diff",+ "--patch",+ "--minimal",+ ...(input.ignoreWhitespace ? ["--ignore-all-space"] : []),+ "HEAD",+ "--",+ ],{maxOutputBytes: REVIEW_DIFF_PATCH_MAX_OUTPUT_BYTES,appendTruncationMarker: true,@@ -1843,7 +1850,13 @@ export const makeGitVcsDriverCore = Effect.fn("makeGitVcsDriverCore")(function*? yield* executeGit("GitVcsDriver.getReviewDiffPreview.base",input.cwd,- ["diff", "--patch", "--minimal", `${baseRef}...HEAD`],+ [+ "diff",+ "--patch",+ "--minimal",+ ...(input.ignoreWhitespace ? ["--ignore-all-space"] : []),+ `${baseRef}...HEAD`,+ ],{maxOutputBytes: REVIEW_DIFF_PATCH_MAX_OUTPUT_BYTES,appendTruncationMarker: true,@@ -2127,11 +2140,17 @@ export const makeGitVcsDriverCore = Effect.fn("makeGitVcsDriverCore")(function*}): [];+ const allBranches = input.includeMatchingRemoteRefs+ ? [...localBranches, ...remoteBranches]+ : dedupeRemoteBranchesWithLocalMatches([...localBranches, ...remoteBranches]);+ const branchesForKind =+ input.refKind === "local"+ ? allBranches.filter((ref) => !ref.isRemote)+ : input.refKind === "remote"+ ? allBranches.filter((ref) => ref.isRemote)+ : allBranches;const refs = paginateBranches({- refs: filterBranchesForListQuery(- dedupeRemoteBranchesWithLocalMatches([...localBranches, ...remoteBranches]),- input.query,- ),+ refs: filterBranchesForListQuery(branchesForKind, input.query),cursor: input.cursor,limit: input.limit,});diff --git a/apps/web/src/components/ChatView.tsx b/apps/web/src/components/ChatView.tsxindex a1ef90c43..636740761 100644--- a/apps/web/src/components/ChatView.tsx+++ b/apps/web/src/components/ChatView.tsx@@ -42,7 +42,7 @@ import { nextTerminalId, resolveTerminalSessionLabel } from "@t3tools/shared/terimport { Debouncer } from "@tanstack/react-pacer";import { useAtomValue } from "@effect/atom-react";import { lazy, memo, Suspense, useCallback, useEffect, useMemo, useRef, useState } from "react";-import { useNavigate, useSearch } from "@tanstack/react-router";+import { useNavigate } from "@tanstack/react-router";import { useShallow } from "zustand/react/shallow";import {isAtomCommandInterrupted,@@ -55,7 +55,7 @@ import * as Cause from "effect/Cause";import { AsyncResult } from "effect/unstable/reactivity";import { isElectron } from "../env";import { readLocalApi } from "../localApi";-import { parseDiffRouteSearch, stripDiffSearchParams } from "../diffRouteSearch";+import { useDiffPanelStore } from "../diffPanelStore";import {collapseExpandedComposerCursor,parseStandaloneComposerSlashCommand,@@ -104,7 +104,7 @@ import { buildTemporaryWorktreeBranchName } from "@t3tools/shared/git";import { useMediaQuery } from "../hooks/useMediaQuery";import { RIGHT_PANEL_INLINE_LAYOUT_MEDIA_QUERY } from "../rightPanelLayout";import {- selectActiveRightPanelKindWithUrl,+ selectActiveRightPanel,selectActiveRightPanelSurface,selectThreadRightPanelState,type RightPanelSurface,@@ -1034,10 +1034,6 @@ function ChatViewContent(props: ChatViewProps) {const timestampFormat = settings.timestampFormat;const autoOpenPlanSidebar = settings.autoOpenPlanSidebar;const navigate = useNavigate();- const rawSearch = useSearch({- strict: false,- select: (params) => parseDiffRouteSearch(params),- });const { resolvedTheme } = useTheme();// Granular store selectors — avoid subscribing to prompt changes.const composerRuntimeMode = useComposerDraftStore(@@ -1217,7 +1213,6 @@ function ChatViewContent(props: ChatViewProps) {composerInteractionMode ?? activeThread?.interactionMode ?? DEFAULT_INTERACTION_MODE;const isLocalDraftThread = !isServerThread && localDraftThread !== undefined;const canCheckoutPullRequestIntoThread = isLocalDraftThread;- const diffOpen = rawSearch.diff === "1";const activeThreadId = activeThread?.id ?? null;const runningTerminalIds = useThreadRunningTerminalIds({environmentId: activeThread?.environmentId ?? null,@@ -1259,8 +1254,9 @@ function ChatViewContent(props: ChatViewProps) {);const activeThreadKey = activeThreadRef ? scopedThreadKey(activeThreadRef) : null;const activeRightPanelKind = useRightPanelStore((state) =>- selectActiveRightPanelKindWithUrl(state.byThreadKey, activeThreadRef, diffOpen),+ selectActiveRightPanel(state.byThreadKey, activeThreadRef),);+ const diffOpen = activeRightPanelKind === "diff";const rightPanelState = useRightPanelStore((state) =>selectThreadRightPanelState(state.byThreadKey, activeThreadRef),);@@ -1295,11 +1291,6 @@ function ChatViewContent(props: ChatViewProps) {const planSidebarOpen = activeRightPanelKind === "plan";- useEffect(() => {- if (!activeThreadRef || !diffOpen) return;- useRightPanelStore.getState().open(activeThreadRef, "diff");- }, [activeThreadRef, diffOpen]);-const existingOpenTerminalThreadKeys = useMemo(() => {const existingThreadKeys = new Set<string>([...serverThreadKeys, ...draftThreadKeys]);return openTerminalThreadKeys.filter((nextThreadKey) => existingThreadKeys.has(nextThreadKey));@@ -2151,27 +2142,7 @@ function ChatViewContent(props: ChatViewProps) {if (activeThreadRef) {useRightPanelStore.getState().toggle(activeThreadRef, "diff");}- void navigate({- to: "/$environmentId/$threadId",- params: {- environmentId,- threadId,- },- replace: true,- search: (previous) => {- const rest = stripDiffSearchParams(previous);- return diffOpen ? { ...rest, diff: undefined } : { ...rest, diff: "1" };- },- });- }, [- activeThreadRef,- diffOpen,- environmentId,- isServerThread,- navigate,- onDiffPanelOpen,- threadId,- ]);+ }, [activeThreadRef, diffOpen, isServerThread, onDiffPanelOpen]);const envLocked = Boolean(activeThread &&@@ -2757,21 +2728,7 @@ function ChatViewContent(props: ChatViewProps) {if (!activeThreadRef || !isServerThread || !isGitRepo) return;useRightPanelStore.getState().open(activeThreadRef, "diff");onDiffPanelOpen?.();- void navigate({- to: "/$environmentId/$threadId",- params: { environmentId, threadId },- replace: true,- search: (previous) => ({ ...stripDiffSearchParams(previous), diff: "1" }),- });- }, [- activeThreadRef,- environmentId,- isGitRepo,- isServerThread,- navigate,- onDiffPanelOpen,- threadId,- ]);+ }, [activeThreadRef, isGitRepo, isServerThread, onDiffPanelOpen]);const addFilesSurface = useCallback(() => {if (!activeThreadRef || !activeProject) return;useRightPanelStore.getState().open(activeThreadRef, "files");@@ -2789,30 +2746,13 @@ function ChatViewContent(props: ChatViewProps) {useRightPanelStore.getState().close(activeThreadRef);return;}- if (diffOpen) {- void navigate({- to: "/$environmentId/$threadId",- params: { environmentId, threadId },- replace: true,- search: (previous) => ({ ...stripDiffSearchParams(previous), diff: undefined }),- });- }const activeTabId = activePreviewState.activeTabId;if (activeTabId) {useRightPanelStore.getState().openBrowser(activeThreadRef, activeTabId);} else {createBrowserSurface();}- }, [- activePreviewState.activeTabId,- activeThreadRef,- createBrowserSurface,- diffOpen,- environmentId,- navigate,- previewPanelOpen,- threadId,- ]);+ }, [activePreviewState.activeTabId, activeThreadRef, createBrowserSurface, previewPanelOpen]);const closePreviewPanel = useCallback(() => {if (activeThreadRef) {setMaximizedRightPanelThreadKey(null);@@ -2936,31 +2876,9 @@ function ChatViewContent(props: ChatViewProps) {}if (surface.kind === "diff" && !diffOpen) {onDiffPanelOpen?.();- void navigate({- to: "/$environmentId/$threadId",- params: { environmentId, threadId },- replace: true,- search: (previous) => ({ ...stripDiffSearchParams(previous), diff: "1" }),- });- } else if (surface.kind !== "diff" && diffOpen) {- void navigate({- to: "/$environmentId/$threadId",- params: { environmentId, threadId },- replace: true,- search: (previous) => ({ ...stripDiffSearchParams(previous), diff: undefined }),- });}},- [- activeThreadRef,- diffOpen,- dismissPlanSidebarForCurrentTurn,- environmentId,- navigate,- onDiffPanelOpen,- planSidebarOpen,- threadId,- ],+ [activeThreadRef, diffOpen, dismissPlanSidebarForCurrentTurn, onDiffPanelOpen, planSidebarOpen],);const toggleRightPanel = useCallback(() => {if (!activeThreadRef) return;@@ -3006,26 +2924,14 @@ function ChatViewContent(props: ChatViewProps) {}}}- if (diffOpen && surfaces.some((surface) => surface.kind === "diff")) {- void navigate({- to: "/$environmentId/$threadId",- params: { environmentId, threadId },- replace: true,- search: (previous) => ({ ...stripDiffSearchParams(previous), diff: undefined }),- });- }},[activeThreadRef,activePreviewState.sessions,closePreview,closeTerminalMutation,- diffOpen,dismissPlanSidebarForCurrentTurn,- environmentId,- navigate,storeCloseTerminal,- threadId,],);const syncActivePreviewSurface = useCallback(() => {@@ -4631,25 +4537,12 @@ function ChatViewContent(props: ChatViewProps) {}, []);const onOpenTurnDiff = useCallback((turnId: TurnId, filePath?: string) => {- if (!isServerThread) {- return;- }+ if (!isServerThread || !activeThreadRef) return;+ useDiffPanelStore.getState().selectTurn(activeThreadRef, turnId, filePath);+ useRightPanelStore.getState().open(activeThreadRef, "diff");onDiffPanelOpen?.();- void navigate({- to: "/$environmentId/$threadId",- params: {- environmentId,- threadId,- },- search: (previous) => {- const rest = stripDiffSearchParams(previous);- return filePath- ? { ...rest, diff: "1", diffTurnId: turnId, diffFilePath: filePath }- : { ...rest, diff: "1", diffTurnId: turnId };- },- });},- [environmentId, isServerThread, navigate, onDiffPanelOpen, threadId],+ [activeThreadRef, isServerThread, onDiffPanelOpen],);// Both the Map and the revert handler are read from refs at call-time so// the callback reference is fully stable and never busts context identity.diff --git a/apps/web/src/components/DiffPanel.tsx b/apps/web/src/components/DiffPanel.tsxindex 7ea2d5884..a7309b44f 100644--- a/apps/web/src/components/DiffPanel.tsx+++ b/apps/web/src/components/DiffPanel.tsx@@ -1,35 +1,28 @@import { useAtomValue } from "@effect/atom-react";-import { Virtualizer } from "@pierre/diffs/react";-import { useNavigate, useParams, useSearch } from "@tanstack/react-router";-import { scopeThreadRef } from "@t3tools/client-runtime/environment";+import { useParams } from "@tanstack/react-router";import {isAtomCommandInterrupted,squashAtomCommandFailure,} from "@t3tools/client-runtime/state/runtime";import type { ScopedThreadRef, TurnId } from "@t3tools/contracts";import {+ ArrowRightIcon,+ CheckIcon,ChevronDownIcon,- ChevronLeftIcon,ChevronRightIcon,Columns2Icon,PilcrowIcon,Rows3Icon,+ SearchIcon,TextWrapIcon,} from "lucide-react";-import {- type WheelEvent as ReactWheelEvent,- useCallback,- useEffect,- useMemo,- useRef,- useState,-} from "react";+import { useCallback, useEffect, useMemo, useRef, useState } from "react";import { useOpenInPreferredEditor } from "../editorPreferences";import { type DraftId } from "../composerDraftStore";import { openDiffFilePrimaryAction } from "../diffFileActions";import { useCheckpointDiff } from "~/lib/checkpointDiffState";import { cn } from "~/lib/utils";-import { parseDiffRouteSearch, stripDiffSearchParams } from "../diffRouteSearch";+import { selectThreadDiffPanelSelection, useDiffPanelStore } from "../diffPanelStore";import { useTheme } from "../hooks/useTheme";import {buildFileDiffRenderKey,@@ -40,19 +33,41 @@ import {} from "../lib/diffRendering";import { useTurnDiffSummaries } from "../hooks/useTurnDiffSummaries";import { useProject, useThread } from "../state/entities";-import { buildThreadRouteParams, resolveThreadRouteRef } from "../threadRoutes";+import { resolveThreadRouteRef } from "../threadRoutes";import { useSettings } from "../hooks/useSettings";import { formatShortTimestamp } from "../timestampFormat";import { DiffPanelLoadingState, DiffPanelShell, type DiffPanelMode } from "./DiffPanelShell";-import { AnnotatableFileDiff } from "./diffs/AnnotatableFileDiff";+import { AnnotatableCodeView, type AnnotatableCodeViewHandle } from "./diffs/AnnotatableFileDiff";import { ToggleGroup, Toggle } from "./ui/toggle-group";+import { Switch } from "./ui/switch";+import {+ Combobox,+ ComboboxEmpty,+ ComboboxInput,+ ComboboxItem,+ ComboboxList,+ ComboboxPopup,+ ComboboxTrigger,+} from "./ui/combobox";+import {+ DropdownMenu,+ DropdownMenuContent,+ DropdownMenuItem,+ DropdownMenuSub,+ DropdownMenuSubContent,+ DropdownMenuSubTrigger,+ DropdownMenuTrigger,+} from "./ui/menu";import { Tooltip, TooltipPopup, TooltipTrigger } from "./ui/tooltip";import { useEnvironmentQuery } from "../state/query";import { serverEnvironment } from "../state/server";+import { reviewEnvironment } from "../state/review";import { vcsEnvironment } from "../state/vcs";+import { buildBaseRefChoices, filterBaseRefChoices } from "../lib/baseRefChoices";type DiffRenderMode = "stacked" | "split";type DiffThemeType = "light" | "dark";+const AUTOMATIC_BASE_REF = "__automatic_base_ref__";interface CollapsedDiffFilesState {readonly scopeKey: string | null;@@ -167,27 +182,24 @@ interface DiffPanelProps {export { DiffWorkerPoolProvider } from "./DiffWorkerPoolProvider";export default function DiffPanel({ mode = "inline", composerDraftTarget }: DiffPanelProps) {- const navigate = useNavigate();const { resolvedTheme } = useTheme();const settings = useSettings();const [diffRenderMode, setDiffRenderMode] = useState<DiffRenderMode>("stacked");const [diffWordWrap, setDiffWordWrap] = useState(settings.diffWordWrap);const [diffIgnoreWhitespace, setDiffIgnoreWhitespace] = useState(settings.diffIgnoreWhitespace);+ const [baseRefQuery, setBaseRefQuery] = useState("");const [collapsedDiffFiles, setCollapsedDiffFiles] = useState<CollapsedDiffFilesState>(() => ({scopeKey: null,fileKeys: EMPTY_COLLAPSED_DIFF_FILE_KEYS,}));- const patchViewportRef = useRef<HTMLDivElement>(null);- const turnStripRef = useRef<HTMLDivElement>(null);- const previousDiffOpenRef = useRef(false);- const [canScrollTurnStripLeft, setCanScrollTurnStripLeft] = useState(false);- const [canScrollTurnStripRight, setCanScrollTurnStripRight] = useState(false);+ const codeViewRef = useRef<AnnotatableCodeViewHandle>(null);const routeThreadRef = useParams({strict: false,select: (params) => resolveThreadRouteRef(params),});- const diffSearch = useSearch({ strict: false, select: (search) => parseDiffRouteSearch(search) });- const diffOpen = diffSearch.diff === "1";+ const diffSelection = useDiffPanelStore((state) =>+ selectThreadDiffPanelSelection(state.byThreadKey, routeThreadRef),+ );const activeThreadId = routeThreadRef?.threadId ?? null;const activeThread = useThread(routeThreadRef);const activeProjectId = activeThread?.projectId ?? null;@@ -233,8 +245,20 @@ export default function DiffPanel({ mode = "inline", composerDraftTarget }: Diff[inferredCheckpointTurnCountByTurnId, turnDiffSummaries],);- const selectedTurnId = diffSearch.diffTurnId ?? null;- const selectedFilePath = selectedTurnId !== null ? (diffSearch.diffFilePath ?? null) : null;+ useEffect(() => {+ if (!routeThreadRef || diffSelection.kind !== "turn") return;+ useDiffPanelStore.getState().reconcileTurnSelection(+ routeThreadRef,+ orderedTurnDiffSummaries.map((summary) => summary.turnId),+ );+ }, [diffSelection, orderedTurnDiffSummaries, routeThreadRef]);++ const selectedTurnId = diffSelection.kind === "turn" ? diffSelection.turnId : null;+ const selectedGitScope = diffSelection.kind === "unstaged" ? "unstaged" : "branch";+ const selectedBaseRef = diffSelection.kind === "branch" ? diffSelection.baseRef : null;+ const selectedFilePath = diffSelection.kind === "turn" ? diffSelection.filePath : null;+ const selectedFileRevealRequestId =+ diffSelection.kind === "turn" ? diffSelection.revealRequestId : 0;const selectedTurn =selectedTurnId === null? undefined@@ -243,7 +267,16 @@ export default function DiffPanel({ mode = "inline", composerDraftTarget }: Diffconst selectedCheckpointTurnCount =selectedTurn &&(selectedTurn.checkpointTurnCount ?? inferredCheckpointTurnCountByTurnId[selectedTurn.turnId]);- const reviewSectionId = selectedTurn ? `turn:${selectedTurn.turnId}` : "conversation";+ const latestTurn = orderedTurnDiffSummaries[0];+ const selectedScopeLabel =+ selectedTurnId === null+ ? selectedGitScope === "unstaged"+ ? "Working tree"+ : "Branch changes"+ : selectedTurn?.turnId === latestTurn?.turnId+ ? "Latest turn"+ : `Turn ${selectedCheckpointTurnCount ?? "?"}`;+ const reviewSectionId = selectedTurn ? `turn:${selectedTurn.turnId}` : selectedGitScope;const collapseScopeKey = routeThreadRef? `${routeThreadRef.environmentId}:${routeThreadRef.threadId}:${reviewSectionId}`: null;@@ -253,7 +286,9 @@ export default function DiffPanel({ mode = "inline", composerDraftTarget }: Diff: EMPTY_COLLAPSED_DIFF_FILE_KEYS;const reviewSectionTitle = selectedTurn? `Turn ${selectedCheckpointTurnCount ?? "?"}`- : "All turns";+ : selectedGitScope === "unstaged"+ ? "Working tree"+ : "Branch changes";const selectedCheckpointRange = useMemo(() =>typeof selectedCheckpointTurnCount === "number"@@ -264,62 +299,116 @@ export default function DiffPanel({ mode = "inline", composerDraftTarget }: Diff: null,[selectedCheckpointTurnCount],);- const conversationCheckpointTurnCount = useMemo(() => {- const turnCounts: Array<number> = [];- for (const summary of orderedTurnDiffSummaries) {- const value =- summary.checkpointTurnCount ?? inferredCheckpointTurnCountByTurnId[summary.turnId];- if (typeof value === "number") {- turnCounts.push(value);- }- }- if (turnCounts.length === 0) {- return undefined;- }- const latest = Math.max(...turnCounts);- return latest > 0 ? latest : undefined;- }, [inferredCheckpointTurnCountByTurnId, orderedTurnDiffSummaries]);- const conversationCheckpointRange = useMemo(- () =>- !selectedTurn && typeof conversationCheckpointTurnCount === "number"- ? {- fromTurnCount: 0,- toTurnCount: conversationCheckpointTurnCount,- }- : null,- [conversationCheckpointTurnCount, selectedTurn],- );- const activeCheckpointRange = selectedTurn- ? selectedCheckpointRange- : conversationCheckpointRange;- const conversationCacheScope = useMemo(() => {- if (selectedTurn || orderedTurnDiffSummaries.length === 0) {- return null;- }- return `conversation:${orderedTurnDiffSummaries.map((summary) => summary.turnId).join(",")}`;- }, [orderedTurnDiffSummaries, selectedTurn]);const activeCheckpointDiff = useCheckpointDiff({environmentId: activeThread?.environmentId ?? null,threadId: activeThreadId,- fromTurnCount: activeCheckpointRange?.fromTurnCount ?? null,- toTurnCount: activeCheckpointRange?.toTurnCount ?? null,+ fromTurnCount: selectedCheckpointRange?.fromTurnCount ?? null,+ toTurnCount: selectedCheckpointRange?.toTurnCount ?? null,ignoreWhitespace: diffIgnoreWhitespace,- cacheScope: selectedTurn ? `turn:${selectedTurn.turnId}` : conversationCacheScope,+ cacheScope: selectedTurn ? `turn:${selectedTurn.turnId}` : null,},- { enabled: isGitRepo },+ { enabled: isGitRepo && selectedTurn !== undefined },);- const selectedTurnCheckpointDiff = selectedTurn ? activeCheckpointDiff.data?.diff : undefined;- const conversationCheckpointDiff = selectedTurn ? undefined : activeCheckpointDiff.data?.diff;- const isLoadingCheckpointDiff = activeCheckpointDiff.isPending;- const checkpointDiffError = activeCheckpointDiff.error;-- const selectedPatch = selectedTurn ? selectedTurnCheckpointDiff : conversationCheckpointDiff;+ const primaryBranchDiffPreview = useEnvironmentQuery(+ selectedTurnId === null && activeThread && activeCwd+ ? reviewEnvironment.diffPreview({+ environmentId: activeThread.environmentId,+ input: {+ cwd: activeCwd,+ ...(selectedBaseRef ? { baseRef: selectedBaseRef } : {}),+ ignoreWhitespace: diffIgnoreWhitespace,+ },+ })+ : null,+ );+ const shouldRetryBranchDiffAtEnvironmentCwd =+ selectedTurnId === null &&+ primaryBranchDiffPreview.error?.includes("configured workspace root") === true &&+ serverConfig?.cwd !== undefined &&+ serverConfig.cwd !== activeCwd;+ const fallbackBranchDiffPreview = useEnvironmentQuery(+ shouldRetryBranchDiffAtEnvironmentCwd && activeThread && serverConfig+ ? reviewEnvironment.diffPreview({+ environmentId: activeThread.environmentId,+ input: {+ cwd: serverConfig.cwd,+ ...(selectedBaseRef ? { baseRef: selectedBaseRef } : {}),+ ignoreWhitespace: diffIgnoreWhitespace,+ },+ })+ : null,+ );+ const branchDiffPreview = shouldRetryBranchDiffAtEnvironmentCwd+ ? fallbackBranchDiffPreview+ : primaryBranchDiffPreview;+ const selectedGitSource = branchDiffPreview.data?.sources.find(+ (source) => source.kind === (selectedGitScope === "unstaged" ? "working-tree" : "branch-range"),+ );+ const localBranchRefs = useEnvironmentQuery(+ selectedTurnId === null &&+ selectedGitScope === "branch" &&+ activeThread &&+ branchDiffPreview.data?.cwd+ ? vcsEnvironment.listRefs({+ environmentId: activeThread.environmentId,+ input: {+ cwd: branchDiffPreview.data.cwd,+ includeMatchingRemoteRefs: true,+ refKind: "local",+ ...(baseRefQuery.trim().length > 0 ? { query: baseRefQuery.trim() } : {}),+ limit: 100,+ },+ })+ : null,+ );+ const remoteBranchRefs = useEnvironmentQuery(+ selectedTurnId === null &&+ selectedGitScope === "branch" &&+ activeThread &&+ branchDiffPreview.data?.cwd+ ? vcsEnvironment.listRefs({+ environmentId: activeThread.environmentId,+ input: {+ cwd: branchDiffPreview.data.cwd,+ includeMatchingRemoteRefs: true,+ refKind: "remote",+ ...(baseRefQuery.trim().length > 0 ? { query: baseRefQuery.trim() } : {}),+ limit: 100,+ },+ })+ : null,+ );+ const baseRefChoices = buildBaseRefChoices(+ localBranchRefs.data?.refs.filter((ref) => ref.name !== selectedGitSource?.headRef) ?? [],+ remoteBranchRefs.data?.refs ?? [],+ );+ const matchingBaseRefChoices = filterBaseRefChoices(baseRefChoices, baseRefQuery);+ const valueForBaseRefChoice = (choice: (typeof baseRefChoices)[number]) =>+ selectedBaseRef && selectedBaseRef === choice.remote?.name+ ? selectedBaseRef+ : (choice.local?.name ?? choice.remote?.name ?? choice.id);+ const baseRefItems = [AUTOMATIC_BASE_REF, ...baseRefChoices.map(valueForBaseRefChoice)];+ const filteredBaseRefItems = [+ ...(baseRefQuery.trim().length === 0 ? [AUTOMATIC_BASE_REF] : []),+ ...matchingBaseRefChoices.map(valueForBaseRefChoice),+ ];+ const gitDiff = selectedGitSource?.diff;++ const selectedPatch = selectedTurn ? activeCheckpointDiff.data?.diff : gitDiff;+ const isSelectedPatchTruncated = !selectedTurn && selectedGitSource?.truncated === true;+ const isLoadingSelectedPatch = selectedTurn+ ? activeCheckpointDiff.isPending+ : branchDiffPreview.isPending;+ const selectedPatchError = selectedTurn ? activeCheckpointDiff.error : branchDiffPreview.error;const hasResolvedPatch = typeof selectedPatch === "string";const hasNoNetChanges = hasResolvedPatch && selectedPatch.trim().length === 0;const renderablePatch = useMemo(- () => getRenderablePatch(selectedPatch, `diff-panel:${resolvedTheme}`),- [resolvedTheme, selectedPatch],+ () =>+ getRenderablePatch(selectedPatch, `diff-panel:${resolvedTheme}`, {+ compactPartialHunkOffsets: selectedTurnId === null,+ }),+ [resolvedTheme, selectedPatch, selectedTurnId],);const renderableFiles = useMemo(() => {if (!renderablePatch || renderablePatch.kind !== "files") {@@ -332,24 +421,26 @@ export default function DiffPanel({ mode = "inline", composerDraftTarget }: Diff}),);}, [renderablePatch]);+ const codeViewFiles = useMemo(+ () =>+ renderableFiles.map((fileDiff) => {+ const fileKey = buildFileDiffRenderKey(fileDiff);+ return {+ fileDiff,+ filePath: resolveFileDiffPath(fileDiff),+ fileKey,+ collapsed: collapsedDiffFileKeys.has(fileKey),+ };+ }),+ [collapsedDiffFileKeys, renderableFiles],+ );useEffect(() => {- if (diffOpen && !previousDiffOpenRef.current) {- setDiffWordWrap(settings.diffWordWrap);- setDiffIgnoreWhitespace(settings.diffIgnoreWhitespace);- }- previousDiffOpenRef.current = diffOpen;- }, [diffOpen, settings.diffIgnoreWhitespace, settings.diffWordWrap]);-- useEffect(() => {- if (!selectedFilePath || !patchViewportRef.current) {- return;- }- const target = Array.from(- patchViewportRef.current.querySelectorAll<HTMLElement>("[data-diff-file-path]"),- ).find((element) => element.dataset.diffFilePath === selectedFilePath);- target?.scrollIntoView({ block: "nearest" });- }, [selectedFilePath, renderableFiles]);+ if (!selectedFilePath) return;+ const file = codeViewFiles.find((candidate) => candidate.filePath === selectedFilePath);+ if (!file) return;+ codeViewRef.current?.scrollTo({ type: "item", id: file.fileKey, align: "start" });+ }, [codeViewFiles, selectedFilePath, selectedFileRevealRequestId]);const openDiffFile = useCallback((filePath: string) => {@@ -385,186 +476,190 @@ export default function DiffPanel({ mode = "inline", composerDraftTarget }: Diff);const selectTurn = (turnId: TurnId) => {- if (!activeThread) return;- void navigate({- to: "/$environmentId/$threadId",- params: buildThreadRouteParams(scopeThreadRef(activeThread.environmentId, activeThread.id)),- search: (previous) => {- const rest = stripDiffSearchParams(previous);- return { ...rest, diff: "1", diffTurnId: turnId };- },- });+ if (!routeThreadRef) return;+ useDiffPanelStore.getState().selectTurn(routeThreadRef, turnId);};- const selectWholeConversation = () => {- if (!activeThread) return;- void navigate({- to: "/$environmentId/$threadId",- params: buildThreadRouteParams(scopeThreadRef(activeThread.environmentId, activeThread.id)),- search: (previous) => {- const rest = stripDiffSearchParams(previous);- return { ...rest, diff: "1" };- },- });+ const selectGitScope = (scope: "branch" | "unstaged") => {+ if (!routeThreadRef) return;+ useDiffPanelStore.getState().selectGitScope(routeThreadRef, scope);+ };+ const selectBranchBaseRef = (baseRef: string | null) => {+ if (!routeThreadRef) return;+ useDiffPanelStore.getState().selectBranchBaseRef(routeThreadRef, baseRef);};- const updateTurnStripScrollState = useCallback(() => {- const element = turnStripRef.current;- if (!element) {- setCanScrollTurnStripLeft(false);- setCanScrollTurnStripRight(false);- return;- }-- const maxScrollLeft = Math.max(0, element.scrollWidth - element.clientWidth);- setCanScrollTurnStripLeft(element.scrollLeft > 4);- setCanScrollTurnStripRight(element.scrollLeft < maxScrollLeft - 4);- }, []);- const scrollTurnStripBy = useCallback((offset: number) => {- const element = turnStripRef.current;- if (!element) return;- element.scrollBy({ left: offset, behavior: "smooth" });- }, []);- const onTurnStripWheel = useCallback((event: ReactWheelEvent<HTMLDivElement>) => {- const element = turnStripRef.current;- if (!element) return;- if (element.scrollWidth <= element.clientWidth + 1) return;- if (Math.abs(event.deltaY) <= Math.abs(event.deltaX)) return;-- event.preventDefault();- element.scrollBy({ left: event.deltaY, behavior: "auto" });- }, []);-- useEffect(() => {- const element = turnStripRef.current;- if (!element) return;-- const frameId = window.requestAnimationFrame(() => updateTurnStripScrollState());- const onScroll = () => updateTurnStripScrollState();-- element.addEventListener("scroll", onScroll, { passive: true });-- const resizeObserver = new ResizeObserver(() => updateTurnStripScrollState());- resizeObserver.observe(element);-- return () => {- window.cancelAnimationFrame(frameId);- element.removeEventListener("scroll", onScroll);- resizeObserver.disconnect();- };- }, [updateTurnStripScrollState]);-- useEffect(() => {- const frameId = window.requestAnimationFrame(() => updateTurnStripScrollState());- return () => {- window.cancelAnimationFrame(frameId);- };- }, [orderedTurnDiffSummaries, selectedTurnId, updateTurnStripScrollState]);-- useEffect(() => {- const element = turnStripRef.current;- if (!element) return;-- const selectedChip = element.querySelector<HTMLElement>("[data-turn-chip-selected='true']");- selectedChip?.scrollIntoView({ block: "nearest", inline: "nearest", behavior: "smooth" });- }, [selectedTurn?.turnId, selectedTurnId]);const headerRow = (<>- <div className="relative min-w-0 flex-1 [-webkit-app-region:no-drag]">- <button- type="button"- className={cn(- "absolute left-0 top-1/2 z-20 inline-flex size-6 -translate-y-1/2 items-center justify-center rounded-md border bg-background/90 text-muted-foreground transition-colors",- canScrollTurnStripLeft- ? "border-border/70 hover:border-border hover:text-foreground"- : "cursor-not-allowed border-border/40 text-muted-foreground/40",- )}- onClick={() => scrollTurnStripBy(-180)}- disabled={!canScrollTurnStripLeft}- aria-label="Scroll turn list left"- >- <ChevronLeftIcon className="size-3.5" />- </button>- <button- type="button"- className={cn(- "absolute right-0 top-1/2 z-20 inline-flex size-6 -translate-y-1/2 items-center justify-center rounded-md border bg-background/90 text-muted-foreground transition-colors",- canScrollTurnStripRight- ? "border-border/70 hover:border-border hover:text-foreground"- : "cursor-not-allowed border-border/40 text-muted-foreground/40",- )}- onClick={() => scrollTurnStripBy(180)}- disabled={!canScrollTurnStripRight}- aria-label="Scroll turn list right"- >- <ChevronRightIcon className="size-3.5" />- </button>- <div- ref={turnStripRef}- className="turn-chip-strip flex gap-1 overflow-x-auto px-8 py-0.5"- style={- canScrollTurnStripLeft || canScrollTurnStripRight- ? {- maskImage: `linear-gradient(to right, ${canScrollTurnStripLeft ? "transparent 24px, black 72px" : "black"}, ${canScrollTurnStripRight ? "black calc(100% - 72px), transparent calc(100% - 24px)" : "black"})`,- }- : undefined- }- onWheel={onTurnStripWheel}- >- <button- type="button"- className="shrink-0 rounded-md"- onClick={selectWholeConversation}- data-turn-chip-selected={selectedTurnId === null}+ <div className="flex min-w-0 flex-1 items-center gap-3 [-webkit-app-region:no-drag]">+ <DropdownMenu>+ <DropdownMenuTrigger+ className="inline-flex h-6 max-w-full items-center gap-1 rounded-md bg-muted/70 px-2 text-xs font-medium text-foreground outline-none transition-colors hover:bg-muted focus-visible:ring-2 focus-visible:ring-ring"+ aria-label={`Diff scope: ${selectedScopeLabel}`}>- <div- className={cn(- "rounded-md border px-2 py-1 text-left transition-colors",- selectedTurnId === null- ? "border-border bg-accent text-accent-foreground"- : "border-border/70 bg-background/70 text-muted-foreground/80 hover:border-border hover:text-foreground/80",+ <span className="truncate">{selectedScopeLabel}</span>+ <ChevronDownIcon className="size-3.5 shrink-0 text-muted-foreground" />+ </DropdownMenuTrigger>+ <DropdownMenuContent align="start" className="w-60">+ <DropdownMenuItem onClick={() => selectGitScope("unstaged")}>+ <span>Working tree</span>+ {selectedTurnId === null && selectedGitScope === "unstaged" && (+ <CheckIcon className="ml-auto" />+ )}+ </DropdownMenuItem>+ <DropdownMenuItem onClick={() => selectGitScope("branch")}>+ <span>Branch changes</span>+ {selectedTurnId === null && selectedGitScope === "branch" && (+ <CheckIcon className="ml-auto" />)}+ </DropdownMenuItem>+ <DropdownMenuItem+ onClick={() => {+ if (latestTurn) selectTurn(latestTurn.turnId);+ }}>- <div className="text-[10px] leading-tight font-medium">All turns</div>- </div>- </button>- {orderedTurnDiffSummaries.map((summary) => (- <Tooltip key={summary.turnId}>- <TooltipTrigger- render={- <button- type="button"- aria-label={summary.turnId}- className="shrink-0 rounded-md"- onClick={() => selectTurn(summary.turnId)}- data-turn-chip-selected={summary.turnId === selectedTurn?.turnId}- />- }+ <span>Latest turn</span>+ {selectedTurnId !== null && selectedTurn?.turnId === latestTurn?.turnId && (+ <CheckIcon className="ml-auto" />+ )}+ </DropdownMenuItem>+ <DropdownMenuSub>+ <DropdownMenuSubTrigger>Turn</DropdownMenuSubTrigger>+ <DropdownMenuSubContent className="w-64">+ {orderedTurnDiffSummaries.map((summary) => {+ const turnCount =+ summary.checkpointTurnCount ??+ inferredCheckpointTurnCountByTurnId[summary.turnId] ??+ "?";+ return (+ <DropdownMenuItem+ key={summary.turnId}+ onClick={() => selectTurn(summary.turnId)}+ >+ <span>Turn {turnCount}</span>+ <span className="ml-auto text-xs tabular-nums text-muted-foreground">+ {formatShortTimestamp(summary.completedAt, settings.timestampFormat)}+ </span>+ {summary.turnId === selectedTurn?.turnId && <CheckIcon className="ml-1" />}+ </DropdownMenuItem>+ );+ })}+ </DropdownMenuSubContent>+ </DropdownMenuSub>+ </DropdownMenuContent>+ </DropdownMenu>+ {selectedTurnId === null && selectedGitScope === "branch" && selectedGitSource?.baseRef && (+ <div+ className="flex min-w-0 max-w-full items-center gap-2 overflow-hidden text-xs text-muted-foreground"+ title={`${selectedGitSource.headRef ?? "HEAD"} → ${selectedGitSource.baseRef}`}+ aria-label={`Comparing ${selectedGitSource.headRef ?? "HEAD"} against ${selectedGitSource.baseRef}`}+ >+ <span className="min-w-0 max-w-48 truncate">{selectedGitSource.headRef ?? "HEAD"}</span>+ <ArrowRightIcon className="size-3.5 shrink-0 opacity-70" />+ <Combobox+ items={baseRefItems}+ filteredItems={filteredBaseRefItems}+ value={selectedBaseRef ?? AUTOMATIC_BASE_REF}+ onOpenChange={(open) => {+ if (!open) setBaseRefQuery("");+ }}+ onValueChange={(value) => {+ if (!value) return;+ selectBranchBaseRef(value === AUTOMATIC_BASE_REF ? null : value);+ }}+ >+ <ComboboxTrigger+ className="inline-flex min-w-0 max-w-48 items-center gap-1 overflow-hidden rounded-md px-1.5 py-1 outline-none transition-colors hover:bg-muted hover:text-foreground focus-visible:ring-2 focus-visible:ring-ring"+ aria-label={`Change comparison target. Currently ${selectedGitSource.baseRef}`}+ >+ <span className="min-w-0 truncate">{selectedGitSource.baseRef}</span>+ <ChevronDownIcon className="size-3.5 shrink-0 opacity-70" />+ </ComboboxTrigger>+ <ComboboxPopup+ align="start"+ className="w-72 min-w-0 max-w-[calc(100vw-1rem)] overflow-hidden [&>[data-slot=combobox-popup]]:min-w-0 [&>[data-slot=combobox-popup]]:overflow-hidden">- <div- className={cn(- "rounded-md border px-2 py-1 text-left transition-colors",- summary.turnId === selectedTurn?.turnId- ? "border-border bg-accent text-accent-foreground"- : "border-border/70 bg-background/70 text-muted-foreground/80 hover:border-border hover:text-foreground/80",- )}- >- <div className="flex items-center gap-1">- <span className="text-[10px] leading-tight font-medium">- Turn{" "}- {summary.checkpointTurnCount ??- inferredCheckpointTurnCountByTurnId[summary.turnId] ??- "?"}- </span>- <span className="text-[9px] leading-tight opacity-70 tabular-nums">- {formatShortTimestamp(summary.completedAt, settings.timestampFormat)}- </span>+ <div className="min-w-0 shrink-0 px-3 pt-2.5">+ <div className="relative -translate-y-px border-b border-border/70 pb-1.5 transition-colors focus-within:border-ring">+ <SearchIcon+ aria-hidden="true"+ className="pointer-events-none absolute top-1.5 left-0 size-4 shrink-0 text-muted-foreground/55"+ />+ <ComboboxInput+ className="[&_input]:h-6.5 [&_input]:ps-5 [&_input]:font-sans [&_input]:leading-6.5"+ inputClassName="rounded-none bg-transparent text-sm"+ placeholder="Search refs..."+ showTrigger={false}+ size="sm"+ unstyled+ value={baseRefQuery}+ onChange={(event) => setBaseRefQuery(event.target.value)}+ /></div></div>- </TooltipTrigger>- <TooltipPopup side="top">{summary.turnId}</TooltipPopup>- </Tooltip>- ))}- </div>+ <div className="grid shrink-0 grid-cols-[1rem_minmax(0,1fr)] items-center gap-2 border-b border-border/70 ps-3 pe-6.5 pt-2 pb-1.5 font-medium text-[10px] text-muted-foreground uppercase tracking-wide">+ <span aria-hidden="true" />+ <div className="grid min-w-0 grid-cols-[minmax(0,1fr)_2rem] items-center">+ <span>Branch</span>+ <span className="text-right">Remote</span>+ </div>+ </div>+ <ComboboxEmpty>No matching refs.</ComboboxEmpty>+ <ComboboxList className="max-h-64 min-w-0 overflow-x-hidden">+ <ComboboxItem+ className="h-8 w-full min-w-0 grid-cols-[1rem_minmax(0,1fr)] py-0"+ contentClassName="w-full min-w-0 overflow-hidden"+ value={AUTOMATIC_BASE_REF}+ >+ <span className="block min-w-0 truncate">Automatic</span>+ </ComboboxItem>+ {baseRefChoices.map((choice) => {+ const item = valueForBaseRefChoice(choice);+ const hasBoth = choice.local !== null && choice.remote !== null;+ const useRemote = choice.remote?.name === item;+ return (+ <ComboboxItem+ key={choice.id}+ className="h-8 w-full min-w-0 grid-cols-[1rem_minmax(0,1fr)] py-0"+ contentClassName="w-full min-w-0 overflow-hidden"+ value={item}+ >+ <div className="grid w-full min-w-0 grid-cols-[minmax(0,1fr)_2rem] items-center overflow-hidden">+ <span className="block min-w-0 truncate pe-2">{choice.label}</span>+ {hasBoth ? (+ <div+ className="flex justify-end"+ onClick={(event) => event.stopPropagation()}+ onPointerDown={(event) => event.stopPropagation()}+ >+ <Switch+ aria-label={`Use remote version of ${choice.label}`}+ checked={useRemote}+ className="[--thumb-size:--spacing(3)]"+ onCheckedChange={(checked) => {+ const nextRef = checked+ ? choice.remote?.name+ : choice.local?.name;+ if (nextRef) selectBranchBaseRef(nextRef);+ }}+ />+ </div>+ ) : choice.remote ? (+ <span+ className="flex justify-end text-muted-foreground"+ title="Remote only"+ >+ <CheckIcon aria-hidden="true" className="size-3" />+ </span>+ ) : null}+ </div>+ </ComboboxItem>+ );+ })}+ </ComboboxList>+ </ComboboxPopup>+ </Combobox>+ </div>+ )}</div><div className="flex shrink-0 items-center gap-1 [-webkit-app-region:no-drag]"><ToggleGroup@@ -644,24 +739,35 @@ export default function DiffPanel({ mode = "inline", composerDraftTarget }: Diff<div className="flex flex-1 items-center justify-center px-5 text-center text-xs text-muted-foreground/70">Turn diffs are unavailable because this project is not a git repository.</div>- ) : orderedTurnDiffSummaries.length === 0 ? (+ ) : selectedTurnId !== null && orderedTurnDiffSummaries.length === 0 ? (<div className="flex flex-1 items-center justify-center px-5 text-center text-xs text-muted-foreground/70">No completed turns yet.</div>) : (<>- <div- ref={patchViewportRef}- className="diff-panel-viewport min-h-0 min-w-0 flex-1 overflow-hidden"- >- {checkpointDiffError && !renderablePatch && (+ <div className="diff-panel-viewport flex min-h-0 min-w-0 flex-1 flex-col overflow-hidden">+ {isSelectedPatchTruncated && (+ <p className="shrink-0 border-b border-border/70 bg-muted/40 px-3 py-1.5 text-[11px] text-muted-foreground">+ This diff was truncated because it exceeded the preview limit. The changes shown are+ incomplete.+ </p>+ )}+ {selectedPatchError && !renderablePatch && (<div className="px-3">- <p className="mb-2 text-[11px] text-red-500/80">{checkpointDiffError}</p>+ <p className="mb-2 text-[11px] text-red-500/80">{selectedPatchError}</p></div>)}{!renderablePatch ? (- isLoadingCheckpointDiff ? (- <DiffPanelLoadingState label="Loading checkpoint diff..." />+ isLoadingSelectedPatch ? (+ <DiffPanelLoadingState+ label={+ selectedTurn+ ? "Loading checkpoint diff..."+ : selectedGitScope === "unstaged"+ ? "Loading working tree diff..."+ : "Loading branch diff..."+ }+ />) : (<div className="flex h-full items-center justify-center px-3 py-2 text-xs text-muted-foreground/70"><p>@@ -672,88 +778,73 @@ export default function DiffPanel({ mode = "inline", composerDraftTarget }: Diff</div>)) : renderablePatch.kind === "files" ? (- <Virtualizer- className="diff-render-surface h-full min-h-0 overflow-auto px-2 pb-2"- config={{- overscrollSize: 600,- intersectionObserverMargin: 1200,+ <div+ className="min-h-0 flex-1"+ onClickCapture={(event) => {+ const composedPath = event.nativeEvent.composedPath?.() ?? [];+ const title = composedPath.find(+ (node): node is HTMLElement =>+ node instanceof HTMLElement && node.hasAttribute("data-title"),+ );+ const filePath = title?.textContent?.trim();+ if (filePath) openDiffFile(filePath);}}>- {renderableFiles.map((fileDiff) => {- const filePath = resolveFileDiffPath(fileDiff);- const fileKey = buildFileDiffRenderKey(fileDiff);- const themedFileKey = `${fileKey}:${resolvedTheme}`;- const collapsed = collapsedDiffFileKeys.has(fileKey);- return (- <div- key={themedFileKey}- data-diff-file-path={filePath}- className="diff-render-file group/diff-file mb-2 rounded-md first:mt-2 last:mb-0"- onClickCapture={(event) => {- const nativeEvent = event.nativeEvent as MouseEvent;- const composedPath = nativeEvent.composedPath?.() ?? [];- const clickedHeader = composedPath.some((node) => {- if (!(node instanceof Element)) return false;- return node.hasAttribute("data-title");- });- if (!clickedHeader) return;- openDiffFile(filePath);- }}- >- <AnnotatableFileDiff- fileDiff={fileDiff}- filePath={filePath}- sectionId={reviewSectionId}- sectionTitle={reviewSectionTitle}- composerDraftTarget={composerDraftTarget}- renderHeaderPrefix={() => (- <Tooltip>- <TooltipTrigger- render={- <button- type="button"- className={cn(- "inline-flex size-5 shrink-0 cursor-pointer items-center justify-center rounded-sm border-0 bg-transparent p-0 transition-colors hover:bg-foreground/10 focus-visible:outline-hidden",- getDiffCollapseIconClassName(fileDiff),- )}- aria-label={- collapsed ? `Expand ${filePath}` : `Collapse ${filePath}`- }- aria-expanded={!collapsed}- onClick={(event) => {- event.stopPropagation();- toggleDiffFileCollapsed(fileKey);- }}- />- }- >- {collapsed ? (- <ChevronRightIcon className="size-4" />- ) : (- <ChevronDownIcon className="size-4" />+ <AnnotatableCodeView+ viewerRef={codeViewRef}+ key={collapseScopeKey ?? reviewSectionId}+ className="diff-render-surface h-full min-h-0 overflow-auto"+ files={codeViewFiles}+ sectionId={reviewSectionId}+ sectionTitle={reviewSectionTitle}+ composerDraftTarget={composerDraftTarget}+ renderHeaderPrefix={(fileDiff, fileKey, collapsed) => {+ const filePath = resolveFileDiffPath(fileDiff);+ return (+ <Tooltip>+ <TooltipTrigger+ render={+ <button+ type="button"+ className={cn(+ "inline-flex size-5 shrink-0 cursor-pointer items-center justify-center rounded-sm border-0 bg-transparent p-0 transition-colors hover:bg-foreground/10 focus-visible:outline-hidden",+ getDiffCollapseIconClassName(fileDiff),)}- </TooltipTrigger>- <TooltipPopup side="top">- {collapsed ? "Expand diff" : "Collapse diff"}- </TooltipPopup>- </Tooltip>- )}- options={{- collapsed,- diffStyle: diffRenderMode === "split" ? "split" : "unified",- lineDiffType: "none",- overflow: diffWordWrap ? "wrap" : "scroll",- theme: resolveDiffThemeName(resolvedTheme),- themeType: resolvedTheme as DiffThemeType,- unsafeCSS: DIFF_PANEL_UNSAFE_CSS,- }}- />- </div>- );- })}- </Virtualizer>+ aria-label={collapsed ? `Expand ${filePath}` : `Collapse ${filePath}`}+ aria-expanded={!collapsed}+ onClick={(event) => {+ event.stopPropagation();+ toggleDiffFileCollapsed(fileKey);+ }}+ />+ }+ >+ {collapsed ? (+ <ChevronRightIcon className="size-4" />+ ) : (+ <ChevronDownIcon className="size-4" />+ )}+ </TooltipTrigger>+ <TooltipPopup side="top">+ {collapsed ? "Expand diff" : "Collapse diff"}+ </TooltipPopup>+ </Tooltip>+ );+ }}+ options={{+ diffStyle: diffRenderMode === "split" ? "split" : "unified",+ lineDiffType: "none",+ overflow: diffWordWrap ? "wrap" : "scroll",+ theme: resolveDiffThemeName(resolvedTheme),+ themeType: resolvedTheme as DiffThemeType,+ unsafeCSS: DIFF_PANEL_UNSAFE_CSS,+ stickyHeaders: true,+ layout: { paddingTop: 8, paddingBottom: 8, gap: 8 },+ }}+ />+ </div>) : (- <div className="h-full overflow-auto p-2">+ <div className="min-h-0 flex-1 overflow-auto p-2"><div className="space-y-2"><p className="text-[11px] text-muted-foreground/75">{renderablePatch.reason}</p><prediff --git a/apps/web/src/components/DiffPanelShell.tsx b/apps/web/src/components/DiffPanelShell.tsxindex 4dd569d28..e727a8005 100644--- a/apps/web/src/components/DiffPanelShell.tsx+++ b/apps/web/src/components/DiffPanelShell.tsx@@ -48,14 +48,8 @@ export function DiffPanelShell(props: {export function DiffPanelHeaderSkeleton() {return (<>- <div className="relative min-w-0 flex-1">- <Skeleton className="absolute left-0 top-1/2 size-6 -translate-y-1/2 rounded-md border border-border/50" />- <Skeleton className="absolute right-0 top-1/2 size-6 -translate-y-1/2 rounded-md border border-border/50" />- <div className="flex gap-1 overflow-hidden px-8 py-0.5">- <Skeleton className="h-6 w-16 shrink-0 rounded-md" />- <Skeleton className="h-6 w-24 shrink-0 rounded-md" />- <Skeleton className="h-6 w-24 shrink-0 rounded-md max-sm:hidden" />- </div>+ <div className="min-w-0 flex-1">+ <Skeleton className="h-8 w-32 rounded-lg" /></div><div className="flex shrink-0 gap-1"><Skeleton className="size-7 rounded-md" />diff --git a/apps/web/src/components/diffs/AnnotatableFileDiff.tsx b/apps/web/src/components/diffs/AnnotatableFileDiff.tsxindex ceb2f8778..f74b1e59a 100644--- a/apps/web/src/components/diffs/AnnotatableFileDiff.tsx+++ b/apps/web/src/components/diffs/AnnotatableFileDiff.tsx@@ -1,14 +1,23 @@import type {AnnotationSide,+ CodeViewDiffItem,+ CodeViewItem,DiffLineAnnotation,FileDiffMetadata,SelectedLineRange,} from "@pierre/diffs";-import { FileDiff, type FileDiffProps } from "@pierre/diffs/react";+import {+ CodeView,+ type CodeViewHandle,+ type CodeViewProps,+ FileDiff,+ type FileDiffProps,+} from "@pierre/diffs/react";import type { ScopedThreadRef } from "@t3tools/contracts";-import { useCallback, useMemo, useState, type ReactNode } from "react";+import { useCallback, useMemo, useState, type ReactNode, type Ref } from "react";import { type DraftId, useComposerDraftStore } from "~/composerDraftStore";+import { fnv1a32 } from "~/lib/diffRendering";import {buildDiffReviewComment,restoreDiffReviewCommentRange,@@ -31,6 +40,7 @@ interface DiffCommentAnnotationGroup {}type DiffCommentLineAnnotation = DiffLineAnnotation<DiffCommentAnnotationGroup>;+export type AnnotatableCodeViewHandle = CodeViewHandle<DiffCommentAnnotationGroup>;const EMPTY_REVIEW_COMMENTS: ReadonlyArray<ReviewCommentContext> = [];function annotationSide(range: SelectedLineRange): AnnotationSide {@@ -237,3 +247,200 @@ export function AnnotatableFileDiff({/>);}++interface AnnotatableCodeViewProps {+ files: ReadonlyArray<{+ fileDiff: FileDiffMetadata;+ filePath: string;+ fileKey: string;+ collapsed: boolean;+ }>;+ sectionId: string;+ sectionTitle: string;+ composerDraftTarget: ScopedThreadRef | DraftId;+ options: NonNullable<CodeViewProps<DiffCommentAnnotationGroup>["options"]>;+ viewerRef?: Ref<AnnotatableCodeViewHandle>;+ className?: string;+ renderHeaderPrefix: (+ fileDiff: FileDiffMetadata,+ fileKey: string,+ collapsed: boolean,+ ) => ReactNode;+}++interface DiffSelectionContext {+ item: CodeViewItem<DiffCommentAnnotationGroup>;+}++export function AnnotatableCodeView({+ files,+ sectionId,+ sectionTitle,+ composerDraftTarget,+ options,+ viewerRef,+ className,+ renderHeaderPrefix,+}: AnnotatableCodeViewProps) {+ const addReviewComment = useComposerDraftStore((store) => store.addReviewComment);+ const removeReviewComment = useComposerDraftStore((store) => store.removeReviewComment);+ const reviewComments = useComposerDraftStore(+ (store) => store.getComposerDraft(composerDraftTarget)?.reviewComments ?? EMPTY_REVIEW_COMMENTS,+ );+ const [selectedLines, setSelectedLines] = useState<{+ id: string;+ range: SelectedLineRange;+ } | null>(null);+ const [draft, setDraft] = useState<{+ fileKey: string;+ annotation: DiffCommentLineAnnotation;+ } | null>(null);++ const filesByKey = useMemo(() => new Map(files.map((file) => [file.fileKey, file])), [files]);+ const items = useMemo<CodeViewDiffItem<DiffCommentAnnotationGroup>[]>(+ () =>+ files.map(({ fileDiff, filePath, fileKey, collapsed }) => {+ const persisted = reviewComments+ .filter(+ (comment) =>+ comment.sectionId === sectionId &&+ comment.filePath === filePath &&+ (comment.fenceLanguage ?? "diff") === "diff",+ )+ .reduce<DiffCommentLineAnnotation[]>((annotations, comment) => {+ const range = restoreDiffReviewCommentRange(fileDiff, comment);+ if (!range) return annotations;+ return appendAnnotationEntry(annotations, range, {+ id: comment.id,+ kind: "comment",+ range,+ rangeLabel: comment.rangeLabel,+ text: comment.text,+ });+ }, []);+ const annotations =+ draft?.fileKey === fileKey ? [...persisted, draft.annotation] : persisted;+ return {+ id: fileKey,+ type: "diff",+ fileDiff,+ annotations,+ collapsed,+ version: fnv1a32(+ `${collapsed ? "1" : "0"}:${annotations+ .flatMap((annotation) =>+ annotation.metadata.entries.map(+ (entry) => `${entry.id}:${entry.rangeLabel}:${entry.text}`,+ ),+ )+ .join(":")}`,+ ),+ };+ }),+ [draft, files, reviewComments, sectionId],+ );++ const removeEntry = useCallback(+ (entryId: string) => {+ setSelectedLines(null);+ if (draft?.annotation.metadata.entries.some((entry) => entry.id === entryId)) {+ setDraft(null);+ } else {+ removeReviewComment(composerDraftTarget, entryId);+ }+ },+ [composerDraftTarget, draft, removeReviewComment],+ );++ const submitEntry = useCallback(+ (entryId: string, text: string) => {+ const entry = draft?.annotation.metadata.entries.find(+ (candidate) => candidate.id === entryId,+ );+ const file = draft ? filesByKey.get(draft.fileKey) : undefined;+ if (!entry || !file) return;+ const comment = buildDiffReviewComment({+ id: entry.id,+ sectionId,+ sectionTitle,+ filePath: file.filePath,+ fileDiff: file.fileDiff,+ range: entry.range,+ text,+ });+ if (comment) addReviewComment(composerDraftTarget, comment);+ setSelectedLines(null);+ setDraft(null);+ },+ [addReviewComment, composerDraftTarget, draft, filesByKey, sectionId, sectionTitle],+ );++ const beginComment = useCallback(+ (range: SelectedLineRange | null, context: DiffSelectionContext) => {+ if (!range) return;+ const item = context.item;+ if (item.type !== "diff") return;+ const file = filesByKey.get(item.id);+ if (!file) return;+ const id = nextFileCommentId();+ const comment = buildDiffReviewComment({+ id,+ sectionId,+ sectionTitle,+ filePath: file.filePath,+ fileDiff: file.fileDiff,+ range,+ text: "",+ });+ if (!comment) return;+ setDraft({+ fileKey: item.id,+ annotation: {+ side: annotationSide(range),+ lineNumber: range.end,+ metadata: {+ entries: [{ id, kind: "draft", range, rangeLabel: comment.rangeLabel, text: "" }],+ },+ },+ });+ },+ [filesByKey, sectionId, sectionTitle],+ );++ const hasOpenComment = draft !== null;+ return (+ <CodeView<DiffCommentAnnotationGroup>+ {...(viewerRef ? { ref: viewerRef } : {})}+ {...(className ? { className } : {})}+ items={items}+ selectedLines={selectedLines}+ onSelectedLinesChange={setSelectedLines}+ options={{+ ...options,+ enableGutterUtility: !hasOpenComment,+ enableLineSelection: !hasOpenComment,+ onLineSelectionEnd: beginComment,+ }}+ renderHeaderPrefix={(item) =>+ item.type === "diff"+ ? renderHeaderPrefix(item.fileDiff, item.id, item.collapsed === true)+ : null+ }+ renderAnnotation={(annotation) => (+ <div className="py-1">+ {annotation.metadata.entries.map((entry) => (+ <LocalCommentAnnotation+ key={entry.id}+ kind={entry.kind}+ rangeLabel={entry.rangeLabel}+ text={entry.text}+ onCancel={() => removeEntry(entry.id)}+ onComment={(text) => submitEntry(entry.id, text)}+ onDelete={() => removeEntry(entry.id)}+ />+ ))}+ </div>+ )}+ />+ );+}diff --git a/apps/web/src/diffPanelStore.test.ts b/apps/web/src/diffPanelStore.test.tsnew file mode 100644index 000000000..64846e8e9--- /dev/null+++ b/apps/web/src/diffPanelStore.test.ts@@ -0,0 +1,68 @@+import { scopeThreadRef } from "@t3tools/client-runtime/environment";+import { EnvironmentId, ThreadId, TurnId } from "@t3tools/contracts";+import { beforeEach, describe, expect, it } from "vite-plus/test";++import { selectThreadDiffPanelSelection, useDiffPanelStore } from "./diffPanelStore";++const THREAD_REF = scopeThreadRef(EnvironmentId.make("environment-1"), ThreadId.make("thread-1"));++describe("diffPanelStore", () => {+ beforeEach(() => useDiffPanelStore.setState({ byThreadKey: {}, branchBaseRefByThreadKey: {} }));++ it("defaults each thread to branch changes with automatic base selection", () => {+ expect(+ selectThreadDiffPanelSelection(useDiffPanelStore.getState().byThreadKey, THREAD_REF),+ ).toEqual({ kind: "branch", baseRef: null });+ });++ it("clears incompatible selection fields when changing scopes", () => {+ const store = useDiffPanelStore.getState();+ store.selectTurn(THREAD_REF, TurnId.make("turn-1"), "src/app.ts");+ store.selectGitScope(THREAD_REF, "unstaged");++ expect(+ selectThreadDiffPanelSelection(useDiffPanelStore.getState().byThreadKey, THREAD_REF),+ ).toEqual({ kind: "unstaged" });++ useDiffPanelStore.getState().selectBranchBaseRef(THREAD_REF, " origin/main ");+ expect(+ selectThreadDiffPanelSelection(useDiffPanelStore.getState().byThreadKey, THREAD_REF),+ ).toEqual({ kind: "branch", baseRef: "origin/main" });+ });++ it("increments the reveal request when opening the same turn file again", () => {+ const turnId = TurnId.make("turn-1");+ useDiffPanelStore.getState().selectTurn(THREAD_REF, turnId, "src/app.ts");+ useDiffPanelStore.getState().selectTurn(THREAD_REF, turnId, "src/app.ts");++ expect(+ selectThreadDiffPanelSelection(useDiffPanelStore.getState().byThreadKey, THREAD_REF),+ ).toEqual({ kind: "turn", turnId, filePath: "src/app.ts", revealRequestId: 2 });+ });++ it("restores the selected branch base after visiting another scope", () => {+ useDiffPanelStore.getState().selectBranchBaseRef(THREAD_REF, "origin/main");+ useDiffPanelStore.getState().selectGitScope(THREAD_REF, "unstaged");+ useDiffPanelStore.getState().selectGitScope(THREAD_REF, "branch");++ expect(+ selectThreadDiffPanelSelection(useDiffPanelStore.getState().byThreadKey, THREAD_REF),+ ).toEqual({ kind: "branch", baseRef: "origin/main" });+ });++ it("reconciles a missing turn selection to the latest available turn", () => {+ const missingTurnId = TurnId.make("turn-missing");+ const latestTurnId = TurnId.make("turn-latest");+ useDiffPanelStore.getState().selectTurn(THREAD_REF, missingTurnId, "src/app.ts");+ useDiffPanelStore.getState().reconcileTurnSelection(THREAD_REF, [latestTurnId]);++ expect(+ selectThreadDiffPanelSelection(useDiffPanelStore.getState().byThreadKey, THREAD_REF),+ ).toEqual({+ kind: "turn",+ turnId: latestTurnId,+ filePath: "src/app.ts",+ revealRequestId: 1,+ });+ });+});diff --git a/apps/web/src/diffPanelStore.ts b/apps/web/src/diffPanelStore.tsnew file mode 100644index 000000000..c946b286d--- /dev/null+++ b/apps/web/src/diffPanelStore.ts@@ -0,0 +1,139 @@+import { scopedThreadKey } from "@t3tools/client-runtime/environment";+import type { ScopedThreadRef, TurnId } from "@t3tools/contracts";+import { create } from "zustand";+import { createJSONStorage, persist } from "zustand/middleware";++import { resolveStorage } from "./lib/storage";++export type DiffPanelSelection =+ | { kind: "branch"; baseRef: string | null }+ | { kind: "unstaged" }+ | { kind: "turn"; turnId: TurnId; filePath: string | null; revealRequestId: number };++const DEFAULT_SELECTION: DiffPanelSelection = { kind: "branch", baseRef: null };++interface DiffPanelStoreState {+ byThreadKey: Record<string, DiffPanelSelection>;+ branchBaseRefByThreadKey: Record<string, string | null>;+ selectGitScope: (ref: ScopedThreadRef, scope: "branch" | "unstaged") => void;+ selectBranchBaseRef: (ref: ScopedThreadRef, baseRef: string | null) => void;+ selectTurn: (ref: ScopedThreadRef, turnId: TurnId, filePath?: string) => void;+ reconcileTurnSelection: (ref: ScopedThreadRef, availableTurnIds: ReadonlyArray<TurnId>) => void;+ removeThread: (ref: ScopedThreadRef) => void;+}++function normalizeBaseRef(baseRef: string | null): string | null {+ const normalized = baseRef?.trim();+ return normalized ? normalized : null;+}++export const useDiffPanelStore = create<DiffPanelStoreState>()(+ persist(+ (set) => ({+ byThreadKey: {},+ branchBaseRefByThreadKey: {},+ selectGitScope: (ref, scope) =>+ set((state) => {+ const threadKey = scopedThreadKey(ref);+ const previous = state.byThreadKey[threadKey];+ const previousBaseRef =+ previous?.kind === "branch"+ ? previous.baseRef+ : (state.branchBaseRefByThreadKey[threadKey] ?? null);+ return {+ byThreadKey: {+ ...state.byThreadKey,+ [threadKey]:+ scope === "branch"+ ? { kind: "branch", baseRef: previousBaseRef }+ : { kind: "unstaged" },+ },+ branchBaseRefByThreadKey:+ previous?.kind === "branch"+ ? { ...state.branchBaseRefByThreadKey, [threadKey]: previous.baseRef }+ : state.branchBaseRefByThreadKey,+ };+ }),+ selectBranchBaseRef: (ref, baseRef) =>+ set((state) => {+ const threadKey = scopedThreadKey(ref);+ const normalizedBaseRef = normalizeBaseRef(baseRef);+ return {+ byThreadKey: {+ ...state.byThreadKey,+ [threadKey]: { kind: "branch", baseRef: normalizedBaseRef },+ },+ branchBaseRefByThreadKey: {+ ...state.branchBaseRefByThreadKey,+ [threadKey]: normalizedBaseRef,+ },+ };+ }),+ selectTurn: (ref, turnId, filePath) =>+ set((state) => {+ const threadKey = scopedThreadKey(ref);+ const previous = state.byThreadKey[threadKey];+ return {+ byThreadKey: {+ ...state.byThreadKey,+ [threadKey]: {+ kind: "turn",+ turnId,+ filePath: filePath?.trim() || null,+ revealRequestId: previous?.kind === "turn" ? previous.revealRequestId + 1 : 1,+ },+ },+ };+ }),+ reconcileTurnSelection: (ref, availableTurnIds) =>+ set((state) => {+ const threadKey = scopedThreadKey(ref);+ const previous = state.byThreadKey[threadKey];+ const latestTurnId = availableTurnIds[0];+ if (+ previous?.kind !== "turn" ||+ latestTurnId === undefined ||+ availableTurnIds.includes(previous.turnId)+ ) {+ return state;+ }+ return {+ byThreadKey: {+ ...state.byThreadKey,+ [threadKey]: { ...previous, turnId: latestTurnId },+ },+ };+ }),+ removeThread: (ref) =>+ set((state) => {+ const threadKey = scopedThreadKey(ref);+ if (!(threadKey in state.byThreadKey) && !(threadKey in state.branchBaseRefByThreadKey)) {+ return state;+ }+ const { [threadKey]: _removed, ...byThreadKey } = state.byThreadKey;+ const { [threadKey]: _removedBaseRef, ...branchBaseRefByThreadKey } =+ state.branchBaseRefByThreadKey;+ return { byThreadKey, branchBaseRefByThreadKey };+ }),+ }),+ {+ name: "t3code:diff-panel-state:v1",+ version: 1,+ storage: createJSONStorage(() =>+ resolveStorage(typeof window !== "undefined" ? window.localStorage : undefined),+ ),+ partialize: (state) => ({+ byThreadKey: state.byThreadKey,+ branchBaseRefByThreadKey: state.branchBaseRefByThreadKey,+ }),+ },+ ),+);++export function selectThreadDiffPanelSelection(+ byThreadKey: Record<string, DiffPanelSelection>,+ ref: ScopedThreadRef | null | undefined,+): DiffPanelSelection {+ if (!ref) return DEFAULT_SELECTION;+ return byThreadKey[scopedThreadKey(ref)] ?? DEFAULT_SELECTION;+}diff --git a/apps/web/src/diffRouteSearch.test.ts b/apps/web/src/diffRouteSearch.test.tsdeleted file mode 100644index c80368eee..000000000--- a/apps/web/src/diffRouteSearch.test.ts+++ /dev/null@@ -1,74 +0,0 @@-import { describe, expect, it } from "vite-plus/test";--import { parseDiffRouteSearch } from "./diffRouteSearch";--describe("parseDiffRouteSearch", () => {- it("parses valid diff search values", () => {- const parsed = parseDiffRouteSearch({- diff: "1",- diffTurnId: "turn-1",- diffFilePath: "src/app.ts",- });-- expect(parsed).toEqual({- diff: "1",- diffTurnId: "turn-1",- diffFilePath: "src/app.ts",- });- });-- it("treats numeric and boolean diff toggles as open", () => {- expect(- parseDiffRouteSearch({- diff: 1,- diffTurnId: "turn-1",- }),- ).toEqual({- diff: "1",- diffTurnId: "turn-1",- });-- expect(- parseDiffRouteSearch({- diff: true,- diffTurnId: "turn-1",- }),- ).toEqual({- diff: "1",- diffTurnId: "turn-1",- });- });-- it("drops turn and file values when diff is closed", () => {- const parsed = parseDiffRouteSearch({- diff: "0",- diffTurnId: "turn-1",- diffFilePath: "src/app.ts",- });-- expect(parsed).toEqual({});- });-- it("drops file value when turn is not selected", () => {- const parsed = parseDiffRouteSearch({- diff: "1",- diffFilePath: "src/app.ts",- });-- expect(parsed).toEqual({- diff: "1",- });- });-- it("normalizes whitespace-only values", () => {- const parsed = parseDiffRouteSearch({- diff: "1",- diffTurnId: " ",- diffFilePath: " ",- });-- expect(parsed).toEqual({- diff: "1",- });- });-});diff --git a/apps/web/src/diffRouteSearch.ts b/apps/web/src/diffRouteSearch.tsdeleted file mode 100644index d9b072f28..000000000--- a/apps/web/src/diffRouteSearch.ts+++ /dev/null@@ -1,39 +0,0 @@-import { TurnId } from "@t3tools/contracts";--export interface DiffRouteSearch {- diff?: "1" | undefined;- diffTurnId?: TurnId | undefined;- diffFilePath?: string | undefined;-}--function isDiffOpenValue(value: unknown): boolean {- return value === "1" || value === 1 || value === true;-}--function normalizeSearchString(value: unknown): string | undefined {- if (typeof value !== "string") {- return undefined;- }- const normalized = value.trim();- return normalized.length > 0 ? normalized : undefined;-}--export function stripDiffSearchParams<T extends Record<string, unknown>>(- params: T,-): Omit<T, "diff" | "diffTurnId" | "diffFilePath"> {- const { diff: _diff, diffTurnId: _diffTurnId, diffFilePath: _diffFilePath, ...rest } = params;- return rest as Omit<T, "diff" | "diffTurnId" | "diffFilePath">;-}--export function parseDiffRouteSearch(search: Record<string, unknown>): DiffRouteSearch {- const diff = isDiffOpenValue(search.diff) ? "1" : undefined;- const diffTurnIdRaw = diff ? normalizeSearchString(search.diffTurnId) : undefined;- const diffTurnId = diffTurnIdRaw ? TurnId.make(diffTurnIdRaw) : undefined;- const diffFilePath = diff && diffTurnId ? normalizeSearchString(search.diffFilePath) : undefined;-- return {- ...(diff ? { diff } : {}),- ...(diffTurnId ? { diffTurnId } : {}),- ...(diffFilePath ? { diffFilePath } : {}),- };-}diff --git a/apps/web/src/index.css b/apps/web/src/index.cssindex 9048e2074..09ef006a6 100644--- a/apps/web/src/index.css+++ b/apps/web/src/index.css@@ -689,7 +689,8 @@ label:has(> select#reasoning-effort) select {background: color-mix(in srgb, var(--background) 94%, var(--card));}-.diff-render-file {+.diff-render-file,+.diff-render-surface > diffs-container {border: 1px solid var(--border);border-radius: 0.5rem;overflow: clip;diff --git a/apps/web/src/lib/baseRefChoices.test.ts b/apps/web/src/lib/baseRefChoices.test.tsnew file mode 100644index 000000000..90f84d900--- /dev/null+++ b/apps/web/src/lib/baseRefChoices.test.ts@@ -0,0 +1,52 @@+import { describe, expect, it } from "vite-plus/test";+import type { VcsRef } from "@t3tools/contracts";+import { buildBaseRefChoices, filterBaseRefChoices } from "./baseRefChoices";++function ref(name: string, remoteName?: string): VcsRef {+ return {+ name,+ current: false,+ isDefault: false,+ isRemote: remoteName !== undefined,+ ...(remoteName ? { remoteName } : {}),+ worktreePath: null,+ };+}++describe("buildBaseRefChoices", () => {+ it("pairs matching local and remote branches and prefers origin", () => {+ const choices = buildBaseRefChoices(+ [ref("main")],+ [ref("upstream/main", "upstream"), ref("origin/main", "origin")],+ );++ expect(choices).toEqual([+ expect.objectContaining({+ label: "main",+ local: expect.objectContaining({ name: "main" }),+ remote: expect.objectContaining({ name: "origin/main" }),+ }),+ expect.objectContaining({+ label: "upstream/main",+ local: null,+ remote: expect.objectContaining({ name: "upstream/main" }),+ }),+ ]);+ });+});++describe("filterBaseRefChoices", () => {+ it("filters stale server results against the current query", () => {+ const choices = buildBaseRefChoices(+ [ref("main"), ref("feature/search")],+ [ref("origin/main", "origin"), ref("origin/feature/search", "origin")],+ );++ expect(filterBaseRefChoices(choices, "SEARCH").map((choice) => choice.label)).toEqual([+ "feature/search",+ ]);+ expect(filterBaseRefChoices(choices, "origin/main").map((choice) => choice.label)).toEqual([+ "main",+ ]);+ });+});diff --git a/apps/web/src/lib/baseRefChoices.ts b/apps/web/src/lib/baseRefChoices.tsnew file mode 100644index 000000000..2be010040--- /dev/null+++ b/apps/web/src/lib/baseRefChoices.ts@@ -0,0 +1,61 @@+import type { VcsRef } from "@t3tools/contracts";++export interface BaseRefChoice {+ readonly id: string;+ readonly label: string;+ readonly local: VcsRef | null;+ readonly remote: VcsRef | null;+}++function remoteBranchName(ref: VcsRef): string {+ if (ref.remoteName && ref.name.startsWith(`${ref.remoteName}/`)) {+ return ref.name.slice(ref.remoteName.length + 1);+ }+ return ref.name;+}++export function buildBaseRefChoices(+ localRefs: ReadonlyArray<VcsRef>,+ remoteRefs: ReadonlyArray<VcsRef>,+): ReadonlyArray<BaseRefChoice> {+ const unusedRemoteRefs = new Set(remoteRefs);+ const pairedChoices = localRefs.map((local) => {+ const matches = remoteRefs.filter(+ (remote) => unusedRemoteRefs.has(remote) && remoteBranchName(remote) === local.name,+ );+ const remote =+ matches.find((candidate) => candidate.remoteName === "origin") ?? matches[0] ?? null;+ if (remote) unusedRemoteRefs.delete(remote);+ return {+ id: `local:${local.name}`,+ label: local.name,+ local,+ remote,+ };+ });++ const remoteOnlyChoices = remoteRefs+ .filter((remote) => unusedRemoteRefs.has(remote))+ .map((remote) => ({+ id: `remote:${remote.name}`,+ label: remote.name,+ local: null,+ remote,+ }));++ return [...pairedChoices, ...remoteOnlyChoices];+}++export function filterBaseRefChoices(+ choices: ReadonlyArray<BaseRefChoice>,+ query: string,+): ReadonlyArray<BaseRefChoice> {+ const normalizedQuery = query.trim().toLocaleLowerCase();+ if (normalizedQuery.length === 0) return choices;+ return choices.filter(+ (choice) =>+ choice.label.toLocaleLowerCase().includes(normalizedQuery) ||+ choice.local?.name.toLocaleLowerCase().includes(normalizedQuery) === true ||+ choice.remote?.name.toLocaleLowerCase().includes(normalizedQuery) === true,+ );+}diff --git a/apps/web/src/lib/diffRendering.test.ts b/apps/web/src/lib/diffRendering.test.tsindex c24f58b99..e75a893d6 100644--- a/apps/web/src/lib/diffRendering.test.ts+++ b/apps/web/src/lib/diffRendering.test.ts@@ -1,5 +1,5 @@import { describe, expect, it } from "vite-plus/test";-import { buildPatchCacheKey } from "./diffRendering";+import { buildPatchCacheKey, getRenderablePatch } from "./diffRendering";describe("buildPatchCacheKey", () => {it("returns a stable cache key for identical content", () => {@@ -29,3 +29,56 @@ describe("buildPatchCacheKey", () => {);});});++describe("getRenderablePatch", () => {+ it("compacts partial hunk render offsets for virtualized review diffs", () => {+ const patch = [+ "diff --git a/example.ts b/example.ts",+ "index 1111111..2222222 100644",+ "--- a/example.ts",+ "+++ b/example.ts",+ "@@ -48,4 +48,4 @@",+ " context",+ "-before",+ "+after",+ " context",+ " context",+ "@@ -80,3 +80,4 @@",+ " context",+ "+added",+ " context",+ " context",+ ].join("\n");++ const parsed = getRenderablePatch(patch, "review", {+ compactPartialHunkOffsets: true,+ });+ expect(parsed?.kind).toBe("files");+ if (parsed?.kind !== "files") return;++ const file = parsed.files[0];+ expect(file?.hunks[0]?.collapsedBefore).toBe(47);+ expect(file?.hunks[0]?.unifiedLineStart).toBe(0);+ expect(file?.hunks[1]?.collapsedBefore).toBeGreaterThan(0);+ expect(file?.hunks[1]?.unifiedLineStart).toBe(file?.hunks[0]?.unifiedLineCount);+ expect(file?.unifiedLineCount).toBe(+ file?.hunks.reduce((total, hunk) => total + hunk.unifiedLineCount, 0),+ );+ });++ it("retains source-file offsets for checkpoint diffs", () => {+ const patch = [+ "diff --git a/example.ts b/example.ts",+ "--- a/example.ts",+ "+++ b/example.ts",+ "@@ -48,1 +48,1 @@",+ "-before",+ "+after",+ ].join("\n");++ const parsed = getRenderablePatch(patch, "checkpoint");+ expect(parsed?.kind).toBe("files");+ if (parsed?.kind !== "files") return;+ expect(parsed.files[0]?.hunks[0]?.unifiedLineStart).toBe(47);+ });+});diff --git a/apps/web/src/lib/diffRendering.ts b/apps/web/src/lib/diffRendering.tsindex cb57ec7e0..cb8318b3d 100644--- a/apps/web/src/lib/diffRendering.ts+++ b/apps/web/src/lib/diffRendering.ts@@ -52,9 +52,45 @@ export type RenderablePatch =reason: string;};+interface RenderablePatchOptions {+ /**+ * Pierre's partial-patch parser keeps hunk render starts in source-file+ * coordinates. Its virtualizer iterates partial patches as compact rows, so+ * review diffs need compact render starts while retaining collapsedBefore+ * for the "N unmodified lines" separator.+ */+ compactPartialHunkOffsets?: boolean;+}++export function compactPartialHunkOffsets(file: FileDiffMetadata): FileDiffMetadata {+ if (!file.isPartial) return file;++ let splitLineStart = 0;+ let unifiedLineStart = 0;+ const hunks = file.hunks.map((hunk) => {+ const compactHunk = {+ ...hunk,+ splitLineStart,+ unifiedLineStart,+ };+ splitLineStart += hunk.splitLineCount;+ unifiedLineStart += hunk.unifiedLineCount;+ return compactHunk;+ });++ return {+ ...file,+ hunks,+ splitLineCount: splitLineStart,+ unifiedLineCount: unifiedLineStart,+ ...(file.cacheKey ? { cacheKey: `${file.cacheKey}:compact-partial` } : {}),+ };+}+export function getRenderablePatch(patch: string | undefined,cacheScope = "diff-panel",+ options: RenderablePatchOptions = {},): RenderablePatch | null {if (!patch) return null;const normalizedPatch = patch.trim();@@ -65,7 +101,11 @@ export function getRenderablePatch(normalizedPatch,buildPatchCacheKey(normalizedPatch, cacheScope),);- const files = parsedPatches.flatMap((parsedPatch) => parsedPatch.files);+ const files = parsedPatches.flatMap((parsedPatch) =>+ options.compactPartialHunkOffsets+ ? parsedPatch.files.map(compactPartialHunkOffsets)+ : parsedPatch.files,+ );if (files.length > 0) {return { kind: "files", files };}diff --git a/apps/web/src/rightPanelStore.test.ts b/apps/web/src/rightPanelStore.test.tsindex 3b6dcc347..fb6d56f98 100644--- a/apps/web/src/rightPanelStore.test.ts+++ b/apps/web/src/rightPanelStore.test.ts@@ -6,7 +6,6 @@ import {migratePersistedRightPanelState,selectActiveRightPanel,selectActiveRightPanelSurface,- selectActiveRightPanelKindWithUrl,selectThreadRightPanelState,useRightPanelStore,} from "./rightPanelStore";@@ -254,16 +253,6 @@ describe("rightPanelStore", () => {expect(selectActiveRightPanel(useRightPanelStore.getState().byThreadKey, refA)).toBe("plan");});- it("?diff=1 always wins over persisted state", () => {- useRightPanelStore.getState().open(refA, "preview");- expect(- selectActiveRightPanelKindWithUrl(useRightPanelStore.getState().byThreadKey, refA, true),- ).toBe("diff");- expect(- selectActiveRightPanelKindWithUrl(useRightPanelStore.getState().byThreadKey, refA, false),- ).toBe("preview");- });-it("removeThread clears persisted state", () => {useRightPanelStore.getState().open(refA, "plan");useRightPanelStore.getState().removeThread(refA);diff --git a/apps/web/src/rightPanelStore.ts b/apps/web/src/rightPanelStore.tsindex 36fa82f9f..26dfe8c51 100644--- a/apps/web/src/rightPanelStore.ts+++ b/apps/web/src/rightPanelStore.ts@@ -550,13 +550,3 @@ export function selectActiveRightPanelSurface(if (!state.isOpen) return null;return state.surfaces.find((surface) => surface.id === state.activeSurfaceId) ?? null;}--export function selectActiveRightPanelKindWithUrl(- byThreadKey: Record<string, ThreadRightPanelState>,- ref: ScopedThreadRef | null | undefined,- diffSearchActive: boolean,-): RightPanelKind | null {- if (!selectThreadRightPanelState(byThreadKey, ref).isOpen) return null;- if (diffSearchActive) return "diff";- return selectActiveRightPanel(byThreadKey, ref);-}diff --git a/apps/web/src/routes/_chat.$environmentId.$threadId.tsx b/apps/web/src/routes/_chat.$environmentId.$threadId.tsxindex 5640487b3..7dc6702b4 100644--- a/apps/web/src/routes/_chat.$environmentId.$threadId.tsx+++ b/apps/web/src/routes/_chat.$environmentId.$threadId.tsx@@ -1,10 +1,9 @@-import { createFileRoute, retainSearchParams, useNavigate } from "@tanstack/react-router";+import { createFileRoute, useNavigate } from "@tanstack/react-router";import { useEffect } from "react";import ChatView from "../components/ChatView";import { threadHasStarted } from "../components/ChatView.logic";import { finalizePromotedDraftThreadByRef, useComposerDraftStore } from "../composerDraftStore";-import { type DiffRouteSearch, parseDiffRouteSearch } from "../diffRouteSearch";import { resolveThreadRouteRef } from "../threadRoutes";import { SidebarInset } from "~/components/ui/sidebar";import { useEnvironmentThreadRefs, useThreadDetail, useThreadShell } from "../state/entities";@@ -74,9 +73,5 @@ function ChatThreadRouteView() {}export const Route = createFileRoute("/_chat/$environmentId/$threadId")({- validateSearch: (search) => parseDiffRouteSearch(search),- search: {- middlewares: [retainSearchParams<DiffRouteSearch>(["diff"])],- },component: ChatThreadRouteView,});diff --git a/packages/contracts/src/git.ts b/packages/contracts/src/git.tsindex e8e9a4ecc..3de6c84fa 100644--- a/packages/contracts/src/git.ts+++ b/packages/contracts/src/git.ts@@ -125,6 +125,8 @@ export const VcsListRefsInput = Schema.Struct({cwd: TrimmedNonEmptyStringSchema,query: Schema.optional(TrimmedNonEmptyStringSchema.check(Schema.isMaxLength(256))),cursor: Schema.optional(NonNegativeInt),+ includeMatchingRemoteRefs: Schema.optional(Schema.Boolean),+ refKind: Schema.optional(Schema.Literals(["all", "local", "remote"])),limit: Schema.optional(PositiveInt.check(Schema.isLessThanOrEqualTo(GIT_LIST_BRANCHES_MAX_LIMIT)),),diff --git a/packages/contracts/src/review.ts b/packages/contracts/src/review.tsindex 363b124bf..a6b879a0c 100644--- a/packages/contracts/src/review.ts+++ b/packages/contracts/src/review.ts@@ -6,6 +6,7 @@ import { VcsError } from "./vcs.ts";export const ReviewDiffPreviewInput = Schema.Struct({cwd: TrimmedNonEmptyString,baseRef: Schema.optional(TrimmedNonEmptyString),+ ignoreWhitespace: Schema.optionalKey(Schema.Boolean),});export type ReviewDiffPreviewInput = typeof ReviewDiffPreviewInput.Type;