Move skills/ to commands/, fix install target and username pattern

- Rename skills/eforge/ → commands/eforge/ to match Claude Code's
  .claude/commands/ convention for custom slash commands
- Update install-skills to target .claude/commands/ instead of .claude/skills/
- Update all path references in installer, pyproject.toml force-include,
  tests, and documentation
- Allow dots in usernames (^[a-zA-Z0-9._-]+$) for first.last format

538 tests passing.

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

Author: DavidJBianco

AGENTS.md

@@ -117,7 +117,7 @@ evidence-forge/
 ├── config.example.yaml          # Example configuration
 ├── .env.example                 # Example environment variables
 │
-├── skills/
+├── commands/
 │   └── eforge/                  # Claude Code Skills for scenario creation
 │       ├── scenario.md          # /eforge scenario - guided scenario creation
 │       └── generate.md          # /eforge generate - generation workflow
@@ -1351,7 +1351,7 @@ def test_state_manager_creates_unique_pids(user_count: int):
 
 Claude Code Skills handle the interactive, creative aspects of scenario creation -- work that was originally planned as a built-in conversational CLI.
 
-**Location:** `skills/eforge/` directory
+**Location:** `commands/eforge/` directory
 
 **Installation:**
 ```bash
@@ -1374,7 +1374,7 @@ eforge install-skills --global
 
 ### Adding a New Skill
 
-1. Create `skills/eforge/{name}.md` with the skill prompt
+1. Create `commands/eforge/{name}.md` with the skill prompt
 2. Follow the hybrid interview pattern: structured questions first, then free-form elaboration
 3. Reference the scenario schema from `docs/scenario-reference.md` to ensure output validity
 4. Test interactively by running the skill in Claude Code

TODO.md

@@ -356,7 +356,7 @@
 
 ### 3.1 Claude Code Skills + Install Command
 
-- [x] Create `skills/eforge/scenario.md` — `/eforge scenario` skill
+- [x] Create `commands/eforge/scenario.md` — `/eforge scenario` skill
   - [x] Hybrid interview flow: structured questions first, then free-form gap-filling
   - [x] Environment, network, personas, attacks, time window, output formats
   - [x] References persona library and scenario schema
@@ -365,18 +365,18 @@
   - [x] 10-tactic MITRE ATT&CK kill chain template
   - [x] Base64/encoded content must be generated via Bash, never fabricated
   - [x] Use `/skill-creator` to develop skill prompt content (2 iterations, 30/30 assertions)
-- [x] Create `skills/eforge/generate.md` — `/eforge generate` skill
+- [x] Create `commands/eforge/generate.md` — `/eforge generate` skill
   - [x] Runs `eforge generate` on scenario file
   - [x] Runs `eforge validate` as pre-flight check
   - [x] Monitors output, diagnoses errors
   - [x] Suggests fixes for common issues, escalates structural problems to `/eforge scenario`
   - [x] Copies ENVIRONMENT.md to output directory alongside GROUND_TRUTH.md
-- [x] Create `skills/eforge/validate.md` — `/eforge validate` skill
+- [x] Create `commands/eforge/validate.md` — `/eforge validate` skill
   - [x] Runs `eforge validate` and interprets output
   - [x] Fixes simple issues directly, escalates structural problems to `/eforge scenario`
 - [x] Add `eforge install-skills` CLI command to `cli/commands.py`
-  - [x] `--project` flag: copies to `.claude/skills/` (default)
-  - [x] `--global` flag: copies to `~/.claude/skills/`
+  - [x] `--project` flag: copies to `.claude/commands/` (default)
+  - [x] `--global` flag: copies to `~/.claude/commands/`
   - [x] Skills bundled as package data via `importlib.resources` + hatch force-include
   - [x] Updates existing installations: overwrites changed files, removes stale files
   - [x] Bundles skills, personas, and scenario-reference.md

skills/eforge/generate.md commands/eforge/generate.mdskills/eforge/generate.md renamed to commands/eforge/generate.md

@@ -114,9 +114,9 @@ eforge init [--force]
 ```bash
 eforge install-skills [--project | --global]
 ```
-1. Copies skill files from the repo's `skills/eforge/` directory
-2. `--project` (default): Installs to `.claude/skills/` in the current project
-3. `--global`: Installs to `~/.claude/skills/`
+1. Copies skill files from the repo's `commands/eforge/` directory
+2. `--project` (default): Installs to `.claude/commands/` in the current project
+3. `--global`: Installs to `~/.claude/commands/`
 4. Reports which skills were installed and their slash-command triggers
 
 #### Workflow 4: Validate Scenario
@@ -518,8 +518,8 @@ Non-interactive: Simply copies the example config with all options documented.
 eforge install-skills [--project | --global]
 
 Options:
-  --project    Install skills to .claude/skills/ in the current project (default)
-  --global     Install skills to ~/.claude/skills/
+  --project    Install skills to .claude/commands/ in the current project (default)
+  --global     Install skills to ~/.claude/commands/
 
 Copies EvidenceForge skill files to the appropriate Claude Code skills location.
 Skill files are bundled as package data and loaded via importlib.resources at runtime.
@@ -616,7 +616,7 @@ EvidenceForge uses Claude Code skills as the primary scenario authoring interfac
 
 #### Skill Files
 
-Skills live in `skills/eforge/` in the repository and are installed via `eforge install-skills`.
+Skills live in `commands/eforge/` in the repository and are installed via `eforge install-skills`.
 
 **`/eforge scenario`** -- Guided scenario creation skill
 
@@ -651,13 +651,13 @@ Responsibilities:
 ```
 # Install to current project (default)
 eforge install-skills --project
-# Creates .claude/skills/eforge-scenario.md
-# Creates .claude/skills/eforge-generate.md
+# Creates .claude/commands/eforge-scenario.md
+# Creates .claude/commands/eforge-generate.md
 
 # Install globally for all projects
 eforge install-skills --global
-# Creates ~/.claude/skills/eforge-scenario.md
-# Creates ~/.claude/skills/eforge-generate.md
+# Creates ~/.claude/commands/eforge-scenario.md
+# Creates ~/.claude/commands/eforge-generate.md
 ```
 
 Skills are plain Markdown files and can be version-controlled, customized, or extended by users.
@@ -724,7 +724,7 @@ Skills are plain Markdown files and can be version-controlled, customized, or ex
 - pytz for timezone handling
 
 **Skills:**
-- Claude Code skills (Markdown files in `skills/eforge/`)
+- Claude Code skills (Markdown files in `commands/eforge/`)
 - Installed via `eforge install-skills` command
 - No runtime dependency on Claude Code for generation (skills are authoring-time only)
 
@@ -751,7 +751,7 @@ evidenceforge/
 +-- config.example.yaml          # Example configuration
 +-- .env.example                 # Example environment variables
 |
-+-- skills/                      # Claude Code skills (source, installed via eforge install-skills)
++-- commands/                      # Claude Code skills (source, installed via eforge install-skills)
 |   +-- eforge/
 |       +-- scenario.md          # /eforge scenario skill
 |       +-- generate.md          # /eforge generate skill
@@ -1084,7 +1084,7 @@ Required scenario files:
    - Each with realistic activity patterns, work hours, and risk profiles
 
 3. **`eforge install-skills` command**
-   - Installs skills, personas, and reference docs to `.claude/skills/` (project) or `~/.claude/skills/` (global)
+   - Installs skills, personas, and reference docs to `.claude/commands/` (project) or `~/.claude/commands/` (global)
    - Bundled as package data via `importlib.resources` + hatch force-include
    - Handles updates: overwrites changed files, removes stale files
 

skills/eforge/scenario.md commands/eforge/scenario.mdskills/eforge/scenario.md renamed to commands/eforge/scenario.md

@@ -40,9 +40,9 @@ build-backend = "hatchling.build"
 packages = ["src/evidenceforge"]
 
 [tool.hatch.build.targets.wheel.force-include]
-"skills/eforge/scenario.md" = "evidenceforge/_data/skills/eforge/scenario.md"
-"skills/eforge/generate.md" = "evidenceforge/_data/skills/eforge/generate.md"
-"skills/eforge/validate.md" = "evidenceforge/_data/skills/eforge/validate.md"
+"commands/eforge/scenario.md" = "evidenceforge/_data/commands/eforge/scenario.md"
+"commands/eforge/generate.md" = "evidenceforge/_data/commands/eforge/generate.md"
+"commands/eforge/validate.md" = "evidenceforge/_data/commands/eforge/validate.md"
 "docs/scenario-reference.md" = "evidenceforge/_data/references/scenario-reference.md"
 "personas" = "evidenceforge/_data/personas"
 "config.example.yaml" = "evidenceforge/_data/config.example.yaml"

skills/eforge/validate.md commands/eforge/validate.mdskills/eforge/validate.md renamed to commands/eforge/validate.md

@@ -1 +1 @@
-"""Package data for EvidenceForge (skills, personas, reference docs)."""
+"""Package data for EvidenceForge (commands, personas, reference docs)."""

docs/PRD.md

@@ -452,25 +452,25 @@ def validate(
 @app.command("install-skills")
 def install_skills_cmd(
     global_install: bool = typer.Option(
-        False, "--global", help="Install to ~/.claude/skills/ (global)"
+        False, "--global", help="Install to ~/.claude/commands/ (global)"
     ),
 ) -> None:
-    """Install EvidenceForge Claude Code skills.
+    """Install EvidenceForge Claude Code skills as custom slash commands.
 
     Copies skill files, persona library, and reference docs to the Claude Code
-    skills directory. By default installs to .claude/skills/ in the current
-    directory (project scope). Use --global to install to ~/.claude/skills/.
+    commands directory. By default installs to .claude/commands/ in the current
+    directory (project scope). Use --global to install to ~/.claude/commands/.
 
     Existing installations are updated: new files are copied, changed files
     are overwritten, and stale files from previous versions are removed.
     """
     from evidenceforge.cli.install_skills import install_skills
 
     if global_install:
-        target_dir = Path.home() / ".claude" / "skills"
+        target_dir = Path.home() / ".claude" / "commands"
         scope = "global"
     else:
-        target_dir = Path.cwd() / ".claude" / "skills"
+        target_dir = Path.cwd() / ".claude" / "commands"
         scope = "project"
 
     console.print(f"[bold blue]Installing EvidenceForge skills ({scope})[/bold blue]")

pyproject.toml

@@ -1,4 +1,4 @@
-"""Install EvidenceForge Claude Code skills to .claude/skills/ directory."""
+"""Install EvidenceForge Claude Code commands to .claude/commands/ directory."""
 
 import importlib.resources
 import shutil
@@ -34,7 +34,7 @@ def _get_data_root() -> Path:
     try:
         data_pkg = importlib.resources.files("evidenceforge._data")
         # Check that it actually has content (not just the __init__.py)
-        skills_dir = data_pkg / "skills" / "eforge" / "scenario.md"
+        skills_dir = data_pkg / "commands" / "eforge" / "scenario.md"
         # Traversable.is_file() works for both filesystem and zip paths
         if skills_dir.is_file():
             return Path(str(data_pkg))
@@ -45,7 +45,7 @@ def _get_data_root() -> Path:
     current = Path(__file__).resolve().parent
     for _ in range(5):
         current = current.parent
-        if (current / "skills" / "eforge" / "scenario.md").exists():
+        if (current / "commands" / "eforge" / "scenario.md").exists():
             return current
 
     raise FileNotFoundError(
@@ -57,22 +57,19 @@ def _get_data_root() -> Path:
 def _collect_source_files(data_root: Path) -> dict[str, Path]:
     """Build a mapping of relative target paths to source file paths.
 
-    Handles both installed layout (_data/skills/eforge/, _data/personas/, _data/references/)
-    and development layout (skills/eforge/, personas/, docs/).
+    Handles both installed layout (_data/commands/eforge/, _data/personas/, _data/references/)
+    and development layout (commands/eforge/, personas/, docs/).
 
     Returns:
         Dict mapping relative path within eforge/ -> absolute source path.
     """
     manifest: dict[str, Path] = {}
 
-    # Detect layout: installed has _data/skills/eforge/, dev has skills/eforge/
-    installed_skills = data_root / "skills" / "eforge"
-    dev_skills = data_root / "skills" / "eforge"
-
-    if (data_root / "skills" / "eforge" / "scenario.md").exists():
-        skills_dir = data_root / "skills" / "eforge"
+    # Detect layout: installed has _data/commands/eforge/, dev has commands/eforge/
+    if (data_root / "commands" / "eforge" / "scenario.md").exists():
+        skills_dir = data_root / "commands" / "eforge"
     else:
-        raise FileNotFoundError(f"Skills not found under {data_root}")
+        raise FileNotFoundError(f"Command files not found under {data_root}")
 
     # Skill markdown files
     for skill_file in SKILL_FILES:
@@ -132,7 +129,7 @@ def install_skills(target_dir: Path) -> tuple[list[str], list[str]]:
     Overwrites existing files and removes stale files from previous installs.
 
     Args:
-        target_dir: Parent directory (e.g., .claude/skills/)
+        target_dir: Parent directory (e.g., .claude/commands/)
 
     Returns:
         Tuple of (installed_files, removed_files) as relative path lists.