diff --git a/action.yml b/action.yml index 55577bb..d4d4ed2 100644 --- a/action.yml +++ b/action.yml @@ -73,6 +73,14 @@ inputs: description: "Enable commit signing using GitHub's commit signature verification. When false, Claude uses standard git commands" required: false default: "false" + bot_id: + description: "GitHub user ID to use for git operations (defaults to Claude's bot ID)" + required: false + default: "41898282" # Claude's bot ID - see src/github/constants.ts + bot_name: + description: "GitHub username to use for git operations (defaults to Claude's bot name)" + required: false + default: "claude[bot]" track_progress: description: "Force tag mode with tracking comments for pull_request and issue events. Only applicable to pull_request (opened, synchronize, ready_for_review, reopened) and issue (opened, edited, labeled, assigned) events." required: false @@ -144,6 +152,8 @@ runs: USE_STICKY_COMMENT: ${{ inputs.use_sticky_comment }} DEFAULT_WORKFLOW_TOKEN: ${{ github.token }} USE_COMMIT_SIGNING: ${{ inputs.use_commit_signing }} + BOT_ID: ${{ inputs.bot_id }} + BOT_NAME: ${{ inputs.bot_name }} TRACK_PROGRESS: ${{ inputs.track_progress }} ADDITIONAL_PERMISSIONS: ${{ inputs.additional_permissions }} CLAUDE_ARGS: ${{ inputs.claude_args }} diff --git a/docs/faq.md b/docs/faq.md index 3594111..269728e 100644 --- a/docs/faq.md +++ b/docs/faq.md @@ -28,6 +28,33 @@ permissions: The OIDC token is required in order for the Claude GitHub app to function. If you wish to not use the GitHub app, you can instead provide a `github_token` input to the action for Claude to operate with. See the [Claude Code permissions documentation][perms] for more. +### Why am I getting '403 Resource not accessible by integration' errors? + +This error occurs when the action tries to fetch the authenticated user information using a GitHub App installation token. GitHub App tokens have limited access and cannot access the `/user` endpoint, which causes this 403 error. + +**Solution**: The action now includes `bot_id` and `bot_name` inputs that default to Claude's bot credentials. This avoids the need to fetch user information from the API. + +For the default claude[bot]: + +```yaml +- uses: anthropics/claude-code-action@v1 + with: + anthropic_api_key: ${{ secrets.ANTHROPIC_API_KEY }} + # bot_id and bot_name have sensible defaults, no need to specify +``` + +For custom bots, specify both: + +```yaml +- uses: anthropics/claude-code-action@v1 + with: + anthropic_api_key: ${{ secrets.ANTHROPIC_API_KEY }} + bot_id: "12345678" # Your bot's GitHub user ID + bot_name: "my-bot" # Your bot's username +``` + +This issue typically only affects agent/automation mode workflows. Interactive workflows (with @claude mentions) don't encounter this issue as they use the comment author's information. + ## Claude's Capabilities and Limitations ### Why won't Claude update workflow files when I ask it to? diff --git a/docs/usage.md b/docs/usage.md index 381d177..58cc1fa 100644 --- a/docs/usage.md +++ b/docs/usage.md @@ -47,28 +47,30 @@ jobs: ## Inputs -| Input | Description | Required | Default | -| ------------------------------ | -------------------------------------------------------------------------------------------------------------------- | -------- | --------- | -| `anthropic_api_key` | Anthropic API key (required for direct API, not needed for Bedrock/Vertex) | No\* | - | -| `claude_code_oauth_token` | Claude Code OAuth token (alternative to anthropic_api_key) | No\* | - | -| `prompt` | Instructions for Claude. Can be a direct prompt or custom template for automation workflows | No | - | -| `track_progress` | Force tag mode with tracking comments. Only works with specific PR/issue events. Preserves GitHub context | No | `false` | -| `claude_args` | Additional arguments to pass directly to Claude CLI (e.g., `--max-turns 10 --model claude-4-0-sonnet-20250805`) | No | "" | -| `base_branch` | The base branch to use for creating new branches (e.g., 'main', 'develop') | No | - | -| `use_sticky_comment` | Use just one comment to deliver PR comments (only applies for pull_request event workflows) | No | `false` | -| `github_token` | GitHub token for Claude to operate with. **Only include this if you're connecting a custom GitHub app of your own!** | No | - | -| `use_bedrock` | Use Amazon Bedrock with OIDC authentication instead of direct Anthropic API | No | `false` | -| `use_vertex` | Use Google Vertex AI with OIDC authentication instead of direct Anthropic API | No | `false` | -| `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 | - | -| `label_trigger` | The label name that triggers the action when applied to an issue (e.g. "claude") | No | - | -| `trigger_phrase` | The trigger phrase to look for in comments, issue/PR bodies, and issue titles | No | `@claude` | -| `branch_prefix` | The prefix to use for Claude branches (defaults to 'claude/', use 'claude-' for dash format) | No | `claude/` | -| `settings` | Claude Code settings as JSON string or path to settings JSON file | No | "" | -| `additional_permissions` | Additional permissions to enable. Currently supports 'actions: read' for viewing workflow results | No | "" | -| `experimental_allowed_domains` | Restrict network access to these domains only (newline-separated). | No | "" | -| `use_commit_signing` | Enable commit signing using GitHub's commit signature verification. When false, Claude uses standard git commands | No | `false` | -| `allowed_bots` | Comma-separated list of allowed bot usernames, or '\*' to allow all bots. Empty string (default) allows no bots | No | "" | +| Input | Description | Required | Default | +| ------------------------------ | -------------------------------------------------------------------------------------------------------------------- | -------- | ------------- | +| `anthropic_api_key` | Anthropic API key (required for direct API, not needed for Bedrock/Vertex) | No\* | - | +| `claude_code_oauth_token` | Claude Code OAuth token (alternative to anthropic_api_key) | No\* | - | +| `prompt` | Instructions for Claude. Can be a direct prompt or custom template for automation workflows | No | - | +| `track_progress` | Force tag mode with tracking comments. Only works with specific PR/issue events. Preserves GitHub context | No | `false` | +| `claude_args` | Additional arguments to pass directly to Claude CLI (e.g., `--max-turns 10 --model claude-4-0-sonnet-20250805`) | No | "" | +| `base_branch` | The base branch to use for creating new branches (e.g., 'main', 'develop') | No | - | +| `use_sticky_comment` | Use just one comment to deliver PR comments (only applies for pull_request event workflows) | No | `false` | +| `github_token` | GitHub token for Claude to operate with. **Only include this if you're connecting a custom GitHub app of your own!** | No | - | +| `use_bedrock` | Use Amazon Bedrock with OIDC authentication instead of direct Anthropic API | No | `false` | +| `use_vertex` | Use Google Vertex AI with OIDC authentication instead of direct Anthropic API | No | `false` | +| `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 | - | +| `label_trigger` | The label name that triggers the action when applied to an issue (e.g. "claude") | No | - | +| `trigger_phrase` | The trigger phrase to look for in comments, issue/PR bodies, and issue titles | No | `@claude` | +| `branch_prefix` | The prefix to use for Claude branches (defaults to 'claude/', use 'claude-' for dash format) | No | `claude/` | +| `settings` | Claude Code settings as JSON string or path to settings JSON file | No | "" | +| `additional_permissions` | Additional permissions to enable. Currently supports 'actions: read' for viewing workflow results | No | "" | +| `experimental_allowed_domains` | Restrict network access to these domains only (newline-separated). | No | "" | +| `use_commit_signing` | Enable commit signing using GitHub's commit signature verification. When false, Claude uses standard git commands | No | `false` | +| `bot_id` | GitHub user ID to use for git operations (defaults to Claude's bot ID) | No | `41898282` | +| `bot_name` | GitHub username to use for git operations (defaults to Claude's bot name) | No | `claude[bot]` | +| `allowed_bots` | Comma-separated list of allowed bot usernames, or '\*' to allow all bots. Empty string (default) allows no bots | No | "" | ### Deprecated Inputs diff --git a/src/github/constants.ts b/src/github/constants.ts new file mode 100644 index 0000000..32818ff --- /dev/null +++ b/src/github/constants.ts @@ -0,0 +1,13 @@ +/** + * GitHub-related constants used throughout the application + */ + +/** + * Claude App bot user ID + */ +export const CLAUDE_APP_BOT_ID = 41898282; + +/** + * Claude bot username + */ +export const CLAUDE_BOT_LOGIN = "claude[bot]"; diff --git a/src/github/context.ts b/src/github/context.ts index 4a7e339..94ef4f8 100644 --- a/src/github/context.ts +++ b/src/github/context.ts @@ -8,6 +8,7 @@ import type { PullRequestReviewCommentEvent, WorkflowRunEvent, } from "@octokit/webhooks-types"; +import { CLAUDE_APP_BOT_ID, CLAUDE_BOT_LOGIN } from "./constants"; // Custom types for GitHub Actions events that aren't webhooks export type WorkflowDispatchEvent = { action?: never; @@ -74,6 +75,8 @@ type BaseContext = { branchPrefix: string; useStickyComment: boolean; useCommitSigning: boolean; + botId: string; + botName: string; allowedBots: string; trackProgress: boolean; }; @@ -122,6 +125,8 @@ export function parseGitHubContext(): GitHubContext { branchPrefix: process.env.BRANCH_PREFIX ?? "claude/", useStickyComment: process.env.USE_STICKY_COMMENT === "true", useCommitSigning: process.env.USE_COMMIT_SIGNING === "true", + botId: process.env.BOT_ID ?? String(CLAUDE_APP_BOT_ID), + botName: process.env.BOT_NAME ?? CLAUDE_BOT_LOGIN, allowedBots: process.env.ALLOWED_BOTS ?? "", trackProgress: process.env.TRACK_PROGRESS === "true", }, diff --git a/src/github/operations/git-config.ts b/src/github/operations/git-config.ts index 0ff9500..8244e95 100644 --- a/src/github/operations/git-config.ts +++ b/src/github/operations/git-config.ts @@ -17,7 +17,7 @@ type GitUser = { export async function configureGitAuth( githubToken: string, context: GitHubContext, - user: GitUser | null, + user: GitUser, ) { console.log("Configuring git authentication for non-signing mode"); @@ -28,20 +28,14 @@ export async function configureGitAuth( ? "users.noreply.github.com" : `users.noreply.${serverUrl.hostname}`; - // Configure git user based on the comment creator + // Configure git user console.log("Configuring git user..."); - if (user) { - const botName = user.login; - const botId = user.id; - console.log(`Setting git user as ${botName}...`); - await $`git config user.name "${botName}"`; - await $`git config user.email "${botId}+${botName}@${noreplyDomain}"`; - console.log(`✓ Set git user as ${botName}`); - } else { - console.log("No user data in comment, using default bot user"); - await $`git config user.name "github-actions[bot]"`; - await $`git config user.email "41898282+github-actions[bot]@${noreplyDomain}"`; - } + const botName = user.login; + const botId = user.id; + console.log(`Setting git user as ${botName}...`); + await $`git config user.name "${botName}"`; + await $`git config user.email "${botId}+${botName}@${noreplyDomain}"`; + console.log(`✓ Set git user as ${botName}`); // Remove the authorization header that actions/checkout sets console.log("Removing existing git authentication headers..."); diff --git a/src/modes/agent/index.ts b/src/modes/agent/index.ts index bf18828..ce526ba 100644 --- a/src/modes/agent/index.ts +++ b/src/modes/agent/index.ts @@ -77,22 +77,16 @@ export const agentMode: Mode = { return false; }, - async prepare({ - context, - githubToken, - octokit, - }: ModeOptions): Promise { + async prepare({ context, githubToken }: ModeOptions): Promise { // Configure git authentication for agent mode (same as tag mode) if (!context.inputs.useCommitSigning) { - try { - // Get the authenticated user (will be claude[bot] when using Claude App token) - const { data: authenticatedUser } = - await octokit.rest.users.getAuthenticated(); - const user = { - login: authenticatedUser.login, - id: authenticatedUser.id, - }; + // Use bot_id and bot_name from inputs directly + const user = { + login: context.inputs.botName, + id: parseInt(context.inputs.botId), + }; + try { // Use the shared git configuration function await configureGitAuth(githubToken, context, user); } catch (error) { diff --git a/src/modes/tag/index.ts b/src/modes/tag/index.ts index c8fc12a..4d997f2 100644 --- a/src/modes/tag/index.ts +++ b/src/modes/tag/index.ts @@ -89,8 +89,14 @@ export const tagMode: Mode = { // Configure git authentication if not using commit signing if (!context.inputs.useCommitSigning) { + // Use bot_id and bot_name from inputs directly + const user = { + login: context.inputs.botName, + id: parseInt(context.inputs.botId), + }; + try { - await configureGitAuth(githubToken, context, commentData.user); + await configureGitAuth(githubToken, context, user); } catch (error) { console.error("Failed to configure git authentication:", error); throw error; diff --git a/test/install-mcp-server.test.ts b/test/install-mcp-server.test.ts index 690b9a8..48b54be 100644 --- a/test/install-mcp-server.test.ts +++ b/test/install-mcp-server.test.ts @@ -2,6 +2,7 @@ import { describe, test, expect, beforeEach, afterEach, spyOn } from "bun:test"; import { prepareMcpConfig } from "../src/mcp/install-mcp-server"; import * as core from "@actions/core"; import type { ParsedGitHubContext } from "../src/github/context"; +import { CLAUDE_APP_BOT_ID, CLAUDE_BOT_LOGIN } from "../src/github/constants"; describe("prepareMcpConfig", () => { let consoleInfoSpy: any; @@ -31,6 +32,8 @@ describe("prepareMcpConfig", () => { branchPrefix: "", useStickyComment: false, useCommitSigning: false, + botId: String(CLAUDE_APP_BOT_ID), + botName: CLAUDE_BOT_LOGIN, allowedBots: "", trackProgress: false, }, diff --git a/test/mockContext.ts b/test/mockContext.ts index 9d681b4..57716da 100644 --- a/test/mockContext.ts +++ b/test/mockContext.ts @@ -9,6 +9,7 @@ import type { PullRequestReviewEvent, PullRequestReviewCommentEvent, } from "@octokit/webhooks-types"; +import { CLAUDE_APP_BOT_ID, CLAUDE_BOT_LOGIN } from "../src/github/constants"; const defaultInputs = { prompt: "", @@ -18,6 +19,8 @@ const defaultInputs = { branchPrefix: "claude/", useStickyComment: false, useCommitSigning: false, + botId: String(CLAUDE_APP_BOT_ID), + botName: CLAUDE_BOT_LOGIN, allowedBots: "", trackProgress: false, }; diff --git a/test/modes/agent.test.ts b/test/modes/agent.test.ts index 20268df..9a67e1c 100644 --- a/test/modes/agent.test.ts +++ b/test/modes/agent.test.ts @@ -1,13 +1,23 @@ -import { describe, test, expect, beforeEach, afterEach, spyOn } from "bun:test"; +import { + describe, + test, + expect, + beforeEach, + afterEach, + spyOn, + mock, +} from "bun:test"; import { agentMode } from "../../src/modes/agent"; import type { GitHubContext } from "../../src/github/context"; import { createMockContext, createMockAutomationContext } from "../mockContext"; import * as core from "@actions/core"; +import * as gitConfig from "../../src/github/operations/git-config"; describe("Agent Mode", () => { let mockContext: GitHubContext; let exportVariableSpy: any; let setOutputSpy: any; + let configureGitAuthSpy: any; beforeEach(() => { mockContext = createMockAutomationContext({ @@ -17,13 +27,22 @@ describe("Agent Mode", () => { () => {}, ); setOutputSpy = spyOn(core, "setOutput").mockImplementation(() => {}); + // Mock configureGitAuth to prevent actual git commands from running + configureGitAuthSpy = spyOn( + gitConfig, + "configureGitAuth", + ).mockImplementation(async () => { + // Do nothing - prevent actual git config modifications + }); }); afterEach(() => { exportVariableSpy?.mockClear(); setOutputSpy?.mockClear(); + configureGitAuthSpy?.mockClear(); exportVariableSpy?.mockRestore(); setOutputSpy?.mockRestore(); + configureGitAuthSpy?.mockRestore(); }); test("agent mode has correct properties", () => { @@ -113,7 +132,22 @@ describe("Agent Mode", () => { // Set CLAUDE_ARGS environment variable process.env.CLAUDE_ARGS = "--model claude-sonnet-4 --max-turns 10"; - const mockOctokit = {} as any; + const mockOctokit = { + rest: { + users: { + getAuthenticated: mock(() => + Promise.resolve({ + data: { login: "test-user", id: 12345 }, + }), + ), + getByUsername: mock(() => + Promise.resolve({ + data: { login: "test-user", id: 12345 }, + }), + ), + }, + }, + } as any; const result = await agentMode.prepare({ context: contextWithCustomArgs, octokit: mockOctokit, @@ -152,7 +186,22 @@ describe("Agent Mode", () => { // In v1-dev, we only have the unified prompt field contextWithPrompts.inputs.prompt = "Custom prompt content"; - const mockOctokit = {} as any; + const mockOctokit = { + rest: { + users: { + getAuthenticated: mock(() => + Promise.resolve({ + data: { login: "test-user", id: 12345 }, + }), + ), + getByUsername: mock(() => + Promise.resolve({ + data: { login: "test-user", id: 12345 }, + }), + ), + }, + }, + } as any; await agentMode.prepare({ context: contextWithPrompts, octokit: mockOctokit, diff --git a/test/permissions.test.ts b/test/permissions.test.ts index 3e15966..6659d62 100644 --- a/test/permissions.test.ts +++ b/test/permissions.test.ts @@ -2,6 +2,7 @@ import { describe, expect, test, spyOn, beforeEach, afterEach } from "bun:test"; import * as core from "@actions/core"; import { checkWritePermissions } from "../src/github/validation/permissions"; import type { ParsedGitHubContext } from "../src/github/context"; +import { CLAUDE_APP_BOT_ID, CLAUDE_BOT_LOGIN } from "../src/github/constants"; describe("checkWritePermissions", () => { let coreInfoSpy: any; @@ -67,6 +68,8 @@ describe("checkWritePermissions", () => { branchPrefix: "claude/", useStickyComment: false, useCommitSigning: false, + botId: String(CLAUDE_APP_BOT_ID), + botName: CLAUDE_BOT_LOGIN, allowedBots: "", trackProgress: false, },