feat: dev tools autoinstall in Windows VMs

User · User · commit ee9c9ede8a76 · 2026-05-06T04:04:16.000+02:00
- UnattendedRequest extended with dev_tools list and use_host_ollama
- autounattend.xml injects FirstLogonCommand with winget + pip + npm
- Tool IDs match sandbox setup (python, git, node, vscode, uv, just, etc.)
- Frontend modal shows 11 tool checkboxes + OLLAMA_HOST toggle
- Default preselect: python, git, node, vscode, uv
diff --git a/webapp/backend/app/main.py b/webapp/backend/app/main.py
@@ -462,6 +462,8 @@ class UnattendedRequest(BaseModel):
     username: str = "user"
     password: str = "password"
     timezone: str = "Europe/Vienna"
+    dev_tools: list[str] | None = None  # dev tool keys (python, git, node, etc.)
+    use_host_ollama: bool = False  # set OLLAMA_HOST to host gateway
 
 
 # ── Template Storage ─────────────────────────────────────────────────────
@@ -1084,8 +1086,29 @@ def _generate_ubuntu_autoinstall(hostname: str, username: str, password: str, ti
 """
 
 
-def _generate_autounattend(hostname: str, username: str, password: str, timezone: str) -> str:
-    """Generate Windows autounattend.xml content."""
+def _generate_autounattend(
+    hostname: str, username: str, password: str, timezone: str,
+    dev_tools: list[str] | None = None, use_host_ollama: bool = False,
+) -> str:
+    """Generate Windows autounattend.xml content.
+
+    If dev_tools is provided, injects a FirstLogonCommand that installs
+    the selected dev tooling via winget + pip + npm.
+    """
+    dev_script = _generate_win_dev_setup_ps1(username, dev_tools, use_host_ollama)
+    first_logon = ""
+    if dev_script:
+        escaped = dev_script.replace("&", "&amp;").replace("<", "&lt;").replace(">", "&gt;").replace('"', "&quot;")
+        first_logon = f"""
+            <FirstLogonCommands>
+                <SynchronousCommand wcm:action="add">
+                    <CommandLine>powershell -ExecutionPolicy Bypass -Command "{escaped}"</CommandLine>
+                    <Description>Dev Environment Setup</Description>
+                    <Order>1</Order>
+                    <RequiresUserInput>false</RequiresUserInput>
+                </SynchronousCommand>
+            </FirstLogonCommands>"""
+
     return f"""<?xml version="1.0" encoding="utf-8"?>
 <unattend xmlns="urn:schemas-microsoft-com:unattend">
     <settings pass="windowsPE">
@@ -1138,12 +1161,86 @@ def _generate_autounattend(hostname: str, username: str, password: str, timezone
                 <Model>Automated VM</Model>
             </OEMInformation>
             <TimeZone>{timezone}</TimeZone>
+            {first_logon}
         </component>
     </settings>
 </unattend>
 """
 
 
+def _generate_win_dev_setup_ps1(
+    username: str = "user",
+    tools: list[str] | None = None,
+    use_host_ollama: bool = False,
+) -> str:
+    """Generate a PowerShell script to install dev tools in a Windows VM.
+
+    Runs winget installs silently, then pip/npm setup. Uses the same tool IDs
+    as the Sandbox dev setup.
+    """
+    if not tools:
+        return ""
+
+    tool_map = {
+        "python": "Python.Python.3.12",
+        "git": "Git.Git",
+        "node": "OpenJS.NodeJS.LTS",
+        "just": "Casey.Just",
+        "vscode": "Microsoft.VisualStudioCode",
+        "notepad++": "Notepad++.Notepad++",
+        "uv": "astral-sh.uv",
+        "windsurf": "Codeium.Windsurf",
+        "cursor": "Anysphere.Cursor",
+        "antigravity": "Google.Antigravity",
+    }
+
+    winget_ids = [
+        tool_map[t] for t in tools if t in tool_map
+    ]
+    has_python = "python" in tools
+    has_claude = any(t in ("claude_desktop", "claudesktop", "claudedesktop") for t in tools)
+
+    lines = [
+        "# Dev Environment Setup (generated by virtualization-mcp)",
+        "$logFile = \"$env:USERPROFILE\\Desktop\\dev-setup.log\"",
+        "Start-Transcript -Path $logFile -Append",
+        "Write-Host '--- Dev Environment Setup ---' -ForegroundColor Cyan",
+    ]
+
+    for wid in winget_ids:
+        lines.append(
+            f'Write-Host "Installing {wid}..." -ForegroundColor Yellow; '
+            f'& winget install -e --id {wid} --source winget --accept-package-agreements --accept-source-agreements 2>&1 | Out-Null'
+        )
+
+    if has_python:
+        lines.append(
+            'Write-Host "Upgrading pip..." -ForegroundColor Yellow; '
+            'python -m pip install --upgrade pip 2>&1 | Out-Null'
+        )
+
+    if has_claude:
+        lines.append(
+            'Write-Host "Downloading Claude Desktop..." -ForegroundColor Yellow; '
+            '$msix = \"$env:TEMP\\Claude.msix\"; '
+            'Invoke-WebRequest -Uri "https://claude.ai/api/desktop/win32/x64/msix/latest/redirect" -OutFile $msix -UseBasicParsing; '
+            'Add-AppxPackage -Path $msix -ErrorAction SilentlyContinue'
+        )
+
+    if use_host_ollama:
+        lines.append(
+            '$gw = (Get-NetRoute -DestinationPrefix "0.0.0.0/0" -ErrorAction SilentlyContinue | Select-Object -First 1).NextHop; '
+            'if ($gw) { '
+            '$env:OLLAMA_HOST = \"http://$gw`:11434\"; '
+            '[Environment]::SetEnvironmentVariable(\"OLLAMA_HOST\", $env:OLLAMA_HOST, \"User\") '
+            '}'
+        )
+
+    lines.append("Write-Host 'Dev setup complete!' -ForegroundColor Green")
+    lines.append("Stop-Transcript")
+    return "; ".join(lines)
+
+
 UNATTENDED_DIR = os.path.join(_repo_root, "assets", "unattended")
 
 
@@ -1174,15 +1271,21 @@ async def setup_unattended_install(name: str, request: UnattendedRequest):
                 "message": "Cloud-init ISO generated. Attach it as the secondary drive after the main ISO.",
             }
         elif os_type == "windows":
-            content = _generate_autounattend(request.hostname, request.username, request.password, request.timezone)
+            content = _generate_autounattend(
+                request.hostname, request.username, request.password, request.timezone,
+                dev_tools=request.dev_tools, use_host_ollama=request.use_host_ollama,
+            )
             dest = os.path.join(UNATTENDED_DIR, f"{name}-autounattend.xml")
             with open(dest, "w") as f:
                 f.write(content)
+            msg = "autounattend.xml generated."
+            if request.dev_tools:
+                msg += f" Dev tools ({len(request.dev_tools)} selected) will install on first login."
             return {
                 "success": True,
                 "os_type": "windows",
                 "file": dest,
-                "message": "autounattend.xml generated. Attach it via VBoxManage storageattach.",
+                "message": msg,
             }
         else:
             raise HTTPException(status_code=400, detail=f"Unsupported OS type: {os_type}")
diff --git a/webapp/frontend/src/pages/virtualbox.tsx b/webapp/frontend/src/pages/virtualbox.tsx
@@ -105,6 +105,8 @@ export default function VirtualBox() {
   const [showUnattended, setShowUnattended] = useState<string | null>(null);
   const [unattendedUsername, setUnattendedUsername] = useState("user");
   const [unattendedPassword, setUnattendedPassword] = useState("password");
+  const [unattendedDevTools, setUnattendedDevTools] = useState<Record<string, boolean>>({});
+  const [unattendedUseOllama, setUnattendedUseOllama] = useState(false);
 
   const fetchVMs = async () => {
     setLoading(true);
@@ -271,10 +273,20 @@ export default function VirtualBox() {
 
   const submitUnattended = async (vmName: string) => {
     try {
+      const devTools = Object.entries(unattendedDevTools)
+        .filter(([, v]) => v)
+        .map(([k]) => k);
       await fetch(`${API_BASE}/api/v1/vms/${encodeURIComponent(vmName)}/unattended`, {
         method: "POST",
         headers: { "Content-Type": "application/json" },
-        body: JSON.stringify({ os_type: "ubuntu", hostname: vmName, username: unattendedUsername, password: unattendedPassword }),
+        body: JSON.stringify({
+          os_type: "windows",
+          hostname: vmName,
+          username: unattendedUsername,
+          password: unattendedPassword,
+          dev_tools: devTools.length > 0 ? devTools : undefined,
+          use_host_ollama: unattendedUseOllama,
+        }),
       });
       setShowUnattended(null);
     } catch (e: any) { console.error(e); }
@@ -768,7 +780,7 @@ export default function VirtualBox() {
                     VRDP
                   </button>
                 )}
-                <button onClick={() => setShowUnattended(vm.name)}
+                <button onClick={() => { setShowUnattended(vm.name); setUnattendedDevTools({python: true, git: true, node: true, vscode: true, uv: true}); }}
                   className="inline-flex items-center gap-1.5 px-3 py-1.5 text-xs rounded-lg bg-white/5 text-muted-foreground hover:bg-white/15 hover:text-white transition-colors font-medium">
                   Autoinstall
                 </button>
@@ -1121,10 +1133,10 @@ export default function VirtualBox() {
       {showUnattended && (
         <div className="fixed inset-0 z-50 flex items-center justify-center bg-black/60 p-4"
           onClick={() => setShowUnattended(null)}>
-          <div className="bg-card border border-border rounded-xl shadow-xl max-w-md w-full p-6 space-y-4"
+          <div className="bg-card border border-border rounded-xl shadow-xl max-w-lg w-full max-h-[85vh] overflow-y-auto p-6 space-y-4"
             onClick={(e) => e.stopPropagation()}>
             <h3 className="font-semibold text-lg">Autoinstall: {showUnattended}</h3>
-            <p className="text-sm text-muted-foreground">Generates answer file (autoinstall.yaml or autounattend.xml). For Ubuntu, creates a cloud-init ISO.</p>
+            <p className="text-sm text-muted-foreground">For Windows VMs, selected dev tools install via winget on first login.</p>
             <div>
               <label className="block text-sm font-medium mb-1">Username</label>
               <input value={unattendedUsername} onChange={(e) => setUnattendedUsername(e.target.value)}
@@ -1135,6 +1147,36 @@ export default function VirtualBox() {
               <input type="password" value={unattendedPassword} onChange={(e) => setUnattendedPassword(e.target.value)}
                 className="w-full bg-background/50 border border-input rounded px-3 py-2" />
             </div>
+            <div className="border-t border-border pt-3">
+              <p className="text-sm font-medium mb-2">Dev Tools (Windows only)</p>
+              <div className="grid grid-cols-2 gap-2">
+                {[
+                  ["python", "Python 3.12"],
+                  ["git", "Git"],
+                  ["node", "Node.js LTS"],
+                  ["vscode", "VS Code"],
+                  ["uv", "uv (pip+venv)"],
+                  ["just", "Just"],
+                  ["notepad++", "Notepad++"],
+                  ["windsurf", "Windsurf"],
+                  ["cursor", "Cursor"],
+                  ["antigravity", "Antigravity"],
+                  ["claude_desktop", "Claude Desktop"],
+                ].map(([id, label]) => (
+                  <label key={id} className="flex items-center gap-2 text-sm py-1 px-2 rounded hover:bg-white/5 cursor-pointer">
+                    <input type="checkbox" checked={unattendedDevTools[id] ?? false}
+                      onChange={(e) => setUnattendedDevTools(prev => ({ ...prev, [id]: e.target.checked }))}
+                      className="rounded border-white/20 bg-white/5" />
+                    {label}
+                  </label>
+                ))}
+              </div>
+              <label className="flex items-center gap-2 text-sm mt-2 py-1 px-2 rounded hover:bg-white/5 cursor-pointer">
+                <input type="checkbox" checked={unattendedUseOllama} onChange={() => setUnattendedUseOllama(!unattendedUseOllama)}
+                  className="rounded border-white/20 bg-white/5" />
+                Use host Ollama (set OLLAMA_HOST)
+              </label>
+            </div>
             <div className="flex gap-2 pt-2">
               <button onClick={() => setShowUnattended(null)}
                 className="flex-1 py-2 rounded-lg border border-border hover:bg-white/10">Cancel</button>
