oasr 0.4.1__py3-none-any.whl → 0.4.2__py3-none-any.whl

cli.py

@@ -13,7 +13,7 @@ from pathlib import Path
 from commands import adapter, clean, clone, config, diff, exec, find, registry, sync, update, use, validate
 from commands import help as help_cmd
 
-__version__ = "0.4.1"
+__version__ = "0.4.2"
 
 
 def main(argv: list[str] | None = None) -> int:

commands/clean.py

@@ -1,16 +1,16 @@
-"""`asr clean` command."""
+"""`asr clean` command - DEPRECATED, use `oasr registry prune` instead."""
 
 from __future__ import annotations
 
 import argparse
-import json
-
-from manifest import check_manifest, delete_manifest, list_manifests, load_manifest
-from registry import load_registry, remove_skill
+import sys
 
 
 def register(subparsers) -> None:
-    p = subparsers.add_parser("clean", help="Clean up corrupted/missing skills and orphaned artifacts")
+    p = subparsers.add_parser(
+        "clean",
+        help="(Deprecated) Clean up corrupted/missing skills - use 'oasr registry prune'",
+    )
     p.add_argument("-y", "--yes", action="store_true", help="Skip confirmation prompt")
     p.add_argument("--json", action="store_true", help="Output in JSON format")
     p.add_argument("--dry-run", action="store_true", help="Show what would be cleaned without doing it")
@@ -18,138 +18,13 @@ def register(subparsers) -> None:
 
 
 def run(args: argparse.Namespace) -> int:
-    entries = load_registry()
-    registered_names = {e.name for e in entries}
-    manifest_names = set(list_manifests())
-
-    to_remove_skills = []
-    to_remove_manifests = []
-
-    # Check for remote skills and show progress header
-    import sys
-
-    from skillcopy.remote import is_remote_source
-
-    remote_count = 0
-    for entry in entries:
-        manifest = load_manifest(entry.name)
-        if manifest and is_remote_source(manifest.source_path):
-            remote_count += 1
-
-    if remote_count > 0 and not args.json:
-        print(f"Checking {remote_count} remote skill(s)...", file=sys.stderr)
-
-    for entry in entries:
-        manifest = load_manifest(entry.name)
-        if manifest:
-            # Show progress for remote skills
-            is_remote = is_remote_source(manifest.source_path)
-            if is_remote and not args.json:
-                platform = (
-                    "GitHub"
-                    if "github.com" in manifest.source_path
-                    else "GitLab"
-                    if "gitlab.com" in manifest.source_path
-                    else "remote"
-                )
-                print(f"  ↓ {entry.name} (checking {platform}...)", file=sys.stderr, flush=True)
-
-            status = check_manifest(manifest)
-
-            if is_remote and not args.json:
-                print(f"  ✓ {entry.name} (checked)", file=sys.stderr)
-
-            if status.status == "missing":
-                to_remove_skills.append(
-                    {
-                        "name": entry.name,
-                        "reason": "source missing",
-                        "path": entry.path,
-                    }
-                )
-
-    orphaned = manifest_names - registered_names
-    for name in orphaned:
-        to_remove_manifests.append(
-            {
-                "name": name,
-                "reason": "orphaned manifest (not in registry)",
-            }
-        )
-
-    if not to_remove_skills and not to_remove_manifests:
-        if args.json:
-            print(json.dumps({"cleaned": 0, "message": "nothing to clean"}))
-        else:
-            print("Nothing to clean.")
-        return 0
-
-    if args.json:
-        result = {
-            "skills_to_remove": to_remove_skills,
-            "manifests_to_remove": to_remove_manifests,
-            "dry_run": args.dry_run,
-        }
-        if not args.dry_run and not args.yes:
-            result["requires_confirmation"] = True
-        print(json.dumps(result, indent=2))
-        if args.dry_run:
-            return 0
-    else:
-        print("The following will be cleaned:\n")
-
-        if to_remove_skills:
-            print("Skills with missing sources:")
-            for s in to_remove_skills:
-                print(f"  ✗ {s['name']} ({s['path']})")
-
-        if to_remove_manifests:
-            print("\nOrphaned manifests:")
-            for m in to_remove_manifests:
-                print(f"  ✗ {m['name']}")
-
-        print()
-
-        if args.dry_run:
-            print("(dry run - no changes made)")
-            return 0
-
-    if not args.yes and not args.json:
-        try:
-            response = input("Proceed with cleanup? [y/N] ").strip().lower()
-            if response not in ("y", "yes"):
-                print("Aborted.")
-                return 1
-        except (EOFError, KeyboardInterrupt):
-            print("\nAborted.")
-            return 1
-
-    removed_skills = []
-    removed_manifests = []
-
-    for s in to_remove_skills:
-        remove_skill(s["name"])
-        removed_skills.append(s["name"])
-
-    for m in to_remove_manifests:
-        delete_manifest(m["name"])
-        removed_manifests.append(m["name"])
+    """Delegate to registry prune with deprecation warning."""
+    # Show deprecation warning unless --json or --quiet
+    if not args.json:
+        print("⚠ Warning: 'oasr clean' is deprecated. Use 'oasr registry prune' instead.", file=sys.stderr)
+        print("   This command will be removed in v0.6.0.\n", file=sys.stderr)
 
-    if args.json:
-        print(
-            json.dumps(
-                {
-                    "removed_skills": removed_skills,
-                    "removed_manifests": removed_manifests,
-                },
-                indent=2,
-            )
-        )
-    else:
-        for name in removed_skills:
-            print(f"Removed skill: {name}")
-        for name in removed_manifests:
-            print(f"Removed manifest: {name}")
-        print(f"\nCleaned {len(removed_skills)} skill(s), {len(removed_manifests)} manifest(s)")
+    # Delegate to registry prune
+    from commands.registry import run_prune
 
-    return 0
+    return run_prune(args)

commands/registry.py

@@ -64,6 +64,13 @@ def register(subparsers) -> None:
     sync_p.add_argument("--config", type=Path, help="Override config file path")
     sync_p.set_defaults(func=run_sync)
 
+    # registry prune
+    prune_p = registry_subparsers.add_parser("prune", help="Clean up corrupted/missing skills and orphaned artifacts")
+    prune_p.add_argument("-y", "--yes", action="store_true", help="Skip confirmation prompt")
+    prune_p.add_argument("--json", action="store_true", help="Output in JSON format")
+    prune_p.add_argument("--dry-run", action="store_true", help="Show what would be cleaned without doing it")
+    prune_p.set_defaults(func=run_prune)
+
 
 def run_validate(args: argparse.Namespace) -> int:
     """Validate registry manifests (default oasr registry behavior)."""
@@ -301,3 +308,140 @@ def run_sync(args: argparse.Namespace) -> int:
             print(f"{len(pruned)} skill(s) pruned")
 
     return 1 if missing_count > 0 else 0
+
+
+def run_prune(args: argparse.Namespace) -> int:
+    """Clean up corrupted/missing skills and orphaned artifacts (oasr registry prune)."""
+    from manifest import delete_manifest, list_manifests
+
+    entries = load_registry()
+    registered_names = {e.name for e in entries}
+    manifest_names = set(list_manifests())
+
+    to_remove_skills = []
+    to_remove_manifests = []
+
+    # Check for remote skills and show progress header
+    remote_count = 0
+    for entry in entries:
+        manifest = load_manifest(entry.name)
+        if manifest and is_remote_source(manifest.source_path):
+            remote_count += 1
+
+    if remote_count > 0 and not args.json:
+        print(f"Checking {remote_count} remote skill(s)...", file=sys.stderr)
+
+    for entry in entries:
+        manifest = load_manifest(entry.name)
+        if manifest:
+            # Show progress for remote skills
+            is_remote = is_remote_source(manifest.source_path)
+            if is_remote and not args.json:
+                platform = (
+                    "GitHub"
+                    if "github.com" in manifest.source_path
+                    else "GitLab"
+                    if "gitlab.com" in manifest.source_path
+                    else "remote"
+                )
+                print(f"  ↓ {entry.name} (checking {platform}...)", file=sys.stderr, flush=True)
+
+            status = check_manifest(manifest)
+
+            if is_remote and not args.json:
+                print(f"  ✓ {entry.name} (checked)", file=sys.stderr)
+
+            if status.status == "missing":
+                to_remove_skills.append(
+                    {
+                        "name": entry.name,
+                        "reason": "source missing",
+                        "path": entry.path,
+                    }
+                )
+
+    orphaned = manifest_names - registered_names
+    for name in orphaned:
+        to_remove_manifests.append(
+            {
+                "name": name,
+                "reason": "orphaned manifest (not in registry)",
+            }
+        )
+
+    if not to_remove_skills and not to_remove_manifests:
+        if args.json:
+            print(json.dumps({"cleaned": 0, "message": "nothing to clean"}))
+        else:
+            print("Nothing to clean.")
+        return 0
+
+    if args.json:
+        result = {
+            "skills_to_remove": to_remove_skills,
+            "manifests_to_remove": to_remove_manifests,
+            "dry_run": args.dry_run,
+        }
+        if not args.dry_run and not args.yes:
+            result["requires_confirmation"] = True
+        print(json.dumps(result, indent=2))
+        if args.dry_run:
+            return 0
+    else:
+        print("The following will be cleaned:\n")
+
+        if to_remove_skills:
+            print("Skills with missing sources:")
+            for s in to_remove_skills:
+                print(f"  ✗ {s['name']} ({s['path']})")
+
+        if to_remove_manifests:
+            print("\nOrphaned manifests:")
+            for m in to_remove_manifests:
+                print(f"  ✗ {m['name']}")
+
+        print()
+
+        if args.dry_run:
+            print("(dry run - no changes made)")
+            return 0
+
+    if not args.yes and not args.json:
+        try:
+            response = input("Proceed with cleanup? [y/N] ").strip().lower()
+            if response not in ("y", "yes"):
+                print("Aborted.")
+                return 1
+        except (EOFError, KeyboardInterrupt):
+            print("\nAborted.")
+            return 1
+
+    removed_skills = []
+    removed_manifests = []
+
+    for s in to_remove_skills:
+        remove_skill(s["name"])
+        removed_skills.append(s["name"])
+
+    for m in to_remove_manifests:
+        delete_manifest(m["name"])
+        removed_manifests.append(m["name"])
+
+    if args.json:
+        print(
+            json.dumps(
+                {
+                    "removed_skills": removed_skills,
+                    "removed_manifests": removed_manifests,
+                },
+                indent=2,
+            )
+        )
+    else:
+        for name in removed_skills:
+            print(f"Removed skill: {name}")
+        for name in removed_manifests:
+            print(f"Removed manifest: {name}")
+        print(f"\nCleaned {len(removed_skills)} skill(s), {len(removed_manifests)} manifest(s)")
+
+    return 0

{oasr-0.4.1.dist-info → oasr-0.4.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: oasr
-Version: 0.4.1
+Version: 0.4.2
 Summary: CLI for managing agent skills across IDE integrations
 Project-URL: Homepage, https://github.com/jgodau/asr
 Project-URL: Repository, https://github.com/jgodau/asr

{oasr-0.4.1.dist-info → oasr-0.4.2.dist-info}/RECORD

@@ -1,7 +1,7 @@
 __init__.py,sha256=cYuwXNht5J2GDPEbHz57rmXRyWzaUgAaCXz8okR0rKE,84
 __main__.py,sha256=Due_Us-4KNlLZhf8MkmoP1hWS5qMWmpZvz2ZaCqPHT4,120
 adapter.py,sha256=WEpYkKDTb7We0zU9i6Z-r5ydtUdghNhxTZ5Eq58h4fU,10027
-cli.py,sha256=J8DqiaLGoUpKOWHMfkOBkQoC-R01ro4zTh2JAjjWVlo,2672
+cli.py,sha256=gb2A9vxiD4q67oRynUJr9W0vHUHm02S2qR56SwAU1MM,2672
 discovery.py,sha256=WWF8SN2LH88mOUBJLavM7rvXcxi6uDQGpqRK20GysxA,3298
 manifest.py,sha256=feNCjkFWfhoVubevKjLtKoIEuzT1YGQn6wWgs9XM8_o,12229
 registry.py,sha256=zGutwVP39xaYqc3KDEXMWCV1tORYpqc5JISO8OaWP1Q,4470
@@ -25,7 +25,7 @@ agents/registry.py,sha256=i6YUAdNUXq1LNqLDNqSg2RlHxqF5Ig5Z40ryteXoLu4,1434
 commands/__init__.py,sha256=g_ZxSKLVZwCVAPpn-Ga_gj53BS2473SOg72ivGph--U,147
 commands/adapter.py,sha256=_68v3t-dRU0mszzL4udKs1bKennyg7RfBTaK2fDGTsE,3215
 commands/add.py,sha256=NJLQ-8-3zy7o6S9VLfL_wauP-Vz0oNGwN3nvtiwxNYM,15255
-commands/clean.py,sha256=KtC5RJRdSBuz7ekEryMHOvHbqzV2vxUlp8_Mv-4b9TU,4893
+commands/clean.py,sha256=RQBAfe6iCLsjMqUyVR55JdYX9MBqgrUuIrA8rFKs1J0,1102
 commands/clone.py,sha256=4APH34-yHjiXQIQwBnKOSEQ_sxV24_GKypcOJMfncvs,5912
 commands/config.py,sha256=PKuOX7CPRAy2j5NG1rhHYDFJT1XvZnOTF2qJW04v34Q,4940
 commands/diff.py,sha256=37JMjvfAEfvK7-4X5iFbD-IGkS8ae4YSY7ZDIZF5B9E,5766
@@ -34,7 +34,7 @@ commands/find.py,sha256=zgqwUnaG5aLX6gJIU2ZeQzxsFh2s7oDNNtmV-e-62Jg,1663
 commands/help.py,sha256=5yhIpgGs1xPs2f39lg-ELE7D0tV_uUTjxQsgkWusIwo,1449
 commands/info.py,sha256=zywaUQsrvcPXcX8W49P7Jqnr90pX8nBPqnH1XcIs0Uk,4396
 commands/list.py,sha256=P3E_PItNoqAStNTcLCY7dV-Db2_Yb7TRCYXgP4G19rQ,3185
-commands/registry.py,sha256=7bPnt7kuiXsCHKUTr29zikXky5socN3jPEl9H1D2WVA,11280
+commands/registry.py,sha256=nerDoR0Uvd_2WlDMQZshJunMW31HsENklAy19A00x4U,16065
 commands/rm.py,sha256=bOPXgifAbgx7kp4ZuNanJbv4wP1l1sIsI8vD6Rlgi8g,4160
 commands/status.py,sha256=8si3iEVu0AUE2qojSCVoU0BLwpLm4UiFyY-Ln7Uo36k,3944
 commands/sync.py,sha256=ZQoB5hBqrzvM6LUQVlKqHQVJib4dB5qe5M-pVG2vtGM,4946
@@ -47,9 +47,9 @@ config/schema.py,sha256=KUebMCokJkymPyNcT2Bwm5BKwXk0SVGdoW24PRNX350,1387
 skillcopy/__init__.py,sha256=YUglUkDzKfnCt4ar_DU33ksI9fGyn2UYbV7qn2c_BcU,2322
 skillcopy/local.py,sha256=QH6484dCenjg8pfNOyTRbQQBklEWhkkTnfQok5ssf_4,1049
 skillcopy/remote.py,sha256=83jRA2VfjtSDGO-YM1x3WGJjKvWzK1RmSTL7SdUOz8s,3155
-oasr-0.4.1.dist-info/METADATA,sha256=Fl64OJMF77F8Q3BfgvUmJFqVNx-2AzXpk7giGf5nmHo,17924
-oasr-0.4.1.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
-oasr-0.4.1.dist-info/entry_points.txt,sha256=VnMuOi6XYMbzAD2bP0X5uV1sQXjOqoDWJ33Lsxwq8u8,52
-oasr-0.4.1.dist-info/licenses/LICENSE,sha256=nQ1j9Ldb8FlJ-z7y2WuXPIlyfnYC7YPasjGdOBgcfP4,10561
-oasr-0.4.1.dist-info/licenses/NOTICE,sha256=EsfkCN0ZRDS0oj3ADvMKeKrAXaPlC8YfpSjvjGVv9jE,207
-oasr-0.4.1.dist-info/RECORD,,
+oasr-0.4.2.dist-info/METADATA,sha256=kzX9QzNlvAXMGO7RuiMpXUBbKj0Zj8LgdobXV3leyoE,17924
+oasr-0.4.2.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+oasr-0.4.2.dist-info/entry_points.txt,sha256=VnMuOi6XYMbzAD2bP0X5uV1sQXjOqoDWJ33Lsxwq8u8,52
+oasr-0.4.2.dist-info/licenses/LICENSE,sha256=nQ1j9Ldb8FlJ-z7y2WuXPIlyfnYC7YPasjGdOBgcfP4,10561
+oasr-0.4.2.dist-info/licenses/NOTICE,sha256=EsfkCN0ZRDS0oj3ADvMKeKrAXaPlC8YfpSjvjGVv9jE,207
+oasr-0.4.2.dist-info/RECORD,,