Compare commits

..

16 Commits

Author SHA1 Message Date
km-anthropic
59e0155354 test: add test comment to README 2025-08-28 16:57:42 -07:00
km-anthropic
a85546bf0b fix: provide explicit git base branch reference to prevent PR review errors
- Tell Claude to use 'origin/{baseBranch}' instead of assuming 'main'
- Add explicit instructions for git diff/log commands with correct base branch
- Fixes 'fatal: ambiguous argument main..HEAD' error in fork environments
- Claude was autonomously running git diff main..HEAD when reviewing PRs
2025-08-28 16:56:47 -07:00
km-anthropic
cd6791b7f2 fix: add GitHub CI MCP tools to tag mode allowed list
Claude was trying to use CI status tools but they weren't in the
allowed list for tag mode, causing permission errors. This fix adds
the CI tools so Claude can check workflow status when reviewing PRs.
2025-08-28 15:18:35 -07:00
km-anthropic
61403a13ff revert: keep detailed track_progress description
The original description provides clarity about which specific event actions are supported.
2025-08-28 14:55:41 -07:00
km-anthropic
92ba9fb7bf fix: address review comments
- Simplify track_progress description to be more general
- Move import to top of types.ts file
2025-08-28 14:46:22 -07:00
km-anthropic
dbdd70852d formatting 2025-08-28 14:32:26 -07:00
km-anthropic
07a69eeb9c feat: enhance mode routing with track_progress and context preservation
This PR implements enhanced mode routing to address two critical v1 migration issues:
1. Lost GitHub context when using custom prompts in tag mode
2. Missing tracking comments for automatic PR reviews

Changes:
- Add track_progress input to force tag mode with tracking comments for PR/issue events
- Support custom prompt injection in tag mode via <custom_instructions> section
- Inject GitHub context as environment variables in agent mode
- Validate track_progress usage (only allowed for PR/issue events)
- Comprehensive test coverage for new routing logic

Event Routing:
- Comment events: Default to tag mode, switch to agent with explicit prompt
- PR/Issue events: Default to agent mode, switch to tag mode with track_progress
- Custom prompts can now be used in tag mode without losing context

This ensures backward compatibility while solving context preservation and tracking visibility issues reported in discussions #490 and #491.
2025-08-28 13:17:18 -07:00
Ashwin Bhat
0c127307fa feat: improve PR review examples with context and tools (#504)
- Add PR repository and number to review prompts
- Note that PR branch is already checked out
- Update allowed tools to use inline comments and gh CLI
- Remove experimental review mode example in favor of standardized approach

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

Co-authored-by: Claude <noreply@anthropic.com>
2025-08-28 09:02:27 -07:00
GitHub Actions
8a20581ed5 chore: bump Claude Code version to 1.0.96 2025-08-28 15:32:23 +00:00
GitHub Actions
a2ad6b7b4e chore: bump Claude Code version to 1.0.95 2025-08-28 01:26:35 +00:00
Ashwin Bhat
f0925925f1 fix: prevent test pollution by ensuring inputs are cloned (#499)
Always create a new object copy of defaultInputs to prevent mutations from affecting other tests.

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

Co-authored-by: Claude <noreply@anthropic.com>
2025-08-27 17:14:28 -07:00
GitHub Actions
ef8c0a650e chore: bump Claude Code version to 1.0.93 2025-08-27 22:27:45 +00:00
GitHub Actions
dd49718216 chore: bump Claude Code version to 1.0.94 2025-08-27 21:53:29 +00:00
GitHub Actions
be4b56e1ea chore: bump Claude Code version to 1.0.93 2025-08-26 22:54:12 +00:00
km-anthropic
dfef61fdee fix: remove redundant update-major-tag workflow that was incorrectly updating beta (#489)
The update-major-tag.yml workflow was:
1. Incorrectly updating the beta tag instead of major version tags
2. Redundant - release.yml already has an update-major-tag job that properly updates major version tags

Removing this workflow ensures:
- Beta tag stays at v0.0.63 and won't be automatically moved
- No duplicate major tag update logic
- Single source of truth for tag management in release.yml

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

Co-authored-by: Kashyap Murali <13315300+katchu11@users.noreply.github.com>
Co-authored-by: Claude <noreply@anthropic.com>
2025-08-26 15:30:37 -07:00
Ashwin Bhat
5218d84d4f chore: temporarily disable base action GitHub release creation (#488)
Commenting out the GitHub release creation step for the base action repository
to temporarily pause automatic releases while keeping tag synchronization active.

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

Co-authored-by: Claude <noreply@anthropic.com>
2025-08-26 10:30:22 -07:00
21 changed files with 444 additions and 113 deletions

View File

@@ -122,35 +122,35 @@ jobs:
token: ${{ secrets.CLAUDE_CODE_BASE_ACTION_PAT }} token: ${{ secrets.CLAUDE_CODE_BASE_ACTION_PAT }}
fetch-depth: 0 fetch-depth: 0
- name: Create and push tag # - name: Create and push tag
run: | # run: |
next_version="${{ needs.create-release.outputs.next_version }}" # next_version="${{ needs.create-release.outputs.next_version }}"
git config user.name "github-actions[bot]" # git config user.name "github-actions[bot]"
git config user.email "github-actions[bot]@users.noreply.github.com" # git config user.email "github-actions[bot]@users.noreply.github.com"
# Create the version tag # # Create the version tag
git tag -a "$next_version" -m "Release $next_version - synced from claude-code-action" # git tag -a "$next_version" -m "Release $next_version - synced from claude-code-action"
git push origin "$next_version" # git push origin "$next_version"
# Update the beta tag # # Update the beta tag
git tag -fa beta -m "Update beta tag to ${next_version}" # git tag -fa beta -m "Update beta tag to ${next_version}"
git push origin beta --force # git push origin beta --force
- name: Create GitHub release # - name: Create GitHub release
env: # env:
GH_TOKEN: ${{ secrets.CLAUDE_CODE_BASE_ACTION_PAT }} # GH_TOKEN: ${{ secrets.CLAUDE_CODE_BASE_ACTION_PAT }}
run: | # run: |
next_version="${{ needs.create-release.outputs.next_version }}" # next_version="${{ needs.create-release.outputs.next_version }}"
# Create the release # # Create the release
gh release create "$next_version" \ # gh release create "$next_version" \
--repo anthropics/claude-code-base-action \ # --repo anthropics/claude-code-base-action \
--title "$next_version" \ # --title "$next_version" \
--notes "Release $next_version - synced from anthropics/claude-code-action" \ # --notes "Release $next_version - synced from anthropics/claude-code-action" \
--latest=false # --latest=false
# Update beta release to be latest # # Update beta release to be latest
gh release edit beta \ # gh release edit beta \
--repo anthropics/claude-code-base-action \ # --repo anthropics/claude-code-base-action \
--latest # --latest

View File

@@ -1,24 +0,0 @@
name: Update Beta Tag
on:
release:
types: [published]
jobs:
update-beta-tag:
runs-on: ubuntu-latest
permissions:
contents: write
steps:
- uses: actions/checkout@v4
- name: Update beta tag
run: |
# Get the current release version
VERSION=${GITHUB_REF#refs/tags/}
# Update the beta tag to point to this release
git config user.name github-actions[bot]
git config user.email github-actions[bot]@users.noreply.github.com
git tag -fa beta -m "Update beta tag to ${VERSION}"
git push origin beta --force

2
.npmrc Normal file
View File

@@ -0,0 +1,2 @@
engine-strict=true
registry=https://registry.npmjs.org/

View File

@@ -51,3 +51,4 @@ Having issues or questions? Check out our [Frequently Asked Questions](./docs/fa
## License ## License
This project is licensed under the MIT License—see the LICENSE file for details. This project is licensed under the MIT License—see the LICENSE file for details.
# Test change for PR review

View File

@@ -73,6 +73,10 @@ inputs:
description: "Enable commit signing using GitHub's commit signature verification. When false, Claude uses standard git commands" description: "Enable commit signing using GitHub's commit signature verification. When false, Claude uses standard git commands"
required: false required: false
default: "false" default: "false"
track_progress:
description: "Force tag mode with tracking comments for pull_request and issue events. Only applicable to pull_request (opened, synchronize, ready_for_review, reopened) and issue (opened, edited, labeled, assigned) events."
required: false
default: "false"
experimental_allowed_domains: experimental_allowed_domains:
description: "Restrict network access to these domains only (newline-separated). If not set, no restrictions are applied. Provider domains are auto-detected." description: "Restrict network access to these domains only (newline-separated). If not set, no restrictions are applied. Provider domains are auto-detected."
required: false required: false
@@ -140,6 +144,7 @@ runs:
USE_STICKY_COMMENT: ${{ inputs.use_sticky_comment }} USE_STICKY_COMMENT: ${{ inputs.use_sticky_comment }}
DEFAULT_WORKFLOW_TOKEN: ${{ github.token }} DEFAULT_WORKFLOW_TOKEN: ${{ github.token }}
USE_COMMIT_SIGNING: ${{ inputs.use_commit_signing }} USE_COMMIT_SIGNING: ${{ inputs.use_commit_signing }}
TRACK_PROGRESS: ${{ inputs.track_progress }}
ADDITIONAL_PERMISSIONS: ${{ inputs.additional_permissions }} ADDITIONAL_PERMISSIONS: ${{ inputs.additional_permissions }}
CLAUDE_ARGS: ${{ inputs.claude_args }} CLAUDE_ARGS: ${{ inputs.claude_args }}
ALL_INPUTS: ${{ toJson(inputs) }} ALL_INPUTS: ${{ toJson(inputs) }}
@@ -157,7 +162,7 @@ runs:
# Install Claude Code if no custom executable is provided # Install Claude Code if no custom executable is provided
if [ -z "${{ inputs.path_to_claude_code_executable }}" ]; then if [ -z "${{ inputs.path_to_claude_code_executable }}" ]; then
echo "Installing Claude Code..." echo "Installing Claude Code..."
curl -fsSL https://claude.ai/install.sh | bash -s 1.0.92 curl -fsSL https://claude.ai/install.sh | bash -s 1.0.96
echo "$HOME/.local/bin" >> "$GITHUB_PATH" echo "$HOME/.local/bin" >> "$GITHUB_PATH"
else else
echo "Using custom Claude Code executable: ${{ inputs.path_to_claude_code_executable }}" echo "Using custom Claude Code executable: ${{ inputs.path_to_claude_code_executable }}"
@@ -247,6 +252,7 @@ runs:
PREPARE_ERROR: ${{ steps.prepare.outputs.prepare_error || '' }} PREPARE_ERROR: ${{ steps.prepare.outputs.prepare_error || '' }}
USE_STICKY_COMMENT: ${{ inputs.use_sticky_comment }} USE_STICKY_COMMENT: ${{ inputs.use_sticky_comment }}
USE_COMMIT_SIGNING: ${{ inputs.use_commit_signing }} USE_COMMIT_SIGNING: ${{ inputs.use_commit_signing }}
TRACK_PROGRESS: ${{ inputs.track_progress }}
- name: Display Claude Code Report - name: Display Claude Code Report
if: steps.prepare.outputs.contains_trigger == 'true' && steps.claude-code.outputs.execution_file != '' if: steps.prepare.outputs.contains_trigger == 'true' && steps.claude-code.outputs.execution_file != ''

2
base-action/.npmrc Normal file
View File

@@ -0,0 +1,2 @@
engine-strict=true
registry=https://registry.npmjs.org/

View File

@@ -99,7 +99,7 @@ runs:
run: | run: |
if [ -z "${{ inputs.path_to_claude_code_executable }}" ]; then if [ -z "${{ inputs.path_to_claude_code_executable }}" ]; then
echo "Installing Claude Code..." echo "Installing Claude Code..."
curl -fsSL https://claude.ai/install.sh | bash -s 1.0.92 curl -fsSL https://claude.ai/install.sh | bash -s 1.0.96
else else
echo "Using custom Claude Code executable: ${{ inputs.path_to_claude_code_executable }}" echo "Using custom Claude Code executable: ${{ inputs.path_to_claude_code_executable }}"
# Add the directory containing the custom executable to PATH # Add the directory containing the custom executable to PATH

View File

@@ -22,7 +22,12 @@ jobs:
with: with:
anthropic_api_key: ${{ secrets.ANTHROPIC_API_KEY }} anthropic_api_key: ${{ secrets.ANTHROPIC_API_KEY }}
prompt: | prompt: |
Please review this pull request and provide comprehensive feedback. REPO: ${{ github.repository }}
PR NUMBER: ${{ github.event.pull_request.number }}
Please review this pull request.
Note: The PR branch is already checked out in the current working directory.
Focus on: Focus on:
- Code quality and best practices - Code quality and best practices
@@ -34,7 +39,10 @@ jobs:
- Verify that README.md and docs are updated for any new features or config changes - Verify that README.md and docs are updated for any new features or config changes
Provide constructive feedback with specific suggestions for improvement. Provide constructive feedback with specific suggestions for improvement.
Use inline comments to highlight specific areas of concern. Use `gh pr comment:*` for top-level comments.
Use `mcp__github_inline_comment__create_inline_comment` to highlight specific areas of concern.
Only your GitHub comments that you post will be seen, so don't submit your review as a normal message, just as comments.
If the PR has already been reviewed, or there are no noteworthy changes, don't post anything.
claude_args: | claude_args: |
--allowedTools "mcp__github__create_pending_pull_request_review,mcp__github__add_comment_to_pending_review,mcp__github__submit_pending_pull_request_review,mcp__github__get_pull_request_diff" --allowedTools "mcp__github_inline_comment__create_inline_comment,Bash(gh pr comment:*), Bash(gh pr diff:*), Bash(gh pr view:*)"

View File

@@ -1,45 +0,0 @@
name: Claude Experimental Review Mode
on:
pull_request:
types: [opened, synchronize]
issue_comment:
types: [created]
jobs:
code-review:
# Run on PR events, or when someone comments "@claude review" on a PR
if: |
github.event_name == 'pull_request' ||
(github.event_name == 'issue_comment' &&
github.event.issue.pull_request &&
contains(github.event.comment.body, '@claude review'))
runs-on: ubuntu-latest
permissions:
contents: read
pull-requests: write
issues: write
id-token: write
steps:
- name: Checkout repository
uses: actions/checkout@v4
with:
fetch-depth: 0 # Full history for better diff analysis
- name: Code Review with Claude
uses: anthropics/claude-code-action@v1-dev
with:
anthropic_api_key: ${{ secrets.ANTHROPIC_API_KEY }}
# github_token not needed - uses default GITHUB_TOKEN for GitHub operations
prompt: |
Review this pull request comprehensively.
Focus on:
- Code quality and maintainability
- Security vulnerabilities
- Performance issues
- Best practices and design patterns
- Test coverage gaps
Be constructive and provide specific suggestions for improvements.
Use GitHub's suggestion format when proposing code changes.

View File

@@ -28,7 +28,13 @@ jobs:
with: with:
anthropic_api_key: ${{ secrets.ANTHROPIC_API_KEY }} anthropic_api_key: ${{ secrets.ANTHROPIC_API_KEY }}
prompt: | prompt: |
REPO: ${{ github.repository }}
PR NUMBER: ${{ github.event.pull_request.number }}
Please review this pull request focusing on the changed files. Please review this pull request focusing on the changed files.
Note: The PR branch is already checked out in the current working directory.
Provide feedback on: Provide feedback on:
- Code quality and adherence to best practices - Code quality and adherence to best practices
- Potential bugs or edge cases - Potential bugs or edge cases
@@ -38,3 +44,6 @@ jobs:
Since this PR touches critical source code paths, please be thorough Since this PR touches critical source code paths, please be thorough
in your review and provide inline comments where appropriate. in your review and provide inline comments where appropriate.
claude_args: |
--allowedTools "mcp__github_inline_comment__create_inline_comment,Bash(gh pr comment:*), Bash(gh pr diff:*), Bash(gh pr view:*)"

View File

@@ -27,8 +27,13 @@ jobs:
with: with:
anthropic_api_key: ${{ secrets.ANTHROPIC_API_KEY }} anthropic_api_key: ${{ secrets.ANTHROPIC_API_KEY }}
prompt: | prompt: |
REPO: ${{ github.repository }}
PR NUMBER: ${{ github.event.pull_request.number }}
Please provide a thorough review of this pull request. Please provide a thorough review of this pull request.
Note: The PR branch is already checked out in the current working directory.
Since this is from a specific author that requires careful review, Since this is from a specific author that requires careful review,
please pay extra attention to: please pay extra attention to:
- Adherence to project coding standards - Adherence to project coding standards
@@ -38,3 +43,6 @@ jobs:
- Documentation - Documentation
Provide detailed feedback and suggestions for improvement. Provide detailed feedback and suggestions for improvement.
claude_args: |
--allowedTools "mcp__github_inline_comment__create_inline_comment,Bash(gh pr comment:*), Bash(gh pr diff:*), Bash(gh pr view:*)"

View File

@@ -576,7 +576,7 @@ Only the body parameter is required - the tool automatically knows which comment
Your task is to analyze the context, understand the request, and provide helpful responses and/or implement code changes as needed. Your task is to analyze the context, understand the request, and provide helpful responses and/or implement code changes as needed.
IMPORTANT CLARIFICATIONS: IMPORTANT CLARIFICATIONS:
- When asked to "review" code, read the code and provide review feedback (do not implement changes unless explicitly asked)${eventData.isPR ? "\n- For PR reviews: Your review will be posted when you update the comment. Focus on providing comprehensive review feedback." : ""} - When asked to "review" code, read the code and provide review feedback (do not implement changes unless explicitly asked)${eventData.isPR ? "\n- For PR reviews: Your review will be posted when you update the comment. Focus on providing comprehensive review feedback." : ""}${eventData.isPR && eventData.baseBranch ? `\n- When comparing PR changes, use 'origin/${eventData.baseBranch}' as the base reference (NOT 'main' or 'master')` : ""}
- Your console outputs and tool results are NOT visible to the user - Your console outputs and tool results are NOT visible to the user
- ALL communication happens through your GitHub comment - that's how users see your feedback, answers, and progress. your normal responses are not seen. - ALL communication happens through your GitHub comment - that's how users see your feedback, answers, and progress. your normal responses are not seen.
@@ -592,7 +592,9 @@ Follow these steps:
- For ISSUE_CREATED: Read the issue body to find the request after the trigger phrase. - For ISSUE_CREATED: Read the issue body to find the request after the trigger phrase.
- For ISSUE_ASSIGNED: Read the entire issue body to understand the task. - For ISSUE_ASSIGNED: Read the entire issue body to understand the task.
- For ISSUE_LABELED: Read the entire issue body to understand the task. - For ISSUE_LABELED: Read the entire issue body to understand the task.
${eventData.eventName === "issue_comment" || eventData.eventName === "pull_request_review_comment" || eventData.eventName === "pull_request_review" ? ` - For comment/review events: Your instructions are in the <trigger_comment> tag above.` : ""} ${eventData.eventName === "issue_comment" || eventData.eventName === "pull_request_review_comment" || eventData.eventName === "pull_request_review" ? ` - For comment/review events: Your instructions are in the <trigger_comment> tag above.` : ""}${eventData.isPR && eventData.baseBranch ? `
- For PR reviews: The PR base branch is 'origin/${eventData.baseBranch}' (NOT 'main' or 'master')
- To see PR changes: use 'git diff origin/${eventData.baseBranch}...HEAD' or 'git log origin/${eventData.baseBranch}..HEAD'` : ""}
- IMPORTANT: Only the comment/issue containing '${context.triggerPhrase}' has your instructions. - IMPORTANT: Only the comment/issue containing '${context.triggerPhrase}' has your instructions.
- Other comments may contain requests from other users, but DO NOT act on those unless the trigger comment explicitly asks you to. - Other comments may contain requests from other users, but DO NOT act on those unless the trigger comment explicitly asks you to.
- Use the Read tool to look at relevant files for better context. - Use the Read tool to look at relevant files for better context.
@@ -679,7 +681,7 @@ ${
- Push to remote: Bash(git push origin <branch>) (NEVER force push) - Push to remote: Bash(git push origin <branch>) (NEVER force push)
- Delete files: Bash(git rm <files>) followed by commit and push - Delete files: Bash(git rm <files>) followed by commit and push
- Check status: Bash(git status) - Check status: Bash(git status)
- View diff: Bash(git diff)` - View diff: Bash(git diff)${eventData.isPR && eventData.baseBranch ? `\n - IMPORTANT: For PR diffs, use: Bash(git diff origin/${eventData.baseBranch}...HEAD)` : ""}`
} }
- Display the todo list as a checklist in the GitHub comment and mark things off as you go. - Display the todo list as a checklist in the GitHub comment and mark things off as you go.
- REPOSITORY SETUP INSTRUCTIONS: The repository's CLAUDE.md file(s) contain critical repo-specific setup instructions, development guidelines, and preferences. Always read and follow these files, particularly the root CLAUDE.md, as they provide essential context for working with the codebase effectively. - REPOSITORY SETUP INSTRUCTIONS: The repository's CLAUDE.md file(s) contain critical repo-specific setup instructions, development guidelines, and preferences. Always read and follow these files, particularly the root CLAUDE.md, as they provide essential context for working with the codebase effectively.

View File

@@ -1,3 +1,5 @@
import type { GitHubContext } from "../github/context";
export type CommonFields = { export type CommonFields = {
repository: string; repository: string;
claudeCommentId: string; claudeCommentId: string;
@@ -99,4 +101,5 @@ export type EventData =
// Combined type with separate eventData field // Combined type with separate eventData field
export type PreparedContext = CommonFields & { export type PreparedContext = CommonFields & {
eventData: EventData; eventData: EventData;
githubContext?: GitHubContext;
}; };

View File

@@ -75,6 +75,7 @@ type BaseContext = {
useStickyComment: boolean; useStickyComment: boolean;
useCommitSigning: boolean; useCommitSigning: boolean;
allowedBots: string; allowedBots: string;
trackProgress: boolean;
}; };
}; };
@@ -122,6 +123,7 @@ export function parseGitHubContext(): GitHubContext {
useStickyComment: process.env.USE_STICKY_COMMENT === "true", useStickyComment: process.env.USE_STICKY_COMMENT === "true",
useCommitSigning: process.env.USE_COMMIT_SIGNING === "true", useCommitSigning: process.env.USE_COMMIT_SIGNING === "true",
allowedBots: process.env.ALLOWED_BOTS ?? "", allowedBots: process.env.ALLOWED_BOTS ?? "",
trackProgress: process.env.TRACK_PROGRESS === "true",
}, },
}; };

View File

@@ -5,6 +5,41 @@ import type { PreparedContext } from "../../create-prompt/types";
import { prepareMcpConfig } from "../../mcp/install-mcp-server"; import { prepareMcpConfig } from "../../mcp/install-mcp-server";
import { parseAllowedTools } from "./parse-tools"; import { parseAllowedTools } from "./parse-tools";
import { configureGitAuth } from "../../github/operations/git-config"; import { configureGitAuth } from "../../github/operations/git-config";
import type { GitHubContext } from "../../github/context";
import { isEntityContext } from "../../github/context";
/**
* Extract GitHub context as environment variables for agent mode
*/
function extractGitHubContext(context: GitHubContext): Record<string, string> {
const envVars: Record<string, string> = {};
// Basic repository info
envVars.GITHUB_REPOSITORY = context.repository.full_name;
envVars.GITHUB_TRIGGER_ACTOR = context.actor;
envVars.GITHUB_EVENT_NAME = context.eventName;
// Entity-specific context (PR/issue numbers, branches, etc.)
if (isEntityContext(context)) {
if (context.isPR) {
envVars.GITHUB_PR_NUMBER = String(context.entityNumber);
// Extract branch info from payload if available
if (
context.payload &&
"pull_request" in context.payload &&
context.payload.pull_request
) {
envVars.GITHUB_BASE_REF = context.payload.pull_request.base?.ref || "";
envVars.GITHUB_HEAD_REF = context.payload.pull_request.head?.ref || "";
}
} else {
envVars.GITHUB_ISSUE_NUMBER = String(context.entityNumber);
}
}
return envVars;
}
/** /**
* Agent mode implementation. * Agent mode implementation.
@@ -136,6 +171,14 @@ export const agentMode: Mode = {
}, },
generatePrompt(context: PreparedContext): string { generatePrompt(context: PreparedContext): string {
// Inject GitHub context as environment variables
if (context.githubContext) {
const envVars = extractGitHubContext(context.githubContext);
for (const [key, value] of Object.entries(envVars)) {
core.exportVariable(key, value);
}
}
// Agent mode uses prompt field // Agent mode uses prompt field
if (context.prompt) { if (context.prompt) {
return context.prompt; return context.prompt;

View File

@@ -3,31 +3,65 @@ import {
isEntityContext, isEntityContext,
isIssueCommentEvent, isIssueCommentEvent,
isPullRequestReviewCommentEvent, isPullRequestReviewCommentEvent,
isPullRequestEvent,
isIssuesEvent,
isPullRequestReviewEvent,
} from "../github/context"; } from "../github/context";
import { checkContainsTrigger } from "../github/validation/trigger"; import { checkContainsTrigger } from "../github/validation/trigger";
export type AutoDetectedMode = "tag" | "agent"; export type AutoDetectedMode = "tag" | "agent";
export function detectMode(context: GitHubContext): AutoDetectedMode { export function detectMode(context: GitHubContext): AutoDetectedMode {
// If prompt is provided, use agent mode for direct execution // Validate track_progress usage
if (context.inputs?.prompt) { if (context.inputs.trackProgress) {
return "agent"; validateTrackProgressEvent(context);
} }
// Check for @claude mentions (tag mode) // If track_progress is set for PR/issue events, force tag mode
if (context.inputs.trackProgress && isEntityContext(context)) {
if (isPullRequestEvent(context) || isIssuesEvent(context)) {
return "tag";
}
}
// Comment events (current behavior - unchanged)
if (isEntityContext(context)) { if (isEntityContext(context)) {
if ( if (
isIssueCommentEvent(context) || isIssueCommentEvent(context) ||
isPullRequestReviewCommentEvent(context) isPullRequestReviewCommentEvent(context) ||
isPullRequestReviewEvent(context)
) { ) {
// If prompt is provided on comment events, use agent mode
if (context.inputs.prompt) {
return "agent";
}
// Default to tag mode if @claude mention found
if (checkContainsTrigger(context)) { if (checkContainsTrigger(context)) {
return "tag"; return "tag";
} }
} }
}
if (context.eventName === "issues") { // Issue events
if (checkContainsTrigger(context)) { if (isEntityContext(context) && isIssuesEvent(context)) {
return "tag"; // Check for @claude mentions or labels/assignees
if (checkContainsTrigger(context)) {
return "tag";
}
}
// PR events (opened, synchronize, etc.)
if (isEntityContext(context) && isPullRequestEvent(context)) {
const supportedActions = [
"opened",
"synchronize",
"ready_for_review",
"reopened",
];
if (context.eventAction && supportedActions.includes(context.eventAction)) {
// If prompt is provided, use agent mode (default for automation)
if (context.inputs.prompt) {
return "agent";
} }
} }
} }
@@ -47,6 +81,33 @@ export function getModeDescription(mode: AutoDetectedMode): string {
} }
} }
function validateTrackProgressEvent(context: GitHubContext): void {
// track_progress is only valid for pull_request and issue events
const validEvents = ["pull_request", "issues"];
if (!validEvents.includes(context.eventName)) {
throw new Error(
`track_progress is only supported for pull_request and issue events. ` +
`Current event: ${context.eventName}`,
);
}
// Additionally validate PR actions
if (context.eventName === "pull_request" && context.eventAction) {
const validActions = [
"opened",
"synchronize",
"ready_for_review",
"reopened",
];
if (!validActions.includes(context.eventAction)) {
throw new Error(
`track_progress for pull_request events is only supported for actions: ` +
`${validActions.join(", ")}. Current action: ${context.eventAction}`,
);
}
}
}
export function shouldUseTrackingComment(mode: AutoDetectedMode): boolean { export function shouldUseTrackingComment(mode: AutoDetectedMode): boolean {
return mode === "tag"; return mode === "tag";
} }

View File

@@ -125,6 +125,9 @@ export const tagMode: Mode = {
"Read", "Read",
"Write", "Write",
"mcp__github_comment__update_claude_comment", "mcp__github_comment__update_claude_comment",
"mcp__github_ci__get_ci_status",
"mcp__github_ci__get_workflow_run_details",
"mcp__github_ci__download_job_log",
]; ];
// Add git commands when not using commit signing // Add git commands when not using commit signing
@@ -177,7 +180,25 @@ export const tagMode: Mode = {
githubData: FetchDataResult, githubData: FetchDataResult,
useCommitSigning: boolean, useCommitSigning: boolean,
): string { ): string {
return generateDefaultPrompt(context, githubData, useCommitSigning); const defaultPrompt = generateDefaultPrompt(
context,
githubData,
useCommitSigning,
);
// If a custom prompt is provided, inject it into the tag mode prompt
if (context.githubContext?.inputs?.prompt) {
return (
defaultPrompt +
`
<custom_instructions>
${context.githubContext.inputs.prompt}
</custom_instructions>`
);
}
return defaultPrompt;
}, },
getSystemPrompt() { getSystemPrompt() {

View File

@@ -32,6 +32,7 @@ describe("prepareMcpConfig", () => {
useStickyComment: false, useStickyComment: false,
useCommitSigning: false, useCommitSigning: false,
allowedBots: "", allowedBots: "",
trackProgress: false,
}, },
}; };

View File

@@ -19,6 +19,7 @@ const defaultInputs = {
useStickyComment: false, useStickyComment: false,
useCommitSigning: false, useCommitSigning: false,
allowedBots: "", allowedBots: "",
trackProgress: false,
}; };
const defaultRepository = { const defaultRepository = {
@@ -72,7 +73,7 @@ export const createMockAutomationContext = (
const mergedInputs = overrides.inputs const mergedInputs = overrides.inputs
? { ...defaultInputs, ...overrides.inputs } ? { ...defaultInputs, ...overrides.inputs }
: defaultInputs; : { ...defaultInputs };
return { ...baseContext, ...overrides, inputs: mergedInputs }; return { ...baseContext, ...overrides, inputs: mergedInputs };
}; };

View File

@@ -68,6 +68,7 @@ describe("checkWritePermissions", () => {
useStickyComment: false, useStickyComment: false,
useCommitSigning: false, useCommitSigning: false,
allowedBots: "", allowedBots: "",
trackProgress: false,
}, },
}); });

View File

@@ -0,0 +1,229 @@
import { describe, expect, it } from "bun:test";
import { detectMode } from "../../src/modes/detector";
import type { GitHubContext } from "../../src/github/context";
describe("detectMode with enhanced routing", () => {
const baseContext = {
runId: "test-run",
eventAction: "opened",
repository: {
owner: "test-owner",
repo: "test-repo",
full_name: "test-owner/test-repo",
},
actor: "test-user",
inputs: {
prompt: "",
triggerPhrase: "@claude",
assigneeTrigger: "",
labelTrigger: "",
branchPrefix: "claude/",
useStickyComment: false,
useCommitSigning: false,
allowedBots: "",
trackProgress: false,
},
};
describe("PR Events with track_progress", () => {
it("should use tag mode when track_progress is true for pull_request.opened", () => {
const context: GitHubContext = {
...baseContext,
eventName: "pull_request",
eventAction: "opened",
payload: { pull_request: { number: 1 } } as any,
entityNumber: 1,
isPR: true,
inputs: { ...baseContext.inputs, trackProgress: true },
};
expect(detectMode(context)).toBe("tag");
});
it("should use tag mode when track_progress is true for pull_request.synchronize", () => {
const context: GitHubContext = {
...baseContext,
eventName: "pull_request",
eventAction: "synchronize",
payload: { pull_request: { number: 1 } } as any,
entityNumber: 1,
isPR: true,
inputs: { ...baseContext.inputs, trackProgress: true },
};
expect(detectMode(context)).toBe("tag");
});
it("should use agent mode when track_progress is false for pull_request.opened", () => {
const context: GitHubContext = {
...baseContext,
eventName: "pull_request",
eventAction: "opened",
payload: { pull_request: { number: 1 } } as any,
entityNumber: 1,
isPR: true,
inputs: { ...baseContext.inputs, trackProgress: false },
};
expect(detectMode(context)).toBe("agent");
});
it("should throw error when track_progress is used with unsupported PR action", () => {
const context: GitHubContext = {
...baseContext,
eventName: "pull_request",
eventAction: "closed",
payload: { pull_request: { number: 1 } } as any,
entityNumber: 1,
isPR: true,
inputs: { ...baseContext.inputs, trackProgress: true },
};
expect(() => detectMode(context)).toThrow(
/track_progress for pull_request events is only supported for actions/,
);
});
});
describe("Issue Events with track_progress", () => {
it("should use tag mode when track_progress is true for issues.opened", () => {
const context: GitHubContext = {
...baseContext,
eventName: "issues",
eventAction: "opened",
payload: { issue: { number: 1, body: "Test" } } as any,
entityNumber: 1,
isPR: false,
inputs: { ...baseContext.inputs, trackProgress: true },
};
expect(detectMode(context)).toBe("tag");
});
it("should use agent mode when track_progress is false for issues", () => {
const context: GitHubContext = {
...baseContext,
eventName: "issues",
eventAction: "opened",
payload: { issue: { number: 1, body: "Test" } } as any,
entityNumber: 1,
isPR: false,
inputs: { ...baseContext.inputs, trackProgress: false },
};
expect(detectMode(context)).toBe("agent");
});
});
describe("Comment Events (unchanged behavior)", () => {
it("should use tag mode for issue_comment with @claude mention", () => {
const context: GitHubContext = {
...baseContext,
eventName: "issue_comment",
payload: {
issue: { number: 1, body: "Test" },
comment: { body: "@claude help" },
} as any,
entityNumber: 1,
isPR: false,
};
expect(detectMode(context)).toBe("tag");
});
it("should use agent mode for issue_comment with prompt provided", () => {
const context: GitHubContext = {
...baseContext,
eventName: "issue_comment",
payload: {
issue: { number: 1, body: "Test" },
comment: { body: "@claude help" },
} as any,
entityNumber: 1,
isPR: false,
inputs: { ...baseContext.inputs, prompt: "Review this PR" },
};
expect(detectMode(context)).toBe("agent");
});
it("should use tag mode for PR review comments with @claude mention", () => {
const context: GitHubContext = {
...baseContext,
eventName: "pull_request_review_comment",
payload: {
pull_request: { number: 1, body: "Test" },
comment: { body: "@claude check this" },
} as any,
entityNumber: 1,
isPR: true,
};
expect(detectMode(context)).toBe("tag");
});
});
describe("Automation Events (should error with track_progress)", () => {
it("should throw error when track_progress is used with workflow_dispatch", () => {
const context: GitHubContext = {
...baseContext,
eventName: "workflow_dispatch",
payload: {} as any,
inputs: { ...baseContext.inputs, trackProgress: true },
};
expect(() => detectMode(context)).toThrow(
/track_progress is only supported for pull_request and issue events/,
);
});
it("should use agent mode for workflow_dispatch without track_progress", () => {
const context: GitHubContext = {
...baseContext,
eventName: "workflow_dispatch",
payload: {} as any,
inputs: { ...baseContext.inputs, prompt: "Run workflow" },
};
expect(detectMode(context)).toBe("agent");
});
});
describe("Custom prompt injection in tag mode", () => {
it("should use tag mode for PR events when both track_progress and prompt are provided", () => {
const context: GitHubContext = {
...baseContext,
eventName: "pull_request",
eventAction: "opened",
payload: { pull_request: { number: 1 } } as any,
entityNumber: 1,
isPR: true,
inputs: {
...baseContext.inputs,
trackProgress: true,
prompt: "Review for security issues",
},
};
expect(detectMode(context)).toBe("tag");
});
it("should use tag mode for issue events when both track_progress and prompt are provided", () => {
const context: GitHubContext = {
...baseContext,
eventName: "issues",
eventAction: "opened",
payload: { issue: { number: 1, body: "Test" } } as any,
entityNumber: 1,
isPR: false,
inputs: {
...baseContext.inputs,
trackProgress: true,
prompt: "Analyze this issue",
},
};
expect(detectMode(context)).toBe("tag");
});
});
});