Skip to content

Commit 08b4082

Browse files
authored
Merge branch 'main' into fix/1221-truncated-tool-args
2 parents d5ba3bd + 7328cbf commit 08b4082

89 files changed

Lines changed: 6268 additions & 491 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.

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

Lines changed: 32 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,55 @@ 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
161174
- name: Verify extension coverage contract
175+
if: matrix.collect-coverage
162176
run: pnpm --dir src run verify:coverage-contract
163177
- name: Run extension dist smoke test
164178
run: pnpm turbo run test:dist --filter="zoo-code" --log-order grouped --output-logs new-only
165179
- name: Run core unit coverage
180+
if: matrix.collect-coverage
166181
run: pnpm turbo run test:coverage:unit --filter="@roo-code/core" --log-order grouped --output-logs new-only
182+
- name: Run core unit tests
183+
if: ${{ !matrix.collect-coverage }}
184+
run: pnpm turbo run test:unit --filter="@roo-code/core" --log-order grouped --output-logs new-only
167185
- name: Run core integration coverage
186+
if: matrix.collect-coverage
168187
run: pnpm turbo run test:coverage:integration --filter="@roo-code/core" --log-order grouped --output-logs new-only
188+
- name: Run core integration tests
189+
if: ${{ !matrix.collect-coverage }}
190+
run: pnpm turbo run test:integration --filter="@roo-code/core" --log-order grouped --output-logs new-only
169191
- name: Verify extension coverage reports
192+
if: matrix.collect-coverage
170193
run: |
171194
node src/scripts/verify-lcov.mjs src/coverage/api/lcov.info
172195
node src/scripts/verify-lcov.mjs src/coverage/core/lcov.info
173196
node src/scripts/verify-lcov.mjs src/coverage/services/lcov.info
174197
node src/scripts/verify-lcov.mjs src/coverage/misc/lcov.info
175198
node src/scripts/verify-lcov.mjs src/coverage/tree-sitter/lcov.info
176199
- name: Merge extension coverage reports
200+
if: matrix.collect-coverage
177201
run: |
178202
mkdir -p src/coverage/merged
179203
pnpm --dir src run merge:coverage
180204
node src/scripts/verify-lcov.mjs src/coverage/merged/lcov.info
181205
# Validate cache boundaries before publishing any new Turbo entries.
182206
- name: Verify coverage cache inputs
207+
if: matrix.collect-coverage
183208
run: pnpm --dir src run verify:coverage-cache-inputs
184209
- name: Save Turbo cache
185210
if: steps.turbo-cache.outputs.cache-hit != 'true'
@@ -197,7 +222,7 @@ jobs:
197222
# it. Core and webview reports retain their independent flags.
198223
# See https://docs.codecov.com/docs/flags
199224
- name: Upload non-core coverage to Codecov
200-
if: matrix.upload-coverage
225+
if: matrix.collect-coverage
201226
uses: codecov/codecov-action@fb8b3582c8e4def4969c97caa2f19720cb33a72f # v7.0.0
202227
with:
203228
files: >-
@@ -209,31 +234,31 @@ jobs:
209234
flags: ${{ matrix.codecov-flag }}
210235
token: ${{ secrets.CODECOV_TOKEN }}
211236
- name: Upload webview JSDOM coverage to Codecov
212-
if: matrix.upload-coverage
237+
if: matrix.collect-coverage
213238
uses: codecov/codecov-action@fb8b3582c8e4def4969c97caa2f19720cb33a72f # v7.0.0
214239
with:
215240
files: webview-ui/coverage/lcov.info
216241
disable_search: true
217242
flags: webview-ui
218243
token: ${{ secrets.CODECOV_TOKEN }}
219244
- name: Upload core unit coverage to Codecov
220-
if: matrix.upload-coverage
245+
if: matrix.collect-coverage
221246
uses: codecov/codecov-action@fb8b3582c8e4def4969c97caa2f19720cb33a72f # v7.0.0
222247
with:
223248
files: packages/core/coverage/unit/lcov.info
224249
disable_search: true
225250
flags: ${{ matrix.codecov-flag }},core-unit
226251
token: ${{ secrets.CODECOV_TOKEN }}
227252
- name: Upload core integration coverage to Codecov
228-
if: matrix.upload-coverage
253+
if: matrix.collect-coverage
229254
uses: codecov/codecov-action@fb8b3582c8e4def4969c97caa2f19720cb33a72f # v7.0.0
230255
with:
231256
files: packages/core/coverage/integration/lcov.info
232257
disable_search: true
233258
flags: ${{ matrix.codecov-flag }},core-integration
234259
token: ${{ secrets.CODECOV_TOKEN }}
235260
- name: Upload coverage reports to GitHub
236-
if: matrix.upload-coverage
261+
if: matrix.collect-coverage
237262
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
238263
with:
239264
name: coverage-reports-${{ matrix.name }}

‎.github/workflows/release-reminder.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
DISCORD_RELEASE_WEBHOOK_URL: ${{ secrets.DISCORD_RELEASE_WEBHOOK_URL }}
2727
run: |
2828
set -euo pipefail
29-
owners=("Elliott" "Navad" "Toray")
29+
owners=("Elliott" "James" "Toray")
3030
anchor_date="2026-07-17"
3131
seconds_since_anchor=$(($(date -u +%s) - $(date -u -d "$anchor_date" +%s)))
3232
weeks_since_anchor=$((seconds_since_anchor / 604800))

‎apps/cli/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,6 @@
4848
"rimraf": "6.0.1",
4949
"tsup": "8.5.1",
5050
"tsx": "4.22.4",
51-
"vitest": "4.1.9"
51+
"vitest": "4.1.11"
5252
}
5353
}

‎apps/vscode-e2e/src/suite/restart-persistence.test.ts‎

Lines changed: 12 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,16 @@ async function quitGracefully(): Promise<void> {
2525
await vscode.commands.executeCommand("workbench.action.quit")
2626
}
2727

28+
async function waitForMarkedCompletion(api: RooCodeAPI, taskId: string): Promise<void> {
29+
await waitFor(() =>
30+
api.hasTaskApiConversationHistorySequence(taskId, {
31+
userText: "RESTART_PERSISTENCE_SMOKE",
32+
assistantToolName: "attempt_completion",
33+
assistantToolInputText: MARKER,
34+
}),
35+
)
36+
}
37+
2838
async function runCreate(api: RooCodeAPI): Promise<void> {
2939
let taskId: string | undefined
3040
let createPhasePassed = false
@@ -86,16 +96,7 @@ async function runVerify(api: RooCodeAPI): Promise<void> {
8696
const historyItem = await api.getTaskHistoryItem(taskId)
8797
assert.ok(historyItem, "Task history item should be available after restart")
8898
assert.ok(historyItem.task.includes("RESTART_PERSISTENCE_SMOKE"), "History title should persist after restart")
89-
const restoredCompletion = await api.hasTaskApiConversationHistorySequence(taskId, {
90-
userText: "RESTART_PERSISTENCE_SMOKE",
91-
assistantToolName: "attempt_completion",
92-
assistantToolInputText: MARKER,
93-
})
94-
assert.strictEqual(
95-
restoredCompletion,
96-
true,
97-
"Fresh-host history should restore the marked user turn followed by its assistant completion",
98-
)
99+
await waitForMarkedCompletion(api, taskId)
99100

100101
await api.resumeTask(taskId)
101102
await waitFor(() => taskMessages.some(({ type, ask }) => type === "ask" && ask === "resume_completed_task"))
@@ -106,16 +107,7 @@ async function runVerify(api: RooCodeAPI): Promise<void> {
106107
reopenedHistoryItem.task.includes("RESTART_PERSISTENCE_SMOKE"),
107108
"Reopened task should retain its persisted history title",
108109
)
109-
const reopenedCompletion = await api.hasTaskApiConversationHistorySequence(taskId, {
110-
userText: "RESTART_PERSISTENCE_SMOKE",
111-
assistantToolName: "attempt_completion",
112-
assistantToolInputText: MARKER,
113-
})
114-
assert.strictEqual(
115-
reopenedCompletion,
116-
true,
117-
"Reopened-host history should restore the marked user turn followed by its assistant completion",
118-
)
110+
await waitForMarkedCompletion(api, taskId)
119111

120112
await writePhaseResult(getResultsDir(), {
121113
version: PHASE_RESULT_VERSION,

‎docs/architecture/native-tool-call-parser-scoping-model.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ For focused debugging, run this submodel directly with:
1212
pnpm parser-scope:model-check
1313
```
1414

15-
The command is composed into the same verification suite, but this remains a separate protocol and state space from the persisted task lifecycle model and shared-store concurrency model. It owns its parser-scoping invariants and adds no parser state to `HistoryItem` or `taskLifecycle.ts`; instead, it replays the public production `NativeToolCallParser` APIs using two independent scope objects.
15+
The command runs this check sequentially with the other lifecycle checks, but this remains a separate protocol and state space from the persisted task lifecycle model and shared-store concurrency model. It owns its parser-scoping invariants and adds no parser state to `HistoryItem` or `taskLifecycle.ts`; instead, it replays the public production `NativeToolCallParser` APIs using two independent scope objects. The authoritative [lifecycle coverage audit and issue tracker](./task-lifecycle-model.md#coverage-audit) records its evidence class and cross-model limits.
1616

1717
## Bounds and replay
1818

‎docs/architecture/task-cleanup-protocol-model.md‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@ pnpm cleanup-protocol:model-check
1414

1515
This is a separate child model from the persisted task lifecycle and shared-store concurrency models. It follows the native tool-call parser model pattern: keep an independent bounded state space for an independent protocol, require every action and semantic landmark to remain reachable, and connect the abstract claims to focused production tests.
1616

17+
The authoritative [lifecycle coverage audit and issue tracker](./task-lifecycle-model.md#coverage-audit) classifies how this abstract model relates to production and other submodels.
18+
1719
## Bounds and environment actions
1820

1921
The model uses two tasks and explores every reachable interleaving through depth 20, with an explicit 100,000-state budget. Abort, disposal, final-save, provider abort/drain phases, and shutdown-cursor state are modeled directly. Independent abort and disposal calls may interleave freely, while provider-initiated calls are gated to the current shutdown task. Cleanup and editor-reversion settlement or rejection are environment actions, so the explorer does not assume they eventually occur.

0 commit comments

Comments
 (0)