Absorbs the GitHub release into the downstream trunk. A merge rather than a rebase so v0.1.11 becomes a real ancestor: the next sync then starts from v0.1.11 instead of the July fork point, and the eventual contribution back to GitHub can tell our commits from the upstream ones it already has. Notable conflict resolutions, 19 hunks over 14 files: * providers/litellm_provider.py takes upstream's wire_model delegation. Both sides had fixed the same gateway-prefix bug; upstream moved the logic into providers/wire.py and deleted _canonicalize_explicit_prefix, so keeping our call would reference a method that no longer exists. * cli/onboard_commands.py takes upstream's three-way file split. Our only change to that file was _NON_CREDENTIAL_CHANNEL_FIELDS, ported to its new home in cli/onboard_channels.py. * agent/loop/main.py keeps our stream reconnect loop and grafts upstream's terminal error-delta handling into it; takes upstream's _route_result_images helper, which also covers the no-vision case our inline version did not, and keeps our read_skill/use_skill reporting; takes upstream's ordering that routes before assembly, since assembly decides whether an attachment is inlined as a picture, while keeping our per-session model override. * agent/subagent/manager.py keeps our backend dispatch and spawn history, and threads the provider/model pair spawn snapshots into backend.run so a live /model switch reaches subagents. The SubagentBackend protocol gained the pair as optional keywords, travelling per call for the same reason workspace already does. Three breakages git merged cleanly and never flagged: * web_rpc/methods_config.py imported six EverOS symbols from onboard_commands, which upstream moved to onboard_everos. * tui_rpc/methods/turn.py passed a single directory to _resolve_path, whose third parameter we had changed to a tuple. Left as it was, an attachment was dropped in silence whenever restrict_to_workspace is on. * config/schema.py carried a second configuredness rule next to the one upstream routes through providers.auth, so routing bypassed the endpoints-first check and read a flat key that no request would use. It now delegates, with include_external for parity with list_providers. Verification: uv run ruff check passes; uv run pytest reports 6823 passed and 4 failed. All four fail on origin/main as well (one theme assertion, three channel QR cases) and are left for a separate fix. Upstream's own 53 changed test files pass, and so do our 85, which is what pins both sides' semantics through these resolutions. Co-authored-by: Claude (claude-opus-5) <noreply@anthropic.com>
601 B
601 B
Summary
Type
- Fix
- Feature
- Docs
- CI / tooling
- Refactor
- Other
Verification
- Relevant tests pass locally
- Relevant lint / type checks pass locally
- User-facing docs or screenshots are updated when needed
Risk
- Security impact considered
- Backward compatibility considered
- Rollback path is clear for risky changes