fix(git): reuse active thread for inline PR review

Author: Dimillian

src/App.tsx

@@ -1833,6 +1833,8 @@ function MainApp() {
     runPullRequestReview,
   } = usePullRequestReviewActions({
     activeWorkspace,
+    activeThreadId,
+    reviewDeliveryMode: appSettings.reviewDeliveryMode,
     pullRequest: selectedPullRequest,
     pullRequestDiffs: gitPullRequestDiffs,
     pullRequestComments: gitPullRequestComments,

src/features/git/hooks/usePullRequestReviewActions.test.tsx

@@ -55,6 +55,8 @@ function renderActions(
 ) {
   const options: Parameters<typeof usePullRequestReviewActions>[0] = {
     activeWorkspace: workspace,
+    activeThreadId: "thread-active",
+    reviewDeliveryMode: "detached",
     pullRequest,
     pullRequestDiffs: diffs,
     pullRequestComments: comments,
@@ -68,7 +70,7 @@ function renderActions(
 }
 
 describe("usePullRequestReviewActions", () => {
-  it("always starts a new thread for PR review", async () => {
+  it("starts a new thread for detached PR review", async () => {
     const { result, options } = renderActions();
 
     await act(async () => {
@@ -131,4 +133,23 @@ describe("usePullRequestReviewActions", () => {
     expect(options.startThreadForWorkspace).toHaveBeenCalledTimes(1);
     expect(options.sendUserMessageToThread).toHaveBeenCalledTimes(1);
   });
+
+  it("reuses the active thread for inline PR review", async () => {
+    const { result, options } = renderActions({
+      activeThreadId: "thread-active",
+      reviewDeliveryMode: "inline",
+    });
+
+    await act(async () => {
+      await result.current.runPullRequestReview({ intent: "full" });
+    });
+
+    expect(options.startThreadForWorkspace).not.toHaveBeenCalled();
+    expect(options.sendUserMessageToThread).toHaveBeenCalledWith(
+      workspace,
+      "thread-active",
+      expect.any(String),
+      [],
+    );
+  });
 });

src/features/git/hooks/usePullRequestReviewActions.ts

@@ -21,6 +21,8 @@ const REVIEW_ACTIONS: PullRequestReviewAction[] = [
 
 type UsePullRequestReviewActionsOptions = {
   activeWorkspace: WorkspaceInfo | null;
+  activeThreadId: string | null;
+  reviewDeliveryMode: "inline" | "detached";
   pullRequest: GitHubPullRequest | null;
   pullRequestDiffs: GitHubPullRequestDiff[];
   pullRequestComments: GitHubPullRequestComment[];
@@ -47,6 +49,8 @@ type RunPullRequestReviewOptions = {
 
 export function usePullRequestReviewActions({
   activeWorkspace,
+  activeThreadId,
+  reviewDeliveryMode,
   pullRequest,
   pullRequestDiffs,
   pullRequestComments,
@@ -80,9 +84,13 @@ export function usePullRequestReviewActions({
           await connectWorkspace(activeWorkspace);
         }
 
-        const reviewThreadId = await startThreadForWorkspace(activeWorkspace.id, {
-          activate: activateThread,
-        });
+        const reuseActiveThread =
+          reviewDeliveryMode === "inline" && Boolean(activeThreadId);
+        const reviewThreadId = reuseActiveThread
+          ? activeThreadId
+          : await startThreadForWorkspace(activeWorkspace.id, {
+            activate: activateThread,
+          });
         if (!reviewThreadId) {
           throw new Error("Failed to start a review thread.");
         }
@@ -113,10 +121,12 @@ export function usePullRequestReviewActions({
     },
     [
       activeWorkspace,
+      activeThreadId,
       connectWorkspace,
       pullRequest,
       pullRequestComments,
       pullRequestDiffs,
+      reviewDeliveryMode,
       sendUserMessageToThread,
       startThreadForWorkspace,
     ],