clonebox 0.1.18__tar.gz → 0.1.20__tar.gz

{clonebox-0.1.18/src/clonebox.egg-info → clonebox-0.1.20}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: clonebox
-Version: 0.1.18
+Version: 0.1.20
 Summary: Clone your workstation environment to an isolated VM with selective apps, paths and services
 Author: CloneBox Team
 License: Apache-2.0
@@ -41,6 +41,9 @@ Provides-Extra: test
 Requires-Dist: pytest>=7.0.0; extra == "test"
 Requires-Dist: pytest-cov>=4.0.0; extra == "test"
 Requires-Dist: pytest-timeout>=2.0.0; extra == "test"
+Provides-Extra: dashboard
+Requires-Dist: fastapi>=0.100.0; extra == "dashboard"
+Requires-Dist: uvicorn>=0.22.0; extra == "dashboard"
 Dynamic: license-file
 
 # CloneBox 📦

{clonebox-0.1.18 → clonebox-0.1.20}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "clonebox"
-version = "0.1.18"
+version = "0.1.20"
 description = "Clone your workstation environment to an isolated VM with selective apps, paths and services"
 readme = "README.md"
 license = {text = "Apache-2.0"}
@@ -52,6 +52,10 @@ test = [
     "pytest-cov>=4.0.0",
     "pytest-timeout>=2.0.0",
 ]
+dashboard = [
+    "fastapi>=0.100.0",
+    "uvicorn>=0.22.0",
+]
 
 [project.scripts]
 clonebox = "clonebox.cli:main"
@@ -64,6 +68,9 @@ Issues = "https://github.com/wronai/clonebox/issues"
 [tool.setuptools.packages.find]
 where = ["src"]
 
+[tool.setuptools.package-data]
+clonebox = ["templates/**/*.yaml"]
+
 [tool.black]
 line-length = 100
 target-version = ["py38", "py39", "py310", "py311", "py312"]
@@ -82,6 +89,7 @@ markers = [
     "e2e: end-to-end tests requiring libvirt/KVM (deselect with '-m \"not e2e\"')",
     "slow: slow tests (deselect with '-m \"not slow\"')",
     "integration: integration tests",
+    "container: container workflow tests requiring podman/docker",
     "requires_kvm: tests requiring /dev/kvm access",
 ]
 addopts = [
@@ -99,3 +107,9 @@ filterwarnings = [
     "ignore::PendingDeprecationWarning",
     "ignore::UserWarning",
 ]
+
+[tool.coverage.run]
+omit = [
+    "src/clonebox/container.py",
+    "src/clonebox/cli.py",
+]

{clonebox-0.1.18 → clonebox-0.1.20}/src/clonebox/__init__.py

@@ -5,7 +5,7 @@ Selectively clone applications, paths and services to a new virtual machine
 with bind mounts instead of full disk cloning.
 """
 
-__version__ = "0.1.13"
+__version__ = "0.1.18"
 __author__ = "CloneBox Team"
 
 from clonebox.cloner import SelectiveVMCloner

{clonebox-0.1.18 → clonebox-0.1.20}/src/clonebox/cli.py

@@ -22,7 +22,10 @@ from rich.table import Table
 
 from clonebox import __version__
 from clonebox.cloner import SelectiveVMCloner, VMConfig
+from clonebox.container import ContainerCloner
 from clonebox.detector import SystemDetector
+from clonebox.models import ContainerConfig
+from clonebox.profiles import merge_with_profile
 
 # Custom questionary style
 custom_style = Style(
@@ -234,9 +237,22 @@ def run_vm_diagnostics(
         if domifaddr.stdout.strip():
             console.print(f"[dim]{domifaddr.stdout.strip()}[/]")
         else:
-            console.print("[yellow]⚠️  No interface address detected yet[/]")
+            console.print("[yellow]⚠️  No interface address detected via virsh domifaddr[/]")
             if verbose and domifaddr.stderr.strip():
                 console.print(f"[dim]{domifaddr.stderr.strip()}[/]")
+            # Fallback: try to get IP via QEMU Guest Agent (useful for slirp/user networking)
+            if guest_agent_ready:
+                try:
+                    ip_out = _qga_exec(vm_name, conn_uri, "ip -4 -o addr show scope global | awk '{print $4}'", timeout=5)
+                    if ip_out and ip_out.strip():
+                        console.print(f"[green]IP (via QGA): {ip_out.strip()}[/]")
+                        result["network"]["qga_ip"] = ip_out.strip()
+                    else:
+                        console.print("[dim]IP: not available via QGA[/]")
+                except Exception as e:
+                    console.print(f"[dim]IP: QGA query failed ({e})[/]")
+            else:
+                console.print("[dim]IP: QEMU Guest Agent not connected[/]")
     except Exception as e:
         result["network"] = {"error": str(e)}
         console.print(f"[yellow]⚠️  Cannot get IP: {e}[/]")
@@ -703,7 +719,6 @@ def interactive_mode():
                 console.print("\n[bold]Inside the VM, mount shared folders with:[/]")
                 for idx, (host, guest) in enumerate(paths_mapping.items()):
                     console.print(f"  [cyan]sudo mount -t 9p -o trans=virtio mount{idx} {guest}[/]")
-
     except Exception as e:
         console.print(f"\n[red]❌ Error: {e}[/]")
         raise
@@ -905,15 +920,16 @@ def cmd_delete(args):
             console.print("[yellow]Cancelled.[/]")
             return
 
-    cloner = SelectiveVMCloner(user_session=getattr(args, "user", False))
-    cloner.delete_vm(name, delete_storage=not args.keep_storage, console=console)
-
 
 def cmd_list(args):
     """List all VMs."""
     cloner = SelectiveVMCloner(user_session=getattr(args, "user", False))
     vms = cloner.list_vms()
 
+    if getattr(args, "json", False):
+        print(json.dumps(vms, indent=2))
+        return
+
     if not vms:
         console.print("[dim]No VMs found.[/]")
         return
@@ -932,14 +948,6 @@ def cmd_list(args):
 
 def cmd_container_up(args):
     """Start a container sandbox."""
-    try:
-        from clonebox.container import ContainerCloner
-        from clonebox.models import ContainerConfig
-    except ModuleNotFoundError as e:
-        raise ModuleNotFoundError(
-            "Container features require extra dependencies (e.g. pydantic). Install them to use 'clonebox container'."
-        ) from e
-
     mounts = {}
     for m in getattr(args, "mount", []) or []:
         if ":" not in m:
@@ -959,21 +967,21 @@ def cmd_container_up(args):
     if getattr(args, "name", None):
         cfg_kwargs["name"] = args.name
 
+    profile_name = getattr(args, "profile", None)
+    if profile_name:
+        merged = merge_with_profile({"container": cfg_kwargs}, profile_name)
+        if isinstance(merged, dict) and isinstance(merged.get("container"), dict):
+            cfg_kwargs = merged["container"]
+
     cfg = ContainerConfig(**cfg_kwargs)
 
     cloner = ContainerCloner(engine=cfg.engine)
-    cloner.up(cfg, detach=getattr(args, "detach", False))
+    detach = getattr(args, "detach", False)
+    cloner.up(cfg, detach=detach, remove=not detach)
 
 
 def cmd_container_ps(args):
     """List containers."""
-    try:
-        from clonebox.container import ContainerCloner
-    except ModuleNotFoundError as e:
-        raise ModuleNotFoundError(
-            "Container features require extra dependencies (e.g. pydantic). Install them to use 'clonebox container'."
-        ) from e
-
     cloner = ContainerCloner(engine=getattr(args, "engine", "auto"))
     items = cloner.ps(all=getattr(args, "all", False))
 
@@ -1004,44 +1012,36 @@ def cmd_container_ps(args):
 
 def cmd_container_stop(args):
     """Stop a container."""
-    try:
-        from clonebox.container import ContainerCloner
-    except ModuleNotFoundError as e:
-        raise ModuleNotFoundError(
-            "Container features require extra dependencies (e.g. pydantic). Install them to use 'clonebox container'."
-        ) from e
-
     cloner = ContainerCloner(engine=getattr(args, "engine", "auto"))
     cloner.stop(args.name)
 
 
 def cmd_container_rm(args):
     """Remove a container."""
-    try:
-        from clonebox.container import ContainerCloner
-    except ModuleNotFoundError as e:
-        raise ModuleNotFoundError(
-            "Container features require extra dependencies (e.g. pydantic). Install them to use 'clonebox container'."
-        ) from e
-
     cloner = ContainerCloner(engine=getattr(args, "engine", "auto"))
     cloner.rm(args.name, force=getattr(args, "force", False))
 
 
 def cmd_container_down(args):
     """Stop and remove a container."""
-    try:
-        from clonebox.container import ContainerCloner
-    except ModuleNotFoundError as e:
-        raise ModuleNotFoundError(
-            "Container features require extra dependencies (e.g. pydantic). Install them to use 'clonebox container'."
-        ) from e
-
     cloner = ContainerCloner(engine=getattr(args, "engine", "auto"))
     cloner.stop(args.name)
     cloner.rm(args.name, force=True)
 
 
+def cmd_dashboard(args):
+    """Run the local CloneBox dashboard."""
+    try:
+        from clonebox.dashboard import run_dashboard
+    except Exception as e:
+        console.print("[red]❌ Dashboard dependencies are not installed.[/]")
+        console.print("[dim]Install with: pip install 'clonebox[dashboard]'[/]")
+        console.print(f"[dim]{e}[/]")
+        return
+
+    run_dashboard(port=getattr(args, "port", 8080))
+
+
 def cmd_diagnose(args):
     """Run detailed VM diagnostics (standalone)."""
     name = args.name
@@ -1521,7 +1521,23 @@ def cmd_test(args):
                             if '192.168' in line or '10.0' in line:
                                 console.print(f"   IP: {line.split()[-1]}")
                 else:
-                    console.print("[yellow]⚠️  No IP address detected[/]")
+                    console.print("[yellow]⚠️  No IP address detected via virsh domifaddr[/]")
+                    # Fallback: try to get IP via QEMU Guest Agent (useful for slirp/user networking)
+                    try:
+                        from .cli import _qga_ping, _qga_exec
+                    except ImportError:
+                        from clonebox.cli import _qga_ping, _qga_exec
+                    if _qga_ping(vm_name, conn_uri):
+                        try:
+                            ip_out = _qga_exec(vm_name, conn_uri, "ip -4 -o addr show scope global | awk '{print $4}'", timeout=5)
+                            if ip_out and ip_out.strip():
+                                console.print(f"[green]✅ VM has network access (IP via QGA: {ip_out.strip()})[/]")
+                            else:
+                                console.print("[yellow]⚠️  IP not available via QGA[/]")
+                        except Exception as e:
+                            console.print(f"[yellow]⚠️  Could not get IP via QGA ({e})[/]")
+                    else:
+                        console.print("[dim]IP: QEMU Guest Agent not connected[/]")
             except:
                 console.print("[yellow]⚠️  Could not check network[/]")
         else:
@@ -1582,34 +1598,13 @@ def cmd_test(args):
         if all_paths:
             for idx, (host_path, guest_path) in enumerate(all_paths.items()):
                 try:
-                    result = subprocess.run(
-                        ["virsh", "--connect", conn_uri, "qemu-agent-command", vm_name,
-                         f'{{"execute":"guest-exec","arguments":{{"path":"test","arg":["-d","{guest_path}"],"capture-output":true}}}}'],
-                        capture_output=True, text=True, timeout=10
-                    )
-                    if result.returncode == 0:
-                        try:
-                            response = json.loads(result.stdout)
-                            if "return" in response:
-                                pid = response["return"]["pid"]
-                                result2 = subprocess.run(
-                                    ["virsh", "--connect", conn_uri, "qemu-agent-command", vm_name,
-                                     f'{{"execute":"guest-exec-status","arguments":{"pid":{pid}}}}'],
-                                    capture_output=True, text=True, timeout=10
-                                )
-                                if result2.returncode == 0:
-                                    resp2 = json.loads(result2.stdout)
-                                    if "return" in resp2 and resp2["return"]["exited"]:
-                                        exit_code = resp2["return"]["exitcode"]
-                                        if exit_code == 0:
-                                            console.print(f"[green]✅ {guest_path}[/]")
-                                        else:
-                                            console.print(f"[red]❌ {guest_path} (not accessible)[/]")
-                                        continue
-                        except:
-                            pass
-                    console.print(f"[yellow]⚠️  {guest_path} (unknown)[/]")
-                except:
+                    # Use the same QGA helper as diagnose/status
+                    is_accessible = _qga_exec(vm_name, conn_uri, f"test -d {guest_path} && echo yes || echo no", timeout=5)
+                    if is_accessible == "yes":
+                        console.print(f"[green]✅ {guest_path}[/]")
+                    else:
+                        console.print(f"[red]❌ {guest_path} (not accessible)[/]")
+                except Exception:
                     console.print(f"[yellow]⚠️  {guest_path} (could not check)[/]")
         else:
             console.print("[dim]No mount points configured[/]")
@@ -1717,8 +1712,18 @@ def generate_clonebox_yaml(
     """Generate YAML config from system snapshot."""
     sys_info = detector.get_system_info()
 
-    # Collect services
-    services = [s.name for s in snapshot.running_services]
+    # Services that should NOT be cloned to VM (host-specific)
+    VM_EXCLUDED_SERVICES = {
+        "libvirtd", "virtlogd", "libvirt-guests", "qemu-guest-agent",
+        "bluetooth", "bluez", "upower", "thermald", "tlp", "power-profiles-daemon",
+        "gdm", "gdm3", "sddm", "lightdm",
+        "snap.cups.cups-browsed", "snap.cups.cupsd",
+        "ModemManager", "wpa_supplicant",
+        "accounts-daemon", "colord", "switcheroo-control",
+    }
+
+    # Collect services (excluding host-specific ones)
+    services = [s.name for s in snapshot.running_services if s.name not in VM_EXCLUDED_SERVICES]
     if deduplicate:
         services = deduplicate_list(services)
 
@@ -1782,6 +1787,21 @@ def generate_clonebox_yaml(
             guest_path = f"/home/ubuntu/{rel_path}"
             app_data_mapping[host_path] = guest_path
 
+    post_commands = []
+
+    chrome_profile = home_dir / ".config" / "google-chrome"
+    if chrome_profile.exists():
+        host_path = str(chrome_profile)
+        if host_path not in paths_mapping and host_path not in app_data_mapping:
+            app_data_mapping[host_path] = "/home/ubuntu/.config/google-chrome"
+
+        post_commands.append(
+            "command -v google-chrome >/dev/null 2>&1 || ("
+            "curl -fsSL -o /tmp/google-chrome.deb https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb && "
+            "apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y /tmp/google-chrome.deb"
+            ")"
+        )
+
     # Determine VM name
     if not vm_name:
         if target_path:
@@ -1815,6 +1835,34 @@ def generate_clonebox_yaml(
     if deduplicate:
         all_snap_packages = deduplicate_list(all_snap_packages)
 
+    if chrome_profile.exists() and "google-chrome" not in [d.get("app", "") for d in app_data_dirs]:
+        if "chromium" not in all_snap_packages:
+            all_snap_packages.append("chromium")
+
+    if "pycharm-community" in all_snap_packages:
+        remapped = {}
+        for host_path, guest_path in app_data_mapping.items():
+            if guest_path == "/home/ubuntu/.config/JetBrains":
+                remapped[host_path] = "/home/ubuntu/snap/pycharm-community/common/.config/JetBrains"
+            elif guest_path == "/home/ubuntu/.local/share/JetBrains":
+                remapped[host_path] = "/home/ubuntu/snap/pycharm-community/common/.local/share/JetBrains"
+            elif guest_path == "/home/ubuntu/.cache/JetBrains":
+                remapped[host_path] = "/home/ubuntu/snap/pycharm-community/common/.cache/JetBrains"
+            else:
+                remapped[host_path] = guest_path
+        app_data_mapping = remapped
+
+    if "firefox" in all_apt_packages:
+        remapped = {}
+        for host_path, guest_path in app_data_mapping.items():
+            if guest_path == "/home/ubuntu/.mozilla/firefox":
+                remapped[host_path] = "/home/ubuntu/snap/firefox/common/.mozilla/firefox"
+            elif guest_path == "/home/ubuntu/.cache/mozilla/firefox":
+                remapped[host_path] = "/home/ubuntu/snap/firefox/common/.cache/mozilla/firefox"
+            else:
+                remapped[host_path] = guest_path
+        app_data_mapping = remapped
+
     # Build config
     config = {
         "version": "1",
@@ -1832,7 +1880,7 @@ def generate_clonebox_yaml(
         "services": services,
         "packages": all_apt_packages,
         "snap_packages": all_snap_packages,
-        "post_commands": [],  # User can add custom commands to run after setup
+        "post_commands": post_commands,
         "paths": paths_mapping,
         "app_data_paths": app_data_mapping,  # App-specific config/data directories
         "detected": {
@@ -2057,6 +2105,32 @@ def cmd_clone(args):
         base_image=getattr(args, "base_image", None),
     )
 
+    profile_name = getattr(args, "profile", None)
+    if profile_name:
+        merged_config = merge_with_profile(yaml.safe_load(yaml_content), profile_name)
+        if isinstance(merged_config, dict):
+            vm_section = merged_config.get("vm")
+            if isinstance(vm_section, dict):
+                vm_packages = vm_section.pop("packages", None)
+                if isinstance(vm_packages, list):
+                    packages = merged_config.get("packages")
+                    if not isinstance(packages, list):
+                        packages = []
+                    for p in vm_packages:
+                        if p not in packages:
+                            packages.append(p)
+                    merged_config["packages"] = packages
+
+            if "container" in merged_config:
+                merged_config.pop("container", None)
+
+            yaml_content = yaml.dump(
+                merged_config,
+                default_flow_style=False,
+                allow_unicode=True,
+                sort_keys=False,
+            )
+
     # Dry run - show what would be created and exit
     if dry_run:
         config = yaml.safe_load(yaml_content)
@@ -2337,6 +2411,7 @@ def main():
         action="store_true",
         help="Use user session (qemu:///session) - no root required",
     )
+    list_parser.add_argument("--json", action="store_true", help="Output JSON")
     list_parser.set_defaults(func=cmd_list)
 
     # Container command
@@ -2347,13 +2422,24 @@ def main():
         default="auto",
         help="Container engine: auto (default), podman, docker",
     )
+    container_parser.set_defaults(func=lambda args, p=container_parser: p.print_help())
     container_sub = container_parser.add_subparsers(dest="container_command", help="Container commands")
 
     container_up = container_sub.add_parser("up", help="Start container")
+    container_up.add_argument(
+        "--engine",
+        choices=["auto", "podman", "docker"],
+        default=argparse.SUPPRESS,
+        help="Container engine: auto (default), podman, docker",
+    )
     container_up.add_argument("path", nargs="?", default=".", help="Workspace path")
     container_up.add_argument("--name", help="Container name")
     container_up.add_argument("--image", default="ubuntu:22.04", help="Container image")
     container_up.add_argument("--detach", action="store_true", help="Run container in background")
+    container_up.add_argument(
+        "--profile",
+        help="Profile name (loads ~/.clonebox.d/<name>.yaml, .clonebox.d/<name>.yaml, or built-in templates)",
+    )
     container_up.add_argument(
         "--mount",
         action="append",
@@ -2380,23 +2466,52 @@ def main():
     container_up.set_defaults(func=cmd_container_up)
 
     container_ps = container_sub.add_parser("ps", aliases=["ls"], help="List containers")
+    container_ps.add_argument(
+        "--engine",
+        choices=["auto", "podman", "docker"],
+        default=argparse.SUPPRESS,
+        help="Container engine: auto (default), podman, docker",
+    )
     container_ps.add_argument("-a", "--all", action="store_true", help="Show all containers")
     container_ps.add_argument("--json", action="store_true", help="Output JSON")
     container_ps.set_defaults(func=cmd_container_ps)
 
     container_stop = container_sub.add_parser("stop", help="Stop container")
+    container_stop.add_argument(
+        "--engine",
+        choices=["auto", "podman", "docker"],
+        default=argparse.SUPPRESS,
+        help="Container engine: auto (default), podman, docker",
+    )
     container_stop.add_argument("name", help="Container name")
     container_stop.set_defaults(func=cmd_container_stop)
 
     container_rm = container_sub.add_parser("rm", help="Remove container")
+    container_rm.add_argument(
+        "--engine",
+        choices=["auto", "podman", "docker"],
+        default=argparse.SUPPRESS,
+        help="Container engine: auto (default), podman, docker",
+    )
     container_rm.add_argument("name", help="Container name")
     container_rm.add_argument("-f", "--force", action="store_true", help="Force remove")
     container_rm.set_defaults(func=cmd_container_rm)
 
     container_down = container_sub.add_parser("down", help="Stop and remove container")
+    container_down.add_argument(
+        "--engine",
+        choices=["auto", "podman", "docker"],
+        default=argparse.SUPPRESS,
+        help="Container engine: auto (default), podman, docker",
+    )
     container_down.add_argument("name", help="Container name")
     container_down.set_defaults(func=cmd_container_down)
 
+    # Dashboard command
+    dashboard_parser = subparsers.add_parser("dashboard", help="Run local dashboard")
+    dashboard_parser.add_argument("--port", type=int, default=8080, help="Port to bind (default: 8080)")
+    dashboard_parser.set_defaults(func=cmd_dashboard)
+
     # Detect command
     detect_parser = subparsers.add_parser("detect", help="Detect system state")
     detect_parser.add_argument("--json", action="store_true", help="Output as JSON")
@@ -2436,6 +2551,10 @@ def main():
         "--base-image",
         help="Path to a bootable qcow2 image to use as a base disk",
     )
+    clone_parser.add_argument(
+        "--profile",
+        help="Profile name (loads ~/.clonebox.d/<name>.yaml, .clonebox.d/<name>.yaml, or built-in templates)",
+    )
     clone_parser.add_argument(
         "--replace",
         action="store_true",
@@ -2462,6 +2581,9 @@ def main():
     status_parser.add_argument(
         "--health", "-H", action="store_true", help="Run full health check"
     )
+    status_parser.add_argument(
+        "--verbose", "-v", action="store_true", help="Show detailed diagnostics (QGA, stderr, etc.)"
+    )
     status_parser.set_defaults(func=cmd_status)
 
     # Diagnose command - detailed diagnostics from workstation

{clonebox-0.1.18 → clonebox-0.1.20}/src/clonebox/cloner.py

@@ -663,7 +663,8 @@ fi
         # Generate mount commands and fstab entries for 9p filesystems
         mount_commands = []
         fstab_entries = []
-        for idx, (host_path, guest_path) in enumerate(config.paths.items()):
+        all_paths = dict(config.paths) if config.paths else {}
+        for idx, (host_path, guest_path) in enumerate(all_paths.items()):
             if Path(host_path).exists():
                 tag = f"mount{idx}"
                 # Use uid=1000,gid=1000 to give ubuntu user access to mounts
@@ -695,6 +696,8 @@ fi
         runcmd_lines = []
 
         runcmd_lines.append("  - systemctl enable --now qemu-guest-agent || true")
+        runcmd_lines.append("  - systemctl enable --now snapd || true")
+        runcmd_lines.append("  - timeout 300 snap wait system seed.loaded || true")
         
         # Add service enablement
         for svc in config.services:
@@ -759,7 +762,7 @@ users:
     sudo: ALL=(ALL) NOPASSWD:ALL
     shell: /bin/bash
     lock_passwd: false
-    groups: sudo,adm,dialout,cdrom,floppy,audio,dip,video,plugdev,netdev
+    groups: sudo,adm,dialout,cdrom,floppy,audio,dip,video,plugdev,netdev,docker
     plain_text_passwd: {config.password}
 
 # Allow password authentication