Merge pull request #831 from aRustyDev/pr/2-phases-8-9-catalog

feat: Phases 8-9 + catalog pipeline refactor

Author: aRustyDev

.github/pre-commit/ruff.toml

@@ -12,9 +12,9 @@ exclude = [
     "node_modules",
     "dist",
     "build",
-    "context/.context",
-    "context/skills/**/examples",
-    "context/skills/**/references",
+    "content/.context",
+    "content/skills/**/examples",
+    "content/skills/**/references",
 ]
 
 [lint]
@@ -43,6 +43,9 @@ ignore = [
 [lint.per-file-ignores]
 ".scripts/**/*.py" = ["T201"]  # Allow print in scripts
 "tests/**/*.py" = ["S101"]    # Allow assert in tests
+"packages/cli/*.py" = [
+    "ARG001", "B007", "PLR0911",  # Utility scripts with flexible patterns
+]
 # Agent code has dynamic imports and internal patterns
 ".claude/agents/**/*.py" = [
     "ARG001", # Unused function args (hook signatures)
@@ -71,6 +74,15 @@ ignore = [
     "UP038",  # isinstance union style
 ]
 ".claude/agents/**/tests/*.py" = ["S101"]  # Allow assert in tests
+# content/agents has same patterns as .claude/agents
+"content/agents/**/*.py" = [
+    "ARG001", "ARG002", "ARG003", "ARG005",
+    "B007", "B011", "B904", "C416", "E402",
+    "PLR0912", "PLR0915", "PLW0603", "PLW2901",
+    "PTH123", "RUF001", "RUF005", "RUF012", "RUF022",
+    "SIM102", "SIM103", "SIM105", "SIM115", "SIM117", "UP038",
+]
+"content/agents/**/tests/*.py" = ["S101"]
 
 [lint.isort]
 known-first-party = [".scripts"]

.github/pre-commit/words/project.txt

@@ -14,6 +14,7 @@ asciinema
 ashleytower
 atcyrus
 awesomeclaude
+backfillable
 BehiSecc
 biome
 blader
@@ -25,6 +26,7 @@ bunx
 burpsuite
 cchooks
 cclint
+ccflare
 ccpm
 CHANGEME
 chunker
@@ -39,6 +41,7 @@ codebase
 codebases
 codecov
 codegraph
+compdef
 Composio
 Cpath
 crawl4ai
@@ -57,10 +60,14 @@ DTCG
 Duplicat
 elec
 embeddings
+ename
+eslug
+etype
 etypes
 fastmcp
 FDTD
 ffuf
+filetree
 Floorplan
 flowgpt
 forceatlas
@@ -92,7 +99,9 @@ jqueryscript
 justfile
 kwsites
 lackeyjb
+lastrowid
 LAPACK
+lintable
 litdb
 Livelocks
 lockfiles
@@ -112,6 +121,8 @@ mihaelamj
 modelcontextprotocol
 monorepo
 mousemovebody
+mycomponent
+mycomponentv
 myns
 myproject
 myskill
@@ -125,6 +136,7 @@ ollama
 onlynamespace
 opto
 orbstack
+orgname
 overclaiming
 pargs
 pdate
@@ -154,6 +166,8 @@ pytestmark
 radon
 rahulvrane
 recieve
+rels
+reclassifiable
 reprioritize
 rereview
 ripgrep
@@ -171,16 +185,19 @@ shellharden
 shfmt
 simctl
 skillmd
+skillsize
 skillsmp
 slugified
 smithery
+smol
 sonnet
 Sortability
 sourcekit
 sqlfluff
 sqlite
 STDP
 subagent
+subdirs
 subviews
 Sundell
 surrealdb
@@ -193,6 +210,7 @@ swiftui
 SwiftUI
 Tauri
 tenequm
+testuser
 timebox
 tmppath
 tokei
@@ -242,8 +260,3 @@ yamllint
 yara
 zeroize
 Zotero
-reclassifiable
-backfillable
-subdirs
-filetree
-skillsize

.github/pre-commit/words/tools.txt

@@ -35,6 +35,7 @@ citty
 clojars
 codefuse
 codegen
+compdef
 coderabbit
 colorlinks
 Columnstore

CLAUDE.md

@@ -30,7 +30,7 @@ brew bundle
 
 Add new tools to `brewfile`, not installed ad-hoc.
 
-### TypeScript Dependencies (cli/package.json)
+### TypeScript Dependencies (packages/cli/package.json)
 
 TypeScript tooling is managed via Bun:
 
@@ -39,13 +39,13 @@ TypeScript tooling is managed via Bun:
 cd packages/cli && bun install
 
 # Run the CLI tool
-bun run packages/cli/src/bin/agents.ts <noun> <verb> [args]
+bun run packages/cli/src/bin/agents.ts <verb> <type> [args]
 
 # Or via justfile
-just agents <noun> <verb> [args]
+just agents <verb> <type> [args]
 
 # Run tests
-cd packages/cli && bun test
+bun test --cwd packages/cli
 ```
 
 The `bun.lock` file is version controlled for reproducible installs.
@@ -89,6 +89,8 @@ See `docs/src/adr/` for architecture decisions.
 ├── brewfile                    # Tool dependencies (Homebrew)
 ├── pyproject.toml              # Python dependencies (uv)
 ├── justfile                    # Task runner
+├── package.json                # Root workspace (Bun)
+├── bun.lock                    # Lockfile (version controlled)
 ├── CLAUDE.md                   # This file
 ├── .data/
 │   └── mcp/
@@ -99,15 +101,19 @@ See `docs/src/adr/` for architecture decisions.
 │   ├── commands/               # Slash commands
 │   ├── skills/                 # SKILL.md files
 │   ├── rules/                  # Rule files
+│   ├── hooks/                  # Hook scripts
 │   ├── plugins/                # Plugin bundles
 │   └── output-styles/          # Output formatting styles
-├── cli/
-│   ├── bin/agents.ts         # Unified CLI (Bun + Citty)
-│   ├── lib/                    # TypeScript modules (hash, output, schemas, etc.)
-│   ├── commands/               # CLI subcommands (plugin, skill, kg, registry)
-│   ├── test/                   # bun:test suites
-│   ├── embed.py                # KG embedding CLI (Python, sqlite-vec)
-│   └── sql/                    # SQL query files
+├── packages/
+│   └── cli/
+│       ├── package.json        # CLI package
+│       └── src/
+│           ├── bin/agents.ts   # CLI entrypoint
+│           ├── commands/       # Command modules (verb-first + legacy)
+│           ├── lib/            # Shared library modules
+│           ├── client/         # Graph viewer frontend
+│           ├── server/         # Graph viewer backend
+│           └── sql/            # SQL query files
 ├── settings/
 │   └── mcp/                    # MCP server configurations
 └── docs/
@@ -122,9 +128,9 @@ See `docs/src/adr/` for architecture decisions.
 |------|---------|
 | Initialize project | `just init` |
 | Install to ~/.claude | `just install` |
-| **CLI tool** | `just agents <noun> <verb> [args]` |
-| Plugin check | `just agents plugin check <name>` |
-| Skill validate | `just agents skill validate <name>` |
+| **CLI tool** | `just agents <verb> <type> [args]` |
+| Plugin check | `just agents lint --type plugin <name>` |
+| Skill validate | `just agents lint --type skill <name>` |
 | External skill check | `just skill external:check` |
 | Semantic search | `just kg-search "query"` |
 
@@ -178,9 +184,9 @@ See `.claude/skills/beads/` for full documentation.
 ## Conventions
 
 - **Brewfile**: Tool-level dependencies only (ollama, uv, bun, yq, etc.)
-- **package.json** (`cli/`): TypeScript packages for `agents` CLI (Bun)
+- **package.json** (`packages/cli/`): TypeScript packages for `agents` CLI (Bun)
 - **pyproject.toml**: Python packages for KG only (sqlite-vec, ollama, watchdog)
 - **`just init`**: Must be idempotent — safe to run multiple times
 - **SQL dumps**: `.data/**/*.sql` files are version controlled; `.db` files are gitignored
 - **Plans**: Written as markdown in `.claude/plans/`, converted to beads issues
-- **`agents`**: Unified CLI tool — `just agents <noun> <verb>` for plugin/skill/registry operations
+- **`agents`**: Unified CLI tool — `just agents <verb> <type>` for plugin/skill/registry operations (verb-first grammar)

README.md

@@ -23,12 +23,16 @@ content/               Component source of truth
 └── reference/         Reference documentation
 
 packages/cli/              TypeScript tooling (Bun + Citty)
-├── bin/agents.ts      CLI entrypoint
-├── commands/          CLI command trees (skill, mcp, component, plugin, ...)
-├── lib/               Library modules
-│   ├── component/     Universal component model (7 providers)
-│   ├── skill-*.ts     Skill lifecycle (add/find/list/outdated/update/remove/info/init)
-│   └── ...            Hash, lockfile, output, runtime, schemas, etc.
+├── src/
+│   ├── bin/agents.ts  CLI entrypoint
+│   ├── commands/      Command modules (verb-first + legacy noun-first)
+│   ├── lib/           Library modules
+│   │   ├── component/ Universal component model (7 providers)
+│   │   ├── skill-*.ts Skill lifecycle (add/find/list/outdated/update/remove/info/init)
+│   │   └── ...        Hash, lockfile, output, runtime, schemas, etc.
+│   ├── client/        Graph viewer frontend
+│   ├── server/        Graph viewer backend
+│   └── sql/           SQL query files
 └── test/              bun:test suites (900+ tests)
 
 settings/mcp/          MCP server configurations
@@ -133,11 +137,11 @@ Curated plugins at `.claude-plugin/marketplace.json`:
 ## Development
 
 ```bash
-just init                          # One-time setup
-cd cli && bun test            # Run all tests
-cd cli && bun test test/component/  # Component tests only
-just agents skill validate <name>  # Validate a skill
-just agents plugin check <name>    # Validate a plugin
+just init                              # One-time setup
+bun test --cwd packages/cli            # Run all tests
+bun test --cwd packages/cli test/component/  # Component tests only
+just agents lint --type skill <name>   # Validate a skill
+just agents lint --type plugin <name>  # Validate a plugin
 ```
 
 ## License

content/agents/meta/skills/pr-addresser.md

@@ -41,7 +41,7 @@ just -f .claude/agents/skill-pr-addresser/justfile status 795
 just -f .claude/agents/skill-pr-addresser/justfile address-dry 795
 
 # Specify skill explicitly (instead of auto-detecting from changed files)
-just -f .claude/agents/skill-pr-addresser/justfile address-skill 795 components/skills/lang-rust-dev
+just -f .claude/agents/skill-pr-addresser/justfile address-skill 795 content/skills/lang-rust-dev
 
 # Force addressing even if no pending feedback detected
 just -f .claude/agents/skill-pr-addresser/justfile address 795 --force

content/agents/skill-pr-addresser/README.md

@@ -239,10 +239,10 @@ gh pr view 795 --json state
 
 ### "Could not infer skill path"
 
-The changed files don't match `components/skills/*`. Specify explicitly:
+The changed files don't match `content/skills/*`. Specify explicitly:
 
 ```bash
-just address-skill 795 components/skills/lang-rust-dev
+just address-skill 795 content/skills/lang-rust-dev
 ```
 
 ## Related

content/agents/skill-pr-addresser/data/sessions/6de157aa/session.json

@@ -1,6 +1,6 @@
 {
   "session_id": "6de157aa",
-  "skill_path": "components/skills/github-app-dev",
+  "skill_path": "content/skills/github-app-dev",
   "issue_number": 692,
   "repo_owner": "aRustyDev",
   "repo_name": "ai",
@@ -27,7 +27,7 @@
       "addressed": 4,
       "skipped": 0,
       "files_modified": [
-        "components/skills/github-app-dev/SKILL.md",
+        "content/skills/github-app-dev/SKILL.md",
         "SKILL.md"
       ],
       "commit_sha": "d105357f7267e0a7bcbc66158830f4460aa06726",

content/agents/skill-pr-addresser/src/github_pr.py

@@ -509,10 +509,10 @@ def infer_skill_from_files(changed_files: list[str]) -> str | None:
         changed_files: List of file paths changed in PR
 
     Returns:
-        Skill path (e.g., "components/skills/lang-rust-dev") or None
+        Skill path (e.g., "content/skills/lang-rust-dev") or None
     """
     for f in changed_files:
-        if f.startswith("components/skills/"):
+        if f.startswith("content/skills/"):
             parts = f.split("/")
             if len(parts) >= 3:
                 return "/".join(parts[:3])

content/agents/skill-pr-addresser/subagents/feedback-fixer/prompt.md

@@ -5,12 +5,13 @@ You are implementing fixes for PR review feedback on a Claude Code skill.
 ## Context
 
 - **Working directory**: A git worktree with the skill checked out
-- **Skill path**: Will be provided (e.g., `components/skills/lang-rust-dev`)
+- **Skill path**: Will be provided (e.g., `content/skills/lang-rust-dev`)
 - **Action group**: A consolidated set of similar feedback items
 
 ## Understanding Action Groups
 
 An action group represents **related feedback that should be addressed together**. For example:
+
 - "Move to examples" with 4 locations means: move content at lines 239, 398, 671, 733 to examples/
 - "Move to references" with 2 locations means: move content at those lines to reference/
 
@@ -57,14 +58,15 @@ If told to move content at lines 239, 398, 671 to examples/:
 2. Identify what each code block demonstrates
 3. Create appropriate example files (e.g., `examples/tracing.ts`, `examples/webhooks.ts`)
 4. Replace original content with reference links like:
-   ```markdown
-   See [examples/tracing.ts](examples/tracing.ts) for implementation.
-   ```
+
+       See [examples/tracing.ts](examples/tracing.ts) for implementation.
+
 5. Ensure the SKILL.md remains under 500 lines
 
 ## What You Can Skip
 
 Skip items that:
+
 - Require changes outside the skill directory
 - Need access to external APIs or resources
 - Involve architectural decisions beyond the skill scope