refactor: move BASE_BRANCH env reading into parseGitHubContext

- Move BASE_BRANCH environment variable reading into parseGitHubContext for consistency
- Update setupBranch to use context.inputs.baseBranch instead of process.env
- Fix test descriptions to correctly reference BASE_BRANCH instead of DEFAULT_BRANCH
- Update test environment setup to use BASE_BRANCH

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

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

.github/ISSUE_TEMPLATE/bug_report.md

@@ -1,36 +0,0 @@
----
-name: Bug report
-about: Create a report to help us improve
-title: ""
-labels: bug
-assignees: ""
----
-
-**Describe the bug**
-A clear and concise description of what the bug is.
-
-**To Reproduce**
-Steps to reproduce the behavior:
-
-1. Go to '...'
-2. Click on '....'
-3. Scroll down to '....'
-4. See error
-
-**Expected behavior**
-A clear and concise description of what you expected to happen.
-
-**Screenshots**
-If applicable, add screenshots to help explain your problem.
-
-**Workflow yml file**
-If it's not sensitive, consider including a paste of your full Claude workflow.yml file.
-
-**API Provider**
-
-[ ] Anthropic First-Party API (default)
-[ ] AWS Bedrock
-[ ] GCP Vertex
-
-**Additional context**
-Add any other context about the problem here.

.github/workflows/issue-triage.yml

@@ -1,104 +0,0 @@
-name: Claude Issue Triage
-description: Run Claude Code for issue triage in GitHub Actions
-on:
-  issues:
-    types: [opened]
-
-jobs:
-  triage-issue:
-    runs-on: ubuntu-latest
-    timeout-minutes: 10
-    permissions:
-      contents: read
-      issues: write
-
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-
-      - name: Setup GitHub MCP Server
-        run: |
-          mkdir -p /tmp/mcp-config
-          cat > /tmp/mcp-config/mcp-servers.json << 'EOF'
-          {
-            "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 }}"
-              }
-            }
-          }
-          EOF
-
-      - name: Create triage prompt
-        run: |
-          mkdir -p /tmp/claude-prompts
-          cat > /tmp/claude-prompts/triage-prompt.txt << 'EOF'
-          You're an issue triage assistant for GitHub issues. Your task is to analyze the issue and select appropriate labels from the provided list.
-
-          IMPORTANT: Don't post any comments or messages to the issue. Your only action should be to apply labels.
-
-          Issue Information:
-          - REPO: ${{ github.repository }}
-          - ISSUE_NUMBER: ${{ github.event.issue.number }}
-
-          TASK OVERVIEW:
-
-          1. First, fetch the list of labels available in this repository by running: `gh label list`. Run exactly this command with nothing else.
-
-          2. Next, use the GitHub tools to get context about the issue:
-             - You have access to these tools:
-               - mcp__github__get_issue: Use this to retrieve the current issue's details including title, description, and existing labels
-               - mcp__github__get_issue_comments: Use this to read any discussion or additional context provided in the comments
-               - mcp__github__update_issue: Use this to apply labels to the issue (do not use this for commenting)
-               - mcp__github__search_issues: Use this to find similar issues that might provide context for proper categorization and to identify potential duplicate issues
-               - mcp__github__list_issues: Use this to understand patterns in how other issues are labeled
-             - Start by using mcp__github__get_issue to get the issue details
-
-          3. Analyze the issue content, considering:
-             - The issue title and description
-             - The type of issue (bug report, feature request, question, etc.)
-             - Technical areas mentioned
-             - Severity or priority indicators
-             - User impact
-             - Components affected
-
-          4. Select appropriate labels from the available labels list provided above:
-             - Choose labels that accurately reflect the issue's nature
-             - Be specific but comprehensive
-             - Select priority labels if you can determine urgency (high-priority, med-priority, or low-priority)
-             - Consider platform labels (android, ios) if applicable
-             - If you find similar issues using mcp__github__search_issues, consider using a "duplicate" label if appropriate. Only do so if the issue is a duplicate of another OPEN issue.
-
-          5. Apply the selected labels:
-             - Use mcp__github__update_issue to apply your selected labels
-             - DO NOT post any comments explaining your decision
-             - DO NOT communicate directly with users
-             - If no labels are clearly applicable, do not apply any labels
-
-          IMPORTANT GUIDELINES:
-          - Be thorough in your analysis
-          - Only select labels from the provided list above
-          - DO NOT post any comments to the issue
-          - Your ONLY action should be to apply labels using mcp__github__update_issue
-          - It's okay to not add any labels if none are clearly applicable
-          EOF
-
-      - name: Run Claude Code for Issue Triage
-        uses: anthropics/claude-code-base-action@beta
-        with:
-          prompt_file: /tmp/claude-prompts/triage-prompt.txt
-          allowed_tools: "Bash(gh label list),mcp__github__get_issue,mcp__github__get_issue_comments,mcp__github__update_issue,mcp__github__search_issues,mcp__github__list_issues"
-          mcp_config_file: /tmp/mcp-config/mcp-servers.json
-          timeout_minutes: "5"
-          anthropic_api_key: ${{ secrets.ANTHROPIC_API_KEY }}

.gitignore

@@ -1,4 +1,3 @@
-.DS_Store
 node_modules
 
 **/.claude/settings.local.json

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,6 +12,9 @@ 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:
@@ -85,6 +88,7 @@ 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 }}
@@ -94,7 +98,7 @@ runs:
     - name: Run Claude Code
       id: claude-code
       if: steps.prepare.outputs.contains_trigger == 'true'
-      uses: anthropics/claude-code-base-action@266585c92dd90d61d3806a3367582c4f6224e892 # https://github.com/anthropics/claude-code-base-action/releases/tag/v0.0.6
+      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 }}
@@ -143,7 +147,7 @@ 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' }}
-        DEFAULT_BRANCH: ${{ steps.prepare.outputs.DEFAULT_BRANCH }}
+        BASE_BRANCH: ${{ steps.prepare.outputs.BASE_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 || '' }}

src/create-prompt/index.ts

@@ -9,8 +9,8 @@ import {
   formatComments,
   formatReviewComments,
   formatChangedFilesWithSHA,
+  stripHtmlComments,
 } from "../github/data/formatter";
-import { sanitizeContent } from "../github/utils/sanitizer";
 import {
   isIssuesEvent,
   isIssueCommentEvent,
@@ -69,7 +69,7 @@ export function buildDisallowedToolsString(
 export function prepareContext(
   context: ParsedGitHubContext,
   claudeCommentId: string,
-  defaultBranch?: string,
+  baseBranch?: string,
   claudeBranch?: string,
 ): PreparedContext {
   const repository = context.repository.full_name;
@@ -147,7 +147,7 @@ export function prepareContext(
         ...(commentId && { commentId }),
         commentBody,
         ...(claudeBranch && { claudeBranch }),
-        ...(defaultBranch && { defaultBranch }),
+        ...(baseBranch && { baseBranch }),
       };
       break;
 
@@ -169,7 +169,7 @@ export function prepareContext(
         prNumber,
         commentBody,
         ...(claudeBranch && { claudeBranch }),
-        ...(defaultBranch && { defaultBranch }),
+        ...(baseBranch && { baseBranch }),
       };
       break;
 
@@ -194,13 +194,13 @@ export function prepareContext(
           prNumber,
           commentBody,
           ...(claudeBranch && { claudeBranch }),
-          ...(defaultBranch && { defaultBranch }),
+          ...(baseBranch && { baseBranch }),
         };
         break;
       } else if (!claudeBranch) {
         throw new Error("CLAUDE_BRANCH is required for issue_comment event");
-      } else if (!defaultBranch) {
+      } else if (!baseBranch) {
-        throw new Error("DEFAULT_BRANCH is required for issue_comment event");
+        throw new Error("BASE_BRANCH is required for issue_comment event");
       } else if (!issueNumber) {
         throw new Error(
           "ISSUE_NUMBER is required for issue_comment event for issues",
@@ -212,7 +212,7 @@ export function prepareContext(
         commentId,
         isPR: false,
         claudeBranch: claudeBranch,
-        defaultBranch,
+        baseBranch,
         issueNumber,
         commentBody,
       };
@@ -228,8 +228,8 @@ export function prepareContext(
       if (isPR) {
         throw new Error("IS_PR must be false for issues event");
       }
-      if (!defaultBranch) {
+      if (!baseBranch) {
-        throw new Error("DEFAULT_BRANCH is required for issues event");
+        throw new Error("BASE_BRANCH is required for issues event");
       }
       if (!claudeBranch) {
         throw new Error("CLAUDE_BRANCH is required for issues event");
@@ -246,7 +246,7 @@ export function prepareContext(
           eventAction: "assigned",
           isPR: false,
           issueNumber,
-          defaultBranch,
+          baseBranch,
           claudeBranch,
           assigneeTrigger,
         };
@@ -256,7 +256,7 @@ export function prepareContext(
           eventAction: "opened",
           isPR: false,
           issueNumber,
-          defaultBranch,
+          baseBranch,
           claudeBranch,
         };
       } else {
@@ -277,7 +277,7 @@ export function prepareContext(
         isPR: true,
         prNumber,
         ...(claudeBranch && { claudeBranch }),
-        ...(defaultBranch && { defaultBranch }),
+        ...(baseBranch && { baseBranch }),
       };
       break;
 
@@ -419,14 +419,14 @@ ${
     eventData.eventName === "pull_request_review") &&
   eventData.commentBody
     ? `<trigger_comment>
-${sanitizeContent(eventData.commentBody)}
+${stripHtmlComments(eventData.commentBody)}
 </trigger_comment>`
     : ""
 }
 ${
   context.directPrompt
     ? `<direct_prompt>
-${sanitizeContent(context.directPrompt)}
+${stripHtmlComments(context.directPrompt)}
 </direct_prompt>`
     : ""
 }
@@ -524,13 +524,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.defaultBranch}...<branch-name>?quick_pull=1&title=<url-encoded-title>&body=<url-encoded-body>)
+        [Create a PR](${GITHUB_SERVER_URL}/${context.repository}/compare/${eventData.baseBranch}...<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.defaultBranch}'.
+        - The target-branch should be '${eventData.baseBranch}'.
         - The branch-name is the current branch: ${eventData.claudeBranch}
         - The body should include:
           - A clear description of the changes
@@ -615,7 +615,7 @@ f. If you are unable to complete certain steps, such as running a linter or test
 
 export async function createPrompt(
   claudeCommentId: number,
-  defaultBranch: string | undefined,
+  baseBranch: string | undefined,
   claudeBranch: string | undefined,
   githubData: FetchDataResult,
   context: ParsedGitHubContext,
@@ -624,7 +624,7 @@ export async function createPrompt(
     const preparedContext = prepareContext(
       context,
       claudeCommentId.toString(),
-      defaultBranch,
+      baseBranch,
       claudeBranch,
     );
 

src/create-prompt/types.ts

@@ -16,7 +16,7 @@ type PullRequestReviewCommentEvent = {
   commentId?: string; // May be present for review comments
   commentBody: string;
   claudeBranch?: string;
-  defaultBranch?: string;
+  baseBranch?: string;
 };
 
 type PullRequestReviewEvent = {
@@ -25,7 +25,7 @@ type PullRequestReviewEvent = {
   prNumber: string;
   commentBody: string;
   claudeBranch?: string;
-  defaultBranch?: string;
+  baseBranch?: string;
 };
 
 type IssueCommentEvent = {
@@ -33,7 +33,7 @@ type IssueCommentEvent = {
   commentId: string;
   issueNumber: string;
   isPR: false;
-  defaultBranch: string;
+  baseBranch: string;
   claudeBranch: string;
   commentBody: string;
 };
@@ -46,7 +46,7 @@ type PullRequestCommentEvent = {
   isPR: true;
   commentBody: string;
   claudeBranch?: string;
-  defaultBranch?: string;
+  baseBranch?: string;
 };
 
 type IssueOpenedEvent = {
@@ -54,7 +54,7 @@ type IssueOpenedEvent = {
   eventAction: "opened";
   isPR: false;
   issueNumber: string;
-  defaultBranch: string;
+  baseBranch: string;
   claudeBranch: string;
 };
 
@@ -63,7 +63,7 @@ type IssueAssignedEvent = {
   eventAction: "assigned";
   isPR: false;
   issueNumber: string;
-  defaultBranch: string;
+  baseBranch: string;
   claudeBranch: string;
   assigneeTrigger: string;
 };
@@ -74,7 +74,7 @@ type PullRequestEvent = {
   isPR: true;
   prNumber: string;
   claudeBranch?: string;
-  defaultBranch?: string;
+  baseBranch?: 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.defaultBranch,
+      branchInfo.baseBranch,
       branchInfo.claudeBranch,
       githubData,
       context,

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 defaultBranch = process.env.DEFAULT_BRANCH || "main";
+    const baseBranch = process.env.BASE_BRANCH || "main";
     const triggerUsername = process.env.TRIGGER_USERNAME;
 
     const context = parseGitHubContext();
@@ -92,7 +92,7 @@ async function run() {
       owner,
       repo,
       claudeBranch,
-      defaultBranch,
+      baseBranch,
     );
 
     // 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\\/${defaultBranch.replace(/[.*+?^${}()|[\]\\]/g, "\\$&")}\\.\\.\\.`,
+        `${serverUrlPattern}\\/.+\\/compare\\/${baseBranch.replace(/[.*+?^${}()|[\]\\]/g, "\\$&")}\\.\\.\\.`,
       );
       const containsPRUrl = currentBody.match(prUrlPattern);
 
@@ -113,7 +113,7 @@ async function run() {
             await octokit.rest.repos.compareCommitsWithBasehead({
               owner,
               repo,
-              basehead: `${defaultBranch}...${claudeBranch}`,
+              basehead: `${baseBranch}...${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/${defaultBranch}...${claudeBranch}?quick_pull=1&title=${prTitle}&body=${prBody}`;
+            const prUrl = `${serverUrl}/${owner}/${repo}/compare/${baseBranch}...${claudeBranch}?quick_pull=1&title=${prTitle}&body=${prBody}`;
             prLink = `\n[Create a PR](${prUrl})`;
           }
         } catch (error) {

src/github/context.ts

@@ -32,6 +32,7 @@ export type ParsedGitHubContext = {
     disallowedTools: string;
     customInstructions: string;
     directPrompt: string;
+    baseBranch?: string;
   };
 };
 
@@ -55,6 +56,7 @@ 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/data/formatter.ts

@@ -6,7 +6,10 @@ import type {
   GitHubReview,
 } from "../types";
 import type { GitHubFileWithSHA } from "./fetcher";
-import { sanitizeContent } from "../utils/sanitizer";
+
+export function stripHtmlComments(text: string): string {
+  return text.replace(/<!--[\s\S]*?-->/g, "");
+}
 
 export function formatContext(
   contextData: GitHubPullRequest | GitHubIssue,
@@ -34,14 +37,13 @@ export function formatBody(
   body: string,
   imageUrlMap: Map<string, string>,
 ): string {
-  let processedBody = body;
+  let processedBody = stripHtmlComments(body);
 
+  // Replace image URLs with local paths
   for (const [originalUrl, localPath] of imageUrlMap) {
     processedBody = processedBody.replaceAll(originalUrl, localPath);
   }
 
-  processedBody = sanitizeContent(processedBody);
-
   return processedBody;
 }
 
@@ -51,16 +53,15 @@ export function formatComments(
 ): string {
   return comments
     .map((comment) => {
-      let body = comment.body;
+      let body = stripHtmlComments(comment.body);
 
+      // Replace image URLs with local paths if we have a mapping
       if (imageUrlMap && body) {
         for (const [originalUrl, localPath] of imageUrlMap) {
           body = body.replaceAll(originalUrl, localPath);
         }
       }
 
-      body = sanitizeContent(body);
-
       return `[${comment.author.login} at ${comment.createdAt}]: ${body}`;
     })
     .join("\n\n");
@@ -77,19 +78,6 @@ export function formatReviewComments(
   const formattedReviews = reviewData.nodes.map((review) => {
     let reviewOutput = `[Review by ${review.author.login} at ${review.submittedAt}]: ${review.state}`;
 
-    if (review.body && review.body.trim()) {
-      let body = review.body;
-
-      if (imageUrlMap) {
-        for (const [originalUrl, localPath] of imageUrlMap) {
-          body = body.replaceAll(originalUrl, localPath);
-        }
-      }
-
-      const sanitizedBody = sanitizeContent(body);
-      reviewOutput += `\n${sanitizedBody}`;
-    }
-
     if (
       review.comments &&
       review.comments.nodes &&
@@ -97,16 +85,15 @@ export function formatReviewComments(
     ) {
       const comments = review.comments.nodes
         .map((comment) => {
-          let body = comment.body;
+          let body = stripHtmlComments(comment.body);
 
+          // Replace image URLs with local paths if we have a mapping
           if (imageUrlMap) {
             for (const [originalUrl, localPath] of imageUrlMap) {
               body = body.replaceAll(originalUrl, localPath);
             }
           }
 
-          body = sanitizeContent(body);
-
           return `  [Comment on ${comment.path}:${comment.line || "?"}]: ${body}`;
         })
         .join("\n");

src/github/operations/branch-cleanup.ts

@@ -6,7 +6,7 @@ export async function checkAndDeleteEmptyBranch(
   owner: string,
   repo: string,
   claudeBranch: string | undefined,
-  defaultBranch: string,
+  baseBranch: 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: `${defaultBranch}...${claudeBranch}`,
+          basehead: `${baseBranch}...${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 = {
-  defaultBranch: string;
+  baseBranch: string;
   claudeBranch?: string;
   currentBranch: string;
 };
@@ -26,15 +26,9 @@ 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;
@@ -42,7 +36,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 default...`,
+        `PR #${entityNumber} is ${prState}, creating new branch from source...`,
       );
       // Fall through to create a new branch like we do for issues
     } else {
@@ -51,24 +45,42 @@ export async function setupBranch(
 
       const branchName = prData.headRefName;
 
-      // Execute git commands to checkout PR branch (shallow fetch for performance)
+      // Execute git commands to checkout PR branch
-      // Fetch the branch with a depth of 20 to avoid fetching too much history, while still allowing for some context
+      await $`git fetch origin ${branchName}`;
-      await $`git fetch origin --depth=20 ${branchName}`;
       await $`git checkout ${branchName}`;
 
       console.log(`Successfully checked out PR branch for PR #${entityNumber}`);
 
-      // For open PRs, return branch info
+      // For open PRs, we need to get the base branch of the PR
+      const baseBranch = prData.baseRefName;
+
       return {
-        defaultBranch,
+        baseBranch,
         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(`Creating new branch for ${entityType} #${entityNumber}...`);
+  console.log(
+    `Creating new branch for ${entityType} #${entityNumber} from source branch: ${sourceBranch}...`,
+  );
 
   const timestamp = new Date()
     .toISOString()
@@ -80,14 +92,14 @@ export async function setupBranch(
   const newBranch = `claude/${entityType}-${entityNumber}-${timestamp}`;
 
   try {
-    // Get the SHA of the default branch
+    // Get the SHA of the source branch
-    const defaultBranchRef = await octokits.rest.git.getRef({
+    const sourceBranchRef = await octokits.rest.git.getRef({
       owner,
       repo,
-      ref: `heads/${defaultBranch}`,
+      ref: `heads/${sourceBranch}`,
     });
 
-    const currentSHA = defaultBranchRef.data.object.sha;
+    const currentSHA = sourceBranchRef.data.object.sha;
 
     console.log(`Current SHA: ${currentSHA}`);
 
@@ -99,8 +111,8 @@ export async function setupBranch(
       sha: currentSHA,
     });
 
-    // Checkout the new branch (shallow fetch for performance)
+    // Checkout the new branch
-    await $`git fetch origin --depth=1 ${newBranch}`;
+    await $`git fetch origin ${newBranch}`;
     await $`git checkout ${newBranch}`;
 
     console.log(
@@ -109,9 +121,9 @@ export async function setupBranch(
 
     // Set outputs for GitHub Actions
     core.setOutput("CLAUDE_BRANCH", newBranch);
-    core.setOutput("DEFAULT_BRANCH", defaultBranch);
+    core.setOutput("BASE_BRANCH", sourceBranch);
     return {
-      defaultBranch,
+      baseBranch: sourceBranch,
       claudeBranch: newBranch,
       currentBranch: newBranch,
     };

src/github/utils/sanitizer.ts

@@ -1,65 +0,0 @@
-export function stripInvisibleCharacters(content: string): string {
-  content = content.replace(/[\u200B\u200C\u200D\uFEFF]/g, "");
-  content = content.replace(
-    /[\u0000-\u0008\u000B\u000C\u000E-\u001F\u007F-\u009F]/g,
-    "",
-  );
-  content = content.replace(/\u00AD/g, "");
-  content = content.replace(/[\u202A-\u202E\u2066-\u2069]/g, "");
-  return content;
-}
-
-export function stripMarkdownImageAltText(content: string): string {
-  return content.replace(/!\[[^\]]*\]\(/g, "![](");
-}
-
-export function stripMarkdownLinkTitles(content: string): string {
-  content = content.replace(/(\[[^\]]*\]\([^)]+)\s+"[^"]*"/g, "$1");
-  content = content.replace(/(\[[^\]]*\]\([^)]+)\s+'[^']*'/g, "$1");
-  return content;
-}
-
-export function stripHiddenAttributes(content: string): string {
-  content = content.replace(/\salt\s*=\s*["'][^"']*["']/gi, "");
-  content = content.replace(/\salt\s*=\s*[^\s>]+/gi, "");
-  content = content.replace(/\stitle\s*=\s*["'][^"']*["']/gi, "");
-  content = content.replace(/\stitle\s*=\s*[^\s>]+/gi, "");
-  content = content.replace(/\saria-label\s*=\s*["'][^"']*["']/gi, "");
-  content = content.replace(/\saria-label\s*=\s*[^\s>]+/gi, "");
-  content = content.replace(/\sdata-[a-zA-Z0-9-]+\s*=\s*["'][^"']*["']/gi, "");
-  content = content.replace(/\sdata-[a-zA-Z0-9-]+\s*=\s*[^\s>]+/gi, "");
-  content = content.replace(/\splaceholder\s*=\s*["'][^"']*["']/gi, "");
-  content = content.replace(/\splaceholder\s*=\s*[^\s>]+/gi, "");
-  return content;
-}
-
-export function normalizeHtmlEntities(content: string): string {
-  content = content.replace(/&#(\d+);/g, (_, dec) => {
-    const num = parseInt(dec, 10);
-    if (num >= 32 && num <= 126) {
-      return String.fromCharCode(num);
-    }
-    return "";
-  });
-  content = content.replace(/&#x([0-9a-fA-F]+);/g, (_, hex) => {
-    const num = parseInt(hex, 16);
-    if (num >= 32 && num <= 126) {
-      return String.fromCharCode(num);
-    }
-    return "";
-  });
-  return content;
-}
-
-export function sanitizeContent(content: string): string {
-  content = stripHtmlComments(content);
-  content = stripInvisibleCharacters(content);
-  content = stripMarkdownImageAltText(content);
-  content = stripMarkdownLinkTitles(content);
-  content = stripHiddenAttributes(content);
-  content = normalizeHtmlEntities(content);
-  return content;
-}
-
-export const stripHtmlComments = (content: string) =>
-  content.replace(/<!--[\s\S]*?-->/g, "");

test/create-prompt.test.ts

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

test/data-formatter.test.ts

@@ -6,6 +6,7 @@ import {
   formatReviewComments,
   formatChangedFiles,
   formatChangedFilesWithSHA,
+  stripHtmlComments,
 } from "../src/github/data/formatter";
 import type {
   GitHubPullRequest,
@@ -98,9 +99,9 @@ Some more text.`;
 
     const result = formatBody(body, imageUrlMap);
     expect(result)
-      .toBe(`Here is some text with an image: ![](/tmp/github-images/image-1234-0.png)
+      .toBe(`Here is some text with an image: ![screenshot](/tmp/github-images/image-1234-0.png)
     
-And another one: ![](/tmp/github-images/image-1234-1.jpg)
+And another one: ![another](/tmp/github-images/image-1234-1.jpg)
 
 Some more text.`);
   });
@@ -123,7 +124,7 @@ Some more text.`);
     ]);
 
     const result = formatBody(body, imageUrlMap);
-    expect(result).toBe("![](https://example.com/image.png)");
+    expect(result).toBe("![image](https://example.com/image.png)");
   });
 
   test("handles multiple occurrences of same image", () => {
@@ -138,8 +139,8 @@ Second: ![img](https://github.com/user-attachments/assets/test.png)`;
     ]);
 
     const result = formatBody(body, imageUrlMap);
-    expect(result).toBe(`First: ![](/tmp/github-images/image-1234-0.png)
+    expect(result).toBe(`First: ![img](/tmp/github-images/image-1234-0.png)
-Second: ![](/tmp/github-images/image-1234-0.png)`);
+Second: ![img](/tmp/github-images/image-1234-0.png)`);
   });
 });
 
@@ -204,7 +205,7 @@ describe("formatComments", () => {
 
     const result = formatComments(comments, imageUrlMap);
     expect(result).toBe(
-      `[user1 at 2023-01-01T00:00:00Z]: Check out this screenshot: ![](/tmp/github-images/image-1234-0.png)\n\n[user2 at 2023-01-02T00:00:00Z]: Here's another image: ![](/tmp/github-images/image-1234-1.jpg)`,
+      `[user1 at 2023-01-01T00:00:00Z]: Check out this screenshot: ![screenshot](/tmp/github-images/image-1234-0.png)\n\n[user2 at 2023-01-02T00:00:00Z]: Here's another image: ![bug](/tmp/github-images/image-1234-1.jpg)`,
     );
   });
 
@@ -232,7 +233,7 @@ describe("formatComments", () => {
 
     const result = formatComments(comments, imageUrlMap);
     expect(result).toBe(
-      `[user1 at 2023-01-01T00:00:00Z]: Two images: ![](/tmp/github-images/image-1234-0.png) and ![](/tmp/github-images/image-1234-1.png)`,
+      `[user1 at 2023-01-01T00:00:00Z]: Two images: ![first](/tmp/github-images/image-1234-0.png) and ![second](/tmp/github-images/image-1234-1.png)`,
     );
   });
 
@@ -249,7 +250,7 @@ describe("formatComments", () => {
 
     const result = formatComments(comments);
     expect(result).toBe(
-      `[user1 at 2023-01-01T00:00:00Z]: Image: ![](https://github.com/user-attachments/assets/test.png)`,
+      `[user1 at 2023-01-01T00:00:00Z]: Image: ![test](https://github.com/user-attachments/assets/test.png)`,
     );
   });
 });
@@ -293,7 +294,7 @@ describe("formatReviewComments", () => {
 
     const result = formatReviewComments(reviewData);
     expect(result).toBe(
-      `[Review by reviewer1 at 2023-01-01T00:00:00Z]: APPROVED\nThis is a great PR! LGTM.\n  [Comment on src/index.ts:42]: Nice implementation\n  [Comment on src/utils.ts:?]: Consider adding error handling`,
+      `[Review by reviewer1 at 2023-01-01T00:00:00Z]: APPROVED\n  [Comment on src/index.ts:42]: Nice implementation\n  [Comment on src/utils.ts:?]: Consider adding error handling`,
     );
   });
 
@@ -316,7 +317,7 @@ describe("formatReviewComments", () => {
 
     const result = formatReviewComments(reviewData);
     expect(result).toBe(
-      `[Review by reviewer1 at 2023-01-01T00:00:00Z]: APPROVED\nLooks good to me!`,
+      `[Review by reviewer1 at 2023-01-01T00:00:00Z]: APPROVED`,
     );
   });
 
@@ -383,7 +384,7 @@ describe("formatReviewComments", () => {
 
     const result = formatReviewComments(reviewData);
     expect(result).toBe(
-      `[Review by reviewer1 at 2023-01-01T00:00:00Z]: CHANGES_REQUESTED\nNeeds changes\n\n[Review by reviewer2 at 2023-01-02T00:00:00Z]: APPROVED\nLGTM`,
+      `[Review by reviewer1 at 2023-01-01T00:00:00Z]: CHANGES_REQUESTED\n\n[Review by reviewer2 at 2023-01-02T00:00:00Z]: APPROVED`,
     );
   });
 
@@ -437,7 +438,7 @@ describe("formatReviewComments", () => {
 
     const result = formatReviewComments(reviewData, imageUrlMap);
     expect(result).toBe(
-      `[Review by reviewer1 at 2023-01-01T00:00:00Z]: APPROVED\nReview with image: ![](/tmp/github-images/image-1234-0.png)\n  [Comment on src/index.ts:42]: Comment with image: ![](/tmp/github-images/image-1234-1.png)`,
+      `[Review by reviewer1 at 2023-01-01T00:00:00Z]: APPROVED\n  [Comment on src/index.ts:42]: Comment with image: ![comment-img](/tmp/github-images/image-1234-1.png)`,
     );
   });
 
@@ -481,7 +482,7 @@ describe("formatReviewComments", () => {
 
     const result = formatReviewComments(reviewData, imageUrlMap);
     expect(result).toBe(
-      `[Review by reviewer1 at 2023-01-01T00:00:00Z]: APPROVED\nGood work\n  [Comment on src/main.ts:15]: Two issues: ![](/tmp/github-images/image-1234-0.png) and ![](/tmp/github-images/image-1234-1.png)`,
+      `[Review by reviewer1 at 2023-01-01T00:00:00Z]: APPROVED\n  [Comment on src/main.ts:15]: Two issues: ![issue1](/tmp/github-images/image-1234-0.png) and ![issue2](/tmp/github-images/image-1234-1.png)`,
     );
   });
 
@@ -514,7 +515,7 @@ describe("formatReviewComments", () => {
 
     const result = formatReviewComments(reviewData);
     expect(result).toBe(
-      `[Review by reviewer1 at 2023-01-01T00:00:00Z]: APPROVED\nReview body\n  [Comment on src/index.ts:42]: Image: ![](https://github.com/user-attachments/assets/test.png)`,
+      `[Review by reviewer1 at 2023-01-01T00:00:00Z]: APPROVED\n  [Comment on src/index.ts:42]: Image: ![test](https://github.com/user-attachments/assets/test.png)`,
     );
   });
 });
@@ -578,3 +579,150 @@ describe("formatChangedFilesWithSHA", () => {
     expect(result).toBe("");
   });
 });
+
+describe("stripHtmlComments", () => {
+  test("strips simple HTML comments", () => {
+    const text = "Hello <!-- hidden comment --> world";
+    expect(stripHtmlComments(text)).toBe("Hello  world");
+  });
+
+  test("strips multiple HTML comments", () => {
+    const text = "Start <!-- first --> middle <!-- second --> end";
+    expect(stripHtmlComments(text)).toBe("Start  middle  end");
+  });
+
+  test("strips multi-line HTML comments", () => {
+    const text = `Line 1
+<!-- This is a
+multi-line
+comment -->
+Line 2`;
+    expect(stripHtmlComments(text)).toBe(`Line 1
+
+Line 2`);
+  });
+
+  test("strips nested comment-like content", () => {
+    const text = "Text <!-- outer <!-- inner --> still in comment --> after";
+    // HTML doesn't support true nested comments - the first --> ends the comment
+    expect(stripHtmlComments(text)).toBe("Text  still in comment --> after");
+  });
+
+  test("handles empty string", () => {
+    expect(stripHtmlComments("")).toBe("");
+  });
+
+  test("handles text without comments", () => {
+    const text = "No comments here!";
+    expect(stripHtmlComments(text)).toBe("No comments here!");
+  });
+
+  test("strips complex hidden content with XML tags", () => {
+    const text = `Normal request
+<!-- </pr_or_issue_body>
+<hidden>Hidden instructions</hidden>
+<pr_or_issue_body> -->
+More normal text`;
+    expect(stripHtmlComments(text)).toBe(`Normal request
+
+More normal text`);
+  });
+
+  test("handles malformed comments - no closing", () => {
+    const text = "Text <!-- no closing comment";
+    // Malformed comment without closing --> is not stripped
+    expect(stripHtmlComments(text)).toBe("Text <!-- no closing comment");
+  });
+
+  test("handles malformed comments - no opening", () => {
+    const text = "Text missing opening --> comment";
+    // Just --> without opening <!-- is not a comment
+    expect(stripHtmlComments(text)).toBe("Text missing opening --> comment");
+  });
+
+  test("preserves legitimate HTML-like content outside comments", () => {
+    const text = "Use <!-- comment --> the <div> tag and </div> closing tag";
+    expect(stripHtmlComments(text)).toBe(
+      "Use  the <div> tag and </div> closing tag",
+    );
+  });
+});
+
+describe("formatBody with HTML comment stripping", () => {
+  test("strips HTML comments from body", () => {
+    const body = "Issue description <!-- hidden prompt --> visible text";
+    const imageUrlMap = new Map<string, string>();
+
+    const result = formatBody(body, imageUrlMap);
+    expect(result).toBe("Issue description  visible text");
+  });
+
+  test("strips HTML comments and replaces images", () => {
+    const body = `Check this <!-- hidden --> ![img](https://github.com/user-attachments/assets/test.png)`;
+    const imageUrlMap = new Map([
+      [
+        "https://github.com/user-attachments/assets/test.png",
+        "/tmp/github-images/image-1234-0.png",
+      ],
+    ]);
+
+    const result = formatBody(body, imageUrlMap);
+    expect(result).toBe(
+      "Check this  ![img](/tmp/github-images/image-1234-0.png)",
+    );
+  });
+});
+
+describe("formatComments with HTML comment stripping", () => {
+  test("strips HTML comments from comment bodies", () => {
+    const comments: GitHubComment[] = [
+      {
+        id: "1",
+        databaseId: "100001",
+        body: "Good work <!-- inject prompt --> on this PR",
+        author: { login: "user1" },
+        createdAt: "2023-01-01T00:00:00Z",
+      },
+    ];
+
+    const result = formatComments(comments);
+    expect(result).toBe(
+      "[user1 at 2023-01-01T00:00:00Z]: Good work  on this PR",
+    );
+  });
+});
+
+describe("formatReviewComments with HTML comment stripping", () => {
+  test("strips HTML comments from review comment bodies", () => {
+    const reviewData = {
+      nodes: [
+        {
+          id: "review1",
+          databaseId: "300001",
+          author: { login: "reviewer1" },
+          body: "LGTM",
+          state: "APPROVED",
+          submittedAt: "2023-01-01T00:00:00Z",
+          comments: {
+            nodes: [
+              {
+                id: "comment1",
+                databaseId: "200001",
+                body: "Nice work <!-- malicious --> here",
+                author: { login: "reviewer1" },
+                createdAt: "2023-01-01T00:00:00Z",
+                path: "src/index.ts",
+                line: 42,
+              },
+            ],
+          },
+        },
+      ],
+    };
+
+    const result = formatReviewComments(reviewData);
+    expect(result).toBe(
+      `[Review by reviewer1 at 2023-01-01T00:00:00Z]: APPROVED\n  [Comment on src/index.ts:42]: Nice work  here`,
+    );
+  });
+});

test/integration-sanitization.test.ts

@@ -1,134 +0,0 @@
-import { describe, expect, it } from "bun:test";
-import { formatBody, formatComments } from "../src/github/data/formatter";
-import type { GitHubComment } from "../src/github/types";
-
-describe("Sanitization Integration", () => {
-  it("should sanitize complete issue/PR body with various hidden content patterns", () => {
-    const issueBody = `
-# Feature Request: Add user dashboard
-
-## Description
-We need a new dashboard for users to track their activity.
-
-<!-- HTML comment that should be removed -->
-
-## Technical Details
-The dashboard should display:
-- User statistics ![dashboard mockup with hidden​‌‍text](dashboard.png)
-- Activity graphs <img alt="example graph description" src="graph.jpg">
-- Recent actions
-
-## Implementation Notes
-See [documentation](https://docs.example.com "internal docs title") for API details.
-
-<div data-instruction="example instruction" aria-label="dashboard label" title="hover text">
-  The implementation should follow our standard patterns.
-</div>
-
-Additional notes: Text­with­soft­hyphens and &#72;&#105;&#100;&#100;&#101;&#110; encoded content.
-
-<input placeholder="search placeholder" type="text" />
-
-Direction override test: ‮reversed‬ text should be normalized.`;
-
-    const imageUrlMap = new Map<string, string>();
-    const result = formatBody(issueBody, imageUrlMap);
-
-    // Verify hidden content is removed
-    expect(result).not.toContain("<!-- HTML comment");
-    expect(result).not.toContain("hidden​‌‍text");
-    expect(result).not.toContain("example graph description");
-    expect(result).not.toContain("internal docs title");
-    expect(result).not.toContain("example instruction");
-    expect(result).not.toContain("dashboard label");
-    expect(result).not.toContain("hover text");
-    expect(result).not.toContain("search placeholder");
-    expect(result).not.toContain("\u200B");
-    expect(result).not.toContain("\u200C");
-    expect(result).not.toContain("\u200D");
-    expect(result).not.toContain("\u00AD");
-    expect(result).not.toContain("\u202E");
-    expect(result).not.toContain("&#72;");
-
-    // Verify legitimate content is preserved
-    expect(result).toContain("# Feature Request: Add user dashboard");
-    expect(result).toContain("## Description");
-    expect(result).toContain("We need a new dashboard");
-    expect(result).toContain("User statistics");
-    expect(result).toContain("![](dashboard.png)");
-    expect(result).toContain('<img src="graph.jpg">');
-    expect(result).toContain("[documentation](https://docs.example.com)");
-    expect(result).toContain(
-      "The implementation should follow our standard patterns",
-    );
-    expect(result).toContain("Hidden encoded content");
-    expect(result).toContain('<input type="text" />');
-  });
-
-  it("should sanitize GitHub comments preserving discussion flow", () => {
-    const comments: GitHubComment[] = [
-      {
-        id: "1",
-        databaseId: "100001",
-        body: `Great idea! Here are my thoughts:
-
-1. We should consider the performance impact
-2. The UI mockup looks good: ![ui design](mockup.png)
-3. Check the [API docs](https://api.example.com "api reference") for rate limits
-
-<div aria-label="comment metadata" data-comment-type="review">
-  This change would affect multiple systems.
-</div>
-
-Note: Implementation​should​follow​best​practices.`,
-        author: { login: "reviewer1" },
-        createdAt: "2023-01-01T10:00:00Z",
-      },
-      {
-        id: "2",
-        databaseId: "100002",
-        body: `Thanks for the feedback! 
-
-<!-- Internal note: discussed with team -->
-
-I've updated the proposal based on your suggestions.
-
-&#84;&#101;&#115;&#116; &#110;&#111;&#116;&#101;: All systems checked.
-
-<span title="status update" data-status="approved">Ready for implementation</span>`,
-        author: { login: "author1" },
-        createdAt: "2023-01-01T12:00:00Z",
-      },
-    ];
-
-    const result = formatComments(comments);
-
-    // Verify hidden content is removed
-    expect(result).not.toContain("<!-- Internal note");
-    expect(result).not.toContain("api reference");
-    expect(result).not.toContain("comment metadata");
-    expect(result).not.toContain('data-comment-type="review"');
-    expect(result).not.toContain("status update");
-    expect(result).not.toContain('data-status="approved"');
-    expect(result).not.toContain("\u200B");
-    expect(result).not.toContain("&#84;");
-
-    // Verify discussion flow is preserved
-    expect(result).toContain("Great idea! Here are my thoughts:");
-    expect(result).toContain("1. We should consider the performance impact");
-    expect(result).toContain("2. The UI mockup looks good: ![](mockup.png)");
-    expect(result).toContain(
-      "3. Check the [API docs](https://api.example.com)",
-    );
-    expect(result).toContain("This change would affect multiple systems.");
-    expect(result).toContain("Implementationshouldfollowbestpractices");
-    expect(result).toContain("Thanks for the feedback!");
-    expect(result).toContain(
-      "I've updated the proposal based on your suggestions.",
-    );
-    expect(result).toContain("Test note: All systems checked.");
-    expect(result).toContain("Ready for implementation");
-    expect(result).toContain("[reviewer1 at");
-    expect(result).toContain("[author1 at");
-  });
-});

test/prepare-context.test.ts

@@ -34,7 +34,7 @@ describe("parseEnvVarsWithContext", () => {
       beforeEach(() => {
         process.env = {
           ...BASE_ENV,
-          DEFAULT_BRANCH: "main",
+          BASE_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.defaultBranch).toBe("main");
+          expect(result.eventData.baseBranch).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 DEFAULT_BRANCH is missing", () => {
+      test("should throw error when BASE_BRANCH is missing", () => {
         expect(() =>
           prepareContext(
             mockIssueCommentContext,
@@ -83,7 +83,7 @@ describe("parseEnvVarsWithContext", () => {
             undefined,
             "claude/issue-67890-20240101_120000",
           ),
-        ).toThrow("DEFAULT_BRANCH is required for issue_comment event");
+        ).toThrow("BASE_BRANCH is required for issue_comment event");
       });
     });
 
@@ -151,7 +151,7 @@ describe("parseEnvVarsWithContext", () => {
     beforeEach(() => {
       process.env = {
         ...BASE_ENV,
-        DEFAULT_BRANCH: "main",
+        BASE_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.defaultBranch).toBe("main");
+        expect(result.eventData.baseBranch).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.defaultBranch).toBe("main");
+        expect(result.eventData.baseBranch).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 DEFAULT_BRANCH is missing for issues", () => {
+    test("should throw error when BASE_BRANCH is missing for issues", () => {
       expect(() =>
         prepareContext(
           mockIssueOpenedContext,
@@ -217,7 +217,7 @@ describe("parseEnvVarsWithContext", () => {
           undefined,
           "claude/issue-42-20240101_120000",
         ),
-      ).toThrow("DEFAULT_BRANCH is required for issues event");
+      ).toThrow("BASE_BRANCH is required for issues event");
     });
   });
 

test/sanitizer.test.ts

@@ -1,259 +0,0 @@
-import { describe, expect, it } from "bun:test";
-import {
-  stripInvisibleCharacters,
-  stripMarkdownImageAltText,
-  stripMarkdownLinkTitles,
-  stripHiddenAttributes,
-  normalizeHtmlEntities,
-  sanitizeContent,
-  stripHtmlComments,
-} from "../src/github/utils/sanitizer";
-
-describe("stripInvisibleCharacters", () => {
-  it("should remove zero-width characters", () => {
-    expect(stripInvisibleCharacters("Hello\u200BWorld")).toBe("HelloWorld");
-    expect(stripInvisibleCharacters("Text\u200C\u200D")).toBe("Text");
-    expect(stripInvisibleCharacters("\uFEFFStart")).toBe("Start");
-  });
-
-  it("should remove control characters", () => {
-    expect(stripInvisibleCharacters("Hello\u0000World")).toBe("HelloWorld");
-    expect(stripInvisibleCharacters("Text\u001F\u007F")).toBe("Text");
-  });
-
-  it("should preserve common whitespace", () => {
-    expect(stripInvisibleCharacters("Hello\nWorld")).toBe("Hello\nWorld");
-    expect(stripInvisibleCharacters("Tab\there")).toBe("Tab\there");
-    expect(stripInvisibleCharacters("Carriage\rReturn")).toBe(
-      "Carriage\rReturn",
-    );
-  });
-
-  it("should remove soft hyphens", () => {
-    expect(stripInvisibleCharacters("Soft\u00ADHyphen")).toBe("SoftHyphen");
-  });
-
-  it("should remove Unicode direction overrides", () => {
-    expect(stripInvisibleCharacters("Text\u202A\u202BMore")).toBe("TextMore");
-    expect(stripInvisibleCharacters("\u2066Isolated\u2069")).toBe("Isolated");
-  });
-});
-
-describe("stripMarkdownImageAltText", () => {
-  it("should remove alt text from markdown images", () => {
-    expect(stripMarkdownImageAltText("![example alt text](image.png)")).toBe(
-      "![](image.png)",
-    );
-    expect(
-      stripMarkdownImageAltText("Text ![description](pic.jpg) more text"),
-    ).toBe("Text ![](pic.jpg) more text");
-  });
-
-  it("should handle multiple images", () => {
-    expect(stripMarkdownImageAltText("![one](1.png) ![two](2.png)")).toBe(
-      "![](1.png) ![](2.png)",
-    );
-  });
-
-  it("should handle empty alt text", () => {
-    expect(stripMarkdownImageAltText("![](image.png)")).toBe("![](image.png)");
-  });
-});
-
-describe("stripMarkdownLinkTitles", () => {
-  it("should remove titles from markdown links", () => {
-    expect(stripMarkdownLinkTitles('[Link](url.com "example title")')).toBe(
-      "[Link](url.com)",
-    );
-    expect(stripMarkdownLinkTitles("[Link](url.com 'example title')")).toBe(
-      "[Link](url.com)",
-    );
-  });
-
-  it("should handle multiple links", () => {
-    expect(
-      stripMarkdownLinkTitles('[One](1.com "first") [Two](2.com "second")'),
-    ).toBe("[One](1.com) [Two](2.com)");
-  });
-
-  it("should preserve links without titles", () => {
-    expect(stripMarkdownLinkTitles("[Link](url.com)")).toBe("[Link](url.com)");
-  });
-});
-
-describe("stripHiddenAttributes", () => {
-  it("should remove alt attributes", () => {
-    expect(
-      stripHiddenAttributes('<img alt="example text" src="pic.jpg">'),
-    ).toBe('<img src="pic.jpg">');
-    expect(stripHiddenAttributes("<img alt='example' src=\"pic.jpg\">")).toBe(
-      '<img src="pic.jpg">',
-    );
-    expect(stripHiddenAttributes('<img alt=example src="pic.jpg">')).toBe(
-      '<img src="pic.jpg">',
-    );
-  });
-
-  it("should remove title attributes", () => {
-    expect(
-      stripHiddenAttributes('<a title="example text" href="#">Link</a>'),
-    ).toBe('<a href="#">Link</a>');
-    expect(stripHiddenAttributes("<div title='example'>Content</div>")).toBe(
-      "<div>Content</div>",
-    );
-  });
-
-  it("should remove aria-label attributes", () => {
-    expect(
-      stripHiddenAttributes('<button aria-label="example">Click</button>'),
-    ).toBe("<button>Click</button>");
-  });
-
-  it("should remove data-* attributes", () => {
-    expect(
-      stripHiddenAttributes(
-        '<div data-test="example" data-info="more example">Text</div>',
-      ),
-    ).toBe("<div>Text</div>");
-  });
-
-  it("should remove placeholder attributes", () => {
-    expect(
-      stripHiddenAttributes('<input placeholder="example text" type="text">'),
-    ).toBe('<input type="text">');
-  });
-
-  it("should handle multiple attributes", () => {
-    expect(
-      stripHiddenAttributes(
-        '<img alt="example" title="test" src="pic.jpg" class="image">',
-      ),
-    ).toBe('<img src="pic.jpg" class="image">');
-  });
-});
-
-describe("normalizeHtmlEntities", () => {
-  it("should decode numeric entities", () => {
-    expect(normalizeHtmlEntities("&#72;&#101;&#108;&#108;&#111;")).toBe(
-      "Hello",
-    );
-    expect(normalizeHtmlEntities("&#65;&#66;&#67;")).toBe("ABC");
-  });
-
-  it("should decode hex entities", () => {
-    expect(normalizeHtmlEntities("&#x48;&#x65;&#x6C;&#x6C;&#x6F;")).toBe(
-      "Hello",
-    );
-    expect(normalizeHtmlEntities("&#x41;&#x42;&#x43;")).toBe("ABC");
-  });
-
-  it("should remove non-printable entities", () => {
-    expect(normalizeHtmlEntities("&#0;&#31;")).toBe("");
-    expect(normalizeHtmlEntities("&#x00;&#x1F;")).toBe("");
-  });
-
-  it("should preserve normal text", () => {
-    expect(normalizeHtmlEntities("Normal text")).toBe("Normal text");
-  });
-});
-
-describe("sanitizeContent", () => {
-  it("should apply all sanitization measures", () => {
-    const testContent = `
-      <!-- This is a comment -->
-      <img alt="example alt text" src="image.jpg">
-      ![example image description](screenshot.png)
-      [click here](https://example.com "example title")
-      <div data-prompt="example data" aria-label="example label">
-        Normal text with hidden\u200Bcharacters
-      </div>
-      &#72;&#105;&#100;&#100;&#101;&#110; message
-    `;
-
-    const sanitized = sanitizeContent(testContent);
-
-    expect(sanitized).not.toContain("<!-- This is a comment -->");
-    expect(sanitized).not.toContain("example alt text");
-    expect(sanitized).not.toContain("example image description");
-    expect(sanitized).not.toContain("example title");
-    expect(sanitized).not.toContain("example data");
-    expect(sanitized).not.toContain("example label");
-    expect(sanitized).not.toContain("\u200B");
-    expect(sanitized).not.toContain("alt=");
-    expect(sanitized).not.toContain("data-prompt=");
-    expect(sanitized).not.toContain("aria-label=");
-
-    expect(sanitized).toContain("Normal text with hiddencharacters");
-    expect(sanitized).toContain("Hidden message");
-    expect(sanitized).toContain('<img src="image.jpg">');
-    expect(sanitized).toContain("![](screenshot.png)");
-    expect(sanitized).toContain("[click here](https://example.com)");
-  });
-
-  it("should handle complex nested patterns", () => {
-    const complexContent = `
-      Text with ![alt \u200B text](image.png) and more.
-      <a href="#" title="example\u00ADtitle">Link</a>
-      <div data-x="&#72;&#105;">Content</div>
-    `;
-
-    const sanitized = sanitizeContent(complexContent);
-
-    expect(sanitized).not.toContain("\u200B");
-    expect(sanitized).not.toContain("\u00AD");
-    expect(sanitized).not.toContain("alt ");
-    expect(sanitized).not.toContain('title="');
-    expect(sanitized).not.toContain('data-x="');
-    expect(sanitized).toContain("![](image.png)");
-    expect(sanitized).toContain('<a href="#">Link</a>');
-  });
-
-  it("should preserve legitimate markdown and HTML", () => {
-    const legitimateContent = `
-      # Heading
-      
-      This is **bold** and *italic* text.
-      
-      Here's a normal image: ![](normal.jpg)
-      And a normal link: [Click here](https://example.com)
-      
-      <div class="container">
-        <p id="para">Normal paragraph</p>
-        <input type="text" name="field">
-      </div>
-    `;
-
-    const sanitized = sanitizeContent(legitimateContent);
-
-    expect(sanitized).toBe(legitimateContent);
-  });
-
-  it("should handle entity-encoded text", () => {
-    const encodedText = `
-      &#72;&#105;&#100;&#100;&#101;&#110; &#109;&#101;&#115;&#115;&#97;&#103;&#101;
-      <div title="&#101;&#120;&#97;&#109;&#112;&#108;&#101;">Test</div>
-    `;
-
-    const sanitized = sanitizeContent(encodedText);
-
-    expect(sanitized).toContain("Hidden message");
-    expect(sanitized).not.toContain('title="');
-    expect(sanitized).toContain("<div>Test</div>");
-  });
-});
-
-describe("stripHtmlComments (legacy)", () => {
-  it("should remove HTML comments", () => {
-    expect(stripHtmlComments("Hello <!-- example -->World")).toBe(
-      "Hello World",
-    );
-    expect(stripHtmlComments("<!-- comment -->Text")).toBe("Text");
-    expect(stripHtmlComments("Text<!-- comment -->")).toBe("Text");
-  });
-
-  it("should handle multiline comments", () => {
-    expect(stripHtmlComments("Hello <!-- \nexample\n -->World")).toBe(
-      "Hello World",
-    );
-  });
-});