updates

Author: trask

.github/scripts/pr-triage/authorize.py

@@ -7,6 +7,9 @@
 command name as a job output so the downstream worker job can gate on it.
 """
 
+# Tokens visible to this script: GITHUB_TOKEN (read + pull-requests:write).
+# NOT visible: COPILOT_GITHUB_TOKEN, OTELBOT_*.
+
 from __future__ import annotations
 
 import json

.github/scripts/pr-triage/poster.py

@@ -9,6 +9,11 @@
 otelbot token.
 """
 
+# Tokens visible to this script: otelbot installation token (write
+# access to this repo via the GitHub App).
+# NOT visible: COPILOT_GITHUB_TOKEN. Do not execute anything from the
+# PR working tree here; this script must remain trusted-code-only.
+
 from __future__ import annotations
 
 import argparse

.github/scripts/pr-triage/triage_helpers.py

@@ -51,7 +51,14 @@ def parsed_command() -> tuple[str, str]:
     comment = payload.get("comment") or {}
     body = str(comment.get("body") or "").strip()
     first_line = body.splitlines()[0].strip() if body else ""
-    requested = first_line.split(maxsplit=1)[0].lower() if first_line else ""
+    # Hard cap on length to avoid echoing pathological input back into a
+    # PR comment if a later step formats `requested` into Markdown.
+    raw = first_line.split(maxsplit=1)[0] if first_line else ""
+    if len(raw) > 32 or not raw.startswith("/"):
+        return "", ""
+    requested = raw.lower()
+    if requested != "/help" and requested not in COMMANDS:
+        return requested, ""
     command = COMMANDS.get(requested, "")
     return requested, command
 

.github/scripts/pr-triage/worker_copilot.py

@@ -13,6 +13,12 @@
 runs Copilot only.
 """
 
+# Tokens visible to this script: GITHUB_TOKEN (read-only, used by
+# Copilot CLI's gh subprocesses) and COPILOT_GITHUB_TOKEN (used by
+# Copilot CLI itself; scrubbed from its child processes by Copilot).
+# NOT visible: OTELBOT_*. Do not invoke ./gradlew or any other
+# PR-controlled build tooling here.
+
 from __future__ import annotations
 
 import argparse

.github/scripts/pr-triage/worker_gradle.py

@@ -14,6 +14,11 @@
 `copilot-worker` job and signals `needs-copilot=true`.
 """
 
+# Tokens visible to this script: GITHUB_TOKEN (read-only, also visible to
+# any PR-controlled Gradle plugins that this job runs).
+# NOT visible: COPILOT_GITHUB_TOKEN, OTELBOT_*. Do not add them to this
+# job: any malicious build script could exfiltrate them.
+
 from __future__ import annotations
 
 import argparse

.github/workflows/pr-triage-comments.yml

@@ -142,20 +142,33 @@ jobs:
           name: pr-triage-work-gradle
           path: ${{ runner.temp }}/gradle-in
 
-      - name: Run copilot-phase worker
+      - name: Run copilot-phase worker (review)
+        if: needs.authorize-command.outputs.command == 'review'
         env:
+          # GITHUB_TOKEN is also set so Copilot CLI's `gh` subprocesses use the
+          # read-only job token rather than falling back to the privileged
+          # COPILOT_GITHUB_TOKEN. Copilot CLI scrubs both names from the
+          # environment of the children it spawns.
           GH_TOKEN: ${{ github.token }}
           COPILOT_GITHUB_TOKEN: ${{ secrets.COPILOT_GITHUB_TOKEN }}
           PR_TRIAGE_REPO_ROOT: ${{ github.workspace }}
         run: |
           mkdir -p "$RUNNER_TEMP/work"
           touch "$RUNNER_TEMP/work/.placeholder"
-          IN_DIR_ARG=""
-          if [[ "${{ needs.authorize-command.outputs.command }}" == "fix" ]]; then
-            IN_DIR_ARG="--in-dir $RUNNER_TEMP/gradle-in"
-          fi
-          # shellcheck disable=SC2086
-          python3 "$RUNNER_TEMP/pr-triage-trusted/worker_copilot.py" --out-dir "$RUNNER_TEMP/work" $IN_DIR_ARG
+          python3 "$RUNNER_TEMP/pr-triage-trusted/worker_copilot.py" --out-dir "$RUNNER_TEMP/work"
+
+      - name: Run copilot-phase worker (fix)
+        if: needs.authorize-command.outputs.command == 'fix'
+        env:
+          GH_TOKEN: ${{ github.token }}
+          COPILOT_GITHUB_TOKEN: ${{ secrets.COPILOT_GITHUB_TOKEN }}
+          PR_TRIAGE_REPO_ROOT: ${{ github.workspace }}
+        run: |
+          mkdir -p "$RUNNER_TEMP/work"
+          touch "$RUNNER_TEMP/work/.placeholder"
+          python3 "$RUNNER_TEMP/pr-triage-trusted/worker_copilot.py" \
+            --out-dir "$RUNNER_TEMP/work" \
+            --in-dir "$RUNNER_TEMP/gradle-in"
 
       - name: Upload copilot work bundle
         if: always()
@@ -180,6 +193,7 @@ jobs:
     permissions:
       contents: read
       pull-requests: write
+      actions: write
     env:
       PR_NUMBER: ${{ github.event.issue.number }}
     steps:
@@ -220,4 +234,3 @@ jobs:
           GH_TOKEN: ${{ steps.otelbot-token.outputs.token }}
           PR_TRIAGE_REPO_ROOT: ${{ github.workspace }}
         run: python3 "$RUNNER_TEMP/pr-triage-trusted/poster.py" --in-dir "$RUNNER_TEMP/work"
-