Skip to content

chore: sync upstream pingdotgg/t3code (20260720)#213

Merged
adamfgr merged 12 commits into
mainfrom
chore/upstream-sync-20260720
Jul 20, 2026
Merged

chore: sync upstream pingdotgg/t3code (20260720)#213
adamfgr merged 12 commits into
mainfrom
chore/upstream-sync-20260720

Conversation

@wizzoapp

@wizzoapp wizzoapp Bot commented Jul 20, 2026

Copy link
Copy Markdown

Nightly sync of upstream pingdotgg/t3code (12 commits, cherry-picked since 1735e27d).

Synced commits

Conflict resolution (the only surface this merge could introduce a bug in)

  1. apps/web/src/components/Sidebar.tsx — import-block collision. Kept both: fork's isProjectNotEmptyInvariant and upstream's SidebarStageBackdrop.
  2. apps/web/src/hostedPairing.ts — upstream moved DEFAULT_HOSTED_APP_URL into @t3tools/shared/connectAuth (same value, https://app.t3.codes). Dropped the now-duplicate local const, kept upstream's pairingUrl import and the fork-local Cloudflare Pages host constants.
  3. apps/server/vite.config.ts — union of pack.define entries: fork's __T3CODE_BUILD_SHA__ / __T3CODE_BUILD_VERSION__ plus upstream's __T3CODE_BUILD_CHANNEL__.
  4. .claude/skills — upstream (Make test-t3-app skill discoverable by Claude Code pingdotgg/t3code#4162) replaces the directory with a symlink to ../.agents/skills; the fork keeps real skill content there (linear-issue-fix, report-t3-bug, t3-e2e-testing, t3-test-server). Resolved by keeping the fork directory and adding a per-skill symlink .claude/skills/test-t3-app -> ../../.agents/skills/test-t3-app, which achieves upstream's discoverability goal without dropping fork skills.
  5. apps/server/src/ws.ts — union in both the RPC scope map and the handler map: fork's scheduled-task methods (subscribeScheduledTasks, setScheduledTaskEnabled, deleteScheduledTask) alongside upstream's new serverProbe.
  6. packages/client-runtime/src/rpc/session.ts — upstream renamed mapInitialConfigError -> mapSessionRpcError and widened its input to InitialConfigError | ProbeError. Took upstream's version; preserved the fork's HeaderOptionsWebSocketConstructor type (still used at line 110).

No fork production code needed changes: model routing stays registry-driven.

Verification

  • vp run typecheck — clean
  • vp check — 0 errors (1 pre-existing lint warning in SidebarUpdatePill.tsx, unchanged from the 20260718 sync)
  • vp test run689 files / 6190 tests passed, 0 failures

Per the fork's upstream-sync policy, Codex findings in files outside the conflicted set above are upstream-origin and accepted as-is.

juliusmarminge and others added 12 commits July 20, 2026 03:08
Co-authored-by: codex <codex@users.noreply.github.com>
…dotgg#4130)

Co-authored-by: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: Julius Marminge <jmarminge@gmail.com>
Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
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>
Co-authored-by: Claude Sonnet 5 <noreply@anthropic.com>
Co-authored-by: codex <codex@users.noreply.github.com>
Co-authored-by: codex <codex@users.noreply.github.com>
@wizzoapp

wizzoapp Bot commented Jul 20, 2026

Copy link
Copy Markdown
Author

@codex review

@chatgpt-codex-connector chatgpt-codex-connector Bot left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 2d4e310aeb

ℹ️ 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".

Comment thread apps/mobile/src/native/StackHeader.tsx
Comment thread apps/server/scripts/t3-sqlite-state.ts
Comment thread apps/server/src/cloud/publicConfig.ts
Comment thread apps/server/src/cloud/bootService.ts
Comment thread docs/reference/scripts.md

@adamfgr adamfgr left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Auto-approved by wizzo-approve: all policy conditions verified against HEAD 2d4e310.

@adamfgr
adamfgr merged commit 9a895aa into main Jul 20, 2026
15 of 20 checks passed
@adamfgr
adamfgr deleted the chore/upstream-sync-20260720 branch July 20, 2026 02:44
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.

7 participants