consolidate pr context into concrete type

Author: sayansisodiya

src/github/process-review.ts

@@ -1,7 +1,7 @@
 import { getConfig } from "../config.js";
 import { reviewDiff } from "../review/reviewer.js";
 import { GitHubClient } from "./client.js";
-import { CHECK_STATUS, CHECK_CONCLUSION, PRDetails, GitHubPullRequestEvent } from "./types.js";
+import { CHECK_STATUS, CHECK_CONCLUSION, PRContext, GitHubPullRequestEvent } from "./types.js";
 
 export async function processReview(
   jobId: string,
@@ -62,18 +62,19 @@ export async function processReview(
 
     console.log(`Retrieved diff content (${diffContent.length} chars)`);
 
-    // Create PR details object
-    const prDetails: PRDetails = {
+    // Create structured PR context object
+    const prContext: PRContext = {
+      owner,
+      repo,
       pr_number: prNumber,
       repository_id: repositoryId,
       commit_sha: commitSha,
       pr_url: prUrl,
+      repository_full_name: payload.repository.full_name,
     };
 
-    const prDetailsContent = `Repository: ${payload.repository.full_name},\nPR Number: ${prDetails.pr_number}\nCommit SHA: ${prDetails.commit_sha}\nPR URL: ${prDetails.pr_url}`;
-
     console.log(`Calling reviewDiff() for job ${jobId}`);
-    const reviewResult = await reviewDiff(diffContent, prDetailsContent, installationId);
+    const reviewResult = await reviewDiff(diffContent, prContext, installationId);
     console.log(`Review completed for job ${jobId}`);
 
     // Read collected comments from file

src/github/types.ts

@@ -5,6 +5,16 @@ export interface PRDetails {
   pr_url: string;
 }
 
+export interface PRContext {
+  owner: string;
+  repo: string;
+  pr_number: number;
+  repository_id: number;
+  commit_sha: string;
+  pr_url: string;
+  repository_full_name: string;
+}
+
 export interface GitHubPullRequestEvent {
   action: string;
   number: number;

src/review/reviewer.ts

@@ -4,11 +4,12 @@ import { join } from 'path';
 import { v4 as uuidv4 } from 'uuid';
 import { Config, getConfig } from "../config.js";
 import { newThread, execute } from "../amp.js";
+import { PRContext } from "../github/types.js";
 
 
 export const reviewDiff = async (
   diffContent: string, 
-  prDetailsContent: string, 
+  prContext: PRContext, 
   installationId: number
 ) => {
 
@@ -25,6 +26,9 @@ export const reviewDiff = async (
       // Create prompt content
       const ampConfig = config.amp;
 
+      // Format PR context for prompt
+      const prDetailsContent = `Repository: ${prContext.repository_full_name}\nPR Number: ${prContext.pr_number}\nCommit SHA: ${prContext.commit_sha}\nPR URL: ${prContext.pr_url}`;
+      
       const promptContent = ampConfig.prompt_template
         .replace(/__PR_DETAILS_CONTENT__/g, prDetailsContent)
         .replace(/__DIFF_CONTENT__/g, diffContent);
@@ -57,6 +61,9 @@ export const reviewDiff = async (
         env: {
           GITHUB_INSTALLATION_ID: installationId.toString(),
           COMMENTS_FILE: commentsFilePath,
+          GITHUB_OWNER: prContext.owner,
+          GITHUB_REPO: prContext.repo,
+          GITHUB_PR_NUMBER: prContext.pr_number.toString(),
           GITHUB_APP_ID: process.env.GITHUB_APP_ID || '',
           GITHUB_APP_PRIVATE_KEY_PATH: process.env.GITHUB_APP_PRIVATE_KEY_PATH || '',
           GITHUB_APP_CWD: process.env.GITHUB_APP_CWD || '',

toolbox/get-pr-comments.js

@@ -15,11 +15,7 @@ if (action === 'describe') {
   console.log(JSON.stringify({
     name: 'get_pr_comments',
     description: 'Get all comments on a pull request',
-    args: {
-      owner: ['string', 'Repository owner'],
-      repo: ['string', 'Repository name'],
-      pr_number: ['number', 'Pull request number']
-    }
+    args: {}
   }));
   process.exit(0);
 }
@@ -28,11 +24,13 @@ if (action === 'describe') {
 if (action === 'execute') {
   (async () => {
     try {
-      const args = JSON.parse(fs.readFileSync(0, 'utf8'));
+      // Get PR context from environment variables
+      const owner = process.env.GITHUB_OWNER;
+      const repo = process.env.GITHUB_REPO;
+      const prNumber = parseInt(process.env.GITHUB_PR_NUMBER || '0');
 
-      // Validate required args
-      if (!args.owner || !args.repo || typeof args.pr_number !== 'number') {
-        throw new Error('Missing required arguments: owner, repo, pr_number');
+      if (!owner || !repo || !prNumber) {
+        throw new Error('Missing required environment variables: GITHUB_OWNER, GITHUB_REPO, GITHUB_PR_NUMBER');
       }
 
       // Runtime deps from compiled output
@@ -42,7 +40,7 @@ if (action === 'execute') {
       const config = getConfig();
       const gh = GitHubClient.fromEnv(config);
 
-      const comments = await gh.getPRComments(args.owner, args.repo, args.pr_number);
+      const comments = await gh.getPRComments(owner, repo, prNumber);
 
       console.log(JSON.stringify({
         success: true,