Remove timestamp from CI branch name and implement 1:1 PR relationship

Co-authored-by: pranaygp <[email protected]>

Author: Copilot

.github/workflows/trigger-ci.yml

@@ -82,15 +82,14 @@ jobs:
         with:
           fetch-depth: 0
 
-      - name: Create CI branch and PR
+      - name: Create or update CI branch and PR
         if: steps.check-permissions.outputs.result == 'true'
         uses: actions/github-script@v7
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}
           script: |
             const prDetails = ${{ steps.pr-details.outputs.result }};
-            const timestamp = new Date().getTime();
-            const ciBranchName = `ci-test/${prDetails.number}-${timestamp}`;
+            const ciBranchName = `ci-test/${prDetails.number}`;
             
             // Add remote for the external fork if it's from a fork
             if (prDetails.head_repo_full_name !== `${context.repo.owner}/${context.repo.repo}`) {
@@ -102,17 +101,51 @@ jobs:
               await exec.exec('git', ['checkout', '-b', ciBranchName, `origin/${prDetails.head_ref}`]);
             }
             
-            // Push the new branch to origin
-            await exec.exec('git', ['push', 'origin', ciBranchName]);
+            // Push the branch to origin (force push to update if exists)
+            await exec.exec('git', ['push', '-f', 'origin', ciBranchName]);
             
-            // Create a draft PR
-            const newPR = await github.rest.pulls.create({
+            // Check if a CI PR already exists for this original PR
+            const existingPRs = await github.rest.pulls.list({
               owner: context.repo.owner,
               repo: context.repo.repo,
-              title: `[CI Test] ${prDetails.title}`,
-              head: ciBranchName,
-              base: prDetails.base_ref,
-              body: `🤖 **Automated CI Test PR**
+              state: 'open',
+              head: `${context.repo.owner}:${ciBranchName}`
+            });
+            
+            let ciPR;
+            let isNewPR = false;
+            
+            if (existingPRs.data.length > 0) {
+              // Update existing PR
+              ciPR = existingPRs.data[0];
+              await github.rest.pulls.update({
+                owner: context.repo.owner,
+                repo: context.repo.repo,
+                pull_number: ciPR.number,
+                body: `🤖 **Automated CI Test PR**
+              
+This is an automated PR created to run CI tests for PR #${prDetails.number} by @${prDetails.user}.
+
+**Original PR:** #${prDetails.number}
+**Last triggered by:** @${context.actor}
+**Source branch:** \`${prDetails.head_ref}\`
+**Source SHA:** \`${prDetails.head_sha}\`
+
+⚠️ **This PR will be automatically closed once CI completes.** Do not merge this PR.
+
+---
+_This PR was last updated in response to the \`/run-ci\` command in #${prDetails.number}_`
+              });
+            } else {
+              // Create a new draft PR
+              isNewPR = true;
+              ciPR = await github.rest.pulls.create({
+                owner: context.repo.owner,
+                repo: context.repo.repo,
+                title: `[CI Test] ${prDetails.title}`,
+                head: ciBranchName,
+                base: prDetails.base_ref,
+                body: `🤖 **Automated CI Test PR**
               
 This is an automated PR created to run CI tests for PR #${prDetails.number} by @${prDetails.user}.
 
@@ -125,29 +158,31 @@ This is an automated PR created to run CI tests for PR #${prDetails.number} by @
 
 ---
 _This PR was created in response to the \`/run-ci\` command in #${prDetails.number}_`,
-              draft: true
-            });
+                draft: true
+              });
+              
+              // Add labels to the new PR
+              await github.rest.issues.addLabels({
+                owner: context.repo.owner,
+                repo: context.repo.repo,
+                issue_number: ciPR.number,
+                labels: ['ci-test', 'automated']
+              });
+            }
 
             // Comment on the original PR
+            const prAction = isNewPR ? 'created' : 'updated';
             await github.rest.issues.createComment({
               owner: context.repo.owner,
               repo: context.repo.repo,
               issue_number: context.issue.number,
-              body: `✅ CI test triggered by @${context.actor}!
+              body: `✅ CI test ${prAction} by @${context.actor}!
 
-CI is now running in draft PR #${newPR.data.number}. You can monitor the progress there.
+CI is now running in draft PR #${ciPR.number}. You can monitor the progress there.
 
 Once the tests complete, you can review the results and the draft PR will be automatically closed.`
             });
 
-            // Add label to the new PR
-            await github.rest.issues.addLabels({
-              owner: context.repo.owner,
-              repo: context.repo.repo,
-              issue_number: newPR.data.number,
-              labels: ['ci-test', 'automated']
-            });
-            
-            core.setOutput('ci_pr_number', newPR.data.number);
+            core.setOutput('ci_pr_number', ciPR.number);
             core.setOutput('ci_branch_name', ciBranchName);