feedback

Author: msukkari

packages/web/src/app/api/(server)/source/route.ts

@@ -27,7 +27,7 @@ export const POST = async (request: NextRequest) => {
 }
 
 
-const postSource = (request: FileSourceRequest, domain: string) => sew(() =>
+export const postSource = (request: FileSourceRequest, domain: string) => sew(() =>
     withAuth(async (session) =>
         withOrgMembership(session, domain, async ({ orgId }) => {
             const response = await getFileSource(request, orgId);

packages/web/src/features/agents/review-agent/nodes/fetchFileContent.ts

@@ -1,6 +1,8 @@
 import { sourcebot_context, sourcebot_pr_payload } from "@/features/agents/review-agent/types";
 import { fileSourceResponseSchema } from "@/features/search/schemas";
 import { base64Decode } from "@/lib/utils";
+import { postSource } from "@/app/api/(server)/source/route";
+import { isServiceError } from "@/lib/utils";
 
 export const fetchFileContent = async (pr_payload: sourcebot_pr_payload, filename: string): Promise<sourcebot_context> => {
     console.log("Executing fetch_file_content");
@@ -12,21 +14,12 @@ export const fetchFileContent = async (pr_payload: sourcebot_pr_payload, filenam
     }
     console.log(JSON.stringify(fileSourceRequest, null, 2));
 
-    const response = await fetch('http://localhost:3000/api/source', {
-        method: 'POST',
-        headers: {
-            'Content-Type': 'application/json',
-            'X-Org-Domain': '~'
-        },
-        body: JSON.stringify(fileSourceRequest)
-    });
-
-    if (!response.ok) {
-        throw new Error(`Failed to fetch file content for ${filename} from ${repoPath}: ${response.statusText}`);
+    const response = await postSource(fileSourceRequest, "~");
+    if (isServiceError(response)) {
+        throw new Error(`Failed to fetch file content for ${filename} from ${repoPath}: ${response.message}`);
     }
 
-    const responseData = await response.json();
-    const fileSourceResponse = fileSourceResponseSchema.parse(responseData);
+    const fileSourceResponse = fileSourceResponseSchema.parse(response);
     const fileContent = base64Decode(fileSourceResponse.source);
 
     const fileContentContext: sourcebot_context = {

packages/web/src/features/agents/review-agent/nodes/githubPrParser.ts

@@ -10,8 +10,14 @@ export const githubPrParser = async (octokit: Octokit, payload: WebhookEventDefi
         throw new Error("Installation not found in github payload");
     }
 
-    const diff = await octokit.request(payload.pull_request.patch_url);
-    const parsedDiff: parse.File[] = parse(diff.data);
+    let parsedDiff: parse.File[] = [];  
+    try {
+        const diff = await octokit.request(payload.pull_request.patch_url);
+        parsedDiff = parse(diff.data);
+    } catch (error) {
+        console.error("Error fetching diff: ", error);
+        throw error;
+    }
 
     const sourcebotFileDiffs: (sourcebot_file_diff | null)[] = parsedDiff.map((file) => {
         if (!file.from || !file.to) {
@@ -20,8 +26,8 @@ export const githubPrParser = async (octokit: Octokit, payload: WebhookEventDefi
         }
 
         const diffs: sourcebot_diff[] = file.chunks.map((chunk) => {
-            let oldSnippet = "";
-            let newSnippet = "";
+            let oldSnippet = `@@ -${chunk.oldStart},${chunk.oldLines} +${chunk.newStart},${chunk.newLines} @@\n`;
+            let newSnippet = `@@ -${chunk.oldStart},${chunk.oldLines} +${chunk.newStart},${chunk.newLines} @@\n`;
 
             for (const change of chunk.changes) {
                 if (change.type === "normal") {