Skip to content

Merge upstream changes into sync branch - #11

Merged
hyrmedia-hector merged 216 commits into
mainfrom
sync/upstream-2026-10-30
Oct 30, 2026
Merged

hyrmedia-hector merged 216 commits into
mainfrom
sync/upstream-2026-10-30

Conversation

@hyrmedia-hector

@hyrmedia-hector hyrmedia-hector commented Oct 30, 2026 •

Copy link
Copy Markdown
Collaborator

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 main into sync/upstream-2026-10-30. Resolved conflicts by keeping the existing fork migration ids 74 and 75 and assigning upstream's SubagentDeliveryState migration id 76. Kept the LiteLLM launcher alongside upstream's secret environment and config changes, and retained both error types in failure.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


View with [code]smith Autofix with [code]smith
Need help on this PR? Tag @codesmith-bot with what you need.

juliusmarminge and others added 30 commits October 30, 2026 11:43
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]>
…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]>
…minal regardless of path casing (pingdotgg#21545)

Co-authored-by: Claude Opus 5.5 <[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]>
… 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]>
…r per command (pingdotgg#22123)

Co-authored-by: Claude Opus 5.5 <[email protected]>
Co-authored-by: maria-rcks <[email protected]>
juliusmarminge and others added 29 commits October 30, 2026 14:25
…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]>
… 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]>
…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: 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]>
SubagentDeliveryState moves to migration 76: Hardened releases already
recorded 74 and 75, and the migrator skips ids at or below the latest.
@hyrmedia-hector
hyrmedia-hector merged commit cbce0aa into main Oct 30, 2026
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.