Skip to content

chore: sync with upstream/main (2ebe7f8e2) - #92

Merged
Fryuni merged 254 commits into
mainfrom
fryuni/merge-upstream-preserve-fork-intent-3
Nov 17, 2026
Merged

Fryuni merged 254 commits into
mainfrom
fryuni/merge-upstream-preserve-fork-intent-3

Conversation

@Fryuni

@Fryuni Fryuni commented Nov 17, 2026

Copy link
Copy Markdown
Owner

Problem

The fork is 253 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 2ebe7f8e2. 20 files had conflicts. git show --remerge-diff 07ebe64868 shows the whole resolution.

Workflows (ADR 0011). Upstream changed four mobile workflows that the fork does not ship, and they are dropped again. Upstream's three new composite actions are dropped too: drop-checkout-credentials, eas-local-build and record-build-tag. Only those workflows use them. ci.yml takes upstream's new Linear GraphQL and i18n catalog checks. The version core is now 0.1.10, which the ADR records.

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

Re-homed on upstream's structure

Fixes for new upstream interactions

  • ADR 0004. Upstream perf(pr): PR panel paints from saved data and reads ahead on intent pingdotgg/t3code#32911 moved PR link resolution into pullRequestLinkPanelTarget, which no longer took a project, so the fork's line failed typecheck. The helper now takes an optional projectId. The thread PR panel's new read-ahead passes the thread's project, so it warms the same project a click opens.
  • ADR 0020. Upstream's new 1 MB tea page test runs every process call through a fake API. The fork's git config read hit it, and the fake now answers that read with no configured URL, as the fork's other tests do.

ADRs

All ADRs now compare against 2ebe7f8e2. Notes were added in 0002, 0004, 0008, 0009, 0011, 0014, 0016, 0017, 0020 and 0023.

Verification

  • vp run check:changed origin/main:
    • Format, lint, knip, unused patches, GraphQL, typecheck (42 packages) and the React compiler pass.
    • Tests: 9,977 pass and 33 fail, in 6 files. Five of those files are byte-identical to upstream:
      • The SSH launcher, install.sh and setup-script tests fail because NixOS has no /bin/bash, mkdir or uname on the sandboxed path.
      • GitVcsDriver and RepositoryIdentityResolver fail because of the host's global url.*.insteadOf. They pass with GIT_CONFIG_GLOBAL=/dev/null.
    • The sixth, GitVcsDriverCore, failed one output-cap line count under full-suite load and passes alone.
  • Targeted server files (37): these pass apart from 3 cases in RelayClientLedger and serviceProtection. Those files match upstream, and the cases fail for lack of /bin/ps and mkdir.
  • Packages, all passing:
    • source-control-forgejo, source-control-core, shared, contracts, client-runtime, provider-pi.
  • Web, all passing:
    • 18 unit files (674 tests);
    • 13 browser files (94 tests) in Chromium, including the fork's PR opener, sidebar, command palette and selection tests.
  • Mobile: 4 outbox and draft files (157 tests) pass.
  • Desktop: 2 files (33 tests) pass.

Not run locally:

  • a manual pass in a real client;
  • the mcp-tool-use eval;
  • the fork release workflow end to end;
  • the full web, mobile and server suites, which CI runs.

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

🤖 Generated with Claude Code

juliusmarminge and others added 30 commits November 16, 2026 05:19
…oaded" (pingdotgg#37651)

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

Co-authored-by: Julius Marminge <julius0216@outlook.com>
…he id (pingdotgg#37493)

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

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

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

Co-authored-by: maria-rcks <maria@kuuro.net>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: Marker-bit <Marker-bit@users.noreply.github.com>
…gdotgg#37703)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: screen <screen@users.noreply.git.cafe>
Co-authored-by: Devin <158243242+devin-ai-integration[bot]@users.noreply.github.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…ead (pingdotgg#37735)

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

Co-authored-by: Usama Khan <usama@Usamas-MacBook-Pro.local>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: Claude Fable 5.2 <noreply@anthropic.com>
…heir project (pingdotgg#37682)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
nikalezah and others added 24 commits November 17, 2026 10:27
pingdotgg#38250)

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

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

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>
…g#38313)

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

Co-authored-by: Julius Marminge <julius0216@outlook.com>
…ed attempt (pingdotgg#38334)

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

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

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 17, 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-17T22:30:24.969023Z 07ebe64 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: 07ebe64868

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

@Fryuni
Fryuni merged commit 481f1d2 into main Nov 17, 2026
9 checks passed
@Fryuni
Fryuni deleted the fryuni/merge-upstream-preserve-fork-intent-3 branch November 17, 2026 22:38
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.