feat: scan CLI, orchestrator, and unified library scanner

pyproject.toml

@@ -10,6 +10,7 @@ dependencies = [
     "pydantic>=2.0",
     "jinja2>=3.1",
     "pyyaml>=6.0",
+    "rich>=13.0",
 ]
 
 [project.scripts]

src/mac2nix/cli.py

@@ -1,6 +1,17 @@
 """mac2nix CLI."""
 
+from __future__ import annotations
+
+import asyncio
+import time
+from pathlib import Path
+
 import click
+from rich.console import Console
+from rich.progress import BarColumn, MofNCompleteColumn, Progress, SpinnerColumn, TextColumn, TimeElapsedColumn
+
+from mac2nix.orchestrator import run_scan
+from mac2nix.scanners import get_all_scanners
 
 
 @click.group()
@@ -10,9 +21,81 @@ def main() -> None:
 
 
 @main.command()
-def scan() -> None:
+@click.option(
+    "--output",
+    "-o",
+    type=click.Path(path_type=Path),
+    default=None,
+    help="Write JSON output to FILE instead of stdout.",
+    metavar="FILE",
+)
+@click.option(
+    "--scanner",
+    "-s",
+    "selected_scanners",
+    multiple=True,
+    help="Run only this scanner (repeatable). Defaults to all scanners.",
+    metavar="NAME",
+)
+def scan(output: Path | None, selected_scanners: tuple[str, ...]) -> None:
     """Scan the current macOS system state."""
-    click.echo("scan: not yet implemented")
+    all_names = list(get_all_scanners().keys())
+    scanners: list[str] | None = list(selected_scanners) if selected_scanners else None
+
+    # Validate any explicitly requested scanner names
+    if scanners is not None:
+        unknown = [s for s in scanners if s not in all_names]
+        if unknown:
+            available = ", ".join(sorted(all_names))
+            raise click.UsageError(f"Unknown scanner(s): {', '.join(unknown)}. Available: {available}")
+
+    total = len(scanners) if scanners is not None else len(all_names)
+
+    completed: int = 0
+    start = time.monotonic()
+
+    with Progress(
+        SpinnerColumn(),
+        TextColumn("[progress.description]{task.description}"),
+        BarColumn(),
+        MofNCompleteColumn(),
+        TimeElapsedColumn(),
+        console=Console(stderr=True),
+        transient=True,
+        redirect_stdout=False,
+        redirect_stderr=False,
+    ) as progress:
+        task_id = progress.add_task("Scanning...", total=total)
+
+        def progress_callback(name: str) -> None:
+            nonlocal completed
+            completed += 1
+            progress.advance(task_id)
+            progress.update(task_id, description=f"[bold cyan]{name}[/] done")
+
+        try:
+            state = asyncio.run(run_scan(scanners=scanners, progress_callback=progress_callback))
+        except RuntimeError as e:
+            raise click.ClickException(str(e)) from e
+
+    elapsed = time.monotonic() - start
+    scanner_count = completed
+
+    json_output = state.to_json()
+
+    if output is not None:
+        output.parent.mkdir(parents=True, exist_ok=True)
+        output.write_text(json_output)
+        click.echo(
+            f"Scanned {scanner_count} scanner(s) in {elapsed:.1f}s — wrote {output}",
+            err=True,
+        )
+    else:
+        click.echo(
+            f"Scanned {scanner_count} scanner(s) in {elapsed:.1f}s",
+            err=True,
+        )
+        click.echo(json_output)
 
 
 @main.command()

src/mac2nix/models/__init__.py

@@ -14,7 +14,6 @@
 )
 from mac2nix.models.files import (
     AppConfigEntry,
-    AppConfigResult,
     BundleEntry,
     ConfigFileType,
     DotfileEntry,
@@ -25,9 +24,9 @@
     FontSource,
     FontsResult,
     KeyBindingEntry,
-    LibraryAuditResult,
     LibraryDirEntry,
     LibraryFileEntry,
+    LibraryResult,
     WorkflowEntry,
 )
 from mac2nix.models.hardware import (
@@ -93,7 +92,6 @@
 
 __all__ = [
     "AppConfigEntry",
-    "AppConfigResult",
     "AppSource",
     "ApplicationsResult",
     "AudioConfig",
@@ -131,9 +129,9 @@
     "LaunchAgentSource",
     "LaunchAgentsResult",
     "LaunchdScheduledJob",
-    "LibraryAuditResult",
     "LibraryDirEntry",
     "LibraryFileEntry",
+    "LibraryResult",
     "MacPortsPackage",
     "MacPortsState",
     "ManagedRuntime",

src/mac2nix/models/files.py

@@ -1,4 +1,4 @@
-"""Dotfile, app config, font, and library audit models."""
+"""Dotfile, app config, font, and library models."""
 
 from __future__ import annotations
 
@@ -56,10 +56,6 @@ class AppConfigEntry(BaseModel):
     modified_time: datetime | None = None
 
 
-class AppConfigResult(BaseModel):
-    entries: list[AppConfigEntry]
-
-
 class FontSource(StrEnum):
     USER = "user"  # ~/Library/Fonts
     SYSTEM = "system"  # /Library/Fonts
@@ -121,7 +117,8 @@ class KeyBindingEntry(BaseModel):
     action: str | dict[str, Any]
 
 
-class LibraryAuditResult(BaseModel):
+class LibraryResult(BaseModel):
+    app_configs: list[AppConfigEntry] = []
     bundles: list[BundleEntry] = []
     directories: list[LibraryDirEntry] = []
     uncovered_files: list[LibraryFileEntry] = []

src/mac2nix/models/system_state.py

@@ -8,7 +8,7 @@
 from pydantic import BaseModel, Field
 
 from mac2nix.models.application import ApplicationsResult, HomebrewState
-from mac2nix.models.files import AppConfigResult, DotfilesResult, FontsResult, LibraryAuditResult
+from mac2nix.models.files import DotfilesResult, FontsResult, LibraryResult
 from mac2nix.models.hardware import AudioConfig, DisplayConfig
 from mac2nix.models.package_managers import (
     ContainersResult,
@@ -37,7 +37,6 @@ class SystemState(BaseModel):
     applications: ApplicationsResult | None = None
     homebrew: HomebrewState | None = None
     dotfiles: DotfilesResult | None = None
-    app_config: AppConfigResult | None = None
     fonts: FontsResult | None = None
     launch_agents: LaunchAgentsResult | None = None
     shell: ShellConfig | None = None
@@ -47,7 +46,7 @@ class SystemState(BaseModel):
     display: DisplayConfig | None = None
     audio: AudioConfig | None = None
     cron: ScheduledTasks | None = None
-    library_audit: LibraryAuditResult | None = None
+    library: LibraryResult | None = None
     nix_state: NixState | None = None
     version_managers: VersionManagersResult | None = None
     package_managers: PackageManagersResult | None = None