Repository navigation
Install the marketplace-verified snapshot by default in plugin add - #11242
StavWasPlayZ wants to merge 3 commits into
Conversation
omarchy plugin add now looks the repo up in the plugin marketplace catalog and checks out the verified snapshot before validating it. Unlisted, unverified, and unreachable cases install upstream HEAD with a warning, and --head installs HEAD on purpose. A verified snapshot that upstream no longer has refuses the install instead of falling back to HEAD. omarchy plugin update keeps each plugin on the track it was added with; existing checkouts keep following HEAD. Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
|
I maintain a plugin that is listed and snapshot-verified on the marketplace, and I ran into exactly the gap this PR closes. The listing page shows every visitor:
That notice is accurate and there is nothing a plugin author can do about it. So the verification pipeline is complete end to end except for the last hop, and this PR is the last hop. One detail in support of the Happy to test this against a real listed plugin if that is useful. |
omarchy plugin add --commit <sha> installs exactly that commit and records the plugin as pinned. Plain updates leave a pinned plugin where it is; omarchy plugin update <id> --commit <sha> moves the pin in either direction, and --head releases it to follow upstream HEAD. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
|
Added explicit commit pinning as suggested by @bypasser-passing in #11236 (comment) (f830da7) |
pin_to_commit runs with set -e suspended, so a failed git reset was ignored: validation passed on the old tree and the plugin was recorded and reported as pinned to a commit it was never moved to. Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com>
|
Updating here: Emailing DHH directly regarding this matter, I received confirmation that these concerns will be addressed in a future update:
Keeping this PR up just in case it becomes relevant, though I'd be more than fine closing it. |
|
Strong improvement — installing the marketplace-verified snapshot by default is the right default, and the warnings are clear that verification ≠ a security audit. One product nit while you're rebasing (conflicts with |
Discussion: #11236
The plugin marketplace verifies exact commits, but
omarchy plugin addclones whatever upstream HEAD is at that moment. The marketplace calls this out itself (VERIFICATION.md, "Installation boundary"). In the 2026-09-10 catalog, 814 of the 2,687 plugins with a verified snapshot have upstream commits past that snapshot, so the install command gives users code the marketplace never checked.This makes the existing command install what the badge describes. Nothing changes on the marketplace side: it keeps showing
omarchy plugin add <url> --enable.Behavior
omarchy plugin add <url>looks the repo up inhttps://plugins.omarchy.org/catalog.jsonbefore cloning:--head→ installs upstream HEAD with a warning, without asking the marketplace.--commit <sha>→ installs exactly that commit and pins the plugin there, without asking the marketplace. It takes a full 40-character hash, can't be combined with--head, checks the commit out before validation, and refuses if upstream doesn't have it.--headcommand for installing HEAD on purpose.omarchy plugin updatekeeps each plugin on the track it was added with, recorded asomarchy.channelin the checkout's.git/config:verified→ fast-forwards to the marketplace's newest verified snapshot (one catalog fetch for a whole bulk update). A withdrawn snapshot or delisted repo leaves the plugin where it is and names--head.head, or no channel (every checkout that exists today) → unchanged: fetchorigin HEAD, diff, confirm, fast-forward, validate, roll back on failure.pinned→ left where it is; the command prints how to move or release the pin.omarchy plugin update <id> --commit <sha>moves a plugin to that commit (forwards or backwards) and pins it: diff, confirm, refuse on local changes, validate, roll back on failure.omarchy plugin update <id> --headswitches a verified or pinned plugin to following upstream HEAD permanently.Implementation
bin/omarchy-plugin-marketplace-lookup(new, hidden): normalizeshttps://,git@github.com:andssh://GitHub URLs, fetches the catalog at most once (only when a URL names GitHub), and prints<state> <verified-commit> <upstream-commit>per URL. Only a singleroot-plugincommunity listing counts; suites, monorepos and duplicates are treated as having no usable snapshot.OMARCHY_PLUGIN_CATALOG_URLoverrides the catalog location for tests.bin/omarchy-plugin-add:--head,--commit, the lookup, per-state notices, checkout-before-validate, and the channel record.bin/omarchy-plugin-update:--head,--commit, per-channel update paths sharing one diff/confirm/merge/validate/rollback routine, and a reset-based pin move for--commit, since a pin may move backwards. The origin is read fromremote.origin.urlrather thangit remote get-url, so a user'sinsteadOfrewrites don't hide the GitHub URL.docs/omarchy-shell.mdandshell/README.mddescribe the new behavior.Tests
test/shell.d/plugin-marketplace-test.sh(21 cases, fully offline: local catalog file,url.<path>.insteadOfto redirect the github.com URL to a local upstream) covers lookup classification, verified install,--head, unverified/unlisted/unreachable warnings, refusal when the snapshot is gone upstream, verified-track updates, withdrawn snapshots,--headswitching, pre-existing checkouts staying on HEAD, and--commitpins: installing, updates leaving them alone, moving them in either direction, releasing them with--head, commits upstream doesn't have, and malformed or conflicting flags.test/shell.d/plugin-add-test.shnow points at an empty local catalog so its GitHub-URL guard cases never reach the network../test/all: the plugin, menu and CLI tests pass. Six shell test files fail in my environment (bar-icon-geometry,config,locate,runtime-smoke,snapper,unowned-system-paths), and all six fail the same way on an unmodifiedquattrocheckout.dizziee.cline-model-usageinstalled at its verified snapshotf63086268b23while upstream HEAD isf7b8b2989c2b.Notes
update --headcan't fast-forward and reports it as local changes; reinstalling works around it.🤖 Generated with Claude Code