Repository navigation
Conversation
…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>
…gdotgg#17360) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
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>
…gdotgg#17545) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…ngdotgg#17559) Co-authored-by: maria-rcks <254055478+maria-rcks@users.noreply.github.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
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:electronran, andvpr typecheckpasses after one fix.Conflicts
apps/web/src/components/chat/ChatComposer.tsx, the prompt row's right padding.pr-12,pr-20,pr-28). That width also decides when a long prompt moves the actions to their own row below it.pb-10action row stay. Upstream's measurement moved earlier and now runs in both fork layouts (resting, or controls in the strip below the composer).pr-*) and the action-row check. The fork's fixed sizes only cover the first frame, before the first measurement.packages/provider-cursor/src/server/driver.test.ts, imports. Upstream moved this test out ofapps/serverand switched toimport * as HttpClient from "effect/http/HttpClient". I kept that and addedHttpClientResponsethe 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 removedgetDriverOptionfromproviderDriverMeta, so the fork's usage strip now usesproviderClients.get(driver)?.label, as other upstream code does.Other checks
vp installanyway.vp test run src/server/driver.test.tsinpackages/provider-cursor: 2 tests pass.ChatComposer.tsxandComposerUsageStrip.tsxhave 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.mdandconflicted-files.txt, were already in the repo root. I left them alone.