chore: sync upstream pingdotgg/t3code (20260710)#167
Merged
Conversation
Co-authored-by: codex <codex@users.noreply.github.com>
Co-authored-by: codex <codex@users.noreply.github.com>
…pingdotgg#3795) Co-authored-by: Julius Marminge <julius@mac.lan> Co-authored-by: codex <codex@users.noreply.github.com>
Co-authored-by: codex <codex@users.noreply.github.com>
…tgg#3823) Co-authored-by: codex <codex@users.noreply.github.com>
Co-authored-by: codex <codex@users.noreply.github.com>
Co-authored-by: codex <codex@users.noreply.github.com>
Author
|
@codex review |
…-sync mocks Upstream pingdotgg#3795 expanded the EnvironmentCacheStore interface with loadServerConfig/saveServerConfig/loadVcsRefs/saveVcsRefs; add those stubs to the fork-local shell-sync mock stores so typecheck passes. Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
![chatgpt-codex-connector[bot]](https://avatars.githubusercontent.com/in/1144995?s=60&v=4){kind=small}
There was a problem hiding this comment.
💡 Codex Review
Here are some automated review suggestions for this pull request.
Reviewed commit: e7f3668c1f
ℹ️ About Codex in GitHub
Codex has been enabled to automatically review pull requests in this repo. Reviews are triggered when you
- Open a pull request for review
- Mark a draft as ready
- Comment "@codex review".
If Codex has suggestions, it will comment; otherwise it will react with 👍.
When you sign up for Codex through ChatGPT, Codex can also answer questions or update the PR, like "@codex address that feedback".
… subscription Upstream pingdotgg#3795's makeEnvironmentServerConfigState subscribed to subscribeServerConfig with {} instead of the fork-local shared SERVER_CONFIG_SUBSCRIPTION_INPUT ({ supportsHeartbeat: true }). That opts the quiet offline-persistence subscription out of the server's keepalive frames (and diverges from the shared subscription key), so idle transports/proxies could drop it and leave provider/model metadata stale. Hoist the const above makeEnvironmentServerConfigState and pass it at the subscription site so every consumer shares the same input. Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.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
3 participants
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.
Nightly upstream sync of
pingdotgg/t3code→agriffiths-bots/t3code.Cherry-picked the 8 new upstream commits since the last sync (
0c66565..f61fa94):f61fa9499Expose mobile PR indicator labels to accessibility (Expose mobile PR indicator labels to accessibility pingdotgg/t3code#3828)8619ef22eShow compact PR number badges in mobile thread rows (Show compact PR number badges in mobile thread rows pingdotgg/t3code#3827)843cf176efix(mobile): embed fonts and render project favicons reliably (fix(mobile): embed fonts and render project favicons reliably pingdotgg/t3code#3823)ca1e08b5a[codex] Label max and ultra reasoning ([codex] Label max and ultra reasoning pingdotgg/t3code#3824)2250e3ee7feat(client): persist offline environment data and mobile preferences (feat(client): persist offline environment data and mobile preferences pingdotgg/t3code#3795)3201e00ad[codex] Preserve worktree metadata during branch sync ([codex] Preserve worktree metadata during branch sync pingdotgg/t3code#3822)e9127658a[codex] Upgrade Clerk stack ([codex] Upgrade Clerk stack pingdotgg/t3code#3821)18a41388eFix desktop native optional dependency packaging (Fix desktop native optional dependency packaging pingdotgg/t3code#3816)Conflict resolution (the only surface where this merge could introduce a bug)
Conflicted files resolved by hand:
scripts/build-desktop-artifact.ts— kept the fork's supersetcreateElectronBuilderEnv()helper (setsnpm_config_user_agentandnpm_execpath) over upstream's inline env block; upstream's newresolvePackageManagerUserAgenthelper is retained and still unit-tested.apps/server/src/orchestration/decider.ts— kept both: the fork's archived-thread invariant guard and upstream's branch-preservation logic in thethread.meta.updatecase (they are independent, non-overlapping additions).apps/mobile/eas.json— kept the fork's Expo account credentials (EXPO_OWNER/EXPO_PROJECT_ID/EXPO_UPDATES_URL) alongside upstream's newNODE_OPTIONSin every build profile.apps/mobile/src/connection/catalog-store.ts— took upstream's Effect-basedSchema.fromJsonStringserialization refactor.apps/mobile/src/connection/platform.ts— took upstream'sLayer.effectContext+MobileStorageservice +Runtime.runtimeContextLayerrestructure and grafted back the fork-localCloudflareAccessCookieInstallercapability.apps/mobile/src/connection/storage.ts— took upstream in full; the fork's inline file-basedEnvironmentCacheStoreis superseded by upstream's DB-backedenvironment-cache-store.tsmodule (wired viapersistence/layer.ts).packages/client-runtime/src/state/server.ts— kept both the fork'sSERVER_CONFIG_SUBSCRIPTION_INPUTconst and upstream's newresolveServerConfigValuefunction.packages/client-runtime/src/state/server.test.ts— union of both import sets so the merged superset test body (fork'sprojectServerConfigtests + upstream'smakeEnvironmentServerConfigState/resolveServerConfigValuetests) compiles.pnpm-lock.yaml— regenerated (--lockfile-only) against the merged manifests.Follow-on fix outside the conflict set required by upstream's interface change:
packages/client-runtime/src/state/shell-sync.test.ts— upstream feat(client): persist offline environment data and mobile preferences pingdotgg/t3code#3795 expanded theEnvironmentCacheStoreinterface withloadServerConfig/saveServerConfig/loadVcsRefs/saveVcsRefs; added those stubs to the fork-local mock stores that lacked them.Verification
vp run typecheck— greenvp check— 0 errors (14 pre-existing warnings, all in upstream-origin files)vp test run— 5769 passed, 7 skipped, 657 test files, exit 0Gated by CI + the upstream-sync policy (not the panel autoreview, which would just re-review upstream's already-reviewed code).