Skip to content

chore: sync with upstream/main (aced664ed) - #94

Merged
Fryuni merged 227 commits into
mainfrom
fryuni/merge-upstream-preserve-fork-intent-4
Nov 19, 2026
Merged

Fryuni merged 227 commits into
mainfrom
fryuni/merge-upstream-preserve-fork-intent-4

Conversation

@Fryuni

@Fryuni Fryuni commented Nov 19, 2026

Copy link
Copy Markdown
Owner

Problem

The fork is 226 commits behind upstream/main. This sync keeps the features recorded in docs/adr and uses upstream's implementation wherever it can.

Change

Merged pingdotgg/t3code main at aced664ed. 29 files had conflicts. git show --remerge-diff dc1ad38371 shows the whole resolution.

Workflows (ADR 0011). Upstream changed no workflows in this range. Only ci-changes.cjs (new shared git test helpers) and VOUCHED.td came in under .github.

Implemented upstream. No upstream commit in this range supersedes an ADR, in whole or in part.

Translated fork copy (new ADR 0030). Upstream translated the whole app into every supported language (pingdotgg#37893), and most conflicts were upstream's i18n wrapping against fork copy. Each one keeps upstream's wrapping and the fork's feature:

  • "Check out in worktree" (ADR 0008), on web and mobile;
  • default base branch (ADR 0009);
  • the --public-url notice and Public URL endpoint (ADR 0010);
  • "updates from its own releases" (ADR 0011);
  • "Show project's PRs" (ADR 0014);
  • Add checkout (ADR 0022);
  • the provider sync notice (ADR 0024);
  • "Never" for worktree cleanup (ADR 0028).

t3code/no-untranslated-copy now fails lint on unwrapped copy. About 25 web keys and 8 mobile keys are translated by hand into all 9 locales, using upstream's terms. vp run i18n:check passes.

Re-homed on upstream's structure

  • ADR 0023. The mobile slash menu, outbox imports and web/fan-out title seeds keep the fork's leading-command split under upstream's new resolver arguments.
  • ADR 0007. Both sides' new mobile model-option tests are kept.
  • ADR 0022. Upstream's isAbsolutePath sits next to withoutRemoteCredentials and normalizeProjectPathForComparison.
  • ADR 0016. mcpToolListJsonBytes is 58,326, which is upstream's 57,321 plus the fork's unchanged 1,005. AgentContextBudget.test.ts measures it.

Fixes for new upstream interactions

  • ADR 0024: cross-environment provider sync never ran. Upstream fix(web): retain custom model drafts until saved pingdotgg/t3code#35176 made updateInstance return the save result. An earlier sync left the fork's syncInstance call after that return, so it was unreachable on fork main. Provider edits stopped reaching other environments. The handler now starts the sync and returns the source write's result. Lint's no-unreachable caught it.
  • ADR 0010: false plain-HTTP warning. Upstream fix(server): warn when t3 serve advertises a plain-HTTP network address pingdotgg/t3code#38813 warns at headless startup that any non-loopback address "uses plain HTTP". With an https --public-url that warning is false. It is now skipped for HTTPS. The fork's existing public-URL startup test gained an assertion, which failed before the fix.
  • ADR 0009. Upstream renamed SettingResetButton's label to ariaLabel, and the default base branch row follows.

ADRs. All ADRs now compare against aced664ed. Notes were added in 0010, 0016 and 0024. New ADR 0030 records how fork copy is translated on future syncs.

Verification

  • vp run check:changed upstream/main:
    • Format, lint, knip, GraphQL, typecheck (42 packages) and the React compiler pass.
    • Tests: 4,143 pass and 3 fail, all in GitManager.test.ts. The 3 pass with GIT_CONFIG_GLOBAL=/dev/null. They fail because of this host's global url.*.insteadOf rules, as the previous sync recorded.
  • vp run i18n:check passes for web, mobile and desktop.
  • AgentContextBudget.test.ts and startupAccess.test.ts pass.

Not run locally:

  • Browser tests: Chromium cannot start on this NixOS host because libglib-2.0.so.0 is missing. CI runs them.
  • a manual pass in a real client;
  • the mcp-tool-use eval;
  • the fork release workflow end to end.

Translations are machine-authored and unreviewed by a native speaker.

Model: Claude Opus 5.5; harness: Claude Code in T3 Code.

🤖 Generated with Claude Code

shivamhwp and others added 30 commits November 17, 2026 13:55
…otgg#38329)

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

Co-authored-by: Simone <185146821+Lucenx9@users.noreply.github.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…nger freezes the thread (pingdotgg#38368)

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

Co-authored-by: Simone <185146821+Lucenx9@users.noreply.github.com>
…dotgg#38387)

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…tgg#38393)

Co-authored-by: Simone <185146821+Lucenx9@users.noreply.github.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…eading (pingdotgg#38397)

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

Co-authored-by: Grok 4.7 <noreply@x.ai>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…failed (pingdotgg#38423)

Co-authored-by: Grok 4.7 <noreply@x.ai>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
… renders (pingdotgg#38458)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
…poser (pingdotgg#38443)

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

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
StiensWout and others added 24 commits November 18, 2026 23:04
pingdotgg#38980)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
…laced (pingdotgg#38978)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
…th (pingdotgg#24683)

Co-authored-by: maria-rcks <maria@kuuro.net>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…ished states (pingdotgg#38986)

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

Co-authored-by: DominikScholz <12826585+DominikScholz@users.noreply.github.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…ady loaded (pingdotgg#39000)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
…ails (pingdotgg#38995)

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

Co-authored-by: Julius Marminge <julius0216@outlook.com>
…ch (pingdotgg#39012)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…onnections (pingdotgg#38974)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…gg#39007)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
…lost (pingdotgg#39018)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
…hived one (pingdotgg#38984)

Co-authored-by: Grok 4.7 <noreply@x.ai>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…eUsage (pingdotgg#39024)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
Copilot AI balanced review requested due to automatic review settings November 19, 2026 10:23

Copilot AI 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.

Copilot was unable to review this pull request because the user who requested the review has insufficient remaining quota. Try requesting a review at a lower effort level.

@chatgpt-codex-connector

chatgpt-codex-connector Bot commented Nov 19, 2026 •

Copy link
Copy Markdown
Codex Review Summary: ✅ Completed

This comment shows the latest Codex review activity on this pull request.

Review Status Commit Review trigger
📝 Code Review ✅ Completed 2026-11-19T10:28:23.286098Z dc1ad38 PR opened
ℹ️ About Codex in GitHub

Your team has set up Codex to 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" or "@codex security review".

Codex reacts with 👀 while any review is running, comments if it has suggestions, and reacts with 👍 once all reviews finish with no findings.

@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: dc1ad38371

ℹ️ About Codex in GitHub

Your team has set up Codex to 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 👍.

Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".

Comment thread apps/server/src/auth/EnvironmentAuth.ts Resolved
@Fryuni
Fryuni merged commit 5c930a9 into main Nov 19, 2026
8 of 9 checks passed
@Fryuni
Fryuni deleted the fryuni/merge-upstream-preserve-fork-intent-4 branch November 19, 2026 10:35
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.