add suggested fixes to inline comments, add thread url to review, refine prompt. other logic/schema cleanup

Author: sayansisodiya

config.yml

@@ -1,25 +1,19 @@
 github:
   base_url: "https://api.github.com"
   check_name: "Amp Code Review"
-  development_mode: true
-  bot_username: "amp-code-review-agent"
 
 queue:
   max_workers: 20
   max_queue_size: 100
   retry_after_seconds: 60
 
-# Diff splitting configuration
-diff_splitting:
-  max_chunk_size: 500000 # 500k characters per chunk
-  max_concurrent: 3
+
 
 server:
   port: "${PORT:-5053}"
   debug: "${DEBUG:-false}"
 
 amp:
-  timeout: "${AMP_TIMEOUT}"
   command: "npx --yes @sourcegraph/amp@latest"
   server_url: "${AMP_SERVER_URL}"
   settings:
@@ -56,39 +50,40 @@ amp:
 
     Review the diff content to identify issues. If you find any issues, leave specific inline comments for each issue found.
 
-    Always leave actionable, specific comments with suggested fixes.
-
-    Suggestions are optional snippets of code that can directly replace the full line the indicated issue is on. If provided, the suggestion should be just code-- no thought process included.
-    If there is no simple code suggestion you can provide to fix the issue succinctly, provide null as the suggestion value instead.
-    Suggestions can only be left on "new" line_type issues, not on "old" issues. For "old" issues, the suggestion should be null.
+    Suggested fixes are optional snippets of code that can directly replace the full line the indicated issue is on for an inline comment.
+    If there is no simple code suggestion you can provide to fix the issue succinctly, do not provide a suggested fix.
 
     Tools available to complete the code review process:
     __TOOL_CONTENT__
 
-    After you have completed the code review process:
+    After you have completed the code review process, leave a single general comment.
+    This comment should NOT reiterate the issues already identified in inline comments. Instead, include:
+    * A brief summary of the diff's changes; include the goal of the changes and what they affect
+    * A tour of the changes-- recommend the best tour order for reviewing the changes. Identify the best place to start the review-— the part that conveys the core and helps in understanding the rest.
+    * (Optional) Any minor or vague considerations that were not obvious enough to be left as an inline comment-- don't repeat any inline comments.
 
-    Leave a general comment summarizing the review, including:
-    * A brief summary of the changes reviewed
-    * List out critical issues and blockers that need to be addressed
-    * Any high-level feedback or suggestions
+    Keep your tone professional and concise when commenting. No emojis.
 
   tools:
     - name: leave_general_comment
-      description: Leave general comments on pull requests
+      description: Leave general review comments on pull requests
       instructions:
-        - "Use this tool to leave general comments on the pull request"
-        - "This will post your comment to the overall pull request discussion"
-        - "Use for summary comments, overall feedback, or general observations"
+        - "Use this tool to leave a general review comment on the pull request"
+        - "This will post your comment as the top level comment on a review"
         - "Required: message, owner, repo, pr_number"
-        - "Example: 'Overall the code looks good, just a few minor suggestions'"
+        - "Example: 'The changes look good, but there are a few issues that need to be addressed'"
     - name: leave_inline_comment
       description: Leave inline comments on specific lines in pull requests
       instructions:
         - "Use this tool to leave comments on specific lines of code"
         - "This will post your comment directly on the line in the diff view via PR review"
         - "Required: message, owner, repo, pr_number, path, line"
-        - "Optional: commit_sha (will be fetched from PR if not provided)"
+        - "Optional: suggested_fix - provide exact replacement code for obvious/trivial fixes only"
+        - "For suggested_fix: only include the raw code replacement, no markdown formatting or explanations"
+        - "Use suggested_fix for simple fixes like typos, missing semicolons, variable name corrections, etc."
+        - "Do NOT use suggested_fix for complex changes, architectural decisions, or anything requiring explanation"
         - "Example: Comment on line 25 of src/auth.js about missing error handling"
+        - "Example with fix: Comment on typo with suggested_fix: 'const userName = req.body.username;'"
     - name: get_pr_comments
       description: Get all comments on a pull request
       instructions:

src/config.ts

@@ -12,25 +12,19 @@ const ConfigSchema = z.object({
     base_url: z.string(),
     token: z.string().optional(),
     check_name: z.string(),
-    development_mode: z.boolean(),
-    bot_username: z.string(),
     webhook_secret: z.string().optional(),
   }),
   queue: z.object({
     max_workers: z.coerce.number(),
     max_queue_size: z.coerce.number(),
     retry_after_seconds: z.coerce.number(),
   }),
-  diff_splitting: z.object({
-    max_chunk_size: z.coerce.number(),
-    max_concurrent: z.coerce.number(),
-  }),
+
   server: z.object({
     port: z.string(),
     debug: z.string(),
   }),
   amp: z.object({
-    timeout: z.string(),
     command: z.string(),
     server_url: z.string(),
     settings: z.object({

src/github/process-review.ts

@@ -86,10 +86,16 @@ export async function processReview(
           console.log(`📝 Collected ${inlineComments.length} inline comments and ${generalComments.length} general comments`);
 
           // Create review summary from general comments
-          const reviewSummary = generalComments.length > 0
+          let reviewSummary = generalComments.length > 0
             ? generalComments.map(c => c.message).join('\n\n')
             : 'Code review completed.';
 
+          // Append Amp thread URL if available
+          if (reviewResult.threadId && config.amp.server_url) {
+            const threadUrl = `${config.amp.server_url}/threads/${reviewResult.threadId}`;
+            reviewSummary += `\n\n[View this review on Amp](${threadUrl})`;
+          }
+
           // Post aggregated review
           console.log('📋 Posting aggregated PR review...');
           await githubClient.createPRReview(
@@ -101,7 +107,9 @@ export async function processReview(
             inlineComments.map(comment => ({
               path: comment.path,
               line: comment.line,
-              body: comment.message
+              body: comment.suggested_fix
+                ? `${comment.message}\n\n\`\`\`suggestion\n${comment.suggested_fix}\n\`\`\``
+                : comment.message
             }))
           );
           console.log('✅ PR review posted successfully');

src/mcp/README.md

@@ -23,7 +23,6 @@ Leave inline comments on specific lines in pull requests.
 - `pr_number` (number, required): Pull request number
 - `path` (string, required): File path for the inline comment
 - `line` (number, required): Line number for the inline comment
-- `commit_sha` (string, optional): Commit SHA (will be fetched if not provided)
 
 ### 3. `get_pr_comments`
 Get all comments on a pull request.
@@ -108,7 +107,7 @@ The tools are designed to work together in a typical code review workflow:
 ## Development
 
 The tools are organized in the `/src/mcp/tools/` directory:
-- `leave_comment.ts` - General comment functionality
+- `leave_general_comment.ts` - General comment functionality
 - `leave_inline_comment.ts` - Inline comment functionality
 - `get_pr_comments.ts` - PR comments retrieval
 

src/mcp/comment-collector.ts

@@ -5,6 +5,7 @@ export interface CommentData {
   message: string;
   path?: string;    // Only for inline comments
   line?: number;    // Only for inline comments
+  suggested_fix?: string; // Only for inline comments
 }
 
 export class FileBasedCommentCollector {
@@ -16,12 +17,13 @@ export class FileBasedCommentCollector {
     writeFileSync(this.filePath, '', 'utf8');
   }
 
-  addInlineComment(path: string, line: number, message: string): void {
+  addInlineComment(path: string, line: number, message: string, suggested_fix?: string): void {
     const comment: CommentData = {
       type: 'inline',
       message,
       path,
-      line
+      line,
+      suggested_fix
     };
 
     this.appendComment(comment);

src/mcp/server.ts

@@ -11,7 +11,7 @@ import {
   McpError,
 } from '@modelcontextprotocol/sdk/types.js';
 import { getConfig, Config } from '../config.js';
-import { leaveGeneralComment } from './tools/leave_comment.js';
+import { leaveGeneralComment } from './tools/leave_general_comment.js';
 import { leaveInlineComment } from './tools/leave_inline_comment.js';
 import { getPRComments } from './tools/get_pr_comments.js';
 import {
@@ -78,13 +78,13 @@ class GitHubMCPServer {
           },
           {
             name: 'leave_inline_comment',
-            description: 'Leave inline comments on specific lines in pull requests',
+            description: 'Leave inline comments on specific lines in pull requests. Can optionally include suggested fixes for trivial changes.',
             inputSchema: {
               type: 'object',
               properties: {
                 message: {
                   type: 'string',
-                  description: 'The comment message',
+                  description: 'The comment message explaining the issue or feedback',
                 },
                 owner: {
                   type: 'string',
@@ -106,9 +106,9 @@ class GitHubMCPServer {
                   type: 'number',
                   description: 'Line number for the inline comment',
                 },
-                commit_sha: {
+                suggested_fix: {
                   type: 'string',
-                  description: 'Commit SHA (optional - will be fetched if not provided)',
+                  description: 'Optional code suggestion to replace the current line(s). Only provide this for obvious/trivial fixes. The suggestion should be the exact replacement code without any markdown formatting.',
                 },
               },
               required: ['message', 'owner', 'repo', 'pr_number', 'path', 'line'],

src/mcp/tools/leave_comment.ts src/mcp/tools/leave_general_comment.tssrc/mcp/tools/leave_comment.ts renamed to src/mcp/tools/leave_general_comment.ts

@@ -4,20 +4,20 @@ export interface LeaveInlineCommentArgs {
   message: string;
   path: string;
   line: number;
-  commit_sha?: string;
+  suggested_fix?: string;
 }
 
 export async function leaveInlineComment(
   args: LeaveInlineCommentArgs
 ): Promise<{ success: boolean; error?: string }> {
   try {
-    const { message, path, line } = args;
+    const { message, path, line, suggested_fix } = args;
 
-    console.log('📝 Collecting inline comment for later review:', { path, line });
+    console.log('📝 Collecting inline comment for later review:', { path, line, hasSuggestion: !!suggested_fix });
 
     const collector = getCollector();
     if (collector) {
-      collector.addInlineComment(path, line, message);
+      collector.addInlineComment(path, line, message, suggested_fix);
     } else {
       console.log('⚠️ No collector available, comment will be skipped');
     }

src/mcp/tools/leave_inline_comment.ts

@@ -1,5 +1,5 @@
 import { z } from 'zod';
-import { LeaveGeneralCommentArgs } from './tools/leave_comment.js';
+import { LeaveGeneralCommentArgs } from './tools/leave_general_comment.js';
 import { LeaveInlineCommentArgs } from './tools/leave_inline_comment.js';
 import { GetPRCommentsArgs } from './tools/get_pr_comments.js';
 
@@ -19,7 +19,7 @@ const LeaveInlineCommentArgsSchema = z.object({
   message: z.string(),
   path: z.string(),
   line: z.number(),
-  commit_sha: z.string().optional(),
+  suggested_fix: z.string().optional(),
 });
 
 

src/mcp/validation.ts

@@ -8,7 +8,7 @@ import { newThread, execute } from "../amp.js";
 
 export const reviewDiff = async (
   diffContent: string, 
-  mrDetailsContent: string, 
+  prDetailsContent: string, 
   installationId: number
 ) => {
 
@@ -26,7 +26,7 @@ export const reviewDiff = async (
       const ampConfig = config.amp;
 
       let promptContent = ampConfig.prompt_template
-        .replace(/__PR_DETAILS_CONTENT__/g, mrDetailsContent)
+        .replace(/__PR_DETAILS_CONTENT__/g, prDetailsContent)
         .replace(/__DIFF_CONTENT__/g, diffContent);
 
       // Add tools content