traderclaw-cli 1.0.117 → 1.0.120

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)] : [];
@@ -757,6 +798,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 +860,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 +1384,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 +1422,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 +1455,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);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "traderclaw-cli",
-  "version": "1.0.117",
+  "version": "1.0.120",
   "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.120"
   },
   "keywords": [
     "traderclaw",