diff --git a/apps/web/src/components/review/ConflictResolutionPanel.tsx b/apps/web/src/components/review/ConflictResolutionPanel.tsx index ea2ff36..95dc750 100644 --- a/apps/web/src/components/review/ConflictResolutionPanel.tsx +++ b/apps/web/src/components/review/ConflictResolutionPanel.tsx @@ -11,7 +11,7 @@ interface ConflictResolutionPanelProps { } export function ConflictResolutionPanel({ initiativeId, conflicts, onResolved }: ConflictResolutionPanelProps) { - const { state, agent, questions, spawn, resume, stop, dismiss } = useConflictAgent(initiativeId); + const { state, agent: _agent, questions, spawn, resume, stop, dismiss } = useConflictAgent(initiativeId); const [showManual, setShowManual] = useState(false); const prevStateRef = useRef(null); diff --git a/apps/web/src/components/review/DiffViewer.tsx b/apps/web/src/components/review/DiffViewer.tsx index d4cfd1e..1ffbe22 100644 --- a/apps/web/src/components/review/DiffViewer.tsx +++ b/apps/web/src/components/review/DiffViewer.tsx @@ -1,4 +1,4 @@ -import type { FileDiff, DiffLine, ReviewComment } from "./types"; +import type { FileDiffDetail, DiffLine, ReviewComment } from "./types"; import { FileCard } from "./FileCard"; function getFileCommentMap( @@ -13,7 +13,7 @@ function getFileCommentMap( } interface DiffViewerProps { - files: FileDiff[]; + files: FileDiffDetail[]; commentsByLine: Map; onAddComment: ( filePath: string, diff --git a/apps/web/src/components/review/FileCard.tsx b/apps/web/src/components/review/FileCard.tsx index 4d6ed6f..4c84769 100644 --- a/apps/web/src/components/review/FileCard.tsx +++ b/apps/web/src/components/review/FileCard.tsx @@ -8,12 +8,12 @@ import { Circle, } from "lucide-react"; import { Badge } from "@/components/ui/badge"; -import type { FileDiff, FileChangeType, DiffLine, ReviewComment } from "./types"; +import type { FileDiffDetail, DiffLine, ReviewComment } from "./types"; import { HunkRows } from "./HunkRows"; import { useHighlightedFile } from "./use-syntax-highlight"; const changeTypeBadge: Record< - FileChangeType, + FileDiffDetail['status'], { label: string; classes: string } | null > = { added: { @@ -32,17 +32,19 @@ const changeTypeBadge: Record< "bg-status-active-bg text-status-active-fg border-status-active-border", }, modified: null, + binary: null, }; -const leftBorderClass: Record = { +const leftBorderClass: Record = { added: "border-l-2 border-l-status-success-fg", deleted: "border-l-2 border-l-status-error-fg", renamed: "border-l-2 border-l-status-active-fg", modified: "border-l-2 border-l-primary/40", + binary: "border-l-2 border-l-primary/40", }; interface FileCardProps { - file: FileDiff; + file: FileDiffDetail; commentsByLine: Map; onAddComment: ( filePath: string, @@ -80,7 +82,7 @@ export function FileCard({ [commentsByLine], ); - const badge = changeTypeBadge[file.changeType]; + const badge = changeTypeBadge[file.status]; // Flatten all hunk lines for syntax highlighting const allLines = useMemo( @@ -93,7 +95,7 @@ export function FileCard({
{/* File header — sticky so it stays visible when scrolling */}