Repository navigation
chore: merge upstream/main (7ef7ba0e3b) - #192
Merged
Merged
Conversation
…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>
…odel rejects them (pingdotgg#39684)
…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>
…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)
…ser during dictation (pingdotgg#40253)
…was removed upstream (pingdotgg#40261)
Co-authored-by: Geezy <igor.licko@gloryck.com> Co-authored-by: Julius Marminge <julius0216@outlook.com>
…he whole Git index (pingdotgg#40268)
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
…ingdotgg#40271) Co-authored-by: Julius Marminge <julius0216@outlook.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
marked this pull request as ready for review
November 21, 2026 15:31
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Weekly upstream sync, continued by hand: merges
upstream/mainup to 7ef7ba0 (perf(server): a tracked file's Diff panel patch skips the untracked-file listing (#40304)) and the currentforkintofork.Conflicts and how they were resolved
apps/web/src/components/ChatView.tsx: kept the fork's surface wrapper and added upstream's newworkspaceRevision.packages/contracts/src/review.ts: kept both the fork'scommit-rangeand upstream'schangeType.GitVcsDriverCore.test.ts: kept both sides' tests.Follow-up fixes (web was red despite the sync script's "typecheck ✅")
gt()/<T>like upstream's. The fork's strings live in fork-owned catalogsapps/web/src/i18n/fork/[locale].json, generated byvp 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 ininitializeI18n.ts. German is translated; the other locales fall back to English. Upstream'si18n:checkdoesn't know these keys, which is expected (it is not a fork gate).SettingResetButtonnow takesariaLabel; setting rows look up their search item viaforkSearchableSetting;ContextMenuSourceis passed through in the coordinator menu;chatMarkdownImageSourceis re-exported from@t3tools/shared/markdownPipeline; the fork props lost in refactors went back ontoReadOnlyThreadTimeline(isLiveFollowLatched) andIssuesPage.no-untranslated-copy: handled by the i18n work above.no-manual-memo:ThreadParentActionsnow usesuseStableCallbackinstead of a ref and an effect.BoundedIntInputkeeps a draft only while editing.oxlint-disable … -- <why>.DatabaseMaintenancein the V1 boundaryProjectService.workspaceScanDirectoryin the toolkit mockVerification (Windows)
--no-verify.origin/fork/ the base commit: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.tsxpackages/contracts/src/review.tsGitVcsDriverCore.test.tsOrchestrator.ts(delegatedCompletionWakeDetail)DelegatedCompletionDelivery.test.tsRestartBackgroundNote.ts/testagentContextBudget.fork.jsonapps/web/src/i18n/initializeI18n.ts(fork hook)IssuesPage.tsxReadOnlyThreadTimeline.tsxchatMarkdownPipelinere-exportpackage.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