5uck1ess · 5uck1ess · Apr 4, 2026 · Apr 4, 2026 · Apr 4, 2026
diff --git a/.claude-plugin/plugin.json b/.claude-plugin/plugin.json
@@ -1,6 +1,6 @@
 {
   "name": "devkit",
-  "version": "2.0.0",
+  "version": "2.0.1",
   "description": "Guardrails and consistency for Claude Code — deterministic workflows, metric-gated improvement loops, and multi-agent consensus",
   "author": {
     "name": "5uck1ess"

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,14 @@
 # Changelog
 
+## 2.0.1
+
+### Fixed
+- Migrate all 20 command files from `commands/` into `skills/` — completes the command-to-skill conversion started in v2.0.0
+- Remove `"commands"` key from `manifest.json` — all entries now under `"skills"`
+- Fix `manifest.json` version (was stuck at `1.3.5` while `plugin.json` was at `2.0.0`)
+- Remove duplicate `skills/` block in README repository structure
+- Fix orphaned `skill-authoring` reference in CONTRIBUTING.md
+
 ## 2.0.0
 
 ### New Commands

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -12,21 +12,21 @@
    Body content (keep under 100 lines).
    ```
 2. Add `"skills/my-skill.md"` to `manifest.json`
-3. See the `skill-authoring` skill for full guidance
+3. See the "Adding an Invocable Skill" section below for full guidance
 
-## Adding a Command
+## Adding an Invocable Skill (formerly "command")
 
-1. Create `commands/my-command.md` with YAML frontmatter:
+1. Create `skills/my-skill.md` with YAML frontmatter:
    ```markdown
    ---
-   name: devkit:my-command
-   description: What this command does.
+   name: devkit:my-skill
+   description: What this skill does.
    ---
-   # Command Title
+   # Skill Title
    Step-by-step workflow.
    ```
-2. Add `"commands/my-command.md"` to `manifest.json`
-3. Include Budget & Early Exit section if the command loops
+2. Add `"skills/my-skill.md"` to `manifest.json`
+3. Include Budget & Early Exit section if the skill loops
 4. Include `[PARALLEL]` markers if steps run concurrently
 
 ## Adding an Agent

diff --git a/README.md b/README.md
@@ -288,8 +288,8 @@ devkit/
 ├── manifest.json            # Plugin manifest
 ├── ROADMAP.md               # Implemented features and future plans
 ├── PREFERENCES.md           # Agent behavior guidelines
-├── commands/                # 20 slash commands
-│   ├── tri-*.md             # Multi-agent commands (5)
+├── skills/                  # Invocable + context-activated skills
+│   ├── tri-*.md             # Multi-agent skills (5)
 │   ├── self-*.md            # Self-improvement loops (5)
 │   ├── pr-ready.md          # PR preparation pipeline
 │   ├── pr-monitor.md        # Post-PR review monitor
@@ -300,29 +300,21 @@ devkit/
 │   ├── bugfix.md            # Bug fix lifecycle
 │   ├── refactor.md          # Refactor lifecycle
 │   ├── decompose.md         # Goal decomposition
-│   └── status.md            # Health check
+│   ├── status.md            # Health check
+│   ├── changelog.md         # Changelog generation
+│   ├── doc-gen.md           # Documentation generation
+│   ├── test-gen.md          # Test generation
+│   ├── research.md          # Deep research
+│   ├── scrape.md            # URL scraping
+│   ├── onboard.md           # Codebase onboarding
+│   └── ...                  # + context-activated skills
 ├── agents/                  # 6 agents
 │   ├── reviewer.md          # Opus, worktree isolation
 │   ├── researcher.md        # Sonnet, worktree isolation
 │   ├── improver.md          # Opus, worktree isolation
 │   ├── test-writer.md       # Sonnet, worktree isolation
 │   ├── documenter.md        # Haiku, worktree isolation
 │   └── security-auditor.md  # Opus, worktree isolation
-├── skills/                  # 14 skills (6 context-activated workflows + 8 principles/tools)
-│   ├── test-gen.md          # Auto: "write tests for X"
-│   ├── doc-gen.md           # Auto: "document this module"
-│   ├── changelog.md         # Auto: "generate a changelog"
-│   ├── onboard.md           # Auto: "explain this codebase"
-│   ├── research.md          # Auto: "research X"
-│   ├── scrape.md            # Auto: "scrape this URL"
-│   ├── executing.md         # Principle: methodical execution
-│   ├── clean-code.md        # Principle: readability
-│   ├── dry.md               # Principle: don't repeat yourself
-│   ├── yagni.md             # Principle: no speculative features
-│   ├── dont-reinvent.md     # Principle: use existing solutions
-│   ├── stuck.md             # Principle: loop recovery
-│   ├── gcli.md              # Tool: Google Workspace CLI
-│   └── creating-workflows.md # Tool: YAML workflow authoring
 ├── hooks/                   # 8 hooks
 │   ├── hooks.json           # Hook config (auto-loaded)
 │   ├── safety-check.sh      # Dangerous operation blocker

diff --git a/manifest.json b/manifest.json
@@ -1,30 +1,28 @@
 {
   "name": "devkit",
-  "version": "1.3.5",
+  "version": "2.0.1",
   "description": "Guardrails and consistency for Claude Code — deterministic workflows, metric-gated improvement loops, and multi-agent consensus",
-  "commands": [
-    "commands/tri-review.md",
-    "commands/tri-dispatch.md",
-    "commands/tri-debug.md",
-    "commands/tri-test-gen.md",
-    "commands/tri-security.md",
-    "commands/self-improve.md",
-    "commands/self-test.md",
-    "commands/self-lint.md",
-    "commands/self-perf.md",
-    "commands/self-migrate.md",
-    "commands/pr-ready.md",
-    "commands/workflow.md",
-    "commands/status.md",
-    "commands/bugfix.md",
-    "commands/feature.md",
-    "commands/refactor.md",
-    "commands/decompose.md",
-    "commands/audit.md",
-    "commands/pr-monitor.md",
-    "commands/repo-map.md"
-  ],
   "skills": [
+    "skills/tri-review.md",
+    "skills/tri-dispatch.md",
+    "skills/tri-debug.md",
+    "skills/tri-test-gen.md",
+    "skills/tri-security.md",
+    "skills/self-improve.md",
+    "skills/self-test.md",
+    "skills/self-lint.md",
+    "skills/self-perf.md",
+    "skills/self-migrate.md",
+    "skills/pr-ready.md",
+    "skills/workflow.md",
+    "skills/status.md",
+    "skills/bugfix.md",
+    "skills/feature.md",
+    "skills/refactor.md",
+    "skills/decompose.md",
+    "skills/audit.md",
+    "skills/pr-monitor.md",
+    "skills/repo-map.md",
     "skills/executing.md",
     "skills/clean-code.md",
     "skills/dry.md",

diff --git a/commands/audit.md → skills/audit.md b/commands/audit.md → skills/audit.md
diff --git a/commands/bugfix.md → skills/bugfix.md b/commands/bugfix.md → skills/bugfix.md
diff --git a/commands/decompose.md → skills/decompose.md b/commands/decompose.md → skills/decompose.md
diff --git a/commands/feature.md → skills/feature.md b/commands/feature.md → skills/feature.md
diff --git a/commands/pr-monitor.md → skills/pr-monitor.md b/commands/pr-monitor.md → skills/pr-monitor.md
diff --git a/commands/pr-ready.md → skills/pr-ready.md b/commands/pr-ready.md → skills/pr-ready.md
diff --git a/commands/refactor.md → skills/refactor.md b/commands/refactor.md → skills/refactor.md
diff --git a/commands/repo-map.md → skills/repo-map.md b/commands/repo-map.md → skills/repo-map.md
diff --git a/commands/self-improve.md → skills/self-improve.md b/commands/self-improve.md → skills/self-improve.md
diff --git a/commands/self-lint.md → skills/self-lint.md b/commands/self-lint.md → skills/self-lint.md
diff --git a/commands/self-migrate.md → skills/self-migrate.md b/commands/self-migrate.md → skills/self-migrate.md
diff --git a/commands/self-perf.md → skills/self-perf.md b/commands/self-perf.md → skills/self-perf.md
diff --git a/commands/self-test.md → skills/self-test.md b/commands/self-test.md → skills/self-test.md
diff --git a/commands/status.md → skills/status.md b/commands/status.md → skills/status.md
diff --git a/commands/tri-debug.md → skills/tri-debug.md b/commands/tri-debug.md → skills/tri-debug.md
diff --git a/commands/tri-dispatch.md → skills/tri-dispatch.md b/commands/tri-dispatch.md → skills/tri-dispatch.md
diff --git a/commands/tri-review.md → skills/tri-review.md b/commands/tri-review.md → skills/tri-review.md
diff --git a/commands/tri-security.md → skills/tri-security.md b/commands/tri-security.md → skills/tri-security.md
diff --git a/commands/tri-test-gen.md → skills/tri-test-gen.md b/commands/tri-test-gen.md → skills/tri-test-gen.md
diff --git a/commands/workflow.md → skills/workflow.md b/commands/workflow.md → skills/workflow.md