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 41bcddb
Browse filesBrowse the repository at this point in the historyBrowse files
Merge upstream main 73931fe into feat/l2-chat-diff-default
main at the merge moment, read from ls-remote of upstream refs/heads/main:
73931fe ("chore(deps): update dependency
zustand to v5.0.16 (#2275)"). merge-base with this branch: 5cc5a37, which is
older than the branch of the previous refresh, so this merge carries a larger
slice of main: 866 paths, of which 32 are paths main deleted and the
merge removes.
Conflict: one file, webview-ui/src/components/settings/SettingsView.tsx, with
two regions inside handleSubmit because both sides edited the same two places.
Region 1 (top of handleSubmit). Main added, ahead of the updateSettings post:
`const saveId = displayChanged ? nextSaveRequestId() : undefined` and a guarded
block that records `sentState.current = cachedState` and calls
`setPendingSaveId(saveId)`. This branch added its experiments-diff block at the
same spot: it walks `changedExperiments.current`, compares each value against
the last submitted value (falling back to the live state/default) and collects
only real differences into `experimentChanges`. Resolution keeps both, main's
saveId block first and then the branch's experiments block, each with its own
closing brace: the single `}` that followed the conflict marker had been
matching the closer of both sides' open blocks, so the resolution writes two.
Region 2 (tail of handleSubmit). The branch added the loop that records what
was submitted into `submittedExperiments.current` until the extension state
confirms it. Main changed the following statement from a bare
`setChangeDetected(false)` into a guarded one with the comment that a time or
date edit clears the flag when the host reports the save and a failed save
leaves the edits in place to retry: `if (!saveId) setChangeDetected(false)`.
Resolution keeps the branch's loop and takes main's guarded clear, dropping the
branch's unguarded call: main modified that line deliberately, and an
unguarded clear would settle a display save locally before the host has
answered. The branch never touched that line, so nothing of its own is lost.
The rehearsal was done with --no-commit --no-ff, the conflicted file was read
from all three stages (base, branch, main) before the merge was aborted, and
the real merge then resolved as above.
Survivor arithmetic over the 242 spec paths either parent touched, on the
additive definition (a title is owed only where a parent changed it against the
merge base): this branch adds 19 titles, main adds 675, and all 694 are present
in the merged tree - 0 added titles dropped. 38 base titles are absent because
main deleted those tests and this branch never touched them, and 3 more are
absent because this branch deleted them and main did not; those are the two
parents' own deletions, applied, not merge damage.
Gates, all run by hand on the merged tree before this commit:
- pnpm install --frozen-lockfile: exit 0. The merged lockfile again outran the
worktree's installed copies - ai 7.0.148 installed against 7.0.162 declared,
katex 0.18.2 against ^0.19.0 - and the install brought both to declared
(7.0.162, 0.19.1) with pnpm-lock.yaml unmodified. It was run once before the
merge as well so this commit's own pre-commit hook had a runtime.
- pnpm --dir src run check-types: exit 0. pnpm --dir webview-ui run check-types:
exit 0. Both are package scripts; the conflict was in webview-ui, so the
webview-ui typecheck is part of the gate here.
- pnpm --dir src run lint: exit 0 in 32 s. pnpm --dir webview-ui run lint:
exit 0 in 9 s. Package scripts, not per-file invocations.
- Vitest: `pnpm --dir webview-ui run test components/settings --run` exit 0,
60 files / 783 tests - the lane containing the hand-resolved component,
including main's display-save specs. `pnpm --dir src run test
integrations/editor --run` exit 0, 2 files / 80 tests, for the spec both
parents edited (auto-merged, not hand-resolved). Those are the only suites
run on this box; the rest of the merged test tree was not executed locally,
so nothing here claims full-suite green.
- prettier 3.9.10 --check over the 793 merged paths that are parseable and still
present: 8 batches, all exit 0, no files differing. 32 parseable paths in the
merge set no longer exist because main deleted them, and 41 more have no
prettier parser (png screenshots and .gitignore); those 73 are reported as not
checked rather than as passing.
- src/eslint-suppressions.json in the merged tree is byte-identical to main's
(sha256 ef86e518fb79): 265 files / 2870 suppressed counts, against this
branch's 338 / 3766. The branch never touched that file, so the fall to main's
numbers is main's own cleanup arriving with the merge, not something the merge
invented; no file's count in the merged tree is above the higher of the two
parents, and no suppression was added.
Hooks: .husky/_ in this worktree carries husky's two-line wrapper for both
pre-commit and pre-push (the workspace install regenerated them, not a git-lfs
stub), and the push that follows this commit will show whether root check-types
actually ran. No --no-verify and no amend.
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