Skip to content

Sync upstream silo-plugins (6 commits) - #13

Merged
JonahMMay merged 7 commits into
mainfrom
sync/upstream-auto
Oct 19, 2026
Merged

JonahMMay merged 7 commits into
mainfrom
sync/upstream-auto

Conversation

@JonahMMay

Copy link
Copy Markdown

Rebrand-aware merge of Silo-Server/silo-plugins at 3c6337680c (1 upstream commits).

Land with "Create a merge commit". Never squash. The second parent is the real upstream commit; that is what keeps the next sync small.

0 files auto-resolved (hunks: theirs 0, ours 0, same 0, superset 0, import-union 0; delete-over-noise 0).

The audit comment below lists likely compile breaks and lost Prairie lines. CI must be green, including Prairie invariants; a failing test after a sync usually means Prairie code was lost, not that the test is stale.

@JonahMMay

Copy link
Copy Markdown
Author

Upstream sync audit

check count
conflict markers 0
likely compile breaks: names used but declared nowhere 0
likely compile breaks: names declared twice 0
files with Prairie lines no longer present 0
Silo tokens added by the sync 0

Quick104 and others added 6 commits October 16, 2026 10:22
…Server#18)

Silo no longer supports Trakt (Silo-Server/silo-server#2586), and the plugin
repository is archived.

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
The catalog tool validates each plugin release with the SDK's manifest
validator. v0.27.0 accepts watch-sync max_batch_size up to 1000, so a
release that declares more than 100 can be added to the catalog.

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
6 upstream commits since cc36d2c. Rebrand-aware merge by
Prairie-Server/.github upstream-sync/prairie_sync.py (base=rebrand(merge-base), theirs=rebrand(upstream)).

Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
Conflicts resolved by hand:
	go.mod
@JonahMMay JonahMMay changed the title Sync upstream Silo-Server/silo-plugins (1 commits) Sync upstream silo-plugins (6 commits) Oct 18, 2026
@coderabbitai

coderabbitai Bot commented Oct 18, 2026

Copy link
Copy Markdown
  • Autofix · Keep fixing CodeRabbit findings and required CI, and resolving merge conflicts

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

Comment @coderabbitai help to get the list of available commands.

@JonahMMay
JonahMMay merged commit 0ce6f48 into main Oct 19, 2026
3 checks passed
@JonahMMay
JonahMMay deleted the sync/upstream-auto branch October 19, 2026 00:25
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.

2 participants