tokentracker-cli 1.2.1 → 1.3.3

package/src/lib/openclaw-cli.js

@@ -0,0 +1,104 @@
+const cp = require("node:child_process");
+const fs = require("node:fs");
+const path = require("node:path");
+
+function cliError(message, code) {
+  return Object.assign(new Error(message), { code });
+}
+
+function isFile(file) {
+  try {
+    return fs.statSync(file).isFile();
+  } catch (error) {
+    if (error.code === "ENOENT" || error.code === "ENOTDIR") return false;
+    throw error;
+  }
+}
+
+function resolveOpenclawCommand(env, platform = process.platform) {
+  if (platform !== "win32") return { command: "openclaw", prefixArgs: [] };
+
+  // Match Node's case-insensitive Windows environment lookup. An explicit
+  // empty PATH must not fall back to the user's real OpenClaw installation.
+  const pathKey = Object.keys(env).sort().find((key) => key.toUpperCase() === "PATH");
+  const searchPath = pathKey === undefined ? process.env.PATH || "" : env[pathKey];
+  for (const entry of String(searchPath || "").split(";")) {
+    const dir = entry.trim().replace(/^"(.*)"$/, "$1");
+    if (!dir) continue;
+    const executable = path.join(dir, "openclaw.exe");
+    if (isFile(executable)) return { command: executable, prefixArgs: [] };
+    if (!isFile(path.join(dir, "openclaw.cmd"))) continue;
+
+    // npm puts Windows shims in the prefix, alongside node_modules. Launch
+    // the declared JS bin with Node directly: cmd.exe would re-interpret
+    // user paths containing %, &, or other shell metacharacters.
+    const packageDir = path.join(dir, "node_modules", "openclaw");
+    let metadata;
+    try {
+      metadata = JSON.parse(fs.readFileSync(path.join(packageDir, "package.json"), "utf8"));
+    } catch (error) {
+      throw cliError(`Cannot resolve npm OpenClaw entry: ${error.message}`, "EINVAL");
+    }
+    const bin = typeof metadata.bin === "string" ? metadata.bin : metadata.bin?.openclaw;
+    if (metadata.name !== "openclaw" || typeof bin !== "string" || !/\.(?:[cm]?js)$/i.test(bin)) {
+      throw cliError("Unsupported npm OpenClaw entry", "EINVAL");
+    }
+    const packageRoot = fs.realpathSync.native(packageDir);
+    const target = fs.realpathSync.native(path.resolve(packageDir, bin));
+    const relative = path.relative(packageRoot, target);
+    if (!relative || relative === ".." || relative.startsWith(`..${path.sep}`) || path.isAbsolute(relative) || !isFile(target)) {
+      throw cliError("npm OpenClaw entry is outside its package", "EINVAL");
+    }
+    return { command: process.execPath, prefixArgs: [target] };
+  }
+  throw cliError("OpenClaw CLI is not on PATH", "ENOENT");
+}
+
+function runOpenclawCli(args, env = process.env) {
+  if (env?.TOKENTRACKER_SKIP_OPENCLAW_CLI === "1") {
+    return {
+      code: 1,
+      skippedReason: "openclaw-cli-missing",
+      error: "skipped via TOKENTRACKER_SKIP_OPENCLAW_CLI",
+      stdout: "",
+      stderr: "",
+    };
+  }
+  let result;
+  try {
+    const { command, prefixArgs } = resolveOpenclawCommand(env);
+    result = cp.spawnSync(command, [...prefixArgs, ...args], {
+      env,
+      encoding: "utf8",
+      timeout: 30_000,
+      windowsHide: true,
+      shell: false,
+    });
+  } catch (error) {
+    result = { error };
+  }
+  const stdout = result.stdout || "";
+  const stderr = result.stderr || "";
+  if (result.error) {
+    return {
+      code: 1,
+      skippedReason: result.error.code === "ENOENT" ? "openclaw-cli-missing" : "openclaw-cli-error",
+      error: result.error.message || String(result.error),
+      stdout,
+      stderr,
+    };
+  }
+  if (result.status !== 0) {
+    const scope = args[0] === "hooks" ? "hooks" : "plugins";
+    return {
+      code: Number(result.status || 1),
+      skippedReason: `openclaw-${scope}-install-failed`,
+      error: (stderr || stdout).trim() || `openclaw ${scope} install failed`,
+      stdout,
+      stderr,
+    };
+  }
+  return { code: 0, stdout, stderr };
+}
+
+module.exports = { resolveOpenclawCommand, runOpenclawCli };

package/src/lib/openclaw-hook.js

@@ -2,7 +2,7 @@ const os = require("node:os");
 const path = require("node:path");
 const fs = require("node:fs/promises");
 const fssync = require("node:fs");
-const cp = require("node:child_process");
+const { runOpenclawCli } = require("./openclaw-cli");
 
 const OPENCLAW_HOOK_NAME = "tokentracker-openclaw-sync";
 const OPENCLAW_HOOK_DIRNAME = "openclaw-hook";
@@ -223,51 +223,6 @@ async function removeOpenclawHookConfig({
   return { removed: changed, ...paths };
 }
 
-function runOpenclawCli(args, env = process.env) {
-  let res;
-  try {
-    res = cp.spawnSync("openclaw", args, {
-      env,
-      encoding: "utf8",
-      timeout: 30_000,
-    });
-  } catch (err) {
-    return {
-      code: 1,
-      skippedReason: err?.code === "ENOENT" ? "openclaw-cli-missing" : "openclaw-cli-error",
-      error: err?.message || String(err),
-      stdout: "",
-      stderr: "",
-    };
-  }
-
-  if (res.error?.code === "ENOENT") {
-    return {
-      code: 1,
-      skippedReason: "openclaw-cli-missing",
-      error: res.error.message,
-      stdout: res.stdout || "",
-      stderr: res.stderr || "",
-    };
-  }
-
-  if ((res.status || 0) !== 0) {
-    return {
-      code: Number(res.status || 1),
-      skippedReason: "openclaw-hooks-install-failed",
-      error: (res.stderr || res.stdout || "").trim() || "openclaw hooks install failed",
-      stdout: res.stdout || "",
-      stderr: res.stderr || "",
-    };
-  }
-
-  return {
-    code: 0,
-    stdout: res.stdout || "",
-    stderr: res.stderr || "",
-  };
-}
-
 function buildHookMarkdown() {
   return `---
 name: ${OPENCLAW_HOOK_NAME}

package/src/lib/openclaw-session-plugin.js

@@ -2,7 +2,7 @@ const os = require("node:os");
 const path = require("node:path");
 const fs = require("node:fs/promises");
 const fssync = require("node:fs");
-const cp = require("node:child_process");
+const { runOpenclawCli } = require("./openclaw-cli");
 
 const OPENCLAW_SESSION_PLUGIN_ID = "openclaw-session-sync";
 const OPENCLAW_SESSION_PLUGIN_DIRNAME = "openclaw-plugin";
@@ -311,64 +311,6 @@ async function removeOpenclawSessionPluginConfig({
   return { removed: changed || hadFiles, ...paths };
 }
 
-function runOpenclawCli(args, env = process.env) {
-  // Test-only escape hatch: skip spawning the real `openclaw` CLI. Behaves like
-  // the CLI being absent (which is the CI environment anyway), so callers take
-  // their graceful skip path. Avoids a ~2s `plugins install --link` per cmdInit
-  // on dev machines that happen to have openclaw installed.
-  if ((env && env.TOKENTRACKER_SKIP_OPENCLAW_CLI) === "1") {
-    return {
-      code: 1,
-      skippedReason: "openclaw-cli-missing",
-      error: "skipped via TOKENTRACKER_SKIP_OPENCLAW_CLI",
-      stdout: "",
-      stderr: "",
-    };
-  }
-  let res;
-  try {
-    res = cp.spawnSync("openclaw", args, {
-      env,
-      encoding: "utf8",
-      timeout: 30_000,
-    });
-  } catch (err) {
-    return {
-      code: 1,
-      skippedReason: err?.code === "ENOENT" ? "openclaw-cli-missing" : "openclaw-cli-error",
-      error: err?.message || String(err),
-      stdout: "",
-      stderr: "",
-    };
-  }
-
-  if (res.error?.code === "ENOENT") {
-    return {
-      code: 1,
-      skippedReason: "openclaw-cli-missing",
-      error: res.error.message,
-      stdout: res.stdout || "",
-      stderr: res.stderr || "",
-    };
-  }
-
-  if ((res.status || 0) !== 0) {
-    return {
-      code: Number(res.status || 1),
-      skippedReason: "openclaw-plugins-install-failed",
-      error: (res.stderr || res.stdout || "").trim() || "openclaw plugins install failed",
-      stdout: res.stdout || "",
-      stderr: res.stderr || "",
-    };
-  }
-
-  return {
-    code: 0,
-    stdout: res.stdout || "",
-    stderr: res.stderr || "",
-  };
-}
-
 function buildSessionPluginPackageJson() {
   return `${JSON.stringify(
     {