Skip to content

Commit 8fd0325

Browse files
easonLiangWorldedtechclaude
andcommitted
Merge upstream main (3859e5d) into feat/abort-r1-u3-gateway-siblings
Conflicts were only in src/api/providers/utils/abort-signal.ts and its spec. Resolved by keeping main's canonical helper: the branch carried a copy that lacked throwIfAborted (main's fetchers import it, so the merge broke tsc) and the pre-aborted branch's unhandled-rejection guard. The PR keeps only its own provider wiring. Verified on the merged tree: tsc clean, eslint clean, prettier clean, 176 tests green (abort-signal + unbound + vercel-ai-gateway + zoo-gateway specs). Co-Authored-By: Claude <noreply@anthropic.com>
2 parents 044e22b + 3859e5d commit 8fd0325

402 files changed

Lines changed: 34674 additions & 3352 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.coderabbit.yaml‎

Lines changed: 17 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ tone_instructions: >-
66
comments and unrelated refactors.
77
88
chat:
9-
allow_non_org_members: false
9+
allow_non_org_members: true
1010

1111
knowledge_base:
1212
web_search:
@@ -48,17 +48,22 @@ reviews:
4848
instructions: >-
4949
Act as an adversarial second-opinion reviewer. Verify PR claims against implementation and
5050
contracts. Trace changed inputs through normal, boundary, error, cancellation, retry, and
51-
default paths and their consumers. Seek plausible counterexamples and regressions from removed
52-
safeguards. Identify assumptions in changed code that depend on facts outside the diff. First
53-
verify repository conventions, tests, and related implementations. When a potential finding
54-
depends on external behavior, use web search and prefer official documentation, specifications,
55-
or upstream repositories. Report only concrete, actionable conflicts or failure modes, citing
56-
the relevant repository location or external source. Prioritize correctness, security, data loss,
57-
lifecycle, and test gaps. Do not report generic best practices, unsupported concerns, speculative
58-
style comments, or unrelated refactors. When changed code introduces a local implementation of a
59-
cross-cutting concern, check whether it bypasses or duplicates an established repository abstraction
60-
or nearby convention. Report only a concrete inconsistency with behavioral or maintenance impact,
61-
and allow intentional deviations.
51+
default paths and their direct test counterparts. Do not flag defects in files not changed by
52+
this PR unless the defect is directly triggered by changed code and cannot be detected in the
53+
changed file alone. Seek plausible counterexamples and regressions from removed safeguards.
54+
Identify assumptions in changed code that depend on facts outside the diff. First verify
55+
repository conventions, tests, and related implementations. When a potential finding depends on
56+
external behavior, use web search and prefer official documentation, specifications, or upstream
57+
repositories. Report only concrete, actionable conflicts or failure modes, citing the relevant
58+
repository location or external source. Prioritize correctness, security, data loss, lifecycle, and
59+
test gaps. Do not report generic best practices, unsupported concerns, speculative style
60+
comments, or unrelated refactors. When changed code introduces a local implementation of a
61+
cross-cutting concern, check whether it bypasses or duplicates an established repository
62+
abstraction or nearby convention. Report only a concrete inconsistency with behavioral or
63+
maintenance impact, and allow intentional deviations. Treat the linked issue and this PR
64+
description as the scope boundary. When a confirmed defect needs work beyond that boundary
65+
and this PR does not create the hazard, do not request changes for it. List it once in the
66+
walkthrough under follow-up candidates, with one line for the trigger.
6267
6368
- path: "**/*.{ts,tsx,js,jsx,mts,mjs,cts,cjs}"
6469
instructions: >-

‎.github/CODEOWNERS‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
# These owners will be the default owners for everything in the repo
2-
* @taltas @JamesRobert20 @navedmerchant @hannesrudolph @edelauna
2+
* @taltas @JamesRobert20 @navedmerchant @edelauna

‎.github/workflows/code-qa.yml‎

Lines changed: 51 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,8 @@ jobs:
9090
run: pnpm lint
9191
- name: Check types
9292
run: pnpm check-types
93+
- name: Validate Code QA workflow
94+
run: pnpm test:code-qa-ci
9395
- name: Model-check task lifecycle protocols
9496
run: pnpm lifecycle:model-check
9597
- name: Validate MCP OAuth integration
@@ -135,11 +137,11 @@ jobs:
135137
- os: ubuntu-latest
136138
name: ubuntu-latest
137139
codecov-flag: ubuntu
138-
upload-coverage: true
140+
collect-coverage: true
139141
- os: windows-latest
140142
name: windows-latest
141143
codecov-flag: windows
142-
upload-coverage: false
144+
collect-coverage: false
143145
steps:
144146
- name: Checkout code
145147
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
@@ -154,25 +156,62 @@ jobs:
154156
restore-keys: |
155157
${{ runner.os }}-turbo-${{ hashFiles('**/pnpm-lock.yaml') }}-
156158
${{ runner.os }}-turbo-
159+
# Windows never uploads coverage, so Windows runs the same test
160+
# suites through the uninstrumented Turbo tasks. Ubuntu stays the
161+
# authoritative coverage lane.
157162
- name: Run non-extension package coverage
163+
if: matrix.collect-coverage
158164
run: pnpm turbo run test:coverage --filter="!@roo-code/core" --filter="!zoo-code" --log-order grouped --output-logs new-only
165+
- name: Run non-extension package tests
166+
if: ${{ !matrix.collect-coverage }}
167+
run: pnpm turbo run test --filter="!@roo-code/core" --filter="!zoo-code" --log-order grouped --output-logs new-only
159168
- name: Run extension coverage lanes
169+
if: matrix.collect-coverage
160170
run: pnpm turbo run test:coverage:api test:coverage:core test:coverage:services test:coverage:misc test:coverage:tree-sitter --filter="zoo-code" --concurrency=2 --log-order grouped --output-logs new-only
171+
- name: Run extension test lanes
172+
if: ${{ !matrix.collect-coverage }}
173+
run: pnpm turbo run test:api test:core test:services test:misc test:tree-sitter --filter="zoo-code" --concurrency=2 --log-order grouped --output-logs new-only
174+
# Runs outside Turbo so changes to .coderabbit.yaml and
175+
# .github/workflows/label-pr-review-state.yml always bust the
176+
# result — those files are outside the src/ package boundary and
177+
# cannot be declared as Turbo inputs.
178+
- name: Run workflow config tests
179+
run: pnpm --dir src run test:workflow
161180
- name: Verify extension coverage contract
181+
if: matrix.collect-coverage
162182
run: pnpm --dir src run verify:coverage-contract
163183
- name: Run extension dist smoke test
164184
run: pnpm turbo run test:dist --filter="zoo-code" --log-order grouped --output-logs new-only
165185
- name: Run core unit coverage
186+
if: matrix.collect-coverage
166187
run: pnpm turbo run test:coverage:unit --filter="@roo-code/core" --log-order grouped --output-logs new-only
188+
- name: Run core unit tests
189+
if: ${{ !matrix.collect-coverage }}
190+
run: pnpm turbo run test:unit --filter="@roo-code/core" --log-order grouped --output-logs new-only
167191
- name: Run core integration coverage
192+
if: matrix.collect-coverage
168193
run: pnpm turbo run test:coverage:integration --filter="@roo-code/core" --log-order grouped --output-logs new-only
194+
- name: Run core integration tests
195+
if: ${{ !matrix.collect-coverage }}
196+
run: pnpm turbo run test:integration --filter="@roo-code/core" --log-order grouped --output-logs new-only
169197
- name: Verify extension coverage reports
198+
if: matrix.collect-coverage
170199
run: |
171200
node src/scripts/verify-lcov.mjs src/coverage/api/lcov.info
172201
node src/scripts/verify-lcov.mjs src/coverage/core/lcov.info
173202
node src/scripts/verify-lcov.mjs src/coverage/services/lcov.info
174203
node src/scripts/verify-lcov.mjs src/coverage/misc/lcov.info
175204
node src/scripts/verify-lcov.mjs src/coverage/tree-sitter/lcov.info
205+
- name: Merge extension coverage reports
206+
if: matrix.collect-coverage
207+
run: |
208+
mkdir -p src/coverage/merged
209+
pnpm --dir src run merge:coverage
210+
node src/scripts/verify-lcov.mjs src/coverage/merged/lcov.info
211+
# Validate cache boundaries before publishing any new Turbo entries.
212+
- name: Verify coverage cache inputs
213+
if: matrix.collect-coverage
214+
run: pnpm --dir src run verify:coverage-cache-inputs
176215
- name: Save Turbo cache
177216
if: steps.turbo-cache.outputs.cache-hit != 'true'
178217
uses: actions/cache/save@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0
@@ -184,53 +223,48 @@ jobs:
184223
# there mostly adds Codecov overhead without changing pass/fail
185224
# behavior.
186225
# Coverage is uploaded in separate steps so each LCOV gets the
187-
# correct flag set. Codecov double-counts overlapping lines when a
188-
# single upload carries multiple flags whose paths overlap, so the
189-
# core lanes and webview lane must be uploaded individually with
190-
# their own flag.
226+
# correct flag set. Extension lanes instrument the same sources, so
227+
# union them before upload; a line is covered when any lane executes
228+
# it. Core and webview reports retain their independent flags.
191229
# See https://docs.codecov.com/docs/flags
192230
- name: Upload non-core coverage to Codecov
193-
if: matrix.upload-coverage
231+
if: matrix.collect-coverage
194232
uses: codecov/codecov-action@fb8b3582c8e4def4969c97caa2f19720cb33a72f # v7.0.0
195233
with:
196234
files: >-
197-
src/coverage/api/lcov.info,
198-
src/coverage/core/lcov.info,
199-
src/coverage/services/lcov.info,
200-
src/coverage/misc/lcov.info,
201-
src/coverage/tree-sitter/lcov.info,
235+
src/coverage/merged/lcov.info,
202236
packages/cloud/coverage/lcov.info,
203237
packages/telemetry/coverage/lcov.info,
204238
apps/cli/coverage/lcov.info
205239
disable_search: true
206240
flags: ${{ matrix.codecov-flag }}
207241
token: ${{ secrets.CODECOV_TOKEN }}
208242
- name: Upload webview JSDOM coverage to Codecov
209-
if: matrix.upload-coverage
243+
if: matrix.collect-coverage
210244
uses: codecov/codecov-action@fb8b3582c8e4def4969c97caa2f19720cb33a72f # v7.0.0
211245
with:
212246
files: webview-ui/coverage/lcov.info
213247
disable_search: true
214248
flags: webview-ui
215249
token: ${{ secrets.CODECOV_TOKEN }}
216250
- name: Upload core unit coverage to Codecov
217-
if: matrix.upload-coverage
251+
if: matrix.collect-coverage
218252
uses: codecov/codecov-action@fb8b3582c8e4def4969c97caa2f19720cb33a72f # v7.0.0
219253
with:
220254
files: packages/core/coverage/unit/lcov.info
221255
disable_search: true
222256
flags: ${{ matrix.codecov-flag }},core-unit
223257
token: ${{ secrets.CODECOV_TOKEN }}
224258
- name: Upload core integration coverage to Codecov
225-
if: matrix.upload-coverage
259+
if: matrix.collect-coverage
226260
uses: codecov/codecov-action@fb8b3582c8e4def4969c97caa2f19720cb33a72f # v7.0.0
227261
with:
228262
files: packages/core/coverage/integration/lcov.info
229263
disable_search: true
230264
flags: ${{ matrix.codecov-flag }},core-integration
231265
token: ${{ secrets.CODECOV_TOKEN }}
232266
- name: Upload coverage reports to GitHub
233-
if: matrix.upload-coverage
267+
if: matrix.collect-coverage
234268
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
235269
with:
236270
name: coverage-reports-${{ matrix.name }}
@@ -240,6 +274,7 @@ jobs:
240274
src/coverage/services/lcov.info
241275
src/coverage/misc/lcov.info
242276
src/coverage/tree-sitter/lcov.info
277+
src/coverage/merged/lcov.info
243278
webview-ui/coverage/lcov.info
244279
packages/cloud/coverage/lcov.info
245280
packages/telemetry/coverage/lcov.info

0 commit comments

Comments
 (0)