traderclaw-cli 1.0.117 → 1.0.121

package/bin/installer-step-engine.mjs

@@ -284,6 +284,47 @@ function getCommandOutput(cmd, { timeoutMs = 0 } = {}) {
   }
 }
 
+/**
+ * First existing `skills/solana-trader` directory: local package → OpenClaw extension → global npm.
+ * @param {{ pluginId: string, pluginPackage: string }} modeConfig
+ * @returns {string|null}
+ */
+export function resolveSolanaTraderPackagedRoot(modeConfig) {
+  const candidates = [
+    join(PLUGIN_PACKAGE_ROOT, "skills", "solana-trader"),
+    join(homedir(), ".openclaw", "extensions", modeConfig.pluginId, "skills", "solana-trader"),
+  ];
+  const npmRoot = getCommandOutput("npm root -g");
+  if (npmRoot) {
+    candidates.push(join(npmRoot, modeConfig.pluginPackage, "skills", "solana-trader"));
+  }
+  for (const dir of candidates) {
+    if (existsSync(dir)) return dir;
+  }
+  return null;
+}
+
+/**
+ * First existing gateway template file under `config/{filename}`.
+ * @param {{ pluginId: string, pluginPackage: string }} modeConfig
+ * @param {string} gatewayConfigFilename
+ * @returns {string|null}
+ */
+function resolveGatewayConfigSourcePath(modeConfig, gatewayConfigFilename) {
+  const candidates = [
+    join(PLUGIN_PACKAGE_ROOT, "config", gatewayConfigFilename),
+    join(homedir(), ".openclaw", "extensions", modeConfig.pluginId, "config", gatewayConfigFilename),
+  ];
+  const npmRoot = getCommandOutput("npm root -g");
+  if (npmRoot) {
+    candidates.push(join(npmRoot, modeConfig.pluginPackage, "config", gatewayConfigFilename));
+  }
+  for (const p of candidates) {
+    if (existsSync(p)) return p;
+  }
+  return null;
+}
+
 function extractUrls(text = "") {
   const matches = text.match(/https?:\/\/[^\s"')]+/g);
   return matches ? [...new Set(matches)] : [];
@@ -410,7 +451,25 @@ function isOpenClawConfigSchemaFailure(text) {
 
 function runCommandWithEvents(cmd, args = [], opts = {}) {
   return new Promise((resolve, reject) => {
-    const { onEvent, ...spawnOpts } = opts;
+    const {
+      onEvent,
+      timeoutMs = 0,
+      heartbeatMs = 0,
+      heartbeatText = "command still running…",
+      ...spawnOpts
+    } = opts;
+
+    let settled = false;
+    let timeoutId;
+    let heartbeatId;
+    const finish = (fn, arg) => {
+      if (settled) return;
+      settled = true;
+      if (timeoutId) clearTimeout(timeoutId);
+      if (heartbeatId) clearInterval(heartbeatId);
+      fn(arg);
+    };
+
     const isNpm = /(?:^|[\\/])npm(?:\.cmd)?$/.test(cmd) || cmd === "npm";
     if (isNpm && !spawnOpts.env?.NODE_OPTIONS?.includes("max-old-space-size")) {
       spawnOpts.env = {
@@ -430,6 +489,44 @@ function runCommandWithEvents(cmd, args = [], opts = {}) {
     const emitFn = typeof onEvent === "function" ? onEvent : null;
     const emit = (event) => emitFn && emitFn(event);
 
+    if (typeof timeoutMs === "number" && timeoutMs > 0) {
+      timeoutId = setTimeout(() => {
+        try {
+          child.kill("SIGTERM");
+        } catch {
+          /* ignore */
+        }
+        setTimeout(() => {
+          try {
+            child.kill("SIGKILL");
+          } catch {
+            /* ignore */
+          }
+        }, 12_000);
+        const tail = `${stdout}\n${stderr}`.trim().slice(-6000);
+        const err = new Error(
+          `Timed out after ${timeoutMs}ms: ${cmd} ${args.join(" ")}\n`
+            + `Last output:\n${tail || "(no output yet — possible npm registry or network stall; try again or run the same npm command in a terminal)"}`,
+        );
+        err.timedOut = true;
+        err.stdout = stdout;
+        err.stderr = stderr;
+        finish(reject, err);
+      }, timeoutMs);
+    }
+
+    if (typeof heartbeatMs === "number" && heartbeatMs > 0 && emitFn) {
+      const start = Date.now();
+      heartbeatId = setInterval(() => {
+        const sec = Math.floor((Date.now() - start) / 1000);
+        emitFn({
+          type: "stdout",
+          text: `[installer] ${heartbeatText} (${sec}s elapsed).\n`,
+          urls: [],
+        });
+      }, heartbeatMs);
+    }
+
     child.stdout?.on("data", (d) => {
       const text = d.toString();
       stdout += text;
@@ -443,8 +540,9 @@ function runCommandWithEvents(cmd, args = [], opts = {}) {
     });
 
     child.on("close", (code) => {
+      if (settled) return;
       const urls = [...new Set([...extractUrls(stdout), ...extractUrls(stderr)])];
-      if (code === 0) resolve({ stdout, stderr, code, urls });
+      if (code === 0) finish(resolve, { stdout, stderr, code, urls });
       else {
         const isOom = code === 137 || (stderr || stdout || "").includes("Killed");
         const raw = (stderr || "").trim();
@@ -459,10 +557,10 @@ function runCommandWithEvents(cmd, args = [], opts = {}) {
         err.stderr = stderr;
         err.urls = urls;
         err.oom = isOom;
-        reject(err);
+        finish(reject, err);
       }
     });
-    child.on("error", reject);
+    child.on("error", (e) => finish(reject, e));
   });
 }
 
@@ -494,7 +592,7 @@ export async function ensureOpenClawGlobalPackageDependencies() {
     return { skipped: true, reason: "global_openclaw_dir_not_found" };
   }
   const registry = "https://registry.npmjs.org/";
-  const installFlags = ["install", "--omit=dev", "--ignore-scripts", "--registry", registry];
+  const installFlags = ["install", "--omit=dev", "--ignore-scripts", "--no-audit", "--no-fund", "--registry", registry];
   await runCommandWithEvents("npm", installFlags, { cwd: dir, shell: false });
   await runCommandWithEvents(
     "npm",
@@ -503,6 +601,8 @@ export async function ensureOpenClawGlobalPackageDependencies() {
       "--omit=dev",
       "--no-save",
       "--ignore-scripts",
+      "--no-audit",
+      "--no-fund",
       "--registry",
       registry,
       "grammy",
@@ -533,11 +633,49 @@ async function installOpenClawPlatform(onEvent) {
     });
   }
   const npmCwd = getNpmGlobalInstallCwd();
-  await runCommandWithEvents("npm", ["install", "-g", "--ignore-scripts", "--registry", "https://registry.npmjs.org/", `openclaw@${OPENCLAW_VERSION}`], {
-    onEvent,
-    cwd: npmCwd,
-    shell: false,
-  });
+  const npmTimeoutMs = Number.parseInt(String(process.env.TRADERCLAW_OPENCLAW_NPM_TIMEOUT_MS || "").trim(), 10);
+  const effectiveTimeout = Number.isFinite(npmTimeoutMs) && npmTimeoutMs > 0 ? npmTimeoutMs : 1_800_000;
+  if (typeof onEvent === "function") {
+    onEvent({
+      type: "stdout",
+      text:
+        `Running: npm install -g openclaw@${OPENCLAW_VERSION} (cwd=${npmCwd}, --no-audit --no-fund). `
+        + "First-time or upgrade installs can take several minutes; live npm lines and heartbeats appear below. "
+        + `Also watch the terminal where you started \`traderclaw install --wizard\`. `
+        + `Override stall limit: TRADERCLAW_OPENCLAW_NPM_TIMEOUT_MS (ms), default ${effectiveTimeout}.\n`,
+      urls: [],
+    });
+  }
+  await runCommandWithEvents(
+    "npm",
+    [
+      "install",
+      "-g",
+      "--ignore-scripts",
+      "--no-audit",
+      "--no-fund",
+      "--loglevel",
+      "info",
+      "--registry",
+      "https://registry.npmjs.org/",
+      `openclaw@${OPENCLAW_VERSION}`,
+    ],
+    {
+      onEvent,
+      cwd: npmCwd,
+      shell: false,
+      timeoutMs: effectiveTimeout,
+      heartbeatMs: 60_000,
+      heartbeatText:
+        "npm still installing OpenClaw — if this repeats for a long time, check disk space, DNS, and outbound HTTPS to registry.npmjs.org",
+      env: {
+        ...process.env,
+        // Non-interactive / fewer slow npm side trips (fundraising prompts, audit).
+        ...(process.env.CI ? {} : { CI: "true" }),
+        npm_config_update_notifier: process.env.npm_config_update_notifier ?? "false",
+      },
+    },
+  );
   const available = commandExists("openclaw");
   let version = available ? getCommandOutput("openclaw --version", { timeoutMs: OPENCLAW_CLI_VERSION_TIMEOUT_MS }) : null;
   if (available && !version && typeof onEvent === "function") {
@@ -618,7 +756,7 @@ function isNpmFilesystemPackageSpec(spec) {
  * IMPORTANT: run with `{ shell: false }` — `spawn(..., { shell: true })` can drop argv on Unix and npm then mis-resolves the package name.
  */
 function npmGlobalInstallArgs(spec, { force = false } = {}) {
-  const args = ["install", "-g", "--ignore-scripts"];
+  const args = ["install", "-g", "--ignore-scripts", "--no-audit", "--no-fund"];
   if (force) args.push("--force");
   if (!isNpmFilesystemPackageSpec(spec)) {
     args.push("--registry", "https://registry.npmjs.org/");
@@ -757,6 +895,31 @@ async function installAndEnableOpenClawPlugin(modeConfig, onEvent, orchestratorU
   };
 }
 
+/**
+ * Idempotent: ensure OpenClaw discovers skills under ~/.openclaw/extensions/<pluginId>/skills (extraDirs).
+ * See OpenClaw workspace skill loader: config.skills.load.extraDirs → openclaw-extra.
+ * @param {Record<string, unknown>} config
+ * @param {string} pluginId
+ */
+function ensureTraderSkillsExtraDir(config, pluginId) {
+  const marker = `.openclaw/extensions/${pluginId}/skills`;
+  const tildeEntry = `~/.openclaw/extensions/${pluginId}/skills`;
+  if (!config.skills || typeof config.skills !== "object") config.skills = {};
+  if (!config.skills.load || typeof config.skills.load !== "object") config.skills.load = {};
+  const raw = config.skills.load.extraDirs;
+  const dirs = Array.isArray(raw) ? [...raw] : [];
+  const normalized = (d) => (typeof d === "string" ? d.replace(/\\/g, "/") : "");
+  const needle = normalized(tildeEntry);
+  const hasMarker = dirs.some((d) => {
+    const n = normalized(d);
+    return n.includes(marker) || n === needle;
+  });
+  if (!hasMarker) {
+    dirs.push(tildeEntry);
+    config.skills.load.extraDirs = dirs;
+  }
+}
+
 function seedPluginConfig(modeConfig, orchestratorUrl, configPath = CONFIG_FILE) {
   const defaultUrl = orchestratorUrl || "https://api.traderclaw.ai";
 
@@ -794,6 +957,8 @@ function seedPluginConfig(modeConfig, orchestratorUrl, configPath = CONFIG_FILE)
 
   mergeOrchestratorForId(modeConfig.pluginId);
 
+  ensureTraderSkillsExtraDir(config, modeConfig.pluginId);
+
   // Do not set plugins.allow here: OpenClaw validates allow[] against the plugin registry, and
   // the id is not registered until after `openclaw plugins install`. Pre-seeding allow caused:
   // "plugins.allow: plugin not found: <id>".
@@ -1316,10 +1481,8 @@ function deployGatewayConfig(modeConfig) {
   const gatewayDir = join(CONFIG_DIR, "gateway");
   mkdirSync(gatewayDir, { recursive: true });
   const destFile = join(gatewayDir, modeConfig.gatewayConfig);
-  const npmRoot = getCommandOutput("npm root -g");
-  if (!npmRoot) return { deployed: false, dest: destFile };
-  const src = join(npmRoot, modeConfig.pluginPackage, "config", modeConfig.gatewayConfig);
-  if (!existsSync(src)) return { deployed: false, dest: destFile };
+  const src = resolveGatewayConfigSourcePath(modeConfig, modeConfig.gatewayConfig);
+  if (!src) return { deployed: false, dest: destFile };
   writeFileSync(destFile, readFileSync(src));
   return { deployed: true, source: src, dest: destFile };
 }
@@ -1356,13 +1519,13 @@ export function resolveAgentWorkspaceDir(configPath = CONFIG_FILE) {
 }
 
 /**
- * Copy skills/solana-trader/HEARTBEAT.md from the globally installed npm package into the workspace root.
+ * Copy skills/solana-trader/HEARTBEAT.md from the plugin package, OpenClaw extension, or global npm into the workspace root.
  * Skips overwrite if a non-empty file already exists (user may have customized it).
  */
 export function deployWorkspaceHeartbeat(modeConfig) {
-  const npmRoot = getCommandOutput("npm root -g");
-  if (!npmRoot) return { deployed: false, reason: "npm_root_g_failed" };
-  const src = join(npmRoot, modeConfig.pluginPackage, "skills", "solana-trader", "HEARTBEAT.md");
+  const skillRoot = resolveSolanaTraderPackagedRoot(modeConfig);
+  if (!skillRoot) return { deployed: false, reason: "source_missing" };
+  const src = join(skillRoot, "HEARTBEAT.md");
   if (!existsSync(src)) return { deployed: false, reason: "source_missing", src };
 
   const workspaceDir = resolveAgentWorkspaceDir(CONFIG_FILE);
@@ -1389,10 +1552,10 @@ export function deployWorkspaceHeartbeat(modeConfig) {
  * Skips files that already exist and are non-empty so user customisations are preserved.
  */
 export function deployWorkspaceBootstrapFiles(modeConfig) {
-  const npmRoot = getCommandOutput("npm root -g");
-  if (!npmRoot) return { deployed: [], skipped: [], failed: [], reason: "npm_root_g_failed" };
+  const skillRoot = resolveSolanaTraderPackagedRoot(modeConfig);
+  if (!skillRoot) return { deployed: [], skipped: [], failed: [], reason: "source_dir_missing" };
 
-  const srcDir = join(npmRoot, modeConfig.pluginPackage, "skills", "solana-trader", "workspace");
+  const srcDir = join(skillRoot, "workspace");
   if (!existsSync(srcDir)) return { deployed: [], skipped: [], failed: [], reason: "source_dir_missing", srcDir };
 
   const workspaceDir = resolveAgentWorkspaceDir(CONFIG_FILE);
@@ -2580,7 +2743,7 @@ export class InstallerStepEngine {
           }
           this.emitLog("install_qmd", "info", "Installing @tobilu/qmd globally for vector search memory...");
           try {
-            await runCommandWithEvents("npm", ["install", "-g", "--ignore-scripts", "--registry", "https://registry.npmjs.org/", "@tobilu/qmd"], {
+            await runCommandWithEvents("npm", ["install", "-g", "--ignore-scripts", "--no-audit", "--no-fund", "--registry", "https://registry.npmjs.org/", "@tobilu/qmd"], {
               onEvent: (evt) => this.emitLog("install_qmd", evt.type === "stderr" ? "warn" : "info", evt.text, evt.urls || []),
             });
           } catch (err) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "traderclaw-cli",
-  "version": "1.0.117",
+  "version": "1.0.121",
   "description": "Global TraderClaw CLI (install --wizard, setup, precheck). Installs solana-traderclaw as a dependency for OpenClaw plugin files.",
   "type": "module",
   "bin": {
@@ -17,7 +17,7 @@
     "node": ">=22"
   },
   "dependencies": {
-    "solana-traderclaw": "^1.0.117"
+    "solana-traderclaw": "^1.0.121"
   },
   "keywords": [
     "traderclaw",