Adds cp upgrade

Author: Steven Smith

.github/workflows/cherry-pick.yml

@@ -12,9 +12,16 @@ jobs:
   cherry-pick:
     runs-on: ubuntu-latest
     if: |
+      github.event_name == 'issue_comment' &&
       github.event.issue.pull_request != null &&
-      startsWith(github.event.comment.body, '/cherry-pick')
+      (startsWith(github.event.comment.body, '/cherry-pick') || contains(github.event.comment.body, '/cherry-pick'))
     steps:
+      - name: Check job condition
+        run: |
+          echo "Event name: ${{ github.event_name }}"
+          echo "Comment body: ${{ github.event.comment.body }}"
+          echo "Is PR: ${{ github.event.issue.pull_request != null }}"
+          echo "Comment starts with /cherry-pick: ${{ startsWith(github.event.comment.body, '/cherry-pick') }}"
       - name: Check out repository
         uses: actions/checkout@v4
         with:
@@ -26,25 +33,42 @@ jobs:
           git config --global user.name "github-actions[bot]"
           git config --global user.email "github-actions[bot]@users.noreply.github.com"
 
+      - name: Debug event context
+        if: github.event_name == 'issue_comment'
+        run: |
+          echo "Event type: ${{ github.event_name }}"
+          echo "Comment body: ${{ github.event.comment.body }}"
+          echo "Issue number: ${{ github.event.issue.number }}"
+          echo "Is PR: ${{ github.event.issue.pull_request != null }}"
+          echo "PR URL: ${{ github.event.issue.pull_request.url }}"
+
       - name: Get PR information
         id: pr_info
+        continue-on-error: true
         uses: actions/github-script@v7
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}
           script: |
             const issueNumber = context.payload.issue.number;
-            const { data: pr } = await github.rest.pulls.get({
-              owner: context.repo.owner,
-              repo: context.repo.repo,
-              pull_number: issueNumber,
-            });
             
-            core.setOutput('pr_number', issueNumber.toString());
-            core.setOutput('base_branch', pr.base.ref);
-            core.setOutput('head_branch', pr.head.ref);
-            core.setOutput('head_sha', pr.head.sha);
-            core.setOutput('title', pr.title || '');
-            core.setOutput('body', pr.body || '');
+            try {
+              const { data: pr } = await github.rest.pulls.get({
+                owner: context.repo.owner,
+                repo: context.repo.repo,
+                pull_number: issueNumber,
+              });
+              
+              core.setOutput('pr_number', issueNumber.toString());
+              core.setOutput('base_branch', pr.base.ref);
+              core.setOutput('head_branch', pr.head.ref);
+              core.setOutput('head_sha', pr.head.sha);
+              core.setOutput('title', pr.title || '');
+              core.setOutput('body', pr.body || '');
+            } catch (error) {
+              core.setOutput('pr_number', issueNumber.toString());
+              core.setFailed(`Failed to get PR information: ${error.message}`);
+              throw error;
+            }
 
       - name: Extract target branch
         id: extract
@@ -142,6 +166,114 @@ jobs:
           done
           
           echo "✅ Successfully cherry-picked all commits"
+<<<<<<< Updated upstream
+=======
+          echo "CHERRY_PICK_SUCCESS=true" >> $GITHUB_ENV
+
+      - name: Post error comment on failure
+        if: always() && (failure() || env.CHERRY_PICK_ERROR != '' || env.EXTRACT_ERROR != '' || env.VALIDATE_ERROR != '' || steps.pr_info.outcome == 'failure')
+        uses: actions/github-script@v7
+        with:
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          script: |
+            const prNumber = parseInt('${{ steps.pr_info.outputs.pr_number }}') || context.payload.issue.number;
+            const prInfoFailed = '${{ steps.pr_info.outcome }}' === 'failure';
+            const targetBranch = '${{ steps.validate_branch.outputs.branch_name }}' || '${{ steps.extract.outputs.branch }}' || 'unknown';
+            const extractError = '${{ env.EXTRACT_ERROR }}';
+            const validateError = '${{ env.VALIDATE_ERROR }}';
+            const cherryPickError = '${{ env.CHERRY_PICK_ERROR }}';
+            const failedCommit = '${{ env.FAILED_COMMIT }}' || 'unknown';
+            const failedCommitMsg = '${{ env.FAILED_COMMIT_MSG }}' || '';
+            const conflictFiles = '${{ env.CONFLICT_FILES }}';
+            const modifyDelete = '${{ env.MODIFY_DELETE }}';
+            const contentConflicts = '${{ env.CONTENT_CONFLICTS }}';
+            const errorDetails = `${{ env.CHERRY_PICK_ERROR_DETAILS }}` || cherryPickError || validateError || extractError;
+            
+            let errorMessage = `❌ **Cherry-pick failed**\n\n`;
+            
+            // Handle PR info failure
+            if (prInfoFailed) {
+              errorMessage += `**Error:** Failed to retrieve PR information.\n\n`;
+              errorMessage += `This might happen if:\n`;
+              errorMessage += `- The comment was made on an issue instead of a pull request\n`;
+              errorMessage += `- The PR number could not be determined\n`;
+              errorMessage += `- There was an API error\n\n`;
+              errorMessage += `Please ensure you're commenting on a pull request, not an issue.\n`;
+            }
+            // Handle different error types
+            else if (extractError) {
+              errorMessage += `**Error:** ${extractError}\n\n`;
+              errorMessage += `Please specify a target branch: \`/cherry-pick <branch-name>\`\n`;
+            } else if (validateError) {
+              errorMessage += `**Error:** ${validateError}\n\n`;
+              errorMessage += `Please verify that the branch exists and try again.\n`;
+            } else if (cherryPickError) {
+              errorMessage += `**Target branch:** \`${targetBranch}\`\n`;
+              errorMessage += `**Failed commit:** \`${failedCommit}\`\n`;
+              
+              if (failedCommitMsg) {
+                errorMessage += `**Commit message:** ${failedCommitMsg}\n\n`;
+              }
+              
+              // Format conflicts
+              if (modifyDelete || contentConflicts || conflictFiles) {
+                errorMessage += `## Merge Conflicts Detected\n\n`;
+                
+                if (contentConflicts) {
+                  const files = contentConflicts.split(',').filter(f => f);
+                  if (files.length > 0) {
+                    errorMessage += `### Content conflicts (files modified in both branches):\n`;
+                    files.forEach(file => {
+                      errorMessage += `- \`${file}\`\n`;
+                    });
+                    errorMessage += `\n`;
+                  }
+                }
+                
+                if (modifyDelete) {
+                  const files = modifyDelete.split(',').filter(f => f);
+                  if (files.length > 0) {
+                    errorMessage += `### Modify/delete conflicts (files deleted in target branch but modified in PR):\n`;
+                    files.forEach(file => {
+                      errorMessage += `- \`${file}\`\n`;
+                    });
+                    errorMessage += `\n`;
+                  }
+                }
+                
+                errorMessage += `## Next Steps\n\n`;
+                errorMessage += `This cherry-pick requires manual resolution. You can:\n\n`;
+                errorMessage += `1. Create a manual cherry-pick branch from \`${targetBranch}\`\n`;
+                errorMessage += `2. Resolve the conflicts manually\n`;
+                errorMessage += `3. Create a PR with the resolved changes\n\n`;
+                errorMessage += `Or use the workflow run logs for detailed conflict information.\n`;
+              } else if (errorDetails) {
+                errorMessage += `\n**Error details:**\n\`\`\`\n${errorDetails.substring(0, 2000)}\n\`\`\`\n`;
+              }
+            } else {
+              errorMessage += `**Error:** An unexpected error occurred during cherry-pick.\n\n`;
+              if (errorDetails) {
+                errorMessage += `**Error details:**\n\`\`\`\n${errorDetails.substring(0, 2000)}\n\`\`\`\n`;
+              }
+            }
+            
+            // Add link to workflow run
+            const workflowRunUrl = `${context.serverUrl}/${context.repo.owner}/${context.repo.repo}/actions/runs/${context.runId}`;
+            errorMessage += `\n---\n`;
+            errorMessage += `📋 [View workflow run](${workflowRunUrl}) for full details`;
+            
+            await github.rest.issues.createComment({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              issue_number: prNumber,
+              body: errorMessage,
+            });
+            
+            // Fail the workflow
+            if (prInfoFailed || cherryPickError || validateError || extractError) {
+              core.setFailed('Cherry-pick failed');
+            }
+>>>>>>> Stashed changes
 
       - name: Push cherry-pick branch
         run: |