merge: proper silo upstream merge for prairie-plugin-sdk - #10
Draft
JonahMMay wants to merge 13 commits into
Draft
Conversation
* feat(watchsync): expand provider plugin contract * fix(watchsync): preserve provider compatibility * docs(watchsync): define list tombstones * docs(watchsync): require snapshots for ordered lists * fix(watchsync): preserve device auth compatibility
* fix(convert): preserve capability config forms * fix(convert): preserve config metadata defaults
…Server#12) Bumps [google.golang.org/grpc](https://github.com/grpc/grpc-go) from 1.75.1 to 1.82.1. - [Release notes](https://github.com/grpc/grpc-go/releases) - [Commits](grpc/grpc-go@v1.75.1...v1.82.1) --- updated-dependencies: - dependency-name: google.golang.org/grpc dependency-version: 1.82.1 dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Silo sends metadata and image-resolver plugins a semantic image-variant hint on ResolveImageURL(s)Request and ResolveCatalogImageURLsRequest, but the vocabulary was documented nowhere and plugins hardcoded the strings. The server now supports client-selectable image sizes and will start sending "large" (~780px posters/stills, ~1280px logos/backdrops) between "featured" and "full". Export the canonical values from a new pkg/pluginsdk/imagevariant package, document the vocabulary on the proto fields and in docs, and state the two contract rules: the set is open and grows additively, and a plugin receiving an unknown variant must degrade to its nearest supported size rather than error. Additive and comment-only on the wire: the regenerated .pb.go diff is struct-field doc comments only. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
An empty variant resolves to the plugin default on the metadata-provider RPCs and the host default on the RuntimeHost RPC; the package doc claimed "host default" for all three. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
…-large feat(images): document the image-variant vocabulary and add the large tier
Address review findings on the season-scoped image gallery contract: document the Specials/season-zero presence rule on ImageRecord and the scope-not-guarantee invariant on GetImagesRequest, add compatibility guidance for presence-sensitive optional fields, replace the tautological absence assertion with an empty-message round trip, and consolidate the field-number and optional-int32 presence checks into shared test helpers. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
…ages # Conflicts: # docs/compatibility.md
…ages feat(metadata): scope image galleries to TV seasons
Resolve proto and watch-sync test conflicts, regenerate prairie pluginproto artifacts, and add silo optional-presence and watch-sync compat coverage. Co-authored-by: Jonah May <JonahMMay@users.noreply.github.com>
Merge sync branch with silo/main integrated via real merge commit so GitHub tracks upstream ancestry instead of showing perpetual commits behind silo. Co-authored-by: Jonah May <JonahMMay@users.noreply.github.com>
|
Important Draft PR not reviewedDraft PRs are not automatically reviewed by default.
To automatically review draft PRs, update your CodeRabbit configuration: reviews:
auto_review:
drafts: trueThanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out. Comment |
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
3 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
Prior silo sync PR #9 was squash-merged, so prairie-plugin-sdk stayed 11 commits behind silo on GitHub.
Solution
silo/mainintocursor/sync-silo-plugin-sdk-d673(proto + watch-sync test conflicts)pluginprotoartifacts viamake protomainwith a real--no-ffmerge commitResult: 0 behind silo, ~19 ahead, merge-base is current silo tip (
d1e3ce1).Changes
imagevarianthelper and capability server compat coverageVerification
go test ./...passes locally.Merge instructions
Use "Create a merge commit" — do NOT squash.
AI disclosure
AI-assisted conflict resolution and merge commit preparation.