diff --git a/entry.js b/entry.js index 9bdfeda..cccbf3d 100755 --- a/entry.js +++ b/entry.js @@ -40479,7 +40479,7 @@ function query({ // package.json var package_default = { name: "@pullfrog/action", - version: "0.0.103", + version: "0.0.104", type: "module", files: [ "index.js", @@ -40759,47 +40759,47 @@ var modes = [ name: "Plan", description: "Create plans, break down tasks, outline steps, analyze requirements, understand scope of work, or provide task breakdowns", prompt: `Follow these steps: -1. Create initial response comment using ${ghPullfrogMcpName}/create_issue_comment saying "I'll {summary of request}" and save the commentId +1. Create initial response comment using ${ghPullfrogMcpName}/create_working_comment saying "I'll {summary of request}" 2. If the request requires understanding the codebase structure, dependencies, or conventions, gather relevant context (read AGENTS.md if it exists, understand how to install dependencies, run tests, run builds, and make changes according to best practices). Skip this step if the prompt is trivial and self-contained. 3. Analyze the request and break it down into clear, actionable tasks 4. Consider dependencies, potential challenges, and implementation order 5. Create a structured plan with clear milestones -6. Update your comment using ${ghPullfrogMcpName}/edit_issue_comment with the commentId to present the plan in a clear, organized format -7. Continue updating the same comment as needed (never create additional comments - always use edit_issue_comment)` +6. Update your comment using ${ghPullfrogMcpName}/update_working_comment to present the plan in a clear, organized format +7. Continue updating the same comment as needed (never create additional comments - always use update_working_comment)` }, { name: "Build", description: "Implement, build, create, or develop code changes; make specific changes to files or features; execute a plan; or handle tasks with specific implementation details", prompt: `Follow these steps: -1. Create initial response comment using ${ghPullfrogMcpName}/create_issue_comment saying "I'll {summary of request}" and save the commentId +1. Create initial response comment using ${ghPullfrogMcpName}/create_working_comment saying "I'll {summary of request}" 2. If the request requires understanding the codebase structure, dependencies, or conventions, gather relevant context (read AGENTS.md if it exists, understand how to install dependencies, run tests, run builds, and make changes according to best practices). Skip this step if the prompt is trivial and self-contained. 3. Understand the requirements and any existing plan 4. Make the necessary code changes 5. Test your changes to ensure they work correctly -6. Update your comment using ${ghPullfrogMcpName}/edit_issue_comment with the commentId to share progress and results -7. Continue updating the same comment as you make progress (never create additional comments - always use edit_issue_comment)` +6. Update your comment using ${ghPullfrogMcpName}/update_working_comment to share progress and results +7. Continue updating the same comment as you make progress (never create additional comments - always use update_working_comment)` }, { name: "Review", description: "Review code, PRs, or implementations; provide feedback or suggestions; identify issues; or check code quality, style, and correctness", prompt: `Follow these steps: -1. Create initial response comment using ${ghPullfrogMcpName}/create_issue_comment saying "I'll review this" and save the commentId +1. Create initial response comment using ${ghPullfrogMcpName}/create_working_comment saying "I'll review this" 2. Get PR info with ${ghPullfrogMcpName}/get_pull_request (this automatically prepares the repository by fetching and checking out the PR branch) 3. View diff: git diff origin/...origin/ (use line numbers from this for inline comments, replace and with 'base' and 'head' from PR info) 4. Read files from the checked-out PR branch to understand the implementation -5. Update your comment using ${ghPullfrogMcpName}/edit_issue_comment with findings as you review +5. Update your comment using ${ghPullfrogMcpName}/update_working_comment with findings as you review 6. When submitting review: use the 'comments' array for ALL specific code issues - include the file path and line position from the diff 7. Only use the 'body' field for a brief summary (1-2 sentences) or for feedback that doesn't apply to a specific code location -8. Continue updating the same comment as needed (never create additional comments - always use edit_issue_comment)` +8. Continue updating the same comment as needed (never create additional comments - always use update_working_comment)` }, { name: "Prompt", description: "Fallback for tasks that don't fit other workflows, direct prompts via comments, or requests requiring general assistance without a specific workflow pattern", prompt: `Follow these steps: -1. Create an initial "Progress Comment" using ${ghPullfrogMcpName}/create_issue_comment saying "I'll {summary of request}" and save the commentId +1. Create an initial "Working Comment" using ${ghPullfrogMcpName}/create_working_comment saying "I'll {summary of request}" 2. Perform the requested task. Only take action if you have high confidence that you understand what is being asked. If you are not sure, ask for clarification. Take stock of the tools at your disposal. -3. As your work progresses, update your Progress Comment to share progress and results. Using ${ghPullfrogMcpName}/edit_issue_comment and the commentId you saved earlier. Do not create additional comments unless you are explicitly asked to do so. -4. When you finish the task, update the Progress Comment a final time to confirm completion. If you created any issues, PRs, etc, include appropriate links to it here.` +3. As your work progresses, update your Working Comment to share progress and results using ${ghPullfrogMcpName}/update_working_comment. Do not create additional comments unless you are explicitly asked to do so. +4. When you finish the task, update the Working Comment a final time with a summary of the results and links to any created issues, PRs, etc.` } ]; diff --git a/fixtures/basic.txt b/fixtures/basic.txt index 8766da1..bb7a670 100644 --- a/fixtures/basic.txt +++ b/fixtures/basic.txt @@ -1 +1 @@ -choose a random animal emoji. add a comment to https://github.com/pullfrogai/scratch/issues/21 containing 50 of that emoji. +create a comment on https://github.com/pullfrogai/scratch/issues/21 with an implementation of an mcp tool for fetching issue comments from github diff --git a/mcp-server.js b/mcp-server.js index 9976891..fa1d19a 100755 --- a/mcp-server.js +++ b/mcp-server.js @@ -101499,6 +101499,61 @@ var EditCommentTool = tool({ }; }) }); +var workingCommentId = null; +var WorkingComment = type({ + issueNumber: type.number.describe("the issue number to comment on"), + intent: type("/^I'll .+$/").describe( + "the body of the initial comment expressing your intent to handle the request. must have the form 'I'll {summary of request}'" + ) +}); +var CreateWorkingCommentTool = tool({ + name: "create_working_comment", + description: "Create an initial comment on a GitHub issue that will be updated as work progresses", + parameters: WorkingComment, + execute: contextualize(async ({ issueNumber, intent }, ctx) => { + if (workingCommentId) { + throw new Error("create_working_comment may not be called multiple times"); + } + const result = await ctx.octokit.rest.issues.createComment({ + owner: ctx.owner, + repo: ctx.name, + issue_number: issueNumber, + body: intent + }); + workingCommentId = result.data.id; + return { + success: true, + commentId: result.data.id, + url: result.data.html_url, + body: result.data.body + }; + }) +}); +var WorkingCommentUpdate = type({ + body: type.string.describe("the new comment body content") +}); +var UpdateWorkingCommentTool = tool({ + name: "update_working_comment", + description: "Update a working comment on a GitHub issue", + parameters: WorkingCommentUpdate, + execute: contextualize(async ({ body }, ctx) => { + if (!workingCommentId) { + throw new Error("create_working_comment must be called before update_working_comment"); + } + const result = await ctx.octokit.rest.issues.updateComment({ + owner: ctx.owner, + repo: ctx.name, + comment_id: workingCommentId, + body + }); + return { + success: true, + commentId: result.data.id, + url: result.data.html_url, + body: result.data.body + }; + }) +}); // mcp/issue.ts var Issue = type({ @@ -101685,6 +101740,8 @@ var server = new FastMCP({ addTools(server, [ CreateCommentTool, EditCommentTool, + CreateWorkingCommentTool, + UpdateWorkingCommentTool, IssueTool, PullRequestTool, ReviewTool, diff --git a/mcp/comment.ts b/mcp/comment.ts index 6434551..4c125d0 100644 --- a/mcp/comment.ts +++ b/mcp/comment.ts @@ -53,3 +53,69 @@ export const EditCommentTool = tool({ }; }), }); + +let workingCommentId: number | null = null; + +export const WorkingComment = type({ + issueNumber: type.number.describe("the issue number to comment on"), + intent: type("/^I'll .+$/").describe( + "the body of the initial comment expressing your intent to handle the request. must have the form 'I'll {summary of request}'" + ), +}); + +export const CreateWorkingCommentTool = tool({ + name: "create_working_comment", + description: + "Create an initial comment on a GitHub issue that will be updated as work progresses", + parameters: WorkingComment, + execute: contextualize(async ({ issueNumber, intent }, ctx) => { + if (workingCommentId) { + throw new Error("create_working_comment may not be called multiple times"); + } + + const result = await ctx.octokit.rest.issues.createComment({ + owner: ctx.owner, + repo: ctx.name, + issue_number: issueNumber, + body: intent, + }); + + workingCommentId = result.data.id; + + return { + success: true, + commentId: result.data.id, + url: result.data.html_url, + body: result.data.body, + }; + }), +}); + +export const WorkingCommentUpdate = type({ + body: type.string.describe("the new comment body content"), +}); + +export const UpdateWorkingCommentTool = tool({ + name: "update_working_comment", + description: "Update a working comment on a GitHub issue", + parameters: WorkingCommentUpdate, + execute: contextualize(async ({ body }, ctx) => { + if (!workingCommentId) { + throw new Error("create_working_comment must be called before update_working_comment"); + } + + const result = await ctx.octokit.rest.issues.updateComment({ + owner: ctx.owner, + repo: ctx.name, + comment_id: workingCommentId, + body, + }); + + return { + success: true, + commentId: result.data.id, + url: result.data.html_url, + body: result.data.body, + }; + }), +}); diff --git a/mcp/server.ts b/mcp/server.ts index 09abe3c..847ae8b 100644 --- a/mcp/server.ts +++ b/mcp/server.ts @@ -1,7 +1,12 @@ #!/usr/bin/env node // Minimal GitHub Issue Comment MCP Server import { FastMCP } from "fastmcp"; -import { CreateCommentTool, EditCommentTool } from "./comment.ts"; +import { + CreateCommentTool, + CreateWorkingCommentTool, + EditCommentTool, + UpdateWorkingCommentTool, +} from "./comment.ts"; import { IssueTool } from "./issue.ts"; import { PullRequestTool } from "./pr.ts"; import { PullRequestInfoTool } from "./prInfo.ts"; @@ -16,6 +21,8 @@ const server = new FastMCP({ addTools(server, [ CreateCommentTool, EditCommentTool, + CreateWorkingCommentTool, + UpdateWorkingCommentTool, IssueTool, PullRequestTool, ReviewTool, diff --git a/modes.ts b/modes.ts index 80034d3..4d9e8b8 100644 --- a/modes.ts +++ b/modes.ts @@ -6,49 +6,49 @@ export const modes = [ description: "Create plans, break down tasks, outline steps, analyze requirements, understand scope of work, or provide task breakdowns", prompt: `Follow these steps: -1. Create initial response comment using ${ghPullfrogMcpName}/create_issue_comment saying "I'll {summary of request}" and save the commentId +1. Create initial response comment using ${ghPullfrogMcpName}/create_working_comment saying "I'll {summary of request}" 2. If the request requires understanding the codebase structure, dependencies, or conventions, gather relevant context (read AGENTS.md if it exists, understand how to install dependencies, run tests, run builds, and make changes according to best practices). Skip this step if the prompt is trivial and self-contained. 3. Analyze the request and break it down into clear, actionable tasks 4. Consider dependencies, potential challenges, and implementation order 5. Create a structured plan with clear milestones -6. Update your comment using ${ghPullfrogMcpName}/edit_issue_comment with the commentId to present the plan in a clear, organized format -7. Continue updating the same comment as needed (never create additional comments - always use edit_issue_comment)`, +6. Update your comment using ${ghPullfrogMcpName}/update_working_comment to present the plan in a clear, organized format +7. Continue updating the same comment as needed (never create additional comments - always use update_working_comment)`, }, { name: "Build", description: "Implement, build, create, or develop code changes; make specific changes to files or features; execute a plan; or handle tasks with specific implementation details", prompt: `Follow these steps: -1. Create initial response comment using ${ghPullfrogMcpName}/create_issue_comment saying "I'll {summary of request}" and save the commentId +1. Create initial response comment using ${ghPullfrogMcpName}/create_working_comment saying "I'll {summary of request}" 2. If the request requires understanding the codebase structure, dependencies, or conventions, gather relevant context (read AGENTS.md if it exists, understand how to install dependencies, run tests, run builds, and make changes according to best practices). Skip this step if the prompt is trivial and self-contained. 3. Understand the requirements and any existing plan 4. Make the necessary code changes 5. Test your changes to ensure they work correctly -6. Update your comment using ${ghPullfrogMcpName}/edit_issue_comment with the commentId to share progress and results -7. Continue updating the same comment as you make progress (never create additional comments - always use edit_issue_comment)`, +6. Update your comment using ${ghPullfrogMcpName}/update_working_comment to share progress and results +7. Continue updating the same comment as you make progress (never create additional comments - always use update_working_comment)`, }, { name: "Review", description: "Review code, PRs, or implementations; provide feedback or suggestions; identify issues; or check code quality, style, and correctness", prompt: `Follow these steps: -1. Create initial response comment using ${ghPullfrogMcpName}/create_issue_comment saying "I'll review this" and save the commentId +1. Create initial response comment using ${ghPullfrogMcpName}/create_working_comment saying "I'll review this" 2. Get PR info with ${ghPullfrogMcpName}/get_pull_request (this automatically prepares the repository by fetching and checking out the PR branch) 3. View diff: git diff origin/...origin/ (use line numbers from this for inline comments, replace and with 'base' and 'head' from PR info) 4. Read files from the checked-out PR branch to understand the implementation -5. Update your comment using ${ghPullfrogMcpName}/edit_issue_comment with findings as you review +5. Update your comment using ${ghPullfrogMcpName}/update_working_comment with findings as you review 6. When submitting review: use the 'comments' array for ALL specific code issues - include the file path and line position from the diff 7. Only use the 'body' field for a brief summary (1-2 sentences) or for feedback that doesn't apply to a specific code location -8. Continue updating the same comment as needed (never create additional comments - always use edit_issue_comment)`, +8. Continue updating the same comment as needed (never create additional comments - always use update_working_comment)`, }, { name: "Prompt", description: "Fallback for tasks that don't fit other workflows, direct prompts via comments, or requests requiring general assistance without a specific workflow pattern", prompt: `Follow these steps: -1. Create an initial "Progress Comment" using ${ghPullfrogMcpName}/create_issue_comment saying "I'll {summary of request}" and save the commentId +1. Create an initial "Working Comment" using ${ghPullfrogMcpName}/create_working_comment saying "I'll {summary of request}" 2. Perform the requested task. Only take action if you have high confidence that you understand what is being asked. If you are not sure, ask for clarification. Take stock of the tools at your disposal. -3. As your work progresses, update your Progress Comment to share progress and results. Using ${ghPullfrogMcpName}/edit_issue_comment and the commentId you saved earlier. Do not create additional comments unless you are explicitly asked to do so. -4. When you finish the task, update the Progress Comment a final time to confirm completion. If you created any issues, PRs, etc, include appropriate links to it here.`, +3. As your work progresses, update your Working Comment to share progress and results using ${ghPullfrogMcpName}/update_working_comment. Do not create additional comments unless you are explicitly asked to do so. +4. When you finish the task, update the Working Comment a final time with a summary of the results and links to any created issues, PRs, etc.`, }, ] as const; diff --git a/package.json b/package.json index 2abbf06..a409675 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@pullfrog/action", - "version": "0.0.103", + "version": "0.0.104", "type": "module", "files": [ "index.js",