automify 0.1.7 → 0.1.8

package/README.md

@@ -203,8 +203,9 @@ Local desktop computer use controls the native desktop on the machine running yo
 Before running `npx automify-install-desktop`, install the native build tools for your OS:
 
 ```sh
-# Windows: Visual Studio C++ Build Tools plus CMake on PATH.
-winget install Kitware.CMake
+# Windows: Visual Studio 2022 C++ Build Tools plus CMake on PATH.
+winget install --id Microsoft.VisualStudio.2022.BuildTools --exact --override "--passive --add Microsoft.VisualStudio.Workload.VCTools --includeRecommended"
+winget install --id Kitware.CMake --exact --source winget
 
 # macOS: Xcode Command Line Tools plus CMake on PATH.
 xcode-select --install
@@ -220,7 +221,7 @@ sudo dnf install -y gcc-c++ make cmake libXtst-devel libpng-devel
 sudo pacman -S --needed base-devel cmake libxtst libpng
 ```
 
-On headless Linux hosts, also install `xvfb` unless you manage `DISPLAY` yourself. On macOS and Windows, `cmake --version` must work in the terminal where you run `npx automify-install-desktop`. On Windows, the VS Code CMake Tools extension is not enough by itself.
+On headless Linux hosts, also install `xvfb` unless you manage `DISPLAY` yourself. On macOS and Windows, `cmake --version` must work in the terminal where you run `npx automify-install-desktop`. On Windows, the VS Code CMake Tools extension is not enough by itself, and Visual Studio 2026 is not currently recognized by the native build chain used by nut.js.
 
 ```js
 import { initAutomify } from "automify";

package/package.json

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

package/scripts/install-desktop.js

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 import { spawnSync } from "node:child_process";
 import { cpSync, existsSync, mkdirSync, readFileSync, rmSync, writeFileSync } from "node:fs";
-import { dirname, join, resolve } from "node:path";
+import { dirname, join, resolve, sep } from "node:path";
 import { fileURLToPath } from "node:url";
 
 const __dirname = dirname(fileURLToPath(import.meta.url));
@@ -23,12 +23,7 @@ const platformPackageName = `@nut-tree/libnut-${process.platform}`;
 const platformPackageDir = join(nutScope, `libnut-${process.platform}`);
 const macPermissionsPackageDir = join(nutScope, "node-mac-permissions");
 
-const runtimeDependencies = [
-  "jimp@1.6.1",
-  "node-abort-controller@3.1.1",
-  "clipboardy@2.3.0",
-  "bindings@1.5.0"
-];
+const runtimeDependencies = ["jimp@1.6.1", "node-abort-controller@3.1.1", "clipboardy@2.3.0", "bindings@1.5.0"];
 
 console.log("Building official nut.js from source.");
 console.log(`Build directory: ${buildRoot}`);
@@ -86,7 +81,9 @@ if (process.platform === "darwin") {
   installWorkspacePackage(macPermissionsSource, macPermissionsPackageDir);
 }
 
-run("node", ["-e", "import('@nut-tree/nut-js').then(() => console.log('nut.js source build import ok'))"], { cwd: root });
+run("node", ["-e", "import('@nut-tree/nut-js').then(() => console.log('nut.js source build import ok'))"], {
+  cwd: root
+});
 
 function cloneOrPull(repo, target, ref) {
   if (existsSync(join(target, ".git"))) {
@@ -123,6 +120,9 @@ function checkBuildPrerequisites() {
   for (const command of ["git", "npm", "cmake"]) {
     if (!commandExists(command)) missing.push(command);
   }
+  if (process.platform === "win32" && !windowsBuildToolsExist()) {
+    missing.push("Visual Studio 2022 C++ Build Tools");
+  }
 
   if (missing.length === 0) return;
 
@@ -134,18 +134,87 @@ function checkBuildPrerequisites() {
   } else if (process.platform === "linux") {
     console.error("Linux: install CMake, a C/C++ compiler, libxtst-dev, and libpng++-dev.");
   } else if (process.platform === "win32") {
-    console.error("Windows: install CMake and Visual Studio C++ Build Tools.");
+    console.error("Windows: install CMake and Visual Studio 2022 C++ Build Tools.");
+    console.error("Make sure the `Desktop development with C++` workload is installed.");
   }
 
   process.exit(1);
 }
 
 function commandExists(command) {
-  const result = spawnSync(resolveCommand(command), ["--version"], {
+  return resolveCommand(command) !== null;
+}
+
+function resolveCommand(command) {
+  for (const candidate of commandCandidates(command)) {
+    const result = spawnSync(candidate.command, [...candidate.args, "--version"], {
+      cwd: root,
+      stdio: "ignore"
+    });
+    if ((result.status ?? 1) === 0) return candidate;
+  }
+  return null;
+}
+
+function commandCandidates(command) {
+  const candidates = [];
+
+  if (process.platform === "win32" && ["npm", "npx"].includes(command)) {
+    candidates.push({ command: `${command}.cmd`, args: [] });
+  }
+
+  const npmCli = npmCliCandidate(command);
+  if (npmCli) candidates.push(npmCli);
+
+  candidates.push({ command, args: [] });
+  return candidates;
+}
+
+function npmCliCandidate(command) {
+  if (!["npm", "npx"].includes(command) || !process.env.npm_execpath) return null;
+  if (command === "npm") return { command: process.execPath, args: [process.env.npm_execpath] };
+
+  const npxExecPath = join(dirname(process.env.npm_execpath), "npx-cli.js");
+  if (!existsSync(npxExecPath)) return null;
+  return { command: process.execPath, args: [npxExecPath] };
+}
+
+function runResolvedCommand(command, args, options = {}) {
+  const candidate = resolveCommand(command) ?? { command, args: [] };
+  return spawnSync(candidate.command, [...candidate.args, ...args], {
     cwd: root,
-    stdio: "ignore"
+    ...options
   });
-  return (result.status ?? 1) === 0;
+}
+
+function windowsBuildToolsExist() {
+  const vswhere = join(
+    process.env["ProgramFiles(x86)"] ?? "C:\\Program Files (x86)",
+    "Microsoft Visual Studio",
+    "Installer",
+    "vswhere.exe"
+  );
+  if (!existsSync(vswhere)) return false;
+
+  const result = spawnSync(
+    vswhere,
+    [
+      "-products",
+      "*",
+      "-version",
+      "[17.0,18.0)",
+      "-requires",
+      "Microsoft.VisualStudio.Component.VC.Tools.x86.x64",
+      "-property",
+      "installationPath"
+    ],
+    {
+      cwd: root,
+      encoding: "utf8",
+      stdio: "pipe"
+    }
+  );
+  return (result.status ?? 1) === 0 && result.stdout.trim().length > 0;
 }
 
 function patchPlatformLibnutDependency() {
@@ -326,15 +395,16 @@ exports.default = default_1;
 function installWorkspacePackage(source, target) {
   rmSync(target, { recursive: true, force: true });
   mkdirSync(dirname(target), { recursive: true });
+  const excludedDirs = [join(source, "node_modules"), join(source, "coverage")];
   cpSync(source, target, {
     recursive: true,
-    filter: (file) => !file.includes(`${source}/node_modules`) && !file.includes(`${source}/coverage`)
+    filter: (file) =>
+      !excludedDirs.some((excludedDir) => file === excludedDir || file.startsWith(`${excludedDir}${sep}`))
   });
 }
 
 function run(command, args, options = {}) {
-  const executable = resolveCommand(command);
-  const result = spawnSync(executable, args, {
+  const result = runResolvedCommand(command, args, {
     cwd: options.cwd ?? root,
     env: options.env ?? process.env,
     shell: false,
@@ -367,10 +437,6 @@ function run(command, args, options = {}) {
   return commandResult;
 }
 
-function resolveCommand(command) {
-  return process.platform === "win32" && ["npm", "npx"].includes(command) ? `${command}.cmd` : command;
-}
-
 function runPnpm(args, options = {}) {
   run("npx", ["--yes", "pnpm@8.15.2", ...args], options);
 }