@hasna/machines 0.0.29 → 0.0.31

package/dist/mcp/index.js

@@ -5793,6 +5793,17 @@ function runMachineCommand(machineId, command) {
     exitCode: result.status ?? 1
   };
 }
+function describeMachineCommandFailure(operation, result) {
+  const detail = (result.stderr || result.stdout || "").trim();
+  const suffix = detail ? `: ${detail}` : "";
+  return `${operation} failed on ${result.machineId} via ${result.source} (exit ${result.exitCode})${suffix}`;
+}
+function requireMachineCommandSuccess(operation, result) {
+  if (result.exitCode !== 0) {
+    throw new Error(describeMachineCommandFailure(operation, result));
+  }
+  return result;
+}
 
 // src/commands/apps.ts
 function getPackageName(app) {
@@ -5886,27 +5897,28 @@ function buildAppsPlan(machineId) {
     executed: 0
   };
 }
-function getAppsStatus(machineId) {
+function getAppsStatus(machineId, runner = runMachineCommand) {
   const machine = resolveMachine(machineId);
+  const readiness = requireMachineCommandSuccess("Apps status readiness check", runner(machine.id, "true"));
   const apps = (machine.apps || []).map((app) => {
-    const probe = runMachineCommand(machine.id, buildAppProbeCommand(machine, app));
+    const probe = requireMachineCommandSuccess(`App probe ${app.name}`, runner(machine.id, buildAppProbeCommand(machine, app)));
     return parseProbeOutput(app, machine, probe.stdout);
   });
   return {
     machineId: machine.id,
-    source: apps.length > 0 ? runMachineCommand(machine.id, "true").source : machine.id === detectCurrentMachineManifest().id ? "local" : runMachineCommand(machine.id, "true").source,
+    source: readiness.source,
     apps
   };
 }
-function diffApps(machineId) {
-  const status = getAppsStatus(machineId);
+function diffApps(machineId, runner = runMachineCommand) {
+  const status = getAppsStatus(machineId, runner);
   return {
     ...status,
     missing: status.apps.filter((app) => !app.installed).map((app) => app.name),
     installed: status.apps.filter((app) => app.installed).map((app) => app.name)
   };
 }
-function runAppsInstall(machineId, options = {}) {
+function runAppsInstall(machineId, options = {}, runner = runMachineCommand) {
   const plan = buildAppsPlan(machineId);
   if (!options.apply)
     return plan;
@@ -5915,14 +5927,7 @@ function runAppsInstall(machineId, options = {}) {
   }
   let executed = 0;
   for (const step of plan.steps) {
-    const result = Bun.spawnSync(["bash", "-lc", step.command], {
-      stdout: "pipe",
-      stderr: "pipe",
-      env: process.env
-    });
-    if (result.exitCode !== 0) {
-      throw new Error(`App install failed (${step.id}): ${result.stderr.toString().trim()}`);
-    }
+    requireMachineCommandSuccess(`App install ${step.id}`, runner(plan.machineId, step.command));
     executed += 1;
   }
   return {
@@ -6209,25 +6214,28 @@ function buildClaudeInstallPlan(machineId, tools) {
     executed: 0
   };
 }
-function getClaudeCliStatus(machineId, tools) {
+function getClaudeCliStatus(machineId, tools, runner = runMachineCommand) {
   const machine = resolveMachine2(machineId);
   const normalizedTools = normalizeTools(tools);
-  const route = runMachineCommand(machine.id, "true").source;
+  const route = requireMachineCommandSuccess("AI CLI status readiness check", runner(machine.id, "true")).source;
   return {
     machineId: machine.id,
     source: route,
-    tools: normalizedTools.map((tool) => parseProbe(tool, runMachineCommand(machine.id, buildProbeCommand(tool)).stdout))
+    tools: normalizedTools.map((tool) => {
+      const result = requireMachineCommandSuccess(`AI CLI probe ${tool}`, runner(machine.id, buildProbeCommand(tool)));
+      return parseProbe(tool, result.stdout);
+    })
   };
 }
-function diffClaudeCli(machineId, tools) {
-  const status = getClaudeCliStatus(machineId, tools);
+function diffClaudeCli(machineId, tools, runner = runMachineCommand) {
+  const status = getClaudeCliStatus(machineId, tools, runner);
   return {
     ...status,
     missing: status.tools.filter((tool) => !tool.installed).map((tool) => tool.tool),
     installed: status.tools.filter((tool) => tool.installed).map((tool) => tool.tool)
   };
 }
-function runClaudeInstall(machineId, tools, options = {}) {
+function runClaudeInstall(machineId, tools, options = {}, runner = runMachineCommand) {
   const plan = buildClaudeInstallPlan(machineId, tools);
   if (!options.apply)
     return plan;
@@ -6236,14 +6244,7 @@ function runClaudeInstall(machineId, tools, options = {}) {
   }
   let executed = 0;
   for (const step of plan.steps) {
-    const result = Bun.spawnSync(["bash", "-lc", step.command], {
-      stdout: "pipe",
-      stderr: "pipe",
-      env: process.env
-    });
-    if (result.exitCode !== 0) {
-      throw new Error(`AI CLI install failed (${step.id}): ${result.stderr.toString().trim()}`);
-    }
+    requireMachineCommandSuccess(`AI CLI install ${step.id}`, runner(plan.machineId, step.command));
     executed += 1;
   }
   return {
@@ -6295,7 +6296,7 @@ function buildTailscaleInstallPlan(machineId) {
     executed: 0
   };
 }
-function runTailscaleInstall(machineId, options = {}) {
+function runTailscaleInstall(machineId, options = {}, runner = runMachineCommand) {
   const plan = buildTailscaleInstallPlan(machineId);
   if (!options.apply)
     return plan;
@@ -6304,14 +6305,7 @@ function runTailscaleInstall(machineId, options = {}) {
   }
   let executed = 0;
   for (const step of plan.steps) {
-    const result = Bun.spawnSync(["bash", "-lc", step.command], {
-      stdout: "pipe",
-      stderr: "pipe",
-      env: process.env
-    });
-    if (result.exitCode !== 0) {
-      throw new Error(`Tailscale install failed (${step.id}): ${result.stderr.toString().trim()}`);
-    }
+    requireMachineCommandSuccess(`Tailscale install ${step.id}`, runner(plan.machineId, step.command));
     executed += 1;
   }
   return {
@@ -6980,7 +6974,7 @@ function buildSetupPlan(machineId) {
     executed: 0
   };
 }
-function runSetup(machineId, options = {}) {
+function runSetup(machineId, options = {}, runner = runMachineCommand) {
   const plan = buildSetupPlan(machineId);
   if (!options.apply) {
     return plan;
@@ -6990,18 +6984,17 @@ function runSetup(machineId, options = {}) {
   }
   let executed = 0;
   for (const step of plan.steps) {
-    const result = Bun.spawnSync(["bash", "-lc", step.command], {
-      stdout: "pipe",
-      stderr: "pipe",
-      env: process.env
-    });
+    const result = runner(plan.machineId, step.command);
     if (result.exitCode !== 0) {
       recordSetupRun(plan.machineId, "failed", {
         executed,
         failedStep: step,
-        stderr: result.stderr.toString()
+        stderr: result.stderr,
+        stdout: result.stdout,
+        exitCode: result.exitCode,
+        source: result.source
       });
-      throw new Error(`Setup step failed (${step.id}): ${result.stderr.toString().trim()}`);
+      throw new Error(describeMachineCommandFailure(`Setup step ${step.id}`, result));
     }
     executed += 1;
   }
@@ -7022,16 +7015,17 @@ function quote4(value) {
   return `'${value.replace(/'/g, `'\\''`)}'`;
 }
 function packageCheckCommand(machine, packageName, manager = machine.platform === "macos" ? "brew" : "apt") {
+  const quotedPackageName = quote4(packageName);
   if (manager === "bun") {
-    return `bun pm ls -g --all | grep -F ${quote4(packageName)}`;
+    return `if bun pm ls -g --all 2>/dev/null | grep -F ${quotedPackageName} >/dev/null 2>&1; then printf 'installed=1\\n'; else printf 'installed=0\\n'; fi`;
   }
   if (manager === "brew") {
-    return `brew list --versions ${quote4(packageName)}`;
+    return `if brew list --versions ${quotedPackageName} >/dev/null 2>&1; then printf 'installed=1\\n'; else printf 'installed=0\\n'; fi`;
   }
   if (manager === "apt") {
-    return `dpkg -s ${quote4(packageName)} >/dev/null 2>&1`;
+    return `if dpkg -s ${quotedPackageName} >/dev/null 2>&1; then printf 'installed=1\\n'; else printf 'installed=0\\n'; fi`;
   }
-  return `command -v ${quote4(packageName)} >/dev/null 2>&1`;
+  return `if command -v ${quotedPackageName} >/dev/null 2>&1; then printf 'installed=1\\n'; else printf 'installed=0\\n'; fi`;
 }
 function packageInstallCommand(machine, packageName, manager = machine.platform === "macos" ? "brew" : "apt") {
   if (manager === "bun") {
@@ -7045,15 +7039,15 @@ function packageInstallCommand(machine, packageName, manager = machine.platform
   }
   return packageName;
 }
-function detectPackageActions(machine) {
+function detectPackageActions(machine, runner) {
   return (machine.packages || []).map((pkg, index) => {
     const manager = pkg.manager || (machine.platform === "macos" ? "brew" : "apt");
-    const check2 = Bun.spawnSync(["bash", "-lc", packageCheckCommand(machine, pkg.name, manager)], {
-      stdout: "ignore",
-      stderr: "ignore",
-      env: process.env
-    });
-    const installed = check2.exitCode === 0;
+    const check2 = runner(machine.id, packageCheckCommand(machine, pkg.name, manager));
+    if (check2.exitCode !== 0) {
+      throw new Error(describeMachineCommandFailure(`Sync package probe ${pkg.name}`, check2));
+    }
+    const installed = check2.stdout.split(`
+`).some((line) => line.trim() === "installed=1");
     return {
       id: `package-${index + 1}`,
       title: `${installed ? "Package present" : "Install package"} ${pkg.name}`,
@@ -7064,6 +7058,9 @@ function detectPackageActions(machine) {
   });
 }
 function detectFileActions(machine) {
+  if ((machine.files || []).length > 0 && resolveMachineCommand(machine.id, "true").source !== "local") {
+    throw new Error(`Remote file sync planning is not supported for ${machine.id}; refusing to inspect or apply local paths as remote state.`);
+  }
   return (machine.files || []).map((file, index) => {
     const sourceExists = existsSync8(file.source);
     const targetExists = existsSync8(file.target);
@@ -7087,7 +7084,7 @@ function detectFileActions(machine) {
     };
   });
 }
-function buildSyncPlan(machineId) {
+function buildSyncPlan(machineId, runner = runMachineCommand) {
   const manifest = readManifest();
   const currentMachineId = getLocalMachineId();
   const selected = machineId ? manifest.machines.find((machine) => machine.id === machineId) : manifest.machines.find((machine) => machine.id === currentMachineId);
@@ -7097,7 +7094,7 @@ function buildSyncPlan(machineId) {
     workspacePath: `${homedir6()}/workspace`
   };
   const actions = [
-    ...detectPackageActions(target),
+    ...detectPackageActions(target, runner),
     ...detectFileActions(target)
   ];
   return {
@@ -7127,8 +7124,8 @@ function applyFileAction(command) {
     symlinkSync(sourcePath, targetPath);
   }
 }
-function runSync(machineId, options = {}) {
-  const plan = buildSyncPlan(machineId);
+function runSync(machineId, options = {}, runner = runMachineCommand) {
+  const plan = buildSyncPlan(machineId, runner);
   if (!options.apply) {
     return plan;
   }
@@ -7142,18 +7139,17 @@ function runSync(machineId, options = {}) {
     if (action.kind === "file") {
       applyFileAction(action.command);
     } else {
-      const result = Bun.spawnSync(["bash", "-lc", action.command], {
-        stdout: "pipe",
-        stderr: "pipe",
-        env: process.env
-      });
+      const result = runner(plan.machineId, action.command);
       if (result.exitCode !== 0) {
         recordSyncRun(plan.machineId, "failed", {
           executed,
           failedAction: action,
-          stderr: result.stderr.toString()
+          stderr: result.stderr,
+          stdout: result.stdout,
+          exitCode: result.exitCode,
+          source: result.source
         });
-        throw new Error(`Sync action failed (${action.id}): ${result.stderr.toString().trim()}`);
+        throw new Error(describeMachineCommandFailure(`Sync action ${action.id}`, result));
       }
     }
     executed += 1;

package/dist/remote.d.ts

@@ -5,9 +5,12 @@ export interface MachineCommandResult {
     stderr: string;
     exitCode: number;
 }
+export type MachineCommandRunner = (machineId: string, command: string) => MachineCommandResult;
 export declare function resolveMachineCommand(machineId: string, command: string, localMachineId?: string): {
     source: MachineCommandResult["source"];
     shellCommand: string;
 };
 export declare function runMachineCommand(machineId: string, command: string): MachineCommandResult;
+export declare function describeMachineCommandFailure(operation: string, result: MachineCommandResult): string;
+export declare function requireMachineCommandSuccess(operation: string, result: MachineCommandResult): MachineCommandResult;
 //# sourceMappingURL=remote.d.ts.map

package/dist/remote.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"remote.d.ts","sourceRoot":"","sources":["../src/remote.ts"],"names":[],"mappings":"AAKA,MAAM,WAAW,oBAAoB;IACnC,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,OAAO,GAAG,KAAK,GAAG,WAAW,GAAG,KAAK,CAAC;IAC9C,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,MAAM,CAAC;CAClB;AAaD,wBAAgB,qBAAqB,CAAC,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,cAAc,SAAsB,GAAG;IAAE,MAAM,EAAE,oBAAoB,CAAC,QAAQ,CAAC,CAAC;IAAC,YAAY,EAAE,MAAM,CAAA;CAAE,CAiBhL;AAED,wBAAgB,iBAAiB,CAAC,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,oBAAoB,CAc1F"}
+{"version":3,"file":"remote.d.ts","sourceRoot":"","sources":["../src/remote.ts"],"names":[],"mappings":"AAKA,MAAM,WAAW,oBAAoB;IACnC,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,OAAO,GAAG,KAAK,GAAG,WAAW,GAAG,KAAK,CAAC;IAC9C,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,MAAM,CAAC;CAClB;AAED,MAAM,MAAM,oBAAoB,GAAG,CAAC,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,KAAK,oBAAoB,CAAC;AAahG,wBAAgB,qBAAqB,CAAC,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,cAAc,SAAsB,GAAG;IAAE,MAAM,EAAE,oBAAoB,CAAC,QAAQ,CAAC,CAAC;IAAC,YAAY,EAAE,MAAM,CAAA;CAAE,CAiBhL;AAED,wBAAgB,iBAAiB,CAAC,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,oBAAoB,CAc1F;AAED,wBAAgB,6BAA6B,CAAC,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,oBAAoB,GAAG,MAAM,CAIrG;AAED,wBAAgB,4BAA4B,CAAC,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,oBAAoB,GAAG,oBAAoB,CAKlH"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hasna/machines",
-  "version": "0.0.29",
+  "version": "0.0.31",
   "description": "Machine fleet management CLI + MCP for developers",
   "type": "module",
   "license": "Apache-2.0",
@@ -57,7 +57,7 @@
   },
   "repository": {
     "type": "git",
-    "url": "https://github.com/hasna/machines.git"
+    "url": "git+https://github.com/hasna/machines.git"
   },
   "homepage": "https://github.com/hasna/machines",
   "bugs": {
@@ -67,7 +67,7 @@
     "bun": ">=1.0.0"
   },
   "dependencies": {
-    "@hasna/events": "^0.1.3",
+    "@hasna/events": "^0.1.7",
     "@modelcontextprotocol/sdk": "^1.26.0",
     "chalk": "^5.6.2",
     "commander": "^13.1.0",