itwillsync 1.7.0 → 1.7.1

package/dist/index.js

@@ -3772,19 +3772,26 @@ function validateToken(provided, expected) {
 import { networkInterfaces } from "os";
 import { createServer } from "net";
 
-// src/tailscale.ts
+// src/exec-utils.ts
 import { execFile } from "child_process";
-function execCommand(cmd, args) {
+function execFileAsync(cmd, args, opts) {
   return new Promise((resolve, reject) => {
-    execFile(cmd, args, { timeout: 5e3 }, (error, stdout, stderr) => {
-      if (error) {
-        reject(error);
-      } else {
-        resolve({ stdout: stdout.trim(), stderr: stderr.trim() });
+    execFile(
+      cmd,
+      args,
+      { timeout: opts?.timeout ?? 5e3 },
+      (error, stdout, stderr) => {
+        if (error) {
+          reject(error);
+        } else {
+          resolve({ stdout: stdout.trim(), stderr: stderr.trim() });
+        }
       }
-    });
+    );
   });
 }
+
+// src/tailscale.ts
 function getTailscalePaths() {
   const paths = ["tailscale"];
   if (process.platform === "darwin") {
@@ -3796,7 +3803,7 @@ async function tryExec(args) {
   let lastError = null;
   for (const bin of getTailscalePaths()) {
     try {
-      const result = await execCommand(bin, args);
+      const result = await execFileAsync(bin, args);
       return { status: "success", ...result };
     } catch (err) {
       if (err.code === "ENOENT") {
@@ -4744,6 +4751,40 @@ Hub Management:
 `);
 }
 
+// src/resolve-command.ts
+async function resolveCommand(command) {
+  if (process.platform !== "win32") {
+    return command;
+  }
+  if (/^[a-zA-Z]:[/\\]/.test(command) || command.startsWith("\\\\")) {
+    return command;
+  }
+  try {
+    const { stdout } = await execFileAsync("where.exe", [command]);
+    const firstMatch = stdout.split("\n")[0]?.trim();
+    if (firstMatch) {
+      return firstMatch;
+    }
+    throw new Error(`where.exe returned empty output for "${command}"`);
+  } catch (err) {
+    if (err.code === "ENOENT") {
+      return command;
+    }
+    throw new Error(
+      `Could not find "${command}" on this system.
+
+To fix this:
+  1. Make sure "${command}" is installed
+  2. Open a new terminal and run: ${command} --version
+  3. If that works, try running itwillsync again
+
+If "${command}" was just installed, you may need to restart your
+terminal so Windows can find it in your PATH.`,
+      { cause: err }
+    );
+  }
+}
+
 // src/index.ts
 import { fileURLToPath as fileURLToPath4 } from "url";
 import { join as join7, dirname as dirname4 } from "path";
@@ -4883,14 +4924,7 @@ async function main() {
   }
   const headless = options.headless;
   const config = loadConfig();
-  let networkingMode = "local";
-  if (options.tailscale) {
-    networkingMode = "tailscale";
-  } else if (options.local) {
-    networkingMode = "local";
-  } else {
-    networkingMode = config.networkingMode;
-  }
+  const networkingMode = options.tailscale ? "tailscale" : options.local ? "local" : config.networkingMode;
   const [cmd, ...cmdArgs] = options.command;
   const isFirstSession = await ensureHub();
   const hubConfig = getHubConfig();
@@ -4900,7 +4934,23 @@ async function main() {
   const ip = await resolveSessionIP(networkingMode, options.localhost);
   const __dirname2 = dirname4(fileURLToPath4(import.meta.url));
   const webClientPath = join7(__dirname2, "web-client");
-  const ptyManager = new PtyManager(cmd, cmdArgs);
+  const resolvedCmd = await resolveCommand(cmd);
+  let ptyManager;
+  try {
+    ptyManager = new PtyManager(resolvedCmd, cmdArgs);
+  } catch {
+    console.error(
+      `
+  Could not start "${cmd}".
+
+  To fix this:
+    1. Make sure "${cmd}" is installed
+    2. Open a new terminal and run: ${cmd} --version
+    3. If that works, try running itwillsync again
+`
+    );
+    process.exit(1);
+  }
   const sessionId = `${cmd}-${Date.now().toString(36)}`;
   const sessionLogger = new SessionLogger(sessionId);
   const server = createSyncServer({