comfygit 0.6.0__tar.gz → 0.7.0__tar.gz

{comfygit-0.6.0 → comfygit-0.7.0}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.4
+Metadata-Version: 2.5
 Name: comfygit
-Version: 0.6.0
+Version: 0.7.0
 Summary: ComfyGit - Git-based environment management for ComfyUI
 Project-URL: Documentation, https://docs.comfygit.org/
 Project-URL: Repository, https://github.com/comfygit-ai/comfygit
@@ -8,8 +8,8 @@ Project-URL: Issues, https://github.com/comfygit-ai/comfygit/issues
 License-File: LICENSE.txt
 Requires-Python: >=3.10
 Requires-Dist: argcomplete>=3.5.0
-Requires-Dist: comfygit-core==0.6.0
-Requires-Dist: comfygit-studio==0.6.0
+Requires-Dist: comfygit-core[keyring]==0.7.0
+Requires-Dist: comfygit-studio==0.7.0
 Requires-Dist: requests>=2.32.4
 Description-Content-Type: text/markdown
 
@@ -201,10 +201,17 @@ cg import [PATH|URL]
 cg export [PATH]
   --allow-issues       Skip confirmation if models lack source URLs
 
-# Configuration
-cg config
-  --civitai-key KEY    Set CivitAI API key (empty string to clear)
-  --show               Show current configuration
+# Provider authentication (secrets never go in argv)
+cg auth status
+cg auth set civitai
+cg auth set huggingface
+cg auth set github
+cg auth login huggingface
+cg auth migrate
+cg auth clear PROVIDER
+
+# Nonsecret configuration
+cg config --show
 
 # Registry management
 cg registry status    # Show registry cache status
@@ -243,6 +250,7 @@ cg create NAME
   --template PATH      Template manifest
   --python VERSION     Python version (default: 3.11)
   --comfyui VERSION    ComfyUI version
+  --comfyui-repository URL  ComfyUI Git repository (canonical by default)
   --torch-backend BACKEND  PyTorch backend (auto/cpu/cu128/rocm6.3/xpu)
   --use                Set as active environment
 
@@ -633,7 +641,9 @@ source ~/.bashrc  # or ~/.zshrc
 
 - `COMFYGIT_HOME` - Override default workspace location (`~/comfygit`)
 - `COMFYGIT_DEV_COMPRESS_LOGS` - Enable compressed logging (dev feature: `true`/`1`/`yes`)
-- `CIVITAI_API_KEY` - CivitAI API key (or use `cg config --civitai-key`)
+- `CIVITAI_API_TOKEN` / `CIVITAI_API_KEY` - CivitAI credential override
+- `HF_TOKEN` / `HUGGING_FACE_HUB_TOKEN` - Hugging Face credential override
+- `GITHUB_TOKEN` / `GH_TOKEN` - GitHub credential override
 
 Example:
 ```bash

{comfygit-0.6.0 → comfygit-0.7.0}/README.md

@@ -186,10 +186,17 @@ cg import [PATH|URL]
 cg export [PATH]
   --allow-issues       Skip confirmation if models lack source URLs
 
-# Configuration
-cg config
-  --civitai-key KEY    Set CivitAI API key (empty string to clear)
-  --show               Show current configuration
+# Provider authentication (secrets never go in argv)
+cg auth status
+cg auth set civitai
+cg auth set huggingface
+cg auth set github
+cg auth login huggingface
+cg auth migrate
+cg auth clear PROVIDER
+
+# Nonsecret configuration
+cg config --show
 
 # Registry management
 cg registry status    # Show registry cache status
@@ -228,6 +235,7 @@ cg create NAME
   --template PATH      Template manifest
   --python VERSION     Python version (default: 3.11)
   --comfyui VERSION    ComfyUI version
+  --comfyui-repository URL  ComfyUI Git repository (canonical by default)
   --torch-backend BACKEND  PyTorch backend (auto/cpu/cu128/rocm6.3/xpu)
   --use                Set as active environment
 
@@ -618,7 +626,9 @@ source ~/.bashrc  # or ~/.zshrc
 
 - `COMFYGIT_HOME` - Override default workspace location (`~/comfygit`)
 - `COMFYGIT_DEV_COMPRESS_LOGS` - Enable compressed logging (dev feature: `true`/`1`/`yes`)
-- `CIVITAI_API_KEY` - CivitAI API key (or use `cg config --civitai-key`)
+- `CIVITAI_API_TOKEN` / `CIVITAI_API_KEY` - CivitAI credential override
+- `HF_TOKEN` / `HUGGING_FACE_HUB_TOKEN` - Hugging Face credential override
+- `GITHUB_TOKEN` / `GH_TOKEN` - GitHub credential override
 
 Example:
 ```bash

{comfygit-0.6.0 → comfygit-0.7.0}/comfygit_cli/cli.py

@@ -233,6 +233,14 @@ def _add_global_commands(subparsers: argparse._SubParsersAction) -> None:
     )
     analyze_parser.set_defaults(func=global_cmds.analyze)
 
+    inventory_parser = subparsers.add_parser(
+        "inventory",
+        help="Report typed workspace model, environment, and storage inventory",
+    )
+    inventory_parser.add_argument("--json", action="store_true", dest="json_output", help="Emit machine-readable JSON")
+    inventory_parser.add_argument("--storage", action="store_true", help="Measure environment, cache, input/output, and model storage")
+    inventory_parser.set_defaults(func=global_cmds.inventory)
+
     # update - Update ComfyGit CLI (self-update)
     update_parser = subparsers.add_parser("update", help="Update ComfyGit CLI")
     update_parser.add_argument("--check", action="store_true", help="Check for updates without upgrading")
@@ -333,6 +341,7 @@ def _add_global_commands(subparsers: argparse._SubParsersAction) -> None:
     # model index list
     model_index_list_parser = model_index_subparsers.add_parser("list", help="List all indexed models")
     model_index_list_parser.add_argument("--duplicates", action="store_true", help="Show only models with multiple locations")
+    model_index_list_parser.add_argument("--json", action="store_true", dest="json_output", help="Emit machine-readable JSON")
     model_index_list_parser.set_defaults(func=global_cmds.model_index_list)
 
     # model index show
@@ -370,7 +379,14 @@ def _add_global_commands(subparsers: argparse._SubParsersAction) -> None:
     # model delete
     model_delete_parser = model_subparsers.add_parser("delete", help="Delete model files and clean index entries")
     model_delete_parser.add_argument("identifier", help="Model hash, hash prefix, filename, or path")
-    model_delete_parser.add_argument("-y", "--yes", action="store_true", help="Skip confirmation prompt")
+    deletion_target = model_delete_parser.add_mutually_exclusive_group()
+    deletion_target.add_argument("--location-id", type=int, help="Delete one indexed location id")
+    deletion_target.add_argument("--all-locations", action="store_true", help="Explicitly target every indexed location")
+    model_delete_parser.add_argument("--apply", action="store_true", help="Apply the deletion plan; default is dry-run")
+    model_delete_parser.add_argument("--allow-referenced", action="store_true", help="Allow deletion despite ComfyGit environment references")
+    model_delete_parser.add_argument("--allow-incomplete-recovery", action="store_true", help="Allow final-copy deletion without source/hash recovery proof")
+    model_delete_parser.add_argument("--json", action="store_true", dest="json_output", help="Emit machine-readable JSON")
+    model_delete_parser.add_argument("-y", "--yes", action="store_true", help="Compatibility alias for --apply --all-locations")
     model_delete_parser.set_defaults(func=global_cmds.model_delete)
 
     # Registry management subcommands
@@ -386,14 +402,46 @@ def _add_global_commands(subparsers: argparse._SubParsersAction) -> None:
     registry_update_parser = registry_subparsers.add_parser("update", help="Update registry data from GitHub")
     registry_update_parser.set_defaults(func=global_cmds.registry_update)
 
-    # Config management - now with subcommands
+    # Provider authentication. Secret values are read from a hidden prompt or stdin,
+    # never from argv.
+    auth_parser = subparsers.add_parser("auth", help="Manage provider authentication")
+    auth_subparsers = auth_parser.add_subparsers(dest="auth_command", help="Authentication commands")
+    auth_parser.set_defaults(func=_make_help_func(auth_parser))
+
+    auth_status_parser = auth_subparsers.add_parser("status", help="Show provider authentication status")
+    auth_status_parser.set_defaults(func=global_cmds.auth_status)
+
+    auth_set_parser = auth_subparsers.add_parser("set", help="Save a provider credential")
+    auth_set_parser.add_argument("provider", choices=("civitai", "huggingface", "github"))
+    auth_set_parser.add_argument(
+        "--token-stdin",
+        action="store_true",
+        help="Read the credential from one line on standard input instead of a hidden prompt",
+    )
+    auth_set_parser.set_defaults(func=global_cmds.auth_set)
+
+    auth_clear_parser = auth_subparsers.add_parser("clear", help="Clear a saved provider credential")
+    auth_clear_parser.add_argument("provider", choices=("civitai", "huggingface", "github"))
+    auth_clear_parser.set_defaults(func=global_cmds.auth_clear)
+
+    auth_login_parser = auth_subparsers.add_parser(
+        "login",
+        help="Authenticate through a provider-native login flow",
+    )
+    auth_login_parser.add_argument("provider", choices=("huggingface",))
+    auth_login_parser.add_argument("--force", action="store_true", help="Force a new provider login")
+    auth_login_parser.set_defaults(func=global_cmds.auth_login)
+
+    auth_migrate_parser = auth_subparsers.add_parser(
+        "migrate",
+        help="Migrate verified legacy plaintext credentials into secure storage",
+    )
+    auth_migrate_parser.set_defaults(func=global_cmds.auth_migrate)
+
+    # Nonsecret workspace configuration.
     config_parser = subparsers.add_parser("config", help="Manage configuration settings")
     config_parser.add_subparsers(dest="config_command", help="Configuration commands")
 
-    # Legacy flags - still supported at root level for backward compatibility
-    config_parser.add_argument("--civitai-key", type=str, help="Set Civitai API key (use empty string to clear)")
-    config_parser.add_argument("--huggingface-token", type=str, help="Set Hugging Face token for gated model downloads (use empty string to clear)")
-    config_parser.add_argument("--github-token", type=str, help="Set GitHub token for private git repository access (use empty string to clear)")
     config_parser.add_argument("--uv-cache", type=str, help="Set external UV cache path (use empty string to clear)")
     config_parser.add_argument("--show", action="store_true", help="Show current configuration")
     config_parser.set_defaults(func=global_cmds.config)
@@ -437,22 +485,24 @@ def _add_global_commands(subparsers: argparse._SubParsersAction) -> None:
     orch_parser.set_defaults(func=_make_help_func(orch_parser))
 
     # orch status
-    orch_status_parser = orch_subparsers.add_parser("status", help="Show orchestrator status")
+    orch_status_parser = orch_subparsers.add_parser("status", help="Show environment runtime status (legacy orchestrator fallback)")
     orch_status_parser.add_argument("--json", action="store_true", help="Output as JSON")
     orch_status_parser.set_defaults(func=global_cmds.orch_status)
 
     # orch restart
-    orch_restart_parser = orch_subparsers.add_parser("restart", help="Restart ComfyUI")
+    orch_restart_parser = orch_subparsers.add_parser("restart", help="Restart idle ComfyUI through its cg run supervisor")
     orch_restart_parser.add_argument("--wait", action="store_true", help="Wait for restart to complete")
+    orch_restart_parser.add_argument("--timeout", type=float, default=180, help="Maximum readiness wait in seconds")
+    orch_restart_parser.add_argument("--json", action="store_true", help="Output acknowledgement or verified readiness as JSON")
     orch_restart_parser.set_defaults(func=global_cmds.orch_restart)
 
     # orch kill
-    orch_kill_parser = orch_subparsers.add_parser("kill", help="Shutdown orchestrator")
+    orch_kill_parser = orch_subparsers.add_parser("kill", help="Shutdown the legacy orchestrator (not cg run)")
     orch_kill_parser.add_argument("--force", action="store_true", help="Force kill (bypass command queue)")
     orch_kill_parser.set_defaults(func=global_cmds.orch_kill)
 
     # orch clean
-    orch_clean_parser = orch_subparsers.add_parser("clean", help="Clean orchestrator state")
+    orch_clean_parser = orch_subparsers.add_parser("clean", help="Clean legacy orchestrator state")
     orch_clean_parser.add_argument("--dry-run", action="store_true", help="Show what would be deleted")
     orch_clean_parser.add_argument("--force", action="store_true", help="Skip confirmation")
     orch_clean_parser.add_argument("--kill", action="store_true", help="Also kill orchestrator process")
@@ -497,6 +547,13 @@ def _add_env_commands(subparsers: argparse._SubParsersAction) -> None:
     create_parser.add_argument("--template", type=Path, help="Template manifest")
     create_parser.add_argument("--python", default="3.11", help="Python version")
     create_parser.add_argument("--comfyui", help="ComfyUI version")
+    create_parser.add_argument(
+        "--comfyui-repository",
+        help=(
+            "ComfyUI Git repository URL. Use with --comfyui to pin a fork "
+            "or alternate upstream; defaults to canonical ComfyUI."
+        ),
+    )
     create_parser.add_argument(
         "--torch-backend",
         default="auto",
@@ -1065,10 +1122,24 @@ def _add_env_commands(subparsers: argparse._SubParsersAction) -> None:
     workflow_resolve_parser = workflow_subparsers.add_parser("resolve", help="Resolve workflow dependencies (nodes & models)")
     workflow_resolve_parser.add_argument("name", help="Workflow name to resolve").completer = workflow_completer  # type: ignore[attr-defined]
     workflow_resolve_parser.add_argument("--auto", action="store_true", help="Auto-resolve without interaction")
+    workflow_resolve_parser.add_argument("--json", action="store_true", help="JSON result on stdout; requires --auto and --install/--no-install")
+    workflow_resolve_parser.add_argument("--strict", action="store_true", help="Exit 1 when dependencies remain unresolved or uninstalled")
     workflow_resolve_parser.add_argument("--install", action="store_true", help="Auto-install missing nodes without prompting")
     workflow_resolve_parser.add_argument("--no-install", action="store_true", help="Skip node installation prompt")
     workflow_resolve_parser.set_defaults(func=env_cmds.workflow_resolve)
 
+    workflow_node_parser = workflow_subparsers.add_parser("node", help="Manage explicit node ownership mappings")
+    mapping_parsers = workflow_node_parser.add_subparsers(dest="mapping_command", required=True)
+    for operation in ("map", "unmap", "list"):
+        mapping_parser = mapping_parsers.add_parser(operation)
+        mapping_parser.add_argument("name", help="Workflow name")
+        if operation != "list":
+            mapping_parser.add_argument("node_type", help="ComfyUI registered node class name")
+        if operation == "map":
+            mapping_parser.add_argument("package", help="Tracked node package identifier")
+        mapping_parser.add_argument("--json", action="store_true")
+        mapping_parser.set_defaults(func=env_cmds.workflow_node_mapping)
+
     # workflow model importance
     workflow_importance_parser = workflow_subparsers.add_parser(
         "model",

{comfygit-0.6.0 → comfygit-0.7.0}/comfygit_cli/env_commands.py

@@ -20,8 +20,8 @@ from comfygit_core.models import (
 )
 from comfygit_core.runtime import (
     ACTIVE_TORCH_BACKEND_OVERRIDE_ENV,
+    ManagedRuntimeController,
     SwitchObserverServer,
-    cleanup_supervisor_advertisement,
     cleanup_switch_status,
     read_switch_status,
     resolve_comfyui_endpoint,
@@ -259,6 +259,7 @@ class EnvironmentCommands:
             workspace.create_environment(
                 name=args.name,
                 comfyui_version=args.comfyui,
+                comfyui_repository=getattr(args, "comfyui_repository", None),
                 python_version=args.python,
                 template_path=args.template,
                 torch_backend=args.torch_backend,
@@ -595,6 +596,9 @@ class EnvironmentCommands:
         extras = getattr(args, 'extra', None) or []
         all_extras = getattr(args, 'all_extras', False)
         overlay_names = getattr(args, 'overlay', None) or []
+        self._managed_runtime = ManagedRuntimeController(
+            env.name, resolve_comfyui_endpoint(base_comfyui_args), self.workspace.path,
+        )
         supervisor_control = self._start_supervisor_control(base_comfyui_args)
         if supervisor_control:
             atexit.register(supervisor_control.stop)
@@ -611,6 +615,9 @@ class EnvironmentCommands:
             # replacing `env`, so derive backend-specific launch args per target.
             torch_backend, was_probed = self._get_or_probe_backend(env, torch_backend_override)
             comfyui_args = self._comfyui_args_for_backend(base_comfyui_args, torch_backend)
+            self._managed_runtime.configure(env.name, resolve_comfyui_endpoint(comfyui_args))
+            if supervisor_control:
+                supervisor_control.advertise_runtime()
 
             if torch_backend_override:
                 print(f"🔧 Using PyTorch backend override: {torch_backend}")
@@ -653,6 +660,7 @@ class EnvironmentCommands:
             if comfyui_args:
                 print(f"   Arguments: {' '.join(comfyui_args)}")
 
+            self._managed_runtime.launching()
             if switch_source_env:
                 result = self._run_switched_comfyui(
                     env,
@@ -668,6 +676,7 @@ class EnvironmentCommands:
                     backend_override=torch_backend_override,
                 )
 
+            self._managed_runtime.exited()
             if result.returncode == RESTART_EXIT_CODE:
                 print("\n🔄 Restart requested, syncing dependencies...\n")
                 no_sync = False  # Ensure sync runs on restart
@@ -696,7 +705,6 @@ class EnvironmentCommands:
         explicit_port = port_text is not None
 
         if port_text and port_text.lower() in {"0", "off", "false", "disabled"}:
-            cleanup_supervisor_advertisement(self.workspace.path)
             return None
 
         if port_text:
@@ -704,7 +712,6 @@ class EnvironmentCommands:
                 candidate_ports = [int(port_text)]
             except ValueError:
                 print(f"⚠️  Invalid COMFYGIT_SUPERVISOR_CONTROL_PORT={port_text!r}; supervisor control disabled")
-                cleanup_supervisor_advertisement(self.workspace.path)
                 return None
         else:
             start_port = min(max(endpoint.port + 1, 1), 65535)
@@ -720,6 +727,7 @@ class EnvironmentCommands:
                 host,
                 port,
                 public_origin=public_origin,
+                runtime_controller=getattr(self, "_managed_runtime", None),
             )
             try:
                 control.start()
@@ -738,7 +746,6 @@ class EnvironmentCommands:
                 "⚠️  Could not start supervisor control server on "
                 f"{host}:{candidate_ports[0]}-{candidate_ports[-1]}: {last_error}"
             )
-        cleanup_supervisor_advertisement(self.workspace.path)
         return None
 
     def _append_switch_log(
@@ -3732,8 +3739,64 @@ class EnvironmentCommands:
         print(f"✗ Invalid selection: {choice}")
         return None
 
-    @with_env_logging("workflow resolve", get_env_name=lambda self, args: self._get_env(args).name)
     def workflow_resolve(self, args: argparse.Namespace, logger=None) -> None:
+        """Resolve with optional machine-readable, strict completion reporting."""
+        import contextlib
+        import json
+
+        json_output = getattr(args, "json", False)
+        strict = getattr(args, "strict", False)
+        if json_output and not args.auto:
+            print("--json requires --auto (use explicit mappings for unknown nodes)", file=sys.stderr)
+            raise SystemExit(2)
+        if json_output and not (args.install or args.no_install):
+            print("--json requires --install or --no-install", file=sys.stderr)
+            raise SystemExit(2)
+
+        try:
+            with contextlib.redirect_stdout(sys.stderr) if json_output else contextlib.nullcontext():
+                self._workflow_resolve(args)
+                if not (json_output or strict):
+                    return
+                # Re-analyze AFTER downloads/installs, rather than reporting the stale plan.
+                env = self._get_env(args)
+                _, result = env.analyze_workflow_dependencies(args.name)
+                missing = env.get_uninstalled_nodes(workflow_name=args.name)
+                failed = env.get_workflow_failed_downloads(args.name)
+                from .utils.workflow_result import resolution_report
+                report = resolution_report(result, missing, failed)
+        except (Exception, SystemExit) as exc:
+            if json_output:
+                print(json.dumps({"schema_version": 1, "workflow": args.name,
+                                  "complete": False, "error": "resolution_failed"}))
+            raise exc
+        if json_output:
+            print(json.dumps(report, indent=2))
+        if strict and not report["complete"]:
+            raise SystemExit(1)
+
+    def workflow_node_mapping(self, args: argparse.Namespace) -> None:
+        """Explicit ownership edits through the public Environment facade."""
+        import json
+
+        env = self._get_env(args)
+        if not env.get_workflow_path(args.name).is_file():
+            raise ValueError(f"Workflow not found: {args.name}")
+        if args.mapping_command == "map":
+            if env.get_manifest_node(args.package) is None:
+                raise ValueError(f"Package is not tracked: {args.package}. Add or dev-link it first.")
+            env.set_workflow_custom_node_mapping(args.name, args.node_type, args.package)
+        elif args.mapping_command == "unmap":
+            env.remove_workflow_custom_node_mapping(args.name, args.node_type)
+        mappings = dict(env.get_workflow_custom_node_map(args.name))
+        if args.json:
+            print(json.dumps({"workflow": args.name, "custom_node_map": mappings}, indent=2))
+        else:
+            for node_type, package in sorted(mappings.items()):
+                print(f"{node_type}: {package}")
+
+    @with_env_logging("workflow resolve", get_env_name=lambda self, args: self._get_env(args).name)
+    def _workflow_resolve(self, args: argparse.Namespace, logger=None) -> None:
         """Resolve workflow dependencies interactively."""
         env = self._get_env(args)
 
@@ -3923,7 +3986,7 @@ class EnvironmentCommands:
                     print(f"      • {m.filename}")
 
                 print("\n💡 Next:")
-                print("  Add Civitai API key: cg config --civitai-key <your-token>")
+                print("  Add Civitai API key: cg auth set civitai")
                 print(f"  Try again: cg workflow resolve \"{args.name}\"")
                 print("  Or commit anyway: cg commit -m \"...\" --allow-issues")
             else: