rely primarily on inline pr feedback

2025-10-31 04:04:06 -04:00
parent 681e08557c
commit acb06634be
6 changed files with 86 additions and 33 deletions
@@ -1,4 +1,6 @@
+import { execSync } from "node:child_process";
 import { type } from "arktype";
+import { log } from "../utils/cli.ts";
 import { contextualize, tool } from "./shared.ts";

 export const PullRequestInfo = type({
@@ -7,7 +9,8 @@ export const PullRequestInfo = type({

 export const PullRequestInfoTool = tool({
  name: "get_pull_request",
-  description: "Retrieve minimal information for a specific pull request by number.",
+  description:
+    "Retrieve PR information and automatically prepare the repository for review by fetching and checking out the PR branch.",
  parameters: PullRequestInfo,
  execute: contextualize(async ({ pull_number }, ctx) => {
    const pr = await ctx.octokit.rest.pulls.get({
@@ -21,6 +24,20 @@ export const PullRequestInfoTool = tool({
    const baseBranch = data.base.ref;
    const headBranch = data.head.ref;

+    if (!baseBranch) {
+      throw new Error(`Base branch not found for PR #${pull_number}`);
+    }
+
+    // Automatically fetch and checkout branches for review
+    log.info(`Fetching base branch: origin/${baseBranch}`);
+    execSync(`git fetch origin ${baseBranch} --depth=20`, { stdio: "inherit" });
+
+    log.info(`Fetching PR branch: origin/${headBranch}`);
+    execSync(`git fetch origin ${headBranch}`, { stdio: "inherit" });
+
+    log.info(`Checking out PR branch: origin/${headBranch}`);
+    execSync(`git checkout origin/${headBranch}`, { stdio: "inherit" });
+
    return {
      number: data.number,
      url: data.html_url,
@@ -8,27 +8,51 @@ export const Review = type({
    .enumerated("APPROVE", "REQUEST_CHANGES", "COMMENT")
    .describe("'APPROVE', 'REQUEST_CHANGES', or 'COMMENT' (the review action)"),
  body: type.string
-    .describe("The body content for the review (required for REQUEST_CHANGES or COMMENT)")
+    .describe(
+      "Brief summary or general feedback that doesn't apply to specific code locations. Keep it concise - most feedback should be in the 'comments' array."
+    )
    .optional(),
  commit_id: type.string
    .describe("Optional SHA of the commit being reviewed. Defaults to latest.")
    .optional(),
  comments: type({
-    path: type.string.describe("The file path to comment on"),
-    position: type.number.describe("The diff position in the file"),
-    body: type.string.describe("The comment text"),
+    path: type.string.describe("The file path to comment on (relative to repo root)"),
+    line: type.number.describe(
+      "The line number in the file (use line numbers from the diff - usually the RIGHT side/new code)"
+    ),
+    side: type
+      .enumerated("LEFT", "RIGHT")
+      .describe(
+        "Side of the diff: LEFT (old code) or RIGHT (new code). Defaults to RIGHT if not provided."
+      )
+      .optional(),
+    body: type.string.describe("The comment text for this specific line"),
+    start_line: type.number
+      .describe("Start line for multi-line comments (optional, for commenting on ranges)")
+      .optional(),
  })
    .array()
-    .describe("Array of draft review comments for specific lines, optional.")
+    .describe(
+      "REQUIRED: Array of inline comments for specific code issues. Use this for all location-specific feedback. Use 'git diff origin/<base>...origin/<head>' to find the correct line numbers (typically use the line numbers shown on the RIGHT side for new code, LEFT side for old code)."
+    )
    .optional(),
 });

 export const ReviewTool = tool({
  name: "submit_pull_request_review",
  description:
-    "Submit a review (approve, request changes, or comment) for an existing pull request.",
+    "Submit a review (approve, request changes, or comment) for an existing pull request. " +
+    "IMPORTANT: Use 'comments' array for ALL specific code issues at the line-level. " +
+    "Only use 'body' for a brief summary or feedback that doesn't apply to a specific location.",
  parameters: Review,
  execute: contextualize(async ({ pull_number, event, body, commit_id, comments = [] }, ctx) => {
+    // Get the PR to determine the head commit if commit_id not provided
+    const pr = await ctx.octokit.rest.pulls.get({
+      owner: ctx.owner,
+      repo: ctx.name,
+      pull_number,
+    });
+
    // Compose the request
    const params: RestEndpointMethodTypes["pulls"]["createReview"]["parameters"] = {
      owner: ctx.owner,
@@ -37,8 +61,26 @@ export const ReviewTool = tool({
      event,
    };
    if (body) params.body = body;
-    if (commit_id) params.commit_id = commit_id;
-    if (comments.length > 0) params.comments = comments;
+    if (commit_id) {
+      params.commit_id = commit_id;
+    } else {
+      params.commit_id = pr.data.head.sha;
+    }
+    if (comments.length > 0) {
+      type ReviewComment = (typeof params.comments & {})[number];
+      // Convert comments to the format expected by GitHub API
+      params.comments = comments.map((comment) => {
+        const reviewComment: ReviewComment = {
+          ...comment,
+        };
+        reviewComment.side = comment.side || "RIGHT";
+        if (comment.start_line) {
+          reviewComment.start_line = comment.start_line;
+          reviewComment.start_side = comment.side || "RIGHT";
+        }
+        return reviewComment;
+      });
+    }
    const result = await ctx.octokit.rest.pulls.createReview(params);
    return {
      success: true,