Skip to content

chore: merge upstream/main (7ef7ba0e3b) - #192

Merged
Pawl-Patrol merged 3103 commits into
forkfrom
sync/upstream-2026-11-16-43825726982
Nov 21, 2026
Merged

Pawl-Patrol merged 3103 commits into
forkfrom
sync/upstream-2026-11-16-43825726982

Conversation

@Pawl-Patrol

@Pawl-Patrol Pawl-Patrol commented Nov 16, 2026 •

Copy link
Copy Markdown
Collaborator

Weekly upstream sync, continued by hand: merges upstream/main up to 7ef7ba0 (perf(server): a tracked file's Diff panel patch skips the untracked-file listing (#40304)) and the current fork into fork.

Conflicts and how they were resolved

  • apps/web/src/components/ChatView.tsx: kept the fork's surface wrapper and added upstream's new workspaceRevision.
  • packages/contracts/src/review.ts: kept both the fork's commit-range and upstream's changeType.
  • GitVcsDriverCore.test.ts: kept both sides' tests.

Follow-up fixes (web was red despite the sync script's "typecheck ✅")

  • i18n (upstream feat(web,mobile,desktop): translate the whole app into every supported language pingdotgg/t3code#37893): the fork's copy is wrapped in gt()/<T> like upstream's. The fork's strings live in fork-owned catalogs apps/web/src/i18n/fork/[locale].json, generated by vp run i18n:generate:fork (scripts/fork/i18n-generate.ts) and loaded on top of upstream's catalogs. The only upstream change is one hook line in initializeI18n.ts. German is translated; the other locales fall back to English. Upstream's i18n:check doesn't know these keys, which is expected (it is not a fork gate).
  • API changes: SettingResetButton now takes ariaLabel; setting rows look up their search item via forkSearchableSetting; ContextMenuSource is passed through in the coordinator menu; chatMarkdownImageSource is re-exported from @t3tools/shared/markdownPipeline; the fork props lost in refactors went back onto ReadOnlyThreadTimeline (isLiveFollowLatched) and IssuesPage.
  • Lint (59 errors):
    • no-untranslated-copy: handled by the i18n work above.
    • no-manual-memo: ThreadParentActions now uses useStableCallback instead of a ref and an effect.
    • State sync: BoundedIntInput keeps a draft only while editing.
    • One unmount effect stays, with the documented oxlint-disable … -- <why>.
  • Tests adapted to upstream behavior:

Verification (Windows)

  • Pre-commit hook fully green: fmt, lint, knip. No --no-verify.
  • Typecheck green: web, mobile, server, client-runtime, contracts, shared, all provider/source-control packages, ssh, tailscale.
  • Web unit tests touched by the change: 61 files / 640 tests green. Server: OrchestratorMcpToolkit integration 5/5, DelegatedCompletionDelivery, RestartBackgroundNote, V1ImportBoundary, delegatedTask, agentContextBudget green.
  • Environmental only, fail identically on origin/fork / the base commit:
    • Server tests: ClaudeMaintenance, DesktopUpdates, bootService/pair/up/uninstall, storageCleanup, WorktreeMcpService, ThreadLaunchService, PiDriver, CodexInstallation, antigravity
    • Desktop/mobile: CRLF, Unix-socket, tar, bash and locale failures
  • Web browser tests were not run locally (no Playwright chromium); CI covers them.

Audit of dropped fork code

1337 fork lines are missing against upstream (previously 1252). The 79 new ones are rewrites in the code upstream refactored (GuestPage/timeline, markdown pipeline, settings rows). The corresponding fork features still exist and were checked by hand.

Likely conflicts on the next sync

  • ChatView.tsx
  • packages/contracts/src/review.ts
  • GitVcsDriverCore.test.ts
  • Orchestrator.ts (delegatedCompletionWakeDetail)
  • DelegatedCompletionDelivery.test.ts
  • RestartBackgroundNote.ts/test
  • agentContextBudget.fork.json
  • the V1ImportBoundary list
  • apps/web/src/i18n/initializeI18n.ts (fork hook)
  • IssuesPage.tsx
  • ReadOnlyThreadTimeline.tsx
  • the chatMarkdownPipeline re-export
  • root package.json (i18n:generate:fork)

Upstream has gained 14 more commits since 7ef7ba0 (now b427708); the next weekly sync picks those up.

🤖 Generated with Claude Code

StiensWout and others added 29 commits November 19, 2026 23:25
…dotgg#39552)

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

Co-authored-by: MarcoDotIO <20867620+MarcoDotIO@users.noreply.github.com>
pingdotgg#39562)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
…n closes (pingdotgg#39569)

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

Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: MarcoDotIO <20867620+MarcoDotIO@users.noreply.github.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…otgg#39598)

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

Co-authored-by: Cursor <cursoragent@cursor.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…when they exit (pingdotgg#38348)

Co-authored-by: Claude Fable 5.2 <noreply@anthropic.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…a failure (pingdotgg#39596)

Co-authored-by: Ryan McDonough <Ryan@r2n.io>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…ands (pingdotgg#39618)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
…lized scroll windows (pingdotgg#39574)

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

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

Co-authored-by: Geezy <igor.licko@gloryck.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…helper (pingdotgg#39665)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
…in1 string (pingdotgg#39659)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
…security fixes (pingdotgg#39669)

Co-authored-by: Dominic Rubas <1042243+rubas@users.noreply.github.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
… usage (pingdotgg#39686)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
juliusmarminge and others added 27 commits November 21, 2026 00:53
…CODE_TANSTACK_SOURCE (pingdotgg#40207)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Generated with [Devin](https://devin.ai)

Co-Authored-By: Devin <158243242+devin-ai-integration[bot]@users.noreply.github.com>
(cherry picked from commit b32f90b)
…rt grow-in

Generated with [Devin](https://devin.ai)

Co-Authored-By: Devin <158243242+devin-ai-integration[bot]@users.noreply.github.com>
(cherry picked from commit 4ce558b)
Generated with [Devin](https://devin.ai)

Co-Authored-By: Devin <158243242+devin-ai-integration[bot]@users.noreply.github.com>
(cherry picked from commit cbc50d8)
Co-authored-by: Geezy <igor.licko@gloryck.com>
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>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…#40282)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
…7ba0

Web: fork code follows upstream's i18n (pingdotgg#37893). Fork copy is wrapped in
gt()/<T>, SettingResetButton takes ariaLabel, setting rows look up their
search item locally, and the fork's strings live in their own catalogs
(apps/web/src/i18n/fork, generated by `vp run i18n:generate:fork`, German
translated) that load on top of upstream's. The thread menu passes the new
context-menu source, the fork pipeline re-exports chatMarkdownImageSource,
and the read-only timeline and Issues panel get the fork's props. The
coordinator actions drop manual memoization, and the idle auto-compact input
keeps a draft only while editing instead of syncing it in an effect.

Tests: adapt fork tests to upstream's sender note, child-thread wording,
DatabaseMaintenance V1 reads, the SendMessage resume hint, the new
ProjectService.workspaceScanDirectory, and the grown context budget; mock
gt-react where components are called directly.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
@Pawl-Patrol Pawl-Patrol changed the title chore: merge upstream/main (47f90ee2e9) chore: merge upstream/main (7ef7ba0e3b) Nov 21, 2026
@Pawl-Patrol
Pawl-Patrol marked this pull request as ready for review November 21, 2026 15:31
@Pawl-Patrol
Pawl-Patrol merged commit 3e6a54a into fork Nov 21, 2026
2 checks passed
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.