@tokenbuddy/tokenbuddy 1.0.24 → 1.0.25

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tokenbuddy/tokenbuddy",
-  "version": "1.0.24",
+  "version": "1.0.25",
   "description": "TokenBuddy Client CLI and Daemon",
   "main": "dist/src/index.js",
   "types": "dist/src/index.d.ts",

package/src/init-clawtip-activation.ts

@@ -132,9 +132,38 @@ function isClawtipPayWalletAuthOutput(args: string[], output: string): boolean {
     || lower.includes("扫码");
 }
 
+export interface ResolveNpxCommandOptions {
+  execPath?: string;
+  envPath?: string;
+  platform?: NodeJS.Platform;
+  exists?: (filePath: string) => boolean;
+}
+
+export function resolveNpxCommand(options: ResolveNpxCommandOptions = {}): string {
+  const platform = options.platform ?? process.platform;
+  const binaryName = platform === "win32" ? "npx.cmd" : "npx";
+  const exists = options.exists ?? ((filePath: string) => fs.existsSync(filePath));
+  const execPath = options.execPath ?? process.execPath;
+  const envPath = options.envPath ?? process.env.PATH ?? "";
+  const candidates = [
+    execPath ? path.join(path.dirname(execPath), binaryName) : undefined,
+    ...envPath.split(path.delimiter).map((entry) => entry ? path.join(entry, binaryName) : undefined),
+    "/opt/homebrew/bin/npx",
+    "/usr/local/bin/npx",
+    "/usr/bin/npx",
+  ].filter((candidate): candidate is string => Boolean(candidate));
+
+  for (const candidate of Array.from(new Set(candidates))) {
+    if (exists(candidate)) {
+      return candidate;
+    }
+  }
+  return binaryName;
+}
+
 async function runClawtipCli(args: string[]): Promise<string> {
   return await new Promise((resolve, reject) => {
-    const child = spawn("npx", args, {
+    const child = spawn(resolveNpxCommand(), args, {
       stdio: ["ignore", "pipe", "pipe"],
     });
     let stdout = "";

package/tests/tokenbuddy.test.ts

@@ -13,6 +13,7 @@ import {
   checkOpenClawRuntime,
   parseClawtipCliOutput,
   readClawtipPayCredential,
+  resolveNpxCommand,
   resolveClawtipQrMediaPath,
   startClawtipWalletBootstrap,
   waitForClawtipActivationConfirmation,
@@ -1116,6 +1117,24 @@ describe("TokenBuddy init payment options", () => {
     expect(parsed.requiresWalletAuth).toBe(true);
   });
 
+  test("resolves npx next to the Node executable when PATH is sparse", () => {
+    const resolved = resolveNpxCommand({
+      execPath: "/opt/homebrew/Cellar/node/26.0.0/bin/node",
+      envPath: "/usr/bin:/bin",
+      exists: (filePath) => filePath === "/opt/homebrew/Cellar/node/26.0.0/bin/npx",
+    });
+
+    expect(resolved).toBe("/opt/homebrew/Cellar/node/26.0.0/bin/npx");
+  });
+
+  test("falls back to npx command name when no absolute candidate exists", () => {
+    expect(resolveNpxCommand({
+      execPath: "/missing/bin/node",
+      envPath: "/usr/bin:/bin",
+      exists: () => false,
+    })).toBe("npx");
+  });
+
   test("surfaces ClawTip upstream payment errors directly", async () => {
     const parsed = parseClawtipCliOutput("ClawTip 返回错误：商家信息有误");