Merge branch 'main' into fix_bedrock_proxy

Author: LouisClt

.changeset/fix-anthropic-custom-model-id-fallback.md

@@ -0,0 +1,11 @@
+---
+"zoo-code": patch
+---
+
+Fix Anthropic provider silently replacing a custom/unrecognized `apiModelId` with the hardcoded default model.
+
+`AnthropicHandler.getModel()` coerced any `apiModelId` not present in the static `anthropicModels` table down to `anthropicDefaultModelId` ("claude-sonnet-4-5"), and that coerced id was what actually got sent as `model` in the API request -- silently ignoring a user-configured custom model name (e.g. a custom Anthropic-compatible deployment or proxy). This produced confusing "model does not exist" errors for the default model instead of the model the user actually selected (#418).
+
+The same fallback also affected capability lookups used to build the `thinking` request parameter: an unrecognized id fell back to the default model's info, which can be from an older model generation with a different API contract, causing the request to use the legacy `thinking: {type: "enabled", budget_tokens}` shape and get rejected with a 400 by models that require `{type: "adaptive"}`.
+
+The model id sent to the API now always honors a user-configured `apiModelId`. For unrecognized values, capabilities are best-effort guessed by matching known model-family substrings (mirroring the existing `BedrockHandler.guessModelInfoFromId` heuristic) instead of defaulting to `anthropicDefaultModelId`'s info.

.github/workflows/cli-release.yml

@@ -13,6 +13,11 @@ on:
         type: boolean
         default: false
 
+# Least privilege: the release job escalates to contents: write via its own
+# job-level permissions block.
+permissions:
+  contents: read
+
 jobs:
   # Build CLI for each platform.
   build:

.github/workflows/code-qa.yml

@@ -9,7 +9,56 @@ on:
     merge_group:
         types: [checks_requested]
 
+# Least privilege: every job below escalates only where it needs to.
+permissions:
+    contents: read
+
 jobs:
+    dependency-review:
+        runs-on: ubuntu-latest
+        # Only meaningful for PRs — validates the dependency diff of the pull
+        # request against GitHub's advisory database before merge.
+        if: github.event_name == 'pull_request'
+        steps:
+            - name: Checkout code
+              uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4
+              with:
+                  # This job never pushes — don't persist the GITHUB_TOKEN.
+                  persist-credentials: false
+            - name: Dependency review
+              uses: actions/dependency-review-action@a1d282b36b6f3519aa1f3fc636f609c47dddb294 # v5.0.0
+
+    invisible-chars:
+        runs-on: ubuntu-latest
+        # Reject invisible / homoglyph Unicode that GitHub's diff UI renders
+        # invisibly and most editors hide. These compile fine, which is the
+        # risk: identifier-splitting, string-literal injection, and the
+        # "Trojan Source" bidi-override attack (U+202A-U+202E). Scanning raw
+        # bytes catches them in strings, identifiers, and comments alike.
+        steps:
+            - name: Checkout code
+              uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4
+              with:
+                  # This job never pushes — don't persist the GITHUB_TOKEN.
+                  persist-credentials: false
+            - name: Reject invisible / homoglyph Unicode
+              run: |
+                  # zero-width (U+200B-200F), word joiner (U+2060), BOM (U+FEFF),
+                  # bidi overrides (U+202A-202E), soft hyphen (U+00AD).
+                  # Covers source, release-adjacent executable scripts
+                  # (*.sh / *.cjs / *.cts / *.mts), and the executable shell
+                  # blocks inside GitHub workflow/action YAML.
+                  if grep -rnP '[\x{200B}-\x{200F}\x{202A}-\x{202E}\x{2060}\x{FEFF}\x{00AD}]' \
+                      --include='*.ts' --include='*.tsx' --include='*.js' --include='*.mjs' \
+                      --include='*.cjs' --include='*.cts' --include='*.mts' --include='*.sh' \
+                      --include='*.yml' --include='*.yaml' \
+                      --exclude-dir=node_modules --exclude-dir=dist --exclude-dir=out \
+                      --exclude-dir=coverage --exclude-dir=.turbo --exclude-dir=.vinxi \
+                      src webview-ui packages apps .github; then
+                      echo "::error::Found invisible or homoglyph Unicode characters (zero-width / bidi-override / BOM / soft hyphen)"
+                      exit 1
+                  fi
+
     check-translations:
         runs-on: ubuntu-latest
         steps:

.github/workflows/codeql.yml

@@ -7,6 +7,11 @@ on:
   schedule:
     - cron: '24 19 * * 3'
 
+# Least privilege: the analyze job escalates to security-events: write via its
+# own job-level permissions block.
+permissions:
+  contents: read
+
 jobs:
   analyze:
     name: Analyze (${{ matrix.language }})
@@ -47,7 +52,7 @@ jobs:
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@dd903d2e4f5405488e5ef1422510ee31c8b32357 # v3
+      uses: github/codeql-action/init@411c4c9a36b3fca4d674f06b6396b2c6d23522c6 # v3
       with:
         languages: ${{ matrix.language }}
         build-mode: ${{ matrix.build-mode }}
@@ -75,6 +80,6 @@ jobs:
         exit 1
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@dd903d2e4f5405488e5ef1422510ee31c8b32357 # v3
+      uses: github/codeql-action/analyze@411c4c9a36b3fca4d674f06b6396b2c6d23522c6 # v3
       with:
         category: "/language:${{matrix.language}}"

.github/workflows/e2e.yml

@@ -7,6 +7,9 @@ on:
     merge_group:
         types: [checks_requested]
 
+permissions:
+    contents: read
+
 jobs:
     e2e-mock:
         runs-on: ubuntu-latest

.github/workflows/label-pr-review-state.yml

@@ -26,7 +26,7 @@ jobs:
         with:
           script: |
             const { owner, repo } = context.repo;
-            const stateLabels = ['awaiting-author', 'awaiting-review'];
+            const stateLabels = ['awaiting-author', 'awaiting-review', 'has-conflicts'];
 
             // When triggered by a single PR event, only reconcile that PR.
             // The hourly schedule and workflow_dispatch reconcile all open PRs.
@@ -43,9 +43,29 @@ jobs:
               });
             }
 
+            // Only a `pull_request`/`pull_request_review` run that was itself triggered
+            // FROM a fork gets a read-only GITHUB_TOKEN — label mutations there 403 with
+            // "Resource not accessible by integration". `schedule` and `workflow_dispatch`
+            // runs always execute in the base repo's context with a read/write token, even
+            // when the PR they're reconciling happens to come from a fork, so they must NOT
+            // be skipped or fork PRs would never get stale labels cleaned up.
+            // See: https://docs.github.com/en/actions/concepts/security/github_token
+            const isReadOnlyRun = Boolean(context.payload.pull_request) &&
+              context.payload.pull_request.head?.repo?.owner?.login !== owner;
+
+            function isForkPR(pr) {
+              return pr.head?.repo?.owner?.login && pr.head.repo.owner.login !== owner;
+            }
+
             // Strips stateLabels from a PR, optionally keeping one.
             // Also removes stale-awaiting-author when not keeping awaiting-author.
+            // Only skipped when this run's own token is read-only (see isReadOnlyRun) —
+            // schedule/workflow_dispatch runs reconcile fork PRs normally.
             async function reconcileLabels(pr, desiredLabel) {
+              if (isReadOnlyRun && isForkPR(pr)) {
+                core.info(`PR #${pr.number}: fork PR on a read-only run — skipping label mutation`);
+                return;
+              }
               const currentLabels = new Set(pr.labels.map(l => l.name));
               for (const label of stateLabels) {
                 if (label !== desiredLabel && currentLabels.has(label)) {
@@ -105,6 +125,22 @@ jobs:
                   continue;
                 }
 
+                // `mergeable`/`mergeable_state` are only returned by the single-PR GET
+                // endpoint, and are computed asynchronously by GitHub — a PR fetched via
+                // pulls.list (schedule/workflow_dispatch runs) never has them, and even a
+                // single-PR fetch can return `null`/"unknown" if the merge check hasn't
+                // finished yet. Re-fetch the single PR to get a fresh value, and treat
+                // "unknown" as not-yet-computed rather than as conflicting.
+                const prDetail = prNumber
+                  ? pr
+                  : (await github.rest.pulls.get({ owner, repo, pull_number: pr.number })).data;
+
+                if (prDetail.mergeable === false && prDetail.mergeable_state === 'dirty') {
+                  core.info(`PR #${pr.number}: has merge conflicts — labeling has-conflicts`);
+                  await reconcileLabels(pr, 'has-conflicts');
+                  continue;
+                }
+
                 // Check CI status for required checks on the PR's head commit only.
                 // Scoping to required checks avoids advisory checks (e.g. codecov/patch)
                 // incorrectly blocking label assignment on otherwise-ready PRs.
@@ -117,9 +153,28 @@ jobs:
                   }),
                 ]);
 
+                // listForRef returns every check run ever recorded on the ref, including
+                // stale superseded ones (e.g. a failed run later re-run green). Branch
+                // protection and the PR UI only consider the latest run per check name, so
+                // reduce to that before evaluating — otherwise a single stale failure makes
+                // ciFailed true forever and state labels never come back. See issue #884.
+                //
+                // Unlike listReviews (which documents oldest-first order), listForRef's
+                // ordering is unspecified, so we pick the latest by run.id — GitHub assigns
+                // monotonically increasing IDs, and id is never null (a freshly re-queued
+                // run can have started_at: null, which would lose a string comparison
+                // against an older completed run's timestamp).
+                const latestByName = new Map();
+                for (const run of checkRuns) {
+                  const prev = latestByName.get(run.name);
+                  if (!prev || run.id > prev.id) {
+                    latestByName.set(run.name, run);
+                  }
+                }
+
                 // Filter to required checks only (or all checks if rules unavailable).
                 // Always exclude this workflow's own run to avoid self-referential loops.
-                const relevantRuns = checkRuns.filter(run => {
+                const relevantRuns = [...latestByName.values()].filter(run => {
                   if (run.name === 'Reconcile PR review state labels') return false;
                   return requiredCheckNames ? requiredCheckNames.has(run.name) : true;
                 });

.github/workflows/marketplace-publish.yml

@@ -6,6 +6,11 @@ on:
       - "v*.*.*"
   workflow_dispatch:
 
+# Least privilege: publish-stable escalates to contents: write via its own
+# job-level permissions block.
+permissions:
+  contents: read
+
 jobs:
   check-pr-approval:
     runs-on: ubuntu-latest

.github/workflows/nightly-publish.yml

@@ -41,7 +41,21 @@ jobs:
             exit 1
           fi
 
+      - name: Skip if this push is a release merge
+        id: release-check
+        run: |
+          commit_subject=$(git log -1 --format=%s)
+          skip=false
+
+          if [[ "$commit_subject" =~ ^chore:\ prepare\ v[0-9]+\.[0-9]+\.[0-9]+\ release ]]; then
+            echo "Commit '${commit_subject}' looks like a release-prep merge; skipping nightly pre-release."
+            skip=true
+          fi
+
+          echo "skip=${skip}" >> "$GITHUB_OUTPUT"
+
       - name: Set pre-release version
+        if: steps.release-check.outputs.skip != 'true'
         id: version
         env:
           RUN_NUMBER: ${{ github.run_number }}
@@ -61,13 +75,15 @@ jobs:
           EOF
 
       - name: Build workspace packages
+        if: steps.release-check.outputs.skip != 'true'
         env:
           PKG_RELEASE_CHANNEL: prerelease
         run: |
           pnpm --filter @roo-code/build build
           pnpm --filter @roo-code/vscode-webview build
 
       - name: Package pre-release VSIX
+        if: steps.release-check.outputs.skip != 'true'
         env:
           POSTHOG_API_KEY: ${{ secrets.POSTHOG_API_KEY }}
           PKG_RELEASE_CHANNEL: prerelease
@@ -76,6 +92,7 @@ jobs:
           pnpm --filter ./src exec vsce package --pre-release --no-dependencies --out ../bin
 
       - name: Verify VSIX contents
+        if: steps.release-check.outputs.skip != 'true'
         env:
           VERSION_NUMBER: ${{ steps.version.outputs.number }}
         run: |
@@ -87,6 +104,7 @@ jobs:
           grep -q "extension/webview-ui/audio/celebration.wav" /tmp/zoo-code-vsix-contents.txt
 
       - name: Validate packaged manifest identity
+        if: steps.release-check.outputs.skip != 'true'
         env:
           VERSION_NUMBER: ${{ steps.version.outputs.number }}
         run: |
@@ -98,12 +116,36 @@ jobs:
           test "$artifact_name" = "zoo-code"
           test "$artifact_publisher" = "ZooCodeOrganization"
 
-      # Open VSX is intentionally excluded: it has no pre-release channel concept,
-      # so pre-release builds would surface as the latest stable version for all users.
       - name: Publish pre-release to VS Code Marketplace
+        if: steps.release-check.outputs.skip != 'true'
         env:
           VSCE_PAT: ${{ secrets.VSCE_PAT }}
           VERSION_NUMBER: ${{ steps.version.outputs.number }}
         run: |
-          npx @vscode/vsce publish --pre-release --packagePath "bin/zoo-code-${VERSION_NUMBER}.vsix"
-          echo "Published ZooCodeOrganization.zoo-code ${VERSION_NUMBER} as a VS Code Marketplace pre-release"
+          npx @vscode/vsce publish --pre-release --skip-duplicate --packagePath "bin/zoo-code-${VERSION_NUMBER}.vsix"
+          echo "Published or skipped existing ZooCodeOrganization.zoo-code ${VERSION_NUMBER} as a VS Code Marketplace pre-release"
+
+      # The VSIX built above with `vsce package --pre-release` already carries the
+      # Microsoft.VisualStudio.Code.PreRelease manifest property, which is what Open
+      # VSX reads to flag the version. `ovsx publish` ignores --pre-release for an
+      # already-packaged .vsix (it only applies when ovsx does the packaging itself),
+      # so it's intentionally omitted here.
+      #
+      # Open VSX's "latest" alias resolves to the highest semver across stable and
+      # pre-release alike (pre-release only breaks ties at equal major.minor.patch),
+      # so a nightly build can transiently become "latest" until the next stable
+      # release outranks it. This mirrors how Marketplace pre-release users already
+      # track the newest published version, so it's an accepted trade-off here too.
+      - name: Publish pre-release to Open VSX Registry
+        if: steps.release-check.outputs.skip != 'true'
+        env:
+          OVSX_PAT: ${{ secrets.OVSX_PAT }}
+          VERSION_NUMBER: ${{ steps.version.outputs.number }}
+        run: |
+          set -o pipefail
+          publish_output=$(pnpm exec ovsx publish "bin/zoo-code-${VERSION_NUMBER}.vsix" --skip-duplicate 2>&1 | tee /dev/stderr)
+          if echo "$publish_output" | grep -q "is already published"; then
+            echo "ZooCodeOrganization.zoo-code ${VERSION_NUMBER} was already published to Open VSX; skipped."
+          else
+            echo "Published ZooCodeOrganization.zoo-code ${VERSION_NUMBER} as an Open VSX pre-release"
+          fi

.github/workflows/release-reminder.yml

@@ -0,0 +1,68 @@
+name: Post weekly release reminder
+
+# Requires repo secret DISCORD_RELEASE_WEBHOOK_URL — Discord webhook for the
+# release-reminders channel. The reminder job fails (noisily) if it is unset.
+
+on:
+    schedule:
+        # Friday at 09:00 UTC
+        - cron: "0 9 * * 5"
+    workflow_dispatch:
+
+permissions: {}
+
+concurrency:
+    group: release-reminder
+    # A re-run produces an identical message, so cancel a stale/duplicate run
+    # rather than risk posting twice.
+    cancel-in-progress: true
+
+jobs:
+    remind:
+        runs-on: ubuntu-latest
+        steps:
+            - name: Post release reminder to Discord
+              env:
+                  DISCORD_RELEASE_WEBHOOK_URL: ${{ secrets.DISCORD_RELEASE_WEBHOOK_URL }}
+              run: |
+                  set -euo pipefail
+                  owners=("Elliott" "Navad" "Toray")
+                  anchor_date="2026-07-17"
+                  seconds_since_anchor=$(($(date -u +%s) - $(date -u -d "$anchor_date" +%s)))
+                  weeks_since_anchor=$((seconds_since_anchor / 604800))
+                  owner="${owners[$((weeks_since_anchor % ${#owners[@]}))]}"
+
+                  message=$(cat <<EOF
+                  **Weekly release reminder**
+
+                  **${owner}** is on deck for this week's Zoo Code release.
+
+                  1. Create the release branch and prepare the release with \`.roo/commands/release.md\`.
+                  2. Get the release PR approved.
+                  3. Tag the release branch to trigger the Marketplace publish workflow.
+                  4. Approve the deployment when the \`marketplace-production\` environment requests it.
+                  5. After publishing succeeds, add the release PR to the merge queue.
+
+                  Avoid merging or rebasing the release branch before publishing, so the approved tag keeps the intended commit SHA.
+
+                  More detail: https://discord.com/channels/1497384592494297201/1498024845945081999/1512914847124291667
+                  EOF
+                  )
+
+                  payload=$(jq -n --arg content "$message" '{content: $content}')
+                  curl --fail-with-body --silent --show-error \
+                    --header 'Content-Type: application/json' \
+                    --data "$payload" \
+                    "$DISCORD_RELEASE_WEBHOOK_URL"
+
+            - name: Notify on failure
+              if: failure()
+              env:
+                  DISCORD_RELEASE_WEBHOOK_URL: ${{ secrets.DISCORD_RELEASE_WEBHOOK_URL }}
+              run: |
+                  set -euo pipefail
+                  payload=$(jq -nc --arg content "⚠️ release-reminder workflow failed — see the Actions runs." '{content: $content}')
+                  curl --fail-with-body --silent --show-error \
+                    --header 'Content-Type: application/json' \
+                    --data "$payload" \
+                    "$DISCORD_RELEASE_WEBHOOK_URL" || true

.github/workflows/release-validation.yml

@@ -16,6 +16,9 @@ on:
             - "releases/**"
             - ".github/workflows/release-validation.yml"
 
+permissions:
+    contents: read
+
 jobs:
     validate-release:
         runs-on: ubuntu-latest