Skip to content

chore: sync fork with upstream c9e9e7d36a - #31

Merged
radys-s merged 8 commits into
mainfrom
tomas/sync-upstream-2026-11-22b
Nov 22, 2026
Merged

radys-s merged 8 commits into
mainfrom
tomas/sync-upstream-2026-11-22b

Conversation

@radys-s

@radys-s radys-s commented Nov 22, 2026

Copy link
Copy Markdown
Owner

Fork main was 7 commits behind pingdotgg/t3code main: the 6 that landed while #30 was being checked, plus pingdotgg#40708.

Merged upstream main c9e9e7d36a into this branch with a real merge. Fork main (5a349ab4ae) is the first parent and was the branch head, so the PR needs no force-push. There were no conflicts: the only file both sides changed is ProviderRegistry.test.ts, where the fork's Auto-slug filter and upstream's login-shell PATH cases are in different hunks. The fork's diff against upstream is 119 files before and after the merge, with identical added and removed lines in every file. Upstream's text-generation fallback (pingdotgg#40699) and login-shell PATH refresh on provider refresh (pingdotgg#40693) were checked against the fork's Auto models and instances; neither needed a change.

Checks: vp run check:changed upstream/main passes every step (43 packages, 1605 tests in 57 files). vp run check:changed origin/main passes every step (284 tests in 11 files). vp run i18n:check passes. A scratch data dir, seeded with migrate-dev-db from a read-only copy of the live database, booted the server, completed V2 orchestration recovery and answered HTTP 302. No deploy or service restart was done.

These 7 commits change no migrations, lockfile or package manifests. Upstream moved 3 more commits during the checks (11224f63d2: pingdotgg#39822, pingdotgg#40154, pingdotgg#40703); they touch no fork file, merge without conflicts, and go in the next sync.

juliusmarminge and others added 8 commits November 21, 2026 22:14
…-foreground-muted (pingdotgg#40676)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
…gdotgg#40701)

Co-authored-by: MarcoDotIO <20867620+MarcoDotIO@users.noreply.github.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…not generate text (pingdotgg#40699)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
…s the draft (pingdotgg#40708)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
Fork main (5a349ab, after #30) was 7 upstream commits behind.
No conflicts: the only file both sides changed is
ProviderRegistry.test.ts, where the fork's Auto-slug filter in the
Claude catalog test sits apart from upstream's login-shell PATH cases.
@github-actions github-actions Bot added vouch:trusted Author is trusted by repo permissions or the VOUCHED list. size:L labels Nov 22, 2026
@radys-s
radys-s merged commit d643257 into main Nov 22, 2026
14 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

size:L vouch:trusted Author is trusted by repo permissions or the VOUCHED list.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants