phase 3

Author: sayansisodiya

src/mcp/http-server.ts

@@ -11,14 +11,13 @@ import {
   McpError,
 } from '@modelcontextprotocol/sdk/types.js';
 import { getConfig, Config } from '../config.js';
-import { GitHubClient } from '../github/client.js';
 import { leaveGeneralComment } from './tools/leave_comment.js';
 import { leaveInlineComment } from './tools/leave_inline_comment.js';
 import { createCheckRun } from './tools/create_check_run.js';
 import { getPRInfo } from './tools/get_pr_info.js';
 import { triggerReview } from './tools/trigger_review.js';
 import { getPRComments } from './tools/get_pr_comments.js';
-import { 
+import {
   validateLeaveGeneralCommentArgs,
   validateLeaveInlineCommentArgs,
   validateCreateCheckRunArgs,
@@ -30,7 +29,6 @@ import {
 class GitHubMCPServer {
   private server: Server;
   private config: Config;
-  private githubClient: GitHubClient;
 
   constructor() {
     console.log('🚀 Initializing GitHub MCP Server...');
@@ -47,16 +45,9 @@ class GitHubMCPServer {
     );
 
     this.config = getConfig();
-    // Initialize with a default client, will be updated in run()
-    this.githubClient = new GitHubClient(this.config);
     this.setupToolHandlers();
   }
 
-  private async setupGitHubClient() {
-    console.log('🔑 Initializing GitHub client with static token');
-    this.githubClient = new GitHubClient(this.config);
-  }
-
   private setupToolHandlers(): void {
     console.log('🔨 Setting up tool handlers...');
     this.server.setRequestHandler(ListToolsRequestSchema, async () => {
@@ -268,8 +259,7 @@ class GitHubMCPServer {
             const validatedArgs = validateLeaveGeneralCommentArgs(args);
             const result = await leaveGeneralComment(
               validatedArgs,
-              this.config,
-              this.githubClient
+              this.config
             );
             console.log(`✅ leave_general_comment completed in ${Date.now() - startTime}ms`);
             return {
@@ -287,8 +277,7 @@ class GitHubMCPServer {
             const validatedArgs = validateLeaveInlineCommentArgs(args);
             const result = await leaveInlineComment(
               validatedArgs,
-              this.config,
-              this.githubClient
+              this.config
             );
             console.log(`✅ leave_inline_comment completed in ${Date.now() - startTime}ms`);
             return {
@@ -306,8 +295,7 @@ class GitHubMCPServer {
             const validatedArgs = validateCreateCheckRunArgs(args);
             const result = await createCheckRun(
               validatedArgs,
-              this.config,
-              this.githubClient
+              this.config
             );
             console.log(`✅ create_check_run completed in ${Date.now() - startTime}ms`);
             return {
@@ -325,8 +313,7 @@ class GitHubMCPServer {
             const validatedArgs = validateGetPRInfoArgs(args);
             const result = await getPRInfo(
               validatedArgs,
-              this.config,
-              this.githubClient
+              this.config
             );
             console.log(`✅ get_pr_info completed in ${Date.now() - startTime}ms`);
             return {
@@ -344,8 +331,7 @@ class GitHubMCPServer {
             const validatedArgs = validateTriggerReviewArgs(args);
             const result = await triggerReview(
               validatedArgs,
-              this.config,
-              this.githubClient
+              this.config
             );
             console.log(`✅ trigger_review completed in ${Date.now() - startTime}ms`);
             return {
@@ -363,8 +349,7 @@ class GitHubMCPServer {
             const validatedArgs = validateGetPRCommentsArgs(args);
             const result = await getPRComments(
               validatedArgs,
-              this.config,
-              this.githubClient
+              this.config
             );
             console.log(`✅ get_pr_comments completed in ${Date.now() - startTime}ms`);
             return {
@@ -397,9 +382,6 @@ class GitHubMCPServer {
 
   async run(): Promise<void> {
     console.log('🔌 Starting MCP server connection...');
-    // Setup the proper GitHub client before starting
-    await this.setupGitHubClient();
-    
     console.log('📡 Creating stdio transport...');
     const transport = new StdioServerTransport();
     console.log('🔗 Connecting to transport...');

src/mcp/server.ts

@@ -14,12 +14,19 @@ export interface CreateCheckRunArgs {
 
 export async function createCheckRun(
   args: CreateCheckRunArgs,
-  config: Config,
-  githubClient: GitHubClient
+  config: Config
 ): Promise<{ success: boolean; check_run_id?: number; error?: string }> {
   try {
     const { owner, repo, commit_sha, status, conclusion, title, summary, details_url } = args;
 
+    // Get installation ID from environment
+    const installationId = parseInt(process.env.GITHUB_INSTALLATION_ID || '0');
+    if (!installationId) {
+      throw new Error('GITHUB_INSTALLATION_ID environment variable is required');
+    }
+
+    const githubClient = GitHubClient.forInstallation(config, installationId);
+
     const checkOptions: {
       name: string;
       status: 'queued' | 'in_progress' | 'completed';

src/mcp/tools/create_check_run.ts

@@ -9,8 +9,7 @@ export interface GetPRCommentsArgs {
 
 export async function getPRComments(
   args: GetPRCommentsArgs,
-  config: Config,
-  githubClient: GitHubClient
+  config: Config
 ): Promise<{ 
   success: boolean; 
   comments?: unknown[]; 
@@ -20,6 +19,14 @@ export async function getPRComments(
   try {
     const { owner, repo, pr_number } = args;
 
+    // Get installation ID from environment
+    const installationId = parseInt(process.env.GITHUB_INSTALLATION_ID || '0');
+    if (!installationId) {
+      throw new Error('GITHUB_INSTALLATION_ID environment variable is required');
+    }
+
+    const githubClient = GitHubClient.forInstallation(config, installationId);
+
     const comments = await githubClient.getPRComments(owner, repo, pr_number);
 
     return {

src/mcp/tools/get_pr_comments.ts

@@ -10,8 +10,7 @@ export interface GetPRInfoArgs {
 
 export async function getPRInfo(
   args: GetPRInfoArgs,
-  config: Config,
-  githubClient: GitHubClient
+  config: Config
 ): Promise<{ 
   success: boolean; 
   pr_info?: unknown; 
@@ -22,6 +21,14 @@ export async function getPRInfo(
   try {
     const { owner, repo, pr_number, include_diff = false } = args;
 
+    // Get installation ID from environment
+    const installationId = parseInt(process.env.GITHUB_INSTALLATION_ID || '0');
+    if (!installationId) {
+      throw new Error('GITHUB_INSTALLATION_ID environment variable is required');
+    }
+
+    const githubClient = GitHubClient.forInstallation(config, installationId);
+
     // Get PR info
     const prInfo = await githubClient.getPRInfo(owner, repo, pr_number);
 

src/mcp/tools/get_pr_info.ts

@@ -10,12 +10,18 @@ export interface LeaveGeneralCommentArgs {
 
 export async function leaveGeneralComment(
   args: LeaveGeneralCommentArgs,
-  config: Config,
-  githubClient: GitHubClient
+  config: Config
 ): Promise<{ success: boolean; comment_id?: number; error?: string }> {
   try {
     const { message, owner, repo, pr_number } = args;
 
+    // Get installation ID from environment
+    const installationId = parseInt(process.env.GITHUB_INSTALLATION_ID || '0');
+    if (!installationId) {
+      throw new Error('GITHUB_INSTALLATION_ID environment variable is required');
+    }
+
+    const githubClient = GitHubClient.forInstallation(config, installationId);
     const response = await githubClient.createPRComment(owner, repo, pr_number, message);
 
     return {

src/mcp/tools/leave_comment.ts

@@ -13,12 +13,19 @@ export interface LeaveInlineCommentArgs {
 
 export async function leaveInlineComment(
   args: LeaveInlineCommentArgs,
-  config: Config,
-  githubClient: GitHubClient
+  config: Config
 ): Promise<{ success: boolean; review_id?: number; error?: string }> {
   try {
     const { message, owner, repo, pr_number, path, line, commit_sha } = args;
 
+    // Get installation ID from environment
+    const installationId = parseInt(process.env.GITHUB_INSTALLATION_ID || '0');
+    if (!installationId) {
+      throw new Error('GITHUB_INSTALLATION_ID environment variable is required');
+    }
+
+    const githubClient = GitHubClient.forInstallation(config, installationId);
+
     console.log('🎯 Creating inline comment via PR review:', { path, line });
 
     // Get commit SHA if not provided

src/mcp/tools/leave_inline_comment.ts

@@ -11,12 +11,19 @@ export interface TriggerReviewArgs {
 
 export async function triggerReview(
   args: TriggerReviewArgs,
-  config: Config,
-  githubClient: GitHubClient
+  config: Config
 ): Promise<{ success: boolean; review_id?: string; check_run_id?: number; error?: string }> {
   try {
     const { owner, repo, pr_number, commit_sha } = args;
 
+    // Get installation ID from environment
+    const installationId = parseInt(process.env.GITHUB_INSTALLATION_ID || '0');
+    if (!installationId) {
+      throw new Error('GITHUB_INSTALLATION_ID environment variable is required');
+    }
+
+    const githubClient = GitHubClient.forInstallation(config, installationId);
+
     // Get PR info to get the latest commit if not provided
     const prInfo = await githubClient.getPRInfo(owner, repo, pr_number);
     const targetCommitSha = commit_sha || prInfo.head.sha;