@softspark/ai-toolkit 2.0.0 → 2.0.2

package/CHANGELOG.md

@@ -7,6 +7,20 @@ Versioning follows [Semantic Versioning](https://semver.org/).
 
 ---
 
+## v2.0.2 — Clean Legacy Directory Removal (2026-04-12)
+
+### Fixed
+- **Migration cleanup** — `~/.ai-toolkit/` is now fully removed after migration instead of leaving an empty directory with a `.migrated` marker
+
+---
+
+## v2.0.1 — Migration Hook Path Fix (2026-04-12)
+
+### Fixed
+- **settings.json hook paths** — migration now rewrites ALL hook commands (including plugin hooks with non-toolkit `_source` tags like `memory-pack`, `enterprise-pack`) from `~/.ai-toolkit/hooks/` to `~/.softspark/ai-toolkit/hooks/`
+
+---
+
 ## v2.0.0 — SoftSpark Namespace Migration (2026-04-12)
 
 ### BREAKING CHANGES

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@softspark/ai-toolkit",
-  "version": "2.0.0",
+  "version": "2.0.2",
   "description": "Professional-grade AI coding toolkit: 92 skills, 44 agents, multi-platform support (Claude, Cursor, Windsurf, Copilot, Gemini, Cline, Roo Code, Aider, Augment, Google Antigravity), machine-enforced safety constitution, persona presets, skill security auditor, expanded lifecycle hooks, 11 plugin packs, and benchmark tooling.",
   "keywords": [
     "claude",

package/scripts/migrate.py

@@ -21,7 +21,6 @@ import json
 import os
 import shutil
 import sys
-from datetime import datetime, timezone
 from pathlib import Path
 
 sys.path.insert(0, str(Path(__file__).resolve().parent))
@@ -36,14 +35,16 @@ from paths import (
 )
 
 
-MIGRATED_MARKER = LEGACY_DATA_DIR / ".migrated"
-
-
 def needs_migration() -> bool:
-    """Check if legacy directory exists and hasn't been migrated yet."""
+    """Check if legacy directory exists and needs migration.
+
+    Returns True only when ~/.ai-toolkit/ exists AND contains real data
+    (not just an empty dir). After migration the directory is removed entirely.
+    """
     if not LEGACY_DATA_DIR.is_dir():
         return False
-    if MIGRATED_MARKER.is_file():
+    # Empty dir (or only hidden files) — nothing to migrate
+    if not any(LEGACY_DATA_DIR.iterdir()):
         return False
     # Don't migrate if AI_TOOLKIT_HOME is set (custom setup)
     if os.environ.get("AI_TOOLKIT_HOME"):
@@ -77,11 +78,10 @@ def migrate_home_directory(dry_run: bool = False) -> bool:
     else:
         # Clean move
         shutil.move(str(LEGACY_DATA_DIR), str(TOOLKIT_DATA_DIR))
-        # Recreate legacy dir for marker
-        LEGACY_DATA_DIR.mkdir(parents=True, exist_ok=True)
 
-    # Write migration marker
-    _write_marker()
+    # Remove legacy directory entirely
+    if LEGACY_DATA_DIR.exists():
+        shutil.rmtree(str(LEGACY_DATA_DIR), ignore_errors=True)
 
     print(f"   Migrated: {TOOLKIT_DATA_DIR}")
     return True
@@ -103,21 +103,6 @@ def _merge_directories(src: Path, dst: Path) -> None:
             shutil.move(str(item), str(dest_item))
 
 
-def _write_marker() -> None:
-    """Write .migrated marker pointing to new location."""
-    LEGACY_DATA_DIR.mkdir(parents=True, exist_ok=True)
-    now = datetime.now(timezone.utc).strftime("%Y-%m-%dT%H:%M:%SZ")
-    marker_data = {
-        "migrated_to": str(TOOLKIT_DATA_DIR),
-        "migrated_at": now,
-        "message": "ai-toolkit data has moved to ~/.softspark/ai-toolkit/. "
-                   "This directory is kept as a marker. Safe to delete.",
-    }
-    with open(MIGRATED_MARKER, "w", encoding="utf-8") as f:
-        json.dump(marker_data, f, indent=2)
-        f.write("\n")
-
-
 def migrate_project_configs(dry_run: bool = False) -> int:
     """Rename .ai-toolkit.json → .softspark-toolkit.json in registered projects.
 
@@ -163,8 +148,49 @@ def migrate_project_configs(dry_run: bool = False) -> int:
     return count
 
 
+def migrate_settings_json(dry_run: bool = False) -> int:
+    """Rewrite hook commands in ~/.claude/settings.json from old to new path.
+
+    Replaces ALL occurrences of .ai-toolkit/hooks/ with .softspark/ai-toolkit/hooks/
+    in hook command strings, regardless of _source tag. This catches plugin hooks
+    (memory-pack, enterprise-pack, etc.) that merge-hooks.py doesn't strip.
+
+    Returns the number of commands rewritten.
+    """
+    settings_path = Path.home() / ".claude" / "settings.json"
+    if not settings_path.is_file():
+        return 0
+
+    try:
+        with open(settings_path, encoding="utf-8") as f:
+            data = json.load(f)
+    except (json.JSONDecodeError, OSError):
+        return 0
+
+    hooks = data.get("hooks", {})
+    old_prefix = ".ai-toolkit/hooks/"
+    new_prefix = ".softspark/ai-toolkit/hooks/"
+    count = 0
+
+    for entries in hooks.values():
+        for entry in entries:
+            for hook in entry.get("hooks", []):
+                cmd = hook.get("command", "")
+                if old_prefix in cmd and new_prefix not in cmd:
+                    hook["command"] = cmd.replace(old_prefix, new_prefix)
+                    count += 1
+
+    if count > 0 and not dry_run:
+        with open(settings_path, "w", encoding="utf-8") as f:
+            json.dump(data, f, indent=4, ensure_ascii=False)
+            f.write("\n")
+        print(f"   Rewritten: {count} hook path(s) in settings.json")
+
+    return count
+
+
 def run_full_migration(dry_run: bool = False) -> bool:
-    """Run complete migration: home directory + project configs.
+    """Run complete migration: home directory + project configs + settings.json.
 
     Returns True if any migration was performed.
     """
@@ -174,6 +200,7 @@ def run_full_migration(dry_run: bool = False) -> bool:
         count = migrate_project_configs(dry_run=dry_run)
         if count > 0:
             print(f"   Migrated {count} project config(s)")
+        migrate_settings_json(dry_run=dry_run)
 
     return migrated
 
@@ -189,8 +216,7 @@ def main() -> None:
 
     if success:
         print()
-        print("Migration complete. The old ~/.ai-toolkit/ directory contains only a")
-        print("migration marker and can be safely deleted.")
+        print("Migration complete. ~/.ai-toolkit/ has been removed.")
     elif not dry_run:
         print("Migration skipped.")