chore(sync): merge upstream main into Fold - #62
Merged
Merged
Conversation
…g#12808) Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
…off (pingdotgg#12807) Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
…s page (pingdotgg#12536) Co-authored-by: Claude Fable 5.1 <noreply@anthropic.com>
…2243) Co-authored-by: Simone <185146821+Lucenx9@users.noreply.github.com>
…2805) Co-authored-by: Claude Fable 5.1 <noreply@anthropic.com>
pingdotgg#12833) Co-authored-by: Claude Fable 5.1 <noreply@anthropic.com>
…nch (pingdotgg#12623) Co-authored-by: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com> Co-authored-by: Julius Marminge <51714798+juliusmarminge@users.noreply.github.com> Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
Brings in 21 upstream commits (adcd908..upstream/main) as a true merge. Conflicts, and how they were settled: - contracts orchestration.ts / provider.ts: Fold split upstream's orchestration.ts into chatAttachment.ts, modelSelection.ts, project.ts, and providerPolicy.ts, so upstream's edits land in those modules. The only substantive one is pingdotgg#12620 (100 attachments, 80 MiB total image budget), ported into chatAttachment.ts as getProviderAttachmentLimitError. - Normalizer.ts: stays deleted (v1). Its pingdotgg#12620 budget check moves to v2's upload path, persistChatAttachments in ws.ts, which rejects an over-budget set before writing — declared sizes are already checked against the decoded bytes there. - BranchToolbarBranchSelector: Fold extracted the combobox into a shared BranchPicker. Upstream's middle-truncated branch names (pingdotgg#12805) and Enter-activates-the-highlighted-row (pingdotgg#12526) now live in BranchPicker, via a new onSelectItem prop, so WorktreeBaseBranchPicker gets both as well. - ChatComposer: took upstream's single measured controls layout (pingdotgg#12837), keeping Fold's runtime-mode labels on the overflow menu and its Vim and voice editor imports. Upstream's Escape dismissal (pingdotgg#12836) merged in; Fold's editor already passes every key through, so Escape arrives. - ThreadPullRequestsPanel: upstream's shared row layout plus Fold's Vim-mode keyboard focus styling. - MessagesTimeline: Fold's v2 timeline has no BackgroundWorktreeSetupChip, so that popover restyle has nothing to land on. The PR-chip environmentId change merged cleanly. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
#60 folded the Integrations settings page into Tools and re-pointed its existing search entries, but the key- and mouse-press overlay entries from the upstream sync (#52) landed alongside it still aimed at /settings/integrations. That route no longer exists, which also broke web typecheck on main. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
github-actions
Bot
added
vouch:trusted
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
9 participants
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.
Problem
Fold's
mainwas 21 commits behind upstream again. Upstream kept merging while #52 waited on CI.What this does
Merges upstream
mainas a true merge commit, followingdocs/operations/upstream-sync.md. All 21 upstream commits come in, and every Fold feature is kept.Conflicts, and how they were settled
orchestration.tsinto modules, so this landed inchatAttachment.tsasgetProviderAttachmentLimitError. Upstream enforced it in the v1Normalizer, which Fold deleted. In Fold it now lives in v2's upload path (persistChatAttachments), which rejects an over-budget set before writing anything.BranchPicker, so both changes live there now, through a newonSelectItemprop. The worktree base picker gets both too.BackgroundWorktreeSetupChip, so upstream's restyle of that popover doesn't apply here. The PR-chip change merged cleanly.Also fixes a break already on
main#60 folded Integrations into the Tools page and re-pointed its search entries. The recording-overlay entries from #52 landed at the same time and still pointed at
/settings/integrations. That route no longer exists, so web typecheck is currently failing onmain. This PR points those two entries at Tools. It's a separate commit.Verification (local; CI runners are unavailable)
test:pitboss:local): 149/149.ws.ts, and they were already onmain. This merge adds none.main.Claude Opus 5 (1M context) via Claude Code in T3 Code.
🤖 Generated with Claude Code