prettier

Allow users to override hardcoded disallowed tools (WebSearch, WebFetch) by including them in their allowed_tools configuration. This provides users with the ability to control tool access based on their security requirements.

Changes:
- Modified buildDisallowedToolsString() to accept allowedTools parameter
- Added logic to filter out hardcoded disallowed tools if present in allowed tools
- Updated function call site to pass allowedTools
- Added comprehensive test coverage for override behavior
- Maintains backward compatibility

Resolves #49

Co-authored-by: ashwin-ant <ashwin-ant@users.noreply.github.com>

.github/workflows/claude.yml

@@ -34,5 +34,3 @@ jobs:
         uses: anthropics/claude-code-action@beta
         with:
           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."

README.md

@@ -446,7 +446,7 @@ anthropic_api_key: ${{ secrets.ANTHROPIC_API_KEY }}
 ```
 
 This applies to all sensitive values including API keys, access tokens, and credentials.
-We also recommend that you always use short-lived tokens when possible
+We also reccomend that you always use short-lived tokens when possible
 
 ## License
 

action.yml

@@ -12,9 +12,6 @@ inputs:
   assignee_trigger:
     description: "The assignee username that triggers the action (e.g. @claude)"
     required: false
-  base_branch:
-    description: "The branch to use as the base/source when creating new branches (defaults to repository default branch)"
-    required: false
 
   # Claude Code configuration
   model:
@@ -88,7 +85,6 @@ runs:
       env:
         TRIGGER_PHRASE: ${{ inputs.trigger_phrase }}
         ASSIGNEE_TRIGGER: ${{ inputs.assignee_trigger }}
-        BASE_BRANCH: ${{ inputs.base_branch }}
         ALLOWED_TOOLS: ${{ inputs.allowed_tools }}
         CUSTOM_INSTRUCTIONS: ${{ inputs.custom_instructions }}
         DIRECT_PROMPT: ${{ inputs.direct_prompt }}
@@ -98,7 +94,7 @@ runs:
     - name: Run Claude Code
       id: claude-code
       if: steps.prepare.outputs.contains_trigger == 'true'
-      uses: anthropics/claude-code-base-action@c8e31bd52d9a149b3f8309d7978c6edaa282688d # v0.0.8
+      uses: anthropics/claude-code-base-action@5097b6cdfe5fc5a3ac0166cc344c34ed23c93982 # https://github.com/anthropics/claude-code-base-action/releases/tag/v0.0.5
       with:
         prompt_file: /tmp/claude-prompts/claude-prompt.txt
         allowed_tools: ${{ env.ALLOWED_TOOLS }}
@@ -114,9 +110,6 @@ runs:
         ANTHROPIC_MODEL: ${{ inputs.model || inputs.anthropic_model }}
         GITHUB_TOKEN: ${{ steps.prepare.outputs.GITHUB_TOKEN }}
 
-        # Provider configuration
-        ANTHROPIC_BASE_URL: ${{ env.ANTHROPIC_BASE_URL }}
-
         # AWS configuration
         AWS_REGION: ${{ env.AWS_REGION }}
         AWS_ACCESS_KEY_ID: ${{ env.AWS_ACCESS_KEY_ID }}
@@ -150,12 +143,10 @@ runs:
         TRIGGER_COMMENT_ID: ${{ github.event.comment.id }}
         CLAUDE_BRANCH: ${{ steps.prepare.outputs.CLAUDE_BRANCH }}
         IS_PR: ${{ github.event.issue.pull_request != null || github.event_name == 'pull_request_review_comment' }}
-        BASE_BRANCH: ${{ steps.prepare.outputs.BASE_BRANCH }}
+        DEFAULT_BRANCH: ${{ steps.prepare.outputs.DEFAULT_BRANCH }}
         CLAUDE_SUCCESS: ${{ steps.claude-code.outputs.conclusion == 'success' }}
         OUTPUT_FILE: ${{ steps.claude-code.outputs.execution_file || '' }}
         TRIGGER_USERNAME: ${{ github.event.comment.user.login || github.event.issue.user.login || github.event.pull_request.user.login || github.event.sender.login || github.triggering_actor || github.actor || '' }}
-        PREPARE_SUCCESS: ${{ steps.prepare.outcome == 'success' }}
-        PREPARE_ERROR: ${{ steps.prepare.outputs.prepare_error || '' }}
 
     - name: Display Claude Code Report
       if: steps.prepare.outputs.contains_trigger == 'true' && steps.claude-code.outputs.execution_file != ''

src/create-prompt/index.ts

@@ -86,7 +86,7 @@ export function buildDisallowedToolsString(
 export function prepareContext(
   context: ParsedGitHubContext,
   claudeCommentId: string,
-  baseBranch?: string,
+  defaultBranch?: string,
   claudeBranch?: string,
 ): PreparedContext {
   const repository = context.repository.full_name;
@@ -164,7 +164,7 @@ export function prepareContext(
         ...(commentId && { commentId }),
         commentBody,
         ...(claudeBranch && { claudeBranch }),
-        ...(baseBranch && { baseBranch }),
+        ...(defaultBranch && { defaultBranch }),
       };
       break;
 
@@ -186,7 +186,7 @@ export function prepareContext(
         prNumber,
         commentBody,
         ...(claudeBranch && { claudeBranch }),
-        ...(baseBranch && { baseBranch }),
+        ...(defaultBranch && { defaultBranch }),
       };
       break;
 
@@ -211,13 +211,13 @@ export function prepareContext(
           prNumber,
           commentBody,
           ...(claudeBranch && { claudeBranch }),
-          ...(baseBranch && { baseBranch }),
+          ...(defaultBranch && { defaultBranch }),
         };
         break;
       } else if (!claudeBranch) {
         throw new Error("CLAUDE_BRANCH is required for issue_comment event");
-      } else if (!baseBranch) {
+      } else if (!defaultBranch) {
-        throw new Error("BASE_BRANCH is required for issue_comment event");
+        throw new Error("DEFAULT_BRANCH is required for issue_comment event");
       } else if (!issueNumber) {
         throw new Error(
           "ISSUE_NUMBER is required for issue_comment event for issues",
@@ -229,7 +229,7 @@ export function prepareContext(
         commentId,
         isPR: false,
         claudeBranch: claudeBranch,
-        baseBranch,
+        defaultBranch,
         issueNumber,
         commentBody,
       };
@@ -245,8 +245,8 @@ export function prepareContext(
       if (isPR) {
         throw new Error("IS_PR must be false for issues event");
       }
-      if (!baseBranch) {
+      if (!defaultBranch) {
-        throw new Error("BASE_BRANCH is required for issues event");
+        throw new Error("DEFAULT_BRANCH is required for issues event");
       }
       if (!claudeBranch) {
         throw new Error("CLAUDE_BRANCH is required for issues event");
@@ -263,7 +263,7 @@ export function prepareContext(
           eventAction: "assigned",
           isPR: false,
           issueNumber,
-          baseBranch,
+          defaultBranch,
           claudeBranch,
           assigneeTrigger,
         };
@@ -273,7 +273,7 @@ export function prepareContext(
           eventAction: "opened",
           isPR: false,
           issueNumber,
-          baseBranch,
+          defaultBranch,
           claudeBranch,
         };
       } else {
@@ -294,7 +294,7 @@ export function prepareContext(
         isPR: true,
         prNumber,
         ...(claudeBranch && { claudeBranch }),
-        ...(baseBranch && { baseBranch }),
+        ...(defaultBranch && { defaultBranch }),
       };
       break;
 
@@ -541,13 +541,13 @@ ${context.directPrompt ? `   - DIRECT INSTRUCTION: A direct instruction was prov
       ${
         eventData.claudeBranch
           ? `- Provide a URL to create a PR manually in this format:
-        [Create a PR](${GITHUB_SERVER_URL}/${context.repository}/compare/${eventData.baseBranch}...<branch-name>?quick_pull=1&title=<url-encoded-title>&body=<url-encoded-body>)
+        [Create a PR](${GITHUB_SERVER_URL}/${context.repository}/compare/${eventData.defaultBranch}...<branch-name>?quick_pull=1&title=<url-encoded-title>&body=<url-encoded-body>)
         - IMPORTANT: Use THREE dots (...) between branch names, not two (..)
           Example: ${GITHUB_SERVER_URL}/${context.repository}/compare/main...feature-branch (correct)
           NOT: ${GITHUB_SERVER_URL}/${context.repository}/compare/main..feature-branch (incorrect)
         - IMPORTANT: Ensure all URL parameters are properly encoded - spaces should be encoded as %20, not left as spaces
           Example: Instead of "fix: update welcome message", use "fix%3A%20update%20welcome%20message"
-        - The target-branch should be '${eventData.baseBranch}'.
+        - The target-branch should be '${eventData.defaultBranch}'.
         - The branch-name is the current branch: ${eventData.claudeBranch}
         - The body should include:
           - A clear description of the changes
@@ -632,7 +632,7 @@ f. If you are unable to complete certain steps, such as running a linter or test
 
 export async function createPrompt(
   claudeCommentId: number,
-  baseBranch: string | undefined,
+  defaultBranch: string | undefined,
   claudeBranch: string | undefined,
   githubData: FetchDataResult,
   context: ParsedGitHubContext,
@@ -641,7 +641,7 @@ export async function createPrompt(
     const preparedContext = prepareContext(
       context,
       claudeCommentId.toString(),
-      baseBranch,
+      defaultBranch,
       claudeBranch,
     );
 

src/create-prompt/types.ts

@@ -16,7 +16,7 @@ type PullRequestReviewCommentEvent = {
   commentId?: string; // May be present for review comments
   commentBody: string;
   claudeBranch?: string;
-  baseBranch?: string;
+  defaultBranch?: string;
 };
 
 type PullRequestReviewEvent = {
@@ -25,7 +25,7 @@ type PullRequestReviewEvent = {
   prNumber: string;
   commentBody: string;
   claudeBranch?: string;
-  baseBranch?: string;
+  defaultBranch?: string;
 };
 
 type IssueCommentEvent = {
@@ -33,7 +33,7 @@ type IssueCommentEvent = {
   commentId: string;
   issueNumber: string;
   isPR: false;
-  baseBranch: string;
+  defaultBranch: string;
   claudeBranch: string;
   commentBody: string;
 };
@@ -46,7 +46,7 @@ type PullRequestCommentEvent = {
   isPR: true;
   commentBody: string;
   claudeBranch?: string;
-  baseBranch?: string;
+  defaultBranch?: string;
 };
 
 type IssueOpenedEvent = {
@@ -54,7 +54,7 @@ type IssueOpenedEvent = {
   eventAction: "opened";
   isPR: false;
   issueNumber: string;
-  baseBranch: string;
+  defaultBranch: string;
   claudeBranch: string;
 };
 
@@ -63,7 +63,7 @@ type IssueAssignedEvent = {
   eventAction: "assigned";
   isPR: false;
   issueNumber: string;
-  baseBranch: string;
+  defaultBranch: string;
   claudeBranch: string;
   assigneeTrigger: string;
 };
@@ -74,7 +74,7 @@ type PullRequestEvent = {
   isPR: true;
   prNumber: string;
   claudeBranch?: string;
-  baseBranch?: string;
+  defaultBranch?: string;
 };
 
 // Union type for all possible event types

src/entrypoints/prepare.ts

@@ -77,7 +77,7 @@ async function run() {
     // Step 10: Create prompt file
     await createPrompt(
       commentId,
-      branchInfo.baseBranch,
+      branchInfo.defaultBranch,
       branchInfo.claudeBranch,
       githubData,
       context,
@@ -92,10 +92,7 @@ async function run() {
     );
     core.setOutput("mcp_config", mcpConfig);
   } catch (error) {
-    const errorMessage = error instanceof Error ? error.message : String(error);
+    core.setFailed(`Prepare step failed with error: ${error}`);
-    core.setFailed(`Prepare step failed with error: ${errorMessage}`);
-    // Also output the clean error message for the action to capture
-    core.setOutput("prepare_error", errorMessage);
     process.exit(1);
   }
 }

src/entrypoints/update-comment-link.ts

@@ -18,7 +18,7 @@ async function run() {
     const commentId = parseInt(process.env.CLAUDE_COMMENT_ID!);
     const githubToken = process.env.GITHUB_TOKEN!;
     const claudeBranch = process.env.CLAUDE_BRANCH;
-    const baseBranch = process.env.BASE_BRANCH || "main";
+    const defaultBranch = process.env.DEFAULT_BRANCH || "main";
     const triggerUsername = process.env.TRIGGER_USERNAME;
 
     const context = parseGitHubContext();
@@ -92,7 +92,7 @@ async function run() {
       owner,
       repo,
       claudeBranch,
-      baseBranch,
+      defaultBranch,
     );
 
     // Check if we need to add PR URL when we have a new branch
@@ -102,7 +102,7 @@ async function run() {
       // Check if comment already contains a PR URL
       const serverUrlPattern = serverUrl.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
       const prUrlPattern = new RegExp(
-        `${serverUrlPattern}\\/.+\\/compare\\/${baseBranch.replace(/[.*+?^${}()|[\]\\]/g, "\\$&")}\\.\\.\\.`,
+        `${serverUrlPattern}\\/.+\\/compare\\/${defaultBranch.replace(/[.*+?^${}()|[\]\\]/g, "\\$&")}\\.\\.\\.`,
       );
       const containsPRUrl = currentBody.match(prUrlPattern);
 
@@ -113,7 +113,7 @@ async function run() {
             await octokit.rest.repos.compareCommitsWithBasehead({
               owner,
               repo,
-              basehead: `${baseBranch}...${claudeBranch}`,
+              basehead: `${defaultBranch}...${claudeBranch}`,
             });
 
           // If there are changes (commits or file changes), add the PR URL
@@ -128,7 +128,7 @@ async function run() {
             const prBody = encodeURIComponent(
               `This PR addresses ${entityType.toLowerCase()} #${context.entityNumber}\n\nGenerated with [Claude Code](https://claude.ai/code)`,
             );
-            const prUrl = `${serverUrl}/${owner}/${repo}/compare/${baseBranch}...${claudeBranch}?quick_pull=1&title=${prTitle}&body=${prBody}`;
+            const prUrl = `${serverUrl}/${owner}/${repo}/compare/${defaultBranch}...${claudeBranch}?quick_pull=1&title=${prTitle}&body=${prBody}`;
             prLink = `\n[Create a PR](${prUrl})`;
           }
         } catch (error) {
@@ -145,48 +145,38 @@ async function run() {
       duration_api_ms?: number;
     } | null = null;
     let actionFailed = false;
-    let errorDetails: string | undefined;
 
-    // First check if prepare step failed
+    // Check for existence of output file and parse it if available
-    const prepareSuccess = process.env.PREPARE_SUCCESS !== "false";
+    try {
-    const prepareError = process.env.PREPARE_ERROR;
+      const outputFile = process.env.OUTPUT_FILE;
+      if (outputFile) {
+        const fileContent = await fs.readFile(outputFile, "utf8");
+        const outputData = JSON.parse(fileContent);
 
-    if (!prepareSuccess && prepareError) {
+        // Output file is an array, get the last element which contains execution details
-      actionFailed = true;
+        if (Array.isArray(outputData) && outputData.length > 0) {
-      errorDetails = prepareError;
+          const lastElement = outputData[outputData.length - 1];
-    } else {
+          if (
-      // Check for existence of output file and parse it if available
+            lastElement.role === "system" &&
-      try {
+            "cost_usd" in lastElement &&
-        const outputFile = process.env.OUTPUT_FILE;
+            "duration_ms" in lastElement
-        if (outputFile) {
+          ) {
-          const fileContent = await fs.readFile(outputFile, "utf8");
+            executionDetails = {
-          const outputData = JSON.parse(fileContent);
+              cost_usd: lastElement.cost_usd,
-
+              duration_ms: lastElement.duration_ms,
-          // Output file is an array, get the last element which contains execution details
+              duration_api_ms: lastElement.duration_api_ms,
-          if (Array.isArray(outputData) && outputData.length > 0) {
+            };
-            const lastElement = outputData[outputData.length - 1];
-            if (
-              lastElement.role === "system" &&
-              "cost_usd" in lastElement &&
-              "duration_ms" in lastElement
-            ) {
-              executionDetails = {
-                cost_usd: lastElement.cost_usd,
-                duration_ms: lastElement.duration_ms,
-                duration_api_ms: lastElement.duration_api_ms,
-              };
-            }
           }
         }
-
-        // Check if the Claude action failed
-        const claudeSuccess = process.env.CLAUDE_SUCCESS !== "false";
-        actionFailed = !claudeSuccess;
-      } catch (error) {
-        console.error("Error reading output file:", error);
-        // If we can't read the file, check for any failure markers
-        actionFailed = process.env.CLAUDE_SUCCESS === "false";
       }
+
+      // Check if the action failed by looking at the exit code or error marker
+      const claudeSuccess = process.env.CLAUDE_SUCCESS !== "false";
+      actionFailed = !claudeSuccess;
+    } catch (error) {
+      console.error("Error reading output file:", error);
+      // If we can't read the file, check for any failure markers
+      actionFailed = process.env.CLAUDE_SUCCESS === "false";
     }
 
     // Prepare input for updateCommentBody function
@@ -199,7 +189,6 @@ async function run() {
       prLink,
       branchName: shouldDeleteBranch ? undefined : claudeBranch,
       triggerUsername,
-      errorDetails,
     };
 
     const updatedBody = updateCommentBody(commentInput);

src/github/context.ts

@@ -32,7 +32,6 @@ export type ParsedGitHubContext = {
     disallowedTools: string;
     customInstructions: string;
     directPrompt: string;
-    baseBranch?: string;
   };
 };
 
@@ -56,7 +55,6 @@ export function parseGitHubContext(): ParsedGitHubContext {
       disallowedTools: process.env.DISALLOWED_TOOLS ?? "",
       customInstructions: process.env.CUSTOM_INSTRUCTIONS ?? "",
       directPrompt: process.env.DIRECT_PROMPT ?? "",
-      baseBranch: process.env.BASE_BRANCH,
     },
   };
 

src/github/operations/branch-cleanup.ts

@@ -6,7 +6,7 @@ export async function checkAndDeleteEmptyBranch(
   owner: string,
   repo: string,
   claudeBranch: string | undefined,
-  baseBranch: string,
+  defaultBranch: string,
 ): Promise<{ shouldDeleteBranch: boolean; branchLink: string }> {
   let branchLink = "";
   let shouldDeleteBranch = false;
@@ -18,7 +18,7 @@ export async function checkAndDeleteEmptyBranch(
         await octokit.rest.repos.compareCommitsWithBasehead({
           owner,
           repo,
-          basehead: `${baseBranch}...${claudeBranch}`,
+          basehead: `${defaultBranch}...${claudeBranch}`,
         });
 
       // If there are no commits, mark branch for deletion

src/github/operations/branch.ts

@@ -14,7 +14,7 @@ import type { Octokits } from "../api/client";
 import type { FetchDataResult } from "../data/fetcher";
 
 export type BranchInfo = {
-  baseBranch: string;
+  defaultBranch: string;
   claudeBranch?: string;
   currentBranch: string;
 };
@@ -26,9 +26,15 @@ export async function setupBranch(
 ): Promise<BranchInfo> {
   const { owner, repo } = context.repository;
   const entityNumber = context.entityNumber;
-  const { baseBranch } = context.inputs;
   const isPR = context.isPR;
 
+  // Get the default branch first
+  const repoResponse = await octokits.rest.repos.get({
+    owner,
+    repo,
+  });
+  const defaultBranch = repoResponse.data.default_branch;
+
   if (isPR) {
     const prData = githubData.contextData as GitHubPullRequest;
     const prState = prData.state;
@@ -36,7 +42,7 @@ export async function setupBranch(
     // Check if PR is closed or merged
     if (prState === "CLOSED" || prState === "MERGED") {
       console.log(
-        `PR #${entityNumber} is ${prState}, creating new branch from source...`,
+        `PR #${entityNumber} is ${prState}, creating new branch from default...`,
       );
       // Fall through to create a new branch like we do for issues
     } else {
@@ -52,36 +58,17 @@ export async function setupBranch(
 
       console.log(`Successfully checked out PR branch for PR #${entityNumber}`);
 
-      // For open PRs, we need to get the base branch of the PR
+      // For open PRs, return branch info
-      const baseBranch = prData.baseRefName;
-
       return {
-        baseBranch,
+        defaultBranch,
         currentBranch: branchName,
       };
     }
   }
 
-  // Determine source branch - use baseBranch if provided, otherwise fetch default
-  let sourceBranch: string;
-
-  if (baseBranch) {
-    // Use provided base branch for source
-    sourceBranch = baseBranch;
-  } else {
-    // No base branch provided, fetch the default branch to use as source
-    const repoResponse = await octokits.rest.repos.get({
-      owner,
-      repo,
-    });
-    sourceBranch = repoResponse.data.default_branch;
-  }
-
   // Creating a new branch for either an issue or closed/merged PR
   const entityType = isPR ? "pr" : "issue";
-  console.log(
+  console.log(`Creating new branch for ${entityType} #${entityNumber}...`);
-    `Creating new branch for ${entityType} #${entityNumber} from source branch: ${sourceBranch}...`,
-  );
 
   const timestamp = new Date()
     .toISOString()
@@ -93,14 +80,14 @@ export async function setupBranch(
   const newBranch = `claude/${entityType}-${entityNumber}-${timestamp}`;
 
   try {
-    // Get the SHA of the source branch
+    // Get the SHA of the default branch
-    const sourceBranchRef = await octokits.rest.git.getRef({
+    const defaultBranchRef = await octokits.rest.git.getRef({
       owner,
       repo,
-      ref: `heads/${sourceBranch}`,
+      ref: `heads/${defaultBranch}`,
     });
 
-    const currentSHA = sourceBranchRef.data.object.sha;
+    const currentSHA = defaultBranchRef.data.object.sha;
 
     console.log(`Current SHA: ${currentSHA}`);
 
@@ -122,9 +109,9 @@ export async function setupBranch(
 
     // Set outputs for GitHub Actions
     core.setOutput("CLAUDE_BRANCH", newBranch);
-    core.setOutput("BASE_BRANCH", sourceBranch);
+    core.setOutput("DEFAULT_BRANCH", defaultBranch);
     return {
-      baseBranch: sourceBranch,
+      defaultBranch,
       claudeBranch: newBranch,
       currentBranch: newBranch,
     };

src/github/operations/comment-logic.ts

@@ -15,7 +15,6 @@ export type CommentUpdateInput = {
   prLink?: string;
   branchName?: string;
   triggerUsername?: string;
-  errorDetails?: string;
 };
 
 export function ensureProperlyEncodedUrl(url: string): string | null {
@@ -76,7 +75,6 @@ export function updateCommentBody(input: CommentUpdateInput): string {
     actionFailed,
     branchName,
     triggerUsername,
-    errorDetails,
   } = input;
 
   // Extract content from the original comment body
@@ -179,14 +177,7 @@ export function updateCommentBody(input: CommentUpdateInput): string {
   }
 
   // Build the new body with blank line between header and separator
-  let newBody = `${header}${links}`;
+  let newBody = `${header}${links}\n\n---\n`;
-
-  // Add error details if available
-  if (actionFailed && errorDetails) {
-    newBody += `\n\n\`\`\`\n${errorDetails}\n\`\`\``;
-  }
-
-  newBody += `\n\n---\n`;
 
   // Clean up the body content
   // Remove any existing View job run, branch links from the bottom

test/comment-logic.test.ts

@@ -39,25 +39,6 @@ describe("updateCommentBody", () => {
       expect(result).toContain("**Claude encountered an error after 45s**");
     });
 
-    it("includes error details when provided", () => {
-      const input = {
-        ...baseInput,
-        currentBody: "Claude Code is working...",
-        actionFailed: true,
-        executionDetails: { duration_ms: 45000 },
-        errorDetails: "Failed to fetch issue data",
-      };
-
-      const result = updateCommentBody(input);
-      expect(result).toContain("**Claude encountered an error after 45s**");
-      expect(result).toContain("[View job]");
-      expect(result).toContain("```\nFailed to fetch issue data\n```");
-      // Ensure error details come after the header/links
-      const errorIndex = result.indexOf("```");
-      const headerIndex = result.indexOf("**Claude encountered an error");
-      expect(errorIndex).toBeGreaterThan(headerIndex);
-    });
-
     it("handles username extraction from content when not provided", () => {
       const input = {
         ...baseInput,

test/create-prompt.test.ts

@@ -127,7 +127,7 @@ describe("generatePrompt", () => {
         eventName: "issue_comment",
         commentId: "67890",
         isPR: false,
-        baseBranch: "main",
+        defaultBranch: "main",
         claudeBranch: "claude/issue-67890-20240101_120000",
         issueNumber: "67890",
         commentBody: "@claude please fix this",
@@ -183,7 +183,7 @@ describe("generatePrompt", () => {
         eventAction: "opened",
         isPR: false,
         issueNumber: "789",
-        baseBranch: "main",
+        defaultBranch: "main",
         claudeBranch: "claude/issue-789-20240101_120000",
       },
     };
@@ -210,7 +210,7 @@ describe("generatePrompt", () => {
         eventAction: "assigned",
         isPR: false,
         issueNumber: "999",
-        baseBranch: "develop",
+        defaultBranch: "develop",
         claudeBranch: "claude/issue-999-20240101_120000",
         assigneeTrigger: "claude-bot",
       },
@@ -238,7 +238,7 @@ describe("generatePrompt", () => {
         eventAction: "opened",
         isPR: false,
         issueNumber: "789",
-        baseBranch: "main",
+        defaultBranch: "main",
         claudeBranch: "claude/issue-789-20240101_120000",
       },
     };
@@ -285,7 +285,7 @@ describe("generatePrompt", () => {
         commentId: "67890",
         isPR: false,
         issueNumber: "123",
-        baseBranch: "main",
+        defaultBranch: "main",
         claudeBranch: "claude/issue-67890-20240101_120000",
         commentBody: "@claude please fix this",
       },
@@ -307,7 +307,7 @@ describe("generatePrompt", () => {
         commentId: "67890",
         isPR: false,
         issueNumber: "123",
-        baseBranch: "main",
+        defaultBranch: "main",
         claudeBranch: "claude/issue-67890-20240101_120000",
         commentBody: "@claude please fix this",
       },
@@ -362,7 +362,7 @@ describe("generatePrompt", () => {
         eventAction: "opened",
         isPR: false,
         issueNumber: "789",
-        baseBranch: "main",
+        defaultBranch: "main",
         claudeBranch: "claude/issue-789-20240101_120000",
       },
     };
@@ -400,7 +400,7 @@ describe("generatePrompt", () => {
         commentId: "67890",
         isPR: false,
         issueNumber: "123",
-        baseBranch: "main",
+        defaultBranch: "main",
         claudeBranch: "claude/issue-123-20240101_120000",
         commentBody: "@claude please fix this",
       },
@@ -432,7 +432,7 @@ describe("generatePrompt", () => {
         prNumber: "456",
         commentBody: "@claude please fix this",
         claudeBranch: "claude/pr-456-20240101_120000",
-        baseBranch: "main",
+        defaultBranch: "main",
       },
     };
 
@@ -470,7 +470,7 @@ describe("generatePrompt", () => {
         isPR: true,
         prNumber: "456",
         commentBody: "@claude please fix this",
-        // No claudeBranch or baseBranch for open PRs
+        // No claudeBranch or defaultBranch for open PRs
       },
     };
 
@@ -503,7 +503,7 @@ describe("generatePrompt", () => {
         prNumber: "789",
         commentBody: "@claude please update this",
         claudeBranch: "claude/pr-789-20240101_123000",
-        baseBranch: "develop",
+        defaultBranch: "develop",
       },
     };
 
@@ -531,7 +531,7 @@ describe("generatePrompt", () => {
         commentId: "review-comment-123",
         commentBody: "@claude fix this issue",
         claudeBranch: "claude/pr-999-20240101_140000",
-        baseBranch: "main",
+        defaultBranch: "main",
       },
     };
 
@@ -559,7 +559,7 @@ describe("generatePrompt", () => {
         isPR: true,
         prNumber: "555",
         claudeBranch: "claude/pr-555-20240101_150000",
-        baseBranch: "main",
+        defaultBranch: "main",
       },
     };
 
@@ -604,7 +604,7 @@ describe("getEventTypeAndContext", () => {
         eventAction: "assigned",
         isPR: false,
         issueNumber: "999",
-        baseBranch: "main",
+        defaultBranch: "main",
         claudeBranch: "claude/issue-999-20240101_120000",
         assigneeTrigger: "claude-bot",
       },

test/prepare-context.test.ts

@@ -34,7 +34,7 @@ describe("parseEnvVarsWithContext", () => {
       beforeEach(() => {
         process.env = {
           ...BASE_ENV,
-          BASE_BRANCH: "main",
+          DEFAULT_BRANCH: "main",
           CLAUDE_BRANCH: "claude/issue-67890-20240101_120000",
         };
       });
@@ -62,7 +62,7 @@ describe("parseEnvVarsWithContext", () => {
           expect(result.eventData.claudeBranch).toBe(
             "claude/issue-67890-20240101_120000",
           );
-          expect(result.eventData.baseBranch).toBe("main");
+          expect(result.eventData.defaultBranch).toBe("main");
           expect(result.eventData.commentBody).toBe(
             "@claude can you help explain how to configure the logging system?",
           );
@@ -75,7 +75,7 @@ describe("parseEnvVarsWithContext", () => {
         ).toThrow("CLAUDE_BRANCH is required for issue_comment event");
       });
 
-      test("should throw error when BASE_BRANCH is missing", () => {
+      test("should throw error when DEFAULT_BRANCH is missing", () => {
         expect(() =>
           prepareContext(
             mockIssueCommentContext,
@@ -83,7 +83,7 @@ describe("parseEnvVarsWithContext", () => {
             undefined,
             "claude/issue-67890-20240101_120000",
           ),
-        ).toThrow("BASE_BRANCH is required for issue_comment event");
+        ).toThrow("DEFAULT_BRANCH is required for issue_comment event");
       });
     });
 
@@ -151,7 +151,7 @@ describe("parseEnvVarsWithContext", () => {
     beforeEach(() => {
       process.env = {
         ...BASE_ENV,
-        BASE_BRANCH: "main",
+        DEFAULT_BRANCH: "main",
         CLAUDE_BRANCH: "claude/issue-42-20240101_120000",
       };
     });
@@ -172,7 +172,7 @@ describe("parseEnvVarsWithContext", () => {
         result.eventData.eventAction === "opened"
       ) {
         expect(result.eventData.issueNumber).toBe("42");
-        expect(result.eventData.baseBranch).toBe("main");
+        expect(result.eventData.defaultBranch).toBe("main");
         expect(result.eventData.claudeBranch).toBe(
           "claude/issue-42-20240101_120000",
         );
@@ -195,7 +195,7 @@ describe("parseEnvVarsWithContext", () => {
         result.eventData.eventAction === "assigned"
       ) {
         expect(result.eventData.issueNumber).toBe("123");
-        expect(result.eventData.baseBranch).toBe("main");
+        expect(result.eventData.defaultBranch).toBe("main");
         expect(result.eventData.claudeBranch).toBe(
           "claude/issue-123-20240101_120000",
         );
@@ -209,7 +209,7 @@ describe("parseEnvVarsWithContext", () => {
       ).toThrow("CLAUDE_BRANCH is required for issues event");
     });
 
-    test("should throw error when BASE_BRANCH is missing for issues", () => {
+    test("should throw error when DEFAULT_BRANCH is missing for issues", () => {
       expect(() =>
         prepareContext(
           mockIssueOpenedContext,
@@ -217,7 +217,7 @@ describe("parseEnvVarsWithContext", () => {
           undefined,
           "claude/issue-42-20240101_120000",
         ),
-      ).toThrow("BASE_BRANCH is required for issues event");
+      ).toThrow("DEFAULT_BRANCH is required for issues event");
     });
   });