Add file-scoped full-context diff viewing (#134)

* Add file-scoped full-context diff viewing

- Propagate relative file paths and context mode through diff queries
- Add per-file patch/full toggle in the diff panel and persist review state
- Extend orchestration contracts and tests for scoped full-context diffs

* Omit unset diff query fields

- Skip undefined checkpoint diff inputs when building queries
- Tighten diff panel formatting and test typing

Author: BunsDev

apps/server/src/checkpointing/Layers/CheckpointDiffQuery.ts

@@ -133,6 +133,8 @@ const make = Effect.gen(function* () {
         fromCheckpointRef,
         toCheckpointRef,
         fallbackFromToHead: false,
+        ...(input.relativePath ? { relativePath: input.relativePath } : {}),
+        ...(input.contextMode ? { contextMode: input.contextMode } : {}),
       });
 
       const turnDiff: OrchestrationGetTurnDiffResultType = {
@@ -158,6 +160,8 @@ const make = Effect.gen(function* () {
       threadId: input.threadId,
       fromTurnCount: 0,
       toTurnCount: input.toTurnCount,
+      relativePath: input.relativePath,
+      contextMode: input.contextMode,
     }).pipe(Effect.map((result): OrchestrationGetFullThreadDiffResult => result));
 
   return {

apps/server/src/checkpointing/Layers/CheckpointStore.ts

@@ -240,10 +240,21 @@ const makeCheckpointStore = Effect.gen(function* () {
         });
       }
 
+      const args = [
+        "diff",
+        "--patch",
+        "--minimal",
+        "--no-color",
+        ...(input.contextMode === "full" ? ["--unified=999999"] : []),
+        fromCommitOid,
+        toCommitOid,
+        ...(input.relativePath ? ["--", input.relativePath] : []),
+      ];
+
       const result = yield* git.execute({
         operation,
         cwd: input.cwd,
-        args: ["diff", "--patch", "--minimal", "--no-color", fromCommitOid, toCommitOid],
+        args,
       });
 
       return result.stdout;

apps/server/src/checkpointing/Services/CheckpointStore.ts

@@ -14,7 +14,7 @@ import { ServiceMap } from "effect";
 import type { Effect } from "effect";
 
 import type { CheckpointStoreError } from "../Errors.ts";
-import { CheckpointRef } from "@okcode/contracts";
+import { CheckpointRef, type OrchestrationDiffContextMode } from "@okcode/contracts";
 
 export interface CaptureCheckpointInput {
   readonly cwd: string;
@@ -32,6 +32,8 @@ export interface DiffCheckpointsInput {
   readonly fromCheckpointRef: CheckpointRef;
   readonly toCheckpointRef: CheckpointRef;
   readonly fallbackFromToHead?: boolean;
+  readonly relativePath?: string;
+  readonly contextMode?: OrchestrationDiffContextMode;
 }
 
 export interface DeleteCheckpointRefsInput {

apps/web/src/components/DiffPanel.tsx

@@ -16,6 +16,7 @@ import { buildPatchCacheKey } from "../lib/diffRendering";
 import {
   expandDiffFile,
   reconcileDiffFileReviewState,
+  setDiffFileContextMode,
   toggleDiffFileAccepted,
   toggleDiffFileCollapsed,
   type DiffFileReviewStateByPath,
@@ -166,33 +167,85 @@ function summarizeFileDiffStats(fileDiff: FileDiffMetadata): {
   );
 }
 
+function resolveRenderableFileDiff(
+  renderablePatch: RenderablePatch | null,
+  filePath: string,
+): FileDiffMetadata | null {
+  if (!renderablePatch || renderablePatch.kind !== "files") {
+    return null;
+  }
+  return (
+    renderablePatch.files.find((candidate) => resolveFileDiffPath(candidate) === filePath) ?? null
+  );
+}
+
+interface FileScopedCheckpointDiffInput {
+  threadId: ThreadId | null;
+  fromTurnCount: number | null;
+  toTurnCount: number | null;
+  cacheScope?: string | null;
+  enabled: boolean;
+}
+
 function DiffFileSection(props: {
   fileDiff: FileDiffMetadata;
   filePath: string;
   fileKey: string;
+  checkpointDiffInput: FileScopedCheckpointDiffInput;
   diffRenderMode: DiffRenderMode;
   diffWordWrap: boolean;
   resolvedTheme: "light" | "dark";
   collapsed: boolean;
   accepted: boolean;
+  contextMode: "patch" | "full";
   onOpenInEditor: (filePath: string) => void;
   onToggleCollapsed: (filePath: string) => void;
   onToggleAccepted: (filePath: string) => void;
+  onContextModeChange: (filePath: string, contextMode: "patch" | "full") => void;
 }) {
   const {
     accepted,
+    checkpointDiffInput,
     collapsed,
+    contextMode,
     diffRenderMode,
     diffWordWrap,
     fileDiff,
     fileKey,
     filePath,
+    onContextModeChange,
     onOpenInEditor,
     onToggleAccepted,
     onToggleCollapsed,
     resolvedTheme,
   } = props;
   const stats = summarizeFileDiffStats(fileDiff);
+  const fullContextDiffQuery = useQuery(
+    checkpointDiffQueryOptions({
+      ...checkpointDiffInput,
+      relativePath: filePath,
+      contextMode: "full",
+      enabled: checkpointDiffInput.enabled && !collapsed && contextMode === "full",
+    }),
+  );
+  const fullContextPatch = useMemo(
+    () =>
+      getRenderablePatch(
+        contextMode === "full" ? fullContextDiffQuery.data?.diff : undefined,
+        `diff-panel:file:${resolvedTheme}:${filePath}:full`,
+      ),
+    [contextMode, filePath, fullContextDiffQuery.data?.diff, resolvedTheme],
+  );
+  const resolvedFileDiff =
+    contextMode === "full"
+      ? (resolveRenderableFileDiff(fullContextPatch, filePath) ?? fileDiff)
+      : fileDiff;
+  const fullContextError =
+    contextMode === "full" && fullContextDiffQuery.error
+      ? fullContextDiffQuery.error instanceof Error
+        ? fullContextDiffQuery.error.message
+        : "Failed to load full-file context."
+      : null;
 
   return (
     <section
@@ -228,6 +281,25 @@ function DiffFileSection(props: {
             <DiffStatLabel additions={stats.additions} deletions={stats.deletions} />
           </span>
         )}
+        <ToggleGroup
+          className="shrink-0"
+          variant="outline"
+          size="xs"
+          value={[contextMode]}
+          onValueChange={(value) => {
+            const next = value[0];
+            if (next === "patch" || next === "full") {
+              onContextModeChange(filePath, next);
+            }
+          }}
+        >
+          <Toggle aria-label={`Show patch diff for ${filePath}`} value="patch">
+            Patch
+          </Toggle>
+          <Toggle aria-label={`Show full file context for ${filePath}`} value="full">
+            Full
+          </Toggle>
+        </ToggleGroup>
         <Button
           size="xs"
           variant={accepted ? "secondary" : "outline"}
@@ -243,8 +315,16 @@ function DiffFileSection(props: {
       </div>
       {!collapsed && (
         <div key={fileKey}>
+          {contextMode === "full" && fullContextDiffQuery.isLoading ? (
+            <DiffPanelLoadingState label="Loading full file..." />
+          ) : null}
+          {fullContextError ? (
+            <div className="border-b border-border/60 bg-destructive/8 px-3 py-2 text-[11px] text-destructive/80">
+              {fullContextError}
+            </div>
+          ) : null}
           <FileDiff
-            fileDiff={fileDiff}
+            fileDiff={resolvedFileDiff}
             options={{
               diffStyle: diffRenderMode === "split" ? "split" : "unified",
               lineDiffType: "none",
@@ -507,6 +587,12 @@ export default function DiffPanel({ mode = "inline" }: DiffPanelProps) {
     },
     [updateActiveReviewState],
   );
+  const onChangeFileContextMode = useCallback(
+    (filePath: string, contextMode: "patch" | "full") => {
+      updateActiveReviewState((current) => setDiffFileContextMode(current, filePath, contextMode));
+    },
+    [updateActiveReviewState],
+  );
 
   const latestSelectedTurnId = orderedTurnDiffSummaries[0]?.turnId ?? null;
 
@@ -675,17 +761,29 @@ export default function DiffPanel({ mode = "inline" }: DiffPanelProps) {
                   const fileReviewState = activeReviewState[filePath] ?? {
                     accepted: false,
                     collapsed: true,
+                    contextMode: "patch" as const,
                   };
                   return (
                     <DiffFileSection
                       key={themedFileKey}
                       accepted={fileReviewState.accepted}
+                      checkpointDiffInput={{
+                        threadId: activeThreadId,
+                        fromTurnCount: activeCheckpointRange?.fromTurnCount ?? null,
+                        toTurnCount: activeCheckpointRange?.toTurnCount ?? null,
+                        cacheScope: selectedTurn
+                          ? `turn:${selectedTurn.turnId}`
+                          : conversationCacheScope,
+                        enabled: isGitRepo,
+                      }}
                       collapsed={fileReviewState.collapsed}
+                      contextMode={fileReviewState.contextMode}
                       diffRenderMode={diffRenderMode}
                       diffWordWrap={diffWordWrap}
                       fileDiff={fileDiff}
                       fileKey={themedFileKey}
                       filePath={filePath}
+                      onContextModeChange={onChangeFileContextMode}
                       onOpenInEditor={openDiffFileInCodeViewer}
                       onToggleAccepted={onToggleFileAccepted}
                       onToggleCollapsed={onToggleFileCollapsed}

apps/web/src/lib/diffFileReviewState.test.ts

@@ -2,6 +2,7 @@ import { describe, expect, it } from "vitest";
 import {
   expandDiffFile,
   reconcileDiffFileReviewState,
+  setDiffFileContextMode,
   toggleDiffFileAccepted,
   toggleDiffFileCollapsed,
 } from "./diffFileReviewState";
@@ -10,38 +11,38 @@ describe("reconcileDiffFileReviewState", () => {
   it("preserves existing state for known files and drops removed files", () => {
     expect(
       reconcileDiffFileReviewState(["src/a.ts"], {
-        "src/a.ts": { accepted: true, collapsed: true },
-        "src/b.ts": { accepted: false, collapsed: true },
+        "src/a.ts": { accepted: true, collapsed: true, contextMode: "full" },
+        "src/b.ts": { accepted: false, collapsed: true, contextMode: "patch" },
       }),
     ).toEqual({
-      "src/a.ts": { accepted: true, collapsed: true },
+      "src/a.ts": { accepted: true, collapsed: true, contextMode: "full" },
     });
   });
 
   it("initializes new files as unaccepted and collapsed", () => {
     expect(reconcileDiffFileReviewState(["src/a.ts"], undefined)).toEqual({
-      "src/a.ts": { accepted: false, collapsed: true },
+      "src/a.ts": { accepted: false, collapsed: true, contextMode: "patch" },
     });
   });
 });
 
 describe("toggleDiffFileAccepted", () => {
   it("marks a file accepted and collapses it", () => {
     expect(toggleDiffFileAccepted({}, "src/a.ts")).toEqual({
-      "src/a.ts": { accepted: true, collapsed: true },
+      "src/a.ts": { accepted: true, collapsed: true, contextMode: "patch" },
     });
   });
 
   it("clears acceptance and re-expands the file", () => {
     expect(
       toggleDiffFileAccepted(
         {
-          "src/a.ts": { accepted: true, collapsed: true },
+          "src/a.ts": { accepted: true, collapsed: true, contextMode: "full" },
         },
         "src/a.ts",
       ),
     ).toEqual({
-      "src/a.ts": { accepted: false, collapsed: false },
+      "src/a.ts": { accepted: false, collapsed: false, contextMode: "full" },
     });
   });
 });
@@ -51,12 +52,28 @@ describe("toggleDiffFileCollapsed", () => {
     expect(
       toggleDiffFileCollapsed(
         {
-          "src/a.ts": { accepted: true, collapsed: true },
+          "src/a.ts": { accepted: true, collapsed: true, contextMode: "full" },
         },
         "src/a.ts",
       ),
     ).toEqual({
-      "src/a.ts": { accepted: true, collapsed: false },
+      "src/a.ts": { accepted: true, collapsed: false, contextMode: "full" },
+    });
+  });
+});
+
+describe("setDiffFileContextMode", () => {
+  it("updates the file context mode without changing other state", () => {
+    expect(
+      setDiffFileContextMode(
+        {
+          "src/a.ts": { accepted: true, collapsed: false, contextMode: "patch" },
+        },
+        "src/a.ts",
+        "full",
+      ),
+    ).toEqual({
+      "src/a.ts": { accepted: true, collapsed: false, contextMode: "full" },
     });
   });
 });
@@ -66,19 +83,19 @@ describe("expandDiffFile", () => {
     expect(
       expandDiffFile(
         {
-          "src/a.ts": { accepted: true, collapsed: true },
+          "src/a.ts": { accepted: true, collapsed: true, contextMode: "patch" },
         },
         "src/a.ts",
       ),
     ).toEqual({
-      "src/a.ts": { accepted: true, collapsed: false },
+      "src/a.ts": { accepted: true, collapsed: false, contextMode: "patch" },
     });
   });
 
   it("returns the same object when the file is already expanded", () => {
     const state = {
-      "src/a.ts": { accepted: false, collapsed: false },
-    };
+      "src/a.ts": { accepted: false, collapsed: false, contextMode: "patch" as const },
+    } satisfies Record<string, { accepted: boolean; collapsed: boolean; contextMode: "patch" }>;
     // File is already expanded, so the same object reference is returned.
     expect(expandDiffFile(state, "src/a.ts")).toBe(state);
   });

apps/web/src/lib/diffFileReviewState.ts

@@ -1,13 +1,15 @@
 export interface DiffFileReviewState {
   collapsed: boolean;
   accepted: boolean;
+  contextMode: "patch" | "full";
 }
 
 export type DiffFileReviewStateByPath = Record<string, DiffFileReviewState>;
 
 const DEFAULT_DIFF_FILE_REVIEW_STATE: DiffFileReviewState = {
   collapsed: true,
   accepted: false,
+  contextMode: "patch",
 };
 
 export function reconcileDiffFileReviewState(
@@ -32,6 +34,7 @@ export function toggleDiffFileAccepted(
     [path]: {
       accepted,
       collapsed: accepted,
+      contextMode: previous.contextMode,
     },
   };
 }
@@ -50,6 +53,24 @@ export function toggleDiffFileCollapsed(
   };
 }
 
+export function setDiffFileContextMode(
+  current: DiffFileReviewStateByPath,
+  path: string,
+  contextMode: "patch" | "full",
+): DiffFileReviewStateByPath {
+  const previous = current[path] ?? DEFAULT_DIFF_FILE_REVIEW_STATE;
+  if (previous.contextMode === contextMode) {
+    return current;
+  }
+  return {
+    ...current,
+    [path]: {
+      ...previous,
+      contextMode,
+    },
+  };
+}
+
 export function expandDiffFile(
   current: DiffFileReviewStateByPath,
   path: string,