ci(small): fix integer expression error in cleanup-branches script (#9565)

Co-authored-by: google-labs-jules[bot] <161369871+google-labs-jules[bot]@users.noreply.github.com>
Co-authored-by: arii <342438+arii@users.noreply.github.com>

Author: arii

.github/workflows/comment-ops.yml

@@ -37,7 +37,7 @@ jobs:
           # Use case-insensitive grep and ensure outputs are always set if matched.
           # We check for commands starting at the beginning of a line to avoid accidental triggers
           # from quotes or descriptive text mentioning the bots.
-          if echo "$BODY" | grep -qiE "^@gemini-bot"; then echo "is_review=true" >> $GITHUB_OUTPUT; fi
+          if echo "$BODY" | grep -qiE "(^|\r?\n)@(gemini-bot|gemini-review)"; then echo "is_review=true" >> $GITHUB_OUTPUT; fi
           if echo "$BODY" | grep -qiE "(^|\r?\n)@pr-squash"; then echo "is_squash=true" >> $GITHUB_OUTPUT; fi
           if echo "$BODY" | grep -qiE "(^|\r?\n)@conflict-resolve"; then echo "is_resolve=true" >> $GITHUB_OUTPUT; fi
           if echo "$BODY" | grep -qiE "^@gemini-triage"; then echo "is_triage=true" >> $GITHUB_OUTPUT; fi
@@ -46,6 +46,11 @@ jobs:
           if echo "$BODY" | grep -qiE "^@gemini-enrich"; then echo "is_enrich=true" >> $GITHUB_OUTPUT; fi
           if echo "$BODY" | grep -qiE "^@gemini-help"; then echo "is_help=true" >> $GITHUB_OUTPUT; fi
 
+          # Set consolidated trigger flag for status jobs
+          if echo "$BODY" | grep -qiE "(^|\r?\n)@(gemini-bot|gemini-review|pr-squash|conflict-resolve|gemini-triage|gemini-coder|create-review-issues|gemini-enrich|gemini-help)"; then
+            echo "is_command_triggered=true" >> $GITHUB_OUTPUT
+          fi
+
   init-status:
     needs: [router]
     if: needs.router.outputs.is_command_triggered == 'true'

scripts/cleanup-branches.sh

@@ -5,38 +5,27 @@ DAYS_OLD=1
 EXCLUDE_REGEX="^(gh-pages|leader|HEAD)$"
 REMOTE="origin"
 
-# 1. Update references and prune tracking branches that no longer exist on remote
 git fetch --prune
 
-# Calculate cutoff timestamp
 CUTOFF=$(date -d "$DAYS_OLD days ago" +%s)
-# Note: On macOS, use: CUTOFF=$(date -v-${DAYS_OLD}d +%s)
 
 echo "Checking for branches older than $DAYS_OLD days with no open PRs..."
 
-# 2. Iterate through remote branches
 git for-each-ref --format='%(committerdate:unix) %(refname:short)' refs/remotes/$REMOTE/ | while read -r time ref; do
     branch_name="${ref#$REMOTE/}"
 
-    # Skip excluded branches
     if [[ $branch_name =~ $EXCLUDE_REGEX ]]; then
         continue
     fi
 
-    # Check if branch is older than the cutoff
     if [ "$time" -lt "$CUTOFF" ]; then
-        
-        # Check for open Pull Requests using GitHub CLI
-        PR_COUNT=$(gh pr list --head "$branch_name" --state open --json number --jq 'length' 2>/dev/null)
-        
-        # If PR_COUNT is 0 (or command fails, assuming no PR), proceed with deletion
-        if [ "$PR_COUNT" -eq 0 ] || [ -z "$PR_COUNT" ]; then
+        PR_COUNT=$(gh pr list --head "$branch_name" --state open --json number --jq 'length' 2>/dev/null || echo 0)
+
+        if [ "${PR_COUNT:-0}" -eq 0 ]; then
             echo "Deleting stale branch: $branch_name"
 
-            # Delete from remote
             git push $REMOTE --delete "$branch_name"
 
-            # Delete local branch if it exists
             if git show-ref --verify --quiet "refs/heads/$branch_name"; then
                 git branch -D "$branch_name"
             fi
@@ -45,4 +34,3 @@ git for-each-ref --format='%(committerdate:unix) %(refname:short)' refs/remotes/
         fi
     fi
 done
-

scripts/gemini-client.ts

@@ -350,22 +350,25 @@ export async function generateContentWithFallback({
       const errorMessage = (error as Error).message || ''
       const errorStatus = (error as { status?: number }).status
 
-      const isNotFound = errorMessage.includes('404') || errorStatus === 404
-      const isBadRequest = errorMessage.includes('400') || errorStatus === 400 // Sometimes invalid model is 400
-      const isRateLimited = errorMessage.includes('429') || errorStatus === 429
-
-      if (isNotFound || isBadRequest || isRateLimited) {
-        let reason = 'Unknown Error'
-        if (isRateLimited) {
-          reason = 'Rate Limited'
-        } else if (isNotFound) {
-          reason = 'Not Found'
-        } else if (isBadRequest) {
-          reason = 'Invalid Request'
-        }
-        const details = reason === 'Unknown Error' ? `: ${errorMessage}` : ''
+      const RETRIABLE_MAP: Record<number, string> = {
+        400: 'Invalid Request',
+        404: 'Not Found',
+        429: 'Rate Limited',
+        500: 'Infrastructure Issue',
+        503: 'Infrastructure Issue',
+      }
+
+      const retriableCode =
+        Object.keys(RETRIABLE_MAP)
+          .map(Number)
+          .find(
+            (code) => errorStatus === code || errorMessage.includes(String(code))
+          )
+
+      if (retriableCode) {
+        const reason = RETRIABLE_MAP[retriableCode] || 'Unknown Retriable Error'
         console.warn(
-          `Model ${modelName} failed (${reason}${details}). Trying next model...`
+          `Model ${modelName} failed (${reason}: ${errorMessage}). Trying next model...`
         )
         continue
       }