clonebox 1.1.5__py3-none-any.whl → 1.1.7__py3-none-any.whl

clonebox/cli.py

@@ -92,6 +92,7 @@ def _resolve_vm_name_and_config_file(name: Optional[str]) -> Tuple[str, Optional
 
 def _qga_ping(vm_name: str, conn_uri: str) -> bool:
     import subprocess
+    import json
 
     try:
         result = subprocess.run(
@@ -116,6 +117,7 @@ def _qga_exec(vm_name: str, conn_uri: str, command: str, timeout: int = 10) -> O
     import subprocess
     import base64
     import time
+    import json
 
     try:
         payload = {
@@ -1852,18 +1854,21 @@ def cmd_test(args):
         all_paths.update(config.get("app_data_paths", {}))
 
         if all_paths:
-            for idx, (host_path, guest_path) in enumerate(all_paths.items()):
-                try:
-                    # 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)[/]")
+            if not _qga_ping(vm_name, conn_uri):
+                console.print("[yellow]⚠️  QEMU guest agent not connected - cannot verify mounts[/]")
+            else:
+                for idx, (host_path, guest_path) in enumerate(all_paths.items()):
+                    try:
+                        # 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[/]")
 
@@ -2100,7 +2105,7 @@ def generate_clonebox_yaml(
             vm_name = f"clone-{sys_info['hostname']}"
 
     # Calculate recommended resources
-    ram_mb = min(4096, int(sys_info["memory_available_gb"] * 1024 * 0.5))
+    ram_mb = min(8192, int(sys_info["memory_available_gb"] * 1024 * 0.5))
     vcpus = max(2, sys_info["cpu_count"] // 2)
 
     if disk_size_gb is None:
@@ -2333,8 +2338,8 @@ def create_vm_from_config(
 
     vm_config = VMConfig(
         name=config["vm"]["name"],
-        ram_mb=config["vm"].get("ram_mb", 4096),
-        vcpus=config["vm"].get("vcpus", 4),
+        ram_mb=config["vm"].get("ram_mb", 8192),
+        vcpus=config["vm"].get("vcpus", 8),
         disk_size_gb=config["vm"].get("disk_size_gb", 10),
         gui=config["vm"].get("gui", True),
         base_image=config["vm"].get("base_image"),

clonebox/models.py

@@ -14,8 +14,8 @@ class VMSettings(BaseModel):
     """VM-specific settings."""
 
     name: str = Field(default="clonebox-vm", description="VM name")
-    ram_mb: int = Field(default=4096, ge=512, le=131072, description="RAM in MB")
-    vcpus: int = Field(default=4, ge=1, le=128, description="Number of vCPUs")
+    ram_mb: int = Field(default=8192, ge=512, le=131072, description="RAM in MB")
+    vcpus: int = Field(default=8, ge=1, le=128, description="Number of vCPUs")
     disk_size_gb: int = Field(default=20, ge=1, le=2048, description="Disk size in GB")
     gui: bool = Field(default=True, description="Enable SPICE graphics")
     base_image: Optional[str] = Field(default=None, description="Path to base qcow2 image")

clonebox/validator.py

@@ -728,7 +728,20 @@ class VMValidator:
             return None if out is None else out.strip() == "yes"
 
         def _run_test(app: str) -> Optional[bool]:
-            user_env = f"sudo -u {vm_user} env HOME=/home/{vm_user} XDG_RUNTIME_DIR=/run/user/1000"
+            uid_out = self._exec_in_vm(f"id -u {vm_user} 2>/dev/null || true", timeout=10)
+            vm_uid = (uid_out or "").strip()
+            if not vm_uid.isdigit():
+                vm_uid = "1000"
+
+            runtime_dir = f"/run/user/{vm_uid}"
+            self._exec_in_vm(
+                f"mkdir -p {runtime_dir} && chown {vm_uid}:{vm_uid} {runtime_dir} && chmod 700 {runtime_dir}",
+                timeout=10,
+            )
+
+            user_env = (
+                f"sudo -u {vm_user} env HOME=/home/{vm_user} USER={vm_user} LOGNAME={vm_user} XDG_RUNTIME_DIR={runtime_dir}"
+            )
 
             if app == "pycharm-community":
                 out = self._exec_in_vm(
@@ -826,6 +839,26 @@ class VMValidator:
         self.console.print(table)
         return self.results["smoke"]
 
+    def _check_qga_ready(self) -> bool:
+        """Check if QEMU guest agent is responding."""
+        try:
+            result = subprocess.run(
+                [
+                    "virsh",
+                    "--connect",
+                    self.conn_uri,
+                    "qemu-agent-command",
+                    self.vm_name,
+                    '{"execute":"guest-ping"}',
+                ],
+                capture_output=True,
+                text=True,
+                timeout=5,
+            )
+            return result.returncode == 0
+        except Exception:
+            return False
+
     def validate_all(self) -> Dict:
         """Run all validations and return comprehensive results."""
         self.console.print("[bold cyan]🔍 Running Full Validation...[/]")
@@ -850,6 +883,20 @@ class VMValidator:
             self.results["overall"] = "error"
             return self.results
 
+        # Check QEMU Guest Agent
+        if not self._check_qga_ready():
+            self.console.print("[red]❌ QEMU Guest Agent not responding[/]")
+            self.console.print("\n[bold]🔧 Troubleshooting QGA:[/]")
+            self.console.print("  1. The VM might still be booting. Wait 30-60 seconds.")
+            self.console.print("  2. Ensure the agent is installed and running inside the VM:")
+            self.console.print("     [dim]virsh console " + self.vm_name + "[/]")
+            self.console.print("     [dim]sudo systemctl status qemu-guest-agent[/]")
+            self.console.print("  3. If newly created, cloud-init might still be running.")
+            self.console.print("  4. Check VM logs: [dim]clonebox logs " + self.vm_name + "[/]")
+            self.console.print(f"\n[yellow]⚠️  Skipping deep validation as it requires a working Guest Agent.[/]")
+            self.results["overall"] = "qga_not_ready"
+            return self.results
+
         # Run all validations
         self.validate_mounts()
         self.validate_packages()

{clonebox-1.1.5.dist-info → clonebox-1.1.7.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: clonebox
-Version: 1.1.5
+Version: 1.1.7
 Summary: Clone your workstation environment to an isolated VM with selective apps, paths and services
 Author: CloneBox Team
 License: Apache-2.0
@@ -33,6 +33,7 @@ Requires-Dist: pyyaml>=6.0
 Requires-Dist: pydantic>=2.0.0
 Requires-Dist: python-dotenv>=1.0.0
 Requires-Dist: cryptography>=42.0.0
+Requires-Dist: structlog>=24.0.0
 Provides-Extra: dev
 Requires-Dist: pytest>=7.0.0; extra == "dev"
 Requires-Dist: pytest-cov>=4.0.0; extra == "dev"

{clonebox-1.1.5.dist-info → clonebox-1.1.7.dist-info}/RECORD

@@ -1,6 +1,6 @@
 clonebox/__init__.py,sha256=CyfHVVq6KqBr4CNERBpXk_O6Q5B35q03YpdQbokVvvI,408
 clonebox/__main__.py,sha256=Fcoyzwwyz5-eC_sBlQk5a5RbKx8uodQz5sKJ190U0NU,135
-clonebox/cli.py,sha256=m2WBz1SDTgpeDvX-dc93bDp4CKp7AcEI17vXWx3D4os,136109
+clonebox/cli.py,sha256=KR3naqYB1ZRFDGGoQAfqRk4Ci4NVF3WiY3nOzRKmcyg,136362
 clonebox/cloner.py,sha256=aH7BwmLgPITHzyHn_n_AKqtEADDm_aUXiRG-nB2rxMQ,90063
 clonebox/container.py,sha256=tiYK1ZB-DhdD6A2FuMA0h_sRNkUI7KfYcJ0tFOcdyeM,6105
 clonebox/dashboard.py,sha256=dMY6odvPq3j6FronhRRsX7aY3qdCwznB-aCWKEmHDNw,5768
@@ -9,7 +9,7 @@ clonebox/di.py,sha256=feFMXP5ff-7gwrIqgnoCpk1ivaiZA_lv2wcpkCSKiew,5648
 clonebox/exporter.py,sha256=WIzVvmA0z_jjrpyXxvnXoLp9oaW6fKS7k0PGwzx_PIM,5629
 clonebox/importer.py,sha256=Q9Uk1IOA41mgGhU4ynW2k-h9GEoGxRKI3c9wWE4uxcA,7097
 clonebox/logging.py,sha256=jD_WgkHmt_h99EmX82QWK7D0OKWyxqcLwgT4UDQFp2g,3675
-clonebox/models.py,sha256=zwejkNtEEO_aPy_Q5UzXG5tszU-c7lkqh9LQus9eWMo,8307
+clonebox/models.py,sha256=l9e5U4ZEEcgCTt2c47GpqFwppwVeifoCoNFi57lFGFo,8307
 clonebox/monitor.py,sha256=zlIarNf8w_i34XI8hZGxxrg5PVZK_Yxm6FQnkhLavRI,9181
 clonebox/p2p.py,sha256=6o0JnscKqF9-BftQhW5fF1W6YY1wXshY9LEklNcHGJc,5913
 clonebox/profiles.py,sha256=UP37fX_rhrG_O9ehNFJBUcULPmUtN1A8KsJ6cM44oK0,1986
@@ -17,7 +17,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=QtGMIjhTKq14qQRGy-pX0TU3vKLiZt7CMloAlF2GmzQ,10515
-clonebox/validator.py,sha256=CF4hMlY69-AGRH5HdG8HAA9_LNCwDKD4xPlYQPWJ9Rw,36647
+clonebox/validator.py,sha256=zX_E0X3IOZ8Dnmn8i9IVXViYXw-9Nyj0L_YyCKYRj9I,38722
 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
@@ -34,9 +34,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.5.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-clonebox-1.1.5.dist-info/METADATA,sha256=0sp9wPpm969pIM4iwq3m22B3uxh0vC694mJSIRjrUoc,48882
-clonebox-1.1.5.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
-clonebox-1.1.5.dist-info/entry_points.txt,sha256=FES95Vi3btfViLEEoHdb8nikNxTqzaooi9ehZw9ZfWI,47
-clonebox-1.1.5.dist-info/top_level.txt,sha256=LdMo2cvCrEcRGH2M8JgQNVsCoszLV0xug6kx1JnaRjo,9
-clonebox-1.1.5.dist-info/RECORD,,
+clonebox-1.1.7.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+clonebox-1.1.7.dist-info/METADATA,sha256=ojWCleuifB5DP3QDwjgT-X45ge_SslR30e7CyHl8iwY,48915
+clonebox-1.1.7.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+clonebox-1.1.7.dist-info/entry_points.txt,sha256=FES95Vi3btfViLEEoHdb8nikNxTqzaooi9ehZw9ZfWI,47
+clonebox-1.1.7.dist-info/top_level.txt,sha256=LdMo2cvCrEcRGH2M8JgQNVsCoszLV0xug6kx1JnaRjo,9
+clonebox-1.1.7.dist-info/RECORD,,