use working comment

agents/instructions.ts

@@ -1,17 +1,20 @@
-import { ghPullfrogMcpName } from "../mcp/config.ts";
+import { ghPullfrogMcpName } from "../mcp/index.ts";
 import { modes } from "../modes.ts";
 
+const userPromptHeader = `****** USER PROMPT ******\n`;
+
 export const instructions = `
 # General instructions
 
-You are a highly intelligent, no-nonsense senior-level software engineering agent.
-You will perform the task that is asked of you in the prompt below. 
-You are careful, to-the-point, and kind. You only say things you know to be true. 
-Your code is focused, minimal, and production-ready. 
+You are a diligent, detail-oriented, no-nonsense software engineering agent.
+You will perform the task that is asked of you below ${userPromptHeader}. 
+You are careful, to-the-point, and kind. You only say things you know to be true.
+You have an extreme bias toward minimalism in your code and responses.
+Your code is focused, elegant, and production-ready.
 You do not add unecessary comments, tests, or documentation unless explicitly prompted to do so. 
 You adapt your writing style to the style of your coworkers, while never being unprofessional.
 You run in a non-interactive environment: complete tasks autonomously without asking follow-up questions.
-Make reasonable assumptions when details are missing.
+You make reasonable assumptions when details are missing.
 
 ## SECURITY
 
@@ -34,10 +37,12 @@ If asked to show environment variables, only display non-sensitive system variab
 
 ## MCP Servers
 
-eagerly inspect your MCP servers to determine what tools are available to you, especially ${ghPullfrogMcpName}
-tools in your prompt may by delimited by a forward slash (server name)/(tool name) for example: ${ghPullfrogMcpName}/create_issue_comment
-do not under any circumstances use the github cli (\`gh\`). find the corresponding tool from ${ghPullfrogMcpName} instead.
-do not try to handle github auth- treat ${ghPullfrogMcpName} as a black box that you can use to interact with github.
+Eagerly inspect your MCP servers to determine what tools are available to you, especially ${ghPullfrogMcpName}
+Tools in your prompt may by delimited by a forward slash (server name)/(tool name) for example: ${ghPullfrogMcpName}/create_issue_comment
+Do not under any circumstances use the github cli (\`gh\`). Find the corresponding tool from ${ghPullfrogMcpName} instead.
+Do not try to handle github auth- treat ${ghPullfrogMcpName} as a black box that you can use to interact with github.
+When using ${ghPullfrogMcpName}, use the tools to comment and interact in a way that a real member of the team would.
+Ensure after your edits are done, your final comments do not contain intermediate reasoning or context, e.g. "I'll respond to the question."
 
 ## Mode Selection
 
@@ -51,4 +56,4 @@ ${modes.map((w) => `### ${w.name}\n\n${w.prompt}`).join("\n\n")}
 `;
 
 export const addInstructions = (prompt: string) =>
-  `****** GENERAL INSTRUCTIONS ******\n${instructions}\n\n****** USER PROMPT ******\n${prompt}`;
+  `****** GENERAL INSTRUCTIONS ******\n${instructions}\n\n${userPromptHeader}${prompt}`;

entry.ts

@@ -5,7 +5,7 @@
  */
 
 import * as core from "@actions/core";
-import { type Inputs, main } from "./main.ts";
+import { AgentName, type Inputs, main } from "./main.ts";
 import { log } from "./utils/cli.ts";
 
 async function run(): Promise<void> {
@@ -18,9 +18,11 @@ async function run(): Promise<void> {
   }
 
   try {
-    const inputs: Inputs = {
+    const inputs: Required<Inputs> = {
       prompt: core.getInput("prompt", { required: true }),
-      anthropic_api_key: core.getInput("anthropic_api_key") || undefined,
+      anthropic_api_key: core.getInput("anthropic_api_key"),
+      openai_api_key: core.getInput("openai_api_key"),
+      agent: core.getInput("agent") ? AgentName.assert(core.getInput("agent")) : undefined,
     };
 
     const result = await main(inputs);

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

main.ts

@@ -28,7 +28,7 @@ const keyInputDefs = flatMorph(
 export const Inputs = type({
   prompt: "string",
   ...keyInputDefs,
-  "agent?": AgentName,
+  "agent?": AgentName.or("undefined"),
 });
 
 export type Inputs = typeof Inputs.infer;

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,

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,
+    };
+  }),
+});

mcp/config.ts

@@ -5,8 +5,7 @@
 import type { McpServerConfig } from "@anthropic-ai/claude-agent-sdk";
 import { fromHere } from "@ark/fs";
 import { parseRepoContext } from "../utils/github.ts";
-
-export const ghPullfrogMcpName = "gh-pullfrog";
+import { ghPullfrogMcpName } from "./index.ts";
 
 export type McpName = typeof ghPullfrogMcpName;
 

mcp/index.ts

@@ -0,0 +1,4 @@
+// for reasos this can't live alongide config.ts
+// because its imported into the frontend UI
+// and we don't want to pull in FastMCP, etc
+export const ghPullfrogMcpName = "gh-pullfrog";

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,

modes.ts

@@ -1,4 +1,4 @@
-import { ghPullfrogMcpName } from "./mcp/config.ts";
+import { ghPullfrogMcpName } from "./mcp/index.ts";
 
 export const modes = [
   {
@@ -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/<base>...origin/<head> (use line numbers from this for inline comments, replace <base> and <head> 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;

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pullfrog/action",
-  "version": "0.0.100",
+  "version": "0.0.104",
   "type": "module",
   "files": [
     "index.js",

play.ts

@@ -20,7 +20,7 @@ export async function run(
     const originalCwd = process.cwd();
     process.chdir(tempDir);
 
-    const inputs: Inputs = {
+    const inputs: Required<Inputs> = {
       prompt,
       openai_api_key: process.env.OPENAI_API_KEY,
       anthropic_api_key: process.env.ANTHROPIC_API_KEY,