refactor: store ReviewNoteData instead of parsing formatted strings

- Add ReviewNoteData interface for structured review data
- Add formatReviewNoteForChat() to format data when sending to chat
- Update PendingReview.data to hold ReviewNoteData instead of content string
- Update all onReviewNote callbacks throughout the callback chain
- Simplify getReviewSummary() to use review.data.userNote directly
- Remove string parsing regex from banner component

Author: ammar-agent

src/browser/components/AIView.tsx

@@ -52,6 +52,8 @@ import { useForceCompaction } from "@/browser/hooks/useForceCompaction";
 import { useAPI } from "@/browser/contexts/API";
 import { usePendingReviews } from "@/browser/hooks/usePendingReviews";
 import { PendingReviewsBanner } from "./PendingReviewsBanner";
+import type { ReviewNoteData } from "@/common/types/review";
+import { formatReviewNoteForChat } from "@/common/types/review";
 
 interface AIViewProps {
   workspaceId: string;
@@ -220,15 +222,15 @@ const AIViewInner: React.FC<AIViewProps> = ({
 
   // Handler for review notes from Code Review tab - adds to pending reviews
   const handleReviewNote = useCallback(
-    (note: string) => {
-      pendingReviews.addReview(note);
+    (data: ReviewNoteData) => {
+      pendingReviews.addReview(data);
     },
     [pendingReviews]
   );
 
-  // Handler to send a review to chat input
-  const handleSendReviewToChat = useCallback((content: string) => {
-    chatInputAPI.current?.appendText(content);
+  // Handler to send a review to chat input (formats to message string)
+  const handleSendReviewToChat = useCallback((data: ReviewNoteData) => {
+    chatInputAPI.current?.appendText(formatReviewNoteForChat(data));
   }, []);
 
   // Handler for manual compaction from CompactionWarning click

src/browser/components/Messages/MessageRenderer.tsx

@@ -1,5 +1,6 @@
 import React from "react";
 import type { DisplayedMessage } from "@/common/types/message";
+import type { ReviewNoteData } from "@/common/types/review";
 import { UserMessage } from "./UserMessage";
 import { AssistantMessage } from "./AssistantMessage";
 import { ToolMessage } from "./ToolMessage";
@@ -16,7 +17,7 @@ interface MessageRendererProps {
   workspaceId?: string;
   isCompacting?: boolean;
   /** Handler for adding review notes from inline diffs */
-  onReviewNote?: (note: string) => void;
+  onReviewNote?: (data: ReviewNoteData) => void;
 }
 
 // Memoized to prevent unnecessary re-renders when parent (AIView) updates

src/browser/components/Messages/ToolMessage.tsx

@@ -35,13 +35,14 @@ import type {
   WebFetchToolArgs,
   WebFetchToolResult,
 } from "@/common/types/tools";
+import type { ReviewNoteData } from "@/common/types/review";
 
 interface ToolMessageProps {
   message: DisplayedMessage & { type: "tool" };
   className?: string;
   workspaceId?: string;
   /** Handler for adding review notes from inline diffs */
-  onReviewNote?: (note: string) => void;
+  onReviewNote?: (data: ReviewNoteData) => void;
 }
 
 // Type guards using Zod schemas for single source of truth

src/browser/components/PendingReviewsBanner.tsx

@@ -21,7 +21,7 @@ import {
 import { cn } from "@/common/lib/utils";
 import { Button } from "./ui/button";
 import { Tooltip, TooltipWrapper } from "./Tooltip";
-import type { PendingReview } from "@/common/types/review";
+import type { PendingReview, ReviewNoteData } from "@/common/types/review";
 
 interface PendingReviewsBannerProps {
   /** All reviews (pending and checked) */
@@ -35,7 +35,7 @@ interface PendingReviewsBannerProps {
   /** Uncheck a review */
   onUncheck: (reviewId: string) => void;
   /** Send review content to chat input */
-  onSendToChat: (content: string) => void;
+  onSendToChat: (data: ReviewNoteData) => void;
   /** Remove a review */
   onRemove: (reviewId: string) => void;
   /** Clear all checked reviews */
@@ -46,13 +46,8 @@ interface PendingReviewsBannerProps {
  * Extract a short summary from review content for display
  */
 function getReviewSummary(review: PendingReview): string {
-  // Extract the user's note from the review content (after the code block)
-  const noteMatch = /```\n> (.+?)\n<\/review>/s.exec(review.content);
-  if (noteMatch) {
-    const note = noteMatch[1].trim();
-    return note.length > 50 ? note.slice(0, 50) + "…" : note;
-  }
-  return `${review.filePath}:${review.lineRange}`;
+  const note = review.data.userNote.trim();
+  return note.length > 50 ? note.slice(0, 50) + "…" : note;
 }
 
 /**
@@ -91,7 +86,7 @@ const ReviewItem: React.FC<{
       <div className="min-w-0 flex-1">
         <div className="flex items-baseline gap-1.5">
           <span className="font-mono text-[var(--color-review-accent)]">
-            {review.filePath}:{review.lineRange}
+            {review.data.filePath}:{review.data.lineRange}
           </span>
         </div>
         <div className="text-muted truncate">{getReviewSummary(review)}</div>
@@ -243,7 +238,7 @@ export const PendingReviewsBanner: React.FC<PendingReviewsBannerProps> = ({
                   review={review}
                   onCheck={() => onCheck(review.id)}
                   onUncheck={() => onUncheck(review.id)}
-                  onSendToChat={() => onSendToChat(review.content)}
+                  onSendToChat={() => onSendToChat(review.data)}
                   onRemove={() => onRemove(review.id)}
                 />
               ))

src/browser/components/RightSidebar.tsx

@@ -12,6 +12,7 @@ import { calculateTokenMeterData } from "@/common/utils/tokens/tokenMeterUtils";
 import { matchesKeybind, KEYBINDS, formatKeybind } from "@/browser/utils/ui/keybinds";
 import { Tooltip, TooltipTrigger, TooltipContent } from "./ui/tooltip";
 import { cn } from "@/common/lib/utils";
+import type { ReviewNoteData } from "@/common/types/review";
 
 interface SidebarContainerProps {
   collapsed: boolean;
@@ -84,7 +85,7 @@ interface RightSidebarProps {
   /** Whether currently resizing */
   isResizing?: boolean;
   /** Callback when user adds a review note from Code Review tab */
-  onReviewNote?: (note: string) => void;
+  onReviewNote?: (data: ReviewNoteData) => void;
   /** Workspace is still being created (git operations in progress) */
   isCreating?: boolean;
 }

src/browser/components/RightSidebar/CodeReview/HunkViewer.tsx

@@ -3,7 +3,7 @@
  */
 
 import React, { useState, useMemo } from "react";
-import type { DiffHunk } from "@/common/types/review";
+import type { DiffHunk, ReviewNoteData } from "@/common/types/review";
 import { SelectableDiffRenderer } from "../../shared/DiffRenderer";
 import {
   type SearchHighlightConfig,
@@ -24,7 +24,7 @@ interface HunkViewerProps {
   onClick?: (e: React.MouseEvent<HTMLElement>) => void;
   onToggleRead?: (e: React.MouseEvent<HTMLElement>) => void;
   onRegisterToggleExpand?: (hunkId: string, toggleFn: () => void) => void;
-  onReviewNote?: (note: string) => void;
+  onReviewNote?: (data: ReviewNoteData) => void;
   searchConfig?: SearchHighlightConfig;
 }
 

src/browser/components/RightSidebar/CodeReview/ReviewPanel.tsx

@@ -32,7 +32,7 @@ import { parseDiff, extractAllHunks, buildGitDiffCommand } from "@/common/utils/
 import { getReviewSearchStateKey } from "@/common/constants/storage";
 import { Tooltip, TooltipTrigger, TooltipContent } from "@/browser/components/ui/tooltip";
 import { parseNumstat, buildFileTree, extractNewPath } from "@/common/utils/git/numstatParser";
-import type { DiffHunk, ReviewFilters as ReviewFiltersType } from "@/common/types/review";
+import type { DiffHunk, ReviewFilters as ReviewFiltersType, ReviewNoteData } from "@/common/types/review";
 import type { FileTreeNode } from "@/common/utils/git/numstatParser";
 import { matchesKeybind, KEYBINDS, formatKeybind } from "@/browser/utils/ui/keybinds";
 import { applyFrontendFilters } from "@/browser/utils/review/filterHunks";
@@ -42,7 +42,7 @@ import { useAPI } from "@/browser/contexts/API";
 interface ReviewPanelProps {
   workspaceId: string;
   workspacePath: string;
-  onReviewNote?: (note: string) => void;
+  onReviewNote?: (data: ReviewNoteData) => void;
   /** Trigger to focus panel (increment to trigger) */
   focusTrigger?: number;
   /** Workspace is still being created (git operations in progress) */

src/browser/components/shared/DiffRenderer.tsx

@@ -18,6 +18,7 @@ import {
   highlightSearchMatches,
   type SearchHighlightConfig,
 } from "@/browser/utils/highlighting/highlightSearchTerms";
+import type { ReviewNoteData } from "@/common/types/review";
 
 // Shared type for diff line types
 export type DiffLineType = "add" | "remove" | "context" | "header";
@@ -313,8 +314,8 @@ export const DiffRenderer: React.FC<DiffRendererProps> = ({
 interface SelectableDiffRendererProps extends Omit<DiffRendererProps, "filePath"> {
   /** File path for generating review notes */
   filePath: string;
-  /** Callback when user submits a review note */
-  onReviewNote?: (note: string) => void;
+  /** Callback when user submits a review note with structured data */
+  onReviewNote?: (data: ReviewNoteData) => void;
   /** Callback when user clicks on a line (to activate parent hunk) */
   onLineClick?: () => void;
   /** Search highlight configuration (optional) */
@@ -339,7 +340,7 @@ interface ReviewNoteInputProps {
   lineData: Array<{ index: number; type: DiffLineType; lineNum: number }>;
   lines: string[]; // Original diff lines with +/- prefix
   filePath: string;
-  onSubmit: (note: string) => void;
+  onSubmit: (data: ReviewNoteData) => void;
   onCancel: () => void;
 }
 
@@ -379,20 +380,25 @@ const ReviewNoteInput: React.FC<ReviewNoteInputProps> = React.memo(
       });
 
       // Elide middle lines if more than 3 lines selected
-      let selectedLines: string;
+      let selectedCode: string;
       if (allLines.length <= 3) {
-        selectedLines = allLines.join("\n");
+        selectedCode = allLines.join("\n");
       } else {
         const omittedCount = allLines.length - 2;
-        selectedLines = [
+        selectedCode = [
           allLines[0],
           `    (${omittedCount} lines omitted)`,
           allLines[allLines.length - 1],
         ].join("\n");
       }
 
-      const reviewNote = `<review>\nRe ${filePath}:${lineRange}\n\`\`\`\n${selectedLines}\n\`\`\`\n> ${noteText.trim()}\n</review>`;
-      onSubmit(reviewNote);
+      // Pass structured data instead of formatted message
+      onSubmit({
+        filePath,
+        lineRange,
+        selectedCode,
+        userNote: noteText.trim(),
+      });
     };
 
     return (
@@ -530,9 +536,9 @@ export const SelectableDiffRenderer = React.memo<SelectableDiffRendererProps>(
       });
     };
 
-    const handleSubmitNote = (reviewNote: string) => {
+    const handleSubmitNote = (data: ReviewNoteData) => {
       if (!onReviewNote) return;
-      onReviewNote(reviewNote);
+      onReviewNote(data);
       setSelection(null);
     };
 

src/browser/components/tools/FileEditToolCall.tsx

@@ -25,6 +25,7 @@ import { useToolExpansion, getStatusDisplay, type ToolStatus } from "./shared/to
 import { useCopyToClipboard } from "@/browser/hooks/useCopyToClipboard";
 import { DiffContainer, DiffRenderer, SelectableDiffRenderer } from "../shared/DiffRenderer";
 import { KebabMenu, type KebabMenuItem } from "../KebabMenu";
+import type { ReviewNoteData } from "@/common/types/review";
 
 type FileEditOperationArgs =
   | FileEditReplaceStringToolArgs
@@ -41,13 +42,13 @@ interface FileEditToolCallProps {
   args: FileEditOperationArgs;
   result?: FileEditToolResult;
   status?: ToolStatus;
-  onReviewNote?: (note: string) => void;
+  onReviewNote?: (data: ReviewNoteData) => void;
 }
 
 function renderDiff(
   diff: string,
   filePath?: string,
-  onReviewNote?: (note: string) => void
+  onReviewNote?: (data: ReviewNoteData) => void
 ): React.ReactNode {
   try {
     const patches = parsePatch(diff);

src/browser/hooks/usePendingReviews.ts

@@ -6,19 +6,7 @@
 import { useCallback, useMemo } from "react";
 import { usePersistedState } from "./usePersistedState";
 import { getPendingReviewsKey } from "@/common/constants/storage";
-import type { PendingReview, PendingReviewsState } from "@/common/types/review";
-
-/**
- * Parse a review note to extract file path and line range
- * Expected format: <review>\nRe filePath:lineRange\n...
- */
-function parseReviewNote(content: string): { filePath: string; lineRange: string } {
-  const match = /Re ([^:]+):(\d+(?:-\d+)?)/.exec(content);
-  if (match) {
-    return { filePath: match[1], lineRange: match[2] };
-  }
-  return { filePath: "unknown", lineRange: "?" };
-}
+import type { PendingReview, PendingReviewsState, ReviewNoteData } from "@/common/types/review";
 
 /**
  * Generate a unique ID for a review
@@ -34,8 +22,8 @@ export interface UsePendingReviewsReturn {
   pendingCount: number;
   /** Count of checked reviews */
   checkedCount: number;
-  /** Add a new review from a review note */
-  addReview: (content: string) => PendingReview;
+  /** Add a new review from structured data */
+  addReview: (data: ReviewNoteData) => PendingReview;
   /** Mark a review as checked */
   checkReview: (reviewId: string) => void;
   /** Uncheck a review (mark as pending again) */
@@ -77,13 +65,10 @@ export function usePendingReviews(workspaceId: string): UsePendingReviewsReturn
   }, [reviews]);
 
   const addReview = useCallback(
-    (content: string): PendingReview => {
-      const { filePath, lineRange } = parseReviewNote(content);
+    (data: ReviewNoteData): PendingReview => {
       const review: PendingReview = {
         id: generateReviewId(),
-        content,
-        filePath,
-        lineRange,
+        data,
         status: "pending",
         createdAt: Date.now(),
       };