Skip to content

fix(roster): point all companion-skills at broomva/skills + drift-guard (BRO-1584)#81

Merged
broomva merged 3 commits into
mainfrom
chore/bro-1584-roster-reconcile
Jun 29, 2026
Merged

fix(roster): point all companion-skills at broomva/skills + drift-guard (BRO-1584)#81
broomva merged 3 commits into
mainfrom
chore/bro-1584-roster-reconcile

Conversation

@broomva

@broomva broomva commented Jun 29, 2026

Copy link
Copy Markdown
Owner

BRO-1584 — reconcile bstack's roster with the consolidation + guard it

After BRO-1570/1575, bstack's roster drifted: 17 of 65 entries still pointed at dead standalone repos or listed consolidated/excluded/relocated skills. Decision (with the user, after thinking it through): bstack-native skills stay in broomva/skills — bstack is a roster + installer + doctor, not a skill-source bundler (its own header: "bstack does not bundle skill source, only the roster + installer wrapper"). So the fix is the roster, not a move.

references/companion-skills.yaml (65 → 56 entries, all broomva/skills)

  • 9 standalone → broomva/skills: autonomous, cross-review, role-x, agentic-control-kernel, kg, prompt-library, p9, arcan-glass, finance-substrate
  • removed 3 consolidated into agentic-control-kernel: control-metalayer-loop, agent-consciousness, knowledge-graph-memory
  • removed 4 excluded products (symphony, symphony-forge, autoany, next-forge) + the non-skill skills-showcase + the relocated microgrid-agent
  • renamed skillsskills-catalog

tests/roster-monorepo-sync.test.sh — drift-guard

  • every entry repo == broomva/skills (single-source invariant, offline)
  • names unique
  • (opt-in BSTACK_ROSTER_CHECK_REMOTE=1) every name resolves as a skill in broomva/skillsthis is exactly how microgrid-agent + the skills→skills-catalog rename were found. Proven to catch a planted standalone-repo entry.

Also

  • references/skills-roster.md install commands reconciled to the monorepo form; 3 consolidated skills annotated; canonical-source pointer added.
  • (workspace, separate) make bstack-check now derives the required-skill list from companion-skills.yaml instead of a hardcoded list that had been failing since the consolidation.

Gates

  • drift-guard 3/3 (offline + remote resolution) · schema-valid · bstack-skills list shows 56 entries all broomva/skills · surgical diffs

🤖 Generated with Claude Code

Summary by CodeRabbit

  • New Features

    • Standardized skill installation to use the shared broomva/skills monorepo for supported entries.
    • Added a new check to help keep the skills roster aligned with the monorepo.
  • Documentation

    • Clarified that the roster YAML is the source of truth when it differs from the docs.
    • Updated install examples to the new shared command format.
  • Bug Fixes

    • Consolidated several skill entries and removed outdated standalone references to reduce roster drift.

…rd (BRO-1584)

After the BRO-1570/1575 consolidation, bstack's roster drifted — 17 of 65 entries
still pointed at dead standalone repos or listed consolidated/excluded/relocated
skills. bstack is a roster + installer, not a skill-source bundler (its own header:
"bstack does not bundle skill source, only the roster + installer wrapper"), so the
fix is the roster, not a move.

references/companion-skills.yaml (65 → 56 entries, all broomva/skills):
- 9 standalone → broomva/skills: autonomous, cross-review, role-x,
  agentic-control-kernel, kg, prompt-library, p9, arcan-glass, finance-substrate.
- removed 3 consolidated-into-agentic-control-kernel: control-metalayer-loop,
  agent-consciousness, knowledge-graph-memory.
- removed 4 excluded products (symphony, symphony-forge, autoany, next-forge),
  the non-skill tool skills-showcase, and the relocated microgrid-agent.
- renamed skills → skills-catalog.

tests/roster-monorepo-sync.test.sh — drift-guard so it can't silently rot again:
- every entry repo == broomva/skills (single-source invariant, offline)
- names unique
- (opt-in BSTACK_ROSTER_CHECK_REMOTE=1) every name resolves as a skill in
  broomva/skills — catches dangling entries (which is exactly how microgrid-agent
  and the skills→skills-catalog rename were found).

references/skills-roster.md — install commands reconciled to the monorepo form;
3 consolidated skills annotated; canonical-source pointer to companion-skills.yaml.

The bstack-native skills (p9, kg, …) stay in broomva/skills — confirmed the right
call: contract (bstack, L3, deliberate) vs implementation (skills, fast iteration),
install is flat-by-name regardless, and one monorepo gets one gate.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
@coderabbitai

coderabbitai Bot commented Jun 29, 2026

Copy link
Copy Markdown

Review Change Stack

Warning

Review limit reached

@broomva, we couldn't start this review because you've reached your PR review rate limit.

More reviews will be available in 45 minutes and 19 seconds. Learn how PR review limits work.

Your organization has used up its prepaid credits, and credit purchases are no longer available. Enable the review add-on in the billing tab to keep reviews running — you're only billed for reviews past your plan's rate limits ($0.25/file).

⌛ How to resolve this issue?

After more reviews become available, a review can be triggered using the @coderabbitai review command as a PR comment. Alternatively, push new commits to this PR.

To avoid repeated limits, reduce automatic review volume by pausing incremental auto-reviews earlier, using label-based review opt-in, excluding WIP or generated PR titles, or requesting reviews manually when the PR is ready. If your team needs uninterrupted high-volume reviews, an organization admin can enable usage-based credits.

🚦 How do rate limits work?

CodeRabbit enforces per-developer PR review limits for each organization. Most developers receive the normal plan review availability.

For paid Pro and Pro+ PR reviews, CodeRabbit uses adaptive limits for sustained high-volume activity. When a developer's recent PR review activity reaches the 95th percentile or higher among CodeRabbit users, additional reviews become available more gradually as earlier reviews age out of the rolling window.

Please see our Fair Usage Limits Policy for further information.

ℹ️ Review info
⚙️ Run configuration

Configuration used: defaults

Review profile: CHILL

Plan: Pro

Run ID: 3495a19d-4880-4ece-90b0-8aad4623774c

📥 Commits

Reviewing files that changed from the base of the PR and between 0738f1b and d73ac8f.

📒 Files selected for processing (5)
  • .github/workflows/ci.yml
  • bin/bstack-skills
  • references/skills-roster.md
  • tests/roster-monorepo-sync.test.sh
  • tests/skills-install-uses-skill-flag.test.sh
📝 Walkthrough

Walkthrough

The companion skills roster YAML is consolidated so that all skill repo fields point to the broomva/skills monorepo, with several deprecated entries removed and a new skills-catalog entry added. The human-readable roster doc is updated to match, and a new Bash test script enforces the single-repo invariant going forward.

Skills Monorepo Consolidation

Layer / File(s) Summary
YAML roster repointing and entry cleanup
references/companion-skills.yaml
Repoints autonomous, cross-review, role-x, agentic-control-kernel, kg, prompt-library, p9, arcan-glass, and finance-substrate to repo: broomva/skills; removes control-metalayer-loop, agent-consciousness, knowledge-graph-memory, symphony, symphony-forge, autoany, skills-showcase, next-forge; adds new required skills-catalog entry.
Markdown roster doc and install command updates
references/skills-roster.md
Adds canonical machine roster statement, standardizes all install commands to npx skills add broomva/skills --skill <name>, and updates Memory & Consciousness, arcan-glass, and finance-substrate table rows.
Drift-guard test script
tests/roster-monorepo-sync.test.sh
New Bash script validates all YAML entries use repo: broomva/skills, roster names are unique, and optionally resolves each name against the remote repo tree via gh CLI; exits nonzero on failures.

Estimated code review effort

🎯 2 (Simple) | ⏱️ ~10 minutes

Possibly related PRs

  • broomva/bstack#8: Modifies the prompt-library entry in references/skills-roster.md, which this PR also repoints to the broomva/skills monorepo.
  • broomva/bstack#44: Introduces the kg entry in references/companion-skills.yaml under broomva/kg, which this PR consolidates to broomva/skills.

Poem

🐇 One repo to rule them all, one monorepo true,
No more scattered skill repos — just broomva/skills will do!
I hopped through the YAML, erased the old stray,
Added a test so the drift stays away.
Now npx skills add points to one place, hooray! 🎉

🚥 Pre-merge checks | ✅ 4 | ❌ 1

❌ Failed checks (1 warning)

Check name Status Explanation Resolution
Docstring Coverage ⚠️ Warning Docstring coverage is 0.00% which is insufficient. The required threshold is 80.00%. Write docstrings for the functions missing them to satisfy the coverage threshold.
✅ Passed checks (4 passed)
Check name Status Explanation
Description Check ✅ Passed Check skipped - CodeRabbit’s high-level summary is enabled.
Title check ✅ Passed The title accurately summarizes the roster consolidation and added drift-guard test.
Linked Issues check ✅ Passed Check skipped because no linked issues were found for this pull request.
Out of Scope Changes check ✅ Passed Check skipped because no linked issues were found for this pull request.
✨ Finishing Touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests
  • Commit unit tests in branch chore/bro-1584-roster-reconcile

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.

@coderabbitai coderabbitai Bot left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actionable comments posted: 3

🤖 Prompt for all review comments with AI agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.

Inline comments:
In `@references/companion-skills.yaml`:
- Around line 19-35: The roster changes in companion-skills.yaml are not
compatible with the current installer flow because bin/bstack-skills only
consumes name and repo and then installs via the repo target alone. Update the
skill manifest and the installer together by adding a machine-readable selector
such as skillPath or by passing --skill "$name" for monorepo entries in
bin/bstack-skills, with special handling around the install path in the existing
parsing and execution logic. Keep the referenced skill entries unique so
autonomous, cross-review, role-x, kg, prompt-library, p9, skills-catalog,
arcan-glass, and finance-substrate can resolve to distinct installs again.

In `@references/skills-roster.md`:
- Around line 5-6: The human-readable roster is still out of sync with the
canonical YAML, so clean up the remaining stale entries in
references/skills-roster.md. Update or remove the outdated install rows for the
renamed/removed skills so they match references/companion-skills.yaml and the
sync test expectations, keeping the markdown table consistent with the canonical
roster. Use the existing roster sections and skill names in the doc to locate
the stale rows and replace them with the current broomva/skills install
references.

In `@tests/roster-monorepo-sync.test.sh`:
- Around line 47-48: The remote path filter in the TREE lookup is using the
wrong shape, so valid skill docs are excluded and the roster check can skip
incorrectly. Update the grep/sed pipeline in the roster sync test to match the
actual `skills/<name>/SKILL.md` contract, and keep the normalization step
aligned so it extracts just the skill name from the `gh api` tree output.
🪄 Autofix (Beta)

Fix all unresolved CodeRabbit comments on this PR:

  • Push a commit to this branch (recommended)
  • Create a new PR with the fixes

ℹ️ Review info
⚙️ Run configuration

Configuration used: defaults

Review profile: CHILL

Plan: Pro

Run ID: 8ae81366-69fc-4aaa-bb35-717f3420d251

📥 Commits

Reviewing files that changed from the base of the PR and between e29780e and 0738f1b.

📒 Files selected for processing (3)
  • references/companion-skills.yaml
  • references/skills-roster.md
  • tests/roster-monorepo-sync.test.sh

Comment thread references/companion-skills.yaml
Comment thread references/skills-roster.md Outdated
Comment thread tests/roster-monorepo-sync.test.sh
broomva and others added 2 commits June 28, 2026 20:54
…e check in CI (P20)

P20 Strata-B (6/10, CHANGES_NEEDED) on PR #81:
- Drift-guard FAILED OPEN on a corrupt/empty roster (python tracebacks went to
  stderr; $(...) captured empty stdout → read as 'clean'). Added a preflight that
  asserts the roster parses + is non-empty; verified it now FAILs on both empty
  'skills: []' and unparseable YAML.
- Remote resolution check (every roster name resolves in broomva/skills) was opt-in
  and never ran in CI. Now default-on when gh is available+authed (skips gracefully
  otherwise; =1 requires it, =0 disables); added GH_TOKEN to the CI tests job so it
  runs on PRs.
- skills-roster.md was half-reconciled: repointed the stale alkosto-wait-optimizer
  standalone install to the monorepo form; annotated the removed products
  (symphony/symphony-forge/autoany/next-forge) and skills-showcase as not-installable.

Curation itself was verified correct by the review (all 9 removals genuine,
agentic-control-kernel retained, 56 survivors all resolve).

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
…bit, PR #81)

CodeRabbit caught a real regression: repointing every roster entry to
repo: broomva/skills meant bin/bstack-skills would run a bare
'npx skills add broomva/skills' per entry — pulling the ENTIRE monorepo each
time, not the single skill. Fix: when repo == broomva/skills, install with
--skill <name>; standalone repos still install whole. Verified via a mocked npx:
all 56 entries now invoke 'broomva/skills --skill <name>'.

Also:
- tests/skills-install-uses-skill-flag.test.sh — guards the installer contract
  (mocks npx, asserts every broomva/skills install carries --skill).
- skills-roster.md banner reworded: it's a broader human catalog (also documents
  ecosystem products), not a strict mirror of the YAML; the YAML is authoritative
  for what's installable.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
@broomva broomva merged commit bd239b9 into main Jun 29, 2026
5 checks passed
@broomva broomva deleted the chore/bro-1584-roster-reconcile branch June 29, 2026 02:00
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.

1 participant