fetch PR url and support basic comment operations

jurajmajerik · jurajmajerik · commit ddc3036914c8 · 2025-12-10T10:46:36.000Z
diff --git a/apps/array/src/main/preload.ts b/apps/array/src/main/preload.ts
@@ -282,6 +282,8 @@ contextBridge.exposeInMainWorld("electronAPI", {
   }> => ipcRenderer.invoke("get-diff-stats", repoPath),
   getCurrentBranch: (repoPath: string): Promise<string | undefined> =>
     ipcRenderer.invoke("get-current-branch", repoPath),
+  getHeadCommitSha: (repoPath: string): Promise<string> =>
+    ipcRenderer.invoke("get-head-commit-sha", repoPath),
   discardFileChanges: (
     repoPath: string,
     filePath: string,
@@ -508,4 +510,59 @@ contextBridge.exposeInMainWorld("electronAPI", {
     setTerminalLayout: (mode: "split" | "tabbed"): Promise<void> =>
       ipcRenderer.invoke("settings:set-terminal-layout", mode),
   },
+  // PR Comments API
+  prComments: {
+    getReviewComments: (
+      directoryPath: string,
+      prNumber: number,
+    ): Promise<unknown[]> =>
+      ipcRenderer.invoke("get-pr-review-comments", directoryPath, prNumber),
+    addComment: (
+      directoryPath: string,
+      prNumber: number,
+      params: {
+        body: string;
+        commitId: string;
+        path: string;
+        line: number;
+        side: "LEFT" | "RIGHT";
+      },
+    ): Promise<unknown> =>
+      ipcRenderer.invoke("add-pr-comment", directoryPath, prNumber, params),
+    replyToReview: (
+      directoryPath: string,
+      prNumber: number,
+      params: { body: string; inReplyTo: number },
+    ): Promise<unknown> =>
+      ipcRenderer.invoke("reply-pr-review", directoryPath, prNumber, params),
+    updateComment: (
+      directoryPath: string,
+      commentId: number,
+      body: string,
+    ): Promise<unknown> =>
+      ipcRenderer.invoke("update-pr-comment", directoryPath, commentId, body),
+    deleteComment: (directoryPath: string, commentId: number): Promise<void> =>
+      ipcRenderer.invoke("delete-pr-comment", directoryPath, commentId),
+    resolveComment: (
+      directoryPath: string,
+      prNumber: number,
+      commentId: number,
+      resolved: boolean,
+    ): Promise<unknown> =>
+      ipcRenderer.invoke(
+        "resolve-pr-comment",
+        directoryPath,
+        prNumber,
+        commentId,
+        resolved,
+      ),
+    getPrForBranch: (
+      directoryPath: string,
+    ): Promise<{
+      number: number;
+      url: string;
+      title: string;
+      state: string;
+    } | null> => ipcRenderer.invoke("get-pr-for-branch", directoryPath),
+  },
 });
diff --git a/apps/array/src/main/services/git.ts b/apps/array/src/main/services/git.ts
@@ -738,6 +738,28 @@ const deletePullRequestComment = async (
   }
 };
 
+interface PullRequestInfo {
+  number: number;
+  url: string;
+  title: string;
+  state: string;
+}
+
+const getPullRequestForBranch = async (
+  directoryPath: string,
+): Promise<PullRequestInfo | null> => {
+  try {
+    const { stdout } = await execAsync(
+      "gh pr view --json number,url,title,state",
+      { cwd: directoryPath },
+    );
+    return JSON.parse(stdout);
+  } catch {
+    // No PR exists for this branch
+    return null;
+  }
+};
+
 const resolvePullRequestComment = async (
   directoryPath: string,
   prNumber: number,
@@ -1189,4 +1211,14 @@ export function registerGitIpc(
       );
     },
   );
+
+  ipcMain.handle(
+    "get-pr-for-branch",
+    async (
+      _event: IpcMainInvokeEvent,
+      directoryPath: string,
+    ): Promise<PullRequestInfo | null> => {
+      return getPullRequestForBranch(directoryPath);
+    },
+  );
 }
diff --git a/apps/array/src/renderer/features/code-editor/components/CodeEditorPanel.tsx b/apps/array/src/renderer/features/code-editor/components/CodeEditorPanel.tsx
@@ -26,11 +26,25 @@ export function CodeEditorPanel({
   const repoPath = worktreePath ?? taskData.repoPath;
   const filePath = getRelativePath(absolutePath, repoPath);
 
-  // Extract PR number from PR URL if available
-  const prUrl = task.latest_run?.output?.pr_url as string | undefined;
-  const prNumber = prUrl
-    ? parseInt(prUrl.split("/").pop() || "0", 10)
-    : undefined;
+  // Fetch PR for the current branch
+  const { data: prInfo } = useQuery({
+    queryKey: ["pr-for-branch", repoPath],
+    enabled: !!repoPath,
+    staleTime: 30_000, // Cache for 30 seconds
+    queryFn: async () => {
+      if (!window.electronAPI || !repoPath) {
+        return null;
+      }
+      return window.electronAPI.prComments.getPrForBranch(repoPath);
+    },
+  });
+
+  // Use PR from branch lookup, or fall back to task output
+  const prUrl =
+    prInfo?.url ?? (task.latest_run?.output?.pr_url as string | undefined);
+  const prNumber =
+    prInfo?.number ??
+    (prUrl ? parseInt(prUrl.split("/").pop() || "0", 10) : undefined);
 
   const {
     data: fileContent,
diff --git a/apps/array/src/renderer/features/code-editor/components/CodeMirrorDiffEditor.tsx b/apps/array/src/renderer/features/code-editor/components/CodeMirrorDiffEditor.tsx
@@ -11,6 +11,8 @@ interface CodeMirrorDiffEditorProps {
   filePath?: string;
   fileId?: string; // Unique identifier for comments (e.g., relative path)
   onContentChange?: (content: string) => void;
+  prNumber?: number;
+  directoryPath?: string;
 }
 
 export function CodeMirrorDiffEditor({
@@ -19,11 +21,15 @@ export function CodeMirrorDiffEditor({
   filePath,
   fileId,
   onContentChange,
+  prNumber,
+  directoryPath,
 }: CodeMirrorDiffEditorProps) {
   const [viewMode, setViewMode] = useState<ViewMode>("split");
   const extensions = useEditorExtensions(filePath, true, {
     enableComments: true,
     fileId: fileId || filePath, // Fall back to filePath if no fileId provided
+    prNumber,
+    directoryPath,
   });
   const options = useMemo(
     () => ({
diff --git a/apps/array/src/renderer/features/code-editor/components/DiffEditorPanel.tsx b/apps/array/src/renderer/features/code-editor/components/DiffEditorPanel.tsx
@@ -2,11 +2,12 @@ import { PanelMessage } from "@components/ui/PanelMessage";
 import { CodeMirrorDiffEditor } from "@features/code-editor/components/CodeMirrorDiffEditor";
 import { CodeMirrorEditor } from "@features/code-editor/components/CodeMirrorEditor";
 import { getRelativePath } from "@features/code-editor/utils/pathUtils";
+import { useCommentStore } from "@features/comments/store/commentStore";
 import { useTaskData } from "@features/task-detail/hooks/useTaskData";
 import { Box } from "@radix-ui/themes";
 import type { Task } from "@shared/types";
 import { useQuery, useQueryClient } from "@tanstack/react-query";
-import { useCallback } from "react";
+import { useCallback, useEffect } from "react";
 import {
   selectWorktreePath,
   useWorkspaceStore,
@@ -29,11 +30,40 @@ export function DiffEditorPanel({
   const filePath = getRelativePath(absolutePath, repoPath);
   const queryClient = useQueryClient();
 
-  // Extract PR number from PR URL if available
-  const prUrl = task.latest_run?.output?.pr_url as string | undefined;
-  const prNumber = prUrl
-    ? parseInt(prUrl.split("/").pop() || "0", 10)
-    : undefined;
+  // Fetch PR for the current branch
+  const { data: prInfo } = useQuery({
+    queryKey: ["pr-for-branch", repoPath],
+    enabled: !!repoPath,
+    staleTime: 30_000, // Cache for 30 seconds
+    queryFn: async () => {
+      if (!window.electronAPI || !repoPath) {
+        return null;
+      }
+      return window.electronAPI.prComments.getPrForBranch(repoPath);
+    },
+  });
+
+  // Use PR from branch lookup, or fall back to task output
+  const prUrl =
+    prInfo?.url ?? (task.latest_run?.output?.pr_url as string | undefined);
+  const prNumber =
+    prInfo?.number ??
+    (prUrl ? parseInt(prUrl.split("/").pop() || "0", 10) : undefined);
+
+  // Fetch PR comments when we have a PR number, and refetch on window focus
+  const fetchComments = useCommentStore((state) => state.fetchComments);
+  useEffect(() => {
+    if (!prNumber || !repoPath) {
+      return;
+    }
+
+    fetchComments(prNumber, repoPath);
+
+    // Refetch when window regains focus
+    const handleFocus = () => fetchComments(prNumber, repoPath);
+    window.addEventListener("focus", handleFocus);
+    return () => window.removeEventListener("focus", handleFocus);
+  }, [prNumber, repoPath, fetchComments]);
 
   const { data: changedFiles = [] } = useQuery({
     queryKey: ["changed-files-head", repoPath],
@@ -104,6 +134,8 @@ export function DiffEditorPanel({
           filePath={absolutePath}
           fileId={filePath} // Use relative path as fileId for comments
           onContentChange={handleContentChange}
+          prNumber={prNumber}
+          directoryPath={repoPath}
         />
       ) : (
         <CodeMirrorEditor
diff --git a/apps/array/src/renderer/features/code-editor/hooks/useEditorExtensions.ts b/apps/array/src/renderer/features/code-editor/hooks/useEditorExtensions.ts
@@ -16,7 +16,12 @@ import { getLanguageExtension } from "../utils/languages";
 export function useEditorExtensions(
   filePath?: string,
   readOnly = false,
-  options?: { enableComments?: boolean; fileId?: string; prNumber?: number },
+  options?: {
+    enableComments?: boolean;
+    fileId?: string;
+    prNumber?: number;
+    directoryPath?: string;
+  },
 ) {
   const isDarkMode = useThemeStore((state) => state.isDarkMode);
   const showComments = useCommentStore((state) => state.showComments);
@@ -28,7 +33,12 @@ export function useEditorExtensions(
   const createComment = useCommentStore((state) => state.createComment);
   const composerState = useCommentStore((state) => state.composerState);
 
-  const { enableComments = false, fileId, prNumber } = options || {};
+  const {
+    enableComments = false,
+    fileId,
+    prNumber,
+    directoryPath,
+  } = options || {};
 
   // Handler for when user clicks "+" to add a comment
   const handleOpenComposer = useCallback(
@@ -41,20 +51,28 @@ export function useEditorExtensions(
   // Handler for submitting a new comment
   const handleSubmitComment = useCallback(
     async (line: number, content: string) => {
-      if (!fileId) return;
+      if (!fileId || !directoryPath || !prNumber) {
+        return;
+      }
+
+      try {
+        // Get the HEAD commit SHA for the comment
+        const commitId =
+          await window.electronAPI.getHeadCommitSha(directoryPath);
 
-      await createComment({
-        prNumber: prNumber || 0,
-        directoryPath: "", // TODO: Get actual directory path from context
-        path: fileId || "",
-        line,
-        side: "right",
-        content,
-        commitId: "", // TODO: Get actual commit ID from context
-      });
-      closeComposer();
+        await createComment({
+          prNumber,
+          directoryPath,
+          path: fileId,
+          line,
+          side: "right",
+          content,
+          commitId,
+        });
+        closeComposer();
+      } catch (_error) {}
     },
-    [fileId, createComment, closeComposer, prNumber],
+    [fileId, createComment, closeComposer, prNumber, directoryPath],
   );
 
   return useMemo(() => {
diff --git a/apps/array/src/renderer/features/comments/store/commentStore.ts b/apps/array/src/renderer/features/comments/store/commentStore.ts
@@ -38,6 +38,7 @@ interface CommentStore {
   getCommentsForLine: (fileId: string, line: number) => Comment[];
 
   // Commands (async, call API then update local state)
+  fetchComments: (prNumber: number, directoryPath: string) => Promise<void>;
   createComment: (input: CreateCommentInput) => Promise<Comment>;
   createReply: (input: CreateReplyInput) => Promise<Comment>;
   updateComment: (
@@ -95,6 +96,25 @@ export const useCommentStore = create<CommentStore>()(
       // COMMANDS (async, call API + update state)
       // ----------------------------------------
 
+      fetchComments: async (prNumber: number, directoryPath: string) => {
+        try {
+          const comments = await commentApi.fetchComments(
+            prNumber,
+            directoryPath,
+          );
+          // Group comments by fileId
+          const commentsByFile: Record<string, Comment[]> = {};
+          for (const comment of comments) {
+            if (!commentsByFile[comment.fileId]) {
+              commentsByFile[comment.fileId] = [];
+            }
+            commentsByFile[comment.fileId].push(comment);
+          }
+          // Replace all comments with fresh data from API
+          set({ comments: commentsByFile });
+        } catch (_error) {}
+      },
+
       createComment: async (input: CreateCommentInput) => {
         // Call API to create comment
         const comment = await commentApi.createComment(input);
diff --git a/apps/array/src/renderer/types/electron.d.ts b/apps/array/src/renderer/types/electron.d.ts
@@ -195,6 +195,7 @@ declare global {
       linesRemoved: number;
     }>;
     getCurrentBranch: (repoPath: string) => Promise<string | undefined>;
+    getHeadCommitSha: (repoPath: string) => Promise<string>;
     discardFileChanges: (
       repoPath: string,
       filePath: string,
@@ -362,6 +363,12 @@ declare global {
         commentId: number,
         resolved: boolean,
       ) => Promise<unknown>;
+      getPrForBranch: (directoryPath: string) => Promise<{
+        number: number;
+        url: string;
+        title: string;
+        state: string;
+      } | null>;
     };
   }
 
