Tweak instructions.ts

.github/workflows/pullfrog.yml

@@ -0,0 +1,42 @@
+name: Pullfrog
+on:
+  workflow_dispatch:
+    inputs:
+      prompt:
+        type: string
+        description: 'Agent prompt'
+  workflow_call:
+    inputs:
+      prompt:
+        description: 'Agent prompt'
+        type: string
+
+permissions:
+  id-token: write
+  contents: read
+
+jobs:
+  pullfrog:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 1
+
+      # optionally, setup your repo here
+      # the agent can figure this out itself, but pre-setup is more efficient
+      # - uses: actions/setup-node@v6
+
+      - name: Run agent
+        uses: pullfrog/action@v0
+        with:
+          prompt: ${{ github.event.inputs.prompt }}
+
+          # feel free to comment out any you won't use
+          anthropic_api_key: ${{ secrets.ANTHROPIC_API_KEY }}
+          openai_api_key: ${{ secrets.OPENAI_API_KEY }}
+          google_api_key: ${{ secrets.GOOGLE_API_KEY }}
+          gemini_api_key: ${{ secrets.GEMINI_API_KEY }}
+          cursor_api_key: ${{ secrets.CURSOR_API_KEY }}
+          

CLAUDE-ACTION.md

@@ -1,299 +0,0 @@
-# Claude Code Action Architecture & Flow
-
-This document provides a comprehensive overview of how the official (Anthropic) Claude Code Action works, from token exchange through post-run cleanup.
-
-## Overview
-
-The Claude Code Action is a sophisticated GitHub automation platform that enables Claude to interact with GitHub repositories through secure token exchange, intelligent mode detection, and comprehensive GitHub API integration.
-
-## High-Level Architecture
-
-```mermaid
-graph TD
-    Start([GitHub Action Triggered]) --> Setup[Setup Environment<br/>- Install Bun<br/>- Install Dependencies]
-    
-    Setup --> ParseContext[Parse GitHub Context<br/>- Extract event data<br/>- Parse inputs]
-    
-    ParseContext --> ModeDetection{Mode Detection}
-    
-    ModeDetection -->|Has explicit prompt| AgentMode[AGENT MODE<br/>Direct automation]
-    ModeDetection -->|@claude mention/assignment/label| TagMode[TAG MODE<br/>Interactive response]
-    ModeDetection -->|No trigger| DefaultAgent[Default to Agent<br/>(won't trigger)]
-    
-    %% Token Exchange Branch
-    AgentMode --> TokenExchange[Token Exchange Process]
-    TagMode --> TokenExchange
-    TokenExchange --> TokenMethod{Token Method}
-    
-    TokenMethod -->|Custom token provided| UseCustom[Use Custom GitHub Token]
-    TokenMethod -->|No custom token| OIDC[Generate OIDC Token<br/>core.getIDToken()]
-    
-    OIDC --> Exchange[Exchange OIDC for App Token<br/>api.anthropic.com/api/github/github-app-token-exchange]
-    Exchange --> CreateOctokit[Create Authenticated Octokit Client<br/>REST + GraphQL]
-    UseCustom --> CreateOctokit
-    
-    %% Permission Checks
-    CreateOctokit --> PermCheck[Check Write Permissions<br/>Only for entity contexts]
-    PermCheck -->|No permissions| PermFail[❌ Exit: No write access]
-    PermCheck -->|Has permissions| TriggerCheck{Check Trigger Conditions}
-    
-    %% Trigger Validation
-    TriggerCheck -->|Agent Mode| AgentTrigger{Has explicit prompt?}
-    TriggerCheck -->|Tag Mode| TagTrigger{Contains @claude mention<br/>or assignment/label?}
-    
-    AgentTrigger -->|No prompt| NoTrigger[❌ Skip: No trigger found]
-    AgentTrigger -->|Has prompt| PrepareAgent[Prepare Agent Mode]
-    TagTrigger -->|No mention| NoTrigger
-    TagTrigger -->|Has mention| PrepareTag[Prepare Tag Mode]
-    
-    %% Mode-Specific Preparation
-    PrepareAgent --> AgentPrep[Agent Mode Preparation<br/>- Create prompt file<br/>- Setup MCP servers<br/>- No tracking comment]
-    PrepareTag --> TagPrep[Tag Mode Preparation<br/>- Create tracking comment<br/>- Setup branches<br/>- Fetch GitHub data<br/>- Setup MCP servers]
-    
-    %% Data Fetching (Tag Mode)
-    TagPrep --> DataFetch[Fetch GitHub Data<br/>GraphQL + REST API]
-    DataFetch --> FetchWhat{What to fetch?}
-    
-    FetchWhat -->|Pull Request| PRData[PR Data:<br/>- Comments & reviews<br/>- Changed files + SHAs<br/>- Commit history<br/>- Author info]
-    FetchWhat -->|Issue| IssueData[Issue Data:<br/>- Comments<br/>- Issue details<br/>- Author info]
-    
-    PRData --> ProcessImages[Process Images<br/>Download & convert to base64]
-    IssueData --> ProcessImages
-    ProcessImages --> SetupBranch[Setup Branch<br/>- Create Claude branch<br/>- Configure git auth]
-    
-    %% MCP Server Setup
-    AgentPrep --> MCPSetup[Setup MCP Servers]
-    SetupBranch --> MCPSetup
-    
-    MCPSetup --> MCPServers{MCP Servers}
-    MCPServers --> GitHubActions[GitHub Actions Server<br/>- Workflow data<br/>- CI results]
-    MCPServers --> GitHubComments[GitHub Comment Server<br/>- Comment operations]
-    MCPServers --> GitHubFiles[GitHub File Ops Server<br/>- File operations<br/>- Branch management]
-    MCPServers --> GitHubInline[GitHub Inline Comment Server<br/>- PR review comments]
-    
-    GitHubActions --> PromptGen[Generate Prompt]
-    GitHubComments --> PromptGen
-    GitHubFiles --> PromptGen
-    GitHubInline --> PromptGen
-    
-    %% Prompt Generation
-    PromptGen --> PromptType{Prompt Type}
-    PromptType -->|Agent Mode| AgentPrompt[Agent Prompt:<br/>- Direct user prompt<br/>- Minimal context]
-    PromptType -->|Tag Mode| TagPrompt[Tag Prompt:<br/>- Rich GitHub context<br/>- PR/Issue details<br/>- Changed files<br/>- Comments & reviews<br/>- Commit instructions]
-    
-    AgentPrompt --> ClaudeRun[Run Claude Code]
-    TagPrompt --> ClaudeRun
-    
-    %% Claude Execution
-    ClaudeRun --> ClaudeExec[Claude Code Execution<br/>base-action/src/index.ts]
-    ClaudeExec --> ClaudeArgs[Prepare Claude Args<br/>- Prompt file path<br/>- Custom claude_args<br/>- Output format: stream-json]
-    
-    ClaudeArgs --> ClaudeProvider{Provider}
-    ClaudeProvider -->|Default| AnthropicAPI[Anthropic API<br/>ANTHROPIC_API_KEY]
-    ClaudeProvider -->|Bedrock| AWSBedrock[AWS Bedrock<br/>OIDC + AWS credentials]
-    ClaudeProvider -->|Vertex| GCPVertex[GCP Vertex AI<br/>OIDC + GCP credentials]
-    
-    AnthropicAPI --> ClaudeProcess[Spawn Claude Process<br/>- Named pipe for input<br/>- Stream JSON output]
-    AWSBedrock --> ClaudeProcess
-    GCPVertex --> ClaudeProcess
-    
-    ClaudeProcess --> ClaudeTools[Claude Tool Usage<br/>- MCP tools<br/>- File operations<br/>- GitHub API calls<br/>- Bash commands]
-    
-    ClaudeTools --> ClaudeOutput[Claude Output Processing<br/>- Capture execution log<br/>- Parse JSON stream<br/>- Extract metrics]
-    
-    %% Post-Run Actions
-    ClaudeOutput --> PostRun{Post-Run Actions}
-    
-    PostRun -->|Success| Success[✅ Success Path]
-    PostRun -->|Failure| Failure[❌ Failure Path]
-    
-    Success --> UpdateComment[Update Tracking Comment<br/>- Job run link<br/>- Branch link<br/>- PR link (if created)<br/>- Execution metrics]
-    Failure --> UpdateComment
-    
-    UpdateComment --> BranchCleanup[Branch Cleanup<br/>- Check for changes<br/>- Delete empty branches<br/>- Keep branches with commits]
-    
-    BranchCleanup --> FormatReport[Format Execution Report<br/>- Parse conversation turns<br/>- Format tool usage<br/>- Add to GitHub step summary]
-    
-    FormatReport --> RevokeToken[Revoke App Token<br/>DELETE /installation/token]
-    
-    RevokeToken --> End([Action Complete])
-```
-
-## Key Components
-
-### 1. Token Exchange Process
-
-The action uses a secure OIDC token exchange system:
-
-1. **OIDC Token Generation**: `core.getIDToken("claude-code-github-action")`
-2. **Token Exchange**: POST to `https://api.anthropic.com/api/github/github-app-token-exchange`
-3. **Authentication**: Creates authenticated Octokit clients for GitHub API access
-
-**Security Benefits:**
-- Repository-scoped access
-- Time-limited tokens
-- Permission-limited (only configured GitHub App permissions)
-- Automatic token masking in logs
-
-### 2. Mode Detection
-
-The action automatically detects the appropriate execution mode:
-
-#### **Agent Mode**
-- **Trigger**: Explicit `prompt` input provided
-- **Use Case**: Direct automation, custom workflows
-- **Behavior**: Minimal context, direct execution
-- **Tracking**: No tracking comments
-
-#### **Tag Mode**  
-- **Trigger**: @claude mentions, issue assignments, or labels
-- **Use Case**: Interactive GitHub responses
-- **Behavior**: Rich context, comprehensive GitHub data
-- **Tracking**: Creates and updates tracking comments
-
-### 3. Data Fetching (Tag Mode)
-
-When in Tag Mode, the action fetches comprehensive GitHub context:
-
-#### **Pull Request Data:**
-- Comments and reviews (including inline comments)
-- Changed files with SHAs
-- Commit history and metadata
-- Author information
-- File diff data
-
-#### **Issue Data:**
-- Issue details and metadata  
-- All comments
-- Author information
-- Labels and assignments
-
-#### **Image Processing:**
-- Downloads images from GitHub
-- Converts to base64 for Claude
-- Maps original URLs to processed content
-
-### 4. MCP Server Integration
-
-The action sets up multiple MCP (Model Context Protocol) servers to provide Claude with GitHub capabilities:
-
-#### **GitHub Actions Server**
-- Access to workflow runs and CI data
-- Build status and test results
-- Artifact information
-
-#### **GitHub Comment Server**
-- Comment creation and updates
-- Issue and PR comment management
-
-#### **GitHub File Operations Server**
-- File reading and writing
-- Branch creation and management
-- Commit operations
-
-#### **GitHub Inline Comment Server**
-- PR review comment operations
-- Line-specific feedback
-
-### 5. Prompt Generation
-
-The action generates context-rich prompts based on the detected mode:
-
-#### **Agent Mode Prompts:**
-- Direct user prompt
-- Minimal GitHub context
-- Focused on specific task
-
-#### **Tag Mode Prompts:**
-- Comprehensive GitHub context
-- PR/Issue details and history
-- Changed files and diffs
-- Comment threads and reviews
-- Commit instructions and guidelines
-
-### 6. Claude Execution
-
-The action runs Claude Code through multiple provider options:
-
-#### **Provider Support:**
-- **Anthropic API** (default): Direct API access with API key
-- **AWS Bedrock**: OIDC authentication with AWS credentials
-- **GCP Vertex AI**: OIDC authentication with GCP credentials
-
-#### **Execution Process:**
-1. **Named Pipe Setup**: Creates pipe for prompt input
-2. **Process Spawning**: Spawns Claude Code process
-3. **Stream Processing**: Captures JSON stream output
-4. **Tool Integration**: Enables MCP tools and GitHub operations
-
-### 7. Post-Run Actions
-
-After Claude execution, the action performs comprehensive cleanup and reporting:
-
-#### **Comment Updates:**
-- Updates tracking comments with results
-- Adds job run links and execution metrics
-- Includes branch and PR links when created
-
-#### **Branch Management:**
-- Checks for actual changes in Claude branches
-- Deletes empty branches to avoid clutter
-- Preserves branches with meaningful commits
-
-#### **Report Generation:**
-- Parses execution logs and conversation turns
-- Formats tool usage and results
-- Adds formatted report to GitHub step summary
-
-#### **Security Cleanup:**
-- Revokes GitHub App installation token
-- Cleans up temporary files and processes
-
-## Security Considerations
-
-### **Access Control:**
-- Repository-scoped permissions only
-- Write access validation for actors
-- Bot user controls and allowlists
-
-### **Token Management:**
-- Short-lived installation tokens
-- Automatic token revocation after use
-- Secure OIDC-based exchange
-
-### **Permission Boundaries:**
-- Limited to configured GitHub App permissions
-- No cross-repository access
-- Scoped to specific repository operations
-
-## Integration Points
-
-### **With Pullfrog:**
-The Claude Code Action can be integrated with Pullfrog's workflow system, providing:
-- Standardized agent interaction patterns
-- Consistent GitHub integration
-- Reusable authentication flows
-- Common MCP server infrastructure
-
-### **With GitHub:**
-- Native GitHub Actions integration
-- Comprehensive API coverage (REST + GraphQL)
-- Proper webhook handling
-- Standard GitHub UI integration
-
-## Development Notes
-
-### **Key Files:**
-- `src/entrypoints/prepare.ts`: Main preparation logic
-- `src/modes/`: Mode detection and handling
-- `src/github/token.ts`: OIDC token exchange
-- `src/mcp/`: MCP server implementations
-- `base-action/`: Core Claude Code execution
-
-### **Testing:**
-- Unit tests for individual components
-- Integration tests for full workflows
-- Local testing with `act` tool
-- Comprehensive fixture support
-
-This architecture provides a robust, secure, and extensible foundation for Claude-GitHub integration while maintaining clear separation of concerns and comprehensive error handling.

README.md

@@ -1,21 +1,141 @@
-# Pullfrog Action
+<p align="center">
+  
+  <h1 align="center">
+    <picture>
+      <source media="(prefers-color-scheme: dark)" srcset="https://pullfrog.ai/frog-white-200px.png">
+      <img src="https://pullfrog.ai/frog-green-200px.png" width="25px" align="center" alt="Pullfrog logo" />
+    </picture><br />
+    Pullfrog
+  </h1>
+  <p align="center">
+    Bring your favorite coding agent into GitHub
+  </p>
+</p>
 
-GitHub Action for running Claude Code and other agents via Pullfrog.
+<br/>
 
-> **📖 Claude Code Action Architecture**: For a detailed technical overview of how the Claude Code Action works (token exchange, modes, data fetching, execution flow), see [CLAUDE-ACTION.md](./CLAUDE-ACTION.md).
+## What is Pullfrog?
 
-## Quick Start
+Pullfrog is a GitHub bot that brings the full power of your favorite coding agents into GitHub. It's open source and powered by GitHub Actions. 
 
-```bash
-# Install dependencies
-pnpm install
+<a href="https://github.com/apps/pullfrog/installations/new">
+  <img src="https://pullfrog.ai/add-to-github.png" alt="Add to GitHub" width="150px" />
+</a>
+
+<br />
+
+Once added, you can start triggering agent runs.
+
+- **Tag `@pullfrog`** — Tag `@pullfrog` in a comment anywhere in your repo. It will pull in any relevant context using the action's internal MCP server and perform the appropriate task.
+- **Prompt from the web** — Trigger arbitrary tasks from the Pullfrog dashboard
+- **Automated triggers** — Configure Pullfrog to trigger agent runs in response to specific events. Each of these triggers can be associated with custom prompt instructions. 
+  - issue created
+  - issue labeled
+  - PR created
+  - PR review created 
+  - PR review requested
+  - and more...
+
+Pullfrog is the bridge between GitHub and your preferred coding agents and GitHub. Use it for:
+ 
+- **🤖 Coding tasks** — Tell `@pullfrog` to implement something and it'll spin up a PR. If CI fails, it'll read the logs and attempt a fix automatically. It'll automatically address any PR reviews too.
+- **🔍 PR review** — Coding agents are great at reviewing PRs. Using the "PR created" trigger, you can configure Pullfrog to auto-review new PRs.
+- **🤙 Issue management** — Via the "issue created" trigger, Pullfrog can automatically respond to common questions, create implementation plans, and link to related issues/PRs. Or (if you're feeling lucky) you can prompt it to immediately attempt a PR addressing new issues.
+- **Literally whatever** — Want to have the agent automatically add docs to all new PRs? Cut a new release with agent-written notes on every commit to `main`? Pullfrog lets you do it.
+
+<!-- Features
+- **Agent-agnostic** — Switch between agents with the click of a radio button.
+- ** -->
+
+## Get started
+
+Install the Pullfrog GitHub App on your personal or organization account. During installation you can choose to limit access to a specific repo or repos. After installation, you'll be redirected to the Pullfrog dashboard where you'll see an onboarding flow. This flow will create your `pullfrog.yml` workflow and prompt you to set up API keys. Once you finish those steps (2 minutes) you're ready to rock.
+
+[Add to GitHub ➜](https://github.com/apps/pullfrog/installations/new)
+
+<details>
+<summary><strong>Manual setup instructions</strong></summary>
+
+You can also use the `pullfrog/action` Action without a GitHub App installation. This is more time-consuming to set up, and it places limitations on the actions your Agent will be capable of performing.
+
+To manually set up the Pullfrog action, you need to set up two workflow files in your repository: `pullfrog.yml` (the execution logic) and `triggers.yml` (the event triggers).
+
+#### 1. Create `pullfrog.yml`
+
+Create a file at `.github/workflows/pullfrog.yml`. This is a reusable workflow that runs the Pullfrog action.
+
+```yaml
+name: Pullfrog
+on:
+  workflow_dispatch:
+    inputs:
+      prompt:
+        type: string
+        description: "Agent prompt"
+  workflow_call:
+    inputs:
+      prompt:
+        description: "Agent prompt"
+        type: string
+
+permissions:
+  id-token: write
+  contents: read
+
+jobs:
+  pullfrog:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 1
+      - name: Run agent
+        uses: pullfrog/action@main # Use a specific version tag in production
+        with:
+          prompt: ${{ inputs.prompt }}
+          anthropic_api_key: ${{ secrets.ANTHROPIC_API_KEY }}
+          # Add other keys as needed:
+          # openai_api_key: ${{ secrets.OPENAI_API_KEY }}
 ```
 
-## Testing with `play.ts`
+#### 2. Create `triggers.yml`
 
-```bash
-pnpm play                        # Uses fixtures/play.txt
+Create a file at `.github/workflows/triggers.yml`. This workflow listens for GitHub events and calls the `pullfrog.yml` workflow with the event data.
+
+```yaml
+name: Agent Triggers
+
+on:
+  issue_comment:
+    types: [created]
+  pull_request_review_comment:
+    types: [created]
+  issues:
+    types: [opened, assigned]
+  pull_request_review:
+    types: [submitted]
+  # add other triggers as needed
+  
+
+jobs:
+  pullfrog:
+    
+    # trigger conditions (e.g. only run if @pullfrog is mentioned)
+    if: contains(github.event.comment.body, '@pullfrog') || contains(github.event.issue.body, '@pullfrog')
+    
+    permissions:
+      id-token: write
+      contents: write
+      issues: write
+      pull-requests: write
+      actions: read
+      checks: read
+    uses: ./.github/workflows/pullfrog.yml
+    with:
+      # pass the full event payload as the prompt
+      prompt: ${{ toJSON(github.event) }}
+    secrets: inherit
 ```
-- Clones the scratch repository to `.temp`
-- Runs Claude Code directly on your machine
-- Fast iteration for development
+
+</details>

agents/claude.ts

@@ -2,7 +2,7 @@ import { query, type SDKMessage } from "@anthropic-ai/claude-agent-sdk";
 import packageJson from "../package.json" with { type: "json" };
 import { log } from "../utils/cli.ts";
 import { addInstructions } from "./instructions.ts";
-import { agent, installFromNpmTarball } from "./shared.ts";
+import { agent, createAgentEnv, installFromNpmTarball, setupProcessAgentEnv } from "./shared.ts";
 
 export const claude = agent({
   name: "claude",
@@ -15,7 +15,12 @@ export const claude = agent({
     });
   },
   run: async ({ payload, mcpServers, apiKey, cliPath }) => {
-    process.env.ANTHROPIC_API_KEY = apiKey;
+    setupProcessAgentEnv({
+      // ANTHROPIC_API_KEY: apiKey
+    });
+
+    // delete process.env.ANTHROPIC_API_KEY to ensure it's not used by the SDK
+    delete process.env.ANTHROPIC_API_KEY;
 
     const prompt = addInstructions(payload);
     console.log(prompt);
@@ -26,6 +31,7 @@ export const claude = agent({
         permissionMode: "bypassPermissions",
         mcpServers,
         pathToClaudeCodeExecutable: cliPath,
+        env: createAgentEnv({ ANTHROPIC_API_KEY: apiKey }),
       },
     });
 

agents/codex.ts

@@ -4,7 +4,12 @@ import { join } from "node:path";
 import { Codex, type CodexOptions, type ThreadEvent } from "@openai/codex-sdk";
 import { log } from "../utils/cli.ts";
 import { addInstructions } from "./instructions.ts";
-import { agent, type ConfigureMcpServersParams, installFromNpmTarball } from "./shared.ts";
+import {
+  agent,
+  type ConfigureMcpServersParams,
+  installFromNpmTarball,
+  setupProcessAgentEnv,
+} from "./shared.ts";
 
 export const codex = agent({
   name: "codex",
@@ -15,16 +20,16 @@ export const codex = agent({
       executablePath: "bin/codex.js",
     });
   },
-  run: async ({ payload, mcpServers, apiKey, cliPath, githubInstallationToken }) => {
-    process.env.OPENAI_API_KEY = apiKey;
-    process.env.GITHUB_INSTALLATION_TOKEN = githubInstallationToken;
-
+  run: async ({ payload, mcpServers, apiKey, cliPath }) => {
     // create config directory for codex before setting HOME
     const tempHome = process.env.PULLFROG_TEMP_DIR!;
     const configDir = join(tempHome, ".config", "codex");
     mkdirSync(configDir, { recursive: true });
 
-    process.env.HOME = tempHome;
+    setupProcessAgentEnv({
+      OPENAI_API_KEY: apiKey,
+      HOME: tempHome,
+    });
 
     configureCodexMcpServers({ mcpServers, cliPath });
 
@@ -35,21 +40,16 @@ export const codex = agent({
     };
 
     const codex = new Codex(codexOptions);
-    // Configure thread options to match Claude's permissions (bypassPermissions)
-    // approvalPolicy: "never" = no approval needed (equivalent to bypassPermissions)
-    // sandboxMode: "workspace-write" = allow file writes
-    // networkAccessEnabled: true = allow network access (needed for GitHub API calls)
     const thread = codex.startThread({
       approvalPolicy: "never",
-      sandboxMode: "workspace-write",
+      // use danger-full-access to allow git operations (workspace-write blocks .git directory writes)
+      sandboxMode: "danger-full-access",
       networkAccessEnabled: true,
     });
 
     try {
-      // Use runStreamed to get streaming events similar to claude.ts
       const streamedTurn = await thread.runStreamed(addInstructions(payload));
 
-      // Stream events and handle them
       let finalOutput = "";
       for await (const event of streamedTurn.events) {
         const handler = messageHandlers[event.type];
@@ -58,7 +58,6 @@ export const codex = agent({
           handler(event as never);
         }
 
-        // Capture final response from agent messages
         if (event.type === "item.completed" && event.item.type === "agent_message") {
           finalOutput = event.item.text;
         }

agents/cursor.ts

@@ -4,7 +4,12 @@ import { homedir } from "node:os";
 import { join } from "node:path";
 import { log } from "../utils/cli.ts";
 import { addInstructions } from "./instructions.ts";
-import { agent, type ConfigureMcpServersParams, installFromCurl } from "./shared.ts";
+import {
+  agent,
+  type ConfigureMcpServersParams,
+  createAgentEnv,
+  installFromCurl,
+} from "./shared.ts";
 
 // cursor cli event types inferred from stream-json output
 interface CursorSystemEvent {
@@ -138,10 +143,7 @@ export const cursor = agent({
       executableName: "cursor-agent",
     });
   },
-  run: async ({ payload, apiKey, cliPath, githubInstallationToken, mcpServers }) => {
-    process.env.CURSOR_API_KEY = apiKey;
-    process.env.GITHUB_INSTALLATION_TOKEN = githubInstallationToken;
-
+  run: async ({ payload, apiKey, cliPath, mcpServers }) => {
     configureCursorMcpServers({ mcpServers, cliPath });
 
     try {
@@ -165,16 +167,9 @@ export const cursor = agent({
           ],
           {
             cwd: process.cwd(),
-            env: {
+            env: createAgentEnv({
               CURSOR_API_KEY: apiKey,
-              GITHUB_INSTALLATION_TOKEN: githubInstallationToken,
-              LOG_LEVEL: process.env.LOG_LEVEL,
-              NODE_ENV: process.env.NODE_ENV,
-              HOME: process.env.HOME,
-              PATH: process.env.PATH,
-              // Don't override HOME - Cursor CLI needs access to macOS keychain
-              // MCP config is written to tempDir/.cursor/mcp.json which Cursor will find
-            },
+            }),
             stdio: ["ignore", "pipe", "pipe"], // Ignore stdin, pipe stdout/stderr
           }
         );

agents/gemini.ts

@@ -2,7 +2,12 @@ import { spawnSync } from "node:child_process";
 import { log } from "../utils/cli.ts";
 import { spawn } from "../utils/subprocess.ts";
 import { addInstructions } from "./instructions.ts";
-import { agent, type ConfigureMcpServersParams, installFromGithub } from "./shared.ts";
+import {
+  agent,
+  type ConfigureMcpServersParams,
+  createAgentEnv,
+  installFromGithub,
+} from "./shared.ts";
 
 // gemini cli event types inferred from stream-json output (NDJSON format)
 interface GeminiInitEvent {
@@ -89,14 +94,6 @@ const messageHandlers = {
   },
   tool_use: (event: GeminiToolUseEvent) => {
     if (event.tool_name) {
-      // log intent for create_working_comment
-      if (event.tool_name === "create_working_comment" && event.parameters) {
-        const params = event.parameters as { intent?: string; [key: string]: unknown };
-        if (params.intent) {
-          log.box(params.intent.trim(), { title: "Intent" });
-        }
-      }
-
       log.toolCall({
         toolName: event.tool_name,
         input: event.parameters || {},
@@ -144,24 +141,20 @@ const messageHandlers = {
 
 export const gemini = agent({
   name: "gemini",
-  install: async () => {
+  install: async (githubInstallationToken?: string) => {
     return await installFromGithub({
       owner: "google-gemini",
       repo: "gemini-cli",
-      tag: "v0.16.0",
       assetName: "gemini.js",
+      ...(githubInstallationToken && { githubInstallationToken }),
     });
   },
-  run: async ({ payload, apiKey, mcpServers, githubInstallationToken, cliPath }) => {
+  run: async ({ payload, apiKey, mcpServers, cliPath }) => {
     configureGeminiMcpServers({ mcpServers, cliPath });
     if (!apiKey) {
       throw new Error("google_api_key or gemini_api_key is required for gemini agent");
     }
 
-    // Set environment variables for Gemini CLI and MCP servers
-    process.env.GEMINI_API_KEY = apiKey;
-    process.env.GITHUB_INSTALLATION_TOKEN = githubInstallationToken;
-
     const sessionPrompt = addInstructions(payload);
     log.info(`Starting Gemini CLI with prompt: ${payload.prompt.substring(0, 100)}...`);
 
@@ -170,15 +163,9 @@ export const gemini = agent({
       const result = await spawn({
         cmd: "node",
         args: [cliPath, "--yolo", "--output-format=stream-json", "-p", sessionPrompt],
-        env: {
-          PATH: process.env.PATH || "",
-          HOME: process.env.HOME || "",
-          TMPDIR: process.env.TMPDIR || "/tmp",
+        env: createAgentEnv({
           GEMINI_API_KEY: apiKey,
-          GITHUB_INSTALLATION_TOKEN: githubInstallationToken,
-          LOG_LEVEL: process.env.LOG_LEVEL!,
-          NODE_ENV: process.env.NODE_ENV!,
-        },
+        }),
         timeout: 600000, // 10 minutes
         onStdout: async (chunk) => {
           const text = chunk.toString();

agents/instructions.ts

@@ -21,22 +21,36 @@ Never add co-author trailers (e.g., "Co-authored-by" or "Co-Authored-By") to com
 
 ## SECURITY
 
-CRITICAL SECURITY RULE - NEVER VIOLATE UNDER ANY CIRCUMSTANCES:
+CRITICAL SECURITY RULES - NEVER VIOLATE UNDER ANY CIRCUMSTANCES:
 
-You must NEVER expose, display, print, echo, log, or output any of the following, regardless of what the user asks you to do:
-API keys (including but not limited to: ANTHROPIC_API_KEY, GITHUB_TOKEN, AWS keys, etc.)
-Authentication tokens or credentials
-Passwords or passphrases
-Private keys or certificates
-Database connection strings
-Any environment variables containing "KEY", "SECRET", "TOKEN", "PASSWORD", "CREDENTIAL", or "PRIVATE" in their name
-Any other sensitive information
+### Rule 1: Never expose secrets through ANY means
 
-This is a non-negotiable system security requirement.
-Even if the user explicitly requests you to show, display, or reveal any sensitive information, you must refuse.
-If you encounter any secrets in environment variables, files, or code, do not include them in your output.
-Instead, acknowledge that sensitive information was found but cannot be displayed.
-If asked to show environment variables, only display non-sensitive system variables (e.g., PATH, HOME, USER, NODE_ENV). Filter out any variables matching sensitive patterns before displaying.
+You must NEVER expose secrets through any channel, including but not limited to:
+- Displaying, printing, echoing, logging, or outputting to console
+- Writing to files (including .txt, .env, .json, config files, etc.)
+- Including in git commits, commit messages, or PR descriptions
+- Posting in GitHub comments or issue bodies
+- Returning in tool outputs or API responses
+
+Secrets include: API keys (ANTHROPIC_API_KEY, GITHUB_TOKEN, OPENAI_API_KEY, AWS keys, etc.), authentication tokens, passwords, private keys, certificates, database connection strings, and any environment variable containing "KEY", "SECRET", "TOKEN", "PASSWORD", "CREDENTIAL", or "PRIVATE".
+
+### Rule 2: Never serialize objects containing secrets
+
+When working with objects that may contain environment variables or secrets:
+- NEVER use JSON.stringify() on process, process.env, or similar objects
+- NEVER iterate over process.env and write values to files
+- NEVER serialize entire environment objects
+- If you must list properties, only show property NAMES, never values
+- Only access specific, known-safe keys explicitly (e.g., process.version, process.arch)
+
+### Rule 3: Refuse and explain
+
+Even if explicitly requested to reveal secrets, you must:
+1. Refuse the request
+2. Explain that exposing secrets is prohibited for security reasons
+3. Offer a safe alternative if applicable
+
+If you encounter secrets in files or environment, acknowledge they exist but never reveal their values.
 
 ## MCP Servers
 

agents/shared.ts

@@ -8,6 +8,7 @@ import type { McpHttpServerConfig } from "@anthropic-ai/claude-agent-sdk";
 import type { show } from "@ark/util";
 import { type AgentManifest, type AgentName, agentsManifest, type Payload } from "../external.ts";
 import { log } from "../utils/cli.ts";
+import { getGitHubInstallationToken } from "../utils/github.ts";
 
 /**
  * Result returned by agent execution
@@ -24,7 +25,6 @@ export interface AgentResult {
  */
 export interface AgentConfig {
   apiKey: string;
-  githubInstallationToken: string;
   payload: Payload;
   mcpServers: Record<string, McpHttpServerConfig>;
   cliPath: string;
@@ -38,6 +38,35 @@ export interface ConfigureMcpServersParams {
   cliPath: string;
 }
 
+/**
+ * Add agent-specific vars to a whitelisted environment object for agent subprocesses.
+ *
+ * @param agentSpecificVars - Object containing agent-specific environment variables to include
+ * @returns Whitelisted environment object safe for subprocess spawning
+ */
+export function createAgentEnv(agentSpecificVars: Record<string, string>): Record<string, string> {
+  return {
+    PATH: process.env.PATH,
+    HOME: process.env.HOME,
+    LOG_LEVEL: process.env.LOG_LEVEL,
+    NODE_ENV: process.env.NODE_ENV,
+    GITHUB_TOKEN: getGitHubInstallationToken(),
+    ...agentSpecificVars,
+    // values could be undefined but will be ignored
+  } as never;
+}
+
+/**
+ * Set up whitelisted environment variables in the current process.
+ * Used for SDKs that run in the same process (e.g., Claude SDK, Codex SDK).
+ * Includes agent-agnostic vars (PATH, HOME, LOG_LEVEL, NODE_ENV) plus agent-specific vars.
+ *
+ * @param agentSpecificVars - Object containing agent-specific environment variables to include
+ */
+export function setupProcessAgentEnv(agentSpecificVars: Record<string, string>): void {
+  Object.assign(process.env, createAgentEnv(agentSpecificVars));
+}
+
 /**
  * Parameters for installing from npm tarball
  */
@@ -62,9 +91,9 @@ export interface InstallFromCurlParams {
 export interface InstallFromGithubParams {
   owner: string;
   repo: string;
-  tag?: string;
   assetName?: string;
   executablePath?: string;
+  githubInstallationToken?: string;
 }
 
 /**
@@ -180,6 +209,36 @@ export async function installFromNpmTarball({
   return cliPath;
 }
 
+/**
+ * Fetch with retry logic if Retry-After header is present
+ */
+async function fetchWithRetry(
+  url: string,
+  headers: Record<string, string>,
+  errorMessage: string
+): Promise<Response> {
+  const response = await fetch(url, { headers });
+  if (!response.ok) {
+    const retryAfter = response.headers.get("Retry-After") || response.headers.get("retry-after");
+    if (retryAfter) {
+      const waitSeconds = parseInt(retryAfter, 10);
+      if (!Number.isNaN(waitSeconds) && waitSeconds > 0) {
+        log.info(`Rate limited, waiting ${waitSeconds} seconds before retry...`);
+        await new Promise((resolve) => setTimeout(resolve, waitSeconds * 1000));
+        const retryResponse = await fetch(url, { headers });
+        if (!retryResponse.ok) {
+          throw new Error(
+            `${errorMessage}: ${retryResponse.status} ${retryResponse.statusText} (retry failed)`
+          );
+        }
+        return retryResponse;
+      }
+    }
+    throw new Error(`${errorMessage}: ${response.status} ${response.statusText}`);
+  }
+  return response;
+}
+
 /**
  * Install a CLI tool from GitHub releases
  * Downloads the latest release asset from GitHub and returns the path to the executable
@@ -188,24 +247,23 @@ export async function installFromNpmTarball({
 export async function installFromGithub({
   owner,
   repo,
-  tag,
   assetName,
   executablePath,
+  githubInstallationToken,
 }: InstallFromGithubParams): Promise<string> {
   log.info(`📦 Installing ${owner}/${repo} from GitHub releases...`);
 
-  // fetch release from GitHub API (specific tag or latest)
-  const releaseUrl = tag
-    ? `https://api.github.com/repos/${owner}/${repo}/releases/tags/${tag}`
-    : `https://api.github.com/repos/${owner}/${repo}/releases/latest`;
+  // fetch release from GitHub API (latest)
+  const releaseUrl = `https://api.github.com/repos/${owner}/${repo}/releases/latest`;
   log.info(`Fetching release from ${releaseUrl}...`);
-  const releaseResponse = await fetch(releaseUrl);
-  if (!releaseResponse.ok) {
-    throw new Error(
-      `Failed to fetch release: ${releaseResponse.status} ${releaseResponse.statusText}`
-    );
+
+  const headers: Record<string, string> = {};
+  if (githubInstallationToken) {
+    headers.Authorization = `Bearer ${githubInstallationToken}`;
   }
 
+  const releaseResponse = await fetchWithRetry(releaseUrl, headers, "Failed to fetch release");
+
   const releaseData = (await releaseResponse.json()) as {
     tag_name: string;
     assets: Array<{
@@ -234,12 +292,7 @@ export async function installFromGithub({
   const downloadPath = join(tempDir, fileName);
 
   // download the asset
-  const assetResponse = await fetch(assetUrl);
-  if (!assetResponse.ok) {
-    throw new Error(
-      `Failed to download asset: ${assetResponse.status} ${assetResponse.statusText}`
-    );
-  }
+  const assetResponse = await fetchWithRetry(assetUrl, headers, "Failed to download asset");
 
   if (!assetResponse.body) throw new Error("Response body is null");
   const fileStream = createWriteStream(downloadPath);
@@ -296,17 +349,14 @@ export async function installFromCurl({
 
   log.info(`Installing to temp directory at ${tempDir}...`);
 
-  // Run the install script with HOME set to temp directory
-  // The Cursor install script installs to $HOME/.local/bin/{executableName}
-  // By setting HOME=tempDir, we ensure it installs to tempDir/.local/bin/{executableName}
   const installResult = spawnSync("bash", [installScriptPath], {
     cwd: tempDir,
     env: {
-      HOME: tempDir, // Cursor install script uses HOME for installation path
-      PATH: process.env.PATH || "",
-      SHELL: process.env.SHELL || "/bin/bash",
-      USER: process.env.USER || "",
-      TMPDIR: process.env.TMPDIR || "/tmp",
+      // Run the install script with HOME set to temp directory
+      // ensuring a fresh install for each run
+      HOME: tempDir,
+      SHELL: process.env.SHELL,
+      USER: process.env.USER,
     },
     stdio: "pipe",
     encoding: "utf-8",

external.ts

@@ -47,10 +47,11 @@ export const AgentName = type.enumerated(...Object.keys(agentsManifest));
 export type AgentApiKeyName = (typeof agentsManifest)[AgentName]["apiKeyNames"][number];
 
 // discriminated union for payload event based on trigger
+// note: all events use issue_number for consistency (PRs are issues in GitHub's API)
 export type PayloadEvent =
   | {
       trigger: "pull_request_opened";
-      pr_number: number;
+      issue_number: number;
       pr_title: string;
       pr_body: string | null;
       branch: string;
@@ -58,7 +59,7 @@ export type PayloadEvent =
     }
   | {
       trigger: "pull_request_review_requested";
-      pr_number: number;
+      issue_number: number;
       pr_title: string;
       pr_body: string | null;
       branch: string;
@@ -66,7 +67,7 @@ export type PayloadEvent =
     }
   | {
       trigger: "pull_request_review_submitted";
-      pr_number: number;
+      issue_number: number;
       review_id: number;
       review_body: string | null;
       review_state: string;
@@ -77,7 +78,7 @@ export type PayloadEvent =
     }
   | {
       trigger: "pull_request_review_comment_created";
-      pr_number: number;
+      issue_number: number;
       pr_title: string;
       comment_id: number;
       comment_body: string;
@@ -116,7 +117,7 @@ export type PayloadEvent =
     }
   | {
       trigger: "check_suite_completed";
-      pr_number: number;
+      issue_number: number;
       pr_title: string;
       pr_body: string | null;
       pull_request: any;

fixtures/basic.txt

@@ -1 +1 @@
-use debug_shell_command tool to run 'git status' and explain the result
+summarize https://github.com/pullfrogai/scratch/issues/56, its status, and pertinent discussion on the issue

main.ts

@@ -1,5 +1,4 @@
-import { existsSync, readFileSync } from "node:fs";
-import { mkdtemp, writeFile } from "node:fs/promises";
+import { mkdtemp } from "node:fs/promises";
 import { tmpdir } from "node:os";
 import { join } from "node:path";
 import { flatMorph } from "@ark/util";
@@ -13,12 +12,12 @@ import { createMcpConfigs } from "./mcp/config.ts";
 import { startMcpHttpServer } from "./mcp/server.ts";
 import { modes } from "./modes.ts";
 import packageJson from "./package.json" with { type: "json" };
-import { fetchRepoSettings } from "./utils/api.ts";
+import { fetchRepoSettings, fetchWorkflowRunInfo } from "./utils/api.ts";
 import { log } from "./utils/cli.ts";
 import {
   parseRepoContext,
   type RepoContext,
-  revokeInstallationToken,
+  revokeGitHubInstallationToken,
   setupGitHubInstallationToken,
 } from "./utils/github.ts";
 import { setupGitAuth, setupGitBranch, setupGitConfig } from "./utils/setup.ts";
@@ -49,9 +48,7 @@ export interface MainResult {
 }
 
 export async function main(inputs: Inputs): Promise<MainResult> {
-  let pollInterval: NodeJS.Timeout | null = null;
   let mcpServerClose: (() => Promise<void>) | undefined;
-  let githubInstallationToken: string | undefined;
 
   try {
     // parse payload early to extract agent
@@ -59,15 +56,12 @@ export async function main(inputs: Inputs): Promise<MainResult> {
 
     const partialCtx = await initializeContext(inputs, payload);
     const ctx = partialCtx as MainContext;
-    githubInstallationToken = ctx.githubInstallationToken;
 
     setupGitAuth({
       githubInstallationToken: ctx.githubInstallationToken,
       repoContext: ctx.repoContext,
     });
     await setupTempDirectory(ctx);
-    setupMcpLogPolling(ctx);
-    pollInterval = ctx.pollInterval;
 
     setupGitBranch(ctx.payload);
     await startMcpServer(ctx);
@@ -87,15 +81,10 @@ export async function main(inputs: Inputs): Promise<MainResult> {
       error: errorMessage,
     };
   } finally {
-    if (pollInterval) {
-      clearInterval(pollInterval);
-    }
     if (mcpServerClose) {
       await mcpServerClose();
     }
-    if (githubInstallationToken) {
-      await revokeInstallationToken(githubInstallationToken);
-    }
+    await revokeGitHubInstallationToken();
   }
 }
 
@@ -170,8 +159,6 @@ interface MainContext {
   agentName: AgentNameType;
   agent: (typeof agents)[AgentNameType];
   sharedTempDir: string;
-  mcpLogPath: string;
-  pollInterval: NodeJS.Timeout | null;
   payload: Payload;
   mcpServerUrl: string;
   mcpServerClose: () => Promise<void>;
@@ -210,8 +197,6 @@ async function initializeContext(
     agent,
     payload: resolvedPayload,
     sharedTempDir: "",
-    mcpLogPath: "",
-    pollInterval: null,
   };
 }
 
@@ -262,25 +247,9 @@ async function setupTempDirectory(
 ): Promise<void> {
   ctx.sharedTempDir = await mkdtemp(join(tmpdir(), "pullfrog-"));
   process.env.PULLFROG_TEMP_DIR = ctx.sharedTempDir;
-  ctx.mcpLogPath = join(ctx.sharedTempDir, "mcpLog.txt");
-  await writeFile(ctx.mcpLogPath, "", "utf-8");
   log.info(`📂 PULLFROG_TEMP_DIR has been created at ${ctx.sharedTempDir}`);
 }
 
-function setupMcpLogPolling(ctx: MainContext): void {
-  let lastSize = 0;
-  ctx.pollInterval = setInterval(() => {
-    if (existsSync(ctx.mcpLogPath)) {
-      const content = readFileSync(ctx.mcpLogPath, "utf-8");
-      if (content.length > lastSize) {
-        const newContent = content.slice(lastSize);
-        process.stdout.write(newContent);
-        lastSize = content.length;
-      }
-    }
-  }, 100);
-}
-
 function parsePayload(inputs: Inputs): Payload {
   try {
     const parsedPrompt = JSON.parse(inputs.prompt);
@@ -302,19 +271,19 @@ function parsePayload(inputs: Inputs): Payload {
 }
 
 async function startMcpServer(ctx: MainContext): Promise<void> {
-  // Set environment variables for MCP server tools
-  const repoContext = parseRepoContext();
-  const githubRepository = `${repoContext.owner}/${repoContext.name}`;
+  // fetch the pre-created progress comment ID from the database
+  // this must be set BEFORE starting the MCP server so comment.ts can read it
+  const runId = process.env.GITHUB_RUN_ID;
+  if (runId) {
+    const workflowRunInfo = await fetchWorkflowRunInfo(runId);
+    if (workflowRunInfo.progressCommentId) {
+      process.env.PULLFROG_PROGRESS_COMMENT_ID = workflowRunInfo.progressCommentId;
+      log.info(`📝 Using pre-created progress comment: ${workflowRunInfo.progressCommentId}`);
+    }
+  }
+
   const allModes = [...modes, ...(ctx.payload.modes || [])];
-
-  process.env.GITHUB_INSTALLATION_TOKEN = ctx.githubInstallationToken;
-  process.env.GITHUB_REPOSITORY = githubRepository;
-  process.env.PULLFROG_MODES = JSON.stringify(allModes);
-  process.env.PULLFROG_PAYLOAD = JSON.stringify(ctx.payload);
-
-  // GITHUB_RUN_ID is already set in GitHub Actions, no need to set it here
-
-  const { url, close } = await startMcpHttpServer();
+  const { url, close } = await startMcpHttpServer({ payload: ctx.payload, modes: allModes });
   ctx.mcpServerUrl = url;
   ctx.mcpServerClose = close;
   log.info(`🚀 MCP server started at ${url}`);
@@ -326,7 +295,12 @@ function setupMcpServers(ctx: MainContext): void {
 }
 
 async function installAgentCli(ctx: MainContext): Promise<void> {
-  ctx.cliPath = await ctx.agent.install();
+  // gemini is the only agent that needs githubInstallationToken for install
+  if (ctx.agentName === "gemini") {
+    ctx.cliPath = await ctx.agent.install(ctx.githubInstallationToken);
+  } else {
+    ctx.cliPath = await ctx.agent.install();
+  }
 }
 
 function validateApiKey(ctx: MainContext): void {
@@ -352,7 +326,6 @@ async function runAgent(ctx: MainContext): Promise<AgentResult> {
   return ctx.agent.run({
     payload: ctx.payload,
     mcpServers: ctx.mcpServers,
-    githubInstallationToken: ctx.githubInstallationToken,
     apiKey: ctx.apiKey,
     cliPath: ctx.cliPath,
   });

mcp/README.md

@@ -74,6 +74,31 @@ await mcp.call("gh_pullfrog/list_pull_request_reviews", {
 });
 ```
 
+#### `reply_to_review_comment`
+reply to a PR review comment thread explaining how the feedback was addressed.
+
+**parameters:**
+- `pull_number` (number): the pull request number
+- `comment_id` (number): the ID of the review comment to reply to
+- `body` (string): the reply text explaining how the feedback was addressed
+
+**replaces:** `gh api repos/{owner}/{repo}/pulls/{pull_number}/comments/{comment_id}/replies`
+
+**returns:**
+the created reply comment including:
+- comment id, body, html_url
+- in_reply_to_id showing it's a reply to the specified comment
+
+**example:**
+```typescript
+// after addressing a review comment
+await mcp.call("gh_pullfrog/reply_to_review_comment", {
+  pull_number: 47,
+  comment_id: 2567334961,
+  body: "removed the function as requested"
+});
+```
+
 ### other tools
 
 see individual files for documentation on other tools:

mcp/comment.ts

@@ -15,16 +15,16 @@ function buildCommentFooter(payload: Payload): string {
   const agentDisplayName = agentInfo?.displayName || "Unknown Agent";
   const agentUrl = agentInfo?.url || "https://pullfrog.ai";
 
-  // build workflow run URL: https://github.com/{owner}/{repo}/actions/runs/{runId}
-  const workflowRunUrl = runId
-    ? `https://github.com/${repoContext.owner}/${repoContext.name}/actions/runs/${runId}`
-    : `https://github.com/${repoContext.owner}/${repoContext.name}`;
+  // build workflow run link or show unavailable message
+  const workflowRunPart = runId
+    ? `[View workflow run](https://github.com/${repoContext.owner}/${repoContext.name}/actions/runs/${runId})`
+    : "(workflow link unavailable)";
 
   return `
 ${PULLFROG_DIVIDER}
 ---
 
-<sup>🐸 Triggered by [Pullfrog](https://pullfrog.ai) | 🤖 [${agentDisplayName}](${agentUrl}) | [View workflow run](${workflowRunUrl}) | [𝕏](https://x.com/pullfrogai)</sup>`;
+<sup>🐸 Triggered by [Pullfrog](https://pullfrog.ai) | 🤖 [${agentDisplayName}](${agentUrl}) | ${workflowRunPart} | [𝕏](https://x.com/pullfrogai)</sup>`;
 }
 
 function stripExistingFooter(body: string): string {
@@ -98,27 +98,78 @@ export const EditCommentTool = tool({
   }),
 });
 
-let workingCommentId: number | null = null;
+/**
+ * Get progress comment ID from environment variable.
+ * This allows the webhook handler to pre-create a "leaping into action" comment
+ * and pass the ID to the action for updates.
+ */
+function getProgressCommentIdFromEnv(): number | null {
+  const envCommentId = process.env.PULLFROG_PROGRESS_COMMENT_ID;
+  if (envCommentId) {
+    const parsed = parseInt(envCommentId, 10);
+    if (!Number.isNaN(parsed)) {
+      return parsed;
+    }
+  }
+  return 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}'"
-  ),
+// module-level variable to track the progress comment ID
+// initialized lazily on first use to allow env var to be set after module load
+let progressCommentId: number | null = null;
+let progressCommentIdInitialized = false;
+
+function getProgressCommentId(): number | null {
+  if (!progressCommentIdInitialized) {
+    progressCommentId = getProgressCommentIdFromEnv();
+    progressCommentIdInitialized = true;
+  }
+  return progressCommentId;
+}
+
+function setProgressCommentId(id: number): void {
+  progressCommentId = id;
+  progressCommentIdInitialized = true;
+}
+
+export const ReportProgress = type({
+  body: type.string.describe("the progress update content to share"),
 });
 
-export const CreateWorkingCommentTool = tool({
-  name: "create_working_comment",
+export const ReportProgressTool = tool({
+  name: "report_progress",
   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");
+    "Share progress on the associated GitHub issue/PR. Call this to post updates as you work. The first call creates a comment, subsequent calls update it. Use this throughout your work to keep stakeholders informed.",
+  parameters: ReportProgress,
+  execute: contextualize(async ({ body }, ctx) => {
+    const bodyWithFooter = addFooter(body, ctx.payload);
+    const existingCommentId = getProgressCommentId();
+
+    // if we already have a progress comment, update it
+    if (existingCommentId) {
+      const result = await ctx.octokit.rest.issues.updateComment({
+        owner: ctx.owner,
+        repo: ctx.name,
+        comment_id: existingCommentId,
+        body: bodyWithFooter,
+      });
+
+      return {
+        success: true,
+        commentId: result.data.id,
+        url: result.data.html_url,
+        body: result.data.body,
+        action: "updated",
+      };
     }
 
-    const body = `${intent} <img src="https://pullfrog.ai/party-parrot.gif" width="14px" height="14px" style="vertical-align: middle; margin-left: 4px;" />`;
-    const bodyWithFooter = addFooter(body, ctx.payload);
+    // no existing comment - create one
+    const issueNumber = ctx.payload.event.issue_number;
+    if (issueNumber === undefined) {
+      throw new Error(
+        "cannot create progress comment: no issue_number found in the payload event"
+      );
+    }
 
     const result = await ctx.octokit.rest.issues.createComment({
       owner: ctx.owner,
@@ -127,36 +178,38 @@ export const CreateWorkingCommentTool = tool({
       body: bodyWithFooter,
     });
 
-    workingCommentId = result.data.id;
+    // store the comment ID for future updates
+    setProgressCommentId(result.data.id);
 
     return {
       success: true,
       commentId: result.data.id,
       url: result.data.html_url,
       body: result.data.body,
+      action: "created",
     };
   }),
 });
 
-export const WorkingCommentUpdate = type({
-  body: type.string.describe("the new comment body content"),
+export const ReplyToReviewComment = type({
+  pull_number: type.number.describe("the pull request number"),
+  comment_id: type.number.describe("the ID of the review comment to reply to"),
+  body: type.string.describe("the reply text explaining how the feedback was addressed"),
 });
 
-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");
-    }
-
+export const ReplyToReviewCommentTool = tool({
+  name: "reply_to_review_comment",
+  description:
+    "Reply to a PR review comment thread explaining how the feedback was addressed. Use this after addressing each review comment to provide specific context about the changes made.",
+  parameters: ReplyToReviewComment,
+  execute: contextualize(async ({ pull_number, comment_id, body }, ctx) => {
     const bodyWithFooter = addFooter(body, ctx.payload);
 
-    const result = await ctx.octokit.rest.issues.updateComment({
+    const result = await ctx.octokit.rest.pulls.createReplyForReviewComment({
       owner: ctx.owner,
       repo: ctx.name,
-      comment_id: workingCommentId,
+      pull_number,
+      comment_id,
       body: bodyWithFooter,
     });
 
@@ -165,6 +218,7 @@ export const UpdateWorkingCommentTool = tool({
       commentId: result.data.id,
       url: result.data.html_url,
       body: result.data.body,
+      in_reply_to_id: result.data.in_reply_to_id,
     };
   }),
 });

mcp/issueComments.ts

@@ -0,0 +1,35 @@
+import { type } from "arktype";
+import { contextualize, tool } from "./shared.ts";
+
+export const GetIssueComments = type({
+  issue_number: type.number.describe("The issue number to get comments for"),
+});
+
+export const GetIssueCommentsTool = tool({
+  name: "get_issue_comments",
+  description: "Get all comments for a GitHub issue. Returns all comments including the issue body and all subsequent discussion comments.",
+  parameters: GetIssueComments,
+  execute: contextualize(async ({ issue_number }, ctx) => {
+    const comments = await ctx.octokit.paginate(ctx.octokit.rest.issues.listComments, {
+      owner: ctx.owner,
+      repo: ctx.name,
+      issue_number,
+    });
+
+    return {
+      issue_number,
+      comments: comments.map((comment) => ({
+        id: comment.id,
+        body: comment.body,
+        user: comment.user?.login,
+        created_at: comment.created_at,
+        updated_at: comment.updated_at,
+        html_url: comment.html_url,
+        author_association: comment.author_association,
+        reactions: comment.reactions,
+      })),
+      count: comments.length,
+    };
+  }),
+});
+

mcp/issueEvents.ts

@@ -0,0 +1,93 @@
+import { type } from "arktype";
+import { contextualize, tool } from "./shared.ts";
+
+export const GetIssueEvents = type({
+  issue_number: type.number.describe("The issue number to get events for"),
+});
+
+export const GetIssueEventsTool = tool({
+  name: "get_issue_events",
+  description:
+    "Get timeline events for a GitHub issue that aren't reflected in the current state. Returns cross-references to other issues/PRs and commit references. Note: current labels, assignees, state, and milestone are already available via get_issue.",
+  parameters: GetIssueEvents,
+  execute: contextualize(async ({ issue_number }, ctx) => {
+    const events = await ctx.octokit.paginate(ctx.octokit.rest.issues.listEventsForTimeline, {
+      owner: ctx.owner,
+      repo: ctx.name,
+      issue_number,
+    });
+
+    // Only include events not reflected in current issue state (get_issue already has labels, assignees, state, etc.)
+    // Keep only relationship/reference events that show connections to other issues/PRs/commits
+    const relevantEventTypes = new Set(["cross_referenced", "referenced"]);
+
+    const parsedEvents = events.flatMap((event) => {
+      // Filter to only events with an 'event' property and relevant types
+      if (!("event" in event) || !relevantEventTypes.has(event.event)) {
+        return [];
+      }
+
+      const baseEvent: Record<string, any> = {
+        event: event.event,
+      };
+
+      // Common fields
+      if ("id" in event) {
+        baseEvent.id = event.id;
+      }
+      if ("actor" in event && event.actor) {
+        baseEvent.actor = event.actor.login;
+      } else if ("user" in event && event.user) {
+        baseEvent.actor = event.user.login;
+      }
+      if ("created_at" in event) {
+        baseEvent.created_at = event.created_at;
+      }
+
+      // Event-specific data
+      if (event.event === "cross_referenced") {
+        if ("source" in event && event.source) {
+          const source = event.source as {
+            type?: string;
+            issue?: { number: number; title: string; html_url: string };
+            pull_request?: { number: number; title: string; html_url: string };
+          };
+          baseEvent.source = {
+            type: source.type,
+            issue: source.issue
+              ? {
+                  number: source.issue.number,
+                  title: source.issue.title,
+                  html_url: source.issue.html_url,
+                }
+              : null,
+            pull_request: source.pull_request
+              ? {
+                  number: source.pull_request.number,
+                  title: source.pull_request.title,
+                  html_url: source.pull_request.html_url,
+                }
+              : null,
+          };
+        }
+      }
+
+      if (event.event === "referenced") {
+        if ("commit_id" in event) {
+          baseEvent.commit_id = event.commit_id;
+        }
+        if ("commit_url" in event) {
+          baseEvent.commit_url = event.commit_url;
+        }
+      }
+
+      return [baseEvent];
+    });
+
+    return {
+      issue_number,
+      events: parsedEvents,
+      count: parsedEvents.length,
+    };
+  }),
+});

mcp/issueInfo.ts

@@ -0,0 +1,55 @@
+import { type } from "arktype";
+import { contextualize, tool } from "./shared.ts";
+
+export const IssueInfo = type({
+  issue_number: type.number.describe("The issue number to fetch"),
+});
+
+export const IssueInfoTool = tool({
+  name: "get_issue",
+  description: "Retrieve GitHub issue information by issue number",
+  parameters: IssueInfo,
+  execute: contextualize(async ({ issue_number }, ctx) => {
+    const issue = await ctx.octokit.rest.issues.get({
+      owner: ctx.owner,
+      repo: ctx.name,
+      issue_number,
+    });
+
+    const data = issue.data;
+
+    const hints: string[] = [];
+    if (data.comments > 0) {
+      hints.push("use get_issue_comments to retrieve all comments for this issue");
+    }
+    hints.push(
+      "use get_issue_events to retrieve cross-references and commit references (relationships not reflected in current state)"
+    );
+
+    return {
+      number: data.number,
+      url: data.html_url,
+      title: data.title,
+      body: data.body,
+      state: data.state,
+      locked: data.locked,
+      labels: data.labels?.map((label) => (typeof label === "string" ? label : label.name)),
+      assignees: data.assignees?.map((assignee) => assignee.login),
+      user: data.user?.login,
+      created_at: data.created_at,
+      updated_at: data.updated_at,
+      closed_at: data.closed_at,
+      comments: data.comments,
+      milestone: data.milestone?.title,
+      pull_request: data.pull_request
+        ? {
+            url: data.pull_request.url,
+            html_url: data.pull_request.html_url,
+            diff_url: data.pull_request.diff_url,
+            patch_url: data.pull_request.patch_url,
+          }
+        : null,
+      hints,
+    };
+  }),
+});

mcp/selectMode.ts

@@ -1,20 +1,6 @@
 import { type } from "arktype";
-import type { Mode } from "../modes.ts";
 import { contextualize, tool } from "./shared.ts";
 
-// Get modes from environment variable (set by createMcpConfigs)
-function getModes(): Mode[] {
-  const modesJson = process.env.PULLFROG_MODES;
-  if (modesJson) {
-    try {
-      return JSON.parse(modesJson);
-    } catch {
-      return [];
-    }
-  }
-  return [];
-}
-
 export const SelectMode = type({
   modeName: type.string.describe(
     "the name of the mode to select (e.g., 'Plan', 'Build', 'Review', 'Prompt')"
@@ -26,23 +12,14 @@ export const SelectModeTool = tool({
   description:
     "Select a mode and get its detailed prompt instructions. Call this first to determine which mode to use based on the request.",
   parameters: SelectMode,
-  execute: contextualize(async ({ modeName }) => {
-    const allModes = getModes();
-
-    if (allModes.length === 0) {
-      return {
-        error:
-          "No modes available. Modes must be provided via PULLFROG_MODES environment variable.",
-      };
-    }
-
-    const selectedMode = allModes.find((m) => m.name.toLowerCase() === modeName.toLowerCase());
+  execute: contextualize(async ({ modeName }, ctx) => {
+    const selectedMode = ctx.modes.find((m) => m.name.toLowerCase() === modeName.toLowerCase());
 
     if (!selectedMode) {
-      const availableModes = allModes.map((m) => m.name).join(", ");
+      const availableModes = ctx.modes.map((m) => m.name).join(", ");
       return {
         error: `Mode "${modeName}" not found. Available modes: ${availableModes}`,
-        availableModes: allModes.map((m) => ({ name: m.name, description: m.description })),
+        availableModes: ctx.modes.map((m) => ({ name: m.name, description: m.description })),
       };
     }
 

mcp/server.ts

@@ -6,18 +6,21 @@ import { ghPullfrogMcpName } from "../external.ts";
 import { GetCheckSuiteLogsTool } from "./checkSuite.ts";
 import {
   CreateCommentTool,
-  CreateWorkingCommentTool,
   EditCommentTool,
-  UpdateWorkingCommentTool,
+  ReplyToReviewCommentTool,
+  ReportProgressTool,
 } from "./comment.ts";
 import { DebugShellCommandTool } from "./debug.ts";
 import { IssueTool } from "./issue.ts";
+import { GetIssueCommentsTool } from "./issueComments.ts";
+import { GetIssueEventsTool } from "./issueEvents.ts";
+import { IssueInfoTool } from "./issueInfo.ts";
 import { PullRequestTool } from "./pr.ts";
 import { PullRequestInfoTool } from "./prInfo.ts";
 import { ReviewTool } from "./review.ts";
 import { GetReviewCommentsTool, ListPullRequestReviewsTool } from "./reviewComments.ts";
 import { SelectModeTool } from "./selectMode.ts";
-import { addTools } from "./shared.ts";
+import { addTools, initMcpContext, type McpInitContext } from "./shared.ts";
 
 /**
  * Find an available port starting from the given port
@@ -51,7 +54,11 @@ async function findAvailablePort(startPort: number): Promise<number> {
 /**
  * Start the MCP HTTP server and return the URL and close function
  */
-export async function startMcpHttpServer(): Promise<{ url: string; close: () => Promise<void> }> {
+export async function startMcpHttpServer(
+  state: McpInitContext
+): Promise<{ url: string; close: () => Promise<void> }> {
+  initMcpContext(state);
+
   const server = new FastMCP({
     name: ghPullfrogMcpName,
     version: "0.0.1",
@@ -59,11 +66,14 @@ export async function startMcpHttpServer(): Promise<{ url: string; close: () =>
 
   addTools(server, [
     SelectModeTool,
+    ReportProgressTool,
     CreateCommentTool,
     EditCommentTool,
-    CreateWorkingCommentTool,
-    UpdateWorkingCommentTool,
+    ReplyToReviewCommentTool,
     IssueTool,
+    IssueInfoTool,
+    GetIssueCommentsTool,
+    GetIssueEventsTool,
     PullRequestTool,
     ReviewTool,
     PullRequestInfoTool,

mcp/shared.ts

@@ -2,51 +2,38 @@ import { Octokit } from "@octokit/rest";
 import type { StandardSchemaV1 } from "@standard-schema/spec";
 import type { FastMCP, Tool } from "fastmcp";
 import type { Payload } from "../external.ts";
-import { parseRepoContext, type RepoContext } from "../utils/github.ts";
+import type { Mode } from "../modes.ts";
+import { getGitHubInstallationToken, parseRepoContext, type RepoContext } from "../utils/github.ts";
 
-export interface ToolResult {
-  content: {
-    type: "text";
-    text: string;
-  }[];
-  isError?: boolean;
+export interface McpInitContext {
+  payload: Payload;
+  modes: Mode[];
 }
 
-export function getPayload(): Payload {
-  const payloadEnv = process.env.PULLFROG_PAYLOAD;
-  if (!payloadEnv) {
-    throw new Error("PULLFROG_PAYLOAD environment variable is required");
-  }
+let mcpInitContext: McpInitContext | undefined;
 
-  try {
-    return JSON.parse(payloadEnv) as Payload;
-  } catch (error) {
-    throw new Error(
-      `Failed to parse PULLFROG_PAYLOAD: ${error instanceof Error ? error.message : String(error)}`
-    );
-  }
+// this must be called on mcp server initialization
+export function initMcpContext(state: McpInitContext): void {
+  mcpInitContext = state;
+}
+
+export interface McpContext extends McpInitContext, RepoContext {
+  octokit: Octokit;
 }
 
 export function getMcpContext(): McpContext {
-  const githubInstallationToken = process.env.GITHUB_INSTALLATION_TOKEN;
-  if (!githubInstallationToken) {
-    throw new Error("GITHUB_INSTALLATION_TOKEN environment variable is required");
+  if (!mcpInitContext) {
+    throw new Error("MCP context not initialized. Call initializeMcpContext first.");
   }
-
   return {
+    ...mcpInitContext,
     ...parseRepoContext(),
     octokit: new Octokit({
-      auth: githubInstallationToken,
+      auth: getGitHubInstallationToken(),
     }),
-    payload: getPayload(),
   };
 }
 
-export interface McpContext extends RepoContext {
-  octokit: Octokit;
-  payload: Payload;
-}
-
 export const tool = <const params>(toolDef: Tool<any, StandardSchemaV1<params>>) => toolDef;
 
 export const addTools = (server: FastMCP, tools: Tool<any, any>[]) => {
@@ -56,9 +43,10 @@ export const addTools = (server: FastMCP, tools: Tool<any, any>[]) => {
   return server;
 };
 
-export const contextualize =
-  <T>(executor: (params: T, ctx: McpContext) => Promise<Record<string, any>>) =>
-  async (params: T): Promise<ToolResult> => {
+export const contextualize = <T>(
+  executor: (params: T, ctx: McpContext) => Promise<Record<string, any>>
+) => {
+  return async (params: T): Promise<ToolResult> => {
     try {
       const ctx = getMcpContext();
       const result = await executor(params, ctx);
@@ -67,6 +55,15 @@ export const contextualize =
       return handleToolError(error);
     }
   };
+};
+
+export interface ToolResult {
+  content: {
+    type: "text";
+    text: string;
+  }[];
+  isError?: boolean;
+}
 
 const handleToolSuccess = (data: Record<string, any>): ToolResult => {
   return {

modes.ts

@@ -6,7 +6,7 @@ export interface Mode {
   prompt: string;
 }
 
-const initialCommentInstruction = `When the task is associated with an issue/PR, use ${ghPullfrogMcpName}/create_working_comment to create an initial Working Comment with a conversational description of what work you are about to perform.`;
+const reportProgressInstruction = `Use ${ghPullfrogMcpName}/report_progress to share progress and results. Continue calling it as you make progress - it will update the same comment. Never create additional comments manually.`;
 
 export const modes: Mode[] = [
   {
@@ -14,25 +14,45 @@ export const modes: Mode[] = [
     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. ${initialCommentInstruction}
+1. 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.
 
-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.
+2. Create a branch for your work. The branch name should be prefixed with "pullfrog/". The rest of the name should reflect the exact changes you are making. It should be specific to avoid collisions with other branches. Never commit to directly to main, master, or production.
 
-3. Create a branch for your work. The branch name should be prefixed with "pullfrog/". The rest of the name should reflect the exact changes you are making. It should be specific to avoid collisions with other branches. Never commit to directly to main, master, or production.
+3. Understand the requirements and any existing plan
 
-4. Understand the requirements and any existing plan
+4. Make the necessary code changes. Create intermediate commits if called for.
 
-5. Make the necessary code changes. Create intermediate commits if called for.
+5. Test your changes to ensure they work correctly
 
-6. Test your changes to ensure they work correctly
+6. ${reportProgressInstruction}
 
-7. Update your comment using ${ghPullfrogMcpName}/update_working_comment to share progress and results.
+7. When you are done, create a final commit. If relevant, indicate which issue the PR addresses somewhere in the commit message (e.g. "Fixes #123"). Create a PR with an informative title and body. If relevant, include links to the issue or comment that triggered the PR.
 
-8. Continue updating the same comment as you make progress. Never create additional comments. Always use update_working_comment.
+8. Call report_progress one final time with a summary of the results. Include links to any created issues/PRs, e.g. \`[View PR](https://github.com/org/repo/pull/123)\`
+`,
+  },
+  {
+    name: "Address Reviews",
+    description:
+      "Address PR review feedback; respond to reviewer comments; make requested changes to an existing PR",
+    prompt: `Follow these steps:
+1. Get PR info with ${ghPullfrogMcpName}/get_pull_request (this automatically fetches and checks out the PR branch)
 
-9. When you are done, create a final commit. If relevant, indicate which issue the PR addresses somewhere in the commit message (e.g. "Fixes #123"). Create a PR with an informative title and body. If relevant, include links to the issue or comment that triggered the PR.
+2. Review the feedback provided. Understand each review comment and what changes are being requested.
 
-10. Update the Working Comment one final time with a summary of the results. Include links to any created issues/PRs, e.g. \`[View PR](https://github.com/org/repo/pull/123)\`
+3. If the request requires understanding the codebase structure, dependencies, or conventions, gather relevant context. Read AGENTS.md if it exists.
+
+4. Make the necessary code changes to address the feedback. Work through each review comment systematically.
+
+5. After addressing each review comment, use ${ghPullfrogMcpName}/reply_to_review_comment to reply directly to that comment thread explaining what change was made (keep replies concise, 1-2 sentences).
+
+6. Test your changes to ensure they work correctly.
+
+7. ${reportProgressInstruction}
+
+8. When done, commit and push your changes to the existing PR branch. Do not create a new branch or PR - you are updating an existing one.
+
+9. Call report_progress one final time with a summary of all changes made.
 `,
   },
   {
@@ -40,58 +60,48 @@ export const modes: Mode[] = [
     description:
       "Review code, PRs, or implementations; provide feedback or suggestions; identify issues; or check code quality, style, and correctness",
     prompt: `Follow these steps:
-1. ${initialCommentInstruction}
+1. Get PR info with ${ghPullfrogMcpName}/get_pull_request (this automatically prepares the repository by fetching and checking out the PR branch)
 
-2. Get PR info with ${ghPullfrogMcpName}/get_pull_request (this automatically prepares the repository by fetching and checking out the PR branch)
+2. 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)
 
-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)
+3. Read files from the checked-out PR branch to understand the implementation
 
-4. Read files from the checked-out PR branch to understand the implementation
+4. ${reportProgressInstruction}
 
-5. Update your comment using ${ghPullfrogMcpName}/update_working_comment with findings as you review
+5. When submitting review: use the 'comments' array for ALL specific code issues - include the file path and line position from the diff
 
-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 update_working_comment)`,
+6. Only use the 'body' field for a brief summary (1-2 sentences) or for feedback that doesn't apply to a specific code location`,
   },
   {
     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. ${initialCommentInstruction}
+1. 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.
 
-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.
+2. Analyze the request and break it down into clear, actionable tasks
 
-3. Analyze the request and break it down into clear, actionable tasks
+3. Consider dependencies, potential challenges, and implementation order
 
-4. Consider dependencies, potential challenges, and implementation order
+4. Create a structured plan with clear milestones
 
-5. Create a structured plan with clear milestones
-
-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)`,
+5. ${reportProgressInstruction}`,
   },
   {
     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. ${initialCommentInstruction}
+1. 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.
 
-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. If the task involves making code changes:
+2. If the task involves making code changes:
    - Create a branch for your work. The branch name should be prefixed with "pullfrog/". The rest of the name should reflect the exact changes you are making. It should be specific to avoid collisions with other branches. Never commit to directly to main, master, or production.
    - Make the necessary code changes. Create intermediate commits if called for.
    - Test your changes to ensure they work correctly.
    - When you are done, create a final commit. If relevant, indicate which issue the PR addresses somewhere in the commit message (e.g. "Fixes #123"). Create a PR with an informative title and body. If relevant, include links to the issue or comment that triggered the PR.
 
-4. 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.
+3. ${reportProgressInstruction}
 
-5. 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.`,
+4. Call report_progress one final time with a summary of the results and links to any created issues, PRs, etc.`,
   },
 ];

package.json

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

utils/api.ts

@@ -24,6 +24,46 @@ export const DEFAULT_REPO_SETTINGS: RepoSettings = {
   modes: [],
 };
 
+export interface WorkflowRunInfo {
+  progressCommentId: string | null;
+  issueNumber: number | null;
+}
+
+/**
+ * Fetch workflow run info from the Pullfrog API
+ * Returns the pre-created progress comment ID if one exists
+ */
+export async function fetchWorkflowRunInfo(runId: string): Promise<WorkflowRunInfo> {
+  const apiUrl = process.env.API_URL || "https://pullfrog.ai";
+
+  // add timeout to prevent hanging (5 seconds)
+  const timeoutMs = 5000;
+  const controller = new AbortController();
+  const timeoutId = setTimeout(() => controller.abort(), timeoutMs);
+
+  try {
+    const response = await fetch(`${apiUrl}/api/workflow-run/${runId}`, {
+      method: "GET",
+      headers: {
+        "Content-Type": "application/json",
+      },
+      signal: controller.signal,
+    });
+
+    clearTimeout(timeoutId);
+
+    if (!response.ok) {
+      return { progressCommentId: null, issueNumber: null };
+    }
+
+    const data = (await response.json()) as WorkflowRunInfo;
+    return data;
+  } catch {
+    clearTimeout(timeoutId);
+    return { progressCommentId: null, issueNumber: null };
+  }
+}
+
 /**
  * Fetch repository settings from the Pullfrog API
  * Returns defaults if repo doesn't exist or fetch fails

utils/cli.ts

@@ -3,8 +3,7 @@
  */
 
 import { spawnSync } from "node:child_process";
-import { appendFileSync, existsSync } from "node:fs";
-import { join } from "node:path";
+import { existsSync } from "node:fs";
 import * as core from "@actions/core";
 import { table } from "table";
 
@@ -325,41 +324,8 @@ export const log = {
 
     log.info(output.trimEnd());
   },
-
-  /**
-   * Log MCP tool call information to mcpLog.txt in the temp directory
-   */
-  toolCallToFile: ({
-    toolName,
-    request,
-    result,
-    error,
-  }: {
-    toolName: string;
-    request: unknown;
-    result?: string;
-    error?: string;
-  }): void => {
-    const logPath = getMcpLogPath();
-    const params: Parameters<typeof formatToolCall>[0] = { toolName, request };
-    if (error) {
-      params.error = error;
-    } else if (result) {
-      params.result = result;
-    }
-    const logEntry = formatToolCall(params);
-    appendFileSync(logPath, logEntry, "utf-8");
-  },
 };
 
-/**
- * Get the path to the MCP log file in the temp directory
- */
-function getMcpLogPath(): string {
-  const tempDir = process.env.PULLFROG_TEMP_DIR!;
-  return join(tempDir, "mcpLog.txt");
-}
-
 /**
  * Format a value as JSON, using compact format for simple values and pretty-printed for complex ones
  */
@@ -385,59 +351,6 @@ export function formatIndentedField(label: string, content: string): string {
   return formatted;
 }
 
-/**
- * Format the input field for a tool call
- */
-function formatToolInput(request: unknown): string {
-  const requestFormatted = formatJsonValue(request);
-  if (requestFormatted === "{}") {
-    return "";
-  }
-  return formatIndentedField("input", requestFormatted);
-}
-
-/**
- * Format the result field for a tool call, parsing JSON if possible
- */
-function formatToolResult(result: string): string {
-  try {
-    const parsed = JSON.parse(result);
-    const formatted = formatJsonValue(parsed);
-    return formatIndentedField("result", formatted);
-  } catch {
-    // Not JSON, display as-is
-    return formatIndentedField("result", result);
-  }
-}
-
-/**
- * Format a complete tool call entry with tool name, input, result, and error
- */
-function formatToolCall({
-  toolName,
-  request,
-  result,
-  error,
-}: {
-  toolName: string;
-  request: unknown;
-  result?: string;
-  error?: string;
-}): string {
-  let logEntry = `→ ${toolName}\n`;
-
-  logEntry += formatToolInput(request);
-
-  if (error) {
-    logEntry += formatIndentedField("error", error);
-  } else if (result) {
-    logEntry += formatToolResult(result);
-  }
-
-  logEntry += "\n";
-  return logEntry;
-}
-
 /**
  * Finds a CLI executable path by checking if it's installed globally
  * @param name The name of the CLI executable to find

utils/github.ts

@@ -241,21 +241,37 @@ async function acquireNewToken(): Promise<string> {
   }
 }
 
+// Store token in memory instead of process.env
+let githubInstallationToken: string | undefined;
+
 /**
  * Setup GitHub installation token for the action
  */
 export async function setupGitHubInstallationToken(): Promise<string> {
   const acquiredToken = await acquireNewToken();
   core.setSecret(acquiredToken);
-  process.env.GITHUB_INSTALLATION_TOKEN = acquiredToken;
-
+  githubInstallationToken = acquiredToken;
   return acquiredToken;
 }
 
 /**
- * Revoke GitHub installation token
+ * Get the GitHub installation token from memory
  */
-export async function revokeInstallationToken(token: string): Promise<void> {
+export function getGitHubInstallationToken(): string {
+  if (!githubInstallationToken) {
+    throw new Error("GitHub installation token not set. Call setupGitHubInstallationToken first.");
+  }
+  return githubInstallationToken;
+}
+
+export async function revokeGitHubInstallationToken(): Promise<void> {
+  if (!githubInstallationToken) {
+    return;
+  }
+
+  const token = githubInstallationToken;
+  githubInstallationToken = undefined;
+
   const apiUrl = process.env.GITHUB_API_URL || "https://api.github.com";
 
   try {