Merge pull request #355 from Cisco-Talos/dev

Release v1.12.0: update agent skill installation

Author: DavidJBianco

CHANGELOG.md

@@ -6,6 +6,23 @@ Detailed development history for the EvidenceForge project. Transferred from TOD
 
 ## Unreleased
 
+## v1.12.0 (2026-07-10)
+
+This minor release aligns EvidenceForge skill installation with current Claude
+Code and ChatGPT project-local and user-wide discovery paths.
+
+**Agent skill installation**
+
+- Changed `eforge install-skills` to install both Claude Code and ChatGPT skills
+  by default, with explicit `all`, `claude`, and `chatgpt` agent selections and
+  `codex` retained as a compatibility alias (`1c585619`).
+- Added project-local and user-wide ChatGPT destinations under `.agents/skills`,
+  best-effort multi-agent installation, and warnings for preserved legacy
+  `.codex/skills` installations (`1c585619`).
+- Updated installer documentation and regression coverage for agent selection,
+  scope handling, compatibility, partial failures, and legacy detection
+  (`1c585619`).
+
 ## v1.11.1 (2026-07-08)
 
 This patch release preserves the expanded blind-review experiment results and

README.md

@@ -35,11 +35,12 @@ git clone https://github.com/Cisco-Talos/EvidenceForge.git
 cd EvidenceForge
 uv sync
 
-# Install agent skills (Claude Code by default)
+# Install project-local skills for all supported agents
 uv run eforge install-skills
 
-# Or install Codex skills
-uv run eforge install-skills --agent codex
+# Or select one agent or install user-wide
+uv run eforge install-skills --agent chatgpt
+uv run eforge install-skills --global
 
 # Create a scenario interactively
 # /eforge scenario
@@ -66,7 +67,12 @@ EvidenceForge includes agent skills for interactive, guided workflows. These are
 | `/eforge evaluate` | Runs the data quality evaluation, interprets scores, reviews records for realism, and suggests improvements. |
 | `/eforge config` | Add, modify, or remove personas, domains, applications, and other configuration data. Handles cross-file dependencies automatically. See [Customizing Configuration](docs/reference/CUSTOMIZING_CONFIG.md). |
 
-Install Claude Code skills with `uv run eforge install-skills` (project scope) or `uv run eforge install-skills --global`. Install Codex skills with `uv run eforge install-skills --agent codex`.
+`uv run eforge install-skills` installs project-local skills for both Claude Code
+and ChatGPT. Claude commands go under `.claude/commands/`; ChatGPT skills go
+under `.agents/skills/`. Add `--global` to install both user-wide under
+`~/.claude/commands/` and `~/.agents/skills/`, or select one with `--agent
+claude` or `--agent chatgpt`. The legacy name `--agent codex` remains an alias
+for `--agent chatgpt` and uses the same destinations.
 
 ## CLI Reference
 
@@ -79,7 +85,7 @@ For scripted or non-interactive use:
 | `eforge eval <output_dir> -s <scenario.yaml>` | Evaluate data quality (4 pillars, 20 sub-scores) |
 | `eforge info [field]` | Show installation info, config paths, and data inventories. Pass a dot-path field for a specific value (e.g., `eforge info personas`). Use `--fields` to list available fields, `--json` for machine output. |
 | `eforge validate-config` | Validate config files for cross-reference integrity. Use `--json` for machine output. |
-| `eforge install-skills [--agent claude\|codex] [--global]` | Install agent skills (`--global` is Claude-only) |
+| `eforge install-skills [--agent all\|claude\|chatgpt\|codex] [--global]` | Install project-local or user-wide agent skills; defaults to all agents (`codex` aliases `chatgpt`) |
 | `eforge version` | Show version |
 
 Useful command flags: `generate` accepts `--verbose` / `--debug` for logging,

pyproject.toml

@@ -22,7 +22,7 @@
 
 [project]
 name = "evidence-forge"
-version = "1.11.1"
+version = "1.12.0"
 description = "Generate realistic synthetic security logs for cybersecurity threat hunting training and research"
 readme = "README.md"
 license = "MIT"

src/evidenceforge/__init__.py

@@ -27,5 +27,5 @@
 architecture combining LLM-driven scenario creation with deterministic log generation.
 """
 
-__version__ = "1.11.1"
+__version__ = "1.12.0"
 __all__ = []  # Will be expanded as modules are implemented

src/evidenceforge/cli/commands.py

@@ -1013,96 +1013,136 @@ def eval_progress(event_type: str, data: dict) -> None:
 @app.command("install-skills")
 def install_skills_cmd(
     agent: str = typer.Option(
-        "claude",
+        "all",
         "--agent",
-        help="Agent to install skills for: claude or codex",
+        help="Agent to install skills for: all, claude, chatgpt, or codex (alias)",
     ),
     global_install: bool = typer.Option(
-        False, "--global", help="Install to ~/.claude/commands/ (global)"
+        False,
+        "--global",
+        help="Install to each selected agent user directory",
     ),
 ) -> None:
     """Install EvidenceForge skills for supported agent workflows.
 
-    By default, installs Claude Code slash commands to .claude/commands/ in the
-    current directory. Use --global with Claude installs to install to
-    ~/.claude/commands/. Use --agent codex to install Codex skills to
-    ~/.codex/skills/.
+    By default, installs skills for Claude Code and ChatGPT in the current
+    project. Use --global to install to each selected agent user directory.
+    The codex agent name remains available as an alias for chatgpt.
 
     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_codex_skills, install_skills
-
-    normalized_agent = agent.lower()
-    if normalized_agent not in {"claude", "codex"}:
-        console.print(
-            f"[bold red]Error:[/bold red] Unknown agent '{agent}'. Use 'claude' or 'codex'.",
-            style="red",
-        )
-        raise typer.Exit(EXIT_INPUT_ERROR)
+    from evidenceforge.cli.install_skills import (
+        find_evidenceforge_chatgpt_skills,
+        install_chatgpt_skills,
+        install_skills,
+    )
 
-    if normalized_agent == "codex" and global_install:
+    requested_agent = agent.lower()
+    valid_agents = {"all", "claude", "chatgpt", "codex"}
+    if requested_agent not in valid_agents:
         console.print(
-            "[bold red]Error:[/bold red] --global is only valid for Claude installs. "
-            "Codex skills install to ~/.codex/skills/.",
+            f"[bold red]Error:[/bold red] Unknown agent {agent!r}. "
+            "Use all, claude, chatgpt, or codex.",
             style="red",
         )
         raise typer.Exit(EXIT_INPUT_ERROR)
 
-    if normalized_agent == "codex":
-        target_dir = Path.home() / ".codex" / "skills"
-        scope = "user"
-        install_func = install_codex_skills
-    elif global_install:
-        target_dir = Path.home() / ".claude" / "commands"
-        scope = "global"
-        install_func = install_skills
+    if requested_agent == "all":
+        selected_agents = ("claude", "chatgpt")
+    elif requested_agent == "codex":
+        selected_agents = ("chatgpt",)
     else:
-        target_dir = Path.cwd() / ".claude" / "commands"
-        scope = "project"
-        install_func = install_skills
+        selected_agents = (requested_agent,)
 
-    console.print(
-        f"[bold blue]Installing EvidenceForge skills for {normalized_agent} ({scope})[/bold blue]"
-    )
-    console.print(f"Target: {target_dir}\n")
+    scope = "global" if global_install else "project"
+    failures: list[tuple[str, str]] = []
+    successful_agents: set[str] = set()
 
-    try:
-        installed, removed = install_func(target_dir)
-    except FileNotFoundError as e:
-        console.print(f"[bold red]Error:[/bold red] {e}", style="red")
-        raise typer.Exit(EXIT_INPUT_ERROR)
-    except PermissionError as e:
-        console.print(f"[bold red]Error:[/bold red] {e}", style="red")
-        raise typer.Exit(EXIT_INPUT_ERROR)
+    for index, normalized_agent in enumerate(selected_agents):
+        if index:
+            console.print()
 
-    if installed:
-        console.print(f"[green]✓[/green] Installed {len(installed)} files:")
-        for f in installed:
-            if normalized_agent == "claude":
-                console.print(f"  eforge/{f}")
-            else:
-                console.print(f"  {f}")
+        if normalized_agent == "claude":
+            target_dir = (
+                Path.home() / ".claude" / "commands"
+                if global_install
+                else Path.cwd() / ".claude" / "commands"
+            )
+        else:
+            target_dir = (
+                Path.home() / ".agents" / "skills"
+                if global_install
+                else Path.cwd() / ".agents" / "skills"
+            )
 
-    if removed:
-        console.print(f"\n[yellow]Removed {len(removed)} stale files:[/yellow]")
-        for f in removed:
+        console.print(
+            f"[bold blue]Installing EvidenceForge skills for "
+            f"{normalized_agent} ({scope})[/bold blue]"
+        )
+        console.print(f"Target: {target_dir}\n")
+
+        try:
             if normalized_agent == "claude":
-                console.print(f"  eforge/{f}", style="dim")
+                installed, removed = install_skills(target_dir)
             else:
-                console.print(f"  {f}", style="dim")
+                installed, removed = install_chatgpt_skills(target_dir)
+        except (FileNotFoundError, PermissionError) as error:
+            console.print(f"[bold red]Error:[/bold red] {error}", style="red")
+            failures.append((normalized_agent, str(error)))
+            continue
 
-    if normalized_agent == "claude":
-        console.print(f"\n[bold green]✓ Skills installed to {target_dir / 'eforge'}[/bold green]")
-        console.print(
-            "Use /eforge scenario, /eforge generate, /eforge validate, /eforge evaluate, or /eforge config."
-        )
-    else:
-        console.print(f"\n[bold green]✓ Skills installed to {target_dir}[/bold green]")
-        console.print(
-            "Use the eforge-scenario, eforge-generate, eforge-validate, "
-            "eforge-evaluate, or eforge-config skills."
-        )
+        successful_agents.add(normalized_agent)
+        if installed:
+            console.print(f"[green]✓[/green] Installed {len(installed)} files:")
+            for installed_file in installed:
+                if normalized_agent == "claude":
+                    console.print(f"  eforge/{installed_file}")
+                else:
+                    console.print(f"  {installed_file}")
+
+        if removed:
+            console.print(f"\n[yellow]Removed {len(removed)} stale files:[/yellow]")
+            for removed_file in removed:
+                if normalized_agent == "claude":
+                    console.print(f"  eforge/{removed_file}", style="dim")
+                else:
+                    console.print(f"  {removed_file}", style="dim")
+
+        if normalized_agent == "claude":
+            installed_dir = target_dir / "eforge"
+            console.print(f"\n[bold green]✓ Skills installed to {installed_dir}[/bold green]")
+            console.print(
+                "Use /eforge scenario, /eforge generate, /eforge validate, "
+                "/eforge evaluate, or /eforge config."
+            )
+        else:
+            console.print(f"\n[bold green]✓ Skills installed to {target_dir}[/bold green]")
+            console.print(
+                "Use the eforge-scenario, eforge-generate, eforge-validate, "
+                "eforge-evaluate, or eforge-config skills."
+            )
+
+    if global_install and "chatgpt" in successful_agents:
+        legacy_dir = Path.home() / ".codex" / "skills"
+        legacy_skills = find_evidenceforge_chatgpt_skills(legacy_dir)
+        if legacy_skills:
+            console.print(
+                "\n[bold yellow]Warning:[/bold yellow] Legacy EvidenceForge skills "
+                f"also exist under {legacy_dir} and may appear as duplicates:"
+            )
+            for legacy_skill in legacy_skills:
+                console.print(f"  {legacy_skill}", style="dim")
+            console.print(
+                "These legacy files were not modified. Remove them manually after "
+                "confirming the new installation works."
+            )
+
+    if failures:
+        console.print("\n[bold red]Skill installation completed with errors:[/bold red]")
+        for failed_agent, message in failures:
+            console.print(f"  {failed_agent}: {message}", style="red")
+        raise typer.Exit(EXIT_INPUT_ERROR)
 
 
 @app.command()