[chamaquita-d3]

Closes #133

Merges upstream v0.1.2-nightly.20261021.3457 into custom-nightly with a merge commit. Every conflict is in a test file: upstream's test-pruning PRs (pingdotgg#22557, pingdotgg#22588–pingdotgg#22593) deleted or shrank tests the fork had edited or added to. Rule applied: keep the fork's added tests and its tests of fork behaviour; drop fork edits to tests upstream deleted as low-signal (the code those tests covered is untouched). pnpm-lock.yaml is upstream's, reconciled with pnpm install --ignore-scripts (fork manifest deps re-added). No non-test fix was needed to reconcile; per instructions no checks were run locally, so fork CI is the build proof.

File:lines	Class	custom-nightly	Upstream	Kept	Why
apps/desktop/src/updates/DesktopUpdates.test.ts 24–113	disjoint	Added "downloads an update as soon as a background check finds it" next to the old tests	Deleted the old tests, dropped the Duration import	Fork's new test; upstream's deletions; re-added the Duration import it needs	Fork test covers fork behaviour; the deleted tests are gone upstream
apps/desktop/src/window/DesktopApplicationMenu.test.ts 132–223	superseded	Edited the macOS branding test to say "D3 Code"	Deleted that test	Upstream	Test pruned; branding code is unchanged
apps/mobile/src/features/review/shikiReviewHighlighter.test.ts 41–174	superseded	Pinned Date.now in the cold/warm test	Deleted the test and its neighbours	Upstream	Test pruned
apps/mobile/src/features/workspace/android-workspace-navigation-colors.test.ts 112–141	disjoint	New-signature "preserves tonal fill" test plus new phone-background test	Deleted the tonal-fill test	Phone-background test only	Fork-added coverage kept; pruned test dropped
apps/mobile/src/widgets/subscriptionUsageSnapshot.test.ts 8–22, 147–167	superseded	Removed createWidgetRefresher and its tests with the probe removal	Kept a trimmed refresher test and imports	Fork (no refresher); trimmed imports to what the file uses	createWidgetRefresher no longer exists in the fork source
apps/server/src/http.test.ts 16–56	disjoint	Voice-route imports (HttpBody, Stream, ThreadId, voiceTranscriptionRouteLayer)	Dropped Tracer, isLoopbackHostname, resolveDevRedirectUrl, withUntracedRequests	Fork's voice imports, upstream's removals	Voice route test stays; imports of pruned tests go
apps/server/src/serverSettings.test.ts 525–590	disjoint	Added the dictation API key test	Deleted the neighbouring settlement test	Dictation test only	Fork-added coverage kept
apps/server/src/usage/UsageLimitSources.test.ts 2–13, 170–272	disjoint	describe import, cswap runner added to the polling test	Deleted the polling test	describe import and the claude-swap tests (outside the hunk); dropped the polling test and unused imports	Claude-swap coverage kept; polling test pruned
apps/web/src/components/settings/KeybindingsSettings.logic.test.ts 226–344	superseded	One added backgroundEditor.toggle label assertion in the "formats labels" test	Deleted the test	Upstream	Test pruned
apps/web/src/components/settings/settingsSearch.test.ts 80–116	disjoint	Added claude-swap to the usage-providers search cases	Deleted the neighbouring tests	Usage-providers it.each	Small fork-modified test with no extra dependencies
apps/web/src/components/usage/UsagePage.refresh.browser.test.tsx (modify/delete)	superseded	Rewrote tests for "never probe providers on open"	Deleted the file	Upstream (deleted)	Upstream removed the usage browser tests wholesale
apps/web/src/keybindings.test.ts 455–544	disjoint	Added backgroundEditor.toggle test	Deleted neighbouring tests	Fork's backgroundEditor.toggle test	Fork-added coverage kept
apps/web/src/localApi.test.ts 74–153	disjoint	Custom-background round trip in the browser-storage test	Deleted the neighbouring tests	Browser-storage test; re-added DEFAULT_CLIENT_SETTINGS import	Fork-modified test kept
packages/client-runtime/src/state/usage.test.ts 194–220	disjoint	Rewrote the refreshUsageLimits join test for the fork's new API	Deleted the old-API test	Fork	Fork changed the API; the test matches the code
packages/client-runtime/src/voice-input/controller.test.ts 326–372	disjoint	Added "frees the session when disposed after its owner released the recorder"	Deleted neighbouring tests	Fork's new test	Fork-added coverage kept
packages/contracts/src/settings.test.ts 271–464	disjoint	Added the "ClientSettings custom backgrounds" suite	Deleted neighbouring suites	Custom-backgrounds suite	Fork-added coverage kept
packages/provider-core/src/server/managedProvider.test.ts 182–450	disjoint	Added "restarts the refresh interval after a manual refresh"	Deleted neighbouring tests, dropped the TestClock import	Fork's test; re-added the TestClock import	Fork-added coverage kept
packages/shared/src/cliRelease.test.ts 6–35, 72–81	superseded	Changed the expected release URLs to d3labs-dev	Deleted both tests	Upstream	Tests pruned; the URL code is unchanged
packages/shared/src/usageLimits.test.ts 507–581, 957–1073	disjoint	Added the claude-swap merge test	Deleted neighbouring tests	Claude-swap test only	Fork-added coverage kept
packages/ssh/src/tunnel.test.ts 85–142	superseded	Changed the expected release URL to d3labs-dev	Deleted the test	Upstream	Test pruned
scripts/build-desktop-artifact.test.ts 32–40, 485–557, 627–888, 1843–1903, 1972–2122	disjoint	"D3 Code" product name, fn-key resources and exclusions, com.diegojohnson.d3code app id, macPasskeySigning default	Deleted about 1,200 lines of tests	The five fork-modified tests (product name, locales/exclusions, platform packaging, signed-mac config, default platform) plus the imports they need; the rest follow upstream	Fork customizations stay covered; pruned tests dropped
pnpm-lock.yaml	superseded	Merged lockfile	Upstream's lockfile	Upstream's, then pnpm install --ignore-scripts	Reconciles the fork's manifest dependencies

🤖 Generated with Claude Code