phase 2

Author: sayansisodiya

src/github/process-review.ts

@@ -5,10 +5,11 @@ import { CHECK_STATUS, CHECK_CONCLUSION, PRDetails, GitHubPullRequestEvent } fro
 
 export async function processReview(
     jobId: string, 
-    githubClient: GitHubClient, 
+    installationId: number, 
     payload: GitHubPullRequestEvent
   ): Promise<void> {
     const config = await getConfig();
+    const githubClient = GitHubClient.forInstallation(config, installationId);
 
     try {
       // Extract PR information
@@ -61,7 +62,7 @@ export async function processReview(
       const prDetailsContent = `Repository: ${payload.repository.full_name}, PR Number: ${prDetails.pr_number}, Commit SHA: ${prDetails.commit_sha}, PR URL: ${prDetails.pr_url}`;
 
       console.log(`Calling reviewDiff() for job ${jobId}`);
-      const reviewResult = await reviewDiff(diffContent, prDetailsContent);
+      const reviewResult = await reviewDiff(diffContent, prDetailsContent, installationId);
       console.log(`Review completed for job ${jobId}`);
 
       // Update check run with success

src/review/review-queue.ts

@@ -22,7 +22,7 @@ export class ReviewJobQueue {
     console.log(`ReviewJobQueue initialized with max queue size ${maxQueueSize} and max workers ${maxWorkers}`);
   }
 
-  enqueueReview(id: number, processReviewCb: (jobId: string) => Promise<void>): string {
+  enqueueReview(id: number, installationId: number, processReviewCb: (jobId: string) => Promise<void>): string {
     // Check if queue is at capacity
     if (this.jobs.size >= this.maxQueueSize) {
       throw new QueueFullError(`Review queue is full (max: ${this.maxQueueSize})`);
@@ -33,6 +33,7 @@ export class ReviewJobQueue {
       status: JOB_STATUS.QUEUED,
       created: Date.now(),
       id,
+      installationId,
     });
 
     // Store callback and add to waiting queue

src/review/reviewer.ts

@@ -6,7 +6,7 @@ import { Config, getConfig } from "../config.js";
 import { newThread, execute } from "../amp.js";
 
 
-export const reviewDiff = async (diffContent: string, mrDetailsContent: string) => {
+export const reviewDiff = async (diffContent: string, mrDetailsContent: string, installationId: number) => {
 
     // Get config
     const config: Config = getConfig();
@@ -42,9 +42,22 @@ export const reviewDiff = async (diffContent: string, mrDetailsContent: string)
       // Write prompt to file
       writeFileSync(promptFilePath, promptContent, 'utf8');
 
-      // Write settings to file
-      const settings = ampConfig.settings;
-      writeFileSync(settingsFilePath, JSON.stringify(settings || {}, null, 2), 'utf8');
+      // Write settings to file with installation ID
+      const settings = { ...ampConfig.settings };
+      
+      // Ensure GitHub MCP server environment exists and set installation ID
+      settings['amp.mcpServers'] = {
+        ...settings['amp.mcpServers'],
+        github: {
+          ...settings['amp.mcpServers']?.github,
+          env: {
+            ...settings['amp.mcpServers']?.github?.env,
+            GITHUB_INSTALLATION_ID: installationId.toString(),
+          }
+        }
+      };
+      
+      writeFileSync(settingsFilePath, JSON.stringify(settings, null, 2), 'utf8');
 
       const threadId = await newThread(tempDir);
       const result = await execute({

src/review/types.ts

@@ -49,6 +49,7 @@ export interface JobInfo {
   started?: number;
   completed?: number;
   id?: number;
+  installationId: number;
   result?: ReviewResult;
   error?: string;
 }

src/routes/github.ts

@@ -1,7 +1,6 @@
 import { Hono } from 'hono';
 import { v4 as uuidv4 } from 'uuid';
 import { GitHubPullRequestEvent } from '../github/types.js';
-import { GitHubClient } from '../github/client.js';
 import { QueueFullError, ReviewJobQueue } from '../review/review-queue.js';
 import { Config, getConfig } from '../config.js';
 import { processReview } from '../github/process-review.js';
@@ -62,21 +61,20 @@ async function handlePullRequestEvent(payload: GitHubPullRequestEvent) {
   const installationId = (payload as any).installation?.id;
   console.log('Installation ID from webhook:', installationId);
 
-  // Use installation-specific client
-  const client = installationId
-    ? GitHubClient.forInstallation(config, installationId)
-    : new GitHubClient(config);
-
   if (!reviewQueue) {
     throw new Error('Review queue not initialized');
   }
 
+  if (!installationId) {
+    throw new Error('Installation ID is required for review processing');
+  }
+
   // Enqueue review job
   const processReviewCallback = async (jobId: string) => {
-    await processReview(jobId, client, payload);
+    await processReview(jobId, installationId, payload);
   };
-
-  const jobId = reviewQueue.enqueueReview(payload.pull_request.number, processReviewCallback);
+  
+  const jobId = reviewQueue.enqueueReview(payload.pull_request.number, installationId, processReviewCallback);
 
   // Return immediate response
   return {

src/server.ts

@@ -89,7 +89,9 @@ app.post('/test/review', async (c) => {
 
     const prDetailsContent = `Repository: ${prDetails.repository_full_name}, PR Number: ${prDetails.pr_number}, Commit SHA: ${prDetails.commit_sha}, PR URL: ${prDetails.pr_url}`;
 
-    const result = await reviewDiff(diffContent, prDetailsContent);
+    // For testing purposes, use a dummy installation ID
+    const testInstallationId = 12345;
+    const result = await reviewDiff(diffContent, prDetailsContent, testInstallationId);
 
     return c.json({
       success: true,