docs(context): use official Rstack agent plugin

Author: ScriptedAlchemy

.agents/plugins/marketplace.json

@@ -1,6 +1,6 @@
 ---
 name: release-rstack
-description: Create a coordinated release pull request for the `rstack` and `create-rstack` npm packages. Use when asked to prepare, create, or open an rstack package release PR.
+description: Create a coordinated release pull request for the `rstack`, `@rstackjs/context`, and `create-rstack` npm packages. Use when asked to prepare, create, or open an rstack package release PR.
 ---
 
 # Release Rstack
@@ -13,7 +13,8 @@ If the version is missing, ask for it before making changes.
 
 ## Version rules
 
-- Read both package versions before editing. Require the rstack target to be a valid, increasing SemVer version.
+- Read all three package versions before editing. Require the rstack target to be a valid, increasing SemVer version.
+- Keep `@rstackjs/context` on exactly the same version as `rstack`.
 - Keep the package version lines independent. Apply the rstack bump type to the current `create-rstack` version:
   - Patch: increment the patch version.
   - Minor: increment the minor version and reset patch to `0`.
@@ -29,13 +30,13 @@ If the version is missing, ask for it before making changes.
 
 3. Create and switch to `release/v<version>` from the clean default-branch HEAD.
 
-4. Update the `version` field in `packages/rstack/package.json` to `<version>` and the `version` field in `packages/create-rstack/package.json` to the derived `create-rstack` version.
+4. Update the `version` fields in `packages/rstack/package.json` and `packages/context/package.json` to `<version>`. Update the `version` field in `packages/create-rstack/package.json` to the derived `create-rstack` version.
 
 5. In every `packages/create-rstack/template-*/package.json`, set the `rstack` dependency to `^<version>`. Update only that dependency entry and verify every template package manifest uses the same target version.
 
 6. Run `pnpm --filter rstack build:native` to regenerate `packages/rstack/binding.cjs` and `packages/rstack/binding.d.cts` for the new version. Do not edit generated binding files manually.
 
-7. Review the diff and confirm it contains only both package version changes, the template `rstack` dependency updates, and the regenerated binding files above. Verify the two package version changes use the intended matching bump type and no template retains an older rstack version.
+7. Review the diff and confirm it contains only the three package version changes, the template `rstack` dependency updates, and the regenerated binding files above. Verify `rstack` and `@rstackjs/context` have the same target version, `create-rstack` uses the intended matching bump type, and no template retains an older rstack version.
 
 8. Create a commit with this exact message: `release: v<version>`.
 

.agents/skills/release-rstack/SKILL.md

@@ -21,8 +21,8 @@ This is deliberately a lean, file-based design:
 - no coordinator daemon, task-runner integration, package-process discovery service, or development
   server route is required;
 - Rslint and Rstest execute only through explicit one-shot MCP tools;
-- Codex and Claude Code bundles register the same `rs mcp` command and provide the same six workflow
-  skills; and
+- the repository-based `rstack` plugin in `rstackjs/agent-skills` registers `rs mcp` for Codex and
+  Claude Code and provides six context workflows; and
 - rich build visualization continues to use an existing Rsdoctor report through `report_link`.
 
 The unused-code feature is intentionally artifact-scoped. It identifies modules that are not
@@ -94,17 +94,20 @@ flowchart LR
   Report["Existing Rsdoctor report"]
   MCP["rs mcp<br/>stdio query server"]
 
+  Plugin["rstackjs/agent-skills<br/>one rstack plugin + six context skills"]
+
   subgraph Hosts["Agent hosts"]
-    Codex["Codex bundle + six skills"]
-    Claude["Claude Code bundle + six skills"]
+    Codex["Codex"]
+    Claude["Claude Code"]
   end
 
   AppObserver -->|publish| Store
   LibObserver -->|publish| Store
   Rslint -->|publish| Store
   Rstest -->|publish| Store
-  Codex -->|stdio| MCP
-  Claude -->|stdio| MCP
+  Codex --> Plugin
+  Claude --> Plugin
+  Plugin -->|stdio| MCP
   MCP -->|read completed records| Store
   MCP -->|read selected file| Artifact
   MCP -->|resolve report_link| Report
@@ -129,6 +132,11 @@ publish their results after the one-shot command completes.
 | MCP server             | Expose the query and explicit-capture tools over stdio.                                          |
 | Plugin skills          | Select the relevant tools and present their evidence boundaries to the model.                    |
 
+The runtime is packaged separately from the CLI facade. `@rstackjs/context` owns the store,
+producer adapters, normalized evidence, queries, and MCP implementation. `rstack` owns command and
+configuration integration, exposes the runtime through `rstack/context`, and supplies the Rstack
+config adapter when `rs mcp` runs explicit lint or test captures.
+
 ### Monorepo process model
 
 The MCP process does not use its launch directory as a package or build identifier. `rs mcp` starts
@@ -381,7 +389,8 @@ flowchart LR
 
 ### Server lifecycle
 
-Both plugin bundles register one local stdio server named `rstack`. Their Node launcher first
+The official `rstack` plugin in `rstackjs/agent-skills` registers one local stdio server named
+`rstack` for both Codex and Claude Code. Its Node launcher first
 resolves the workspace-root local `rstack` package and invokes its `rs` binary directly. When that
 package is unavailable from the workspace root, the launcher falls back to `rs mcp` from the MCP
 host `PATH`, inheriting standard input, output, and error and propagating the delegated process
@@ -438,35 +447,18 @@ The reachability tools use four classifications:
 An `unreachable-module-candidate` is a request for source and runtime verification, not a deletion
 decision. Export-level and local-symbol conclusions remain outside this branch.
 
-## Plugin bundles
+## Agent plugin distribution
 
-### Codex bundle
+The installable host integration lives in
+[`rstackjs/agent-skills`](https://github.com/rstackjs/agent-skills), not in this runtime repository.
+It extends that repository's existing `rstack` plugin rather than creating another plugin or
+marketplace:
 
 ```text
-plugins/rstack-codex/
+agent-skills/
 ├── .codex-plugin/
-│   └── plugin.json
-├── .mcp.json
-└── skills/
-    ├── analyze-build/
-    ├── assess-change-impact/
-    ├── debug-dev-cycle/
-    ├── explain-dead-code/
-    ├── find-unused-code/
-    └── review-context-change/
-```
-
-The Codex manifest describes the plugin, points to the six skills, and references `.mcp.json`. The
-repository marketplace entry points at this local bundle. The bundle uses the workspace-root local
-`rstack` package when available and otherwise expects `rs` on the MCP host `PATH`; it does not carry
-another copy of the context runtime.
-
-### Claude code bundle
-
-```text
-plugins/rstack-claude/
 ├── .claude-plugin/
-│   └── plugin.json
+├── .agents/plugins/marketplace.json
 ├── .mcp.json
 └── skills/
     ├── analyze-build/
@@ -477,8 +469,10 @@ plugins/rstack-claude/
     └── review-context-change/
 ```
 
-The Claude Code bundle uses the same command, schemas, and workflow text. This branch does not add
-Claude-specific hooks, agents, workflows, or a second server implementation.
+The Codex and Claude manifests discover the same root `skills/` directory and `.mcp.json`. The
+launcher uses the workspace-root local `rstack` package when available and otherwise expects `rs`
+on the host `PATH`. The plugin contains no copy of `@rstackjs/context`, compiler graph, store, or MCP
+implementation.
 
 ### Skill catalog
 
@@ -518,7 +512,7 @@ candidates.
 ```mermaid
 flowchart LR
   P01["Phase 0/1<br/>foundation, passive build records,<br/>Rsdoctor analysis, report links<br/>implemented"]
-  P2["Phase 2<br/>module artifact reachability<br/>and plugin bundles<br/>implemented"]
+  P2["Phase 2<br/>module artifact reachability<br/>and official plugin workflows<br/>implemented"]
   P3["Phase 3<br/>explicit one-shot Rslint/Rstest<br/>snapshots and queries<br/>implemented"]
   P4["Phase 4<br/>compatible diffs, exact-path evidence,<br/>and six skills<br/>implemented"]
   P5["Phase 5<br/>no custom GUI or remote transport;<br/>reuse headless MCP + Rsdoctor GUI<br/>resolved"]
@@ -546,7 +540,7 @@ Implemented downstream:
 - application entries, library contract targets, and conservative roots;
 - bounded root reachability, shortest explanations, and impact traversal;
 - the four module-analysis MCP tools; and
-- matching Codex and Claude Code plugin bundles.
+- one shared Codex and Claude Code integration in `rstackjs/agent-skills`.
 
 The implementation reports module candidates only. Export usage and local-symbol dead-code claims
 were not added.
@@ -572,7 +566,7 @@ Implemented downstream:
 - stored lint fixed-output previews without apply;
 - the `code_evidence` exact-path composition query;
 - `debug-dev-cycle` and `review-context-change`; and
-- the complete six-skill set in both plugin bundles.
+- the complete six-skill set in the official `rstack` plugin.
 
 CI artifact exchange, performance budgets, apply tools, automatic verification, and export-level
 diffs remain deferred.

docs/rfcs/0001-rstack-context-engine.md

@@ -1,4 +1,6 @@
-# Rstack Context Package And Agent Plugin Implementation Plan
+<!-- cspell:ignore evals dogfood -->
+
+# Rstack context package and agent plugin implementation plan
 
 > **For agentic workers:** REQUIRED SUB-SKILL: Use superpowers:subagent-driven-development (recommended) or superpowers:executing-plans to implement this plan task-by-task. Steps use checkbox (`- [ ]`) syntax for tracking.
 
@@ -8,7 +10,7 @@
 
 **Tech Stack:** TypeScript, Rslib, Rstest, Rslint, MCP SDK, Zod, Codex plugins, Claude Code plugins, Agent Skills.
 
-## Global Constraints
+## Global constraints
 
 - Keep work on `codex/rstack-mcp-observability` in `rstack-cli` and `codex/rstack-context-plugin` in `agent-skills`.
 - Do not create another marketplace or another plugin identity; extend the existing `rstack` plugin.
@@ -20,7 +22,7 @@
 
 ---
 
-### Task 1: Extend the official Rstack plugin
+### Task 1: extend the official Rstack plugin
 
 **Files:**
 
@@ -64,9 +66,9 @@ Run:
 
 ```bash
 node scripts/test-rstack-context-plugin.mjs
-python3 /home/zack/.codex/skills/.system/plugin-creator/scripts/validate_plugin.py .
+python3 ~/.codex/skills/.system/plugin-creator/scripts/validate_plugin.py .
 for skill in skills/analyze-build skills/assess-change-impact skills/debug-dev-cycle skills/explain-dead-code skills/find-unused-code skills/review-context-change; do
-  python3 /home/zack/.codex/skills/.system/skill-creator/scripts/quick_validate.py "$skill"
+  python3 ~/.codex/skills/.system/skill-creator/scripts/quick_validate.py "$skill"
 done
 pnpm lint
 ```
@@ -78,7 +80,7 @@ git add .mcp.json .codex-plugin .claude-plugin skills README.md scripts/test-rst
 git commit -m "feat(plugin): add Rstack Context workflows"
 ```
 
-### Task 2: Create the separated context package
+### Task 2: create the separated context package
 
 **Files:**
 
@@ -140,7 +142,7 @@ git add packages/context packages/rstack pnpm-workspace.yaml pnpm-lock.yaml
 git commit -m "refactor(context): extract context runtime package"
 ```
 
-### Task 3: Remove duplicate plugin distribution from Rstack CLI
+### Task 3: remove duplicate plugin distribution from Rstack CLI
 
 **Files:**
 
@@ -189,7 +191,7 @@ git add -A plugins .agents/plugins packages/rstack/tests/context docs website
 git commit -m "docs(context): use the official Rstack agent plugin"
 ```
 
-### Task 4: Install and dogfood the coordinated result
+### Task 4: install and dogfood the coordinated result
 
 **Files:**
 

docs/superpowers/plans/2026-08-13-context-package-agent-skills.md

@@ -1,4 +1,4 @@
-# Rstack Context
+# Rstack context
 
 `@rstackjs/context` is the runtime behind the Rstack project-context MCP. It records and queries
 checkout-local build, lint, test, coverage, and Rsdoctor evidence while keeping freshness,