comfygit 0.3.6__py3-none-any.whl → 0.3.10__py3-none-any.whl

comfygit_cli/global_commands.py

@@ -16,15 +16,6 @@ from .utils import create_progress_callback, paginate, show_civitai_auth_help, s
 
 logger = get_logger(__name__)
 
-# Default system nodes to install with new workspaces.
-# These are infrastructure custom nodes that provide management capabilities.
-# Use `cg init --bare` to skip installation.
-DEFAULT_SYSTEM_NODES = {
-    "comfygit-manager": {
-        "url": "https://github.com/comfyhub-org/comfygit-manager.git",
-        "description": "ComfyGit management panel for ComfyUI",
-    },
-}
 
 
 class GlobalCommands:
@@ -94,7 +85,6 @@ class GlobalCommands:
         - uv_cache/ for package management
         - environments/ for ComfyUI environments
         """
-        from pathlib import Path
 
         # Validate models directory if provided (before creating workspace)
         explicit_models_dir = getattr(args, 'models_dir', None)
@@ -142,12 +132,6 @@ class GlobalCommands:
 
             print(f"✓ Workspace initialized at {workspace.path}")
 
-            # Install default system nodes (unless --bare)
-            if not getattr(args, 'bare', False):
-                self._install_system_nodes(workspace)
-            else:
-                print("📦 Skipping system node installation (--bare flag)")
-
             # Handle models directory setup
             self._setup_models_directory(workspace, args)
 
@@ -163,39 +147,6 @@ class GlobalCommands:
             print(f"✗ Failed to initialize workspace: {e}", file=sys.stderr)
             sys.exit(1)
 
-    def _install_system_nodes(self, workspace: Workspace) -> None:
-        """Install default system nodes (comfygit-manager) into workspace.
-
-        System nodes are infrastructure custom nodes that:
-        - Live at workspace level (.metadata/system_nodes/)
-        - Are symlinked into every environment
-        - Are never tracked in pyproject.toml
-        """
-        from comfygit_core.utils.git import git_clone
-
-        system_nodes_path = workspace.paths.system_nodes
-
-        for node_name, node_config in DEFAULT_SYSTEM_NODES.items():
-            target_path = system_nodes_path / node_name
-
-            if target_path.exists():
-                logger.debug(f"System node '{node_name}' already exists, skipping")
-                continue
-
-            print(f"📦 Installing system node: {node_name}")
-            try:
-                git_clone(
-                    url=node_config["url"],
-                    target_path=target_path,
-                    depth=1  # Shallow clone for speed
-                )
-                print(f"   ✓ Installed {node_name}")
-                logger.info(f"Installed system node: {node_name}")
-            except Exception as e:
-                print(f"   ⚠️  Failed to install {node_name}: {e}")
-                print(f"   You can install it manually later")
-                logger.warning(f"Failed to install system node {node_name}: {e}")
-
     def _show_workspace_env_setup(self, workspace_path: Path) -> None:
         """Show instructions for setting COMFYGIT_HOME for custom workspace location."""
         import os
@@ -231,8 +182,7 @@ class GlobalCommands:
             args: CLI arguments containing models_dir and yes flags
         """
         from pathlib import Path
-        from comfygit_cli.utils.progress import create_model_sync_progress
-        from comfygit_core.utils.common import format_size
+
 
         # Check for explicit flags
         use_interactive = not getattr(args, 'yes', False)
@@ -256,7 +206,7 @@ class GlobalCommands:
         print("\nOptions:")
         print("  1. Point to an existing ComfyUI models directory (recommended)")
         print("     → Access all your existing models immediately")
-        print(f"     → Example: ~/ComfyUI/models")
+        print("     → Example: ~/ComfyUI/models")
         print("\n  2. Use the default empty directory")
         print(f"     → ComfyGit created: {workspace.paths.models}")
         print("     → Download models as needed later")
@@ -296,7 +246,7 @@ class GlobalCommands:
                 # Auto-detect if they entered ComfyUI root instead of models subdir
                 if (models_path / "models").exists() and models_path.name != "models":
                     print(f"\n⚠️  Detected ComfyUI installation at: {models_path}")
-                    use_subdir = input(f"Use models/ subdirectory instead? (Y/n): ").strip().lower()
+                    use_subdir = input("Use models/ subdirectory instead? (Y/n): ").strip().lower()
                     if use_subdir != 'n':
                         models_path = models_path / "models"
                         print(f"Using: {models_path}")
@@ -322,9 +272,10 @@ class GlobalCommands:
             workspace: The workspace instance
             models_path: Path to the models directory to scan
         """
-        from comfygit_cli.utils.progress import create_model_sync_progress
         from comfygit_core.utils.common import format_size
 
+        from comfygit_cli.utils.progress import create_model_sync_progress
+
         try:
             progress = create_model_sync_progress()
             workspace.set_models_directory(models_path, progress=progress)
@@ -404,7 +355,7 @@ class GlobalCommands:
 
         # Read log lines
         try:
-            with open(log_file, 'r', encoding='utf-8') as f:
+            with open(log_file, encoding='utf-8') as f:
                 lines = f.readlines()
         except Exception as e:
             print(f"✗ Failed to read log file: {e}", file=sys.stderr)
@@ -453,9 +404,9 @@ class GlobalCommands:
             for line in record:
                 print(line.rstrip())
 
-        print(f"\n=== End of logs ===")
+        print("\n=== End of logs ===")
         if not args.full and len(records) == args.lines:
-            print(f"Tip: Use --full to see all logs, or increase --lines to see more")
+            print("Tip: Use --full to see all logs, or increase --lines to see more")
 
     @with_workspace_logging("migrate")
     def migrate(self, args: argparse.Namespace) -> None:
@@ -749,7 +700,7 @@ class GlobalCommands:
         callbacks = CLIExportCallbacks()
 
         try:
-            tarball_path = env.export_environment(output_path, callbacks=callbacks)
+            tarball_path = env.export_environment(output_path, callbacks=callbacks, allow_issues=args.allow_issues)
 
             # Check if we need user confirmation
             if callbacks.models_without_sources and not args.allow_issues:
@@ -1519,10 +1470,10 @@ class GlobalCommands:
     def orch_status(self, args: argparse.Namespace) -> None:
         """Show orchestrator status."""
         from .utils.orchestrator import (
+            format_uptime,
+            get_orchestrator_uptime,
             is_orchestrator_running,
             read_switch_status,
-            get_orchestrator_uptime,
-            format_uptime
         )
 
         metadata_dir = self.workspace.path / ".metadata"
@@ -1578,7 +1529,7 @@ class GlobalCommands:
             try:
                 port = control_port_file.read_text().strip()
                 print(f"Control Port:   {port}")
-            except IOError:
+            except OSError:
                 pass
 
         # Check switch status
@@ -1605,6 +1556,7 @@ class GlobalCommands:
     def orch_restart(self, args: argparse.Namespace) -> None:
         """Request orchestrator to restart ComfyUI."""
         import time
+
         from .utils.orchestrator import is_orchestrator_running, safe_write_command
 
         metadata_dir = self.workspace.path / ".metadata"
@@ -1643,11 +1595,12 @@ class GlobalCommands:
     def orch_kill(self, args: argparse.Namespace) -> None:
         """Shutdown orchestrator."""
         import time
+
         from .utils.orchestrator import (
             is_orchestrator_running,
-            safe_write_command,
             kill_orchestrator_process,
-            read_switch_status
+            read_switch_status,
+            safe_write_command,
         )
 
         metadata_dir = self.workspace.path / ".metadata"
@@ -1701,9 +1654,9 @@ class GlobalCommands:
     def orch_clean(self, args: argparse.Namespace) -> None:
         """Clean orchestrator state files."""
         from .utils.orchestrator import (
+            cleanup_orchestrator_state,
             is_orchestrator_running,
             kill_orchestrator_process,
-            cleanup_orchestrator_state
         )
 
         metadata_dir = self.workspace.path / ".metadata"
@@ -1742,7 +1695,7 @@ class GlobalCommands:
             print("\nNote: workspace_config.json will be preserved")
 
             if args.kill:
-                print(f"\n⚠️  --kill flag: Will also terminate orchestrator process")
+                print("\n⚠️  --kill flag: Will also terminate orchestrator process")
 
             response = input("\nContinue? [y/N]: ").strip().lower()
             if response not in ['y', 'yes']:
@@ -1784,6 +1737,7 @@ class GlobalCommands:
     def orch_logs(self, args: argparse.Namespace) -> None:
         """Show orchestrator logs."""
         import subprocess
+
         from .utils.orchestrator import tail_log_file
 
         metadata_dir = self.workspace.path / ".metadata"
@@ -1808,3 +1762,27 @@ class GlobalCommands:
                 print("".join(lines))
             else:
                 print("(empty log file)")
+
+    # === Workspace Management ===
+
+    @with_workspace_logging("workspace cleanup")
+    def workspace_cleanup(self, args: argparse.Namespace) -> None:
+        """Clean up legacy workspace artifacts.
+
+        Removes .metadata/system_nodes/ directory if no environments
+        still use legacy symlinked manager.
+        """
+        force = getattr(args, 'force', False)
+
+        result = self.workspace.cleanup_legacy_system_nodes(force=force)
+
+        if result.success:
+            print(f"Removed {result.removed_path}")
+        else:
+            if result.legacy_environments:
+                print("Cannot cleanup: Some environments still use legacy manager")
+                for env in result.legacy_environments:
+                    print(f"  {env}")
+                print("\nRun 'cg -e <ENV> manager update' to migrate, then retry.")
+            else:
+                print(f"{result.message}")

comfygit_cli/logging/environment_logger.py

@@ -408,21 +408,21 @@ def with_env_logging(command_name: str, get_env_name: Callable | None = None, lo
     """Decorator for environment commands that automatically sets up logging.
     
     Args:
-        command_name: Name of the command for logging (e.g., "env create")
+        command_name: Name of the command for logging (e.g., "create", "node add")
         get_env_name: Optional function to extract env name from args.
-                     If None, tries args.name, then args.env_name, 
+                     If None, tries args.name, then args.env_name,
                      then calls self._get_env_name(args) if available.
         log_args: If True, automatically logs all args attributes (default: True)
         **log_context: Additional static context to log
-    
+
     Example:
-        @with_env_logging("env create")  # Automatically logs all args
+        @with_env_logging("create")  # Automatically logs all args
         def create(self, args):
             # All logging automatically goes to environment log
             result = self.env_mgr.create_environment(...)
-        
-        @with_env_logging("env apply", log_args=False, custom_field="value")
-        def apply(self, args):
+
+        @with_env_logging("repair", log_args=False, custom_field="value")
+        def repair(self, args):
             # Only logs custom_field, not args
     """
     def decorator(func: Callable) -> Callable:

comfygit_cli/utils/civitai_errors.py

@@ -5,5 +5,5 @@ def show_civitai_auth_help() -> None:
     """Display helpful message for Civitai authentication errors."""
     print("\n💡 Civitai API key required")
     print("   1. Get your API key from: https://civitai.com/user/account")
-    print("   2. Add it to ComfyGit: comfygit config --civitai-key <your-key>")
+    print("   2. Add it to ComfyGit: cg config --civitai-key <your-key>")
     print("   3. Try downloading again")