Skip to content

chore(sync): merge upstream main and preserve fork integrations - #78

Merged
ScriptedAlchemy merged 17 commits into
mainfrom
codex/sync-upstream-main-20261107
Nov 8, 2026
Merged

ScriptedAlchemy merged 17 commits into
mainfrom
codex/sync-upstream-main-20261107

Conversation

@ScriptedAlchemy

@ScriptedAlchemy ScriptedAlchemy commented Nov 7, 2026 •

Copy link
Copy Markdown
Owner

Sync 15 upstream commits from pingdotgg/t3code at a9e709f into the fork's main, bringing in provider account checks, typed ACP forms, desktop theme synchronization, and mobile fixes.

Resolve the overlapping changes while preserving the fork's managed Codex CLI setup, Antigravity profile preparation lock, account transfer service, and shared skills settings. Adopt upstream's removal of Cursor Keychain usage access. Update the model-mention composer's environment mock to include the new theme atom so the full web test suite can load. Existing uncommitted mobile signing edits in the primary checkout are excluded.

Validation: the merge's vp run check:changed origin/main --concurrency 2 passed (641 tests in 47 files). The follow-up fix passed vp run check:changed bc3d2e3278 --concurrency 2 and the full vp run --filter @t3tools/web test suite (5,822 tests in 543 files). The affected composer test reproduced the CI crash before the mock update and passes afterward. Full builds, Rust tests, mobile native lint, and release smoke remain CI coverage.

Model: gpt-6.1-sol. Harness: Codex through T3 Code.

voltcrash and others added 16 commits November 7, 2026 05:06
…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>
@changeset-bot

changeset-bot Bot commented Nov 7, 2026 •

Copy link
Copy Markdown

⚠️ No Changeset found

Latest commit: 80bb433

Merging this PR will not cause a version bump for any packages. If these changes should not result in a new version, you're good to go. If these changes should result in a version bump, you need to add a changeset.

Click here to learn what changesets are, and how to add one.

Click here if you're a maintainer who wants to add a changeset to this PR

@ScriptedAlchemy
ScriptedAlchemy merged commit ce27118 into main Nov 8, 2026
16 checks passed
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.