@softspark/ai-toolkit 4.11.0 → 4.13.0

package/scripts/plugin.py

@@ -23,6 +23,7 @@ Actions:
 from __future__ import annotations
 
 import json
+import re
 import shutil
 import sqlite3 as sqlite
 import subprocess
@@ -31,6 +32,7 @@ from pathlib import Path
 
 sys.path.insert(0, str(Path(__file__).resolve().parent))
 from _common import app_dir, inject_section, inject_rule, remove_rule_section
+from injection import strip_section, trim_trailing_blanks
 from codex_skill_adapter import cleanup_codex_skills, sync_codex_skill
 from generate_codex_hooks import generate as generate_codex_hooks
 from install_steps.ai_tools import inject_with_rules
@@ -536,8 +538,9 @@ def _install_codex_extra_skills(pack: dict, pack_dir: Path) -> None:
 def _install_codex_base() -> None:
     _ensure_core_hook_scripts()
     # Universal coding rules are inlined into AGENTS.md by generate_codex.py;
-    # Codex does not read a .agents/rules/ directory.
-    inject_with_rules("generate_codex.py", CODEX_ROOT / "AGENTS.md", RULES_DIR)
+    # Codex does not read a .agents/rules/ directory. Global instructions must
+    # live at $CODEX_HOME/AGENTS.md (default ~/.codex/AGENTS.md), not ~/AGENTS.md.
+    inject_with_rules("generate_codex.py", CODEX_ROOT / ".codex" / "AGENTS.md", RULES_DIR)
     hooks_path = CODEX_ROOT / ".codex" / "hooks.json"
     existing = _load_json(hooks_path, {"hooks": {}})
     plugin_entries: dict[str, list[dict]] = {}
@@ -632,21 +635,41 @@ def _strip_codex_hooks(name: str) -> None:
 
 
 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)
+    # Codex reads instructions only from AGENTS.md, never from a .agents/rules/
+    # directory, so pack rules are marker-injected into ~/.codex/AGENTS.md (the
+    # documented global instruction file) instead of written as dead files.
+    agents_md = CODEX_ROOT / ".codex" / "AGENTS.md"
     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}")
+        section = f"plugin-{name}-{spec['name']}"
+        inject_section(spec["source"], agents_md, section)
+        print(f"    Injected Codex rule: {spec['name']} -> ~/.codex/AGENTS.md")
+    _clean_legacy_codex_rule_files(name)
 
 
 def _remove_codex_rules(name: str) -> None:
+    agents_md = CODEX_ROOT / ".codex" / "AGENTS.md"
+    if agents_md.is_file():
+        content = agents_md.read_text(encoding="utf-8")
+        changed = False
+        for match in re.findall(r"<!-- TOOLKIT:(plugin-" + re.escape(name) + r"-[^ ]+) START -->", content):
+            content = strip_section(content, match)
+            changed = True
+        if changed:
+            agents_md.write_text(trim_trailing_blanks(content) + "\n", encoding="utf-8")
+            print(f"    Removed Codex rules for {name} from ~/.codex/AGENTS.md")
+    _clean_legacy_codex_rule_files(name)
+
+
+def _clean_legacy_codex_rule_files(name: str) -> None:
+    """Remove dead ~/.agents/rules/plugin-<name>-*.md files written by earlier
+    versions. Codex never read them; Antigravity's .agents/rules/ is a separate,
+    project-local surface, so this only touches our own plugin-prefixed files."""
     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}")
+        print(f"    Removed legacy Codex rule file: {rule_file.name}")
 
 
 def install_pack_codex(name: str, pack: dict, pack_dir: Path) -> bool:

package/scripts/update_projects.py

@@ -28,8 +28,19 @@ def _update_project(project: dict[str, Any], install_script: str, extra_args: li
     # Pass saved editors from registry so update re-installs the same editors
     cmd_args = ["python3", install_script, "--local"] + extra_args
     project_editors = project.get("editors", [])
-    if project_editors:
+    has_editor_override = any(
+        arg == "--editors" or arg.startswith("--editors=")
+        for arg in extra_args
+    )
+    if project_editors and not has_editor_override:
         cmd_args.extend(["--editors", ",".join(project_editors)])
+    has_profile_override = any(
+        arg == "--profile" or arg.startswith("--profile=")
+        for arg in extra_args
+    )
+    project_profile = project.get("profile", "")
+    if project_profile and not has_profile_override:
+        cmd_args.extend(["--profile", project_profile])
 
     try:
         proc = subprocess.run(

package/scripts/validate.py

@@ -124,6 +124,10 @@ LANGUAGE_RULE_CATEGORIES = frozenset({
 
 PLANNED_ASSETS = [
     "app/.claude-plugin/plugin.json",
+    "app/claude-app/hooks/hooks.json",
+    "app/claude-app/skills/ai-toolkit-rules/SKILL.md",
+    "app/claude-app/global-instructions.md",
+    "scripts/claude_app.py",
     "scripts/doctor.py",
     "scripts/benchmark_ecosystem.py",
     "scripts/harvest_ecosystem.py",
@@ -561,9 +565,37 @@ def validate_planned_assets(tk_dir: Path, vr: ValidationResult) -> None:
             assert d["name"]
             assert d["version"]
             assert d["description"]
-            print("  OK: plugin manifest JSON is valid")
+            assert isinstance(d.get("repository"), str)
+            ignored = {"npm", "install", "marketplace", "claude-code"} & set(d)
+            assert not ignored
+            for path_field in ("hooks", "skills"):
+                relative = str(d[path_field]).removeprefix("./")
+                assert (tk_dir / "app" / relative).exists()
+            print("  OK: plugin manifest matches the official schema surface")
         except (json.JSONDecodeError, KeyError, AssertionError):
-            vr.error("Invalid plugin manifest JSON or missing required fields")
+            vr.error("Invalid plugin manifest JSON, official fields, or component paths")
+
+    try:
+        from claude_app import (
+            GLOBAL_INSTRUCTIONS_PATH,
+            PLUGIN_HOOKS_PATH,
+            PLUGIN_RULES_SKILL_PATH,
+            render_global_instructions,
+            render_plugin_hooks,
+            render_rules_skill,
+        )
+        generated = (
+            (PLUGIN_HOOKS_PATH, render_plugin_hooks()),
+            (PLUGIN_RULES_SKILL_PATH, render_rules_skill()),
+            (GLOBAL_INSTRUCTIONS_PATH, render_global_instructions()),
+        )
+        stale = [path for path, expected in generated if path.read_text(encoding="utf-8") != expected]
+        if stale:
+            vr.error("Stale Claude app assets; run: python3 scripts/claude_app.py sync")
+        else:
+            print("  OK: Claude app plugin assets match canonical rules/hooks")
+    except (OSError, ValueError, json.JSONDecodeError) as exc:
+        vr.error(f"Invalid Claude app generated assets: {exc}")
 
     # Validate benchmark dashboard JSON
     benchmark_dashboard = tk_dir / "benchmarks" / "ecosystem-dashboard.json"