mirror of
https://github.com/backnotprop/plannotator.git
synced 2026-09-14 14:17:26 +08:00
feat: expandable diff context in code review (#247)
* feat: expandable diff context in code review (closes #243) Switch from PatchDiff to FileDiff component from @pierre/diffs to enable GitHub-style "show more lines" buttons between hunks. The library handles all expansion UI when provided full file contents via oldLines/newLines. - Add /api/file-content endpoint to serve old/new file content per diff type - Add getFileContentsForDiff() helper with ref mapping for all diff types - Parse patch client-side via getSingularPatch(), augment with file contents - Update @pierre/diffs from 1.0.4 to 1.0.11 (scroll sync fix, no breaking changes) Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> * fix: upgrade @pierre/diffs to beta, re-parse patch with full file contents The previous approach spread file content arrays onto a partial-mode FileDiffMetadata, causing hunk index mismatches and Shiki decoration errors. Now uses processFile() to re-parse the patch with oldFile/newFile so hunk indices are computed against the full file (isPartial: false), which is required for expansion to work correctly. Also fixes a flash error on file switch by tagging fileContents with the filePath they were fetched for, preventing stale contents from being paired with the wrong patch during the render before useEffect fires. - Upgrade @pierre/diffs from ^1.0.x to ^1.1.0-beta.19 in all workspaces - Add test fixtures for disjoint hunks, deleted/renamed/new files Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> * fix: abort stale file-content fetches, validate path params - Add AbortController to file-content fetch effect to cancel in-flight requests when switching files - Reject path traversal (.. or absolute paths) on /api/file-content - Document /api/file-content endpoint in CLAUDE.md Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> --------- Co-authored-by: Claude Opus 4.6 <noreply@anthropic.com>
This commit is contained in:
@@ -10,7 +10,7 @@
|
||||
*/
|
||||
|
||||
import { isRemoteSession, getServerPort } from "./remote";
|
||||
import { type DiffType, type GitContext, runGitDiff, getWorktreeDiffOptions } from "./git";
|
||||
import { type DiffType, type GitContext, runGitDiff, getWorktreeDiffOptions, getFileContentsForDiff } from "./git";
|
||||
import { getRepoInfo } from "./repo";
|
||||
import { handleImage, handleUpload, handleAgents, handleServerReady, handleDraftSave, handleDraftLoad, handleDraftDelete, type OpencodeClient } from "./shared-handlers";
|
||||
import { contentHash, deleteDraft } from "./draft";
|
||||
@@ -198,6 +198,29 @@ export async function startReviewServer(
|
||||
}
|
||||
}
|
||||
|
||||
// API: Get file content for expandable diff context
|
||||
if (url.pathname === "/api/file-content" && req.method === "GET") {
|
||||
const filePath = url.searchParams.get("path");
|
||||
if (!filePath) {
|
||||
return Response.json({ error: "Missing path" }, { status: 400 });
|
||||
}
|
||||
if (filePath.includes("..") || filePath.startsWith("/")) {
|
||||
return Response.json({ error: "Invalid path" }, { status: 400 });
|
||||
}
|
||||
const oldPath = url.searchParams.get("oldPath") || undefined;
|
||||
if (oldPath && (oldPath.includes("..") || oldPath.startsWith("/"))) {
|
||||
return Response.json({ error: "Invalid path" }, { status: 400 });
|
||||
}
|
||||
const defaultBranch = gitContext?.defaultBranch || "main";
|
||||
const result = await getFileContentsForDiff(
|
||||
currentDiffType,
|
||||
defaultBranch,
|
||||
filePath,
|
||||
oldPath,
|
||||
);
|
||||
return Response.json(result);
|
||||
}
|
||||
|
||||
// API: Serve images (local paths or temp uploads)
|
||||
if (url.pathname === "/api/image") {
|
||||
return handleImage(req);
|
||||
|
||||
Reference in New Issue
Block a user