Skip to content

fix: point the counts generator at nself-org/bundles #98

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
acamarata merged 1 commit into from
Sep 17, 2026
Merged

fix: point the counts generator at nself-org/bundles #98

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions counts.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
{
"_generated": "GENERATED BY plugins/scripts/plugin-counts.sh \u2014 DO NOT HAND EDIT",
"schema_version": 1,
"generated_at": "2026-09-11T10:29:19Z",
"generated_at": "2026-09-17T11:08:11Z",
"sources": {
"free": {
"repo": "nself-org/plugins",
"sha": "d5e472bc3462013e44263f4c426f2e79fee69bae"
"sha": "3029757af4b1980d2509ecd1044a1ad2e2c2b9cd"
},
"pro": {
"repo": "nself-org/plugins-pro",
"sha": "01624292e61f115ca5da3ab57a60f61129859ba2"
"repo": "nself-org/bundles",
"sha": "cc1fe6df64fa9343f4343c368216c8f055fee17e"
}
},
"free": {
Expand Down
27 changes: 17 additions & 10 deletions scripts/plugin-counts.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
# recomputing anything.
#
# Inputs:
# registry.json in this repo (free) and in a sibling ../plugins-pro
# registry.json in this repo (free) and in a sibling ../bundles
# checkout (pro, private). Each entry's own manifest
# (free|paid/<slug>/plugin.{json,yaml,yml}) supplies the installable flag.
# A registry entry may mirror that flag, but the manifest wins; if the two
Expand All @@ -25,8 +25,8 @@
# Constraints:
# --origin reads both registries (and every manifest referenced by them)
# from origin/main via `git show`, not the working tree — use this for any
# doc generation or CI, since a local plugins-pro checkout can be on a
# feature branch. Missing/unreadable ../plugins-pro is a hard failure
# doc generation or CI, since a local bundles checkout can be on a
# feature branch. Missing/unreadable ../bundles is a hard failure
# (never emits free-only numbers — that silent-drift failure mode is
# exactly what this generator exists to eliminate).
set -euo pipefail
Expand All @@ -49,12 +49,19 @@ done

root="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)" # this (free) repo root
siblings="$(dirname "$root")"
pro_repo="$siblings/plugins-pro"
# The licensed-plugin repo was renamed nself-org/plugins-pro -> nself-org/bundles
# (ADR-P6-01). Accept either sibling directory name: a clone made after the
# rename is "bundles", one made before it is still "plugins-pro" on disk and
# reaches GitHub through the rename redirect. Prefer the new name.
pro_repo="$siblings/bundles"
if [ ! -e "$pro_repo/.git" ] && [ -e "$siblings/plugins-pro/.git" ]; then
pro_repo="$siblings/plugins-pro"
fi

if [ ! -d "$pro_repo/.git" ] && [ ! -f "$pro_repo/.git" ]; then
echo "ERROR: missing sibling repo: $pro_repo" >&2
echo "This generator reads pro counts from a sibling checkout of the" >&2
echo "private nself-org/plugins-pro repo. Clone it next to this repo." >&2
echo "ERROR: missing sibling repo: $siblings/bundles" >&2
echo "This generator reads licensed-plugin counts from a sibling checkout" >&2
echo "of the private nself-org/bundles repo. Clone it next to this repo." >&2
echo "Refusing to emit free-only counts: a silently-wrong count is the" >&2
echo "exact failure this generator exists to prevent." >&2
exit 1
Expand Down Expand Up @@ -189,7 +196,7 @@ pro_report, pro_status = tier_report(pro_repo, "paid", pro_plugins)

# Overlap rule. A slug in both registries is a two-tier product: the free entry
# is its free tier, the pro entry its pro tier (e.g. cron, notify). Both sides
# must carry "tier_pair": true — plugins-pro/scripts/check-bundles-registry-
# must carry "tier_pair": true — bundles/scripts/check-bundles-registry-
# consistency.py already enforces that, so an unflagged shared slug is a data
# error rather than a second kind of overlap. One product counts once.
#
Expand All @@ -209,7 +216,7 @@ if unflagged:
"ERROR: slug(s) in both registries without tier_pair:true on both sides: "
+ ", ".join(unflagged)
+ "\nEvery shared slug must be declared a free/pro tier pair. Fix the"
" registries (see plugins-pro/scripts/check-bundles-registry-consistency.py)"
" registries (see bundles/scripts/check-bundles-registry-consistency.py)"
" rather than guessing how to count it."
)
tier_pairs = shared
Expand All @@ -229,7 +236,7 @@ result = {
).stdout.strip(),
"sources": {
"free": {"repo": "nself-org/plugins", "sha": blob_sha(free_repo, "registry.json")},
"pro": {"repo": "nself-org/plugins-pro", "sha": blob_sha(pro_repo, "registry.json")},
"pro": {"repo": "nself-org/bundles", "sha": blob_sha(pro_repo, "registry.json")},
},
"free": free_report,
"pro": pro_report,
Expand Down
Loading