From 7a1b1e9944e21dabbac727051c6191a722a28340 Mon Sep 17 00:00:00 2001
From: divyansh42 <diagrawa@redhat.com>
Date: Wed, 9 Sep 2026 21:54:41 +0530
Subject: [PATCH] chore: add rebase and cherry-pick slash command workflows

- Update slash.yml to use peter-evans/slash-command-dispatch inline
  (matching tektoncd/pipeline) with retest, cherry-pick, and rebase
  commands scoped to tektoncd/cli
- Add rebase-command.yaml triggered by /rebase slash command, delegating
  to tektoncd/plumbing/_rebase-command.yaml with required permissions
- Update chatops_retest.yaml plumbing SHA to match tektoncd/pipeline

Signed-off-by: Divyansh Agarwal <diagrawa@redhat.com>
---
 .github/workflows/chatops_retest.yaml |  2 +-
 .github/workflows/rebase-command.yaml | 30 +++++++++++++++++++++
 .github/workflows/slash.yml           | 39 ++++++++++++++++++++-------
 3 files changed, 61 insertions(+), 10 deletions(-)
 create mode 100644 .github/workflows/rebase-command.yaml

diff --git a/.github/workflows/chatops_retest.yaml b/.github/workflows/chatops_retest.yaml
index f428dd76a1..8411c4521f 100644
--- a/.github/workflows/chatops_retest.yaml
+++ b/.github/workflows/chatops_retest.yaml
@@ -10,5 +10,5 @@ on:
 jobs:
   retest:
     name: Rerun Failed Actions
-    uses: tektoncd/plumbing/.github/workflows/_chatops_retest.yml@8441d6ffad5bf64f631ed0e67e46192fdedaca47
+    uses: tektoncd/plumbing/.github/workflows/_chatops_retest.yml@48c53b4e7f1e0bb206575b80eb9fcf07b5854907
     secrets: inherit
diff --git a/.github/workflows/rebase-command.yaml b/.github/workflows/rebase-command.yaml
new file mode 100644
index 0000000000..5dd7ab2493
--- /dev/null
+++ b/.github/workflows/rebase-command.yaml
@@ -0,0 +1,30 @@
+# Rebase Command Workflow
+#
+# This workflow is triggered by the /rebase slash command from the slash.yml workflow.
+# It automatically rebases a PR branch against its base branch and force pushes the result.
+#
+# Usage: Comment `/rebase` on an open pull request
+#
+# Security Notes:
+# - Only users with "write" permission can trigger this command (enforced in slash.yml)
+# - Cannot rebase PRs from forks (branch must be in tektoncd/cli)
+# - Uses CHATOPS_TOKEN to push rebased branches
+# - Uses --force-with-lease for safe force pushing
+
+name: Rebase Command
+
+on:
+  repository_dispatch:
+    types: [rebase-command]
+
+permissions:
+  contents: write
+  pull-requests: write
+  issues: write
+
+jobs:
+  rebase:
+    name: Rebase PR
+    uses: tektoncd/plumbing/.github/workflows/_rebase-command.yaml@4e60dd3785868521b0542134f5f57f2989c8883d
+    secrets:
+      CHATOPS_TOKEN: ${{ secrets.CHATOPS_TOKEN }}
diff --git a/.github/workflows/slash.yml b/.github/workflows/slash.yml
index ddaf9abc5e..2440a262ce 100644
--- a/.github/workflows/slash.yml
+++ b/.github/workflows/slash.yml
@@ -1,17 +1,38 @@
 name: Slash Command Routing
 
-permissions:
-  contents: read
-
 on:
   issue_comment:
     types: [created]
 
+permissions:
+  contents: read
+
 jobs:
   check_comments:
-    if: ${{ github.event.issue.pull_request }}
-    permissions:
-      issues: write # for peter-evans/slash-command-dispatch to create issue reaction
-      pull-requests: write # for peter-evans/slash-command-dispatch to create PR reaction
-    uses: tektoncd/plumbing/.github/workflows/_slash.yml@8441d6ffad5bf64f631ed0e67e46192fdedaca47
-    secrets: inherit
+    runs-on: ubuntu-latest
+    steps:
+    - name: route-land
+      uses: peter-evans/slash-command-dispatch@9bdcd7914ec1b75590b790b844aa3b8eee7c683a # v5.0.2
+      with:
+        token: ${{ secrets.CHATOPS_TOKEN }}
+        config: >
+          [
+            {
+              "command": "retest",
+              "permission": "write",
+              "issue_type": "pull-request",
+              "repository": "tektoncd/cli"
+            },
+            {
+              "command": "cherry-pick",
+              "permission": "write",
+              "issue_type": "pull-request",
+              "repository": "tektoncd/cli"
+            },
+            {
+              "command": "rebase",
+              "permission": "write",
+              "issue_type": "pull-request",
+              "repository": "tektoncd/cli"
+            }
+          ]