Skip to content

Sync upstream Silo-Server/silo-plugins (6 commits) - #14

Closed
JonahMMay wants to merge 7 commits into
mainfrom
sync/upstream-2026-10-18
Closed

JonahMMay wants to merge 7 commits into
mainfrom
sync/upstream-2026-10-18

Conversation

@JonahMMay

Copy link
Copy Markdown

Rebrand-aware merge of Silo-Server/silo-plugins at 79d8dc98f3 (6 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).

Generated files taken from upstream (the regen job rebuilds them on this branch):

  • go.sum

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.

github-actions Bot and others added 7 commits October 13, 2026 21:20
…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

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

@JonahMMay

Copy link
Copy Markdown
Author

Superseded: merge pushed to sync/upstream-auto (#13).

@JonahMMay JonahMMay closed this Oct 18, 2026
@JonahMMay
JonahMMay deleted the sync/upstream-2026-10-18 branch October 18, 2026 23:07
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