Repository navigation
Merge upstream changes into sync branch - #11
Merged
Merged
Conversation
…ollers skip work (pingdotgg#27711) Co-authored-by: Claude Opus 5.5 <[email protected]>
Co-authored-by: Ben Smith <[email protected]> Co-authored-by: GLM-5.3 (Z.ai ACP) <[email protected]> Co-authored-by: Claude Opus 5.5 <[email protected]> Co-authored-by: maria-rcks <[email protected]> Co-authored-by: maria-rcks <[email protected]>
…10 (pingdotgg#21315) Co-authored-by: maria-rcks <[email protected]>
…pingdotgg#21325) Co-authored-by: Claude Opus 5.5 <[email protected]>
…creation (pingdotgg#21337) Co-authored-by: maria-rcks <[email protected]> Co-authored-by: maria-rcks <[email protected]>
…tgg#21430) Co-authored-by: Claude Opus 5.5 <[email protected]> Co-authored-by: GPT-6.1 Sol <[email protected]> Co-authored-by: maria-rcks <[email protected]> Co-authored-by: maria-rcks <[email protected]>
…tgg#21443) Co-authored-by: Claude Opus 5.5 <[email protected]> Co-authored-by: GPT-6.1 Sol <[email protected]> Co-authored-by: maria-rcks <[email protected]>
…ngdotgg#21478) Co-authored-by: Claude Opus 5.5 <[email protected]> Co-authored-by: maria-rcks <[email protected]>
…ipboard (pingdotgg#21537) Co-authored-by: Claude Opus 5.5 <[email protected]> Co-authored-by: maria-rcks <[email protected]>
…minal regardless of path casing (pingdotgg#21545) Co-authored-by: Claude Opus 5.5 <[email protected]>
…g#21594) Co-authored-by: maria-rcks <[email protected]>
…dotgg#21650) Co-authored-by: Claude Opus 5.5 <[email protected]> Co-authored-by: GPT-6.1 Sol <[email protected]> Co-authored-by: maria-rcks <[email protected]>
…ingdotgg#21654) Co-authored-by: Le Jsessy <[email protected]> Co-authored-by: maria-rcks <[email protected]>
… is still on the account (pingdotgg#21706) Co-authored-by: Rodrigo Brechard <[email protected]> Co-authored-by: Claude Opus 5.5 <[email protected]> Co-authored-by: maria-rcks <[email protected]>
…client's report (pingdotgg#21745) Co-authored-by: maria-rcks <[email protected]>
…gg#21894) Co-authored-by: maria-rcks <[email protected]>
…otgg#21903) Co-authored-by: Claude Opus 5.5 <[email protected]> Co-authored-by: maria-rcks <[email protected]>
…tgg#21920) Co-authored-by: maria-rcks <[email protected]>
pingdotgg#21988) Co-authored-by: Claude Opus 5.5 <[email protected]>
…ingdotgg#22029) Co-authored-by: Claude Opus 5.5 <[email protected]> Co-authored-by: GPT-6.1 Sol <[email protected]> Co-authored-by: maria-rcks <[email protected]>
…adata (pingdotgg#22044) Co-authored-by: Claude Opus 5.5 <[email protected]>
…ped names (pingdotgg#22053) Co-authored-by: Claude Opus 5.5 <[email protected]>
…ranch (pingdotgg#22098) Co-authored-by: GPT-6.1 Sol <[email protected]> Co-authored-by: maria-rcks <[email protected]>
…tgg#22115) Co-authored-by: GPT-6.1 Sol <[email protected]> Co-authored-by: maria-rcks <[email protected]>
…r per command (pingdotgg#22123) Co-authored-by: Claude Opus 5.5 <[email protected]> Co-authored-by: maria-rcks <[email protected]>
Co-authored-by: Claude Opus 5.5 <[email protected]> Co-authored-by: maria-rcks <[email protected]>
…gg#22134) Co-authored-by: maria-rcks <[email protected]>
Co-authored-by: Claude Opus 5.5 <[email protected]>
…g#22062) Co-authored-by: Claude Opus 5.5 <[email protected]> Co-authored-by: maria-rcks <[email protected]> Co-authored-by: maria-rcks <[email protected]>
…22339) Co-authored-by: GPT-6.1 Sol <[email protected]> Co-authored-by: maria-rcks <[email protected]>
…ingdotgg#22340) Co-authored-by: GPT-6.1 Sol <[email protected]> Co-authored-by: maria-rcks <[email protected]>
…ingdotgg#23274) Co-authored-by: Claude Opus 5.5 <[email protected]> Co-authored-by: maria-rcks <[email protected]>
…3351) Co-authored-by: Claude Opus 5.5 <[email protected]> Co-authored-by: maria-rcks <[email protected]>
…gdotgg#23475) Co-authored-by: GPT-6.1 Sol <[email protected]> Co-authored-by: maria-rcks <[email protected]>
…ingdotgg#27817) Co-authored-by: Claude Opus 5.5 <[email protected]>
Co-authored-by: GPT-6.1 Sol <[email protected]> Co-authored-by: maria-rcks <[email protected]>
…her instance (pingdotgg#23957) Co-authored-by: maria-rcks <[email protected]>
…ingdotgg#24106) Co-authored-by: GPT-6.1 Sol <[email protected]> Co-authored-by: Claude Opus 5.5 <[email protected]> Co-authored-by: maria-rcks <[email protected]>
… ms (pingdotgg#24502) Co-authored-by: Claude Opus 5.5 <[email protected]> Co-authored-by: ayagmar <[email protected]> Co-authored-by: maria-rcks <[email protected]> Co-authored-by: maria-rcks <[email protected]>
…mes at the reset (pingdotgg#24634) Co-authored-by: maria-rcks <[email protected]>
…ngdotgg#24697) Co-authored-by: Claude Opus 5.5 <[email protected]> Co-authored-by: maria-rcks <[email protected]>
…gg#25306) Co-authored-by: GPT-6.1 Sol <[email protected]> Co-authored-by: maria-rcks <[email protected]>
Co-authored-by: maria-rcks <[email protected]>
…g#23695) Co-authored-by: Tejas Parmar <[email protected]> Co-authored-by: maria-rcks <[email protected]> Co-authored-by: maria-rcks <[email protected]>
Co-authored-by: maria-rcks <[email protected]> Co-authored-by: maria-rcks <[email protected]>
…23436) Co-authored-by: GPT-6.1 Sol <[email protected]> Co-authored-by: maria-rcks <[email protected]>
…#25028) Co-authored-by: Alex Southwell <[email protected]> Co-authored-by: maria-rcks <[email protected]>
…25231) Co-authored-by: Alex <[email protected]>
…gg#23594) Co-authored-by: GPT-6.1 Sol <[email protected]> Co-authored-by: maria-rcks <[email protected]>
Co-authored-by: maria-rcks <[email protected]>
…ingdotgg#26937) Co-authored-by: maria-rcks <[email protected]> Co-authored-by: maria-rcks <[email protected]>
…dotgg#27831) Co-authored-by: maria-rcks <[email protected]>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: maria-rcks <[email protected]> Co-authored-by: maria-rcks <[email protected]>
…ovider (pingdotgg#27746) Co-authored-by: Julius Marminge <[email protected]> Co-authored-by: Claude Opus 5.5 <[email protected]> Signed-off-by: Yordis Prieto <[email protected]>
…mposer layout reads (pingdotgg#27823) Co-authored-by: Claude Opus 5.5 <[email protected]>
SubagentDeliveryState moves to migration 76: Hardened releases already recorded 74 and 75, and the migrator skips ids at or below the latest.
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.
Problem
The sync branch was behind upstream and needed the latest changes. The migration and provider files had conflicts that required resolution before the branch could be used.
Change
Merged upstream
mainintosync/upstream-2026-10-30. Resolved conflicts by keeping the existing fork migration ids 74 and 75 and assigning upstream'sSubagentDeliveryStatemigration id 76. Kept the LiteLLM launcher alongside upstream's secret environment and config changes, and retained both error types infailure.ts.Scope and approval
This is a focused upstream sync. It contains no independent feature changes.
Verification
Typecheck passed for 39 packages; lint, knip, and format passed. Seven tests failed in
check:changed; the same failures occurred on a clean upstream checkout, so they are not caused by this merge. The failing cases cover CLI installation ownership, Pi and Codex usage, Git worktree naming, Claude plugin skill discovery, and desktop artifact probing.GPT-6 / Codex
Need help on this PR? Tag
@codesmith-botwith what you need.