Skip to content

chore: sync upstream pingdotgg/t3code#232

Merged
adamfgr merged 2 commits into
mainfrom
chore/upstream-sync-20260722
Jul 22, 2026
Merged

chore: sync upstream pingdotgg/t3code#232
adamfgr merged 2 commits into
mainfrom
chore/upstream-sync-20260722

Conversation

@wizzoapp

@wizzoapp wizzoapp Bot commented Jul 22, 2026

Copy link
Copy Markdown

Nightly upstream sync of pingdotgg/t3code → fork main.

Synced commits (cherry-picked c0bb237..62cf461)

Conflict resolution

The only files where our resolution could introduce a bug (everything else applied cleanly):

  • apps/web/src/components/chat/ChatComposer.tsx — the disabled prop line was already identical on both sides (fork had removed environmentUnavailable earlier with an explanatory comment; upstream fix(web): keep composer editable while disconnected pingdotgg/t3code#4241 does the full change). Kept upstream's behaviour plus the fork's local comment documenting the queue-while-disconnected rationale.
  • apps/server/src/vcs/GitVcsDriverCore.ts — the fork uses its remoteRefEntries structure for remote-branch listing; grafted upstream fix: better defaults — Claude 1M context, Codex gpt-5.6, worktrees from origin main pingdotgg/t3code#4240's origin/<default>isDefault computation onto that structure (defaultBranch !== null && parsedRemoteRef?.remoteName === "origin" && parsedRemoteRef.branchName === defaultBranch). Upstream's combined-branches re-sort hunk applied cleanly.
  • apps/server/src/vcs/GitVcsDriverCore.test.ts — kept the fork's superset of tests (broken remote-tracking ref, missing local ref target) AND added upstream's new test ("marks the origin default ref as default when no local copy exists").

Verification (all green)

  • vp run typecheck
  • vp check ✓ (0 errors)
  • vp test run ✓ — 703 test files passed, 6547 tests passed / 22 skipped

Gated by CI + the upstream-sync procedure (no panel autoreview on sync PRs).

t3dotgg and others added 2 commits July 22, 2026 03:08
Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
…om origin main (pingdotgg#4240)

Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
@wizzoapp

wizzoapp Bot commented Jul 22, 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: 2df8d0415c

ℹ️ 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/web/src/components/chat/ChatComposer.tsx

@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 2df8d04.

@adamfgr
adamfgr merged commit f2c2ca6 into main Jul 22, 2026
12 checks passed
@adamfgr
adamfgr deleted the chore/upstream-sync-20260722 branch July 22, 2026 02:51
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.

2 participants