Repository navigation
Merge upstream v0.1.8-nightly.20261107.4340 - #29
Merged
Merged
Conversation
…ngdotgg#31949) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…ild (pingdotgg#31945) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…ace (pingdotgg#31936) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
pingdotgg#31955) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…gdotgg#31292) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
pingdotgg#27960) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…ping or garbling (pingdotgg#31168) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…ngdotgg#31794) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: maria-rcks <maria@kuuro.net>
…29355) Co-authored-by: PR Batch Tester <agent@local.test> Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com> Co-authored-by: GPT-6.1 Sol <noreply@openai.com> Co-authored-by: maria-rcks <maria@kuuro.net>
…gdotgg#28530) Co-authored-by: PR Batch Tester <agent@local.test> Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…onto an empty ~/.t3 (pingdotgg#23878) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
pingdotgg#31769) Co-authored-by: Aditya Vardhan Sharma <adityaradhika13@gmail.com>
Co-authored-by: Lakshmi Tanmay <lakshmi@voltcrash.com> Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
pingdotgg#32035) Co-authored-by: Claude Fable 5.1 <noreply@anthropic.com>
…#32325) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…2269) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…32263) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…the system language (pingdotgg#32252)
…2231) Co-authored-by: maria-rcks <maria@kuuro.net>
…24202) Co-authored-by: PR Batch Tester <agent@local.test> Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com> Co-authored-by: maria-rcks <maria@kuuro.net>
Co-authored-by: GPT 6.1 Sol <codex@openai.com> Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: GPT 6.1 Sol <codex@openai.com> Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…ingdotgg#32403) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
… of rejected (pingdotgg#32405) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…ingdotgg#32408) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…ingdotgg#32395) Co-authored-by: Cursor <cursoragent@cursor.com>
…pingdotgg#32391) Co-authored-by: GPT 6.1 Sol <codex@openai.com> Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…32389) Co-authored-by: GPT 6.1 Sol <codex@openai.com> Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com> Co-authored-by: maria-rcks <maria@kuuro.net>
…gg#27397) Co-authored-by: maria-rcks <maria@kuuro.net>
…e's service (pingdotgg#26324) Co-authored-by: notcompromised <peyton.lamb111@gmail.com> Co-authored-by: maria-rcks <maria@kuuro.net> Co-authored-by: Yash Singh <saiansh2525@gmail.com>
…#19659) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com> Co-authored-by: maria-rcks <maria@kuuro.net> Co-authored-by: Yash Singh <saiansh2525@gmail.com> Co-authored-by: Honey Paptan <hpaptan@gmail.com>
…ngdotgg#19660) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com> Co-authored-by: Yash Singh <saiansh2525@gmail.com>
Remove Cursor CLI credential and macOS Keychain fallbacks for account usage and limits, including their settings and web/mobile prompts. Preserve usage through the Cursor SDK sign-in, CURSOR_API_KEY exchange, and explicit auth tokens for limits. Verified focused Cursor tests and full CI on the final head. The scope and intended loss of usage for CLI-only environments were explicitly approved by the maintainer. Model: GPT 6.1 Sol. Harness: Codex through T3 Code.
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…gdotgg#32401) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…d Escape to the PTY (pingdotgg#32666) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…#27941) Co-authored-by: Orin <orin@orin.ws> Co-authored-by: maria-rcks <maria@kuuro.net>
Codex Review Summary: ✅ CompletedThis comment shows the latest Codex review activity on this pull request.
ℹ️ About Codex in GitHubYour team has set up Codex to review pull requests in this repo. Reviews are triggered when you
Codex reacts with 👀 while any review is running, comments if it has suggestions, and reacts with 👍 once all reviews finish with no findings. |
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.1.8-nightly.20261107.4340. The pre-commit hook and typecheck passed.The sync merges this PR by itself, which builds and publishes the update.
Claude's summary
The merge is resolved and everything is staged, with no conflict markers left. I haven't committed, as instructed.
Conflicts
packages/provider-cursor/src/server/usageLimits.test.ts: upstream (fix(cursor): use the SDK account for usage data pingdotgg/t3code#32448, "use the SDK account for usage data") removed the stored-login and macOS Keychain path for reading Cursor usage limits, and rewrote these tests without the Node services wrapper. The fork had added one test, "reports a rejected API key as a failed probe". I took upstream's file and re-added that test in upstream's style. The fork's driver tests for the key exchange and usage windows merged cleanly and still pass.apps/web/src/components/chat/ComposerModelEffort.tsx: the fork had deleted this file (it belongs to upstream's 3841 composer redesign) and upstream edited it (fix(web): keep Pi thinking controls visible before selection pingdotgg/t3code#27397, Pi thinking controls). I kept it deleted. Nothing in the fork imports it. Upstream's fix also changedbuildTraitsTriggerDisplayinpackages/client-runtime/src/modelTraits.ts, and the fork's TraitsPicker uses that, so the fork still gets the fix.Composer files git merged without a conflict
ChatComposer.tsxonly gains thelanguageandonRetryCatalogprops for speech setup.index.cssonly gains upstream's iframe-safe scrollbar selectors.Lockfile and checks
pnpm-lock.yamlmerged without a conflict. I ranvp installandensure:electronanyway.vpr typecheckpasses on all 40 packages, with only Effect suggestions and no errors.usageLimits,driverandaccountUsagein provider-cursor (19 tests), andmodelTraitsin client-runtime (5 tests).vp fmt --checkandvp linton the 283 staged files, andvp run knip:check, all passed with no errors, so there was nothing to fix.Two untracked files,
claude-summary.mdandconflicted-files.txt, are in the repo root. I left them alone and unstaged.