You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
{{ message }}
Repository navigation
Commit 5cc9e1a
Browse filesBrowse the repository at this point in the historyBrowse files
Merge upstream/main (73931fe) into feat/async-save-diagnostics-l1
upstream/main read from ls-remote at the merge moment: 73931fe
('chore(deps): update dependency zustand to v5.0.16 (#2275)'). merge base: 764db84. Branch head
before the merge: b65c24f. Rehearsed with 'git merge --no-commit --no-ff', read the conflicted
paths from all three stages, aborted, then merged again for real.
Conflicts: 2 files, 3 regions.
src/integrations/editor/__tests__/DiffViewProvider.spec.ts, fixture region (18 ours / 9 theirs).
Took main's makeTaskDouble() fixture over the branch's inline double. main's helper already defaults
includeDiagnosticMessages: true and maxDiagnosticMessages: 50, which is what the branch spelled out
inline, so preferring main's shape lost nothing behavioural. main's double carries no say(), and the
branch's L1 assertions need it (saveDirectly's fire-and-forget diagnostics tail emits via say
('error')), so the merged helper returns a declared double type
'type TaskDouble = { providerRef: { deref: Mock }; say: Mock }' and adds say: vi.fn().mockResolvedValue(true).
The branch's 'let mockTask: any' did not come across: under main's 'let mockTask: Task' the branch's
11 mockTask.say.mock.calls sites failed typecheck (TS2339) and providerRef.deref().getState failed
TS18048, so the merged file types the double as TaskDouble and hands it to DiffViewProvider through
asTask(), which holds the single 'as unknown as Task' cast in one named place with a comment. That
keeps main's anti-any direction and the branch's assertions intact instead of trading one for the other.
Same file, assertion block (352 ours / 5 theirs). Took the branch side, which carries the branch's L1
assertions plus its 340 new lines, and dropped main's five lines. main's block asserted
expect(diffViewProvider.newProblemsMessage).toBe("") against the synchronous behaviour; the merged
src/integrations/editor/DiffViewProvider.ts auto-merged to the branch's asynchronous one - it declares
'newProblemsMessage?: string' privately (bracket access) and returns { newProblemsMessage: undefined }
- so main's assertion describes a behaviour the merged tree no longer has. Lane evidence below.
src/eslint-suppressions.json (140 ours / 0 theirs): took main's blob whole. It has 265 entries and
2870 suppressed counts against the branch's 338 and 3766; main removed 73 per-file entries and added
none, and the branch added none either, so the region was main's cleanup against base content the
branch left in place. Where both parents keep an entry the merged tree follows main's lower count
(api/providers/xai.ts 7 -> 4, presentAssistantMessage-images.spec 16 -> 14, checkpoint.test 5 -> 3,
ClineProvider.spec 196 -> 195). No entry was re-added: 'pnpm --dir src run lint' exits 0 with 0
problems against main's blob, so no file in the merged tree sits above main's count for it.
Verification on the merged tree, in order:
- pnpm install --frozen-lockfile after the merge: exit 0, lockfile unmodified. It moved installed ai
7.0.148 -> 7.0.162 and katex 0.18.2 -> 0.19.1, which is what the merged manifests declare (ai 7.0.162,
katex ^0.19.0); the branch declared neither change, so this is main arriving, not drift between the
lockfile and the manifests.
- pnpm --dir src run check-types: exit 0. pnpm --dir webview-ui run check-types: exit 0.
- pnpm --dir src run lint: exit 0, 0 problems.
- Lanes run: 'pnpm --dir src run test integrations/editor --run' 2 files / 92 tests passed - this is
the lane that decides the assertion-block resolution; 'pnpm --dir src run test core/task --run' 53
files / 997 tests passed; 'pnpm --dir webview-ui run test components/settings --run' 60 files / 776
tests passed (SettingsView is not in this PR's diff; run as a regression sample, not a requirement).
- Lanes NOT run: everything else in 'pnpm test' - no full src vitest run, no packages lanes, no
apps/vscode-e2e, no lifecycle:model-check, and no local Stryker (the mutation runner is not installed
on this box, so mutation evidence is left to CI).
- prettier --check over the paths either parent touched vs the merge base: 857 paths, 825 present.
784 have a parser and were checked in 8 batches of at most 100, after classifying every extension in
the set with 'prettier --file-info' (--file-info rejects multiple paths, so classification is one
representative probe per extension). 783 were clean on the first pass; the one file that differed is
the hand-composed DiffViewProvider.spec.ts fixture block, formatted with prettier --write (9 lines
changed, line count unchanged) and then clean on re-check, after which check-types, lint and the three
lanes above were re-run on the formatted tree. 73 paths were not checked: 41 have no parser (.gitignore
and .png - counted as not run, not as passing) and 32 are absent because main deleted them (its
provider-settings consolidation); 0 are prettier-ignored.
- Additive survivor arithmetic over the test paths either parent touched (270 files): the branch adds
14 test titles over the merge base, main adds 1183, and 0 of those 1197 required titles are missing
from the merged tree. No test file present in either parent is absent from the merge.
- Path assertions against the win32 drive trap: the two resolve("/") and join("/") sites in
DiffViewProvider.spec.ts sit inside the branch's vi.mock("path") factory, so they are mocked
construction rather than the real resolver and carry no drive letter. This merge introduces no
OS-conditional constant with a hard-coded drive; the 14 such sites in the merge set are in
src/utils/__tests__/shell.spec.ts and src/integrations/terminal/__tests__/TerminalProfile.spec.ts,
main's own files, which arrive unchanged.
No .changeset file and no CHANGELOG edit.
Copy file name to clipboardExpand all lines: .github/pull_request_template.md
+1Lines changed: 1 addition & 0 deletions
Display the source diff
Display the rich diff
Original file line number
Diff line number
Diff line change
@@ -40,6 +40,7 @@ Write the steps that test your changes. This helps reviewers check your work.
40
40
-[ ]**Self-Review**: I reviewed my own code with care.
41
41
-[ ]**Writing Style**: The PR title and description use Simplified Technical English (ASD-STE100): short sentences, plain words, active voice, one idea per sentence, no contractions.
42
42
-[ ]**Testing**: New and/or updated tests have been added to cover my changes (if applicable).
43
+
-[ ]**Test Helpers** (test changes only): Shared test helpers (`src/test-utils/`, `@/utils/test-utils`) are used only for mechanical duplication; test intent and scenario-specific mocks remain visible.
43
44
-[ ]**Visual Snapshot** (UI changes only): If a user would notice this change at a glance (layout, theme tokens, brand elements, empty/error states), I added or updated a `*.visual.tsx` snapshot in `webview-ui/`. See `webview-ui/AGENTS.md` → "When a UI change needs a snapshot".
44
45
-[ ]**Documentation Impact**: I checked if my changes need documentation updates (see "Documentation Updates" section below).
45
46
-[ ]**Contribution Guidelines**: I read and agree to the [Contributor Guidelines](/CONTRIBUTING.md).
0 commit comments