comfygit 0.2.0__tar.gz → 0.3.6__tar.gz

{comfygit-0.2.0 → comfygit-0.3.6}/CLAUDE.md

@@ -1,7 +1,7 @@
-# ComfyDock CLI Package
+# ComfyGit CLI Package
 
 ## Overview
-CLI interface for ComfyDock, providing command-line tools for workspace and environment management.
+CLI interface for ComfyGit, providing command-line tools for workspace and environment management.
 
 ## Key Documents
 - @docs/codebase-map.md - Architecture and structure
@@ -16,13 +16,13 @@ CLI interface for ComfyDock, providing command-line tools for workspace and envi
 
 ```bash
 # Run mypy (stricter, CI/CD-style checking)
-uv run mypy packages/cli/comfydock_cli/
+uv run mypy packages/cli/comfygit_cli/
 
 # Run pyright (Pylance/IDE-style checking - catches "possibly unbound" etc.)
-uv run pyright packages/cli/comfydock_cli/
+uv run pyright packages/cli/comfygit_cli/
 
 # Run both together
-uv run mypy packages/cli/comfydock_cli/ && uv run pyright packages/cli/comfydock_cli/
+uv run mypy packages/cli/comfygit_cli/ && uv run pyright packages/cli/comfygit_cli/
 ```
 
 **Why both?**
@@ -79,7 +79,7 @@ uv run pytest packages/cli/tests/ -v
 uv run pytest packages/cli/tests/test_status_displays_uninstalled_nodes.py -v
 
 # Test with coverage
-uv run pytest packages/cli/tests/ --cov=comfydock_cli
+uv run pytest packages/cli/tests/ --cov=comfygit_cli
 ```
 
 ## Code Style
@@ -128,8 +128,8 @@ except Exception as e:
 
 Before committing CLI changes:
 
-1. ✅ Run `uv run mypy packages/cli/comfydock_cli/`
-2. ✅ Run `uv run pyright packages/cli/comfydock_cli/`
+1. ✅ Run `uv run mypy packages/cli/comfygit_cli/`
+2. ✅ Run `uv run pyright packages/cli/comfygit_cli/`
 3. ✅ Run `uv run pytest packages/cli/tests/`
 4. ✅ Test manually with `uv run cfd <command>`
 5. ✅ Check no red squiggles in IDE
@@ -155,7 +155,7 @@ uv run ruff check --fix packages/cli/
 
 ## Dependencies
 
-- **comfydock-core**: Core library (DO NOT couple with CLI specifics)
+- **comfygit-core**: Core library (DO NOT couple with CLI specifics)
 - **argparse**: Command-line parsing
 - **argcomplete**: Shell tab completion
 - **aiohttp**: Async HTTP for registry operations
@@ -163,7 +163,7 @@ uv run ruff check --fix packages/cli/
 ## Architecture
 
 ```
-comfydock_cli/
+comfygit_cli/
 ├── cli.py                    # Main entry point, argument parsing
 ├── env_commands.py           # Environment-scoped commands
 ├── global_commands.py        # Workspace-scoped commands

{comfygit-0.2.0 → comfygit-0.3.6}/PKG-INFO

@@ -1,20 +1,20 @@
 Metadata-Version: 2.4
 Name: comfygit
-Version: 0.2.0
+Version: 0.3.6
 Summary: ComfyGit - Git-based environment management for ComfyUI
 License-File: LICENSE.txt
 Requires-Python: >=3.10
 Requires-Dist: argcomplete>=3.5.0
-Requires-Dist: comfygit-core>=0.2.0
+Requires-Dist: comfygit-core==0.3.6
 Description-Content-Type: text/markdown
 
-# ComfyDock CLI
+# ComfyGit CLI
 
-Command-line interface for ComfyDock workspace and environment management.
+Command-line interface for ComfyGit workspace and environment management.
 
 ## Overview
 
-The CLI (`cfd` command) provides interactive, user-friendly access to ComfyDock's environment management system. It wraps the `comfydock-core` library with:
+The CLI (`cfd` command) provides interactive, user-friendly access to ComfyGit's environment management system. It wraps the `comfygit-core` library with:
 
 - **Smart tab completion** - Context-aware shell completion for bash/zsh
 - **Interactive resolution** - User-guided dependency resolution for ambiguous cases
@@ -556,8 +556,8 @@ Logs rotate automatically at 10MB with 5 backups kept.
 # Make sure you've initialized
 cfd init
 
-# Or set COMFYDOCK_HOME to point to existing workspace
-export COMFYDOCK_HOME=/path/to/workspace
+# Or set COMFYGIT_HOME to point to existing workspace
+export COMFYGIT_HOME=/path/to/workspace
 ```
 
 **"No active environment"**
@@ -599,13 +599,13 @@ source ~/.bashrc  # or ~/.zshrc
 
 ## Environment Variables
 
-- `COMFYDOCK_HOME` - Override default workspace location (`~/comfydock`)
-- `COMFYDOCK_DEV_COMPRESS_LOGS` - Enable compressed logging (dev feature: `true`/`1`/`yes`)
+- `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 `cfd config --civitai-key`)
 
 Example:
 ```bash
-export COMFYDOCK_HOME=/mnt/storage/comfydock
+export COMFYGIT_HOME=/mnt/storage/comfygit
 cfd init
 ```
 

{comfygit-0.2.0 → comfygit-0.3.6}/README.md

@@ -1,10 +1,10 @@
-# ComfyDock CLI
+# ComfyGit CLI
 
-Command-line interface for ComfyDock workspace and environment management.
+Command-line interface for ComfyGit workspace and environment management.
 
 ## Overview
 
-The CLI (`cfd` command) provides interactive, user-friendly access to ComfyDock's environment management system. It wraps the `comfydock-core` library with:
+The CLI (`cfd` command) provides interactive, user-friendly access to ComfyGit's environment management system. It wraps the `comfygit-core` library with:
 
 - **Smart tab completion** - Context-aware shell completion for bash/zsh
 - **Interactive resolution** - User-guided dependency resolution for ambiguous cases
@@ -546,8 +546,8 @@ Logs rotate automatically at 10MB with 5 backups kept.
 # Make sure you've initialized
 cfd init
 
-# Or set COMFYDOCK_HOME to point to existing workspace
-export COMFYDOCK_HOME=/path/to/workspace
+# Or set COMFYGIT_HOME to point to existing workspace
+export COMFYGIT_HOME=/path/to/workspace
 ```
 
 **"No active environment"**
@@ -589,13 +589,13 @@ source ~/.bashrc  # or ~/.zshrc
 
 ## Environment Variables
 
-- `COMFYDOCK_HOME` - Override default workspace location (`~/comfydock`)
-- `COMFYDOCK_DEV_COMPRESS_LOGS` - Enable compressed logging (dev feature: `true`/`1`/`yes`)
+- `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 `cfd config --civitai-key`)
 
 Example:
 ```bash
-export COMFYDOCK_HOME=/mnt/storage/comfydock
+export COMFYGIT_HOME=/mnt/storage/comfygit
 cfd init
 ```
 

{comfygit-0.2.0 → comfygit-0.3.6}/comfygit_cli/cli.py

@@ -65,7 +65,7 @@ def _check_for_old_docker_installation() -> None:
 
 
 def main() -> None:
-    """Main entry point for ComfyDock CLI."""
+    """Main entry point for ComfyGit CLI."""
     # Enable readline for input() line editing (arrow keys, history)
     # Unix/Linux/macOS: provides full editing capability
     # Windows: gracefully falls back to native console editing
@@ -156,6 +156,7 @@ def _add_global_commands(subparsers: argparse._SubParsersAction) -> None:
     init_parser.add_argument("path", type=Path, nargs="?", help="Workspace directory (default: ~/comfygit)")
     init_parser.add_argument("--models-dir", type=Path, help="Path to existing models directory to index")
     init_parser.add_argument("--yes", "-y", action="store_true", help="Use all defaults, no interactive prompts")
+    init_parser.add_argument("--bare", action="store_true", help="Create workspace without system nodes (comfygit-manager)")
     init_parser.set_defaults(func=global_cmds.init)
 
     # list - List all environments
@@ -185,6 +186,11 @@ def _add_global_commands(subparsers: argparse._SubParsersAction) -> None:
         ),
     )
     import_parser.add_argument("--use", action="store_true", help="Set imported environment as active")
+    import_parser.add_argument(
+        "--models",
+        choices=["all", "required", "skip"],
+        help="Model download strategy: all (default with --yes), required only, or skip"
+    )
     import_parser.add_argument("-y", "--yes", action="store_true", help="Skip confirmation prompts, use defaults for workspace initialization")
     import_parser.set_defaults(func=global_cmds.import_env)
 
@@ -287,6 +293,45 @@ def _add_global_commands(subparsers: argparse._SubParsersAction) -> None:
     completion_status_parser = completion_subparsers.add_parser("status", help="Show tab completion installation status")
     completion_status_parser.set_defaults(func=completion_cmds.status)
 
+    # Orchestrator management subcommands
+    orch_parser = subparsers.add_parser(
+        "orch",
+        aliases=["orchestrator"],
+        help="Monitor and control orchestrator"
+    )
+    orch_subparsers = orch_parser.add_subparsers(
+        dest="orch_command",
+        help="Orchestrator commands"
+    )
+
+    # orch status
+    orch_status_parser = orch_subparsers.add_parser("status", help="Show orchestrator status")
+    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.add_argument("--wait", action="store_true", help="Wait for restart to complete")
+    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.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.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")
+    orch_clean_parser.set_defaults(func=global_cmds.orch_clean)
+
+    # orch logs
+    orch_logs_parser = orch_subparsers.add_parser("logs", help="Show orchestrator logs")
+    orch_logs_parser.add_argument("-f", "--follow", action="store_true", help="Follow logs in real-time")
+    orch_logs_parser.add_argument("-n", "--lines", type=int, default=50, help="Number of lines to show (default: 50)")
+    orch_logs_parser.set_defaults(func=global_cmds.orch_logs)
+
 
 def _add_env_commands(subparsers: argparse._SubParsersAction) -> None:
     """Add environment-specific commands."""
@@ -341,6 +386,7 @@ def _add_env_commands(subparsers: argparse._SubParsersAction) -> None:
     manifest_parser = subparsers.add_parser("manifest", help="Show environment manifest (pyproject.toml)")
     manifest_parser.add_argument("--pretty", action="store_true", help="Output as YAML instead of TOML")
     manifest_parser.add_argument("--section", type=str, help="Show specific section (e.g., tool.comfygit.nodes)")
+    manifest_parser.add_argument("--ide", nargs="?", const="auto", metavar="CMD", help="Open in editor (uses $EDITOR if no command given)")
     manifest_parser.set_defaults(func=env_cmds.manifest)
 
     # repair - Repair environment drift (manual edits or git operations)
@@ -402,6 +448,16 @@ def _add_env_commands(subparsers: argparse._SubParsersAction) -> None:
     merge_parser = subparsers.add_parser("merge", help="Merge branch into current")
     merge_parser.add_argument("branch", help="Branch to merge")
     merge_parser.add_argument("-m", "--message", help="Merge commit message")
+    merge_parser.add_argument(
+        "--preview",
+        action="store_true",
+        help="Preview changes without applying (read-only diff with conflict detection)"
+    )
+    merge_parser.add_argument(
+        "--auto-resolve",
+        choices=["mine", "theirs"],
+        help="Auto-resolve conflicts: 'mine' keeps local, 'theirs' takes incoming"
+    )
     merge_parser.set_defaults(func=env_cmds.merge)
 
     # revert - Revert commits
@@ -430,6 +486,16 @@ def _add_env_commands(subparsers: argparse._SubParsersAction) -> None:
         action="store_true",
         help="Discard uncommitted changes and force pull"
     )
+    pull_parser.add_argument(
+        "--preview",
+        action="store_true",
+        help="Preview changes without applying (read-only fetch and diff)"
+    )
+    pull_parser.add_argument(
+        "--auto-resolve",
+        choices=["mine", "theirs"],
+        help="Auto-resolve conflicts: 'mine' keeps local, 'theirs' takes incoming"
+    )
     pull_parser.set_defaults(func=env_cmds.pull)
 
     # push - Push commits to remote
@@ -508,6 +574,7 @@ def _add_env_commands(subparsers: argparse._SubParsersAction) -> None:
     node_remove_parser = node_subparsers.add_parser("remove", help="Remove custom node(s)")
     node_remove_parser.add_argument("node_names", nargs="+", help="Node registry ID(s) or name(s)").completer = installed_node_completer  # type: ignore[attr-defined]
     node_remove_parser.add_argument("--dev", action="store_true", help="Remove development node specifically")
+    node_remove_parser.add_argument("--untrack", action="store_true", help="Only remove from tracking, leave filesystem unchanged")
     node_remove_parser.set_defaults(func=env_cmds.node_remove)
 
     # node prune

{comfygit-0.2.0 → comfygit-0.3.6}/comfygit_cli/cli_utils.py

@@ -1,4 +1,4 @@
-"""Utility functions for ComfyDock CLI."""
+"""Utility functions for ComfyGit CLI."""
 
 import sys
 from typing import TYPE_CHECKING

{comfygit-0.2.0 → comfygit-0.3.6}/comfygit_cli/completers.py

@@ -1,4 +1,4 @@
-"""Custom argcomplete completers for ComfyDock CLI."""
+"""Custom argcomplete completers for ComfyGit CLI."""
 import argparse
 from typing import Any