merge: sync upstream through f8b4c464b4 (classic-merge) - #453
Merged
Conversation
…gdotgg#9965) Co-authored-by: Claude Fable 5.1 <noreply@anthropic.com>
22 commits after #452: imported custom-provider resume, OpenCode revert from the first removed assistant message, desktop LAN vs Tailscale pairing, and Knip unused-export audits.
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
6 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.
Classic-merge of
pingdotgg/t3codemain(f8b4c464b4) intofork/dev.Land with
gh pr merge --merge(never squash). This preserves the merge's second parent sofork/dev..upstream/mainstays honest.Follow-up to #452.
Incoming
22 commits after #452, including:
d92dca74ebresume imported custom-provider threads (fix(web): resume imported custom-provider threads pingdotgg/t3code#10184)4ca71463a2OpenCode revert from the first removed assistant message (fix(opencode): revert from the first removed assistant message pingdotgg/t3code#9924)0d8a91a25acache successful Cursor model discovery between refreshes (fix(cursor): cache successful model discovery between refreshes pingdotgg/t3code#9918)60e1b73948separate LAN and Tailscale pairing endpoints (fix(desktop): separate LAN and Tailscale pairing endpoints pingdotgg/t3code#9882)be7796d867scale agent spawn rows with interface font (fix(web): scale agent spawn rows with interface font pingdotgg/t3code#10092)bd7f7ea093keep bulk thread deletion going after failures (fix(web): keep bulk thread deletion going after failures pingdotgg/t3code#4615)Weld
3-way (never whole-file ours/theirs):
SetSessionModeRpc(fork Grok setMode) beside knip-privateSetSessionConfigOptionRpc.directoryon revert while taking fix(opencode): revert from the first removed assistant message pingdotgg/t3code#9924's first-removed-assistant-message targeting.Causediagnostics beside fix(cursor): cache successful model discovery between refreshes pingdotgg/t3code#9918 model-discovery cache.Do not squash