refactor sending prompt to agent from UI

Author: adboio

apps/code/src/renderer/features/code-review/components/CloudReviewPage.tsx

@@ -1,12 +1,13 @@
+import { sendPromptToAgent } from "@features/sessions/utils/sendPromptToAgent";
 import { useCloudChangedFiles } from "@features/task-detail/hooks/useCloudChangedFiles";
 import type { FileDiffMetadata } from "@pierre/diffs";
 import { processFile } from "@pierre/diffs";
 import { Flex, Spinner, Text } from "@radix-ui/themes";
 import { useReviewNavigationStore } from "@renderer/features/code-review/stores/reviewNavigationStore";
 import type { ChangedFile, Task } from "@shared/types";
-import { useMemo } from "react";
-import { useReviewComment } from "../hooks/useReviewComment";
+import { useCallback, useMemo } from "react";
 import type { DiffOptions, OnCommentCallback } from "../types";
+import { buildInlineCommentPrompt } from "../utils/reviewPrompts";
 import { InteractiveFileDiff } from "./InteractiveFileDiff";
 import {
   DeferredDiffPlaceholder,
@@ -26,7 +27,15 @@ export function CloudReviewPage({ task }: CloudReviewPageProps) {
   );
   const { effectiveBranch, prUrl, isRunActive, remoteFiles, isLoading } =
     useCloudChangedFiles(taskId, task, isReviewOpen);
-  const onComment = useReviewComment(taskId);
+  const onComment: OnCommentCallback = useCallback(
+    (filePath, startLine, endLine, side, comment) => {
+      sendPromptToAgent(
+        taskId,
+        buildInlineCommentPrompt(filePath, startLine, endLine, side, comment),
+      );
+    },
+    [taskId],
+  );
 
   const allPaths = useMemo(() => remoteFiles.map((f) => f.path), [remoteFiles]);
 

apps/code/src/renderer/features/code-review/components/ReviewPage.tsx

@@ -1,16 +1,17 @@
 import { makeFileKey } from "@features/git-interaction/utils/fileKey";
 import { usePanelLayoutStore } from "@features/panels/store/panelLayoutStore";
+import { sendPromptToAgent } from "@features/sessions/utils/sendPromptToAgent";
 import { useCwd } from "@features/sidebar/hooks/useCwd";
 import type { parsePatchFiles } from "@pierre/diffs";
 import { Flex, Text } from "@radix-ui/themes";
 import { useReviewNavigationStore } from "@renderer/features/code-review/stores/reviewNavigationStore";
 import { useTRPC } from "@renderer/trpc/client";
 import type { ChangedFile, Task } from "@shared/types";
 import { useQuery } from "@tanstack/react-query";
-import { useMemo } from "react";
-import { useReviewComment } from "../hooks/useReviewComment";
+import { useCallback, useMemo } from "react";
 import { useReviewDiffs } from "../hooks/useReviewDiffs";
 import type { DiffOptions, OnCommentCallback } from "../types";
+import { buildInlineCommentPrompt } from "../utils/reviewPrompts";
 import { InteractiveFileDiff } from "./InteractiveFileDiff";
 import {
   DeferredDiffPlaceholder,
@@ -32,7 +33,15 @@ export function ReviewPage({ task }: ReviewPageProps) {
   const isReviewOpen = useReviewNavigationStore(
     (s) => (s.reviewModes[taskId] ?? "closed") !== "closed",
   );
-  const onComment = useReviewComment(taskId);
+  const onComment: OnCommentCallback = useCallback(
+    (filePath, startLine, endLine, side, comment) => {
+      sendPromptToAgent(
+        taskId,
+        buildInlineCommentPrompt(filePath, startLine, endLine, side, comment),
+      );
+    },
+    [taskId],
+  );
 
   const {
     changedFiles,

apps/code/src/renderer/features/code-review/hooks/useReviewComment.ts

@@ -0,0 +1,26 @@
+import type { AnnotationSide } from "@pierre/diffs";
+
+function escapeXmlAttr(value: string): string {
+  return value
+    .replace(/&/g, "&")
+    .replace(/</g, "&lt;")
+    .replace(/>/g, "&gt;")
+    .replace(/"/g, "&quot;")
+    .replace(/'/g, "&apos;");
+}
+
+export function buildInlineCommentPrompt(
+  filePath: string,
+  startLine: number,
+  endLine: number,
+  side: AnnotationSide,
+  comment: string,
+): string {
+  const lineRef =
+    startLine === endLine
+      ? `line ${startLine}`
+      : `lines ${startLine}-${endLine}`;
+  const sideLabel = side === "deletions" ? "old" : "new";
+  const escapedPath = escapeXmlAttr(filePath);
+  return `In file <file path="${escapedPath}" />, ${lineRef} (${sideLabel}):\n\n${comment}`;
+}

apps/code/src/renderer/features/code-review/utils/reviewPrompts.ts

@@ -1,8 +1,5 @@
-import { DEFAULT_TAB_IDS } from "@features/panels/constants/panelConstants";
-import { usePanelLayoutStore } from "@features/panels/store/panelLayoutStore";
-import { findTabInTree } from "@features/panels/store/panelTree";
-import { getSessionService } from "@features/sessions/service/service";
 import { useSessionForTask } from "@features/sessions/stores/sessionStore";
+import { sendPromptToAgent } from "@features/sessions/utils/sendPromptToAgent";
 import { useNavigationStore } from "@stores/navigationStore";
 import { useCallback } from "react";
 import type { FixWithAgentPrompt } from "../utils/errorPrompts";
@@ -34,16 +31,7 @@ export function useFixWithAgent(
       const { label, context } = buildPrompt(error);
 
       const prompt = `<error_context label="${label}">${context}</error_context>\n\n\`\`\`\n${error}\n\`\`\``;
-      getSessionService().sendPrompt(taskId, prompt);
-
-      const { taskLayouts, setActiveTab } = usePanelLayoutStore.getState();
-      const layout = taskLayouts[taskId];
-      if (layout) {
-        const result = findTabInTree(layout.panelTree, DEFAULT_TAB_IDS.LOGS);
-        if (result) {
-          setActiveTab(taskId, result.panelId, DEFAULT_TAB_IDS.LOGS);
-        }
-      }
+      sendPromptToAgent(taskId, prompt);
     },
     [buildPrompt, taskId, isSessionReady],
   );

apps/code/src/renderer/features/git-interaction/hooks/useFixWithAgent.ts

@@ -0,0 +1,27 @@
+import { useReviewNavigationStore } from "@features/code-review/stores/reviewNavigationStore";
+import { DEFAULT_TAB_IDS } from "@features/panels/constants/panelConstants";
+import { usePanelLayoutStore } from "@features/panels/store/panelLayoutStore";
+import { findTabInTree } from "@features/panels/store/panelTree";
+import { getSessionService } from "@features/sessions/service/service";
+
+/**
+ * Sends a prompt to the agent session for a task, collapses the review
+ * panel to split mode if expanded, and switches to the logs/chat tab.
+ */
+export function sendPromptToAgent(taskId: string, prompt: string): void {
+  getSessionService().sendPrompt(taskId, prompt);
+
+  const { getReviewMode, setReviewMode } = useReviewNavigationStore.getState();
+  if (getReviewMode(taskId) === "expanded") {
+    setReviewMode(taskId, "split");
+  }
+
+  const { taskLayouts, setActiveTab } = usePanelLayoutStore.getState();
+  const layout = taskLayouts[taskId];
+  if (layout) {
+    const result = findTabInTree(layout.panelTree, DEFAULT_TAB_IDS.LOGS);
+    if (result) {
+      setActiveTab(taskId, result.panelId, DEFAULT_TAB_IDS.LOGS);
+    }
+  }
+}