Skip to content

Merge upstream v0.0.46-nightly.20261009.2886 - #3

Open
mohan6623 wants to merge 131 commits into
custom/usage-badgefrom
sync/v0.0.46-nightly.20261009.2886
Open

mohan6623 wants to merge 131 commits into
custom/usage-badgefrom
sync/v0.0.46-nightly.20261009.2886

Conversation

@mohan6623

Copy link
Copy Markdown
Owner

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

Merging this PR builds and publishes the update.

Claude's summary

The merge is resolved and staged, not committed. All conflict markers are gone, ensure:electron ran, and vpr typecheck passes after one fix.

Conflicts

  1. apps/web/src/components/chat/ChatComposer.tsx, the prompt row's right padding.
    • The fork reserves room for the action buttons with three fixed sizes (pr-12, pr-20, pr-28). That width also decides when a long prompt moves the actions to their own row below it.
    • Upstream (fix(web): collapsed composer reserves room for wide send actions pingdotgg/t3code#17016) replaced the fixed sizes with the measured width of the actions plus 1rem, so wide buttons like the compact-before-send chip fit. It only measured while the composer is resting.
    • Combined: the fork's row ref, layout classes and pb-10 action row stay. Upstream's measurement moved earlier and now runs in both fork layouts (resting, or controls in the strip below the composer).
    • The measured width plus 16px now drives both the right padding (inline style instead of pr-*) and the action-row check. The fork's fixed sizes only cover the first frame, before the first measurement.
  2. packages/provider-cursor/src/server/driver.test.ts, imports. Upstream moved this test out of apps/server and switched to import * as HttpClient from "effect/http/HttpClient". I kept that and added HttpClientResponse the same way, because the fork's Cursor usage test needs it.

Fix outside the conflicts: typecheck failed in apps/web/src/components/chat/ComposerUsageStrip.tsx. Upstream removed getDriverOption from providerDriverMeta, so the fork's usage strip now uses providerClients.get(driver)?.label, as other upstream code does.

Other checks

  • The lockfile merged without conflict; I ran vp install anyway.
  • vp test run src/server/driver.test.ts in packages/provider-cursor: 2 tests pass.
  • ChatComposer.tsx and ComposerUsageStrip.tsx have no unit tests, so I couldn't run any for the web change. The composer layout change is untested; checking it means opening the composer in the app.

Two untracked files, claude-summary.md and conflicted-files.txt, were already in the repo root. I left them alone.

esthor and others added 30 commits October 7, 2026 18:36
…after it (pingdotgg#16713)

Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
…tgg#17041)

Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
…second (pingdotgg#17029)

Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
…pingdotgg#17028)

Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
…ngdotgg#17079)

Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
pingdotgg#15385)

Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
…gdotgg#15397)

Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
…ingdotgg#15893)

Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
…otgg#16296)

Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
Yash-Singh1 and others added 28 commits October 8, 2026 22:30
Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
…ect (pingdotgg#17366)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…ilscale (pingdotgg#17158)

Co-authored-by: PR Batch Tester <agent@local.test>
Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
…ff (pingdotgg#17359)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
… card (pingdotgg#17094)

Co-authored-by: macodev00 <macodev00@users.noreply.github.com>
…hem (pingdotgg#17191)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: maria-rcks <254055478+maria-rcks@users.noreply.github.com>
… port (pingdotgg#17417)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…hout (pingdotgg#17427)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…LatestVersions service (pingdotgg#17434)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…essions service (pingdotgg#17446)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…e with Effect conventions (pingdotgg#17542)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…service conventions (pingdotgg#17544)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…ngdotgg#17559)

Co-authored-by: maria-rcks <254055478+maria-rcks@users.noreply.github.com>
Copilot AI balanced review requested due to automatic review settings October 10, 2026 01:24

Copilot AI left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.