fix: add model parameter support to base-action

- Add model field to ClaudeOptions type
- Pass ANTHROPIC_MODEL env var to runClaude function
- Handle --model argument in prepareRunConfig

This allows the model specified in action.yml to be properly passed
to the Claude CLI command.

🤖 Generated with [Claude Code](https://claude.ai/code)

Co-Authored-By: Claude <noreply@anthropic.com>

README.md

@@ -170,7 +170,6 @@ jobs:
 | `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\*     | -         |
 | `direct_prompt`                | Direct prompt for Claude to execute automatically without needing a trigger (for automated workflows)                | No       | -         |
-| `override_prompt`              | Complete replacement of Claude's prompt with custom template (supports variable substitution)                        | No       | -         |
 | `base_branch`                  | The base branch to use for creating new branches (e.g., 'main', 'develop')                                           | 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`      |
@@ -396,36 +395,6 @@ jobs:
 
 Perfect for automatically reviewing PRs from new team members, external contributors, or specific developers who need extra guidance.
 
-#### Custom Prompt Templates
-
-Use `override_prompt` for complete control over Claude's behavior with variable substitution:
-
-```yaml
-- uses: anthropics/claude-code-action@beta
-  with:
-    override_prompt: |
-      Analyze PR #$PR_NUMBER in $REPOSITORY for security vulnerabilities.
-
-      Changed files:
-      $CHANGED_FILES
-
-      Focus on:
-      - SQL injection risks
-      - XSS vulnerabilities
-      - Authentication bypasses
-      - Exposed secrets or credentials
-
-      Provide severity ratings (Critical/High/Medium/Low) for any issues found.
-```
-
-The `override_prompt` feature supports these variables:
-
-- `$REPOSITORY`, `$PR_NUMBER`, `$ISSUE_NUMBER`
-- `$PR_TITLE`, `$ISSUE_TITLE`, `$PR_BODY`, `$ISSUE_BODY`
-- `$PR_COMMENTS`, `$ISSUE_COMMENTS`, `$REVIEW_COMMENTS`
-- `$CHANGED_FILES`, `$TRIGGER_COMMENT`, `$TRIGGER_USERNAME`
-- `$BRANCH_NAME`, `$BASE_BRANCH`, `$EVENT_TYPE`, `$IS_PR`
-
 ## How It Works
 
 1. **Trigger Detection**: Listens for comments containing the trigger phrase (default: `@claude`) or issue assignment to a specific user

action.yml

@@ -50,10 +50,6 @@ inputs:
     description: "Direct instruction for Claude (bypasses normal trigger detection)"
     required: false
     default: ""
-  override_prompt:
-    description: "Complete replacement of Claude's prompt with custom template (supports variable substitution)"
-    required: false
-    default: ""
   mcp_config:
     description: "Additional MCP configuration (JSON string) that merges with the built-in GitHub MCP servers"
   additional_permissions:
@@ -146,7 +142,6 @@ runs:
         DISALLOWED_TOOLS: ${{ inputs.disallowed_tools }}
         CUSTOM_INSTRUCTIONS: ${{ inputs.custom_instructions }}
         DIRECT_PROMPT: ${{ inputs.direct_prompt }}
-        OVERRIDE_PROMPT: ${{ inputs.override_prompt }}
         MCP_CONFIG: ${{ inputs.mcp_config }}
         OVERRIDE_GITHUB_TOKEN: ${{ inputs.github_token }}
         GITHUB_RUN_ID: ${{ github.run_id }}
@@ -193,13 +188,12 @@ runs:
       shell: bash
       run: |
         # Install Claude Code globally
-        npm install -g @anthropic-ai/claude-code@1.0.57
+        npm install -g @anthropic-ai/claude-code@1.0.56
 
         # Run the base-action
         cd ${GITHUB_ACTION_PATH}/base-action
         bun install
-        cd -
-        bun run ${GITHUB_ACTION_PATH}/base-action/src/index.ts
+        bun run src/index.ts
       env:
         # Base-action inputs
         CLAUDE_CODE_ACTION: "1"

base-action/action.yml

@@ -115,7 +115,7 @@ runs:
 
     - name: Install Claude Code
       shell: bash
-      run: npm install -g @anthropic-ai/claude-code@1.0.57
+      run: npm install -g @anthropic-ai/claude-code@1.0.56
 
     - name: Run Claude Code Action
       shell: bash

src/create-prompt/index.ts

@@ -120,7 +120,6 @@ export function prepareContext(
   const allowedTools = context.inputs.allowedTools;
   const disallowedTools = context.inputs.disallowedTools;
   const directPrompt = context.inputs.directPrompt;
-  const overridePrompt = context.inputs.overridePrompt;
   const isPR = context.isPR;
 
   // Get PR/Issue number from entityNumber
@@ -159,7 +158,6 @@ export function prepareContext(
       disallowedTools: disallowedTools.join(","),
     }),
     ...(directPrompt && { directPrompt }),
-    ...(overridePrompt && { overridePrompt }),
     ...(claudeBranch && { claudeBranch }),
   };
 
@@ -462,76 +460,11 @@ function getCommitInstructions(
   }
 }
 
-function substitutePromptVariables(
-  template: string,
-  context: PreparedContext,
-  githubData: FetchDataResult,
-): string {
-  const { contextData, comments, reviewData, changedFilesWithSHA } = githubData;
-  const { eventData } = context;
-
-  const variables: Record<string, string> = {
-    REPOSITORY: context.repository,
-    PR_NUMBER:
-      eventData.isPR && "prNumber" in eventData ? eventData.prNumber : "",
-    ISSUE_NUMBER:
-      !eventData.isPR && "issueNumber" in eventData
-        ? eventData.issueNumber
-        : "",
-    PR_TITLE: eventData.isPR && contextData?.title ? contextData.title : "",
-    ISSUE_TITLE: !eventData.isPR && contextData?.title ? contextData.title : "",
-    PR_BODY: eventData.isPR && contextData?.body ? contextData.body : "",
-    ISSUE_BODY: !eventData.isPR && contextData?.body ? contextData.body : "",
-    PR_COMMENTS: eventData.isPR
-      ? formatComments(comments, githubData.imageUrlMap)
-      : "",
-    ISSUE_COMMENTS: !eventData.isPR
-      ? formatComments(comments, githubData.imageUrlMap)
-      : "",
-    REVIEW_COMMENTS: eventData.isPR
-      ? formatReviewComments(reviewData, githubData.imageUrlMap)
-      : "",
-    CHANGED_FILES: eventData.isPR
-      ? formatChangedFilesWithSHA(changedFilesWithSHA)
-      : "",
-    TRIGGER_COMMENT: "commentBody" in eventData ? eventData.commentBody : "",
-    TRIGGER_USERNAME: context.triggerUsername || "",
-    BRANCH_NAME:
-      "claudeBranch" in eventData && eventData.claudeBranch
-        ? eventData.claudeBranch
-        : "baseBranch" in eventData && eventData.baseBranch
-          ? eventData.baseBranch
-          : "",
-    BASE_BRANCH:
-      "baseBranch" in eventData && eventData.baseBranch
-        ? eventData.baseBranch
-        : "",
-    EVENT_TYPE: eventData.eventName,
-    IS_PR: eventData.isPR ? "true" : "false",
-  };
-
-  let result = template;
-  for (const [key, value] of Object.entries(variables)) {
-    const regex = new RegExp(`\\$${key}`, "g");
-    result = result.replace(regex, value);
-  }
-
-  return result;
-}
-
 export function generatePrompt(
   context: PreparedContext,
   githubData: FetchDataResult,
   useCommitSigning: boolean,
 ): string {
-  if (context.overridePrompt) {
-    return substitutePromptVariables(
-      context.overridePrompt,
-      context,
-      githubData,
-    );
-  }
-
   const {
     contextData,
     comments,
@@ -761,7 +694,8 @@ What You CANNOT Do:
 - Submit formal GitHub PR reviews
 - Approve pull requests (for security reasons)
 - Post multiple comments (you only update your initial comment)
-- Execute commands outside the repository context${useCommitSigning ? "\n- Run arbitrary Bash commands (unless explicitly allowed via allowed_tools configuration)" : ""}
+- Execute commands outside the repository context
+- Run arbitrary Bash commands (unless explicitly allowed via allowed_tools configuration)
 - Perform branch operations (cannot merge branches, rebase, or perform other git operations beyond pushing commits)
 - Modify files in the .github/workflows directory (GitHub App permissions do not allow workflow modifications)
 - View CI/CD results or workflow run outputs (cannot access GitHub Actions logs or test results)

src/create-prompt/types.ts

@@ -7,7 +7,6 @@ export type CommonFields = {
   allowedTools?: string;
   disallowedTools?: string;
   directPrompt?: string;
-  overridePrompt?: string;
 };
 
 type PullRequestReviewCommentEvent = {

src/github/context.ts

@@ -34,7 +34,6 @@ export type ParsedGitHubContext = {
     disallowedTools: string[];
     customInstructions: string;
     directPrompt: string;
-    overridePrompt: string;
     baseBranch?: string;
     branchPrefix: string;
     useStickyComment: boolean;
@@ -64,7 +63,6 @@ export function parseGitHubContext(): ParsedGitHubContext {
       disallowedTools: parseMultilineInput(process.env.DISALLOWED_TOOLS ?? ""),
       customInstructions: process.env.CUSTOM_INSTRUCTIONS ?? "",
       directPrompt: process.env.DIRECT_PROMPT ?? "",
-      overridePrompt: process.env.OVERRIDE_PROMPT ?? "",
       baseBranch: process.env.BASE_BRANCH,
       branchPrefix: process.env.BRANCH_PREFIX ?? "claude/",
       useStickyComment: process.env.USE_STICKY_COMMENT === "true",

src/github/operations/branch.ts

@@ -116,11 +116,6 @@ export async function setupBranch(
         `Branch name generated: ${newBranch} (will be created by file ops server on first commit)`,
       );
 
-      // Ensure we're on the source branch
-      console.log(`Fetching and checking out source branch: ${sourceBranch}`);
-      await $`git fetch origin ${sourceBranch} --depth=1`;
-      await $`git checkout ${sourceBranch}`;
-
       // Set outputs for GitHub Actions
       core.setOutput("CLAUDE_BRANCH", newBranch);
       core.setOutput("BASE_BRANCH", sourceBranch);
@@ -136,12 +131,7 @@ export async function setupBranch(
       `Creating local branch ${newBranch} for ${entityType} #${entityNumber} from source branch: ${sourceBranch}...`,
     );
 
-    // Fetch and checkout the source branch first to ensure we branch from the correct base
-    console.log(`Fetching and checking out source branch: ${sourceBranch}`);
-    await $`git fetch origin ${sourceBranch} --depth=1`;
-    await $`git checkout ${sourceBranch}`;
-
-    // Create and checkout the new branch from the source branch
+    // Create and checkout the new branch locally
     await $`git checkout -b ${newBranch}`;
 
     console.log(

test/create-prompt.test.ts

@@ -322,148 +322,6 @@ describe("generatePrompt", () => {
     expect(prompt).toContain("CUSTOM INSTRUCTIONS:\nAlways use TypeScript");
   });
 
-  test("should use override_prompt when provided", () => {
-    const envVars: PreparedContext = {
-      repository: "owner/repo",
-      claudeCommentId: "12345",
-      triggerPhrase: "@claude",
-      overridePrompt: "Simple prompt for $REPOSITORY PR #$PR_NUMBER",
-      eventData: {
-        eventName: "pull_request",
-        eventAction: "opened",
-        isPR: true,
-        prNumber: "123",
-      },
-    };
-
-    const prompt = generatePrompt(envVars, mockGitHubData, false);
-
-    expect(prompt).toBe("Simple prompt for owner/repo PR #123");
-    expect(prompt).not.toContain("You are Claude, an AI assistant");
-  });
-
-  test("should substitute all variables in override_prompt", () => {
-    const envVars: PreparedContext = {
-      repository: "test/repo",
-      claudeCommentId: "12345",
-      triggerPhrase: "@claude",
-      triggerUsername: "john-doe",
-      overridePrompt: `Repository: $REPOSITORY
-      PR: $PR_NUMBER
-      Title: $PR_TITLE
-      Body: $PR_BODY
-      Comments: $PR_COMMENTS
-      Review Comments: $REVIEW_COMMENTS
-      Changed Files: $CHANGED_FILES
-      Trigger Comment: $TRIGGER_COMMENT
-      Username: $TRIGGER_USERNAME
-      Branch: $BRANCH_NAME
-      Base: $BASE_BRANCH
-      Event: $EVENT_TYPE
-      Is PR: $IS_PR`,
-      eventData: {
-        eventName: "pull_request_review_comment",
-        isPR: true,
-        prNumber: "456",
-        commentBody: "Please review this code",
-        claudeBranch: "feature-branch",
-        baseBranch: "main",
-      },
-    };
-
-    const prompt = generatePrompt(envVars, mockGitHubData, false);
-
-    expect(prompt).toContain("Repository: test/repo");
-    expect(prompt).toContain("PR: 456");
-    expect(prompt).toContain("Title: Test PR");
-    expect(prompt).toContain("Body: This is a test PR");
-    expect(prompt).toContain("Comments: ");
-    expect(prompt).toContain("Review Comments: ");
-    expect(prompt).toContain("Changed Files: ");
-    expect(prompt).toContain("Trigger Comment: Please review this code");
-    expect(prompt).toContain("Username: john-doe");
-    expect(prompt).toContain("Branch: feature-branch");
-    expect(prompt).toContain("Base: main");
-    expect(prompt).toContain("Event: pull_request_review_comment");
-    expect(prompt).toContain("Is PR: true");
-  });
-
-  test("should handle override_prompt for issues", () => {
-    const envVars: PreparedContext = {
-      repository: "owner/repo",
-      claudeCommentId: "12345",
-      triggerPhrase: "@claude",
-      overridePrompt: "Issue #$ISSUE_NUMBER: $ISSUE_TITLE in $REPOSITORY",
-      eventData: {
-        eventName: "issues",
-        eventAction: "opened",
-        isPR: false,
-        issueNumber: "789",
-        baseBranch: "main",
-        claudeBranch: "claude/issue-789-20240101-1200",
-      },
-    };
-
-    const issueGitHubData = {
-      ...mockGitHubData,
-      contextData: {
-        title: "Bug: Login form broken",
-        body: "The login form is not working",
-        author: { login: "testuser" },
-        state: "OPEN",
-        createdAt: "2023-01-01T00:00:00Z",
-        comments: {
-          nodes: [],
-        },
-      },
-    };
-
-    const prompt = generatePrompt(envVars, issueGitHubData, false);
-
-    expect(prompt).toBe("Issue #789: Bug: Login form broken in owner/repo");
-  });
-
-  test("should handle empty values in override_prompt substitution", () => {
-    const envVars: PreparedContext = {
-      repository: "owner/repo",
-      claudeCommentId: "12345",
-      triggerPhrase: "@claude",
-      overridePrompt:
-        "PR: $PR_NUMBER, Issue: $ISSUE_NUMBER, Comment: $TRIGGER_COMMENT",
-      eventData: {
-        eventName: "pull_request",
-        eventAction: "opened",
-        isPR: true,
-        prNumber: "123",
-      },
-    };
-
-    const prompt = generatePrompt(envVars, mockGitHubData, false);
-
-    expect(prompt).toBe("PR: 123, Issue: , Comment: ");
-  });
-
-  test("should not substitute variables when override_prompt is not provided", () => {
-    const envVars: PreparedContext = {
-      repository: "owner/repo",
-      claudeCommentId: "12345",
-      triggerPhrase: "@claude",
-      eventData: {
-        eventName: "issues",
-        eventAction: "opened",
-        isPR: false,
-        issueNumber: "123",
-        baseBranch: "main",
-        claudeBranch: "claude/issue-123-20240101-1200",
-      },
-    };
-
-    const prompt = generatePrompt(envVars, mockGitHubData, false);
-
-    expect(prompt).toContain("You are Claude, an AI assistant");
-    expect(prompt).toContain("<event_type>ISSUE_CREATED</event_type>");
-  });
-
   test("should include trigger username when provided", () => {
     const envVars: PreparedContext = {
       repository: "owner/repo",

test/install-mcp-server.test.ts

@@ -31,7 +31,6 @@ describe("prepareMcpConfig", () => {
       disallowedTools: [],
       customInstructions: "",
       directPrompt: "",
-      overridePrompt: "",
       branchPrefix: "",
       useStickyComment: false,
       additionalPermissions: new Map(),

test/mockContext.ts

@@ -16,7 +16,6 @@ const defaultInputs = {
   disallowedTools: [] as string[],
   customInstructions: "",
   directPrompt: "",
-  overridePrompt: "",
   useBedrock: false,
   useVertex: false,
   timeoutMinutes: 30,

test/permissions.test.ts

@@ -67,7 +67,6 @@ describe("checkWritePermissions", () => {
       disallowedTools: [],
       customInstructions: "",
       directPrompt: "",
-      overridePrompt: "",
       branchPrefix: "claude/",
       useStickyComment: false,
       additionalPermissions: new Map(),

test/trigger-validation.test.ts

@@ -32,7 +32,6 @@ describe("checkContainsTrigger", () => {
           assigneeTrigger: "",
           labelTrigger: "",
           directPrompt: "Fix the bug in the login form",
-          overridePrompt: "",
           allowedTools: [],
           disallowedTools: [],
           customInstructions: "",
@@ -64,7 +63,6 @@ describe("checkContainsTrigger", () => {
           assigneeTrigger: "",
           labelTrigger: "",
           directPrompt: "",
-          overridePrompt: "",
           allowedTools: [],
           disallowedTools: [],
           customInstructions: "",
@@ -280,7 +278,6 @@ describe("checkContainsTrigger", () => {
           assigneeTrigger: "",
           labelTrigger: "",
           directPrompt: "",
-          overridePrompt: "",
           allowedTools: [],
           disallowedTools: [],
           customInstructions: "",
@@ -313,7 +310,6 @@ describe("checkContainsTrigger", () => {
           assigneeTrigger: "",
           labelTrigger: "",
           directPrompt: "",
-          overridePrompt: "",
           allowedTools: [],
           disallowedTools: [],
           customInstructions: "",
@@ -346,7 +342,6 @@ describe("checkContainsTrigger", () => {
           assigneeTrigger: "",
           labelTrigger: "",
           directPrompt: "",
-          overridePrompt: "",
           allowedTools: [],
           disallowedTools: [],
           customInstructions: "",