clonebox 1.1.15__py3-none-any.whl → 1.1.16__py3-none-any.whl

clonebox/cli.py

@@ -1930,7 +1930,10 @@ def cmd_test(args):
                         if is_accessible == "yes":
                             console.print(f"[green]✅ {guest_path} (mount)[/]")
                         else:
-                            console.print(f"[red]❌ {guest_path} (mount inaccessible)[/]")
+                            if cloud_init_running:
+                                console.print(f"[yellow]⏳ {guest_path} (mount pending)[/]")
+                            else:
+                                console.print(f"[red]❌ {guest_path} (mount inaccessible)[/]")
                     except Exception:
                         console.print(f"[yellow]⚠️  {guest_path} (could not check)[/]")
                 
@@ -1943,7 +1946,10 @@ def cmd_test(args):
                         if is_accessible == "yes":
                             console.print(f"[green]✅ {guest_path} (copied)[/]")
                         else:
-                            console.print(f"[red]❌ {guest_path} (copy missing)[/]")
+                            if cloud_init_running:
+                                console.print(f"[yellow]⏳ {guest_path} (copy pending)[/]")
+                            else:
+                                console.print(f"[red]❌ {guest_path} (copy missing)[/]")
                     except Exception:
                         console.print(f"[yellow]⚠️  {guest_path} (could not check)[/]")
         else:
@@ -2349,6 +2355,68 @@ def load_clonebox_config(path: Path) -> dict:
     return config
 
 
+def _exec_in_vm_qga(vm_name: str, conn_uri: str, command: str) -> Optional[str]:
+    """Internal helper to execute command via QGA and get output."""
+    import subprocess
+    import json
+    import base64
+    import time
+    
+    try:
+        # 1. Start execution
+        cmd_json = {
+            "execute": "guest-exec",
+            "arguments": {
+                "path": "/bin/sh",
+                "arg": ["-c", command],
+                "capture-output": True
+            }
+        }
+        
+        result = subprocess.run(
+            ["virsh", "--connect", conn_uri, "qemu-agent-command", vm_name, json.dumps(cmd_json)],
+            capture_output=True,
+            text=True,
+            timeout=5
+        )
+        
+        if result.returncode != 0:
+            return None
+            
+        resp = json.loads(result.stdout)
+        pid = resp.get("return", {}).get("pid")
+        if not pid:
+            return None
+            
+        # 2. Wait and get status (quick check)
+        status_json = {"execute": "guest-exec-status", "arguments": {"pid": pid}}
+        
+        for _ in range(3): # Try a few times
+            status_result = subprocess.run(
+                ["virsh", "--connect", conn_uri, "qemu-agent-command", vm_name, json.dumps(status_json)],
+                capture_output=True,
+                text=True,
+                timeout=5
+            )
+            
+            if status_result.returncode != 0:
+                continue
+                
+            status_resp = json.loads(status_result.stdout)
+            ret = status_resp.get("return", {})
+            
+            if ret.get("exited"):
+                if "out-data" in ret:
+                    return base64.b64decode(ret["out-data"]).decode().strip()
+                return ""
+            
+            time.sleep(0.5)
+            
+        return None
+    except Exception:
+        return None
+
+
 def monitor_cloud_init_status(vm_name: str, user_session: bool = False, timeout: int = 900):
     """Monitor cloud-init status in VM and show progress."""
     import subprocess
@@ -2358,6 +2426,8 @@ def monitor_cloud_init_status(vm_name: str, user_session: bool = False, timeout:
     start_time = time.time()
     shutdown_count = 0  # Count consecutive shutdown detections
     restart_detected = False
+    last_phases = []
+    seen_lines = set()
 
     with Progress(
         SpinnerColumn(),
@@ -2390,7 +2460,7 @@ def monitor_cloud_init_status(vm_name: str, user_session: bool = False, timeout:
                         restart_detected = True
                         progress.update(
                             task,
-                            description="[yellow]⟳ VM restarting after package installation...",
+                            description="[yellow]⟳ VM restarting after installation...",
                         )
                     time.sleep(3)
                     continue
@@ -2403,7 +2473,7 @@ def monitor_cloud_init_status(vm_name: str, user_session: bool = False, timeout:
                 if restart_detected and "running" in vm_state and shutdown_count >= 3:
                     # VM restarted successfully - GUI should be ready
                     progress.update(
-                        task, description=f"[green]✓ GUI ready! Total time: {minutes}m {seconds}s"
+                        task, description=f"[green]✓ VM ready! Total time: {minutes}m {seconds}s"
                     )
                     time.sleep(2)
                     break
@@ -2420,15 +2490,44 @@ def monitor_cloud_init_status(vm_name: str, user_session: bool = False, timeout:
                 else:
                     remaining = "almost done"
 
+                # Try to get real-time progress via QGA
+                # Get last 3 unique progress lines
+                raw_info = _exec_in_vm_qga(
+                    vm_name, 
+                    conn_uri, 
+                    "grep -E '\\[[0-9]/[0-9]\\]|→' /var/log/cloud-init-output.log 2>/dev/null | tail -n 5"
+                )
+                
+                if raw_info:
+                    lines = [l.strip() for l in raw_info.strip().split('\n') if l.strip()]
+                    for line in lines:
+                        if line not in seen_lines:
+                            # If it's a new phase line, we can log it to console above the progress bar
+                            if "[" in line and "/9]" in line:
+                                console.print(f"[dim]  {line}[/]")
+                            seen_lines.add(line)
+                            last_phases.append(line)
+                    
+                    # Keep only last 2 for the progress bar description
+                    if len(last_phases) > 2:
+                        last_phases = last_phases[-2:]
+
                 if restart_detected:
                     progress.update(
                         task,
-                        description=f"[cyan]Starting GUI... ({minutes}m {seconds}s, {remaining})",
+                        description=f"[cyan]Finalizing setup... ({minutes}m {seconds}s, {remaining})",
+                    )
+                elif last_phases:
+                    # Show the actual phase from logs
+                    current_status = last_phases[-1]
+                    progress.update(
+                        task,
+                        description=f"[cyan]{current_status} ({minutes}m {seconds}s, {remaining})",
                     )
                 else:
                     progress.update(
                         task,
-                        description=f"[cyan]Installing desktop packages... ({minutes}m {seconds}s, {remaining})",
+                        description=f"[cyan]Installing packages... ({minutes}m {seconds}s, {remaining})",
                     )
 
             except (subprocess.TimeoutExpired, Exception) as e:

clonebox/cloner.py

@@ -1053,7 +1053,11 @@ if [ -n "$(echo "$COPIED_PATHS" | tr -d '[:space:]')" ]; then
     while IFS= read -r p; do
         [ -z "$p" ] && continue
         if [ -d "$p" ]; then
-            ok "$p copied"
+            if [ "$(ls -A "$p" 2>/dev/null | wc -l)" -gt 0 ]; then
+                ok "$p copied"
+            else
+                ok "$p copied (empty)"
+            fi
         else
             fail "$p missing (copy)"
         fi
@@ -1118,6 +1122,12 @@ fi
         mount_checks = []
         for idx, (host_path, guest_path) in enumerate(config.paths.items()):
             mount_checks.append(f'check_mount "{guest_path}" "mount{idx}"')
+        
+        # Add copied paths checks
+        copy_paths = config.copy_paths or config.app_data_paths
+        if copy_paths:
+            for idx, (host_path, guest_path) in enumerate(copy_paths.items()):
+                mount_checks.append(f'check_copy_path "{guest_path}"')
 
         apt_checks_str = "\n".join(apt_checks) if apt_checks else "echo 'No apt packages to check'"
         snap_checks_str = (
@@ -1224,6 +1234,30 @@ check_mount() {{
         log "[INFO] Mount point '$path' does not exist yet"
         return 0
     fi
+}
+
+check_copy_path() {
+    local path="$1"
+    if [ -d "$path" ]; then
+        if [ "$(ls -A "$path" 2>/dev/null | wc -l)" -gt 0 ]; then
+            log "[PASS] Path '$path' exists and contains data"
+            ((PASSED++))
+            return 0
+        else
+            log "[WARN] Path '$path' exists but is EMPTY"
+            ((WARNINGS++))
+            return 1
+        fi
+    else
+        if [ $SETUP_IN_PROGRESS -eq 1 ]; then
+            log "[INFO] Path '$path' not imported yet"
+            return 0
+        else
+            log "[FAIL] Path '$path' MISSING"
+            ((FAILED++))
+            return 1
+        fi
+    fi
 }}
 
 check_gui() {{
@@ -1408,37 +1442,38 @@ fi
 
         # Handle copy_paths (import then copy)
         all_copy_paths = dict(config.copy_paths) if config.copy_paths else {}
-        for idx, (host_path, guest_path) in enumerate(all_copy_paths.items()):
-            if Path(host_path).exists():
-                tag = f"import{idx}"
-                temp_mount_point = f"/mnt/import{idx}"
-                # Use regular mount options
-                mount_opts = "trans=virtio,version=9p2000.L,mmap,uid=1000,gid=1000"
-
-                # 1. Create temp mount point
-                mount_commands.append(f"  - mkdir -p {temp_mount_point}")
-                
-                # 2. Mount the 9p share
-                mount_commands.append(f"  - mount -t 9p -o {mount_opts} {tag} {temp_mount_point} || true")
-                
-                # 3. Ensure target directory exists and permissions are prepared
-                if str(guest_path).startswith("/home/ubuntu/"):
-                    mount_commands.append(f"  - mkdir -p {guest_path}")
-                    mount_commands.append(f"  - chown 1000:1000 {guest_path}")
-                else:
-                    mount_commands.append(f"  - mkdir -p {guest_path}")
+        existing_copy_paths = {h: g for h, g in all_copy_paths.items() if Path(h).exists()}
+        
+        for idx, (host_path, guest_path) in enumerate(existing_copy_paths.items()):
+            tag = f"import{idx}"
+            temp_mount_point = f"/mnt/import{idx}"
+            # Use regular mount options
+            mount_opts = "trans=virtio,version=9p2000.L,mmap,uid=1000,gid=1000"
+
+            # 1. Create temp mount point
+            mount_commands.append(f"  - mkdir -p {temp_mount_point}")
+            
+            # 2. Mount the 9p share
+            mount_commands.append(f"  - mount -t 9p -o {mount_opts} {tag} {temp_mount_point} || true")
+            
+            # 3. Ensure target directory exists and permissions are prepared
+            if str(guest_path).startswith("/home/ubuntu/"):
+                mount_commands.append(f"  - mkdir -p {guest_path}")
+                mount_commands.append(f"  - chown 1000:1000 {guest_path}")
+            else:
+                mount_commands.append(f"  - mkdir -p {guest_path}")
 
-                # 4. Copy contents (cp -rT to copy contents of source to target)
-                # We use || true to ensure boot continues even if copy fails
-                mount_commands.append(f"  - echo 'Importing {host_path} to {guest_path}...'")
-                mount_commands.append(f"  - cp -rT {temp_mount_point} {guest_path} || true")
-                
-                # 5. Fix ownership recursively
-                mount_commands.append(f"  - chown -R 1000:1000 {guest_path}")
+            # 4. Copy contents (cp -rT to copy contents of source to target)
+            # We use || true to ensure boot continues even if copy fails
+            mount_commands.append(f"  - echo 'Importing {host_path} to {guest_path}...'")
+            mount_commands.append(f"  - cp -rT {temp_mount_point} {guest_path} || true")
+            
+            # 5. Fix ownership recursively
+            mount_commands.append(f"  - chown -R 1000:1000 {guest_path}")
 
-                # 6. Unmount and cleanup
-                mount_commands.append(f"  - umount {temp_mount_point} || true")
-                mount_commands.append(f"  - rmdir {temp_mount_point} || true")
+            # 6. Unmount and cleanup
+            mount_commands.append(f"  - umount {temp_mount_point} || true")
+            mount_commands.append(f"  - rmdir {temp_mount_point} || true")
 
         # User-data
         # Add desktop environment if GUI is enabled
@@ -1457,31 +1492,82 @@ fi
         # Build runcmd - services, mounts, snaps, post_commands
         runcmd_lines = []
 
+        # Add detailed logging header
+        runcmd_lines.append("  - echo '═══════════════════════════════════════════════════════════'")
+        runcmd_lines.append("  - echo '           CloneBox VM Installation Progress'")
+        runcmd_lines.append("  - echo '═══════════════════════════════════════════════════════════'")
+        runcmd_lines.append("  - echo ''")
+        
+        # Phase 1: APT Packages
+        if all_packages:
+            runcmd_lines.append(f"  - echo '[1/9] 📦 Installing APT packages ({len(all_packages)} total)...'")
+            runcmd_lines.append("  - export DEBIAN_FRONTEND=noninteractive")
+            runcmd_lines.append("  - apt-get update")
+            for i, pkg in enumerate(all_packages, 1):
+                runcmd_lines.append(f"  - echo '  → [{i}/{len(all_packages)}] Installing {pkg}...'")
+                runcmd_lines.append(f"  - apt-get install -y {pkg} || echo '    ⚠️  Failed to install {pkg}'")
+            runcmd_lines.append("  - echo '  ✓ APT packages installed'")
+            runcmd_lines.append("  - echo ''")
+        else:
+            runcmd_lines.append("  - echo '[1/9] 📦 No APT packages to install'")
+            runcmd_lines.append("  - echo ''")
+
+        # Phase 2: Core services
+        runcmd_lines.append("  - echo '[2/9] 🔧 Enabling core services...'")
+        runcmd_lines.append("  - echo '  → qemu-guest-agent'")
         runcmd_lines.append("  - systemctl enable --now qemu-guest-agent || true")
+        runcmd_lines.append("  - echo '  → snapd'")
         runcmd_lines.append("  - systemctl enable --now snapd || true")
+        runcmd_lines.append("  - echo '  → Waiting for snap system seed...'")
         runcmd_lines.append("  - timeout 300 snap wait system seed.loaded || true")
+        runcmd_lines.append("  - echo '  ✓ Core services enabled'")
+        runcmd_lines.append("  - echo ''")
 
-        # Add service enablement
-        for svc in config.services:
+        # Phase 3: User services
+        runcmd_lines.append(f"  - echo '[3/9] 🔧 Enabling user services ({len(config.services)} total)...'")
+        for i, svc in enumerate(config.services, 1):
+            runcmd_lines.append(f"  - echo '  → [{i}/{len(config.services)}] {svc}'")
             runcmd_lines.append(f"  - systemctl enable --now {svc} || true")
+        runcmd_lines.append("  - echo '  ✓ User services enabled'")
+        runcmd_lines.append("  - echo ''")
 
-        # Add fstab entries for persistent mounts after reboot
+        # Phase 4: Filesystem mounts
+        runcmd_lines.append(f"  - echo '[4/9] 📁 Mounting shared directories ({len(fstab_entries)} mounts)...'")
         if fstab_entries:
             runcmd_lines.append(
                 "  - grep -q '^# CloneBox 9p mounts' /etc/fstab || echo '# CloneBox 9p mounts' >> /etc/fstab"
             )
-            for entry in fstab_entries:
+            for i, entry in enumerate(fstab_entries, 1):
+                mount_point = entry.split()[1] if len(entry.split()) > 1 else entry
+                runcmd_lines.append(f"  - echo '  → [{i}/{len(fstab_entries)}] {mount_point}'")
                 runcmd_lines.append(
                     f"  - grep -qF \"{entry}\" /etc/fstab || echo '{entry}' >> /etc/fstab"
                 )
             runcmd_lines.append("  - mount -a || true")
+        runcmd_lines.append("  - echo '  ✓ Mounts configured'")
+        runcmd_lines.append("  - echo ''")
+
+        # Phase 5: Data Import (copied paths)
+        if existing_copy_paths:
+            runcmd_lines.append(f"  - echo '[5/9] 📥 Importing data ({len(existing_copy_paths)} paths)...'")
+            # Add mounts (immediate, before reboot)
+            import_count = 0
+            for cmd in mount_commands:
+                if "Importing" in cmd:
+                    import_count += 1
+                    runcmd_lines.append(cmd.replace("Importing", f"  → [{import_count}/{len(existing_copy_paths)}] Importing"))
+                else:
+                    runcmd_lines.append(cmd)
+            runcmd_lines.append("  - echo '  ✓ Data import completed'")
+            runcmd_lines.append("  - echo ''")
+        else:
+            runcmd_lines.append("  - echo '[5/9] 📥 No data to import'")
+            runcmd_lines.append("  - echo ''")
 
-        # Add mounts (immediate, before reboot)
-        for cmd in mount_commands:
-            runcmd_lines.append(cmd)
-
-        # Create user directories with correct permissions EARLY to avoid race conditions with GDM
+        # Phase 6: GUI Environment Setup
         if config.gui:
+            runcmd_lines.append("  - echo '[6/9] 🖥️  Setting up GUI environment...'")
+            runcmd_lines.append("  - echo '  → Creating user directories'")
             # Create directories that GNOME services need
             runcmd_lines.extend(
                 [
@@ -1491,41 +1577,56 @@ fi
                     "  - chown -R 1000:1000 /home/ubuntu/.config /home/ubuntu/.cache /home/ubuntu/.local",
                     "  - chmod 700 /home/ubuntu/.config /home/ubuntu/.cache",
                     "  - systemctl set-default graphical.target",
-                    "  - systemctl enable --now gdm3 || systemctl enable --now gdm || true",
-                    "  - systemctl start display-manager || true",
+                    "  - echo '  → Starting display manager'",
                 ]
             )
+            runcmd_lines.append("  - systemctl enable --now gdm3 || systemctl enable --now gdm || true")
+            runcmd_lines.append("  - systemctl start display-manager || true")
+            runcmd_lines.append("  - echo '  ✓ GUI environment ready'")
+            runcmd_lines.append("  - echo ''")
+        else:
+            runcmd_lines.append("  - echo '[6/9] 🖥️  No GUI requested'")
+            runcmd_lines.append("  - echo ''")
 
         runcmd_lines.append("  - chown -R 1000:1000 /home/ubuntu || true")
         runcmd_lines.append("  - chown -R 1000:1000 /home/ubuntu/snap || true")
 
-        # Install snap packages (with retry logic)
+        # Phase 7: Snap packages
         if config.snap_packages:
-            runcmd_lines.append("  - echo 'Installing snap packages...'")
-            for snap_pkg in config.snap_packages:
+            runcmd_lines.append(f"  - echo '[7/9] 📦 Installing snap packages ({len(config.snap_packages)} packages)...'")
+            for i, snap_pkg in enumerate(config.snap_packages, 1):
+                runcmd_lines.append(f"  - echo '  → [{i}/{len(config.snap_packages)}] {snap_pkg}'")
                 # Try classic first, then strict, with retries
                 cmd = (
                     f"for i in 1 2 3; do "
-                    f"snap install {snap_pkg} --classic && break || "
-                    f"snap install {snap_pkg} && break || "
-                    f"sleep 10; "
+                    f"snap install {snap_pkg} --classic && echo '    ✓ {snap_pkg} installed (classic)' && break || "
+                    f"snap install {snap_pkg} && echo '    ✓ {snap_pkg} installed' && break || "
+                    f"echo '    ⟳ Retry $i/3...' && sleep 10; "
                     f"done"
                 )
                 runcmd_lines.append(f"  - {cmd}")
+            runcmd_lines.append("  - echo '  ✓ Snap packages installed'")
+            runcmd_lines.append("  - echo ''")
 
             # Connect snap interfaces for GUI apps (not auto-connected via cloud-init)
-            runcmd_lines.append("  - echo 'Connecting snap interfaces...'")
+            runcmd_lines.append(f"  - echo '  🔌 Connecting snap interfaces...'")
             for snap_pkg in config.snap_packages:
+                runcmd_lines.append(f"  - echo '    → {snap_pkg}'")
                 interfaces = SNAP_INTERFACES.get(snap_pkg, DEFAULT_SNAP_INTERFACES)
                 for iface in interfaces:
                     runcmd_lines.append(
                         f"  - snap connect {snap_pkg}:{iface} :{iface} 2>/dev/null || true"
                     )
-
+            runcmd_lines.append("  - echo '    ✓ Snap interfaces connected'")
             runcmd_lines.append("  - systemctl restart snapd || true")
+            runcmd_lines.append("  - echo ''")
+        else:
+            runcmd_lines.append("  - echo '[7/9] 📦 No snap packages to install'")
+            runcmd_lines.append("  - echo ''")
 
         # Add remaining GUI setup if enabled
         if config.gui:
+            runcmd_lines.append("  - echo '  ⚙️  Creating autostart entries...'")
             # Create autostart entries for GUI apps
             autostart_apps = {
                 "pycharm-community": (
@@ -1577,15 +1678,28 @@ Comment=CloneBox autostart
 
             # Fix ownership of autostart directory
             runcmd_lines.append("  - chown -R 1000:1000 /home/ubuntu/.config/autostart")
+            runcmd_lines.append("  - echo '  ✓ Autostart entries created'")
+            runcmd_lines.append("  - echo ''")
 
-        # Run user-defined post commands
+        # Phase 8: Post commands
         if config.post_commands:
-            runcmd_lines.append("  - echo 'Running post-setup commands...'")
-            for cmd in config.post_commands:
+            runcmd_lines.append(f"  - echo '[8/9] ⚙️  Running post-setup commands ({len(config.post_commands)} commands)...'")
+            for i, cmd in enumerate(config.post_commands, 1):
+                # Truncate long commands for display
+                display_cmd = cmd[:60] + '...' if len(cmd) > 60 else cmd
+                runcmd_lines.append(f"  - echo '  → [{i}/{len(config.post_commands)}] {display_cmd}'")
                 runcmd_lines.append(f"  - {cmd}")
+                runcmd_lines.append(f"  - echo '    ✓ Command {i} completed'")
+            runcmd_lines.append("  - echo '  ✓ Post-setup commands completed'")
+            runcmd_lines.append("  - echo ''")
+        else:
+            runcmd_lines.append("  - echo '[8/9] ⚙️  No post-setup commands'")
+            runcmd_lines.append("  - echo ''")
 
         # Generate health check script
         health_script = self._generate_health_check_script(config)
+        # Phase 9: Health checks and finalization
+        runcmd_lines.append("  - echo '[9/9] 🏥 Running health checks...'")
         runcmd_lines.append(
             f"  - echo '{health_script}' | base64 -d > /usr/local/bin/clonebox-health"
         )
@@ -1593,8 +1707,15 @@ Comment=CloneBox autostart
         runcmd_lines.append(
             "  - /usr/local/bin/clonebox-health >> /var/log/clonebox-health.log 2>&1 || true"
         )
+        runcmd_lines.append("  - echo '  ✓ Health checks completed'")
         runcmd_lines.append("  - echo 'CloneBox VM ready!' > /var/log/clonebox-ready")
-
+        
+        # Final status
+        runcmd_lines.append("  - echo ''")
+        runcmd_lines.append("  - echo '═══════════════════════════════════════════════════════════'")
+        runcmd_lines.append("  - echo '           ✅ CloneBox VM Installation Complete!'")
+        runcmd_lines.append("  - echo '═══════════════════════════════════════════════════════════'")
+        runcmd_lines.append("  - echo ''")
         # Generate boot diagnostic script (self-healing)
         boot_diag_script = self._generate_boot_diagnostic_script(config)
         runcmd_lines.append(
@@ -2349,7 +2470,8 @@ if __name__ == "__main__":
 
         # Add reboot command at the end if GUI is enabled
         if config.gui:
-            runcmd_lines.append("  - echo 'Rebooting in 10 seconds to start GUI...'")
+            runcmd_lines.append("  - echo '🔄 Rebooting in 10 seconds to start GUI...'")
+            runcmd_lines.append("  - echo '   (After reboot, GUI will auto-start)'")
             runcmd_lines.append("  - sleep 10 && reboot")
 
         runcmd_yaml = "\n".join(runcmd_lines) if runcmd_lines else ""
@@ -2397,9 +2519,8 @@ package_update: true
 package_upgrade: false
 {bootcmd_block}
 
-# Install packages (cloud-init waits for completion before runcmd)
-packages:
-{packages_yaml}
+# Install packages moved to runcmd for better logging
+packages: []
 
 # Run after packages are installed
 runcmd:

clonebox/validator.py

@@ -155,6 +155,7 @@ class VMValidator:
         mount_table.add_column("Files", justify="right")
 
         # Validate bind mounts (paths)
+        setup_in_progress = self._setup_in_progress() is True
         for host_path, guest_path in paths.items():
             self.results["mounts"]["total"] += 1
             
@@ -182,6 +183,9 @@ class VMValidator:
                 status_icon = "[red]❌ Inaccessible[/]"
                 self.results["mounts"]["failed"] += 1
                 status = "mounted_but_inaccessible"
+            elif setup_in_progress:
+                status_icon = "[yellow]⏳ Pending[/]"
+                status = "pending"
             else:
                 status_icon = "[red]❌ Not Mounted[/]"
                 self.results["mounts"]["failed"] += 1
@@ -219,6 +223,9 @@ class VMValidator:
                 status_icon = "[green]✅ Copied[/]"
                 self.results["mounts"]["passed"] += 1
                 status = "pass"
+            elif setup_in_progress:
+                status_icon = "[yellow]⏳ Pending[/]"
+                status = "pending"
             else:
                 status_icon = "[red]❌ Missing[/]"
                 self.results["mounts"]["failed"] += 1
@@ -255,6 +262,8 @@ class VMValidator:
         pkg_table.add_column("Status", justify="center")
         pkg_table.add_column("Version", style="dim")
 
+        setup_in_progress = self._setup_in_progress() is True
+
         for package in packages:
             self.results["packages"]["total"] += 1
 
@@ -269,11 +278,17 @@ class VMValidator:
                     {"package": package, "installed": True, "version": version}
                 )
             else:
-                pkg_table.add_row(package, "[red]❌ Missing[/]", "")
-                self.results["packages"]["failed"] += 1
-                self.results["packages"]["details"].append(
-                    {"package": package, "installed": False, "version": None}
-                )
+                if setup_in_progress:
+                    pkg_table.add_row(package, "[yellow]⏳ Pending[/]", "")
+                    self.results["packages"]["details"].append(
+                        {"package": package, "installed": False, "version": None, "pending": True}
+                    )
+                else:
+                    pkg_table.add_row(package, "[red]❌ Missing[/]", "")
+                    self.results["packages"]["failed"] += 1
+                    self.results["packages"]["details"].append(
+                        {"package": package, "installed": False, "version": None}
+                    )
 
         self.console.print(pkg_table)
         self.console.print(
@@ -419,14 +434,14 @@ class VMValidator:
             else:
                 pid_value = "—"
 
-            enabled_icon = "[green]✅[/]" if is_enabled else "[yellow]⚠️[/]"
-            running_icon = "[green]✅[/]" if is_running else "[red]❌[/]"
+            enabled_icon = "[green]✅[/]" if is_enabled else ("[yellow]⏳[/]" if setup_in_progress else "[yellow]⚠️[/]")
+            running_icon = "[green]✅[/]" if is_running else ("[yellow]⏳[/]" if setup_in_progress else "[red]❌[/]")
 
             svc_table.add_row(service, enabled_icon, running_icon, pid_value, "")
 
             if is_enabled and is_running:
                 self.results["services"]["passed"] += 1
-            else:
+            elif not setup_in_progress:
                 self.results["services"]["failed"] += 1
 
             self.results["services"]["details"].append(
@@ -994,18 +1009,18 @@ class VMValidator:
             return self.results
 
         ci_status = self._exec_in_vm("cloud-init status --long 2>/dev/null || cloud-init status 2>/dev/null || true", timeout=20)
+        setup_in_progress = False
         if ci_status:
             ci_lower = ci_status.lower()
             if "running" in ci_lower:
-                self.console.print("[yellow]⏳ Cloud-init still running - skipping deep validation for now[/]")
-                self.results["overall"] = "cloud_init_running"
-                return self.results
+                self.console.print("[yellow]⏳ Cloud-init still running - deep validation will show pending states[/]")
+                setup_in_progress = True
 
         ready_msg = self._exec_in_vm(
             "cat /var/log/clonebox-ready 2>/dev/null || true",
             timeout=10,
         )
-        if not (ready_msg and "clonebox vm ready" in ready_msg.lower()):
+        if not setup_in_progress and not (ready_msg and "clonebox vm ready" in ready_msg.lower()):
             self.console.print(
                 "[yellow]⚠️  CloneBox ready marker not found - provisioning may not have completed[/]"
             )

{clonebox-1.1.15.dist-info → clonebox-1.1.16.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: clonebox
-Version: 1.1.15
+Version: 1.1.16
 Summary: Clone your workstation environment to an isolated VM with selective apps, paths and services
 Author: CloneBox Team
 License: Apache-2.0

{clonebox-1.1.15.dist-info → clonebox-1.1.16.dist-info}/RECORD

@@ -1,8 +1,8 @@
 clonebox/__init__.py,sha256=CyfHVVq6KqBr4CNERBpXk_O6Q5B35q03YpdQbokVvvI,408
 clonebox/__main__.py,sha256=Fcoyzwwyz5-eC_sBlQk5a5RbKx8uodQz5sKJ190U0NU,135
 clonebox/audit.py,sha256=1W9vaIjB0A--_p7CgE3cIP5RNckJG1RxJrL-tOb-QmU,14298
-clonebox/cli.py,sha256=45-0HJ_T8O5Ggrd42VZTU1LoTOgIidRPqST7jzP23YM,174764
-clonebox/cloner.py,sha256=gQeaY_Cu6cKLKh_L0z8yuhB877WWunyKBy3vOzD-IMI,99640
+clonebox/cli.py,sha256=k3q-JrzsiDcGPjhzHbm1jPKajxD2chYJxSGGftCbA20,178481
+clonebox/cloner.py,sha256=ZMeIpEuzT8ZO9fav99JdE3krWT6e06K8pBR7XxDKbos,106958
 clonebox/container.py,sha256=tiYK1ZB-DhdD6A2FuMA0h_sRNkUI7KfYcJ0tFOcdyeM,6105
 clonebox/dashboard.py,sha256=dMY6odvPq3j6FronhRRsX7aY3qdCwznB-aCWKEmHDNw,5768
 clonebox/detector.py,sha256=vS65cvFNPmUBCX1Y_TMTnSRljw6r1Ae9dlVtACs5XFc,23075
@@ -20,7 +20,7 @@ clonebox/resource_monitor.py,sha256=lDR9KyPbVtImeeOkOBPPVP-5yCgoL5hsVFPZ_UqsY0w,
 clonebox/resources.py,sha256=IkuM4OdSDV4qhyc0eIynwbAHBTv0aVSxxW-gghsnCAs,6815
 clonebox/rollback.py,sha256=hpwO-8Ehe1pW0wHuZvJkC_qxZ6yEo9otCJRhGIUArCo,5711
 clonebox/secrets.py,sha256=l1jwJcEPB1qMoGNLPjyrkKKr1khh9VmftFJI9BWhgK0,10628
-clonebox/validator.py,sha256=_glRPL6VlTCnIpPTtFa8_cVApcl1h0jU_uyHCfKraUM,44501
+clonebox/validator.py,sha256=uXBkdrWSk8oBhRnD1y4mwxRdxOPduRraroSIs14bAo8,45342
 clonebox/backends/libvirt_backend.py,sha256=sIHFIvFO1hIOXEFR_foSkOGBgIzaJVQs-njOU8GdafA,7170
 clonebox/backends/qemu_disk.py,sha256=YsGjYX5sbEf35Y4yjTpNkZat73a4RGBxY-KTVzJhqIs,1687
 clonebox/backends/subprocess_runner.py,sha256=c-IyaMxM1cmUu64h654oAvulm83K5Mu-VQxXJ_0BOds,1506
@@ -40,9 +40,9 @@ clonebox/snapshots/manager.py,sha256=hGzM8V6ZJPXjTqj47c4Kr8idlE-c1Q3gPUvuw1HvS1A
 clonebox/snapshots/models.py,sha256=sRnn3OZE8JG9FZJlRuA3ihO-JXoPCQ3nD3SQytflAao,6206
 clonebox/templates/profiles/ml-dev.yaml,sha256=w07MToGh31xtxpjbeXTBk9BkpAN8A3gv8HeA3ESKG9M,461
 clonebox/templates/profiles/web-stack.yaml,sha256=EBnnGMzML5vAjXmIUbCpbTCwmRaNJiuWd3EcL43DOK8,485
-clonebox-1.1.15.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-clonebox-1.1.15.dist-info/METADATA,sha256=4gxhtiBARsY1QcnwjPU705upAAXQPvTXNiXHzkZaGpI,49052
-clonebox-1.1.15.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
-clonebox-1.1.15.dist-info/entry_points.txt,sha256=FES95Vi3btfViLEEoHdb8nikNxTqzaooi9ehZw9ZfWI,47
-clonebox-1.1.15.dist-info/top_level.txt,sha256=LdMo2cvCrEcRGH2M8JgQNVsCoszLV0xug6kx1JnaRjo,9
-clonebox-1.1.15.dist-info/RECORD,,
+clonebox-1.1.16.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+clonebox-1.1.16.dist-info/METADATA,sha256=mPn_uTUwAXlnakSJc8DLWyg1KlNERP5-oIEyWABxuwA,49052
+clonebox-1.1.16.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+clonebox-1.1.16.dist-info/entry_points.txt,sha256=FES95Vi3btfViLEEoHdb8nikNxTqzaooi9ehZw9ZfWI,47
+clonebox-1.1.16.dist-info/top_level.txt,sha256=LdMo2cvCrEcRGH2M8JgQNVsCoszLV0xug6kx1JnaRjo,9
+clonebox-1.1.16.dist-info/RECORD,,