Merge upstream v0.0.46-nightly.20261010.2948

[mohan6623]

Claude Code resolved the conflicts in this merge of upstream v0.0.46-nightly.20261010.2948. Typecheck passed.

Merging this PR builds and publishes the update.

Claude's summary

All four conflicts are resolved and staged. ensure:electron and vpr typecheck both pass, and the tests for the touched code pass (ChatView.logic.test.ts and sidebar.test.tsx: 129 passed; the Cursor driver.test.ts: 2 passed). Nothing is committed.

How each conflict was resolved

1. apps/web/src/components/ChatView.tsx (4 hunks): Both sides fixed the same slowdown when resizing the preview panel. The fork moved the panel's width state into the panel itself, so ChatView no longer redraws on every frame of a resize. Upstream instead made the width hook cheaper but kept it in ChatView. I kept the fork's version and left out upstream's ChatView additions. Upstream's improved hook is still used, because the panel calls it internally. Upstream's other ChatView changes merged cleanly, and so did your setting that turns off Compact and send.

2. apps/web/src/components/chat/ChatComposer.tsx (1 hunk): Upstream added a measurement of the action buttons' width so the prompt doesn't run under them. The fork already does this in useComposerActionRow, which also handles your layout where actions move to a row below a long prompt. I kept the fork's layout code and removed upstream's duplicate measurement. Upstream's other composer changes, including the new Compact chip toggle, are kept.

3. apps/web/src/components/ui/sidebar.tsx (2 hunks): Both sides made the same fix: during a sidebar drag, set the width directly and write --sidebar-width only once at the end. I took upstream's version because it does everything the fork's did and more: it cancels the drag when the sidebar is toggled and keeps the width within bounds when the window resizes. Your hover-to-open sidebar code merged cleanly.

4. packages/provider-cursor/src/server/driver.test.ts (imports): Upstream moved the Cursor driver into its own package. Your API-key exchange for Cursor usage moved with it, in usageLimits.ts. I took upstream's import style and added the HttpClientResponse import that your usage test needs.

Fix outside the conflicts: typecheck failed because the fork-only ComposerUsageStrip.tsx imported getDriverOption, which upstream removed. I switched it to upstream's providerClients.get(...), formatted the file and staged it.

The untracked claude-summary.md and conflicted-files.txt were already in the folder before I started, and I didn't touch them.

[Copilot]

Copilot was unable to review this pull request because the user who requested the review has reached their quota limit.