mcli-framework 8.0.17__tar.gz → 8.0.18__tar.gz

{mcli_framework-8.0.17 → mcli_framework-8.0.18}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mcli-framework
-Version: 8.0.17
+Version: 8.0.18
 Summary: Portable workflow framework - transform any script into a versioned, schedulable command. Store in ~/.mcli/workflows/, version with lockfile, run as daemon or cron job.
 Author-email: Luis Fernandez de la Vara <luis@lefv.io>
 Maintainer-email: Luis Fernandez de la Vara <luis@lefv.io>

{mcli_framework-8.0.17 → mcli_framework-8.0.18}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "mcli-framework"
-version = "8.0.17"
+version = "8.0.18"
 description = "Portable workflow framework - transform any script into a versioned, schedulable command. Store in ~/.mcli/workflows/, version with lockfile, run as daemon or cron job."
 readme = "README.md"
  requires-python = ">=3.10"

{mcli_framework-8.0.17 → mcli_framework-8.0.18}/src/mcli/self/self_cmd.py

@@ -1085,157 +1085,15 @@ except ImportError as e:
     logger.debug(f"Could not load migrate command: {e}")
 
 try:
-    from mcli.self.health_cmd import health
+    from mcli.self.workflows_cmd import workflows_group
 
-    self_app.add_command(health, name="health")
-    logger.debug("Added health command to self group")
-except ImportError as e:
-    logger.debug(f"Could not load health command: {e}")
-
-
-try:
-    from mcli.self.workflows_cmd import workflows_cmd
-
-    self_app.add_command(workflows_cmd, name="workflows")
-    logger.debug("Added workflows command to self group")
+    self_app.add_command(workflows_group, name="workflows")
+    logger.debug("Added workflows command group to self group")
 except ImportError as e:
     logger.debug(f"Could not load workflows command: {e}")
 
-
-# Workspace management commands
-@click.group("workspace")
-def workspace():
-    """📁 Manage registered workflow workspaces.
-
-    Track workflow locations across multiple repositories for unified
-    command listing with 'mcli list --all'.
-
-    Examples:
-        mcli self workspace list       # List registered workspaces
-        mcli self workspace add        # Register current directory
-        mcli self workspace add ~/myrepo  # Register specific directory
-        mcli self workspace remove     # Unregister current directory
-    """
-    pass
-
-
-@workspace.command("list")
-@click.option("--json", "as_json", is_flag=True, help="Output as JSON")
-def workspace_list(as_json: bool):
-    """📋 List all registered workspaces."""
-    import json as json_module
-
-    from mcli.lib.workspace_registry import list_registered_workspaces
-
-    workspaces = list_registered_workspaces()
-
-    if as_json:
-        click.echo(
-            json_module.dumps({"workspaces": workspaces, "total": len(workspaces)}, indent=2)
-        )
-        return
-
-    if not workspaces:
-        console.print("[yellow]No workspaces registered.[/yellow]")
-        console.print("\n[dim]Register a workspace:[/dim]")
-        console.print("  mcli self workspace add [PATH]")
-        return
-
-    table = Table(title="Registered Workspaces")
-    table.add_column("Name", style="cyan")
-    table.add_column("Path", style="dim")
-    table.add_column("Status", style="green")
-
-    for ws in workspaces:
-        status = "✅ Active" if ws["exists"] else "⚠️ Missing"
-        table.add_row(ws["name"], ws["path"], status)
-
-    console.print(table)
-    console.print(f"\n[dim]Total: {len(workspaces)} workspace(s)[/dim]")
-
-
-@workspace.command("add")
-@click.argument("path", required=False, type=click.Path(exists=True))
-@click.option("--name", "-n", help="Custom name for the workspace")
-def workspace_add(path: Optional[str], name: Optional[str]):
-    """➕ Register a workspace (current directory if no path given)."""
-    from mcli.lib.workspace_registry import register_workspace
-
-    workspace_path = Path(path).resolve() if path else None
-
-    result = register_workspace(workspace_path, name)
-    if result:
-        console.print(f"[green]✅ Workspace registered successfully![/green]")
-        console.print(f"[dim]ID: {result}[/dim]")
-        console.print("\n[dim]View all workflows with:[/dim]")
-        console.print("  mcli list --all")
-    else:
-        console.print("[red]❌ Failed to register workspace[/red]")
-        console.print("[dim]Make sure the directory has .mcli/workflows/[/dim]")
-
-
-@workspace.command("remove")
-@click.argument("path", required=False, type=click.Path())
-@click.option("--yes", "-y", is_flag=True, help="Skip confirmation")
-def workspace_remove(path: Optional[str], yes: bool):
-    """➖ Unregister a workspace (current directory if no path given)."""
-    from rich.prompt import Confirm
-
-    from mcli.lib.workspace_registry import unregister_workspace
-
-    workspace_path = Path(path).resolve() if path else None
-
-    if not yes:
-        path_str = str(workspace_path) if workspace_path else "current directory"
-        if not Confirm.ask(f"[yellow]Unregister workspace at {path_str}?[/yellow]"):
-            console.print("[yellow]Cancelled[/yellow]")
-            return
-
-    if unregister_workspace(workspace_path):
-        console.print("[green]✅ Workspace unregistered[/green]")
-    else:
-        console.print("[red]❌ Failed to unregister workspace[/red]")
-        console.print("[dim]Make sure the path is registered[/dim]")
-
-
-@workspace.command("prune")
-@click.option("--yes", "-y", is_flag=True, help="Skip confirmation")
-def workspace_prune(yes: bool):
-    """🧹 Remove workspaces that no longer exist."""
-    from rich.prompt import Confirm
-
-    from mcli.lib.workspace_registry import list_registered_workspaces, load_registry, save_registry
-
-    workspaces = list_registered_workspaces()
-    missing = [ws for ws in workspaces if not ws["exists"]]
-
-    if not missing:
-        console.print("[green]✅ All registered workspaces exist[/green]")
-        return
-
-    console.print(f"[yellow]Found {len(missing)} missing workspace(s):[/yellow]")
-    for ws in missing:
-        console.print(f"  - {ws['name']} ({ws['path']})")
-
-    if not yes:
-        if not Confirm.ask("[yellow]Remove these workspaces from registry?[/yellow]"):
-            console.print("[yellow]Cancelled[/yellow]")
-            return
-
-    # Remove missing workspaces
-    registry = load_registry()
-    for ws in missing:
-        if ws["id"] in registry.get("workspaces", {}):
-            del registry["workspaces"][ws["id"]]
-
-    if save_registry(registry):
-        console.print(f"[green]✅ Removed {len(missing)} missing workspace(s)[/green]")
-    else:
-        console.print("[red]❌ Failed to update registry[/red]")
-
-
-self_app.add_command(workspace)
-logger.debug("Added workspace command to self group")
+# NOTE: workspace commands have been merged into 'mcli self workflows'
+# Use: mcli self workflows add/remove/prune
 
 # NOTE: store command has been moved to mcli.app.commands_cmd for better organization
 

{mcli_framework-8.0.17 → mcli_framework-8.0.18}/src/mcli/self/workflows_cmd.py

@@ -1,14 +1,16 @@
 """
-Workflows command for mcli self.
+Workflows command group for mcli self.
 
-Provides a comprehensive view of all workflows tracked by mcli,
-including a dashboard summary and detailed listings.
+Provides comprehensive workflow and workspace management:
+- Dashboard summary of all workflows
+- Detailed workflow listings
+- Workspace registration and management
 """
 
 import json
 from datetime import datetime
 from pathlib import Path
-from typing import Any, Dict, List
+from typing import Any, Dict, List, Optional
 
 import click
 from rich.console import Console
@@ -24,6 +26,9 @@ from mcli.lib.workspace_registry import (
     get_registry_path,
     list_registered_workspaces,
     load_registry,
+    register_workspace,
+    save_registry,
+    unregister_workspace,
 )
 
 logger = get_logger(__name__)
@@ -211,94 +216,162 @@ def _render_workflow_list(
     console.print(f"\n[bold]Total: {total} workflow(s)[/bold]")
 
 
-@click.command("workflows")
-@click.option(
-    "--all",
-    "-a",
-    "show_all",
-    is_flag=True,
-    help="Show detailed list of all workflows",
-)
-@click.option(
-    "--global",
-    "-g",
-    "is_global",
-    is_flag=True,
-    help="Show only global workflows (~/.mcli/workflows/)",
-)
+# =============================================================================
+# CLI Group and Commands
+# =============================================================================
+
+
+@click.group("workflows", invoke_without_command=True)
 @click.option("--json", "as_json", is_flag=True, help="Output as JSON")
-@click.option(
-    "--dashboard",
-    "-d",
-    is_flag=True,
-    help="Show dashboard view (default when no flags)",
-)
-def workflows_cmd(show_all: bool, is_global: bool, as_json: bool, dashboard: bool):
-    """📊 View all workflows tracked by mcli.
+@click.pass_context
+def workflows_group(ctx, as_json: bool):
+    """📊 Manage workflows and workspaces.
 
-    Shows a dashboard summary of all registered workspaces and their workflows.
-    Use flags to get different views:
+    View all workflows tracked by mcli and manage workspace registrations.
 
     \b
-    Default (no flags):  Dashboard with summary stats
-    --all/-a:            Detailed list of all workflows
-    --global/-g:         Show only global workflows
-    --json:              Output as JSON for scripting
-    --dashboard/-d:      Force dashboard view
+    Commands:
+        (default)     Dashboard with summary stats
+        list          Detailed list of all workflows
+        add           Register a workspace
+        remove        Unregister a workspace
+        prune         Remove missing workspaces
 
     \b
     Examples:
         mcli self workflows              # Dashboard summary
-        mcli self workflows --all        # List all workflows
-        mcli self workflows --global     # Global workflows only
-        mcli self workflows --json       # JSON output
+        mcli self workflows list         # List all workflows
+        mcli self workflows list -g      # Global workflows only
+        mcli self workflows add          # Register current directory
+        mcli self workflows remove       # Unregister current directory
     """
+    # If no subcommand, show dashboard
+    if ctx.invoked_subcommand is None:
+        try:
+            auto_register_current()
+            stats = _get_workflow_stats()
+
+            if as_json:
+                output = {
+                    "summary": {
+                        "total_workflows": stats["total_workflows"],
+                        "total_workspaces": stats["total_workspaces"],
+                        "active_workspaces": stats["active_workspaces"],
+                        "missing_workspaces": stats["missing_workspaces"],
+                        "global_workflows": stats["global_workflows"],
+                        "local_workflows": stats["local_workflows"],
+                        "current_workspace": stats["current_workspace"],
+                        "registry_updated": stats["registry_updated"],
+                    },
+                    "language_counts": stats["language_counts"],
+                    "workspaces": stats["workspaces"],
+                }
+                click.echo(json.dumps(output, indent=2, default=str))
+            else:
+                _render_dashboard(stats)
+        except Exception as e:
+            console.print(f"[red]Error: {e}[/red]")
+            logger.exception("Failed to display workflows")
+
+
+@workflows_group.command("list")
+@click.option("--global", "-g", "is_global", is_flag=True, help="Show only global workflows")
+@click.option("--json", "as_json", is_flag=True, help="Output as JSON")
+def workflows_list(is_global: bool, as_json: bool):
+    """📋 List all workflows in detail."""
     try:
-        # Auto-register current workspace if applicable
         auto_register_current()
-
-        # Gather stats
         stats = _get_workflow_stats()
 
-        # JSON output
         if as_json:
-            output = {
-                "summary": {
-                    "total_workflows": stats["total_workflows"],
-                    "total_workspaces": stats["total_workspaces"],
-                    "active_workspaces": stats["active_workspaces"],
-                    "missing_workspaces": stats["missing_workspaces"],
-                    "global_workflows": stats["global_workflows"],
-                    "local_workflows": stats["local_workflows"],
-                    "current_workspace": stats["current_workspace"],
-                    "registry_updated": stats["registry_updated"],
-                },
-                "language_counts": stats["language_counts"],
-                "workspaces": stats["workspaces"],
-            }
-
-            # Add full workflow details if --all
-            if show_all:
-                flat_workflows = []
-                for workspace_name, workflows in stats["all_workflows"].items():
-                    for wf in workflows:
-                        wf["workspace"] = workspace_name
-                        flat_workflows.append(wf)
-                output["workflows"] = flat_workflows
-
-            click.echo(json.dumps(output, indent=2, default=str))
-            return 0
-
-        # Detailed list mode
-        if show_all or is_global:
+            flat_workflows = []
+            for workspace_name, workflows in stats["all_workflows"].items():
+                if is_global and "global" not in workspace_name.lower():
+                    continue
+                for wf in workflows:
+                    wf["workspace"] = workspace_name
+                    flat_workflows.append(wf)
+            click.echo(json.dumps({"workflows": flat_workflows, "total": len(flat_workflows)}, indent=2, default=str))
+        else:
             _render_workflow_list(stats["all_workflows"], is_global)
-            return 0
-
-        # Default: dashboard view
-        _render_dashboard(stats)
-        return 0
-
     except Exception as e:
         console.print(f"[red]Error: {e}[/red]")
-        logger.exception("Failed to display workflows")
-        return 1
+        logger.exception("Failed to list workflows")
+
+
+@workflows_group.command("add")
+@click.argument("path", required=False, type=click.Path(exists=True))
+@click.option("--name", "-n", help="Custom name for the workspace")
+def workflows_add(path: Optional[str], name: Optional[str]):
+    """➕ Register a workspace (current directory if no path given)."""
+    workspace_path = Path(path).resolve() if path else None
+
+    result = register_workspace(workspace_path, name)
+    if result:
+        console.print("[green]✅ Workspace registered successfully![/green]")
+        console.print(f"[dim]ID: {result}[/dim]")
+        console.print("\n[dim]View all workflows with:[/dim]")
+        console.print("  mcli self workflows list")
+    else:
+        console.print("[red]❌ Failed to register workspace[/red]")
+        console.print("[dim]Make sure the directory has .mcli/workflows/[/dim]")
+
+
+@workflows_group.command("remove")
+@click.argument("path", required=False, type=click.Path())
+@click.option("--yes", "-y", is_flag=True, help="Skip confirmation")
+def workflows_remove(path: Optional[str], yes: bool):
+    """➖ Unregister a workspace (current directory if no path given)."""
+    from rich.prompt import Confirm
+
+    workspace_path = Path(path).resolve() if path else None
+
+    if not yes:
+        path_str = str(workspace_path) if workspace_path else "current directory"
+        if not Confirm.ask(f"[yellow]Unregister workspace at {path_str}?[/yellow]"):
+            console.print("[yellow]Cancelled[/yellow]")
+            return
+
+    if unregister_workspace(workspace_path):
+        console.print("[green]✅ Workspace unregistered[/green]")
+    else:
+        console.print("[red]❌ Failed to unregister workspace[/red]")
+        console.print("[dim]Make sure the path is registered[/dim]")
+
+
+@workflows_group.command("prune")
+@click.option("--yes", "-y", is_flag=True, help="Skip confirmation")
+def workflows_prune(yes: bool):
+    """🧹 Remove workspaces that no longer exist."""
+    from rich.prompt import Confirm
+
+    workspaces = list_registered_workspaces()
+    missing = [ws for ws in workspaces if not ws["exists"]]
+
+    if not missing:
+        console.print("[green]✅ All registered workspaces exist[/green]")
+        return
+
+    console.print(f"[yellow]Found {len(missing)} missing workspace(s):[/yellow]")
+    for ws in missing:
+        console.print(f"  - {ws['name']} ({ws['path']})")
+
+    if not yes:
+        if not Confirm.ask("[yellow]Remove these workspaces from registry?[/yellow]"):
+            console.print("[yellow]Cancelled[/yellow]")
+            return
+
+    # Remove missing workspaces
+    registry = load_registry()
+    for ws in missing:
+        if ws["id"] in registry.get("workspaces", {}):
+            del registry["workspaces"][ws["id"]]
+
+    if save_registry(registry):
+        console.print(f"[green]✅ Removed {len(missing)} missing workspace(s)[/green]")
+    else:
+        console.print("[red]❌ Failed to update registry[/red]")
+
+
+# Export the group
+workflows = workflows_group

{mcli_framework-8.0.17 → mcli_framework-8.0.18}/src/mcli_framework.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mcli-framework
-Version: 8.0.17
+Version: 8.0.18
 Summary: Portable workflow framework - transform any script into a versioned, schedulable command. Store in ~/.mcli/workflows/, version with lockfile, run as daemon or cron job.
 Author-email: Luis Fernandez de la Vara <luis@lefv.io>
 Maintainer-email: Luis Fernandez de la Vara <luis@lefv.io>