automify 0.3.0 → 0.3.1

package/README.md

@@ -126,6 +126,9 @@ Pre-warm or refresh QEMU image caches:
 # Pre-warm the minimal QEMU CLI cache.
 npx automify-qemu-image
 
+# Pre-warm a QEMU CLI cache for examples that need Node.js in the VM.
+npx automify-qemu-image --package coreutils --package nodejs
+
 # Pre-warm the QEMU desktop cache with Xvfb/openbox/xterm/xdotool/scrot.
 npx automify-qemu-image --desktop
 
@@ -281,7 +284,7 @@ const cli = automify.virtualCli({
     memory: "2g",
     cpus: 2
   },
-  additionalAptPackages: ["coreutils"],
+  additionalAptPackages: ["coreutils", "nodejs"],
   shared: { hostPath: process.cwd(), containerPath: "/workspace" }
 });
 
@@ -779,7 +782,7 @@ RUN_OPENAI_QEMU_DESKTOP_E2E=1 \
 node --test test/e2e/live-openai.e2e.test.js
 ```
 
-Use `AUTOMIFY_QEMU_DEFAULT_IMAGE_URL` to point the default Debian download at a mirror, and `AUTOMIFY_QEMU_IMAGE_CACHE_DIR` to choose the cache directory. By default, Automify caches the downloaded Debian base image and prepared Automify-ready Debian images on the user's computer. The CLI cache stays minimal; the desktop cache is a separate variant that bakes Xvfb/openbox/xterm/xdotool/scrot so warm desktop boots do not reinstall apt packages. Configure image caching with `defaultImageCache`, for example `defaultImageCache: { dir: "/var/cache/automify-qemu", forcePrepare: true }`. Run `npx automify-qemu-image` to pre-warm the QEMU CLI cache. Run `npx automify-qemu-image --desktop` to pre-warm the QEMU desktop cache. Run `npx automify-qemu-image --image-url https://example.com/path/linux.qcow2 --cache-dir /var/cache/automify-qemu-custom` to pre-warm an alternate cloud qcow2 cache, then use the same URL and cache directory at runtime with `vm.imageUrl` or `qemuImageUrl` plus `defaultImageCache`. Run `npx automify-qemu-image --force-download` to replace the cached base image and rebuild the prepared image. Local disks passed with `image` or `vm.image` are not prepared by the cache command; they must already be bootable with SSH access. On ARM hosts Automify auto-detects common QEMU UEFI firmware paths; set `AUTOMIFY_QEMU_FIRMWARE` if your QEMU install keeps the firmware elsewhere.
+Use `AUTOMIFY_QEMU_DEFAULT_IMAGE_URL` to point the default Debian download at a mirror, and `AUTOMIFY_QEMU_IMAGE_CACHE_DIR` to choose the cache directory. By default, Automify caches the downloaded Debian base image and prepared Automify-ready Debian images on the user's computer. CLI cache variants bake the requested `packages` and `additionalAptPackages`; the desktop cache is a separate variant that bakes Xvfb/openbox/xterm/xdotool/scrot so warm desktop boots do not reinstall apt packages. Configure image caching with `defaultImageCache`, for example `defaultImageCache: { dir: "/var/cache/automify-qemu", forcePrepare: true }`. Run `npx automify-qemu-image` to pre-warm the minimal QEMU CLI cache, or add flags such as `--package coreutils --package nodejs` to pre-warm a package-specific CLI cache. Run `npx automify-qemu-image --desktop` to pre-warm the QEMU desktop cache. Run `npx automify-qemu-image --image-url https://example.com/path/linux.qcow2 --cache-dir /var/cache/automify-qemu-custom` to pre-warm an alternate cloud qcow2 cache, then use the same URL and cache directory at runtime with `vm.imageUrl` or `qemuImageUrl` plus `defaultImageCache`. Run `npx automify-qemu-image --force-download` to replace the cached base image and rebuild the prepared image. Local disks passed with `image` or `vm.image` are not prepared by the cache command; they must already be bootable with SSH access. On ARM hosts Automify auto-detects common QEMU UEFI firmware paths; set `AUTOMIFY_QEMU_FIRMWARE` if your QEMU install keeps the firmware elsewhere.
 
 ## License
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "automify",
-  "version": "0.3.0",
+  "version": "0.3.1",
   "description": "AI computer use for browser, CLI, and desktop in Node.js.",
   "homepage": "https://aldovincenti.github.io/automify",
   "bugs": {

package/scripts/qemu-image.js

@@ -19,6 +19,8 @@ const options = parseArgs(args);
 console.log("Preparing Automify QEMU default Debian image cache.");
 if (options.desktop) {
   console.log("Desktop cache enabled: the prepared image will include the default QEMU desktop packages.");
+} else if (options.packages.length > 0) {
+  console.log("CLI cache enabled: the prepared image will include the requested apt packages.");
 } else {
   console.log("CLI cache enabled: the prepared image will stay minimal for QEMU virtual CLI runs.");
 }
@@ -39,7 +41,7 @@ try {
     imageUrl: options.imageUrl,
     defaultImageCache: options.defaultImageCache,
     preparedImageProfile: options.desktop ? "desktop" : undefined,
-    preparedPackages: options.desktop ? uniquePackages([...DEFAULT_QEMU_DESKTOP_PACKAGES, ...options.packages]) : [],
+    preparedPackages: options.desktop ? uniquePackages([...DEFAULT_QEMU_DESKTOP_PACKAGES, ...options.packages]) : options.packages,
     vmName: "automify-qemu-image"
   });
 
@@ -132,7 +134,7 @@ Options:
   --force-prepare         Rebuild only the prepared image
   --no-prepare            Download only the base Debian qcow2
   --desktop               Prepare the QEMU desktop cache variant
-  --package <name>        Add an apt package to the prepared desktop cache
+  --package <name>        Add an apt package to the prepared cache
   --cache-dir <path>      Cache root for base and prepared images
   --prepared-cache-dir <path>
                           Cache directory for prepared images
@@ -143,6 +145,7 @@ Options:
 
 Examples:
   npx automify-qemu-image            # pre-warm the QEMU CLI cache
+  npx automify-qemu-image --package coreutils --package nodejs
   npx automify-qemu-image --desktop  # pre-warm the QEMU desktop cache
   npx automify-qemu-image --force-download
   npx automify-qemu-image --cache-dir ${root}/.automify-qemu-cache

package/src/lib/qemu-cli-automify.js

@@ -34,6 +34,7 @@ const execFileAsync = promisify(execFile);
 
 const DEFAULT_CWD = "/workspace";
 const DEFAULT_TIMEOUT_MS = 30_000;
+const DEFAULT_STARTUP_TIMEOUT_MS = 120_000;
 const VIRTUAL_CLI_OPTION_KEYS = mergeOptionKeys(AUTOMIFY_OPTION_KEYS, [
   "preset",
   "command",
@@ -195,6 +196,7 @@ export class QemuCliSession {
     this.originalSshKeyPath = options.sshKeyPath;
     this.originalSudo = options.sudo;
     this.defaultImage = null;
+    this.preparedPackages = new Set();
     this.usesDefaultImage = !this.image && !options.existingVM;
     this.name = options.vmName ?? `automify-vm-cli-${randomUUID()}`;
     this.cwd = normalizeGuestPath(options.cwd, DEFAULT_CWD);
@@ -251,7 +253,7 @@ export class QemuCliSession {
       this.started = true;
       await waitForSsh(this.execFile, this.sshCommand, this.sshOptions());
       await this.runSsh(this.startupScript(), {
-        timeout: positiveInteger(this.options.timeoutMs) ?? DEFAULT_TIMEOUT_MS
+        timeout: this.startupTimeoutMs()
       });
       debugVirtualCli(this.options, "vm_ready", { vmName: this.name });
     } catch (error) {
@@ -288,13 +290,15 @@ export class QemuCliSession {
       sshPort: this.sshPort,
       sshTimeoutMs: this.options.sshTimeoutMs,
       startupTimeoutMs: this.options.startupTimeoutMs,
-      timeoutMs: this.options.timeoutMs,
+      timeoutMs: this.startupTimeoutMs(),
       qemuTimeoutMs: this.options.qemuTimeoutMs,
       createCloudInitServer: this.options.createCloudInitServer,
+      preparedPackages: this.options.installDependencies === false ? [] : this.dependencyPackages(),
       spawn: this.spawn,
       vmName: this.name
     });
     this.defaultImage = prepared;
+    this.preparedPackages = new Set(prepared.preparedPackages ?? []);
     this.image = prepared.image;
     this.options = {
       ...this.options,
@@ -313,7 +317,7 @@ export class QemuCliSession {
   }
 
   startupScript() {
-    const packages = uniquePackages([...(this.options.packages ?? []), ...(this.options.additionalAptPackages ?? [])]);
+    const packages = this.dependencyPackages().filter((pkg) => !this.preparedPackages.has(pkg));
     const startupCommand = this.options.startupCommand ?? ":";
     return [
       installCommand(packages, this.options),
@@ -323,6 +327,14 @@ export class QemuCliSession {
     ].join(" && ");
   }
 
+  dependencyPackages() {
+    return uniquePackages([...(this.options.packages ?? []), ...(this.options.additionalAptPackages ?? [])]);
+  }
+
+  startupTimeoutMs() {
+    return positiveInteger(this.options.startupTimeoutMs) ?? DEFAULT_STARTUP_TIMEOUT_MS;
+  }
+
   async run(command, options = {}) {
     await this.start();
     const cwd = normalizeGuestPath(options.cwd ?? this.cwd, this.cwd);
@@ -385,6 +397,7 @@ export class QemuCliSession {
     }
     await this.defaultImage?.close();
     this.defaultImage = null;
+    this.preparedPackages = new Set();
     if (this.usesDefaultImage) {
       this.image = null;
       this.options = {