chore: 🔀 merge upstream nightly v0.0.43-nightly.20260924.2187

[chamaquita-d3]

Merging upstream nightly v0.0.43-nightly.20260924.2187 into factory-test/base stopped on one conflicted file, so no custom build could be published. This merges the tag with --no-ff (keeping it an ancestor of the branch) and resolves the conflict.

Upstream's #13309 swapped the effort dropdown's GaugeIcon for BrainIcon in exactly the three lines where the fork's aae14db had swapped it for ActivityIcon. Same question, different answers: the fork's icon choice is a deliberate customization, so it wins. Nothing else in the file was touched, and every other upstream change merged cleanly.

Conflict resolution

File:lines	Class	factory-test/base	Upstream	Kept	Why
apps/web/src/components/chat/TraitsPicker.tsx:19	Same question, different answers	import { ActivityIcon, ZapIcon }	import { BrainIcon, ZapIcon }	fork (ActivityIcon)	Both sides re-pointed the same import away from GaugeIcon; the fork's icon is its own customization, so the import follows its usages.
apps/web/src/components/chat/TraitsPicker.tsx:652	Same question, different answers	<ComposerControlIcon icon={ActivityIcon} …> (compact trigger)	<ComposerControlIcon icon={BrainIcon} …>	fork (ActivityIcon)	Same icon decision at the compact trigger's icon slot; keeping the fork's choice consistent with the import.
apps/web/src/components/chat/TraitsPicker.tsx:671	Same question, different answers	<ComposerControlIcon icon={ActivityIcon} …> (expanded trigger)	<ComposerControlIcon icon={BrainIcon} …>	fork (ActivityIcon)	Same decision at the expanded trigger; both call sites must match or the dropdown shows two different icons.

pnpm-lock.yaml was not hand-merged: upstream's lockfile was taken wholesale and reconciled with the merged manifests by pnpm install, which re-added the fork's 42 lines of extra dependencies.

git grep -nE '^(<<<<<<<|>>>>>>>) ' finds nothing, and git merge-base --is-ancestor v0.0.43-nightly.20260924.2187 HEAD succeeds.

Checks

Check	Result
pnpm install --frozen-lockfile	✅ pass
pnpm run typecheck	✅ pass (15/15 packages, exit 0, at --concurrency-limit 1; the default limit of 2 gets the server's tsc OOM-killed with exit 137 on this 2-core sandbox)
pnpm exec vp fmt --check	✅ pass (4099 files)
pnpm exec vp lint apps/web/src/components/chat/TraitsPicker.tsx	✅ pass, exit 0 with no findings — no error added
pnpm exec vp run --filter t3 test	⚠️ 5162 passed, 101 pre-existing environmental failures
pnpm exec vp run --parallel --concurrency-limit 2 --filter '!t3' --filter '!@t3tools/monorepo' test	✅ pass (415 files, 5461 tests, exit 0)
pnpm run build:desktop	✅ pass (exit 0)

The 101 server failures are confined to src/git/GitManager.test.ts and src/vcs/GitVcsDriverCore.test.ts, and every one is a GitCommandError from a git subprocess in a /tmp scratch repo. Checking out factory-test/base in the same sandbox and running those two files reproduces exactly 101 failures / 111 passed, so they are a property of this sandbox's git, not of the merge — which touches only a web icon import and the lockfile and cannot reach the VCS driver.

Fixes #5

🤖 Generated with Claude Code