@actiondock/cli 2.0.4 → 2.0.7

package/bin/ad.js

@@ -1,17 +1,32 @@
 #!/usr/bin/env node
 import { spawnSync } from "node:child_process";
-import { fileURLToPath } from "node:url";
+import { createRequire } from "node:module";
+import { fileURLToPath, pathToFileURL } from "node:url";
 
 const isBun = typeof process.versions.bun !== "undefined";
 
 if (!isBun && !process.env.ACTIONDOCK_TSX_BOOTSTRAPPED) {
   const hasTsx =
-    process.execArgv.some((arg, i) => arg === "--import" && process.execArgv[i + 1] === "tsx") ||
+    process.execArgv.some((arg, i) => arg === "--import" && process.execArgv[i + 1]?.includes("tsx")) ||
     process.execArgv.some((arg) => arg.includes("tsx"));
   if (!hasTsx) {
+    const require = createRequire(import.meta.url);
+    let tsxSpecifier = "tsx";
+    try {
+      tsxSpecifier = pathToFileURL(require.resolve("tsx")).href;
+    } catch {
+      try {
+        const runtimeNodePkg = require.resolve("@actiondock/runtime-node/package.json");
+        const runtimeReq = createRequire(runtimeNodePkg);
+        tsxSpecifier = pathToFileURL(runtimeReq.resolve("tsx")).href;
+      } catch {
+        // 回退为裸模块名
+      }
+    }
+
     const res = spawnSync(
       process.execPath,
-      ["--import", "tsx", fileURLToPath(import.meta.url), ...process.argv.slice(2)],
+      ["--import", tsxSpecifier, fileURLToPath(import.meta.url), ...process.argv.slice(2)],
       {
         stdio: "inherit",
         env: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@actiondock/cli",
-  "version": "2.0.4",
+  "version": "2.0.7",
   "description": "ActionDock CLI facade for developing, testing, building, and exporting standalone Agent Actions and Skills",
   "type": "module",
   "bin": {
@@ -34,7 +34,8 @@
     "@actiondock/runtime-cli": "^2.0.0",
     "@actiondock/runtime-node": "^2.0.0",
     "@actiondock/sdk": "^2.0.0",
-    "commander": "^13.1.0"
+    "commander": "^13.1.0",
+    "tsx": "^4.19.3"
   },
   "devDependencies": {
     "@types/bun": "latest",

package/src/commands/index.ts

@@ -21,7 +21,7 @@ export function createCliProgram(): Command {
   program
     .name("ad")
     .description("ActionDock (ad) 2.0 - Toolchain for building and shipping standalone AI Agent Actions & Skills")
-    .version("2.0.4");
+    .version("2.0.7");
 
   registerInitCommand(program);
   registerInfoCommand(program);