feat: add unified update_claude_comment tool

- Add new update_claude_comment tool that automatically handles both issue and PR comments - Remove individual update_issue_comment and update_pull_request_comment tools - Pass CLAUDE_COMMENT_ID, GITHUB_EVENT_NAME, and IS_PR to MCP server environment - Use Octokit instead of raw fetch for better type safety and error handling - Simplify Claude's comment update workflow by removing need for owner/repo/commentId params - Update prompts and tests to use the new unified tool
2026-01-23 23:14:13 +08:00 · 2025-05-30 07:56:32 -07:00 · 2025-05-30 07:47:17 -07:00
32 changed files with 191 additions and 1548 deletions
--- a/.github/workflows/claude-review.yml
+++ b/.github/workflows/claude-review.yml
@@ -29,4 +29,4 @@ jobs:

            Be constructive and specific in your feedback. Give inline comments where applicable.
          anthropic_api_key: ${{ secrets.ANTHROPIC_API_KEY }}
-          allowed_tools: "mcp__github__create_pending_pull_request_review,mcp__github__add_pull_request_review_comment_to_pending_review,mcp__github__submit_pending_pull_request_review,mcp__github__get_pull_request_diff"
+          allowed_tools: "mcp__github__add_pull_request_review_comment"
--- a/.github/workflows/claude.yml
+++ b/.github/workflows/claude.yml
@@ -36,4 +36,3 @@ jobs:
          anthropic_api_key: ${{ secrets.ANTHROPIC_API_KEY }}
          allowed_tools: "Bash(bun install),Bash(bun test:*),Bash(bun run format),Bash(bun typecheck)"
          custom_instructions: "You have also been granted tools for editing files and running bun commands (install, run, test, typecheck) for testing your changes: bun install, bun test, bun run format, bun typecheck."
-          model: "claude-opus-4-20250514"
--- a/.github/workflows/issue-triage.yml
+++ b/.github/workflows/issue-triage.yml
@@ -23,20 +23,18 @@ jobs:
          mkdir -p /tmp/mcp-config
          cat > /tmp/mcp-config/mcp-servers.json << 'EOF'
          {
-            "mcpServers": {
-              "github": {
-                "command": "docker",
-                "args": [
-                  "run",
-                  "-i",
-                  "--rm",
-                  "-e",
-                  "GITHUB_PERSONAL_ACCESS_TOKEN",
-                  "ghcr.io/github/github-mcp-server:sha-6d69797"
-                ],
-                "env": {
-                  "GITHUB_PERSONAL_ACCESS_TOKEN": "${{ secrets.GITHUB_TOKEN }}"
-                }
+            "github": {
+              "command": "docker",
+              "args": [
+                "run",
+                "-i",
+                "--rm",
+                "-e",
+                "GITHUB_PERSONAL_ACCESS_TOKEN",
+                "ghcr.io/github/github-mcp-server:sha-7aced2b"
+              ],
+              "env": {
+                "GITHUB_PERSONAL_ACCESS_TOKEN": "${{ secrets.GITHUB_TOKEN }}"
              }
            }
          }
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -1,138 +0,0 @@
-name: Create Release
-
-on:
-  workflow_dispatch:
-    inputs:
-      dry_run:
-        description: "Dry run (only show what would be created)"
-        required: false
-        type: boolean
-        default: false
-
-jobs:
-  create-release:
-    runs-on: ubuntu-latest
-    permissions:
-      contents: write
-    outputs:
-      next_version: ${{ steps.next_version.outputs.next_version }}
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-
-      - name: Get latest tag
-        id: get_latest_tag
-        run: |
-          # Get only version tags (v + number pattern)
-          latest_tag=$(git tag -l 'v[0-9]*' | sort -V | tail -1 || echo "v0.0.0")
-          if [ -z "$latest_tag" ]; then
-            latest_tag="v0.0.0"
-          fi
-          echo "latest_tag=$latest_tag" >> $GITHUB_OUTPUT
-          echo "Latest tag: $latest_tag"
-
-      - name: Calculate next version
-        id: next_version
-        run: |
-          latest_tag="${{ steps.get_latest_tag.outputs.latest_tag }}"
-          # Remove 'v' prefix and split by dots
-          version=${latest_tag#v}
-          IFS='.' read -ra VERSION_PARTS <<< "$version"
-
-          # Increment patch version
-          major=${VERSION_PARTS[0]:-0}
-          minor=${VERSION_PARTS[1]:-0}
-          patch=${VERSION_PARTS[2]:-0}
-          patch=$((patch + 1))
-
-          next_version="v${major}.${minor}.${patch}"
-          echo "next_version=$next_version" >> $GITHUB_OUTPUT
-          echo "Next version: $next_version"
-
-      - name: Display dry run info
-        if: ${{ inputs.dry_run }}
-        run: |
-          echo "🔍 DRY RUN MODE"
-          echo "Would create tag: ${{ steps.next_version.outputs.next_version }}"
-          echo "From commit: ${{ github.sha }}"
-          echo "Previous tag: ${{ steps.get_latest_tag.outputs.latest_tag }}"
-
-      - name: Create and push tag
-        if: ${{ !inputs.dry_run }}
-        run: |
-          next_version="${{ steps.next_version.outputs.next_version }}"
-          git config user.name "github-actions[bot]"
-          git config user.email "github-actions[bot]@users.noreply.github.com"
-
-          git tag -a "$next_version" -m "Release $next_version"
-          git push origin "$next_version"
-
-      - name: Create Release
-        if: ${{ !inputs.dry_run }}
-        env:
-          GH_TOKEN: ${{ github.token }}
-        run: |
-          next_version="${{ steps.next_version.outputs.next_version }}"
-
-          gh release create "$next_version" \
-            --title "$next_version" \
-            --generate-notes \
-            --latest=false # We want to keep beta as the latest
-
-  update-beta-tag:
-    needs: create-release
-    if: ${{ !inputs.dry_run }}
-    runs-on: ubuntu-latest
-    permissions:
-      contents: write
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-
-      - name: Update beta tag
-        run: |
-          # Get the latest version tag
-          VERSION=$(git tag -l 'v[0-9]*' | sort -V | tail -1)
-
-          # Update the beta tag to point to this release
-          git config user.name "github-actions[bot]"
-          git config user.email "github-actions[bot]@users.noreply.github.com"
-          git tag -fa beta -m "Update beta tag to ${VERSION}"
-          git push origin beta --force
-
-      - name: Update beta release to be latest
-        env:
-          GH_TOKEN: ${{ github.token }}
-        run: |
-          # Update beta release to be marked as latest
-          gh release edit beta --latest
-
-  update-major-tag:
-    needs: create-release
-    if: ${{ !inputs.dry_run }}
-    runs-on: ubuntu-latest
-    permissions:
-      contents: write
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-
-      - name: Update major version tag
-        run: |
-          next_version="${{ needs.create-release.outputs.next_version }}"
-          # Extract major version (e.g., v0 from v0.0.20)
-          major_version=$(echo "$next_version" | cut -d. -f1)
-
-          # Update the major version tag to point to this release
-          git config user.name "github-actions[bot]"
-          git config user.email "github-actions[bot]@users.noreply.github.com"
-          git tag -fa "$major_version" -m "Update $major_version tag to $next_version"
-          git push origin "$major_version" --force
-
-          echo "Updated $major_version tag to point to $next_version"
--- a/FAQ.md
+++ b/FAQ.md
@@ -6,7 +6,7 @@ This FAQ addresses common questions and gotchas when using the Claude Code GitHu

 ### Why doesn't tagging @claude from my automated workflow work?

-The `github-actions` user cannot trigger subsequent GitHub Actions workflows. This is a GitHub security feature to prevent infinite loops. To make this work, you need to use a Personal Access Token (PAT) instead, which will act as a regular user, or use a separate app token of your own. When posting a comment on an issue or PR from your workflow, use your PAT instead of the `GITHUB_TOKEN` generated in your workflow.
+The `github-actions` user (and other GitHub Apps/bots) cannot trigger subsequent GitHub Actions workflows. This is a GitHub security feature to prevent infinite loops. To make this work, you need to use a Personal Access Token (PAT) instead, which will act as a regular user. When posting a comment on an issue or PR from your workflow, use your PAT instead of the `GITHUB_TOKEN` generated in your workflow.

 ### Why does Claude say I don't have permission to trigger it?

--- a/README.md
+++ b/README.md
@@ -65,13 +65,6 @@ jobs:
          # trigger_phrase: "/claude"
          # Optional: add assignee trigger for issues
          # assignee_trigger: "claude"
-          # Optional: add custom environment variables (YAML format)
-          # claude_env: |
-          #   NODE_ENV: test
-          #   DEBUG: true
-          #   API_URL: https://api.example.com
-          # Optional: limit the number of conversation turns
-          # max_turns: "5"
 ```

 ## Inputs
@@ -80,7 +73,6 @@ jobs:
 | --------------------- | -------------------------------------------------------------------------------------------------------------------- | -------- | --------- |
 | `anthropic_api_key`   | Anthropic API key (required for direct API, not needed for Bedrock/Vertex)                                           | No\*     | -         |
 | `direct_prompt`       | Direct prompt for Claude to execute automatically without needing a trigger (for automated workflows)                | No       | -         |
-| `max_turns`           | Maximum number of conversation turns Claude can take (limits back-and-forth exchanges)                               | No       | -         |
 | `timeout_minutes`     | Timeout in minutes for execution                                                                                     | No       | `30`      |
 | `github_token`        | GitHub token for Claude to operate with. **Only include this if you're connecting a custom GitHub app of your own!** | No       | -         |
 | `model`               | Model to use (provider-specific format required for Bedrock/Vertex)                                                  | No       | -         |
@@ -90,104 +82,13 @@ jobs:
 | `allowed_tools`       | Additional tools for Claude to use (the base GitHub tools will always be included)                                   | No       | ""        |
 | `disallowed_tools`    | Tools that Claude should never use                                                                                   | No       | ""        |
 | `custom_instructions` | Additional custom instructions to include in the prompt for Claude                                                   | No       | ""        |
-| `mcp_config`          | Additional MCP configuration (JSON string) that merges with the built-in GitHub MCP servers                          | No       | ""        |
 | `assignee_trigger`    | The assignee username that triggers the action (e.g. @claude). Only used for issue assignment                        | No       | -         |
 | `trigger_phrase`      | The trigger phrase to look for in comments, issue/PR bodies, and issue titles                                        | No       | `@claude` |
-| `claude_env`          | Custom environment variables to pass to Claude Code execution (YAML format)                                          | No       | ""        |

 \*Required when using direct Anthropic API (default and when not using Bedrock or Vertex)

 > **Note**: This action is currently in beta. Features and APIs may change as we continue to improve the integration.

-### Using Custom MCP Configuration
-
-The `mcp_config` input allows you to add custom MCP (Model Context Protocol) servers to extend Claude's capabilities. These servers merge with the built-in GitHub MCP servers.
-
-#### Basic Example: Adding a Sequential Thinking Server
-
-```yaml
- uses: anthropics/claude-code-action@beta
-  with:
-    anthropic_api_key: ${{ secrets.ANTHROPIC_API_KEY }}
-    mcp_config: |
-      {
-        "mcpServers": {
-          "sequential-thinking": {
-            "command": "npx",
-            "args": [
-              "-y",
-              "@modelcontextprotocol/server-sequential-thinking"
-            ]
-          }
-        }
-      }
-    allowed_tools: "mcp__sequential-thinking__sequentialthinking" # Important: Each MCP tool from your server must be listed here, comma-separated
-    # ... other inputs
-```
-
-#### Passing Secrets to MCP Servers
-
-For MCP servers that require sensitive information like API keys or tokens, use GitHub Secrets in the environment variables:
-
-```yaml
- uses: anthropics/claude-code-action@beta
-  with:
-    anthropic_api_key: ${{ secrets.ANTHROPIC_API_KEY }}
-    mcp_config: |
-      {
-        "mcpServers": {
-          "custom-api-server": {
-            "command": "npx",
-            "args": ["-y", "@example/api-server"],
-            "env": {
-              "API_KEY": "${{ secrets.CUSTOM_API_KEY }}",
-              "BASE_URL": "https://api.example.com"
-            }
-          }
-        }
-      }
-    # ... other inputs
-```
-
-#### Using Python MCP Servers with uv
-
-For Python-based MCP servers managed with `uv`, you need to specify the directory containing your server:
-
-```yaml
- uses: anthropics/claude-code-action@beta
-  with:
-    anthropic_api_key: ${{ secrets.ANTHROPIC_API_KEY }}
-    mcp_config: |
-      {
-        "mcpServers": {
-          "my-python-server": {
-            "type": "stdio",
-            "command": "uv",
-            "args": [
-              "--directory",
-              "${{ github.workspace }}/path/to/server/",
-              "run",
-              "server_file.py"
-            ]
-          }
-        }
-      }
-    allowed_tools: "my-python-server__<tool_name>" # Replace <tool_name> with your server's tool names
-    # ... other inputs
-```
-
-For example, if your Python MCP server is at `mcp_servers/weather.py`, you would use:
-
-```yaml
-"args":
-  ["--directory", "${{ github.workspace }}/mcp_servers/", "run", "weather.py"]
-```
-
-**Important**:
-
- Always use GitHub Secrets (`${{ secrets.SECRET_NAME }}`) for sensitive values like API keys, tokens, or passwords. Never hardcode secrets directly in the workflow file.
- Your custom servers will override any built-in servers with the same name.
-
 ## Examples

 ### Ways to Tag @claude
@@ -332,40 +233,6 @@ This action is built on top of [`anthropics/claude-code-base-action`](https://gi

 ## Advanced Configuration

-### Custom Environment Variables
-
-You can pass custom environment variables to Claude Code execution using the `claude_env` input. This is useful for CI/test setups that require specific environment variables:
-
-```yaml
- uses: anthropics/claude-code-action@beta
-  with:
-    claude_env: |
-      NODE_ENV: test
-      CI: true
-      DATABASE_URL: postgres://test:test@localhost:5432/test_db
-    # ... other inputs
-```
-
-The `claude_env` input accepts YAML format where each line defines a key-value pair. These environment variables will be available to Claude Code during execution, allowing it to run tests, build processes, or other commands that depend on specific environment configurations.
-
-### Limiting Conversation Turns
-
-You can use the `max_turns` parameter to limit the number of back-and-forth exchanges Claude can have during task execution. This is useful for:
-
- Controlling costs by preventing runaway conversations
- Setting time boundaries for automated workflows
- Ensuring predictable behavior in CI/CD pipelines
-
-```yaml
- uses: anthropics/claude-code-action@beta
-  with:
-    anthropic_api_key: ${{ secrets.ANTHROPIC_API_KEY }}
-    max_turns: "5" # Limit to 5 conversation turns
-    # ... other inputs
-```
-
-When the turn limit is reached, Claude will stop execution gracefully. Choose a value that gives Claude enough turns to complete typical tasks while preventing excessive usage.
-
 ### Custom Tools

 By default, Claude only has access to:
@@ -381,15 +248,8 @@ Claude does **not** have access to execute arbitrary Bash commands by default. I
 ```yaml
 - uses: anthropics/claude-code-action@beta
  with:
-    allowed_tools: |
-      Bash(npm install)
-      Bash(npm run test)
-      Edit
-      Replace
-      NotebookEditCell
-    disallowed_tools: |
-      TaskOutput
-      KillTask
+    allowed_tools: "Bash(npm install),Bash(npm run test),Edit,Replace,NotebookEditCell"
+    disallowed_tools: "TaskOutput,KillTask"
    # ... other inputs
 ```

--- a/ROADMAP.md
+++ b/ROADMAP.md
@@ -1,20 +0,0 @@
-# Claude Code GitHub Action Roadmap
-
-Thank you for trying out the beta of our GitHub Action! This document outlines our path to `v1.0`. Items are not necessarily in priority order.
-
-## Path to 1.0
-
- **Ability to see GitHub Action CI results** - This will enable Claude to look at CI failures and make updates to PRs to fix test failures, lint errors, and the like.
- **Cross-repo support** - Enable Claude to work across multiple repositories in a single session
- **Ability to modify workflow files** - Let Claude update GitHub Actions workflows and other CI configuration files
- **Support for workflow_dispatch and repository_dispatch events** - Dispatch Claude on events triggered via API from other workflows or from other services
- **Ability to disable commit signing** - Option to turn off GPG signing for environments where it's not required. This will enable Claude to use normal `git` bash commands for committing. This will likely become the default behavior once added.
- **Better code review behavior** - Support inline comments on specific lines, provide higher quality reviews with more actionable feedback
- **Support triggering @claude from bot users** - Allow automation and bot accounts to invoke Claude
- **Customizable base prompts** - Full control over Claude's initial context with template variables like `$PR_COMMENTS`, `$PR_FILES`, etc. Users can replace our default prompt entirely while still accessing key contextual data
-
---
-
-**Note:** This roadmap represents our current vision for reaching `v1.0` and is subject to change based on user feedback and development priorities.
-
-We welcome feedback on these planned features! If you're interested in contributing to any of these features, please open an issue to discuss implementation details with us. We're also open to suggestions for new features not listed here.
--- a/action.yml
+++ b/action.yml
@@ -39,12 +39,6 @@ inputs:
    description: "Direct instruction for Claude (bypasses normal trigger detection)"
    required: false
    default: ""
-  mcp_config:
-    description: "Additional MCP configuration (JSON string) that merges with the built-in GitHub MCP servers"
-  claude_env:
-    description: "Custom environment variables to pass to Claude Code execution (YAML format)"
-    required: false
-    default: ""

  # Auth configuration
  anthropic_api_key:
@@ -62,10 +56,6 @@ inputs:
    required: false
    default: "false"

-  max_turns:
-    description: "Maximum number of conversation turns"
-    required: false
-    default: ""
  timeout_minutes:
    description: "Timeout in minutes for execution"
    required: false
@@ -87,42 +77,38 @@ runs:
    - name: Install Dependencies
      shell: bash
      run: |
-        cd ${GITHUB_ACTION_PATH}
+        cd ${{ github.action_path }}
        bun install

    - name: Prepare action
      id: prepare
      shell: bash
      run: |
-        bun run ${GITHUB_ACTION_PATH}/src/entrypoints/prepare.ts
+        bun run ${{ github.action_path }}/src/entrypoints/prepare.ts
      env:
        TRIGGER_PHRASE: ${{ inputs.trigger_phrase }}
        ASSIGNEE_TRIGGER: ${{ inputs.assignee_trigger }}
        BASE_BRANCH: ${{ inputs.base_branch }}
        ALLOWED_TOOLS: ${{ inputs.allowed_tools }}
-        DISALLOWED_TOOLS: ${{ inputs.disallowed_tools }}
        CUSTOM_INSTRUCTIONS: ${{ inputs.custom_instructions }}
        DIRECT_PROMPT: ${{ inputs.direct_prompt }}
-        MCP_CONFIG: ${{ inputs.mcp_config }}
        OVERRIDE_GITHUB_TOKEN: ${{ inputs.github_token }}
        GITHUB_RUN_ID: ${{ github.run_id }}

    - name: Run Claude Code
      id: claude-code
      if: steps.prepare.outputs.contains_trigger == 'true'
-      uses: anthropics/claude-code-base-action@cef27f3f006b4c6e8394105604f63f20e84ae300 # v0.0.21
+      uses: anthropics/claude-code-base-action@c8e31bd52d9a149b3f8309d7978c6edaa282688d # v0.0.8
      with:
-        prompt_file: ${{ runner.temp }}/claude-prompts/claude-prompt.txt
+        prompt_file: /tmp/claude-prompts/claude-prompt.txt
        allowed_tools: ${{ env.ALLOWED_TOOLS }}
        disallowed_tools: ${{ env.DISALLOWED_TOOLS }}
        timeout_minutes: ${{ inputs.timeout_minutes }}
-        max_turns: ${{ inputs.max_turns }}
        model: ${{ inputs.model || inputs.anthropic_model }}
        mcp_config: ${{ steps.prepare.outputs.mcp_config }}
        use_bedrock: ${{ inputs.use_bedrock }}
        use_vertex: ${{ inputs.use_vertex }}
        anthropic_api_key: ${{ inputs.anthropic_api_key }}
-        claude_env: ${{ inputs.claude_env }}
      env:
        # Model configuration
        ANTHROPIC_MODEL: ${{ inputs.model || inputs.anthropic_model }}
@@ -153,7 +139,7 @@ runs:
      if: steps.prepare.outputs.contains_trigger == 'true' && steps.prepare.outputs.claude_comment_id && always()
      shell: bash
      run: |
-        bun run ${GITHUB_ACTION_PATH}/src/entrypoints/update-comment-link.ts
+        bun run ${{ github.action_path }}/src/entrypoints/update-comment-link.ts
      env:
        REPOSITORY: ${{ github.repository }}
        PR_NUMBER: ${{ github.event.issue.number || github.event.pull_request.number }}
--- a/bun.lock
+++ b/bun.lock
@@ -2,7 +2,7 @@
  "lockfileVersion": 1,
  "workspaces": {
    "": {
-      "name": "@anthropic-ai/claude-code-action",
+      "name": "claude-pr-action",
      "dependencies": {
        "@actions/core": "^1.10.1",
        "@actions/github": "^6.0.1",
--- a/examples/claude-auto-review.yml
+++ b/examples/claude-auto-review.yml
@@ -35,4 +35,4 @@ jobs:

            Provide constructive feedback with specific suggestions for improvement.
            Use inline comments to highlight specific areas of concern.
-          # allowed_tools: "mcp__github__create_pending_pull_request_review,mcp__github__add_pull_request_review_comment_to_pending_review,mcp__github__submit_pending_pull_request_review,mcp__github__get_pull_request_diff"
+          # allowed_tools: "mcp__github__add_pull_request_review_comment"
--- a/package.json
+++ b/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "@anthropic-ai/claude-code-action",
+  "name": "claude-pr-action",
  "version": "1.0.0",
  "private": true,
  "scripts": {
--- a/src/create-prompt/index.ts
+++ b/src/create-prompt/index.ts
@@ -24,7 +24,6 @@ export type { CommonFields, PreparedContext } from "./types";

 const BASE_ALLOWED_TOOLS = [
  "Edit",
-  "MultiEdit",
  "Glob",
  "Grep",
  "LS",
@@ -36,35 +35,38 @@ const BASE_ALLOWED_TOOLS = [
 ];
 const DISALLOWED_TOOLS = ["WebSearch", "WebFetch"];

-export function buildAllowedToolsString(customAllowedTools?: string[]): string {
+export function buildAllowedToolsString(customAllowedTools?: string): string {
  let baseTools = [...BASE_ALLOWED_TOOLS];

  let allAllowedTools = baseTools.join(",");
-  if (customAllowedTools && customAllowedTools.length > 0) {
-    allAllowedTools = `${allAllowedTools},${customAllowedTools.join(",")}`;
+  if (customAllowedTools) {
+    allAllowedTools = `${allAllowedTools},${customAllowedTools}`;
  }
  return allAllowedTools;
 }

 export function buildDisallowedToolsString(
-  customDisallowedTools?: string[],
-  allowedTools?: string[],
+  customDisallowedTools?: string,
+  allowedTools?: string,
 ): string {
  let disallowedTools = [...DISALLOWED_TOOLS];

  // If user has explicitly allowed some hardcoded disallowed tools, remove them from disallowed list
-  if (allowedTools && allowedTools.length > 0) {
+  if (allowedTools) {
+    const allowedToolsArray = allowedTools
+      .split(",")
+      .map((tool) => tool.trim());
    disallowedTools = disallowedTools.filter(
-      (tool) => !allowedTools.includes(tool),
+      (tool) => !allowedToolsArray.includes(tool),
    );
  }

  let allDisallowedTools = disallowedTools.join(",");
-  if (customDisallowedTools && customDisallowedTools.length > 0) {
+  if (customDisallowedTools) {
    if (allDisallowedTools) {
-      allDisallowedTools = `${allDisallowedTools},${customDisallowedTools.join(",")}`;
+      allDisallowedTools = `${allDisallowedTools},${customDisallowedTools}`;
    } else {
-      allDisallowedTools = customDisallowedTools.join(",");
+      allDisallowedTools = customDisallowedTools;
    }
  }
  return allDisallowedTools;
@@ -118,10 +120,8 @@ export function prepareContext(
    triggerPhrase,
    ...(triggerUsername && { triggerUsername }),
    ...(customInstructions && { customInstructions }),
-    ...(allowedTools.length > 0 && { allowedTools: allowedTools.join(",") }),
-    ...(disallowedTools.length > 0 && {
-      disallowedTools: disallowedTools.join(","),
-    }),
+    ...(allowedTools && { allowedTools }),
+    ...(disallowedTools && { disallowedTools }),
    ...(directPrompt && { directPrompt }),
    ...(claudeBranch && { claudeBranch }),
  };
@@ -418,7 +418,6 @@ ${
 }
 <claude_comment_id>${context.claudeCommentId}</claude_comment_id>
 <trigger_username>${context.triggerUsername ?? "Unknown"}</trigger_username>
-<trigger_display_name>${githubData.triggerDisplayName ?? context.triggerUsername ?? "Unknown"}</trigger_display_name>
 <trigger_phrase>${context.triggerPhrase}</trigger_phrase>
 ${
  (eventData.eventName === "issue_comment" ||
@@ -504,14 +503,12 @@ ${context.directPrompt ? `   - DIRECT INSTRUCTION: A direct instruction was prov
          ? `
      - Push directly using mcp__github_file_ops__commit_files to the existing branch (works for both new and existing files).
      - Use mcp__github_file_ops__commit_files to commit files atomically in a single commit (supports single or multiple files).
-      - When pushing changes with this tool and the trigger user is not "Unknown", include a Co-authored-by trailer in the commit message.
-      - Use: "Co-authored-by: ${githubData.triggerDisplayName ?? context.triggerUsername} <${context.triggerUsername}@users.noreply.github.com>"`
+      - When pushing changes with this tool and TRIGGER_USERNAME is not "Unknown", include a "Co-authored-by: ${context.triggerUsername} <${context.triggerUsername}@users.noreply.github.com>" line in the commit message.`
          : `
      - You are already on the correct branch (${eventData.claudeBranch || "the PR branch"}). Do not create a new branch.
      - Push changes directly to the current branch using mcp__github_file_ops__commit_files (works for both new and existing files)
      - Use mcp__github_file_ops__commit_files to commit files atomically in a single commit (supports single or multiple files).
-      - When pushing changes and the trigger user is not "Unknown", include a Co-authored-by trailer in the commit message.
-      - Use: "Co-authored-by: ${githubData.triggerDisplayName ?? context.triggerUsername} <${context.triggerUsername}@users.noreply.github.com>"
+      - When pushing changes and TRIGGER_USERNAME is not "Unknown", include a "Co-authored-by: ${context.triggerUsername} <${context.triggerUsername}@users.noreply.github.com>" line in the commit message.
      ${
        eventData.claudeBranch
          ? `- Provide a URL to create a PR manually in this format:
@@ -624,9 +621,7 @@ export async function createPrompt(
      claudeBranch,
    );

-    await mkdir(`${process.env.RUNNER_TEMP}/claude-prompts`, {
-      recursive: true,
-    });
+    await mkdir("/tmp/claude-prompts", { recursive: true });

    // Generate the prompt
    const promptContent = generatePrompt(preparedContext, githubData);
@@ -637,18 +632,15 @@ export async function createPrompt(
    console.log("=======================");

    // Write the prompt file
-    await writeFile(
-      `${process.env.RUNNER_TEMP}/claude-prompts/claude-prompt.txt`,
-      promptContent,
-    );
+    await writeFile("/tmp/claude-prompts/claude-prompt.txt", promptContent);

    // Set allowed tools
    const allAllowedTools = buildAllowedToolsString(
-      context.inputs.allowedTools,
+      preparedContext.allowedTools,
    );
    const allDisallowedTools = buildDisallowedToolsString(
-      context.inputs.disallowedTools,
-      context.inputs.allowedTools,
+      preparedContext.disallowedTools,
+      preparedContext.allowedTools,
    );

    core.exportVariable("ALLOWED_TOOLS", allAllowedTools);
--- a/src/entrypoints/prepare.ts
+++ b/src/entrypoints/prepare.ts
@@ -59,7 +59,6 @@ async function run() {
      repository: `${context.repository.owner}/${context.repository.repo}`,
      prNumber: context.entityNumber.toString(),
      isPR: context.isPR,
-      triggerUsername: context.actor,
    });

    // Step 8: Setup branch
@@ -85,16 +84,13 @@ async function run() {
    );

    // Step 11: Get MCP configuration
-    const additionalMcpConfig = process.env.MCP_CONFIG || "";
-    const mcpConfig = await prepareMcpConfig({
+    const mcpConfig = await prepareMcpConfig(
      githubToken,
-      owner: context.repository.owner,
-      repo: context.repository.repo,
-      branch: branchInfo.currentBranch,
-      additionalMcpConfig,
-      claudeCommentId: commentId.toString(),
-      allowedTools: context.inputs.allowedTools,
-    });
+      context.repository.owner,
+      context.repository.repo,
+      branchInfo.currentBranch,
+      commentId.toString(),
+    );
    core.setOutput("mcp_config", mcpConfig);
  } catch (error) {
    const errorMessage = error instanceof Error ? error.message : String(error);
--- a/src/entrypoints/update-comment-link.ts
+++ b/src/entrypoints/update-comment-link.ts
@@ -12,7 +12,6 @@ import {
 } from "../github/context";
 import { GITHUB_SERVER_URL } from "../github/api/config";
 import { checkAndDeleteEmptyBranch } from "../github/operations/branch-cleanup";
-import { updateClaudeComment } from "../github/operations/comments/update-claude-comment";

 async function run() {
  try {
@@ -167,7 +166,7 @@ async function run() {
          if (Array.isArray(outputData) && outputData.length > 0) {
            const lastElement = outputData[outputData.length - 1];
            if (
-              lastElement.type === "result" &&
+              lastElement.role === "system" &&
              "cost_usd" in lastElement &&
              "duration_ms" in lastElement
            ) {
@@ -205,14 +204,23 @@ async function run() {

    const updatedBody = updateCommentBody(commentInput);

+    // Update the comment using the appropriate API
    try {
-      await updateClaudeComment(octokit.rest, {
-        owner,
-        repo,
-        commentId,
-        body: updatedBody,
-        isPullRequestReviewComment: isPRReviewComment,
-      });
+      if (isPRReviewComment) {
+        await octokit.rest.pulls.updateReviewComment({
+          owner,
+          repo,
+          comment_id: commentId,
+          body: updatedBody,
+        });
+      } else {
+        await octokit.rest.issues.updateComment({
+          owner,
+          repo,
+          comment_id: commentId,
+          body: updatedBody,
+        });
+      }
      console.log(
        `✅ Updated ${isPRReviewComment ? "PR review" : "issue"} comment ${commentId} with job link`,
      );
--- a/src/github/api/client.ts
+++ b/src/github/api/client.ts
@@ -9,10 +9,7 @@ export type Octokits = {

 export function createOctokit(token: string): Octokits {
  return {
-    rest: new Octokit({
-      auth: token,
-      baseUrl: GITHUB_API_URL,
-    }),
+    rest: new Octokit({ auth: token }),
    graphql: graphql.defaults({
      baseUrl: GITHUB_API_URL,
      headers: {
--- a/src/github/api/queries/github.ts
+++ b/src/github/api/queries/github.ts
@@ -104,11 +104,3 @@ export const ISSUE_QUERY = `
    }
  }
 `;
-
-export const USER_QUERY = `
-  query($login: String!) {
-    user(login: $login) {
-      name
-    }
-  }
-`;
--- a/src/github/context.ts
+++ b/src/github/context.ts
@@ -28,8 +28,8 @@ export type ParsedGitHubContext = {
  inputs: {
    triggerPhrase: string;
    assigneeTrigger: string;
-    allowedTools: string[];
-    disallowedTools: string[];
+    allowedTools: string;
+    disallowedTools: string;
    customInstructions: string;
    directPrompt: string;
    baseBranch?: string;
@@ -52,8 +52,8 @@ export function parseGitHubContext(): ParsedGitHubContext {
    inputs: {
      triggerPhrase: process.env.TRIGGER_PHRASE ?? "@claude",
      assigneeTrigger: process.env.ASSIGNEE_TRIGGER ?? "",
-      allowedTools: parseMultilineInput(process.env.ALLOWED_TOOLS ?? ""),
-      disallowedTools: parseMultilineInput(process.env.DISALLOWED_TOOLS ?? ""),
+      allowedTools: process.env.ALLOWED_TOOLS ?? "",
+      disallowedTools: process.env.DISALLOWED_TOOLS ?? "",
      customInstructions: process.env.CUSTOM_INSTRUCTIONS ?? "",
      directPrompt: process.env.DIRECT_PROMPT ?? "",
      baseBranch: process.env.BASE_BRANCH,
@@ -110,14 +110,6 @@ export function parseGitHubContext(): ParsedGitHubContext {
  }
 }

-export function parseMultilineInput(s: string): string[] {
-  return s
-    .split(/,|[\n\r]+/)
-    .map((tool) => tool.replace(/#.+$/, ""))
-    .map((tool) => tool.trim())
-    .filter((tool) => tool.length > 0);
-}
-
 export function isIssuesEvent(
  context: ParsedGitHubContext,
 ): context is ParsedGitHubContext & { payload: IssuesEvent } {
--- a/src/github/data/fetcher.ts
+++ b/src/github/data/fetcher.ts
@@ -1,24 +1,23 @@
 import { execSync } from "child_process";
-import type { Octokits } from "../api/client";
-import { ISSUE_QUERY, PR_QUERY, USER_QUERY } from "../api/queries/github";
 import type {
+  GitHubPullRequest,
+  GitHubIssue,
  GitHubComment,
  GitHubFile,
-  GitHubIssue,
-  GitHubPullRequest,
  GitHubReview,
-  IssueQueryResponse,
  PullRequestQueryResponse,
+  IssueQueryResponse,
 } from "../types";
-import type { CommentWithImages } from "../utils/image-downloader";
+import { PR_QUERY, ISSUE_QUERY } from "../api/queries/github";
+import type { Octokits } from "../api/client";
 import { downloadCommentImages } from "../utils/image-downloader";
+import type { CommentWithImages } from "../utils/image-downloader";

 type FetchDataParams = {
  octokits: Octokits;
  repository: string;
  prNumber: string;
  isPR: boolean;
-  triggerUsername?: string;
 };

 export type GitHubFileWithSHA = GitHubFile & {
@@ -32,7 +31,6 @@ export type FetchDataResult = {
  changedFilesWithSHA: GitHubFileWithSHA[];
  reviewData: { nodes: GitHubReview[] } | null;
  imageUrlMap: Map<string, string>;
-  triggerDisplayName?: string | null;
 };

 export async function fetchGitHubData({
@@ -40,7 +38,6 @@ export async function fetchGitHubData({
  repository,
  prNumber,
  isPR,
-  triggerUsername,
 }: FetchDataParams): Promise<FetchDataResult> {
  const [owner, repo] = repository.split("/");
  if (!owner || !repo) {
@@ -104,14 +101,6 @@ export async function fetchGitHubData({
  let changedFilesWithSHA: GitHubFileWithSHA[] = [];
  if (isPR && changedFiles.length > 0) {
    changedFilesWithSHA = changedFiles.map((file) => {
-      // Don't compute SHA for deleted files
-      if (file.changeType === "DELETED") {
-        return {
-          ...file,
-          sha: "deleted",
-        };
-      }
-
      try {
        // Use git hash-object to compute the SHA for the current file content
        const sha = execSync(`git hash-object "${file.path}"`, {
@@ -194,12 +183,6 @@ export async function fetchGitHubData({
    allComments,
  );

-  // Fetch trigger user display name if username is provided
-  let triggerDisplayName: string | null | undefined;
-  if (triggerUsername) {
-    triggerDisplayName = await fetchUserDisplayName(octokits, triggerUsername);
-  }
-
  return {
    contextData,
    comments,
@@ -207,27 +190,5 @@ export async function fetchGitHubData({
    changedFilesWithSHA,
    reviewData,
    imageUrlMap,
-    triggerDisplayName,
  };
 }
-
-export type UserQueryResponse = {
-  user: {
-    name: string | null;
-  };
-};
-
-export async function fetchUserDisplayName(
-  octokits: Octokits,
-  login: string,
-): Promise<string | null> {
-  try {
-    const result = await octokits.graphql<UserQueryResponse>(USER_QUERY, {
-      login,
-    });
-    return result.user.name;
-  } catch (error) {
-    console.warn(`Failed to fetch user display name for ${login}:`, error);
-    return null;
-  }
-}
--- a/src/github/operations/branch.ts
+++ b/src/github/operations/branch.ts
@@ -45,16 +45,9 @@ export async function setupBranch(

      const branchName = prData.headRefName;

-      // Determine optimal fetch depth based on PR commit count, with a minimum of 20
-      const commitCount = prData.commits.totalCount;
-      const fetchDepth = Math.max(commitCount, 20);
-
-      console.log(
-        `PR #${entityNumber}: ${commitCount} commits, using fetch depth ${fetchDepth}`,
-      );
-
-      // Execute git commands to checkout PR branch (dynamic depth based on PR size)
-      await $`git fetch origin --depth=${fetchDepth} ${branchName}`;
+      // Execute git commands to checkout PR branch (shallow fetch for performance)
+      // Fetch the branch with a depth of 20 to avoid fetching too much history, while still allowing for some context
+      await $`git fetch origin --depth=20 ${branchName}`;
      await $`git checkout ${branchName}`;

      console.log(`Successfully checked out PR branch for PR #${entityNumber}`);
--- a/src/github/operations/comments/update-claude-comment.ts
+++ b/src/github/operations/comments/update-claude-comment.ts
@@ -1,70 +0,0 @@
-import { Octokit } from "@octokit/rest";
-
-export type UpdateClaudeCommentParams = {
-  owner: string;
-  repo: string;
-  commentId: number;
-  body: string;
-  isPullRequestReviewComment: boolean;
-};
-
-export type UpdateClaudeCommentResult = {
-  id: number;
-  html_url: string;
-  updated_at: string;
-};
-
-/**
- * Updates a Claude comment on GitHub (either an issue/PR comment or a PR review comment)
- *
- * @param octokit - Authenticated Octokit instance
- * @param params - Parameters for updating the comment
- * @returns The updated comment details
- * @throws Error if the update fails
- */
-export async function updateClaudeComment(
-  octokit: Octokit,
-  params: UpdateClaudeCommentParams,
-): Promise<UpdateClaudeCommentResult> {
-  const { owner, repo, commentId, body, isPullRequestReviewComment } = params;
-
-  let response;
-
-  try {
-    if (isPullRequestReviewComment) {
-      // Try PR review comment API first
-      response = await octokit.rest.pulls.updateReviewComment({
-        owner,
-        repo,
-        comment_id: commentId,
-        body,
-      });
-    } else {
-      // Use issue comment API (works for both issues and PR general comments)
-      response = await octokit.rest.issues.updateComment({
-        owner,
-        repo,
-        comment_id: commentId,
-        body,
-      });
-    }
-  } catch (error: any) {
-    // If PR review comment update fails with 404, fall back to issue comment API
-    if (isPullRequestReviewComment && error.status === 404) {
-      response = await octokit.rest.issues.updateComment({
-        owner,
-        repo,
-        comment_id: commentId,
-        body,
-      });
-    } else {
-      throw error;
-    }
-  }
-
-  return {
-    id: response.data.id,
-    html_url: response.data.html_url,
-    updated_at: response.data.updated_at,
-  };
-}
--- a/src/github/operations/comments/update-with-branch.ts
+++ b/src/github/operations/comments/update-with-branch.ts
@@ -15,7 +15,6 @@ import {
  isPullRequestReviewCommentEvent,
  type ParsedGitHubContext,
 } from "../../context";
-import { updateClaudeComment } from "./update-claude-comment";

 export async function updateTrackingComment(
  octokit: Octokits,
@@ -37,19 +36,25 @@ export async function updateTrackingComment(

  // Update the existing comment with the branch link
  try {
-    const isPRReviewComment = isPullRequestReviewCommentEvent(context);
-
-    await updateClaudeComment(octokit.rest, {
-      owner,
-      repo,
-      commentId,
-      body: updatedBody,
-      isPullRequestReviewComment: isPRReviewComment,
-    });
-
-    console.log(
-      `✅ Updated ${isPRReviewComment ? "PR review" : "issue"} comment ${commentId} with branch link`,
-    );
+    if (isPullRequestReviewCommentEvent(context)) {
+      // For PR review comments (inline comments), use the pulls API
+      await octokit.rest.pulls.updateReviewComment({
+        owner,
+        repo,
+        comment_id: commentId,
+        body: updatedBody,
+      });
+      console.log(`✅ Updated PR review comment ${commentId} with branch link`);
+    } else {
+      // For all other comments, use the issues API
+      await octokit.rest.issues.updateComment({
+        owner,
+        repo,
+        comment_id: commentId,
+        body: updatedBody,
+      });
+      console.log(`✅ Updated issue comment ${commentId} with branch link`);
+    }
  } catch (error) {
    console.error("Error updating comment with branch link:", error);
    throw error;
--- a/src/github/types.ts
+++ b/src/github/types.ts
@@ -1,7 +1,6 @@
 // Types for GitHub GraphQL query responses
 export type GitHubAuthor = {
  login: string;
-  name?: string;
 };

 export type GitHubComment = {
--- a/src/mcp/github-file-ops-server.ts
+++ b/src/mcp/github-file-ops-server.ts
@@ -8,7 +8,6 @@ import { join } from "path";
 import fetch from "node-fetch";
 import { GITHUB_API_URL } from "../github/api/config";
 import { Octokit } from "@octokit/rest";
-import { updateClaudeComment } from "../github/operations/comments/update-claude-comment";

 type GitHubRef = {
  object: {
@@ -441,6 +440,7 @@ server.tool(
  },
 );

+// Update Claude comment tool
 server.tool(
  "update_claude_comment",
  "Update the Claude comment with progress and results (automatically handles both issue and PR comments)",
@@ -464,27 +464,62 @@ server.tool(
      const repo = REPO_NAME;
      const commentId = parseInt(claudeCommentId, 10);

+      // Create Octokit instance
      const octokit = new Octokit({
        auth: githubToken,
-        baseUrl: GITHUB_API_URL,
      });

+      // Determine if this is a PR review comment based on event type
      const isPullRequestReviewComment =
        eventName === "pull_request_review_comment";

-      const result = await updateClaudeComment(octokit, {
-        owner,
-        repo,
-        commentId,
-        body,
-        isPullRequestReviewComment,
-      });
+      let response;
+
+      try {
+        if (isPullRequestReviewComment) {
+          // Try PR review comment API first
+          response = await octokit.rest.pulls.updateReviewComment({
+            owner,
+            repo,
+            comment_id: commentId,
+            body,
+          });
+        } else {
+          // Use issue comment API (works for both issues and PR general comments)
+          response = await octokit.rest.issues.updateComment({
+            owner,
+            repo,
+            comment_id: commentId,
+            body,
+          });
+        }
+      } catch (error: any) {
+        // If PR review comment update fails with 404, fall back to issue comment API
+        if (isPullRequestReviewComment && error.status === 404) {
+          response = await octokit.rest.issues.updateComment({
+            owner,
+            repo,
+            comment_id: commentId,
+            body,
+          });
+        } else {
+          throw error;
+        }
+      }

      return {
        content: [
          {
            type: "text",
-            text: JSON.stringify(result, null, 2),
+            text: JSON.stringify(
+              {
+                id: response.data.id,
+                html_url: response.data.html_url,
+                updated_at: response.data.updated_at,
+              },
+              null,
+              2,
+            ),
          },
        ],
      };
--- a/src/mcp/install-mcp-server.ts
+++ b/src/mcp/install-mcp-server.ts
@@ -1,37 +1,29 @@
 import * as core from "@actions/core";
-import { GITHUB_API_URL } from "../github/api/config";
-
-type PrepareConfigParams = {
-  githubToken: string;
-  owner: string;
-  repo: string;
-  branch: string;
-  additionalMcpConfig?: string;
-  claudeCommentId?: string;
-  allowedTools: string[];
-};

 export async function prepareMcpConfig(
-  params: PrepareConfigParams,
+  githubToken: string,
+  owner: string,
+  repo: string,
+  branch: string,
+  claudeCommentId?: string,
 ): Promise<string> {
-  const {
-    githubToken,
-    owner,
-    repo,
-    branch,
-    additionalMcpConfig,
-    claudeCommentId,
-    allowedTools,
-  } = params;
  try {
-    const allowedToolsList = allowedTools || [];
-
-    const hasGitHubMcpTools = allowedToolsList.some((tool) =>
-      tool.startsWith("mcp__github__"),
-    );
-
-    const baseMcpConfig: { mcpServers: Record<string, unknown> } = {
+    const mcpConfig = {
      mcpServers: {
+        github: {
+          command: "docker",
+          args: [
+            "run",
+            "-i",
+            "--rm",
+            "-e",
+            "GITHUB_PERSONAL_ACCESS_TOKEN",
+            "ghcr.io/anthropics/github-mcp-server:sha-7382253",
+          ],
+          env: {
+            GITHUB_PERSONAL_ACCESS_TOKEN: githubToken,
+          },
+        },
        github_file_ops: {
          command: "bun",
          args: [
@@ -47,62 +39,12 @@ export async function prepareMcpConfig(
            ...(claudeCommentId && { CLAUDE_COMMENT_ID: claudeCommentId }),
            GITHUB_EVENT_NAME: process.env.GITHUB_EVENT_NAME || "",
            IS_PR: process.env.IS_PR || "false",
-            GITHUB_API_URL: GITHUB_API_URL,
          },
        },
      },
    };

-    if (hasGitHubMcpTools) {
-      baseMcpConfig.mcpServers.github = {
-        command: "docker",
-        args: [
-          "run",
-          "-i",
-          "--rm",
-          "-e",
-          "GITHUB_PERSONAL_ACCESS_TOKEN",
-          "ghcr.io/github/github-mcp-server:sha-6d69797", // https://github.com/github/github-mcp-server/releases/tag/v0.5.0
-        ],
-        env: {
-          GITHUB_PERSONAL_ACCESS_TOKEN: githubToken,
-        },
-      };
-    }
-
-    // Merge with additional MCP config if provided
-    if (additionalMcpConfig && additionalMcpConfig.trim()) {
-      try {
-        const additionalConfig = JSON.parse(additionalMcpConfig);
-
-        // Validate that parsed JSON is an object
-        if (typeof additionalConfig !== "object" || additionalConfig === null) {
-          throw new Error("MCP config must be a valid JSON object");
-        }
-
-        core.info(
-          "Merging additional MCP server configuration with built-in servers",
-        );
-
-        // Merge configurations with user config overriding built-in servers
-        const mergedConfig = {
-          ...baseMcpConfig,
-          ...additionalConfig,
-          mcpServers: {
-            ...baseMcpConfig.mcpServers,
-            ...additionalConfig.mcpServers,
-          },
-        };
-
-        return JSON.stringify(mergedConfig, null, 2);
-      } catch (parseError) {
-        core.warning(
-          `Failed to parse additional MCP config: ${parseError}. Using base config only.`,
-        );
-      }
-    }
-
-    return JSON.stringify(baseMcpConfig, null, 2);
+    return JSON.stringify(mcpConfig, null, 2);
  } catch (error) {
    core.setFailed(`Install MCP server failed with error: ${error}`);
    process.exit(1);
--- a/test/create-prompt.test.ts
+++ b/test/create-prompt.test.ts
@@ -316,7 +316,7 @@ describe("generatePrompt", () => {

    expect(prompt).toContain("<trigger_username>johndoe</trigger_username>");
    expect(prompt).toContain(
-      'Use: "Co-authored-by: johndoe <johndoe@users.noreply.github.com>"',
+      "Co-authored-by: johndoe <johndoe@users.noreply.github.com>",
    );
  });

@@ -652,7 +652,7 @@ describe("buildAllowedToolsString", () => {
  });

  test("should append custom tools when provided", () => {
-    const customTools = ["Tool1", "Tool2", "Tool3"];
+    const customTools = "Tool1,Tool2,Tool3";
    const result = buildAllowedToolsString(customTools);

    // Base tools should be present
@@ -683,7 +683,7 @@ describe("buildDisallowedToolsString", () => {
  });

  test("should append custom disallowed tools when provided", () => {
-    const customDisallowedTools = ["BadTool1", "BadTool2"];
+    const customDisallowedTools = "BadTool1,BadTool2";
    const result = buildDisallowedToolsString(customDisallowedTools);

    // Base disallowed tools should be present
@@ -701,8 +701,8 @@ describe("buildDisallowedToolsString", () => {
  });

  test("should remove hardcoded disallowed tools if they are in allowed tools", () => {
-    const customDisallowedTools = ["BadTool1", "BadTool2"];
-    const allowedTools = ["WebSearch", "SomeOtherTool"];
+    const customDisallowedTools = "BadTool1,BadTool2";
+    const allowedTools = "WebSearch,SomeOtherTool";
    const result = buildDisallowedToolsString(
      customDisallowedTools,
      allowedTools,
@@ -720,7 +720,7 @@ describe("buildDisallowedToolsString", () => {
  });

  test("should remove all hardcoded disallowed tools if they are all in allowed tools", () => {
-    const allowedTools = ["WebSearch", "WebFetch", "SomeOtherTool"];
+    const allowedTools = "WebSearch,WebFetch,SomeOtherTool";
    const result = buildDisallowedToolsString(undefined, allowedTools);

    // Both hardcoded disallowed tools should be removed
@@ -732,8 +732,8 @@ describe("buildDisallowedToolsString", () => {
  });

  test("should handle custom disallowed tools when all hardcoded tools are overridden", () => {
-    const customDisallowedTools = ["BadTool1", "BadTool2"];
-    const allowedTools = ["WebSearch", "WebFetch"];
+    const customDisallowedTools = "BadTool1,BadTool2";
+    const allowedTools = "WebSearch,WebFetch";
    const result = buildDisallowedToolsString(
      customDisallowedTools,
      allowedTools,
--- a/test/github/context.test.ts
+++ b/test/github/context.test.ts
@@ -1,57 +0,0 @@
-import { describe, it, expect } from "bun:test";
-import { parseMultilineInput } from "../../src/github/context";
-
-describe("parseMultilineInput", () => {
-  it("should parse a comma-separated string", () => {
-    const input = `Bash(bun install),Bash(bun test:*),Bash(bun typecheck)`;
-    const result = parseMultilineInput(input);
-    expect(result).toEqual([
-      "Bash(bun install)",
-      "Bash(bun test:*)",
-      "Bash(bun typecheck)",
-    ]);
-  });
-
-  it("should parse multiline string", () => {
-    const input = `Bash(bun install)
-Bash(bun test:*)
-Bash(bun typecheck)`;
-    const result = parseMultilineInput(input);
-    expect(result).toEqual([
-      "Bash(bun install)",
-      "Bash(bun test:*)",
-      "Bash(bun typecheck)",
-    ]);
-  });
-
-  it("should parse comma-separated multiline line", () => {
-    const input = `Bash(bun install),Bash(bun test:*)
-Bash(bun typecheck)`;
-    const result = parseMultilineInput(input);
-    expect(result).toEqual([
-      "Bash(bun install)",
-      "Bash(bun test:*)",
-      "Bash(bun typecheck)",
-    ]);
-  });
-
-  it("should ignore comments", () => {
-    const input = `Bash(bun install),
-Bash(bun test:*) # For testing
-# For type checking
-Bash(bun typecheck)
-`;
-    const result = parseMultilineInput(input);
-    expect(result).toEqual([
-      "Bash(bun install)",
-      "Bash(bun test:*)",
-      "Bash(bun typecheck)",
-    ]);
-  });
-
-  it("should parse an empty string", () => {
-    const input = "";
-    const result = parseMultilineInput(input);
-    expect(result).toEqual([]);
-  });
-});
--- a/test/install-mcp-server.test.ts
+++ b/test/install-mcp-server.test.ts
@@ -1,414 +0,0 @@
-import { describe, test, expect, beforeEach, afterEach, spyOn } from "bun:test";
-import { prepareMcpConfig } from "../src/mcp/install-mcp-server";
-import * as core from "@actions/core";
-
-describe("prepareMcpConfig", () => {
-  let consoleInfoSpy: any;
-  let consoleWarningSpy: any;
-  let setFailedSpy: any;
-  let processExitSpy: any;
-
-  beforeEach(() => {
-    consoleInfoSpy = spyOn(core, "info").mockImplementation(() => {});
-    consoleWarningSpy = spyOn(core, "warning").mockImplementation(() => {});
-    setFailedSpy = spyOn(core, "setFailed").mockImplementation(() => {});
-    processExitSpy = spyOn(process, "exit").mockImplementation(() => {
-      throw new Error("Process exit");
-    });
-  });
-
-  afterEach(() => {
-    consoleInfoSpy.mockRestore();
-    consoleWarningSpy.mockRestore();
-    setFailedSpy.mockRestore();
-    processExitSpy.mockRestore();
-  });
-
-  test("should return base config when no additional config is provided and no allowed_tools", async () => {
-    const result = await prepareMcpConfig({
-      githubToken: "test-token",
-      owner: "test-owner",
-      repo: "test-repo",
-      branch: "test-branch",
-      allowedTools: [],
-    });
-
-    const parsed = JSON.parse(result);
-    expect(parsed.mcpServers).toBeDefined();
-    expect(parsed.mcpServers.github).not.toBeDefined();
-    expect(parsed.mcpServers.github_file_ops).toBeDefined();
-    expect(parsed.mcpServers.github_file_ops.env.GITHUB_TOKEN).toBe(
-      "test-token",
-    );
-    expect(parsed.mcpServers.github_file_ops.env.REPO_OWNER).toBe("test-owner");
-    expect(parsed.mcpServers.github_file_ops.env.REPO_NAME).toBe("test-repo");
-    expect(parsed.mcpServers.github_file_ops.env.BRANCH_NAME).toBe(
-      "test-branch",
-    );
-  });
-
-  test("should include github MCP server when mcp__github__ tools are allowed", async () => {
-    const result = await prepareMcpConfig({
-      githubToken: "test-token",
-      owner: "test-owner",
-      repo: "test-repo",
-      branch: "test-branch",
-      allowedTools: [
-        "mcp__github__create_issue",
-        "mcp__github_file_ops__commit_files",
-      ],
-    });
-
-    const parsed = JSON.parse(result);
-    expect(parsed.mcpServers).toBeDefined();
-    expect(parsed.mcpServers.github).toBeDefined();
-    expect(parsed.mcpServers.github_file_ops).toBeDefined();
-    expect(parsed.mcpServers.github.env.GITHUB_PERSONAL_ACCESS_TOKEN).toBe(
-      "test-token",
-    );
-  });
-
-  test("should not include github MCP server when only file_ops tools are allowed", async () => {
-    const result = await prepareMcpConfig({
-      githubToken: "test-token",
-      owner: "test-owner",
-      repo: "test-repo",
-      branch: "test-branch",
-      allowedTools: [
-        "mcp__github_file_ops__commit_files",
-        "mcp__github_file_ops__update_claude_comment",
-      ],
-    });
-
-    const parsed = JSON.parse(result);
-    expect(parsed.mcpServers).toBeDefined();
-    expect(parsed.mcpServers.github).not.toBeDefined();
-    expect(parsed.mcpServers.github_file_ops).toBeDefined();
-  });
-
-  test("should include file_ops server even when no GitHub tools are allowed", async () => {
-    const result = await prepareMcpConfig({
-      githubToken: "test-token",
-      owner: "test-owner",
-      repo: "test-repo",
-      branch: "test-branch",
-      allowedTools: ["Edit", "Read", "Write"],
-    });
-
-    const parsed = JSON.parse(result);
-    expect(parsed.mcpServers).toBeDefined();
-    expect(parsed.mcpServers.github).not.toBeDefined();
-    expect(parsed.mcpServers.github_file_ops).toBeDefined();
-  });
-
-  test("should return base config when additional config is empty string", async () => {
-    const result = await prepareMcpConfig({
-      githubToken: "test-token",
-      owner: "test-owner",
-      repo: "test-repo",
-      branch: "test-branch",
-      additionalMcpConfig: "",
-      allowedTools: [],
-    });
-
-    const parsed = JSON.parse(result);
-    expect(parsed.mcpServers).toBeDefined();
-    expect(parsed.mcpServers.github).not.toBeDefined();
-    expect(parsed.mcpServers.github_file_ops).toBeDefined();
-    expect(consoleWarningSpy).not.toHaveBeenCalled();
-  });
-
-  test("should return base config when additional config is whitespace only", async () => {
-    const result = await prepareMcpConfig({
-      githubToken: "test-token",
-      owner: "test-owner",
-      repo: "test-repo",
-      branch: "test-branch",
-      additionalMcpConfig: "   \n\t  ",
-      allowedTools: [],
-    });
-
-    const parsed = JSON.parse(result);
-    expect(parsed.mcpServers).toBeDefined();
-    expect(parsed.mcpServers.github).not.toBeDefined();
-    expect(parsed.mcpServers.github_file_ops).toBeDefined();
-    expect(consoleWarningSpy).not.toHaveBeenCalled();
-  });
-
-  test("should merge valid additional config with base config", async () => {
-    const additionalConfig = JSON.stringify({
-      mcpServers: {
-        custom_server: {
-          command: "custom-command",
-          args: ["arg1", "arg2"],
-          env: {
-            CUSTOM_ENV: "custom-value",
-          },
-        },
-      },
-    });
-
-    const result = await prepareMcpConfig({
-      githubToken: "test-token",
-      owner: "test-owner",
-      repo: "test-repo",
-      branch: "test-branch",
-      additionalMcpConfig: additionalConfig,
-      allowedTools: [
-        "mcp__github__create_issue",
-        "mcp__github_file_ops__commit_files",
-      ],
-    });
-
-    const parsed = JSON.parse(result);
-    expect(consoleInfoSpy).toHaveBeenCalledWith(
-      "Merging additional MCP server configuration with built-in servers",
-    );
-    expect(parsed.mcpServers.github).toBeDefined();
-    expect(parsed.mcpServers.github_file_ops).toBeDefined();
-    expect(parsed.mcpServers.custom_server).toBeDefined();
-    expect(parsed.mcpServers.custom_server.command).toBe("custom-command");
-    expect(parsed.mcpServers.custom_server.args).toEqual(["arg1", "arg2"]);
-    expect(parsed.mcpServers.custom_server.env.CUSTOM_ENV).toBe("custom-value");
-  });
-
-  test("should override built-in servers when additional config has same server names", async () => {
-    const additionalConfig = JSON.stringify({
-      mcpServers: {
-        github: {
-          command: "overridden-command",
-          args: ["overridden-arg"],
-          env: {
-            OVERRIDDEN_ENV: "overridden-value",
-          },
-        },
-      },
-    });
-
-    const result = await prepareMcpConfig({
-      githubToken: "test-token",
-      owner: "test-owner",
-      repo: "test-repo",
-      branch: "test-branch",
-      additionalMcpConfig: additionalConfig,
-      allowedTools: [
-        "mcp__github__create_issue",
-        "mcp__github_file_ops__commit_files",
-      ],
-    });
-
-    const parsed = JSON.parse(result);
-    expect(consoleInfoSpy).toHaveBeenCalledWith(
-      "Merging additional MCP server configuration with built-in servers",
-    );
-    expect(parsed.mcpServers.github.command).toBe("overridden-command");
-    expect(parsed.mcpServers.github.args).toEqual(["overridden-arg"]);
-    expect(parsed.mcpServers.github.env.OVERRIDDEN_ENV).toBe(
-      "overridden-value",
-    );
-    expect(
-      parsed.mcpServers.github.env.GITHUB_PERSONAL_ACCESS_TOKEN,
-    ).toBeUndefined();
-    expect(parsed.mcpServers.github_file_ops).toBeDefined();
-  });
-
-  test("should merge additional root-level properties", async () => {
-    const additionalConfig = JSON.stringify({
-      customProperty: "custom-value",
-      anotherProperty: {
-        nested: "value",
-      },
-      mcpServers: {
-        custom_server: {
-          command: "custom",
-        },
-      },
-    });
-
-    const result = await prepareMcpConfig({
-      githubToken: "test-token",
-      owner: "test-owner",
-      repo: "test-repo",
-      branch: "test-branch",
-      additionalMcpConfig: additionalConfig,
-      allowedTools: [],
-    });
-
-    const parsed = JSON.parse(result);
-    expect(parsed.customProperty).toBe("custom-value");
-    expect(parsed.anotherProperty).toEqual({ nested: "value" });
-    expect(parsed.mcpServers.github).not.toBeDefined();
-    expect(parsed.mcpServers.custom_server).toBeDefined();
-  });
-
-  test("should handle invalid JSON gracefully", async () => {
-    const invalidJson = "{ invalid json }";
-
-    const result = await prepareMcpConfig({
-      githubToken: "test-token",
-      owner: "test-owner",
-      repo: "test-repo",
-      branch: "test-branch",
-      additionalMcpConfig: invalidJson,
-      allowedTools: [],
-    });
-
-    const parsed = JSON.parse(result);
-    expect(consoleWarningSpy).toHaveBeenCalledWith(
-      expect.stringContaining("Failed to parse additional MCP config:"),
-    );
-    expect(parsed.mcpServers.github).not.toBeDefined();
-    expect(parsed.mcpServers.github_file_ops).toBeDefined();
-  });
-
-  test("should handle non-object JSON values", async () => {
-    const nonObjectJson = JSON.stringify("string value");
-
-    const result = await prepareMcpConfig({
-      githubToken: "test-token",
-      owner: "test-owner",
-      repo: "test-repo",
-      branch: "test-branch",
-      additionalMcpConfig: nonObjectJson,
-      allowedTools: [],
-    });
-
-    const parsed = JSON.parse(result);
-    expect(consoleWarningSpy).toHaveBeenCalledWith(
-      expect.stringContaining("Failed to parse additional MCP config:"),
-    );
-    expect(consoleWarningSpy).toHaveBeenCalledWith(
-      expect.stringContaining("MCP config must be a valid JSON object"),
-    );
-    expect(parsed.mcpServers.github).not.toBeDefined();
-    expect(parsed.mcpServers.github_file_ops).toBeDefined();
-  });
-
-  test("should handle null JSON value", async () => {
-    const nullJson = JSON.stringify(null);
-
-    const result = await prepareMcpConfig({
-      githubToken: "test-token",
-      owner: "test-owner",
-      repo: "test-repo",
-      branch: "test-branch",
-      additionalMcpConfig: nullJson,
-      allowedTools: [],
-    });
-
-    const parsed = JSON.parse(result);
-    expect(consoleWarningSpy).toHaveBeenCalledWith(
-      expect.stringContaining("Failed to parse additional MCP config:"),
-    );
-    expect(consoleWarningSpy).toHaveBeenCalledWith(
-      expect.stringContaining("MCP config must be a valid JSON object"),
-    );
-    expect(parsed.mcpServers.github).not.toBeDefined();
-    expect(parsed.mcpServers.github_file_ops).toBeDefined();
-  });
-
-  test("should handle array JSON value", async () => {
-    const arrayJson = JSON.stringify([1, 2, 3]);
-
-    const result = await prepareMcpConfig({
-      githubToken: "test-token",
-      owner: "test-owner",
-      repo: "test-repo",
-      branch: "test-branch",
-      additionalMcpConfig: arrayJson,
-      allowedTools: [],
-    });
-
-    const parsed = JSON.parse(result);
-    // Arrays are objects in JavaScript, so they pass the object check
-    // But they'll fail when trying to spread or access mcpServers property
-    expect(consoleInfoSpy).toHaveBeenCalledWith(
-      "Merging additional MCP server configuration with built-in servers",
-    );
-    expect(parsed.mcpServers.github).not.toBeDefined();
-    expect(parsed.mcpServers.github_file_ops).toBeDefined();
-    // The array will be spread into the config (0: 1, 1: 2, 2: 3)
-    expect(parsed[0]).toBe(1);
-    expect(parsed[1]).toBe(2);
-    expect(parsed[2]).toBe(3);
-  });
-
-  test("should merge complex nested configurations", async () => {
-    const additionalConfig = JSON.stringify({
-      mcpServers: {
-        server1: {
-          command: "cmd1",
-          env: { KEY1: "value1" },
-        },
-        server2: {
-          command: "cmd2",
-          env: { KEY2: "value2" },
-        },
-        github_file_ops: {
-          command: "overridden",
-          env: { CUSTOM: "value" },
-        },
-      },
-      otherConfig: {
-        nested: {
-          deeply: "value",
-        },
-      },
-    });
-
-    const result = await prepareMcpConfig({
-      githubToken: "test-token",
-      owner: "test-owner",
-      repo: "test-repo",
-      branch: "test-branch",
-      additionalMcpConfig: additionalConfig,
-      allowedTools: [],
-    });
-
-    const parsed = JSON.parse(result);
-    expect(parsed.mcpServers.server1).toBeDefined();
-    expect(parsed.mcpServers.server2).toBeDefined();
-    expect(parsed.mcpServers.github).not.toBeDefined();
-    expect(parsed.mcpServers.github_file_ops.command).toBe("overridden");
-    expect(parsed.mcpServers.github_file_ops.env.CUSTOM).toBe("value");
-    expect(parsed.otherConfig.nested.deeply).toBe("value");
-  });
-
-  test("should preserve GITHUB_ACTION_PATH in file_ops server args", async () => {
-    const oldEnv = process.env.GITHUB_ACTION_PATH;
-    process.env.GITHUB_ACTION_PATH = "/test/action/path";
-
-    const result = await prepareMcpConfig({
-      githubToken: "test-token",
-      owner: "test-owner",
-      repo: "test-repo",
-      branch: "test-branch",
-      allowedTools: [],
-    });
-
-    const parsed = JSON.parse(result);
-    expect(parsed.mcpServers.github_file_ops.args[1]).toBe(
-      "/test/action/path/src/mcp/github-file-ops-server.ts",
-    );
-
-    process.env.GITHUB_ACTION_PATH = oldEnv;
-  });
-
-  test("should use process.cwd() when GITHUB_WORKSPACE is not set", async () => {
-    const oldEnv = process.env.GITHUB_WORKSPACE;
-    delete process.env.GITHUB_WORKSPACE;
-
-    const result = await prepareMcpConfig({
-      githubToken: "test-token",
-      owner: "test-owner",
-      repo: "test-repo",
-      branch: "test-branch",
-      allowedTools: [],
-    });
-
-    const parsed = JSON.parse(result);
-    expect(parsed.mcpServers.github_file_ops.env.REPO_DIR).toBe(process.cwd());
-
-    process.env.GITHUB_WORKSPACE = oldEnv;
-  });
-});
--- a/test/mockContext.ts
+++ b/test/mockContext.ts
@@ -11,8 +11,8 @@ const defaultInputs = {
  triggerPhrase: "/claude",
  assigneeTrigger: "",
  anthropicModel: "claude-3-7-sonnet-20250219",
-  allowedTools: [] as string[],
-  disallowedTools: [] as string[],
+  allowedTools: "",
+  disallowedTools: "",
  customInstructions: "",
  directPrompt: "",
  useBedrock: false,
--- a/test/permissions.test.ts
+++ b/test/permissions.test.ts
@@ -62,8 +62,8 @@ describe("checkWritePermissions", () => {
    inputs: {
      triggerPhrase: "@claude",
      assigneeTrigger: "",
-      allowedTools: [],
-      disallowedTools: [],
+      allowedTools: "",
+      disallowedTools: "",
      customInstructions: "",
      directPrompt: "",
    },
--- a/test/prepare-context.test.ts
+++ b/test/prepare-context.test.ts
@@ -242,7 +242,7 @@ describe("parseEnvVarsWithContext", () => {
        ...mockPullRequestCommentContext,
        inputs: {
          ...mockPullRequestCommentContext.inputs,
-          allowedTools: ["Tool1", "Tool2"],
+          allowedTools: "Tool1,Tool2",
        },
      });
      const result = prepareContext(contextWithAllowedTools, "12345");
--- a/test/trigger-validation.test.ts
+++ b/test/trigger-validation.test.ts
@@ -30,8 +30,8 @@ describe("checkContainsTrigger", () => {
          triggerPhrase: "/claude",
          assigneeTrigger: "",
          directPrompt: "Fix the bug in the login form",
-          allowedTools: [],
-          disallowedTools: [],
+          allowedTools: "",
+          disallowedTools: "",
          customInstructions: "",
        },
      });
@@ -56,8 +56,8 @@ describe("checkContainsTrigger", () => {
          triggerPhrase: "/claude",
          assigneeTrigger: "",
          directPrompt: "",
-          allowedTools: [],
-          disallowedTools: [],
+          allowedTools: "",
+          disallowedTools: "",
          customInstructions: "",
        },
      });
@@ -228,8 +228,8 @@ describe("checkContainsTrigger", () => {
          triggerPhrase: "@claude",
          assigneeTrigger: "",
          directPrompt: "",
-          allowedTools: [],
-          disallowedTools: [],
+          allowedTools: "",
+          disallowedTools: "",
          customInstructions: "",
        },
      });
@@ -255,8 +255,8 @@ describe("checkContainsTrigger", () => {
          triggerPhrase: "@claude",
          assigneeTrigger: "",
          directPrompt: "",
-          allowedTools: [],
-          disallowedTools: [],
+          allowedTools: "",
+          disallowedTools: "",
          customInstructions: "",
        },
      });
@@ -282,8 +282,8 @@ describe("checkContainsTrigger", () => {
          triggerPhrase: "@claude",
          assigneeTrigger: "",
          directPrompt: "",
-          allowedTools: [],
-          disallowedTools: [],
+          allowedTools: "",
+          disallowedTools: "",
          customInstructions: "",
        },
      });
--- a/test/update-claude-comment.test.ts
+++ b/test/update-claude-comment.test.ts
@@ -1,413 +0,0 @@
-import { describe, test, expect, jest, beforeEach } from "bun:test";
-import { Octokit } from "@octokit/rest";
-import {
-  updateClaudeComment,
-  type UpdateClaudeCommentParams,
-} from "../src/github/operations/comments/update-claude-comment";
-
-describe("updateClaudeComment", () => {
-  let mockOctokit: Octokit;
-
-  beforeEach(() => {
-    mockOctokit = {
-      rest: {
-        issues: {
-          updateComment: jest.fn(),
-        },
-        pulls: {
-          updateReviewComment: jest.fn(),
-        },
-      },
-    } as any as Octokit;
-  });
-
-  test("should update issue comment successfully", async () => {
-    const mockResponse = {
-      data: {
-        id: 123456,
-        html_url: "https://github.com/owner/repo/issues/1#issuecomment-123456",
-        updated_at: "2024-01-01T00:00:00Z",
-        body: "Updated comment",
-      },
-    };
-
-    // @ts-expect-error Mock implementation doesn't match full type signature
-    mockOctokit.rest.issues.updateComment = jest
-      .fn()
-      .mockResolvedValue(mockResponse);
-
-    const params: UpdateClaudeCommentParams = {
-      owner: "testowner",
-      repo: "testrepo",
-      commentId: 123456,
-      body: "Updated comment",
-      isPullRequestReviewComment: false,
-    };
-
-    const result = await updateClaudeComment(mockOctokit, params);
-
-    expect(mockOctokit.rest.issues.updateComment).toHaveBeenCalledWith({
-      owner: "testowner",
-      repo: "testrepo",
-      comment_id: 123456,
-      body: "Updated comment",
-    });
-
-    expect(result).toEqual({
-      id: 123456,
-      html_url: "https://github.com/owner/repo/issues/1#issuecomment-123456",
-      updated_at: "2024-01-01T00:00:00Z",
-    });
-  });
-
-  test("should update PR comment successfully", async () => {
-    const mockResponse = {
-      data: {
-        id: 789012,
-        html_url: "https://github.com/owner/repo/pull/2#issuecomment-789012",
-        updated_at: "2024-01-02T00:00:00Z",
-        body: "Updated PR comment",
-      },
-    };
-
-    // @ts-expect-error Mock implementation doesn't match full type signature
-    mockOctokit.rest.issues.updateComment = jest
-      .fn()
-      .mockResolvedValue(mockResponse);
-
-    const params: UpdateClaudeCommentParams = {
-      owner: "testowner",
-      repo: "testrepo",
-      commentId: 789012,
-      body: "Updated PR comment",
-      isPullRequestReviewComment: false,
-    };
-
-    const result = await updateClaudeComment(mockOctokit, params);
-
-    expect(mockOctokit.rest.issues.updateComment).toHaveBeenCalledWith({
-      owner: "testowner",
-      repo: "testrepo",
-      comment_id: 789012,
-      body: "Updated PR comment",
-    });
-
-    expect(result).toEqual({
-      id: 789012,
-      html_url: "https://github.com/owner/repo/pull/2#issuecomment-789012",
-      updated_at: "2024-01-02T00:00:00Z",
-    });
-  });
-
-  test("should update PR review comment successfully", async () => {
-    const mockResponse = {
-      data: {
-        id: 345678,
-        html_url: "https://github.com/owner/repo/pull/3#discussion_r345678",
-        updated_at: "2024-01-03T00:00:00Z",
-        body: "Updated review comment",
-      },
-    };
-
-    // @ts-expect-error Mock implementation doesn't match full type signature
-    mockOctokit.rest.pulls.updateReviewComment = jest
-      .fn()
-      .mockResolvedValue(mockResponse);
-
-    const params: UpdateClaudeCommentParams = {
-      owner: "testowner",
-      repo: "testrepo",
-      commentId: 345678,
-      body: "Updated review comment",
-      isPullRequestReviewComment: true,
-    };
-
-    const result = await updateClaudeComment(mockOctokit, params);
-
-    expect(mockOctokit.rest.pulls.updateReviewComment).toHaveBeenCalledWith({
-      owner: "testowner",
-      repo: "testrepo",
-      comment_id: 345678,
-      body: "Updated review comment",
-    });
-
-    expect(result).toEqual({
-      id: 345678,
-      html_url: "https://github.com/owner/repo/pull/3#discussion_r345678",
-      updated_at: "2024-01-03T00:00:00Z",
-    });
-  });
-
-  test("should fallback to issue comment API when PR review comment update fails with 404", async () => {
-    const mockError = new Error("Not Found") as any;
-    mockError.status = 404;
-
-    const mockResponse = {
-      data: {
-        id: 456789,
-        html_url: "https://github.com/owner/repo/pull/4#issuecomment-456789",
-        updated_at: "2024-01-04T00:00:00Z",
-        body: "Updated via fallback",
-      },
-    };
-
-    // @ts-expect-error Mock implementation doesn't match full type signature
-    mockOctokit.rest.pulls.updateReviewComment = jest
-      .fn()
-      .mockRejectedValue(mockError);
-    // @ts-expect-error Mock implementation doesn't match full type signature
-    mockOctokit.rest.issues.updateComment = jest
-      .fn()
-      .mockResolvedValue(mockResponse);
-
-    const params: UpdateClaudeCommentParams = {
-      owner: "testowner",
-      repo: "testrepo",
-      commentId: 456789,
-      body: "Updated via fallback",
-      isPullRequestReviewComment: true,
-    };
-
-    const result = await updateClaudeComment(mockOctokit, params);
-
-    expect(mockOctokit.rest.pulls.updateReviewComment).toHaveBeenCalledWith({
-      owner: "testowner",
-      repo: "testrepo",
-      comment_id: 456789,
-      body: "Updated via fallback",
-    });
-
-    expect(mockOctokit.rest.issues.updateComment).toHaveBeenCalledWith({
-      owner: "testowner",
-      repo: "testrepo",
-      comment_id: 456789,
-      body: "Updated via fallback",
-    });
-
-    expect(result).toEqual({
-      id: 456789,
-      html_url: "https://github.com/owner/repo/pull/4#issuecomment-456789",
-      updated_at: "2024-01-04T00:00:00Z",
-    });
-  });
-
-  test("should propagate error when PR review comment update fails with non-404 error", async () => {
-    const mockError = new Error("Internal Server Error") as any;
-    mockError.status = 500;
-
-    // @ts-expect-error Mock implementation doesn't match full type signature
-    mockOctokit.rest.pulls.updateReviewComment = jest
-      .fn()
-      .mockRejectedValue(mockError);
-
-    const params: UpdateClaudeCommentParams = {
-      owner: "testowner",
-      repo: "testrepo",
-      commentId: 567890,
-      body: "This will fail",
-      isPullRequestReviewComment: true,
-    };
-
-    await expect(updateClaudeComment(mockOctokit, params)).rejects.toEqual(
-      mockError,
-    );
-
-    expect(mockOctokit.rest.pulls.updateReviewComment).toHaveBeenCalledWith({
-      owner: "testowner",
-      repo: "testrepo",
-      comment_id: 567890,
-      body: "This will fail",
-    });
-
-    // Ensure fallback wasn't attempted
-    expect(mockOctokit.rest.issues.updateComment).not.toHaveBeenCalled();
-  });
-
-  test("should propagate error when issue comment update fails", async () => {
-    const mockError = new Error("Forbidden");
-
-    // @ts-expect-error Mock implementation doesn't match full type signature
-    mockOctokit.rest.issues.updateComment = jest
-      .fn()
-      .mockRejectedValue(mockError);
-
-    const params: UpdateClaudeCommentParams = {
-      owner: "testowner",
-      repo: "testrepo",
-      commentId: 678901,
-      body: "This will also fail",
-      isPullRequestReviewComment: false,
-    };
-
-    await expect(updateClaudeComment(mockOctokit, params)).rejects.toEqual(
-      mockError,
-    );
-
-    expect(mockOctokit.rest.issues.updateComment).toHaveBeenCalledWith({
-      owner: "testowner",
-      repo: "testrepo",
-      comment_id: 678901,
-      body: "This will also fail",
-    });
-  });
-
-  test("should handle empty body", async () => {
-    const mockResponse = {
-      data: {
-        id: 111222,
-        html_url: "https://github.com/owner/repo/issues/5#issuecomment-111222",
-        updated_at: "2024-01-05T00:00:00Z",
-        body: "",
-      },
-    };
-
-    // @ts-expect-error Mock implementation doesn't match full type signature
-    mockOctokit.rest.issues.updateComment = jest
-      .fn()
-      .mockResolvedValue(mockResponse);
-
-    const params: UpdateClaudeCommentParams = {
-      owner: "testowner",
-      repo: "testrepo",
-      commentId: 111222,
-      body: "",
-      isPullRequestReviewComment: false,
-    };
-
-    const result = await updateClaudeComment(mockOctokit, params);
-
-    expect(result).toEqual({
-      id: 111222,
-      html_url: "https://github.com/owner/repo/issues/5#issuecomment-111222",
-      updated_at: "2024-01-05T00:00:00Z",
-    });
-  });
-
-  test("should handle very long body", async () => {
-    const longBody = "x".repeat(10000);
-    const mockResponse = {
-      data: {
-        id: 333444,
-        html_url: "https://github.com/owner/repo/issues/6#issuecomment-333444",
-        updated_at: "2024-01-06T00:00:00Z",
-        body: longBody,
-      },
-    };
-
-    // @ts-expect-error Mock implementation doesn't match full type signature
-    mockOctokit.rest.issues.updateComment = jest
-      .fn()
-      .mockResolvedValue(mockResponse);
-
-    const params: UpdateClaudeCommentParams = {
-      owner: "testowner",
-      repo: "testrepo",
-      commentId: 333444,
-      body: longBody,
-      isPullRequestReviewComment: false,
-    };
-
-    const result = await updateClaudeComment(mockOctokit, params);
-
-    expect(mockOctokit.rest.issues.updateComment).toHaveBeenCalledWith({
-      owner: "testowner",
-      repo: "testrepo",
-      comment_id: 333444,
-      body: longBody,
-    });
-
-    expect(result).toEqual({
-      id: 333444,
-      html_url: "https://github.com/owner/repo/issues/6#issuecomment-333444",
-      updated_at: "2024-01-06T00:00:00Z",
-    });
-  });
-
-  test("should handle markdown formatting in body", async () => {
-    const markdownBody = `
-# Header
- List item 1
- List item 2
-
-\`\`\`typescript
-const code = "example";
-\`\`\`
-
-[Link](https://example.com)
-    `.trim();
-
-    const mockResponse = {
-      data: {
-        id: 555666,
-        html_url: "https://github.com/owner/repo/issues/7#issuecomment-555666",
-        updated_at: "2024-01-07T00:00:00Z",
-        body: markdownBody,
-      },
-    };
-
-    // @ts-expect-error Mock implementation doesn't match full type signature
-    mockOctokit.rest.issues.updateComment = jest
-      .fn()
-      .mockResolvedValue(mockResponse);
-
-    const params: UpdateClaudeCommentParams = {
-      owner: "testowner",
-      repo: "testrepo",
-      commentId: 555666,
-      body: markdownBody,
-      isPullRequestReviewComment: false,
-    };
-
-    const result = await updateClaudeComment(mockOctokit, params);
-
-    expect(mockOctokit.rest.issues.updateComment).toHaveBeenCalledWith({
-      owner: "testowner",
-      repo: "testrepo",
-      comment_id: 555666,
-      body: markdownBody,
-    });
-
-    expect(result).toEqual({
-      id: 555666,
-      html_url: "https://github.com/owner/repo/issues/7#issuecomment-555666",
-      updated_at: "2024-01-07T00:00:00Z",
-    });
-  });
-
-  test("should handle different response data fields", async () => {
-    const mockResponse = {
-      data: {
-        id: 777888,
-        html_url: "https://github.com/owner/repo/pull/8#discussion_r777888",
-        updated_at: "2024-01-08T12:30:45Z",
-        body: "Updated",
-        // Additional fields that might be in the response
-        created_at: "2024-01-01T00:00:00Z",
-        user: { login: "bot" },
-        node_id: "MDI0OlB1bGxSZXF1ZXN0UmV2aWV3Q29tbWVudDc3Nzg4OA==",
-      },
-    };
-
-    // @ts-expect-error Mock implementation doesn't match full type signature
-    mockOctokit.rest.pulls.updateReviewComment = jest
-      .fn()
-      .mockResolvedValue(mockResponse);
-
-    const params: UpdateClaudeCommentParams = {
-      owner: "testowner",
-      repo: "testrepo",
-      commentId: 777888,
-      body: "Updated",
-      isPullRequestReviewComment: true,
-    };
-
-    const result = await updateClaudeComment(mockOctokit, params);
-
-    // Should only return the specific fields we care about
-    expect(result).toEqual({
-      id: 777888,
-      html_url: "https://github.com/owner/repo/pull/8#discussion_r777888",
-      updated_at: "2024-01-08T12:30:45Z",
-    });
-  });
-});