wip: revert session ids

Author: sayansisodiya

src/github/process-review.ts

@@ -63,15 +63,14 @@ 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(`Starting review session for job ${jobId}`);
-      const sessionId = `session-${jobId}`;
-      startReviewSession(sessionId);
+      startReviewSession();
 
       console.log(`Calling reviewDiff() for job ${jobId}`);
-      await reviewDiff(diffContent, prDetailsContent, installationId, sessionId);
+      await reviewDiff(diffContent, prDetailsContent, installationId);
       console.log(`Review completed for job ${jobId}`);
 
       // Collect all comments from the review session
-      const collector = endReviewSession(sessionId);
+      const collector = endReviewSession();
       console.log(`Collected ${collector.getInlineComments().length} inline comments and ${collector.getGeneralComments().length} general comments`);
 
       // Post aggregated review if there are any comments
@@ -111,8 +110,7 @@ export async function processReview(
 
       // End review session if it was started
       try {
-        const sessionId = `session-${jobId}`;
-        endReviewSession(sessionId);
+        endReviewSession();
       } catch {
         console.log('No active review session to end');
       }

src/mcp/tools/leave_comment.ts

@@ -15,13 +15,7 @@ export async function leaveGeneralComment(
 
     console.log('📝 Collecting general comment for later review');
 
-    // Get session ID from environment (passed by the review process)
-    const sessionId = process.env.REVIEW_SESSION_ID;
-    if (!sessionId) {
-      throw new Error('No REVIEW_SESSION_ID found in environment. Review session not properly initialized.');
-    }
-    
-    const collector = getCurrentCollector(sessionId);
+    const collector = getCurrentCollector();
     collector.addGeneralComment(message);
 
     return {

src/mcp/tools/leave_inline_comment.ts

@@ -18,13 +18,7 @@ export async function leaveInlineComment(
 
     console.log('📝 Collecting inline comment for later review:', { path, line });
 
-    // Get session ID from environment (passed by the review process)
-    const sessionId = process.env.REVIEW_SESSION_ID;
-    if (!sessionId) {
-      throw new Error('No REVIEW_SESSION_ID found in environment. Review session not properly initialized.');
-    }
-    
-    const collector = getCurrentCollector(sessionId);
+    const collector = getCurrentCollector();
     collector.addInlineComment(path, line, message);
 
     return {

src/review/comment-collector.ts

@@ -50,30 +50,26 @@ export class ReviewCommentCollector {
   }
 }
 
-// Global collectors keyed by session ID for concurrent reviews
-const activeCollectors = new Map<string, ReviewCommentCollector>();
+// Global collector instance for the current review session
+let currentCollector: ReviewCommentCollector | null = null;
 
-export function startReviewSession(sessionId: string): ReviewCommentCollector {
-  const collector = new ReviewCommentCollector();
-  activeCollectors.set(sessionId, collector);
-  console.log(`Started review session: ${sessionId}`);
-  return collector;
+export function startReviewSession(): ReviewCommentCollector {
+  currentCollector = new ReviewCommentCollector();
+  return currentCollector;
 }
 
-export function getCurrentCollector(sessionId: string): ReviewCommentCollector {
-  const collector = activeCollectors.get(sessionId);
-  if (!collector) {
-    throw new Error(`No active review session found for ID: ${sessionId}. Call startReviewSession() first.`);
+export function getCurrentCollector(): ReviewCommentCollector {
+  if (!currentCollector) {
+    throw new Error('No active review session. Call startReviewSession() first.');
   }
-  return collector;
+  return currentCollector;
 }
 
-export function endReviewSession(sessionId: string): ReviewCommentCollector {
-  const collector = activeCollectors.get(sessionId);
-  if (!collector) {
-    throw new Error(`No active review session found for ID: ${sessionId}.`);
+export function endReviewSession(): ReviewCommentCollector {
+  if (!currentCollector) {
+    throw new Error('No active review session to end.');
   }
-  activeCollectors.delete(sessionId);
-  console.log(`Ended review session: ${sessionId}`);
+  const collector = currentCollector;
+  currentCollector = null;
   return collector;
 }

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, installationId: number, sessionId?: string) => {
+export const reviewDiff = async (diffContent: string, mrDetailsContent: string, installationId: number) => {
 
     // Get config
     const config: Config = getConfig();
@@ -45,15 +45,14 @@ export const reviewDiff = async (diffContent: string, mrDetailsContent: string,
       // Write settings to file with installation ID
       const settings = { ...ampConfig.settings };
 
-      // Ensure GitHub MCP server environment exists and set installation ID and session ID
+      // 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(),
-            ...(sessionId && { REVIEW_SESSION_ID: sessionId }),
           }
         }
       };