clonebox 1.1.5__tar.gz → 1.1.7__tar.gz

{clonebox-1.1.5/src/clonebox.egg-info → clonebox-1.1.7}/PKG-INFO

@@ -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 → clonebox-1.1.7}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "clonebox"
-version = "1.1.5"
+version = "1.1.7"
 description = "Clone your workstation environment to an isolated VM with selective apps, paths and services"
 readme = "README.md"
 license = {text = "Apache-2.0"}
@@ -39,6 +39,7 @@ dependencies = [
     "pydantic>=2.0.0",
     "python-dotenv>=1.0.0",
     "cryptography>=42.0.0",
+    "structlog>=24.0.0",
 ]
 
 [project.optional-dependencies]

{clonebox-1.1.5 → clonebox-1.1.7}/src/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-1.1.5 → clonebox-1.1.7}/src/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-1.1.5 → clonebox-1.1.7}/src/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 → clonebox-1.1.7/src/clonebox.egg-info}/PKG-INFO

@@ -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 → clonebox-1.1.7}/src/clonebox.egg-info/requires.txt

@@ -6,6 +6,7 @@ pyyaml>=6.0
 pydantic>=2.0.0
 python-dotenv>=1.0.0
 cryptography>=42.0.0
+structlog>=24.0.0
 
 [dashboard]
 fastapi>=0.100.0

{clonebox-1.1.5 → clonebox-1.1.7}/tests/test_models.py

@@ -15,8 +15,8 @@ class TestVMSettings:
     def test_default_values(self):
         settings = VMSettings()
         assert settings.name == "clonebox-vm"
-        assert settings.ram_mb == 4096
-        assert settings.vcpus == 4
+        assert settings.ram_mb == 8192
+        assert settings.vcpus == 8
         assert settings.gui is True
 
     @pytest.mark.parametrize(
@@ -173,7 +173,7 @@ class TestCloneBoxConfigYAML:
     def test_yaml_roundtrip(self, tmp_path):
         original = CloneBoxConfig(
             version="1",
-            vm=VMSettings(name="yaml-vm", ram_mb=4096, network_mode="user"),
+            vm=VMSettings(name="yaml-vm", ram_mb=8192, network_mode="user"),
             paths={"/home/user/code": "/mnt/code"},
             app_data_paths={"/home/user/.config/app": "/home/ubuntu/.config/app"},
             packages=["python3", "nodejs"],