Update Claude Code Action to enhance input options and streamline prompt extraction from GitHub context. Remove redundant GitHub token and MCP installation steps in workflow for improved clarity and efficiency.

MervinPraison · MervinPraison · commit 022e6fe0f485 · 2025-06-16T09:39:06.000+01:00
diff --git a/.github/actions/claude-code-action/action.yml b/.github/actions/claude-code-action/action.yml
@@ -2,36 +2,61 @@ name: "Claude Code Action"
 description: "Run Claude Code in GitHub Actions workflows"
 
 inputs:
-  github_token:
-    description: "GitHub token with repo and issues permissions"
-    required: true
   anthropic_api_key:
     description: "Anthropic API key"
-    required: true
-  prompt:
-    description: "The prompt to send to Claude Code"
+    required: false
+  github_token:
+    description: "GitHub token for Claude to operate with"
+    required: false
+    default: ${{ github.token }}
+  trigger_phrase:
+    description: "The trigger phrase to look for in comments, issue/PR bodies, and issue titles"
+    required: false
+    default: "@claude"
+  assignee_trigger:
+    description: "The assignee username that triggers the action (e.g. @claude). Only used for issue assignment"
+    required: false
+  max_turns:
+    description: "Maximum number of conversation turns Claude can take"
+    required: false
+  timeout_minutes:
+    description: "Timeout in minutes for execution"
+    required: false
+    default: "30"
+  model:
+    description: "Model to use (provider-specific format required for Bedrock/Vertex)"
+    required: false
+  use_bedrock:
+    description: "Use Amazon Bedrock with OIDC authentication instead of direct Anthropic API"
+    required: false
+    default: "false"
+  use_vertex:
+    description: "Use Google Vertex AI with OIDC authentication instead of direct Anthropic API"
+    required: false
+    default: "false"
+  allowed_tools:
+    description: "Additional tools for Claude to use (the base GitHub tools will always be included)"
     required: false
     default: ""
-  prompt_file:
-    description: "Path to a file containing the prompt to send to Claude Code"
+  disallowed_tools:
+    description: "Tools that Claude should never use"
     required: false
     default: ""
-  allowed_tools:
-    description: "Comma-separated list of allowed tools for Claude Code to use"
+  custom_instructions:
+    description: "Additional custom instructions to include in the prompt for Claude"
     required: false
     default: ""
-  output_file:
-    description: "File to save Claude Code output to (optional)"
+  mcp_config:
+    description: "Additional MCP configuration (JSON string) that merges with the built-in GitHub MCP servers"
     required: false
     default: ""
-  timeout_minutes:
-    description: "Timeout in minutes for Claude Code execution"
+  claude_env:
+    description: "Custom environment variables to pass to Claude Code execution (YAML format)"
     required: false
-    default: "10"
-  install_github_mcp:
-    description: "Whether to install the GitHub MCP server"
+    default: ""
+  direct_prompt:
+    description: "Direct prompt for Claude to execute automatically without needing a trigger (for automated workflows)"
     required: false
-    default: "false"
 
 runs:
   using: "composite"
@@ -41,7 +66,6 @@ runs:
       run: npm install -g @anthropic-ai/claude-code
 
     - name: Install GitHub MCP Server
-      if: inputs.install_github_mcp == 'true'
       shell: bash
       run: |
         claude mcp add-json github '{
@@ -59,106 +83,171 @@ runs:
           }
         }'
 
-    - name: Prepare Prompt File
+    - name: Extract GitHub Context and Create Prompt
       shell: bash
-      id: prepare_prompt
+      id: prepare_context
       run: |
-        # If neither prompt nor prompt_file is provided, auto-generate from GitHub context
-        if [ -z "${{ inputs.prompt }}" ] && [ -z "${{ inputs.prompt_file }}" ]; then
-          echo "Auto-generating prompt from GitHub context..."
-          mkdir -p /tmp/claude-action
-          
-          # Extract the user's request from the GitHub event (mimicking official behavior)
-          if [[ "${{ github.event_name }}" == "issue_comment" ]]; then
-            PROMPT_TEXT="${{ github.event.comment.body }}"
-            CONTEXT="Issue Comment on: ${{ github.event.issue.title }}"
-          elif [[ "${{ github.event_name }}" == "pull_request_review_comment" ]]; then
-            PROMPT_TEXT="${{ github.event.comment.body }}"
-            CONTEXT="PR Comment on: ${{ github.event.pull_request.title }}"
-          elif [[ "${{ github.event_name }}" == "pull_request_review" ]]; then
-            PROMPT_TEXT="${{ github.event.review.body }}"
-            CONTEXT="PR Review on: ${{ github.event.pull_request.title }}"
-          elif [[ "${{ github.event_name }}" == "issues" ]]; then
-            PROMPT_TEXT="${{ github.event.issue.body }}"
-            CONTEXT="Issue: ${{ github.event.issue.title }}"
-          else
-            PROMPT_TEXT="Help with this repository"
-            CONTEXT="Repository assistance requested"
+        echo "🔍 Extracting GitHub context from event: ${{ github.event_name }}"
+        
+        # Function to check for trigger phrase
+        check_trigger() {
+          local text="$1"
+          local trigger="${{ inputs.trigger_phrase }}"
+          if [[ "$text" == *"$trigger"* ]]; then
+            return 0
           fi
-          
-          # Create GitHub context prompt (similar to official action)
-          cat > /tmp/claude-action/github-context-prompt.txt << EOF
+          return 1
+        }
+        
+        # Extract context based on event type
+        TRIGGER_FOUND="false"
+        USER_REQUEST=""
+        CONTEXT_INFO=""
+        
+        case "${{ github.event_name }}" in
+          "issue_comment")
+            COMMENT_BODY="${{ github.event.comment.body }}"
+            ISSUE_TITLE="${{ github.event.issue.title }}"
+            ISSUE_NUMBER="${{ github.event.issue.number }}"
+            
+            if check_trigger "$COMMENT_BODY"; then
+              TRIGGER_FOUND="true"
+              USER_REQUEST="$COMMENT_BODY"
+              CONTEXT_INFO="Issue Comment on #$ISSUE_NUMBER: $ISSUE_TITLE"
+            fi
+            ;;
+            
+          "pull_request_review_comment")
+            COMMENT_BODY="${{ github.event.comment.body }}"
+            PR_TITLE="${{ github.event.pull_request.title }}"
+            PR_NUMBER="${{ github.event.pull_request.number }}"
+            
+            if check_trigger "$COMMENT_BODY"; then
+              TRIGGER_FOUND="true"
+              USER_REQUEST="$COMMENT_BODY"
+              CONTEXT_INFO="PR Comment on #$PR_NUMBER: $PR_TITLE"
+            fi
+            ;;
+            
+          "pull_request_review")
+            REVIEW_BODY="${{ github.event.review.body }}"
+            PR_TITLE="${{ github.event.pull_request.title }}"
+            PR_NUMBER="${{ github.event.pull_request.number }}"
+            
+            if check_trigger "$REVIEW_BODY"; then
+              TRIGGER_FOUND="true"
+              USER_REQUEST="$REVIEW_BODY"
+              CONTEXT_INFO="PR Review on #$PR_NUMBER: $PR_TITLE"
+            fi
+            ;;
+            
+          "issues")
+            ISSUE_BODY="${{ github.event.issue.body }}"
+            ISSUE_TITLE="${{ github.event.issue.title }}"
+            ISSUE_NUMBER="${{ github.event.issue.number }}"
+            
+            if check_trigger "$ISSUE_TITLE" || check_trigger "$ISSUE_BODY"; then
+              TRIGGER_FOUND="true"
+              USER_REQUEST="$ISSUE_BODY"
+              CONTEXT_INFO="Issue #$ISSUE_NUMBER: $ISSUE_TITLE"
+            elif [[ "${{ github.event.action }}" == "assigned" && -n "${{ inputs.assignee_trigger }}" ]]; then
+              ASSIGNEE="${{ github.event.assignee.login }}"
+              if [[ "$ASSIGNEE" == "${{ inputs.assignee_trigger }}" ]]; then
+                TRIGGER_FOUND="true"
+                USER_REQUEST="$ISSUE_BODY"
+                CONTEXT_INFO="Issue #$ISSUE_NUMBER assigned to $ASSIGNEE: $ISSUE_TITLE"
+              fi
+            fi
+            ;;
+        esac
+        
+        # Check for direct prompt override
+        if [[ -n "${{ inputs.direct_prompt }}" ]]; then
+          TRIGGER_FOUND="true"
+          USER_REQUEST="${{ inputs.direct_prompt }}"
+          CONTEXT_INFO="Automated GitHub workflow"
+        fi
+        
+        if [[ "$TRIGGER_FOUND" != "true" ]]; then
+          echo "❌ No trigger phrase found or direct prompt provided. Exiting gracefully."
+          echo "SKIP_EXECUTION=true" >> $GITHUB_ENV
+          exit 0
+        fi
+        
+        echo "✅ Trigger found! Context: $CONTEXT_INFO"
+        
+        # Create comprehensive prompt
+        mkdir -p /tmp/claude-action
+        cat > /tmp/claude-action/github-context-prompt.txt << EOF
         You are Claude Code, an AI assistant helping with GitHub workflows and code.
         
         Repository: ${{ github.repository }}
-        Context: $CONTEXT
+        Context: $CONTEXT_INFO
+        Event: ${{ github.event_name }}
         
         User Request:
-        $PROMPT_TEXT
+        $USER_REQUEST
+        
+        Please analyze the request and provide helpful assistance. You have access to repository tools and can help with:
+        - Code analysis and implementation
+        - GitHub workflows and automation
+        - Pull request reviews and feedback
+        - Issue resolution and bug fixes
+        - Documentation updates
+        - Testing and deployment
         
-        Please analyze the request and provide helpful assistance. You have access to repository tools and can help with code analysis, implementations, and GitHub workflows.
+        Respond naturally and helpfully to the user's request using the available tools.
         EOF
-          
-          PROMPT_PATH="/tmp/claude-action/github-context-prompt.txt"
-        elif [ ! -z "${{ inputs.prompt_file }}" ]; then
-          # Check if the prompt file exists
-          if [ ! -f "${{ inputs.prompt_file }}" ]; then
-            echo "::error::Prompt file '${{ inputs.prompt_file }}' does not exist."
-            exit 1
-          fi
-          PROMPT_PATH="${{ inputs.prompt_file }}"
-        else
-          mkdir -p /tmp/claude-action
-          PROMPT_PATH="/tmp/claude-action/prompt.txt"
-          echo "${{ inputs.prompt }}" > "$PROMPT_PATH"
-        fi
-
-        # Verify the prompt file is not empty
-        if [ ! -s "$PROMPT_PATH" ]; then
-          echo "::error::Prompt is empty. Please provide a non-empty prompt."
-          exit 1
-        fi
-
-        # Save the prompt path for the next step
-        echo "PROMPT_PATH=$PROMPT_PATH" >> $GITHUB_ENV
+        
+        echo "PROMPT_FILE=/tmp/claude-action/github-context-prompt.txt" >> $GITHUB_ENV
+        echo "SKIP_EXECUTION=false" >> $GITHUB_ENV
 
     - name: Run Claude Code
+      if: env.SKIP_EXECUTION != 'true'
       shell: bash
-      id: run_claude
       run: |
-        ALLOWED_TOOLS_ARG=""
-        if [ ! -z "${{ inputs.allowed_tools }}" ]; then
-          ALLOWED_TOOLS_ARG="--allowedTools ${{ inputs.allowed_tools }}"
+        echo "🚀 Running Claude Code with GitHub context..."
+        
+        # Build command arguments
+        CMD_ARGS=("-p" "--verbose" "--output-format" "stream-json")
+        
+        # Add timeout if specified
+        if [[ -n "${{ inputs.timeout_minutes }}" ]]; then
+          CMD_ARGS+=("--timeout" "${{ inputs.timeout_minutes }}m")
         fi
-
-        # Set a timeout to ensure the command doesn't run indefinitely
-        timeout_seconds=$((${{ inputs.timeout_minutes }} * 60))
-
-        if [ -z "${{ inputs.output_file }}" ]; then
-          # Run Claude Code and output to console
-          timeout $timeout_seconds claude \
-            -p \
-            --verbose \
-            --output-format stream-json \
-            "$(cat ${{ env.PROMPT_PATH }})" \
-            ${{ inputs.allowed_tools != '' && format('--allowedTools "{0}"', inputs.allowed_tools) || '' }}
-        else
-          # Run Claude Code and tee output to console and file
-          timeout $timeout_seconds claude \
-            -p \
-            --verbose \
-            --output-format stream-json \
-            "$(cat ${{ env.PROMPT_PATH }})" \
-            ${{ inputs.allowed_tools != '' && format('--allowedTools "{0}"', inputs.allowed_tools) || '' }} | tee output.txt
-
-          # Process output.txt into JSON in a separate step
-          jq -s '.' output.txt > output.json
-
-          # Extract the result from the last item in the array (system message)
-          jq -r '.[-1].result' output.json > "${{ inputs.output_file }}"
-
-          echo "Complete output saved to output.json, final response saved to ${{ inputs.output_file }}"
+        
+        # Add max turns if specified
+        if [[ -n "${{ inputs.max_turns }}" ]]; then
+          CMD_ARGS+=("--max-turns" "${{ inputs.max_turns }}")
+        fi
+        
+        # Add allowed tools (include GitHub tools by default)
+        TOOLS="mcp__github__get_issue,mcp__github__get_issue_comments,mcp__github__update_issue,mcp__github__search_issues,mcp__github__list_issues,mcp__github__create_comment,Read,Write,Edit,Bash"
+        if [[ -n "${{ inputs.allowed_tools }}" ]]; then
+          TOOLS="$TOOLS,${{ inputs.allowed_tools }}"
+        fi
+        CMD_ARGS+=("--allowedTools" "$TOOLS")
+        
+        # Add disallowed tools
+        if [[ -n "${{ inputs.disallowed_tools }}" ]]; then
+          CMD_ARGS+=("--disallowedTools" "${{ inputs.disallowed_tools }}")
         fi
+        
+        # Add custom instructions
+        if [[ -n "${{ inputs.custom_instructions }}" ]]; then
+          CMD_ARGS+=("--custom-instructions" "${{ inputs.custom_instructions }}")
+        fi
+        
+        # Read the prompt content
+        PROMPT_CONTENT=$(cat "${{ env.PROMPT_FILE }}")
+        
+        echo "📝 Executing: claude ${CMD_ARGS[*]} \"[prompt content]\""
+        
+        # Execute Claude Code with timeout
+        TIMEOUT_SECONDS=$((${{ inputs.timeout_minutes }} * 60))
+        timeout $TIMEOUT_SECONDS claude "${CMD_ARGS[@]}" "$PROMPT_CONTENT"
+        
+        echo "✅ Claude Code execution completed"
       env:
         ANTHROPIC_API_KEY: ${{ inputs.anthropic_api_key }}
         GITHUB_TOKEN: ${{ inputs.github_token }} 
diff --git a/.github/workflows/claude.yml b/.github/workflows/claude.yml
@@ -34,6 +34,4 @@ jobs:
         uses: ./.github/actions/claude-code-action
         with:
           anthropic_api_key: ${{ secrets.ANTHROPIC_API_KEY }}
-          github_token: ${{ secrets.GITHUB_TOKEN }}
-          install_github_mcp: "true"
 
