@softspark/ai-toolkit 2.0.1 → 2.1.0

package/scripts/plugin.py

@@ -2,28 +2,27 @@
 """ai-toolkit plugin — install, remove, update, clean, and list plugin packs.
 
 Usage:
-    plugin.py install <pack-name> [<pack-name> ...]
-    plugin.py install --all
-    plugin.py remove <pack-name> [<pack-name> ...]
-    plugin.py remove --all
-    plugin.py update <pack-name> [<pack-name> ...]
-    plugin.py update --all
+    plugin.py list [--editor claude|codex|all]
+    plugin.py status [--editor claude|codex|all]
+    plugin.py install [--editor claude|codex|all] <pack-name> [<pack-name> ...]
+    plugin.py install [--editor claude|codex|all] --all
+    plugin.py remove [--editor claude|codex|all] <pack-name> [<pack-name> ...]
+    plugin.py remove [--editor claude|codex|all] --all
+    plugin.py update [--editor claude|codex|all] <pack-name> [<pack-name> ...]
+    plugin.py update [--editor claude|codex|all] --all
     plugin.py clean <pack-name> [--days N]
-    plugin.py list
-    plugin.py status
 
 Actions:
-    install   Copy plugin hooks/scripts, verify agents+skills are linked
-    remove    Remove plugin hooks/scripts, leave core agents+skills intact
-    update    Re-install plugin (remove + install), --all updates all installed
-    clean     Prune old data (e.g. memory-pack observations older than --days N, default 90)
-    list      Show available plugin packs with status
-    status    Show what's currently installed
+    install   Install a plugin pack for one or more runtimes
+    remove    Remove plugin hooks/rules/scripts for one or more runtimes
+    update    Re-install plugin pack (remove + install)
+    clean     Prune old data (e.g. memory-pack observations older than --days N)
+    list      Show available plugin packs with install status by runtime
+    status    Show installed packs with runtime-specific details
 """
 from __future__ import annotations
 
 import json
-import os
 import shutil
 import sqlite3 as sqlite
 import subprocess
@@ -31,38 +30,85 @@ import sys
 from pathlib import Path
 
 sys.path.insert(0, str(Path(__file__).resolve().parent))
-from _common import toolkit_dir, app_dir
+from _common import app_dir, inject_section, inject_rule, remove_rule_section
+from codex_skill_adapter import cleanup_codex_skills, sync_codex_skill
+from generate_codex_hooks import generate as generate_codex_hooks
+from generate_codex_rules import generate as generate_codex_rules
+from install_steps.ai_tools import inject_with_rules
+from paths import HOOKS_DIR as _HOOKS_DIR
+from paths import RULES_DIR, TOOLKIT_DATA_DIR
 from plugin_schema import resolve_hook_event, validate_manifest, validate_references
 
 
-from paths import TOOLKIT_DATA_DIR, HOOKS_DIR as _HOOKS_DIR
-
 PLUGINS_DIR = app_dir / "plugins"
 CLAUDE_DIR = Path.home() / ".claude"
+CODEX_ROOT = Path.home()
 HOOKS_DIR = _HOOKS_DIR
 PLUGINS_STATE_FILE = TOOLKIT_DATA_DIR / "plugins.json"
+MEMORY_DB = TOOLKIT_DATA_DIR / "memory.db"
+
+VALID_EDITORS = ("claude", "codex")
+SUPPORTED_CODEX_HOOK_EVENTS = frozenset({
+    "SessionStart",
+    "PreToolUse",
+    "PostToolUse",
+    "UserPromptSubmit",
+    "Stop",
+})
 
 
 # ---------------------------------------------------------------------------
 # State management
 # ---------------------------------------------------------------------------
 
+def _empty_state() -> dict:
+    return {
+        "targets": {
+            "claude": {"installed": []},
+            "codex": {"installed": []},
+        }
+    }
+
+
 def load_state() -> dict:
-    """Load installed plugins state."""
+    """Load installed plugins state with backwards compatibility."""
+    state = _empty_state()
     if PLUGINS_STATE_FILE.is_file():
         try:
-            with open(PLUGINS_STATE_FILE) as f:
-                return json.load(f)
+            with open(PLUGINS_STATE_FILE, encoding="utf-8") as f:
+                raw = json.load(f)
         except (json.JSONDecodeError, OSError):
-            pass
-    return {"installed": []}
+            raw = {}
+
+        if isinstance(raw, dict):
+            if isinstance(raw.get("installed"), list):
+                # Legacy format: Claude-only installs.
+                state["targets"]["claude"]["installed"] = sorted(set(raw["installed"]))
+
+            targets = raw.get("targets", {})
+            if isinstance(targets, dict):
+                for editor in VALID_EDITORS:
+                    installed = targets.get(editor, {}).get("installed", [])
+                    if isinstance(installed, list):
+                        state["targets"][editor]["installed"] = sorted(set(installed))
+    return state
 
 
 def save_state(state: dict) -> None:
     """Save installed plugins state."""
     PLUGINS_STATE_FILE.parent.mkdir(parents=True, exist_ok=True)
-    with open(PLUGINS_STATE_FILE, "w") as f:
+    with open(PLUGINS_STATE_FILE, "w", encoding="utf-8") as f:
         json.dump(state, f, indent=2)
+        f.write("\n")
+
+
+def _installed_for(state: dict, editor: str) -> list[str]:
+    return list(state.get("targets", {}).get(editor, {}).get("installed", []))
+
+
+def _set_installed(state: dict, editor: str, names: list[str]) -> None:
+    state.setdefault("targets", {}).setdefault(editor, {})
+    state["targets"][editor]["installed"] = sorted(set(names))
 
 
 # ---------------------------------------------------------------------------
@@ -79,7 +125,7 @@ def list_available() -> list[dict]:
         if not manifest.is_file():
             continue
         try:
-            with open(manifest) as f:
+            with open(manifest, encoding="utf-8") as f:
                 data = json.load(f)
             data["_dir"] = str(d)
             packs.append(data)
@@ -96,64 +142,107 @@ def find_pack(name: str) -> dict | None:
     return None
 
 
-# ---------------------------------------------------------------------------
-# Install
-# ---------------------------------------------------------------------------
+def _resolve_skill_source(pack_dir: Path, skill: str) -> Path | None:
+    core = app_dir / "skills" / skill / "SKILL.md"
+    plugin = pack_dir / "skills" / skill / "SKILL.md"
+    if core.is_file():
+        return core.parent
+    if plugin.is_file():
+        return plugin.parent
+    return None
 
-def _link_agents(includes: dict, pack_dir: Path, installed_items: list[str]) -> None:
-    """Verify and link referenced agents from a plugin pack."""
-    for agent in includes.get("agents", []):
-        agent_file = CLAUDE_DIR / "agents" / f"{agent}.md"
-        source_file = app_dir / "agents" / f"{agent}.md"
-        if agent_file.exists() or agent_file.is_symlink():
-            print(f"    OK agent: {agent}")
-        elif source_file.is_file():
-            agent_file.parent.mkdir(parents=True, exist_ok=True)
-            agent_file.symlink_to(source_file)
-            print(f"    Linked agent: {agent}")
-            installed_items.append(f"agent:{agent}")
-        else:
-            print(f"    WARN agent not found: {agent}")
 
+def _resolve_rule_source(pack_dir: Path, rule_name: str) -> tuple[Path, bool] | None:
+    candidates = [
+        (pack_dir / f"{rule_name}.md", False),
+        (pack_dir / "rules" / f"{rule_name}.md", False),
+        (pack_dir / rule_name, False),
+        (app_dir / "rules" / f"{rule_name}.md", True),
+        (app_dir / "rules" / rule_name, True),
+    ]
+    for path, is_core in candidates:
+        if path.is_file():
+            return path, is_core
+    return None
 
-def _link_skills(includes: dict, pack_dir: Path, installed_items: list[str]) -> None:
-    """Verify and link referenced skills from a plugin pack."""
-    for skill in includes.get("skills", []):
-        skill_dir = CLAUDE_DIR / "skills" / skill
-        source_dir = app_dir / "skills" / skill
-        if skill_dir.exists() or skill_dir.is_symlink():
-            print(f"    OK skill: {skill}")
-        elif source_dir.is_dir():
-            skill_dir.parent.mkdir(parents=True, exist_ok=True)
-            skill_dir.symlink_to(source_dir)
-            print(f"    Linked skill: {skill}")
-            installed_items.append(f"skill:{skill}")
-        else:
-            plugin_skill = pack_dir / "skills" / skill / "SKILL.md"
-            if plugin_skill.is_file():
-                skill_dir.parent.mkdir(parents=True, exist_ok=True)
-                skill_dir.symlink_to(pack_dir / "skills" / skill)
-                print(f"    Linked skill (from plugin): {skill}")
-                installed_items.append(f"skill:{skill}")
-            else:
-                print(f"    WARN skill not found: {skill}")
-
-
-def _copy_hooks(name: str, pack_dir: Path, installed_items: list[str]) -> None:
-    """Copy plugin-specific hook scripts."""
-    plugin_hooks_dir = pack_dir / "hooks"
-    if not plugin_hooks_dir.is_dir():
+
+def _resolve_hook_source(pack_dir: Path, hook_ref: str) -> tuple[Path, bool] | None:
+    base = Path(hook_ref).name
+    candidates = [
+        (pack_dir / hook_ref, False),
+        (pack_dir / "hooks" / base, False),
+        (app_dir / "hooks" / base, True),
+    ]
+    for path, is_core in candidates:
+        if path.is_file():
+            return path, is_core
+    return None
+
+
+def _resolve_pack_hooks(pack: dict, pack_dir: Path) -> list[dict]:
+    specs: list[dict] = []
+    seen: set[str] = set()
+    for hook_ref in pack.get("includes", {}).get("hooks", []):
+        resolved = _resolve_hook_source(pack_dir, hook_ref)
+        if not resolved:
+            print(f"    WARN hook not found: {hook_ref}")
+            continue
+        source, is_core = resolved
+        hook_name = source.name
+        if hook_name in seen:
+            continue
+        event = resolve_hook_event(hook_name, pack)
+        if not event:
+            print(f"    WARN could not infer hook event for: {hook_name}")
+            continue
+        specs.append({
+            "ref": hook_ref,
+            "name": hook_name,
+            "event": event,
+            "source": source,
+            "is_core": is_core,
+        })
+        seen.add(hook_name)
+    return specs
+
+
+def _resolve_pack_rules(pack: dict, pack_dir: Path) -> list[dict]:
+    specs: list[dict] = []
+    for rule_name in pack.get("includes", {}).get("rules", []):
+        resolved = _resolve_rule_source(pack_dir, rule_name)
+        if not resolved:
+            print(f"    WARN rule not found: {rule_name}")
+            continue
+        source, is_core = resolved
+        specs.append({
+            "name": source.stem,
+            "source": source,
+            "is_core": is_core,
+        })
+    return specs
+
+
+def _has_core_claude_rule(rule_name: str) -> bool:
+    return (app_dir / "rules" / f"{rule_name}.md").is_file()
+
+
+# ---------------------------------------------------------------------------
+# Shared installers
+# ---------------------------------------------------------------------------
+
+def _ensure_core_hook_scripts() -> None:
+    """Ensure canonical hook scripts exist in ~/.softspark/ai-toolkit/hooks/."""
+    hooks_src = app_dir / "hooks"
+    if not hooks_src.is_dir():
         return
     HOOKS_DIR.mkdir(parents=True, exist_ok=True)
-    for hook_file in sorted(plugin_hooks_dir.glob("*.sh")):
-        dest = HOOKS_DIR / f"plugin-{name}-{hook_file.name}"
-        shutil.copy2(hook_file, dest)
-        dest.chmod(dest.stat().st_mode | 0o111)
-        print(f"    Copied hook: {hook_file.name} -> {dest.name}")
-        installed_items.append(f"hook:{dest.name}")
+    for hook_file in sorted(hooks_src.glob("*.sh")):
+        dst = HOOKS_DIR / hook_file.name
+        shutil.copy2(hook_file, dst)
+        dst.chmod(dst.stat().st_mode | 0o111)
 
 
-def _copy_scripts(name: str, pack_dir: Path, installed_items: list[str]) -> None:
+def _copy_plugin_scripts(name: str, pack_dir: Path, installed_items: list[str]) -> None:
     """Copy plugin-specific scripts and run init if present."""
     plugin_scripts_dir = pack_dir / "scripts"
     if not plugin_scripts_dir.is_dir():
@@ -174,202 +263,510 @@ def _copy_scripts(name: str, pack_dir: Path, installed_items: list[str]) -> None
     if init_script.is_file():
         result = subprocess.run(
             ["python3", str(init_script)],
-            capture_output=True, text=True,
+            capture_output=True,
+            text=True,
         )
-        if result.returncode == 0:
+        if result.returncode == 0 and result.stdout.strip():
             print(f"    Init: {result.stdout.strip()}")
-        else:
+        elif result.returncode != 0 and result.stderr.strip():
             print(f"    WARN init failed: {result.stderr.strip()}")
 
 
-def install_pack(name: str) -> bool:
-    """Install a single plugin pack. Returns True if successful."""
-    pack = find_pack(name)
-    if not pack:
-        print(f"  ERROR: plugin pack '{name}' not found")
-        print(f"  Available: {', '.join(p['name'] for p in list_available())}")
-        return False
-
-    pack_dir = Path(pack["_dir"])
-    includes = pack.get("includes", {})
-    installed_items: list[str] = []
+def _copy_plugin_hook_scripts(name: str, hook_specs: list[dict], installed_items: list[str]) -> None:
+    """Copy plugin-provided hook scripts into shared toolkit storage."""
+    if not hook_specs:
+        return
+    HOOKS_DIR.mkdir(parents=True, exist_ok=True)
+    for spec in hook_specs:
+        if spec["is_core"]:
+            continue
+        dest = HOOKS_DIR / f"plugin-{name}-{spec['name']}"
+        shutil.copy2(spec["source"], dest)
+        dest.chmod(dest.stat().st_mode | 0o111)
+        print(f"    Copied hook: {spec['name']} -> {dest.name}")
+        installed_items.append(f"hook:{dest.name}")
 
-    print(f"  Installing: {name} ({pack.get('description', '')})")
 
-    _link_agents(includes, pack_dir, installed_items)
-    _link_skills(includes, pack_dir, installed_items)
-    _copy_hooks(name, pack_dir, installed_items)
-    _copy_scripts(name, pack_dir, installed_items)
+def _plugin_hook_command(name: str, spec: dict) -> str:
+    if spec["is_core"]:
+        return f"\"$HOME/.softspark/ai-toolkit/hooks/{spec['name']}\""
+    return f"\"$HOME/.softspark/ai-toolkit/hooks/plugin-{name}-{spec['name']}\""
 
-    plugin_hooks_dir = pack_dir / "hooks"
-    if plugin_hooks_dir.is_dir() and any(plugin_hooks_dir.glob("*.sh")):
-        _inject_plugin_hooks(name, pack_dir)
 
-    state = load_state()
-    if name not in state["installed"]:
-        state["installed"].append(name)
-    save_state(state)
+def _load_json(path: Path, default: dict) -> dict:
+    if not path.is_file():
+        return json.loads(json.dumps(default))
+    try:
+        with open(path, encoding="utf-8") as f:
+            data = json.load(f)
+    except (json.JSONDecodeError, OSError):
+        return json.loads(json.dumps(default))
+    if isinstance(data, dict):
+        return data
+    return json.loads(json.dumps(default))
+
+
+def _write_json(path: Path, data: dict) -> None:
+    path.parent.mkdir(parents=True, exist_ok=True)
+    with open(path, "w", encoding="utf-8") as f:
+        json.dump(data, f, indent=4)
+        f.write("\n")
+
+
+def _load_core_hook_matchers() -> dict[str, str]:
+    hooks_json = app_dir / "hooks.json"
+    if not hooks_json.is_file():
+        return {}
+    data = _load_json(hooks_json, {"hooks": {}})
+    mapping: dict[str, str] = {}
+    for entries in data.get("hooks", {}).values():
+        if not isinstance(entries, list):
+            continue
+        for entry in entries:
+            if not isinstance(entry, dict):
+                continue
+            matcher = entry.get("matcher", "")
+            for hook in entry.get("hooks", []):
+                if not isinstance(hook, dict):
+                    continue
+                command = hook.get("command", "")
+                base = Path(command.replace("\"", "")).name
+                if base and base not in mapping:
+                    mapping[base] = matcher
+    return mapping
+
+
+CORE_HOOK_MATCHERS = _load_core_hook_matchers()
+
+
+def _hook_already_present(hooks_data: dict, hook_name: str) -> bool:
+    for entries in hooks_data.get("hooks", {}).values():
+        if not isinstance(entries, list):
+            continue
+        for entry in entries:
+            for hook in entry.get("hooks", []):
+                command = hook.get("command", "")
+                if Path(command.replace("\"", "")).name == hook_name:
+                    return True
+    return False
 
-    print(f"  Done: {name} ({len(installed_items)} items)")
-    return True
 
+# ---------------------------------------------------------------------------
+# Claude runtime
+# ---------------------------------------------------------------------------
 
-def _inject_plugin_hooks(name: str, pack_dir: Path) -> None:
-    """Register plugin hooks in settings.json via manual JSON merge."""
+def _ensure_claude_settings() -> Path:
+    CLAUDE_DIR.mkdir(parents=True, exist_ok=True)
     settings_path = CLAUDE_DIR / "settings.json"
     if not settings_path.is_file():
-        return
+        _write_json(settings_path, {"hooks": {}, "env": {}})
+    return settings_path
 
-    try:
-        with open(settings_path) as f:
-            settings = json.load(f)
-    except (json.JSONDecodeError, OSError):
-        return
 
+def _install_claude_skills(pack: dict, pack_dir: Path, installed_items: list[str]) -> None:
+    for skill in pack.get("includes", {}).get("skills", []):
+        skill_dir = CLAUDE_DIR / "skills" / skill
+        source_dir = _resolve_skill_source(pack_dir, skill)
+        if skill_dir.exists() or skill_dir.is_symlink():
+            print(f"    OK skill: {skill}")
+        elif source_dir:
+            skill_dir.parent.mkdir(parents=True, exist_ok=True)
+            skill_dir.symlink_to(source_dir)
+            print(f"    Linked skill: {skill}")
+            installed_items.append(f"skill:{skill}")
+        else:
+            print(f"    WARN skill not found: {skill}")
+
+
+def _install_claude_agents(pack: dict, installed_items: list[str]) -> None:
+    for agent in pack.get("includes", {}).get("agents", []):
+        agent_file = CLAUDE_DIR / "agents" / f"{agent}.md"
+        source_file = app_dir / "agents" / f"{agent}.md"
+        if agent_file.exists() or agent_file.is_symlink():
+            print(f"    OK agent: {agent}")
+        elif source_file.is_file():
+            agent_file.parent.mkdir(parents=True, exist_ok=True)
+            agent_file.symlink_to(source_file)
+            print(f"    Linked agent: {agent}")
+            installed_items.append(f"agent:{agent}")
+        else:
+            print(f"    WARN agent not found: {agent}")
+
+
+def _merge_claude_hooks(name: str, hook_specs: list[dict]) -> None:
+    settings_path = _ensure_claude_settings()
+    settings = _load_json(settings_path, {"hooks": {}, "env": {}})
     hooks = settings.setdefault("hooks", {})
-    plugin_hooks_dir = pack_dir / "hooks"
+    source_tag = f"ai-toolkit-plugin-{name}"
 
-    for hook_file in sorted(plugin_hooks_dir.glob("*.sh")):
-        # Determine event from hook filename or manifest
-        event = _guess_event(hook_file.name, name)
-        if not event:
+    for spec in hook_specs:
+        if spec["is_core"]:
+            # Base Claude install already owns core hooks.
             continue
-
-        dest_path = HOOKS_DIR / f"plugin-{name}-{hook_file.name}"
         entry = {
-            "_source": f"ai-toolkit-plugin-{name}",
-            "matcher": "",
+            "_source": source_tag,
+            "matcher": CORE_HOOK_MATCHERS.get(spec["name"], ""),
             "hooks": [
                 {
                     "type": "command",
-                    "command": str(dest_path),
+                    "command": _plugin_hook_command(name, spec),
                 }
             ],
         }
-
-        event_hooks = hooks.setdefault(event, [])
-        # Remove old entries from this plugin
-        event_hooks = [h for h in event_hooks if h.get("_source") != f"ai-toolkit-plugin-{name}"]
+        event_hooks = hooks.setdefault(spec["event"], [])
+        event_hooks = [h for h in event_hooks if h.get("_source") != source_tag]
         event_hooks.append(entry)
-        hooks[event] = event_hooks
+        hooks[spec["event"]] = event_hooks
 
-    with open(settings_path, "w") as f:
-        json.dump(settings, f, indent=4)
-    print(f"    Merged hooks into settings.json")
+    _write_json(settings_path, settings)
+    print("    Merged hooks into ~/.claude/settings.json")
+
+
+def _strip_claude_hooks(name: str) -> None:
+    settings_path = CLAUDE_DIR / "settings.json"
+    if not settings_path.is_file():
+        return
+
+    settings = _load_json(settings_path, {"hooks": {}})
+    hooks = settings.get("hooks", {})
+    source_tag = f"ai-toolkit-plugin-{name}"
+    changed = False
+
+    for event in list(hooks.keys()):
+        original = hooks[event]
+        filtered = [h for h in original if h.get("_source") != source_tag]
+        if len(filtered) != len(original):
+            hooks[event] = filtered
+            changed = True
+        if not hooks[event]:
+            del hooks[event]
 
+    if changed:
+        _write_json(settings_path, settings)
+        print("    Stripped hooks from ~/.claude/settings.json")
 
-def _guess_event(hook_filename: str, pack_name: str) -> str:
-    """Map hook filename to Claude Code event.
 
-    Uses hook_events from the plugin manifest if available,
-    falls back to filename-based guessing.
-    """
-    pack = find_pack(pack_name)
-    if pack:
-        return resolve_hook_event(hook_filename, pack)
-    # Fallback for unknown packs
-    return resolve_hook_event(hook_filename, {})
+def _install_claude_rules(name: str, rule_specs: list[dict]) -> None:
+    for spec in rule_specs:
+        if spec["is_core"] and _has_core_claude_rule(spec["name"]):
+            print(f"    OK rule (core install): {spec['name']}")
+            continue
+        section = f"plugin-{name}-{spec['name']}"
+        inject_section(spec["source"], CLAUDE_DIR / "CLAUDE.md", section)
+        print(f"    Injected rule: {spec['name']} -> ~/.claude/CLAUDE.md")
 
 
-# ---------------------------------------------------------------------------
-# Remove
-# ---------------------------------------------------------------------------
+def _remove_claude_rules(name: str, rule_specs: list[dict]) -> None:
+    for spec in rule_specs:
+        if spec["is_core"] and _has_core_claude_rule(spec["name"]):
+            continue
+        section = f"plugin-{name}-{spec['name']}"
+        remove_rule_section(section, Path.home())
 
-def remove_pack(name: str) -> bool:
-    """Remove a plugin pack. Returns True if successful."""
-    state = load_state()
-    if name not in state["installed"]:
-        print(f"  Plugin '{name}' is not installed")
-        return False
 
-    print(f"  Removing: {name}")
+def install_pack_claude(name: str, pack: dict, pack_dir: Path) -> bool:
+    installed_items: list[str] = []
+    hook_specs = _resolve_pack_hooks(pack, pack_dir)
+    rule_specs = _resolve_pack_rules(pack, pack_dir)
+
+    _ensure_core_hook_scripts()
+    _install_claude_agents(pack, installed_items)
+    _install_claude_skills(pack, pack_dir, installed_items)
+    _copy_plugin_hook_scripts(name, hook_specs, installed_items)
+    _copy_plugin_scripts(name, pack_dir, installed_items)
+    _install_claude_rules(name, rule_specs)
+    if any(not spec["is_core"] for spec in hook_specs):
+        _merge_claude_hooks(name, hook_specs)
+
+    print(f"  Done: {name} for claude ({len(installed_items)} file items)")
+    return True
 
-    # 1. Remove plugin hooks from ~/.softspark/ai-toolkit/hooks/
-    removed = 0
-    for hook in HOOKS_DIR.glob(f"plugin-{name}-*.sh"):
-        hook.unlink()
-        print(f"    Removed hook: {hook.name}")
-        removed += 1
 
-    # 2. Remove plugin scripts
-    scripts_dir = TOOLKIT_DATA_DIR / "plugin-scripts" / name
-    if scripts_dir.is_dir():
-        shutil.rmtree(scripts_dir)
-        print(f"    Removed scripts: {scripts_dir}")
-        removed += 1
+def remove_pack_claude(name: str, pack: dict, pack_dir: Path, *, keep_shared_assets: bool) -> bool:
+    hook_specs = _resolve_pack_hooks(pack, pack_dir)
+    rule_specs = _resolve_pack_rules(pack, pack_dir)
 
-    # 3. Strip plugin hooks from settings.json
-    _strip_plugin_hooks(name)
+    if not keep_shared_assets:
+        for hook in HOOKS_DIR.glob(f"plugin-{name}-*.sh"):
+            hook.unlink()
+            print(f"    Removed hook: {hook.name}")
 
-    # 4. Update state
-    state["installed"] = [p for p in state["installed"] if p != name]
-    save_state(state)
+        scripts_dir = TOOLKIT_DATA_DIR / "plugin-scripts" / name
+        if scripts_dir.is_dir():
+            shutil.rmtree(scripts_dir)
+            print(f"    Removed scripts: {scripts_dir}")
 
-    print(f"  Done: removed {name}")
+    if any(not spec["is_core"] for spec in hook_specs):
+        _strip_claude_hooks(name)
+    _remove_claude_rules(name, rule_specs)
+
+    print(f"  Done: removed {name} from claude")
     return True
 
 
-def _strip_plugin_hooks(name: str) -> None:
-    """Remove plugin hooks from settings.json."""
-    settings_path = CLAUDE_DIR / "settings.json"
-    if not settings_path.is_file():
-        return
+# ---------------------------------------------------------------------------
+# Codex runtime
+# ---------------------------------------------------------------------------
+
+def _install_all_codex_skills(target_root: Path) -> None:
+    skills_src = app_dir / "skills"
+    skills_dst = target_root / ".agents" / "skills"
+    skills_dst.mkdir(parents=True, exist_ok=True)
+    for skill_dir in sorted(skills_src.iterdir()):
+        if not skill_dir.is_dir() or skill_dir.name.startswith("_"):
+            continue
+        skill_md = skill_dir / "SKILL.md"
+        if not skill_md.is_file():
+            continue
+        sync_codex_skill(skill_dir, skills_dst)
+    cleanup_codex_skills(skills_dst, skills_src)
 
-    try:
-        with open(settings_path) as f:
-            settings = json.load(f)
-    except (json.JSONDecodeError, OSError):
-        return
 
+def _install_codex_extra_skills(pack: dict, pack_dir: Path) -> None:
+    skills_dst = CODEX_ROOT / ".agents" / "skills"
+    skills_dst.mkdir(parents=True, exist_ok=True)
+    for skill in pack.get("includes", {}).get("skills", []):
+        source_dir = _resolve_skill_source(pack_dir, skill)
+        if not source_dir:
+            print(f"    WARN skill not found: {skill}")
+            continue
+        sync_codex_skill(source_dir, skills_dst)
+        print(f"    Ensured Codex skill: {skill}")
+
+
+def _install_codex_base() -> None:
+    _ensure_core_hook_scripts()
+    inject_with_rules("generate_codex.py", CODEX_ROOT / "AGENTS.md", RULES_DIR)
+    generate_codex_rules(CODEX_ROOT, rules_dir=RULES_DIR)
+    hooks_path = CODEX_ROOT / ".codex" / "hooks.json"
+    existing = _load_json(hooks_path, {"hooks": {}})
+    plugin_entries: dict[str, list[dict]] = {}
+    for event, entries in existing.get("hooks", {}).items():
+        kept = [entry for entry in entries if str(entry.get("_source", "")).startswith("ai-toolkit-plugin-")]
+        if kept:
+            plugin_entries[event] = kept
+
+    generate_codex_hooks(CODEX_ROOT)
+
+    if plugin_entries:
+        refreshed = _load_json(hooks_path, {"hooks": {}})
+        bucket = refreshed.setdefault("hooks", {})
+        for event, entries in plugin_entries.items():
+            bucket.setdefault(event, [])
+            bucket[event].extend(entries)
+        _write_json(hooks_path, refreshed)
+    _install_all_codex_skills(CODEX_ROOT)
+
+
+def _ensure_codex_hooks_file() -> Path:
+    hooks_path = CODEX_ROOT / ".codex" / "hooks.json"
+    if not hooks_path.is_file():
+        generate_codex_hooks(CODEX_ROOT)
+    return hooks_path
+
+
+def _codex_matcher(spec: dict) -> str:
+    if spec["event"] in {"PreToolUse", "PostToolUse"}:
+        return "Bash"
+    if spec["event"] == "SessionStart":
+        return "startup|resume"
+    return CORE_HOOK_MATCHERS.get(spec["name"], "")
+
+
+def _merge_codex_hooks(name: str, hook_specs: list[dict]) -> None:
+    hooks_path = _ensure_codex_hooks_file()
+    data = _load_json(hooks_path, {"hooks": {}})
+    bucket = data.setdefault("hooks", {})
+    source_tag = f"ai-toolkit-plugin-{name}"
+
+    for spec in hook_specs:
+        if spec["event"] not in SUPPORTED_CODEX_HOOK_EVENTS:
+            print(f"    Skipped Codex hook (unsupported event): {spec['name']} -> {spec['event']}")
+            continue
+        if spec["is_core"] and _hook_already_present(data, spec["name"]):
+            print(f"    OK Codex hook (base install): {spec['name']}")
+            continue
+        entry = {
+            "_source": source_tag,
+            "hooks": [
+                {
+                    "type": "command",
+                    "command": _plugin_hook_command(name, spec),
+                }
+            ],
+        }
+        matcher = _codex_matcher(spec)
+        if matcher:
+            entry["matcher"] = matcher
+
+        event_hooks = bucket.setdefault(spec["event"], [])
+        event_hooks = [h for h in event_hooks if h.get("_source") != source_tag]
+        event_hooks.append(entry)
+        bucket[spec["event"]] = event_hooks
+
+    _write_json(hooks_path, data)
+    print("    Merged hooks into ~/.codex/hooks.json")
+
+
+def _strip_codex_hooks(name: str) -> None:
+    hooks_path = CODEX_ROOT / ".codex" / "hooks.json"
+    if not hooks_path.is_file():
+        return
+    data = _load_json(hooks_path, {"hooks": {}})
+    bucket = data.get("hooks", {})
     source_tag = f"ai-toolkit-plugin-{name}"
-    hooks = settings.get("hooks", {})
     changed = False
 
-    for event in list(hooks.keys()):
-        original = hooks[event]
+    for event in list(bucket.keys()):
+        original = bucket[event]
         filtered = [h for h in original if h.get("_source") != source_tag]
         if len(filtered) != len(original):
-            hooks[event] = filtered
+            bucket[event] = filtered
             changed = True
-        if not hooks[event]:
-            del hooks[event]
+        if not bucket[event]:
+            del bucket[event]
 
     if changed:
-        with open(settings_path, "w") as f:
-            json.dump(settings, f, indent=4)
-        print(f"    Stripped hooks from settings.json")
+        _write_json(hooks_path, data)
+        print("    Stripped hooks from ~/.codex/hooks.json")
+
+
+def _install_codex_rules(name: str, rule_specs: list[dict]) -> None:
+    rules_dir = CODEX_ROOT / ".agents" / "rules"
+    rules_dir.mkdir(parents=True, exist_ok=True)
+    for spec in rule_specs:
+        dest = rules_dir / f"plugin-{name}-{spec['name']}.md"
+        shutil.copy2(spec["source"], dest)
+        print(f"    Installed Codex rule: {dest.name}")
+
+
+def _remove_codex_rules(name: str) -> None:
+    rules_dir = CODEX_ROOT / ".agents" / "rules"
+    if not rules_dir.is_dir():
+        return
+    for rule_file in sorted(rules_dir.glob(f"plugin-{name}-*.md")):
+        rule_file.unlink()
+        print(f"    Removed Codex rule: {rule_file.name}")
+
+
+def install_pack_codex(name: str, pack: dict, pack_dir: Path) -> bool:
+    installed_items: list[str] = []
+    hook_specs = _resolve_pack_hooks(pack, pack_dir)
+    rule_specs = _resolve_pack_rules(pack, pack_dir)
+
+    _install_codex_base()
+    _install_codex_extra_skills(pack, pack_dir)
+    _copy_plugin_hook_scripts(name, hook_specs, installed_items)
+    _copy_plugin_scripts(name, pack_dir, installed_items)
+    _install_codex_rules(name, rule_specs)
+    _merge_codex_hooks(name, hook_specs)
+
+    print(f"  Done: {name} for codex ({len(installed_items)} file items)")
+    return True
+
+
+def remove_pack_codex(name: str, pack: dict, pack_dir: Path, *, keep_shared_assets: bool) -> bool:
+    if not keep_shared_assets:
+        for hook in HOOKS_DIR.glob(f"plugin-{name}-*.sh"):
+            hook.unlink()
+            print(f"    Removed hook: {hook.name}")
+
+        scripts_dir = TOOLKIT_DATA_DIR / "plugin-scripts" / name
+        if scripts_dir.is_dir():
+            shutil.rmtree(scripts_dir)
+            print(f"    Removed scripts: {scripts_dir}")
+
+    _strip_codex_hooks(name)
+    _remove_codex_rules(name)
+    print(f"  Done: removed {name} from codex")
+    return True
 
 
 # ---------------------------------------------------------------------------
-# Update
+# Common actions
 # ---------------------------------------------------------------------------
 
-def update_pack(name: str) -> bool:
-    """Update a single plugin pack (remove + install). Returns True if successful."""
+def install_pack(name: str, editor: str) -> bool:
+    pack = find_pack(name)
+    if not pack:
+        print(f"  ERROR: plugin pack '{name}' not found")
+        print(f"  Available: {', '.join(p['name'] for p in list_available())}")
+        return False
+
+    pack_dir = Path(pack["_dir"])
+    installed_items: list[str] = []
+
+    print(f"  Installing: {name} for {editor} ({pack.get('description', '')})")
+
+    ok = install_pack_claude(name, pack, pack_dir) if editor == "claude" else install_pack_codex(name, pack, pack_dir)
+    if not ok:
+        return False
+
+    state = load_state()
+    installed = _installed_for(state, editor)
+    if name not in installed:
+        installed.append(name)
+    _set_installed(state, editor, installed)
+    save_state(state)
+    return True
+
+
+def remove_pack(name: str, editor: str) -> bool:
     state = load_state()
-    if name not in state["installed"]:
-        print(f"  Plugin '{name}' is not installed — use 'install' instead")
+    installed = _installed_for(state, editor)
+    if name not in installed:
+        print(f"  Plugin '{name}' is not installed for {editor}")
         return False
 
-    print(f"  Updating: {name}")
-    remove_pack(name)
-    return install_pack(name)
+    pack = find_pack(name)
+    if not pack:
+        print(f"  Plugin '{name}' manifest not found")
+        return False
+
+    pack_dir = Path(pack["_dir"])
+    print(f"  Removing: {name} from {editor}")
+    keep_shared_assets = any(
+        name in _installed_for(state, other)
+        for other in VALID_EDITORS
+        if other != editor
+    )
+    ok = (
+        remove_pack_claude(name, pack, pack_dir, keep_shared_assets=keep_shared_assets)
+        if editor == "claude"
+        else remove_pack_codex(name, pack, pack_dir, keep_shared_assets=keep_shared_assets)
+    )
+    if not ok:
+        return False
+
+    installed = [p for p in installed if p != name]
+    _set_installed(state, editor, installed)
+    save_state(state)
+    return True
+
+
+def update_pack(name: str, editor: str) -> bool:
+    state = load_state()
+    if name not in _installed_for(state, editor):
+        print(f"  Plugin '{name}' is not installed for {editor} — use 'install' instead")
+        return False
+
+    print(f"  Updating: {name} for {editor}")
+    remove_pack(name, editor)
+    return install_pack(name, editor)
 
 
 # ---------------------------------------------------------------------------
 # Clean
 # ---------------------------------------------------------------------------
 
-MEMORY_DB = TOOLKIT_DATA_DIR / "memory.db"
-
-# Map plugin names to their clean logic
 CLEANABLE_PLUGINS = {"memory-pack"}
 
 
 def clean_pack(name: str, days: int = 90) -> bool:
     """Prune old data for a plugin. Returns True if successful."""
     state = load_state()
-    if name not in state["installed"]:
+    installed_anywhere = any(name in _installed_for(state, editor) for editor in VALID_EDITORS)
+    if not installed_anywhere:
         print(f"  Plugin '{name}' is not installed")
         return False
 
@@ -393,17 +790,12 @@ def _clean_memory_pack(days: int) -> bool:
         conn = sqlite.connect(str(MEMORY_DB))
         cur = conn.cursor()
 
-        # Count before
         before = cur.execute("SELECT COUNT(*) FROM observations").fetchone()[0]
-
-        # Delete old observations
         cur.execute(
             "DELETE FROM observations WHERE created_at < datetime('now', ?)",
             (f"-{days} days",),
         )
         pruned_obs = cur.rowcount
-
-        # Delete orphan sessions
         cur.execute(
             "DELETE FROM sessions WHERE session_id NOT IN "
             "(SELECT DISTINCT session_id FROM observations) "
@@ -439,62 +831,45 @@ def _human_size(size_bytes: int) -> str:
 # List / Status
 # ---------------------------------------------------------------------------
 
-def cmd_list() -> None:
-    """List available plugin packs."""
+def cmd_list(editors: list[str]) -> None:
     packs = list_available()
     state = load_state()
 
     print("Available plugin packs:")
     print()
-    print(f"  {'Name':<20} {'Domain':<12} {'Status':<14} {'Agents':>7} {'Skills':>7} {'Hooks':>6}  Installed")
-    print(f"  {'-'*20} {'-'*12} {'-'*14} {'-'*7} {'-'*7} {'-'*6}  {'-'*9}")
+    print(
+        f"  {'Name':<20} {'Domain':<12} {'Status':<14} {'Agents':>7} {'Skills':>7} {'Hooks':>6}"
+        f"  {'Claude':>6} {'Codex':>6}"
+    )
+    print(
+        f"  {'-'*20} {'-'*12} {'-'*14} {'-'*7} {'-'*7} {'-'*6}"
+        f"  {'-'*6} {'-'*6}"
+    )
 
     for pack in packs:
         inc = pack.get("includes", {})
-        installed = "YES" if pack["name"] in state["installed"] else ""
+        claude = "YES" if pack["name"] in _installed_for(state, "claude") else ""
+        codex = "YES" if pack["name"] in _installed_for(state, "codex") else ""
         print(
             f"  {pack['name']:<20} {pack.get('domain',''):<12} {pack.get('status',''):<14}"
             f" {len(inc.get('agents',[])):>7} {len(inc.get('skills',[])):>7} {len(inc.get('hooks',[])):>6}"
-            f"  {installed}"
+            f"  {claude:>6} {codex:>6}"
         )
 
     print()
-    print(f"  Total: {len(packs)} packs, {len(state['installed'])} installed")
+    print(
+        f"  Total: {len(packs)} packs | Claude: {len(_installed_for(state, 'claude'))}"
+        f" | Codex: {len(_installed_for(state, 'codex'))}"
+    )
     print()
-    print("  Install:    ai-toolkit plugin install <name>")
-    print("  Install all: ai-toolkit plugin install --all")
-    print("  Update:     ai-toolkit plugin update <name>")
-    print("  Update all: ai-toolkit plugin update --all")
-    print("  Clean:      ai-toolkit plugin clean <name> [--days N]")
-    print("  Remove:     ai-toolkit plugin remove <name>")
-
-
-def cmd_status() -> None:
-    """Show installed plugins with details."""
-    state = load_state()
-    if not state["installed"]:
-        print("No plugins installed.")
-        print("Run: ai-toolkit plugin list")
-        return
-
-    print("Installed plugins:")
-    for name in state["installed"]:
-        pack = find_pack(name)
-        if pack:
-            print(f"  {name}: {pack.get('description', '')}")
-            # Check hooks
-            hooks = list(HOOKS_DIR.glob(f"plugin-{name}-*.sh"))
-            if hooks:
-                print(f"    Hooks: {', '.join(h.name for h in hooks)}")
-            # Show memory-pack DB stats
-            if name == "memory-pack":
-                _show_memory_stats()
-        else:
-            print(f"  {name}: (manifest not found — orphaned?)")
+    print("  Install:     ai-toolkit plugin install --editor claude|codex|all <name>")
+    print("  Install all: ai-toolkit plugin install --editor claude|codex|all --all")
+    print("  Update:      ai-toolkit plugin update --editor claude|codex|all <name>")
+    print("  Remove:      ai-toolkit plugin remove --editor claude|codex|all <name>")
+    print("  Clean:       ai-toolkit plugin clean <name> [--days N]")
 
 
 def _show_memory_stats() -> None:
-    """Show memory-pack database statistics."""
     if not MEMORY_DB.is_file():
         print("    DB: not initialized")
         return
@@ -514,71 +889,134 @@ def _show_memory_stats() -> None:
         print(f"    DB: {_human_size(MEMORY_DB.stat().st_size)} (error reading stats)")
 
 
+def cmd_status(editors: list[str]) -> None:
+    state = load_state()
+    shown = False
+    for editor in editors:
+        installed = _installed_for(state, editor)
+        print(f"Installed plugins for {editor}:")
+        if not installed:
+            print("  (none)")
+            print()
+            continue
+        shown = True
+        for name in installed:
+            pack = find_pack(name)
+            if not pack:
+                print(f"  {name}: (manifest not found — orphaned?)")
+                continue
+            print(f"  {name}: {pack.get('description', '')}")
+            if editor == "claude":
+                hooks = list(HOOKS_DIR.glob(f"plugin-{name}-*.sh"))
+                if hooks:
+                    print(f"    Hooks: {', '.join(h.name for h in hooks)}")
+            elif editor == "codex":
+                rules_dir = CODEX_ROOT / ".agents" / "rules"
+                rule_files = sorted(rules_dir.glob(f"ai-toolkit-plugin-{name}-*.md")) if rules_dir.is_dir() else []
+                if rule_files:
+                    print(f"    Rules: {', '.join(f.name for f in rule_files)}")
+            if name == "memory-pack":
+                _show_memory_stats()
+        print()
+
+    if not shown and all(not _installed_for(state, editor) for editor in editors):
+        print("Run: ai-toolkit plugin list")
+
+
 # ---------------------------------------------------------------------------
-# Main
+# CLI parsing
 # ---------------------------------------------------------------------------
 
-def _cmd_install(args: list[str]) -> None:
+def _parse_editors(args: list[str]) -> tuple[list[str], list[str]]:
+    editors = ["claude"]
+    remainder: list[str] = []
+    i = 0
+    while i < len(args):
+        arg = args[i]
+        if arg.startswith("--editor="):
+            value = arg.split("=", 1)[1]
+        elif arg == "--editor":
+            if i + 1 >= len(args):
+                print("ERROR: --editor requires a value")
+                sys.exit(1)
+            i += 1
+            value = args[i]
+        else:
+            remainder.append(arg)
+            i += 1
+            continue
+
+        if value == "all":
+            editors = list(VALID_EDITORS)
+        else:
+            parsed = [item.strip() for item in value.split(",") if item.strip()]
+            invalid = [item for item in parsed if item not in VALID_EDITORS]
+            if invalid:
+                print(f"ERROR: unsupported editor(s): {', '.join(invalid)}")
+                print("Valid values: claude, codex, all")
+                sys.exit(1)
+            editors = parsed or ["claude"]
+        i += 1
+    return editors, remainder
+
+
+def _cmd_install(args: list[str], editors: list[str]) -> None:
     if not args:
-        print("Usage: ai-toolkit plugin install <pack-name> [...]")
-        print("       ai-toolkit plugin install --all")
+        print("Usage: ai-toolkit plugin install [--editor claude|codex|all] <pack-name> [...]")
+        print("       ai-toolkit plugin install [--editor claude|codex|all] --all")
         sys.exit(1)
-    if "--all" in args:
-        packs = list_available()
-        print(f"Installing all {len(packs)} plugin packs...\n")
+    names = [pack["name"] for pack in list_available()] if "--all" in args else args
+    for editor in editors:
+        if "--all" in args:
+            print(f"Installing all {len(names)} plugin packs for {editor}...\n")
         ok = 0
-        for pack in packs:
-            if install_pack(pack["name"]):
+        for name in names:
+            if install_pack(name, editor):
                 ok += 1
             print()
-        print(f"Installed: {ok}/{len(packs)} packs")
-    else:
-        for name in args:
-            install_pack(name)
+        if "--all" in args:
+            print(f"Installed: {ok}/{len(names)} packs for {editor}")
             print()
 
 
-def _cmd_remove(args: list[str]) -> None:
+def _cmd_remove(args: list[str], editors: list[str]) -> None:
     if not args:
-        print("Usage: ai-toolkit plugin remove <pack-name> [...]")
-        print("       ai-toolkit plugin remove --all")
+        print("Usage: ai-toolkit plugin remove [--editor claude|codex|all] <pack-name> [...]")
+        print("       ai-toolkit plugin remove [--editor claude|codex|all] --all")
         sys.exit(1)
-    if "--all" in args:
-        state = load_state()
-        names = list(state["installed"])
+    state = load_state()
+    for editor in editors:
+        names = list(_installed_for(state, editor)) if "--all" in args else args
         if not names:
-            print("No plugins installed.")
-            return
-        for name in names:
-            remove_pack(name)
+            print(f"No plugins installed for {editor}.")
             print()
-    else:
-        for name in args:
-            remove_pack(name)
+            continue
+        for name in names:
+            remove_pack(name, editor)
             print()
 
 
-def _cmd_update(args: list[str]) -> None:
+def _cmd_update(args: list[str], editors: list[str]) -> None:
     if not args:
-        print("Usage: ai-toolkit plugin update <pack-name> [...]")
-        print("       ai-toolkit plugin update --all")
+        print("Usage: ai-toolkit plugin update [--editor claude|codex|all] <pack-name> [...]")
+        print("       ai-toolkit plugin update [--editor claude|codex|all] --all")
         sys.exit(1)
-    if "--all" in args:
-        state = load_state()
-        names = list(state["installed"])
+    state = load_state()
+    for editor in editors:
+        names = list(_installed_for(state, editor)) if "--all" in args else args
         if not names:
-            print("No plugins installed.")
-            return
-        print(f"Updating {len(names)} installed plugin(s)...\n")
+            print(f"No plugins installed for {editor}.")
+            print()
+            continue
+        if "--all" in args:
+            print(f"Updating {len(names)} installed plugin(s) for {editor}...\n")
         ok = 0
         for name in names:
-            if update_pack(name):
+            if update_pack(name, editor):
                 ok += 1
             print()
-        print(f"Updated: {ok}/{len(names)} packs")
-    else:
-        for name in args:
-            update_pack(name)
+        if "--all" in args:
+            print(f"Updated: {ok}/{len(names)} packs for {editor}")
             print()
 
 
@@ -591,10 +1029,10 @@ def _parse_clean_args(args: list[str]) -> tuple[list[str], int]:
             try:
                 days = int(args[i + 1])
                 if days <= 0:
-                    print(f"  ERROR: --days must be positive, got {days}")
+                    print(f"ERROR: --days must be positive, got {days}")
                     sys.exit(1)
             except ValueError:
-                print(f"  ERROR: --days requires a number, got '{args[i + 1]}'")
+                print(f"ERROR: --days requires a number, got '{args[i + 1]}'")
                 sys.exit(1)
             i += 2
         else:
@@ -623,24 +1061,30 @@ def main() -> None:
         sys.exit(1)
 
     action = sys.argv[1]
-    args = sys.argv[2:]
-
-    dispatch = {
-        "list": lambda: cmd_list(),
-        "status": lambda: cmd_status(),
-        "install": lambda: _cmd_install(args),
-        "remove": lambda: _cmd_remove(args),
-        "update": lambda: _cmd_update(args),
-        "clean": lambda: _cmd_clean(args),
-    }
+    editors, args = _parse_editors(sys.argv[2:])
 
-    handler = dispatch.get(action)
-    if handler:
-        handler()
-    else:
-        print(f"Unknown action: {action}")
-        print("Actions: install, remove, update, clean, list, status")
-        sys.exit(1)
+    if action == "list":
+        cmd_list(editors)
+        return
+    if action == "status":
+        cmd_status(editors)
+        return
+    if action == "install":
+        _cmd_install(args, editors)
+        return
+    if action == "remove":
+        _cmd_remove(args, editors)
+        return
+    if action == "update":
+        _cmd_update(args, editors)
+        return
+    if action == "clean":
+        _cmd_clean(args)
+        return
+
+    print(f"Unknown action: {action}")
+    print("Actions: install, remove, update, clean, list, status")
+    sys.exit(1)
 
 
 if __name__ == "__main__":