diff --git a/docs/spec/architecture.md b/docs/spec/architecture.md
index aaaf0a6..75bb4d0 100644
--- a/docs/spec/architecture.md
+++ b/docs/spec/architecture.md
@@ -24,7 +24,15 @@ ai-development/
 ├── CONTEXT.md                   # Domain language, principles, glossary; auto-loaded at session start
 ├── docs/                        # Workflow artifacts and issues (prd/, ard/, bug/, notes/, adr/, issues/, spec/) + research/ (raw research audit trail)
 ├── .agents/                     # Agent Skills standard location (provider-agnostic)
-│   └── skills/                  # SKILL.md files — canonical source, deployed to ~/.agents/skills/
+│   ├── skills/                  # SKILL.md files — canonical source, deployed to ~/.agents/skills/
+│   └── evals/                   # eval.yaml files for skills not yet in a plugin (cross-cutting/, implement/)
+├── .claude-plugin/              # Marketplace manifest (both Claude Code and Copilot CLI read here)
+│   └── marketplace.json         # Declares all installable plugins in this repo
+├── .github/plugin/
+│   └── marketplace.json         # Mirror of .claude-plugin/marketplace.json for Copilot CLI canonical path
+├── plugins/                     # Installable plugin units (each is a self-contained deployable)
+│   ├── hello-world/             # Demo plugin validating marketplace scaffolding
+│   └── kyberforge/              # Marketplace management toolkit (create-plugin, marketplace-architect, write-skill, write-eval)
 ├── core/                        # Provider-agnostic source of truth
 │   ├── AGENTS.md                # Global always-on rules (Communication + Behavior); deployed to ~/.agents/AGENTS.md
 │   ├── instructions/            # AI behavior definitions (plain markdown)
@@ -34,7 +42,6 @@ ai-development/
 ├── providers/                   # Provider-specific adapters
 │   ├── claude-code/             # CLAUDE.md (thin adapter), settings.json, provider-manifest.sh
 │   └── copilot/                 # copilot-instructions.md, hooks, agents adapter
-├── templates/                   # Project scaffolding templates
 └── scripts/
     ├── deploy-manifest.sh       # Source→target mappings; sourced by install.sh and sync.sh
     ├── install.sh               # Deploys to ~/.agents/skills/, ~/.claude/, etc.
diff --git a/docs/spec/overview.md b/docs/spec/overview.md
index 6e6a754..b8e187d 100644
--- a/docs/spec/overview.md
+++ b/docs/spec/overview.md
@@ -2,19 +2,24 @@
 
 Current deployed state of this repo — what you get if you run `install.sh` today. Updated at the close of each chunk and in the same PR as any behavior change.
 
-*Last updated: 2026-06-20 (gitleaks tooling + skill)*
+*Last updated: 2026-06-20 (kyberforge plugin — marketplace skill consolidation)*
 
 ## What is deployed
 
-### Skills
-14 skills deployed to `~/.agents/skills/` via `install.sh`. Available as slash commands in Claude Code via `~/.claude/skills/ → ~/.agents/skills/` symlink. 11 are first-draft placeholders pending rebuild in Chunk 3; 3 are new Chunk 3 skills (`write-eval`, `write-skill`, `write-docs`).
+### Plugins
+1 plugin registered in the marketplace (`holocron` marketplace, `.claude-plugin/marketplace.json`):
 
-**Factory bootstrap (Chunk 3):**
-- `write-eval` — produces `eval.yaml` test files for skills. Hand-written (bootstrap). Eval at `.agents/evals/factory/write-eval/eval.yaml`.
-- `write-skill` — authors new SKILL.md files and converts placeholders to canonical format. Hand-written (bootstrap — cannot author itself before it exists). Eval at `.agents/evals/factory/write-skill/eval.yaml`. Invokes `write-eval` as part of its own process.
+- **`kyberforge`** — marketplace management toolkit. Contains `create-plugin`, `marketplace-architect`, `write-skill`, `write-eval` skills plus bundled assets (`assets/plugin-template/`), reference docs, scripts, and evals. Install: `claude plugin install kyberforge@holocron`. Source: `plugins/kyberforge/`. Research doc: `plugins/kyberforge/docs/plugin-marketplace-architecture.md`.
+
+### Skills
+13 skills deployed directly to `~/.agents/skills/` via `install.sh`. Available as slash commands in Claude Code via `~/.claude/skills/ → ~/.agents/skills/` symlink. Factory and marketplace skills (`write-eval`, `write-skill`, `create-plugin`, `marketplace-architect`) have moved to the `kyberforge` plugin and are only available after plugin install.
+
+**Factory bootstrap (now in kyberforge plugin):**
+- `write-eval` — produces `eval.yaml` test files for skills. Hand-written (bootstrap). Eval at `plugins/kyberforge/tests/evals/write-eval/eval.yaml`.
+- `write-skill` — authors new SKILL.md files and converts placeholders to canonical format. Hand-written (bootstrap). Eval at `plugins/kyberforge/tests/evals/write-skill/eval.yaml`. Invokes `write-eval` as part of its own process.
 - `write-docs` — produces technical documentation derived from code and spec; never invents behaviour. **First factory-authored skill** (SKILL.md produced via `write-skill`, eval via `write-eval`). Eval at `.agents/evals/implement/write-docs/eval.yaml`. Sources: anthropics/skills `doc-coauthoring`, mattpocock/skills `write-a-skill`, bmad-code-org/BMAD-METHOD `bmad-advanced-elicitation`.
 
-Current skills: `caveman`, `diagnose`, `gitleaks`, `grill-me`, `grill-with-docs`, `improve-codebase-architecture`, `prototype`, `tdd`, `to-issues`, `to-prd`, `triage`, `write-docs`, `write-eval`, `write-skill`, `zoom-out`.
+Current skills (direct): `caveman`, `diagnose`, `gitleaks`, `grill-me`, `grill-with-docs`, `improve-codebase-architecture`, `prototype`, `tdd`, `to-issues`, `to-prd`, `triage`, `write-docs`, `zoom-out`.
 
 **Chunk 3 target:** 42 skills across 9 categories. PRD: `docs/prd/chunk-3-skills-library.md`. Canonical build reference: `docs/research/ai-coding-factory/ai-coding-factory-skills-index.md` (delete once all skills exist). Skills stored flat (`skill-name/SKILL.md`) per ADR-0009; category in `metadata.category` frontmatter. Categories: design, factory, implement, test, review, deploy, operate, cross-cutting, iac (2 skills only — docker-compose + iac-security-review). Role skills (6) deferred to Chunk 5. Gitea skills moved to `providers/gitea/` provider adapter.
 
@@ -48,6 +53,8 @@ For chunk planning and open questions, see `docs/ROADMAP.md`.
 
 ## Recent changes
 
+- 2026-06-20 — kyberforge plugin created and registered in `holocron` marketplace. Consolidates `create-plugin`, `marketplace-architect`, `write-skill`, and `write-eval` skills (previously in `.agents/skills/`) plus their evals, bundled scripts, references, and the plugin-marketplace-architecture research doc into a single installable plugin at `plugins/kyberforge/`. Plugin template (`templates/plugin/`) bundled into `plugins/kyberforge/skills/create-plugin/assets/plugin-template/` and removed from repo root. Evals moved from `.agents/evals/marketplace/` and `.agents/evals/factory/write-eval/` into `plugins/kyberforge/tests/evals/`. These four skills are no longer available as standalone slash commands — install the plugin to use them.
+
 - 2026-06-20 — Gitleaks secret scanning added. `scripts/setup-gitleaks.sh` installs gitleaks v8.24.2, seeds `.gitleaks.toml` (first run only — project-owned after that), and writes a managed pre-commit hook block that is replaced on re-run. `scripts/gitleaks.toml` is the base config template extending gitleaks defaults. `tests/test-setup-gitleaks.sh` covers 6 behaviors (reject non-git dir, config deploy, hook create, append, stale-block replace, idempotency). `.gitleaks.toml` in repo root adds path allowlist for `docs/research/` (high-entropy terminal captures). `gitleaks` skill added (`cross-cutting`) covering full lifecycle: install, update, tune allowlist, scan modes, resolve real findings. Key lesson: v8.24.2 uses `[allowlist]` (singular); v8.25.0+ uses `[[allowlists]]` — wrong syntax silently does nothing.
 
 - 2026-05-18 — Issue 0018 phase 1 refactor complete: `write-skill` redesigned from scratch. New files added to skill directory: `SKILL-TEMPLATE.md` (authoritative 6-section template with XML blocks, human-usable), `META-TEMPLATE.md` (provenance schema with inline-commented YAML), `CATEGORIES.md` (self-contained category table), `META.md` (write-skill's own provenance). SKILL.md rewritten: 6 sections replacing 8 (Role and When/When not dropped — not in agentskills.io spec); frontmatter reduced to 3 fields (`name`, `description`, `metadata.category`); provenance fields (`version`, `updated`, `when`, `source`, `references`) moved to META.md (progressive disclosure — not loaded at startup). `docs/notes/skill-implementation-workflow.md` updated to reference SKILL-TEMPLATE.md as the authoritative template.