comfygit-core 0.4.2__tar.gz → 0.6.0__tar.gz

{comfygit_core-0.4.2 → comfygit_core-0.6.0}/AGENTS.md

@@ -54,7 +54,7 @@ Check existing managers/services before adding new abstractions.
 
 | Manager | File | Main responsibility |
 | --- | --- | --- |
-| `PyprojectManager` | `managers/pyproject_manager.py` | Manifest CRUD and temporary uv/PyTorch injection. |
+| `PyprojectManager` | `managers/pyproject_manager.py` | Manifest CRUD and disposable UV overlay materialization. |
 | `UVProjectManager` | `managers/uv_project_manager.py` | uv sync/add/remove operations. |
 | `OverlayManager` | `managers/overlay_manager.py` | Overlay loading and legacy `.local-uv-config` migration. |
 | `PyTorchBackendManager` | `managers/pytorch_backend_manager.py` | `.pytorch-backend`, GPU probing, torch source config. |
@@ -76,9 +76,9 @@ Machine-local sync inputs are not portable manifest truth:
 - Local uv overrides now flow through overlays, with legacy `.local-uv-config`
   migrated by `OverlayManager`.
 
-`PyprojectManager.uv_injection_context()` temporarily merges local overlays and
-PyTorch backend config into `pyproject.toml` for uv operations, then restores the
-tracked manifest in a `finally` path. Preserve that invariant.
+`UVProjectManager` copies the tracked manifest into a disposable project before
+materializing local overlays and PyTorch backend config for uv operations. Keep
+machine-local overlay materialization out of the tracked manifest.
 
 ## Dependency Criticality
 
@@ -101,7 +101,7 @@ Run tests from the repo root with uv:
 ```bash
 uv run pytest packages/core/tests/ -v
 uv run pytest packages/core/tests/unit/managers/test_pyproject_manager.py -v
-uv run pytest packages/core/tests/ -k "injection" -v
+uv run pytest packages/core/tests/ -k "overlay or pytorch" -v
 ```
 
 Core tests should usually exercise core APIs and fixtures rather than subprocess

{comfygit_core-0.4.2 → comfygit_core-0.6.0}/CLAUDE.md

@@ -54,7 +54,7 @@ Check existing managers/services before adding new abstractions.
 
 | Manager | File | Main responsibility |
 | --- | --- | --- |
-| `PyprojectManager` | `managers/pyproject_manager.py` | Manifest CRUD and temporary uv/PyTorch injection. |
+| `PyprojectManager` | `managers/pyproject_manager.py` | Manifest CRUD and disposable UV overlay materialization. |
 | `UVProjectManager` | `managers/uv_project_manager.py` | uv sync/add/remove operations. |
 | `OverlayManager` | `managers/overlay_manager.py` | Overlay loading and legacy `.local-uv-config` migration. |
 | `PyTorchBackendManager` | `managers/pytorch_backend_manager.py` | `.pytorch-backend`, GPU probing, torch source config. |
@@ -76,9 +76,9 @@ Machine-local sync inputs are not portable manifest truth:
 - Local uv overrides now flow through overlays, with legacy `.local-uv-config`
   migrated by `OverlayManager`.
 
-`PyprojectManager.uv_injection_context()` temporarily merges local overlays and
-PyTorch backend config into `pyproject.toml` for uv operations, then restores the
-tracked manifest in a `finally` path. Preserve that invariant.
+`UVProjectManager` copies the tracked manifest into a disposable project before
+materializing local overlays and PyTorch backend config for uv operations. Keep
+machine-local overlay materialization out of the tracked manifest.
 
 ## Dependency Criticality
 
@@ -101,7 +101,7 @@ Run tests from the repo root with uv:
 ```bash
 uv run pytest packages/core/tests/ -v
 uv run pytest packages/core/tests/unit/managers/test_pyproject_manager.py -v
-uv run pytest packages/core/tests/ -k "injection" -v
+uv run pytest packages/core/tests/ -k "overlay or pytorch" -v
 ```
 
 Core tests should usually exercise core APIs and fixtures rather than subprocess

{comfygit_core-0.4.2 → comfygit_core-0.6.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: comfygit-core
-Version: 0.4.2
+Version: 0.6.0
 Summary: ComfyGit Core - Git-based ComfyUI environment manager
 Project-URL: Documentation, https://docs.comfygit.org/
 Project-URL: Repository, https://github.com/comfygit-ai/comfygit
@@ -10,7 +10,7 @@ Requires-Python: >=3.10
 Requires-Dist: blake3>=0.3.3
 Requires-Dist: huggingface-hub>=0.11.0
 Requires-Dist: packaging>=16.2
-Requires-Dist: requests>=2.33.0
+Requires-Dist: requests>=2.32.4
 Requires-Dist: requirements-parser>=0.11.0
 Requires-Dist: tomlkit>=0.11.0
 Requires-Dist: uv>=0.11.8

{comfygit_core-0.4.2 → comfygit_core-0.6.0}/docs/architecture-deep-dive.md

@@ -301,12 +301,12 @@ flowchart TB
         factories_uv["factories/uv_factory.py"]
     end
 
-    subgraph L3["LAYER 3: Managers (13 files)"]
+    subgraph L3["LAYER 3: Managers"]
         direction LR
         mgr_orchestrators["Orchestrators:<br/>environment_git_orchestrator<br/>environment_model_manager<br/>node_manager<br/>workflow_manager"]
         mgr_config["Config:<br/>pyproject_manager<br/>uv_project_manager<br/>pytorch_backend_manager<br/>git_manager"]
         mgr_symlink["Symlinks:<br/>model_symlink_manager<br/>user_content_symlink_manager<br/>system_node_symlink_manager"]
-        mgr_other["Other:<br/>export_import_manager<br/>model_download_manager"]
+        mgr_other["Other:<br/>export_import_manager"]
     end
 
     subgraph L4["LAYER 4: Services"]
@@ -405,7 +405,7 @@ flowchart TB
 |---------|---------|
 | `PyprojectManager` | All pyproject.toml operations via 5 handlers (deps, nodes, uv, workflows, models) |
 | `UVProjectManager` | UV commands + pyproject coordination |
-| `PyTorchBackendManager` | .pytorch-backend file management and config injection |
+| `PyTorchBackendManager` | .pytorch-backend file management and overlay config generation |
 | `GitManager` | High-level git workflows (commit, pull, push, branch, merge) |
 
 #### Symlink Managers
@@ -419,7 +419,6 @@ flowchart TB
 | Manager | Purpose |
 |---------|---------|
 | `ExportImportManager` | Environment bundling for portability |
-| `ModelDownloadManager` | Model downloads from various sources |
 
 ---
 

{comfygit_core-0.4.2 → comfygit_core-0.6.0}/docs/architecture.md

@@ -7,7 +7,7 @@ ComfyGit Core is a **library-first Python package** providing environment manage
 ```
 ┌─────────────────────────────────────────┐
 │  Public API Layer                       │
-│  Workspace, Environment (core/)         │
+│  Workspace, Environment, facade exports │
 └──────────────┬──────────────────────────┘
                │
 ┌──────────────▼──────────────────────────┐
@@ -40,14 +40,16 @@ ComfyGit Core is a **library-first Python package** providing environment manage
 | Module | Purpose | Key Concepts |
 |--------|---------|--------------|
 | **core/** | Public API | Workspace (multi-env), Environment (single env) |
-| **models/** | Type safety | Data classes, protocols, exceptions with context |
+| **models/** | Public typed contracts | Exported data classes, protocols, exceptions with context |
+| **readiness.py**, **workflow.py**, **runtime.py**, **assets.py**, **git.py** | Public facades | Reusable domain helpers promoted for adapters |
 | **managers/** | Orchestration | Environment orchestrators (Git, Model), Resource managers (Node, Workflow, Model symlinks), Config managers (PyProject, UV, PyTorch backend) |
+| **manifest/** | Internal manifest abstraction | Pyproject-backed store, section handlers, edit helpers, overlay materialization, migration cleanup |
 | **analyzers/** | Analysis | Parse workflows/git/status; classify nodes |
 | **resolvers/** | Resolution | Map workflow nodes to packages; resolve model sources |
 | **services/** | Business logic | Lookup, registry, downloads, import analysis |
 | **repositories/** | Persistence | SQLite caching, workflow cache, config storage |
 | **clients/** | External APIs | CivitAI, GitHub, ComfyUI registry |
-| **factories/** | DI | Create Workspace/Environment with dependencies |
+| **factories/** | Internal DI | Create Workspace/Environment with dependencies behind public facades |
 | **utils/** | Low-level | Git, filesystem, parsing, version, download |
 | **caching/** | Cache layer | API cache, custom node cache, workflow cache |
 | **configs/** | Reference data | Builtin nodes, model categories |
@@ -73,9 +75,10 @@ ComfyGit Core is a **library-first Python package** providing environment manage
 ## Key Entry Points
 
 **Workspace Operations:**
+- `Workspace.open()` - Discover and load an existing workspace
 - `Workspace.create()` - Create new workspace with validation
-- `Workspace.environments()` / `get_environment()` - List/get environments
-- `WorkspaceFactory.find()` - Discover existing workspace from environment variables
+- `Workspace.open_or_create()` - Setup-friendly load-or-create entry point
+- `Workspace.list_environments()` / `get_environment()` - List/get environments
 - `Workspace.get_schema_version()` / `is_legacy_schema()` - Check workspace version
 - `Workspace.upgrade_schema_if_needed()` - Migrate to current schema
 
@@ -92,6 +95,18 @@ ComfyGit Core is a **library-first Python package** providing environment manage
 - `GlobalNodeResolver.search_packages()` - Fuzzy search with heuristic boosting
 - `ModelResolver.resolve_model()` - Resolve model sources using multiple strategies
 
+Low-level resolvers, managers, repositories, factories, and utilities are
+implementation details unless re-exported through a public facade module.
+Adapters should import from `comfygit_core`, `comfygit_core.models`, or the
+explicit facade modules instead of deep implementation paths.
+
+The `manifest/` package is the internal boundary around the current
+`pyproject.toml` implementation. `PyprojectManager` remains the compatibility
+facade for existing core internals, but document storage, section ownership,
+overlay materialization, and disposable uv project sync should live behind
+manifest helpers. New callers should prefer `Environment.get_manifest_snapshot()`
+or the public Environment/Workspace facade methods instead of reading raw TOML.
+
 ## Dependencies
 
 **External:** aiohttp, requests, uv, pyyaml, tomlkit, blake3, packaging, psutil, requirements-parser

{comfygit_core-0.4.2 → comfygit_core-0.6.0}/docs/layer-hierarchy.md

@@ -167,7 +167,6 @@ This document defines the import hierarchy and functional responsibilities for t
 - `workflow_manager.py` - Workflow analysis/resolution/commit operations
 - `model_path_manager.py` - Model path configuration
 - `model_manifest_manager.py` - Model manifest operations
-- `model_download_manager.py` - Model download operations
 - `git_manager.py` - Git commit/rollback operations
 
 ---
@@ -323,4 +322,4 @@ environment_factory.py (Layer 7)
     → git_manager.py (Layer 6)
       → utils/git.py (Layer 1)
         → models/exceptions.py (Layer 0)
-```
+```

{comfygit_core-0.4.2 → comfygit_core-0.6.0}/docs/plans/uv-overlay-system.md

@@ -7,25 +7,37 @@
 
 ComfyGit environments currently embed ALL dependencies (including platform-specific packages like `sageattention`) directly in pyproject.toml. UV resolves all dependencies — including optional ones — during `uv sync`, which means packages that cannot be built on the local machine (e.g., CUDA-only packages on macOS) cause resolution failures even when the user never requested that extra.
 
-The existing injection system has two separate mechanisms for machine-local config:
+The earlier machine-local dependency system had two separate mechanisms:
 - `.pytorch-backend` — auto-detected PyTorch backend (custom format, auto-gitignored)
 - `.local-uv-config` — machine-specific UV sources/indexes (TOML, auto-gitignored)
 
-These are hard-coded into `uv_injection_context()` with separate code paths. There's no way for users to create their own injectable dependency sets (e.g., "GPU acceleration packages" or "development tools") that layer on top of the base environment.
+Those paths have converged on overlays. Sync/run copy the tracked
+`pyproject.toml` into a disposable project, materialize overlay-derived UV
+configuration there, run uv from the disposable project, then discard it.
+The tracked manifest is not mutated by local overlays.
 
-**The goal:** A composable overlay system where `.toml` files can inject additional dependencies, UV sources, constraints, and settings into the resolution — layered on top of the base pyproject.toml. Some overlays are shareable (checked into git), others are machine-local (gitignored). This enables environments to ship minimal portable dependencies while letting users opt into platform-specific acceleration packages.
+**The goal:** A composable overlay system where `.toml` files can add
+additional dependencies, UV sources, constraints, and settings into resolution,
+layered on top of the base pyproject.toml in a disposable project. Some
+overlays are shareable (checked into git), others are machine-local
+(gitignored). This enables environments to ship minimal portable dependencies
+while letting users opt into platform-specific acceleration packages.
 
 ## Proposed Solution
 
 ### Concept: UV Overlays
 
-An **overlay** is a standalone TOML file that declares additional packages and UV configuration to merge into pyproject.toml during sync/run. Overlays compose additively — multiple overlays can be stacked.
+An **overlay** is a standalone TOML file that declares additional packages and
+UV configuration to merge into a disposable pyproject during sync/run. Overlays
+compose additively — multiple overlays can be stacked.
 
 **Two types:**
 1. **Shared overlays** — Checked into git alongside the environment (e.g., `sageattention.toml`). Available to anyone who clones the environment. Opt-in at runtime.
 2. **Local overlays** — Machine-specific, auto-gitignored (e.g., dev source paths, private indexes). Always active when present.
 
-**PyTorch becomes a special-cased auto-generated overlay** — the probing logic stays, but it produces config in the same format as any other overlay, and the injection pipeline treats it uniformly.
+**PyTorch becomes a special-cased auto-generated overlay** — the probing logic
+stays, but it produces config in the same format as any other overlay, and
+disposable materialization treats it uniformly.
 
 ### Overlay File Format
 
@@ -38,7 +50,7 @@ Overlays use a flat TOML structure (similar to `uv.toml`, not the nested `[tool.
 description = "SageAttention GPU acceleration for CUDA systems"
 
 [dependencies]
-# Packages to inject into [project.dependencies]
+# Packages to materialize into [project.dependencies]
 packages = ["sageattention"]
 
 [sources]
@@ -57,7 +69,7 @@ requires-dist = ["torch"]
 requires-python = ">=3.9"
 
 [constraints]
-# Version constraints to inject (maps to [tool.uv.constraint-dependencies])
+# Version constraints to materialize (maps to [tool.uv.constraint-dependencies])
 packages = []
 
 [[index]]
@@ -89,7 +101,7 @@ Overlays can be activated three ways:
 
 1. **CLI flag (one-time):** `cg run --overlay sageattention` or `cg sync --overlay sageattention`
 2. **Persistent config:** `cg env-config overlays enable sageattention` (writes to `.overlay-config.toml`)
-3. **Always-on local:** `.local.toml` overlay is always injected when present (replaces `.local-uv-config`)
+3. **Always-on local:** `.local.toml` overlay is always applied when present (replaces `.local-uv-config`)
 
 `.overlay-config.toml` format:
 ```toml
@@ -114,11 +126,11 @@ Overlays merge **additively** in order: base pyproject.toml → local overlay
 
 ### PyTorch Integration
 
-PyTorch stays special-cased for **probing** (auto-detection logic remains in `PyTorchBackendManager`), but the injection now goes through the same overlay pipeline:
+PyTorch stays special-cased for **probing** (auto-detection logic remains in `PyTorchBackendManager`), but materialization now goes through the same overlay pipeline:
 
 1. `PyTorchBackendManager.get_pytorch_config()` returns the same dict format it does now
-2. The injection pipeline converts it to overlay format internally
-3. PyTorch is always injected **last** so it wins on torch/torchvision/torchaudio conflicts
+2. The overlay manager converts it to overlay format internally
+3. PyTorch is always applied **last** so it wins on torch/torchvision/torchaudio conflicts
 
 The `.pytorch-backend` file stays as-is (probing state storage). No migration needed — it's an implementation detail of the PyTorch overlay generation.
 
@@ -132,7 +144,7 @@ Per project philosophy of "no legacy/backwards-compatible code": auto-migrate on
 
 1. **Create `OverlayConfig` model** — Dataclass for parsed overlay
    - Fields: description, dependencies, sources, settings, dependency_metadata, constraints, indexes
-   - `to_injection_payload() -> dict` — Convert to the existing `_inject_uv_config()` payload format
+   - `to_uv_payload() -> dict` — Convert to the UV pyproject payload format
    - Files: `packages/core/src/comfygit_core/models/overlay.py`
 
 2. **Create `OverlayManager`** — New manager class
@@ -144,12 +156,12 @@ Per project philosophy of "no legacy/backwards-compatible code": auto-migrate on
    - Auto-migrate `.local-uv-config` to `.cec/overlays/.local.toml` on first access
    - Files: `packages/core/src/comfygit_core/managers/overlay_manager.py`
 
-3. **Refactor `uv_injection_context()`** — Generalize to accept overlays
-   - New signature: `uv_injection_context(overlays: list[OverlayConfig])`
-   - Add dependency injection support (inject into `[project.dependencies]`)
-   - Add `dependency-metadata` injection into `[[tool.uv.dependency-metadata]]`
-   - Add `no-build-isolation-package` injection
-   - Keep strip-before-inject pattern for PyTorch
+3. **Materialize overlays into disposable projects**
+   - Use `PyprojectManager.apply_uv_overlays(overlays)` on generated project copies
+   - Add dependency materialization support for `[project.dependencies]`
+   - Add `dependency-metadata` materialization into `[[tool.uv.dependency-metadata]]`
+   - Add `no-build-isolation-package` materialization
+   - Keep strip-before-apply pattern for PyTorch
    - Files: `packages/core/src/comfygit_core/managers/pyproject_manager.py` (lines 466-539, 766-854)
 
 4. **Update `UVProjectManager.sync_project()`** — Use overlay pipeline
@@ -203,7 +215,7 @@ Per project philosophy of "no legacy/backwards-compatible code": auto-migrate on
 |------|---------|
 | `packages/core/src/comfygit_core/managers/overlay_manager.py` | **NEW** — Overlay loading, activation, collection |
 | `packages/core/src/comfygit_core/models/overlay.py` | **NEW** — OverlayConfig dataclass |
-| `packages/core/src/comfygit_core/managers/pyproject_manager.py` | Refactor `uv_injection_context()` and injection methods |
+| `packages/core/src/comfygit_core/managers/pyproject_manager.py` | Overlay materialization methods |
 | `packages/core/src/comfygit_core/managers/uv_project_manager.py` | Update sync to use overlay pipeline |
 | `packages/core/src/comfygit_core/core/environment.py` | Wire overlay collection into sync/run |
 | `packages/core/src/comfygit_core/managers/pytorch_backend_manager.py` | No changes — generates config consumed as overlay internally |
@@ -215,9 +227,9 @@ Per project philosophy of "no legacy/backwards-compatible code": auto-migrate on
 ## Testing Strategy
 
 - **Unit tests for OverlayManager:** Load/parse overlay files, collect in correct order, validate format
-- **Unit tests for overlay injection:** Verify dependencies, sources, constraints, metadata merge correctly into pyproject config
+- **Unit tests for overlay materialization:** Verify dependencies, sources, constraints, metadata merge correctly into pyproject config
 - **Unit test for migration:** `.local-uv-config` auto-migrates to `.local.toml`
-- **Integration test:** End-to-end sync with overlay applied, verify pyproject restored after sync
+- **Integration test:** End-to-end sync with overlay applied, verify tracked pyproject remains clean after sync
 - **2-3 tests per component** per project guidelines
 
 ## Open Questions

{comfygit_core-0.4.2 → comfygit_core-0.6.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "comfygit-core"
-version = "0.4.2"
+version = "0.6.0"
 description = "ComfyGit Core - Git-based ComfyUI environment manager"
 readme = "README.md"
 requires-python = ">=3.10"
@@ -8,7 +8,7 @@ dependencies = [
     "blake3>=0.3.3",
     "huggingface_hub>=0.11.0",
     "packaging>=16.2",
-    "requests>=2.33.0",
+    "requests>=2.32.4",
     "requirements-parser>=0.11.0",
     "tomlkit>=0.11.0",
     "uv>=0.11.8",

{comfygit_core-0.4.2 → comfygit_core-0.6.0}/src/comfygit_core/analyzers/__init__.py

@@ -21,6 +21,8 @@ _EXPORTS: dict[str, str] = {
     "get_node_git_info": "node_git_analyzer",
     "RefDiffAnalyzer": "ref_diff_analyzer",
     "StatusScanner": "status_scanner",
+    "detect_unmanaged_comfyui_path": "unmanaged_comfyui_analyzer",
+    "scan_unmanaged_comfyui": "unmanaged_comfyui_analyzer",
     "WorkflowDependencyParser": "workflow_dependency_parser",
 }
 
@@ -39,4 +41,3 @@ def __getattr__(name: str) -> Any:
 
 def __dir__() -> list[str]:
     return sorted(set(globals()) | set(__all__))
-

{comfygit_core-0.4.2 → comfygit_core-0.6.0}/src/comfygit_core/analyzers/model_scanner.py

@@ -1,7 +1,6 @@
 """ModelScanner - Model file discovery, hashing, and indexing operations."""
 from __future__ import annotations
 
-from dataclasses import dataclass
 from enum import Enum
 from pathlib import Path
 from typing import TYPE_CHECKING
@@ -9,6 +8,7 @@ from typing import TYPE_CHECKING
 from ..configs.model_config import ModelConfig
 from ..logging.logging_config import get_logger
 from ..models.exceptions import ComfyDockError
+from ..models.model_scan import ModelScanProgress, ScanResult
 
 if TYPE_CHECKING:
     from ..repositories.model_repository import ModelRepository
@@ -44,34 +44,6 @@ MIN_MODEL_SIZE = 8
 # Minimum file size for model files (8 bytes)
 
 
-@dataclass
-class ScanResult:
-    """Result of model scanning operation."""
-    scanned_count: int
-    added_count: int
-    updated_count: int
-    skipped_count: int
-    error_count: int
-    errors: list[str]
-    removed_count: int = 0
-
-
-class ModelScanProgress:
-    """Callback protocol for model scan progress updates."""
-
-    def on_scan_start(self, total_files: int) -> None:
-        """Called when scan starts with total file count."""
-        pass
-
-    def on_file_processed(self, current: int, total: int, filename: str) -> None:
-        """Called after each file is processed."""
-        pass
-
-    def on_scan_complete(self, result: ScanResult) -> None:
-        """Called when scan completes."""
-        pass
-
-
 class ModelScanner:
     """Model file discovery, hashing, and indexing operations."""
 

{comfygit_core-0.4.2 → comfygit_core-0.6.0}/src/comfygit_core/analyzers/node_classifier.py

@@ -5,11 +5,11 @@ import json
 from dataclasses import dataclass, field
 from pathlib import Path
 from typing import TYPE_CHECKING
-import tomllib
 
 from ..configs.comfyui_builtin_nodes import COMFYUI_BUILTIN_NODES
 from ..logging.logging_config import get_logger
 from ..models.comfyui_builtin_versions import BuiltinVersionGateInfo
+from ..utils.toml_compat import tomllib
 
 if TYPE_CHECKING:
     from ..configs.model_config import ModelConfig

{comfygit_core-0.4.2 → comfygit_core-0.6.0}/src/comfygit_core/analyzers/node_git_analyzer.py

@@ -67,7 +67,7 @@ def get_node_git_info(node_path: Path) -> GitInfo | None:
                 git_info.github_repo = github_match.group(2).replace(".git", "")
 
         # Check if there are uncommitted changes
-        status_entries = git_status_porcelain(node_path)
+        status_entries = git_status_porcelain(node_path, check=False)
         git_info.is_dirty = bool(status_entries)
 
         return git_info

{comfygit_core-0.4.2 → comfygit_core-0.6.0}/src/comfygit_core/analyzers/status_scanner.py

@@ -41,6 +41,25 @@ def _versions_match(actual: str | None, expected: str | None) -> bool:
         return False
 
 
+_UV_DRY_RUN_CHANGE_PREFIXES = (
+    "Would update lockfile",
+    "Would download ",
+    "Would install ",
+    "Would uninstall ",
+    "Would upgrade ",
+    "Would downgrade ",
+    "Would remove ",
+)
+
+
+def _uv_dry_run_reports_changes(output: str) -> bool:
+    """Return True when uv dry-run output says sync would mutate the env."""
+    return any(
+        line.strip().startswith(_UV_DRY_RUN_CHANGE_PREFIXES)
+        for line in output.splitlines()
+    )
+
+
 class StatusScanner:
     """Scans environment to get current state."""
 
@@ -58,7 +77,12 @@ class StatusScanner:
         self._comfyui_path = comfyui_path
         self._pytorch_manager = pytorch_manager
 
-    def get_full_comparison(self) -> EnvironmentComparison:
+    def get_full_comparison(
+        self,
+        *,
+        check_package_sync: bool = False,
+        backend_override: str | None = None,
+    ) -> EnvironmentComparison:
         """Get complete environment comparison with all details.
 
         Args:
@@ -77,17 +101,19 @@ class StatusScanner:
         # Get basic comparison
         comparison = self.compare_states(current, expected)
 
-        # Skip package sync check for performance (100-500ms saved)
-        # Rationale:
-        #   - Users rarely manually modify .venv/
-        #   - Operations like 'run', 'repair', 'node add' auto-sync before executing
-        #   - Status is high-frequency with workflow caching - needs to be fast
-        #   - Package drift self-corrects on next sync operation
-        # If thorough check needed, use 'cg repair --dry-run' (future)
-        # TODO: Add package sync status
-        # package_status = self.check_packages_sync()
-        comparison.packages_in_sync = True #package_status.in_sync
-        comparison.package_sync_message = "" #package_status.message
+        if check_package_sync:
+            package_status = self.check_packages_sync(
+                backend_override=backend_override
+            )
+            comparison.packages_in_sync = package_status.in_sync
+            comparison.package_sync_message = package_status.message
+        else:
+            # Keep high-frequency status fast unless the manifest diff says uv
+            # materialization may be needed. Package drift self-corrects on the
+            # next explicit sync/run path, but dependency edits should guide the
+            # user to sync before committing.
+            comparison.packages_in_sync = True
+            comparison.package_sync_message = ""
 
         return comparison
 
@@ -273,7 +299,7 @@ class StatusScanner:
         Returns:
             Expected environment state from configuration
         """
-        self._pyproject.load()
+        self._pyproject.get_manifest_snapshot()
 
         # Get expected custom nodes from pyproject
         node_infos = self._pyproject.nodes.get_existing()
@@ -400,7 +426,11 @@ class StatusScanner:
 
         return comparison
 
-    def check_packages_sync(self) -> PackageSyncStatus:
+    def check_packages_sync(
+        self,
+        *,
+        backend_override: str | None = None,
+    ) -> PackageSyncStatus:
         """Check if packages are in sync with pyproject.toml.
 
         Returns:
@@ -408,15 +438,22 @@ class StatusScanner:
         """
         try:
             # Use UV's dry-run to check if sync would change anything
-            # PyTorch injection ensures the check uses the correct backend
+            # Disposable PyTorch overlay materialization ensures the check uses the correct backend.
             extras, all_extras = self._pyproject.resolve_sync_extras(None, False)
-            self._uv.sync_project(
+            dry_run_output = self._uv.sync_project(
                 dry_run=True,
                 all_groups=True,
                 pytorch_manager=self._pytorch_manager,
+                backend_override=backend_override,
                 extras=extras,
                 all_extras=all_extras,
             )
+            if _uv_dry_run_reports_changes(dry_run_output):
+                return PackageSyncStatus(
+                    in_sync=False,
+                    message="Packages out of sync (run 'cg sync' to update)",
+                    details=dry_run_output,
+                )
             return PackageSyncStatus(
                 in_sync=True, message="Packages match pyproject.toml"
             )