Skip to content

Commit 5a1525e

Browse files
committed
Merge remote-tracking branch 'upstream/main' into fix/868-apply-diff-whole-lines-warning
# Conflicts: # src/core/prompts/tools/native-tools/apply_diff.ts
2 parents d7afbc5 + fcc51b5 commit 5a1525e

285 files changed

Lines changed: 20568 additions & 2043 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: 7 additions & 4 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:
@@ -55,12 +55,15 @@ reviews:
5555
repository conventions, tests, and related implementations. When a potential finding depends on
5656
external behavior, use web search and prefer official documentation, specifications, or upstream
5757
repositories. Report only concrete, actionable conflicts or failure modes, citing the relevant
58-
repository location or external source. Prioritize correctness, security, data loss, lifecycle,
59-
and test gaps. Do not report generic best practices, unsupported concerns, speculative style
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
6060
comments, or unrelated refactors. When changed code introduces a local implementation of a
6161
cross-cutting concern, check whether it bypasses or duplicates an established repository
6262
abstraction or nearby convention. Report only a concrete inconsistency with behavioral or
63-
maintenance impact, and allow intentional deviations.
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.
6467
6568
- path: "**/*.{ts,tsx,js,jsx,mts,mjs,cts,cjs}"
6669
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: 38 additions & 7 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,32 +156,61 @@ 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
176205
- name: Merge extension coverage reports
206+
if: matrix.collect-coverage
177207
run: |
178208
mkdir -p src/coverage/merged
179209
pnpm --dir src run merge:coverage
180210
node src/scripts/verify-lcov.mjs src/coverage/merged/lcov.info
181211
# Validate cache boundaries before publishing any new Turbo entries.
182212
- name: Verify coverage cache inputs
213+
if: matrix.collect-coverage
183214
run: pnpm --dir src run verify:coverage-cache-inputs
184215
- name: Save Turbo cache
185216
if: steps.turbo-cache.outputs.cache-hit != 'true'
@@ -197,7 +228,7 @@ jobs:
197228
# it. Core and webview reports retain their independent flags.
198229
# See https://docs.codecov.com/docs/flags
199230
- name: Upload non-core coverage to Codecov
200-
if: matrix.upload-coverage
231+
if: matrix.collect-coverage
201232
uses: codecov/codecov-action@fb8b3582c8e4def4969c97caa2f19720cb33a72f # v7.0.0
202233
with:
203234
files: >-
@@ -209,31 +240,31 @@ jobs:
209240
flags: ${{ matrix.codecov-flag }}
210241
token: ${{ secrets.CODECOV_TOKEN }}
211242
- name: Upload webview JSDOM coverage to Codecov
212-
if: matrix.upload-coverage
243+
if: matrix.collect-coverage
213244
uses: codecov/codecov-action@fb8b3582c8e4def4969c97caa2f19720cb33a72f # v7.0.0
214245
with:
215246
files: webview-ui/coverage/lcov.info
216247
disable_search: true
217248
flags: webview-ui
218249
token: ${{ secrets.CODECOV_TOKEN }}
219250
- name: Upload core unit coverage to Codecov
220-
if: matrix.upload-coverage
251+
if: matrix.collect-coverage
221252
uses: codecov/codecov-action@fb8b3582c8e4def4969c97caa2f19720cb33a72f # v7.0.0
222253
with:
223254
files: packages/core/coverage/unit/lcov.info
224255
disable_search: true
225256
flags: ${{ matrix.codecov-flag }},core-unit
226257
token: ${{ secrets.CODECOV_TOKEN }}
227258
- name: Upload core integration coverage to Codecov
228-
if: matrix.upload-coverage
259+
if: matrix.collect-coverage
229260
uses: codecov/codecov-action@fb8b3582c8e4def4969c97caa2f19720cb33a72f # v7.0.0
230261
with:
231262
files: packages/core/coverage/integration/lcov.info
232263
disable_search: true
233264
flags: ${{ matrix.codecov-flag }},core-integration
234265
token: ${{ secrets.CODECOV_TOKEN }}
235266
- name: Upload coverage reports to GitHub
236-
if: matrix.upload-coverage
267+
if: matrix.collect-coverage
237268
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
238269
with:
239270
name: coverage-reports-${{ matrix.name }}

0 commit comments

Comments
 (0)