Repository navigation
chore: merge upstream through ea7d46ac10 - #81
Merged
Merged
Conversation
…al (pingdotgg#13491) Co-authored-by: eshaan Sood <eshaansood@192.168.1.14> Co-authored-by: Gabriel De Andrade <30420087+gabrielelpidio@users.noreply.github.com> Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Conflicts: - UsageService: keep the per-instance Cursor login loop; a login that is missing with no error now adds neither an account source nor a setup error. - ChatView: drop the folded version-skew reconnect line as upstream does; keep the workspace-expired notice and the always-available Reconnect. - Sidebar: keep the pendingEnvironmentSend draft preview and add the row accessibility labels. Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
With several Cursor instances, a missing login beside an unreadable one must add no source of its own, only the unreadable login's error. Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
Thread transfer impact✅ Thread transfer remains within every enforced ceiling.
Baseline: Scenario and decoded snapshot size10 historical turns, 5 command tools per turn, 878.9 KiB retained MCP result per historical turn, and a 1.05 MiB retained result in the measured turn.
Updated in place by a trusted workflow. PR artifacts are strictly validated and never executed. |
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.
Brings in the 7 upstream commits since #79: accessibility labels for controls and sidebar rows, usage contract tolerance for newer providers, no Cursor warning when no login is saved, client-version mismatch detection on the usage page, the offline-versus-update fix in the composer, and the Linux node-pty prebuild check for Windows artifacts.
Merge with a merge commit, not a squash. Squashing drops upstream's history and the next sync conflicts on every file again.
Conflicts
apps/server/src/usage/UsageService.ts. The fork reads every Cursor instance's login, and upstream now returns early when its one login is missing with no error. Kept the fork's multi-login loop and applied upstream's rule inside it. A login that is missing with no error adds neither an account source nor a setup error. A login blocked by an env token or the memory store still reports "needs a Cursor CLI login", as upstream does. Upstream's new tests pass unchanged. A new test covers two instances, one with an unreadable login and one with none, and expects only the unreadable login's error. Without the rule it gets two sources.apps/web/src/components/ChatView.tsx. Upstream removed the folded "Reconnecting to X, finishing an update" line, which showed an offline server as an update in progress. Took that removal. Kept the fork's notice: the "no longer available / this workspace expired" state with its Connections action, and the Reconnect action. Reconnect stays visible while reconnecting, because a paused cloud workspace sits in that phase and only Reconnect wakes it (#33). ThereconnectActionconstant existed only so the folded line could share it, so it is inlined into its one remaining use.apps/web/src/components/Sidebar.tsx. Kept the fork'spendingEnvironmentSendpreview for draft rows, and added upstream'sresolveSidebarRowAccessibilityblock after it, so the accessible label uses the same preview.Verification
Targeted
vp test run, all passing:apps/serversrc/usage/has 8 files and 117 tests.apps/webcovers ChatView.logic, Sidebar.logic, ui/switch, the usage page, and the usage query, with 13 files and 385 tests.packages/sharedusageMerge.test.tshas 26 tests.packages/client-runtimeusage and serverUsage have 11 tests.apps/mobileConnectionFormField has 2 tests.scriptsbuild-desktop-artifact has 75 tests.No fork code reads the renamed
staleEnvironmentsfield.🤖 Generated with Claude Code