solana-traderclaw 1.0.42 → 1.0.43

package/README.md

@@ -44,6 +44,11 @@ Or install directly into OpenClaw:
 openclaw plugins install solana-traderclaw
 ```
 
+Install name and config id are intentionally different:
+- npm package / install command: `solana-traderclaw`
+- OpenClaw plugin id in `openclaw.json`: `solana-trader`
+- OpenClaw allowlist entry: `plugins.allow: ["solana-trader"]`
+
 ### 2. Run setup
 
 ```bash
@@ -143,7 +148,7 @@ traderclaw config set <key> <v> # Update a value
 traderclaw config reset         # Remove all plugin config
 ```
 
-Available config keys: `orchestratorUrl`, `walletId`, `apiKey`, `apiTimeout`, `refreshToken`, `walletPublicKey`, `walletPrivateKey`, `gatewayBaseUrl`, `gatewayToken`, `agentId`
+Available config keys: `orchestratorUrl`, `walletId`, `apiKey`, `apiTimeout`, `refreshToken`, `recoverySecret`, `walletPublicKey`, `walletPrivateKey`, `gatewayBaseUrl`, `gatewayToken`, `agentId`
 
 ### `traderclaw --help`
 
@@ -160,6 +165,7 @@ If you prefer to configure manually instead of using the CLI, add to `~/.opencla
 ```json5
 {
   plugins: {
+    allow: ["solana-trader"],
     entries: {
       "solana-trader": {
         enabled: true,

package/bin/installer-step-engine.mjs

@@ -55,8 +55,105 @@ function getNpmGlobalInstallCwd() {
   }
 }
 
-/** Older `plugins.entries` keys / npm-era ids to merge orchestrator URL for. */
-const LEGACY_TRADER_PLUGIN_IDS = ["traderclaw-v1", "solana-traderclaw-v1", "solana-trader"];
+/** Older `plugins.entries` keys / npm-era ids for the v1 plugin. */
+const LEGACY_TRADER_PLUGIN_IDS = ["traderclaw-v1", "solana-traderclaw-v1", "solana-traderclaw"];
+
+function isRecord(value) {
+  return !!value && typeof value === "object" && !Array.isArray(value);
+}
+
+function getLegacyTraderPluginIds(pluginId) {
+  return pluginId === "solana-trader" ? LEGACY_TRADER_PLUGIN_IDS : [];
+}
+
+function normalizeTraderPluginEntries(config, pluginId) {
+  if (!isRecord(config)) return false;
+  if (!isRecord(config.plugins)) config.plugins = {};
+  if (!isRecord(config.plugins.entries)) config.plugins.entries = {};
+
+  const entries = config.plugins.entries;
+  const legacyIds = getLegacyTraderPluginIds(pluginId);
+  if (legacyIds.length === 0) return false;
+
+  let touched = false;
+  let hasSource = false;
+  let enabledSeen = false;
+  let enabledValue = false;
+  let mergedConfig = {};
+
+  for (const sourceId of [...legacyIds, pluginId]) {
+    const entry = entries[sourceId];
+    if (!isRecord(entry)) continue;
+    hasSource = true;
+    if (typeof entry.enabled === "boolean") {
+      enabledSeen = true;
+      enabledValue = enabledValue || entry.enabled;
+    }
+    if (isRecord(entry.config)) {
+      mergedConfig = { ...mergedConfig, ...entry.config };
+    }
+  }
+
+  if (!hasSource) return false;
+
+  const canonicalEntry = isRecord(entries[pluginId]) ? entries[pluginId] : {};
+  const nextEntry = {
+    ...canonicalEntry,
+    enabled: typeof canonicalEntry.enabled === "boolean" ? canonicalEntry.enabled : (enabledSeen ? enabledValue : true),
+    config: mergedConfig,
+  };
+
+  if (entries[pluginId] !== nextEntry) {
+    entries[pluginId] = nextEntry;
+    touched = true;
+  }
+
+  for (const legacyId of legacyIds) {
+    if (Object.prototype.hasOwnProperty.call(entries, legacyId)) {
+      delete entries[legacyId];
+      touched = true;
+    }
+  }
+
+  return touched;
+}
+
+function normalizeTraderAllowlist(config, pluginId) {
+  if (!isRecord(config?.plugins)) return false;
+  const legacyIds = new Set(getLegacyTraderPluginIds(pluginId));
+  if (legacyIds.size === 0 || !Array.isArray(config.plugins.allow)) return false;
+
+  const nextAllow = [];
+  const seen = new Set();
+  let touched = false;
+
+  for (const id of config.plugins.allow) {
+    if (typeof id !== "string") {
+      touched = true;
+      continue;
+    }
+    const trimmed = id.trim();
+    if (!trimmed) {
+      touched = true;
+      continue;
+    }
+    if (legacyIds.has(trimmed)) {
+      touched = true;
+      continue;
+    }
+    if (seen.has(trimmed)) {
+      touched = true;
+      continue;
+    }
+    seen.add(trimmed);
+    nextAllow.push(trimmed);
+  }
+
+  if (touched) {
+    config.plugins.allow = nextAllow;
+  }
+  return touched;
+}
 
 function stripAnsi(text) {
   if (typeof text !== "string") return text;
@@ -433,6 +530,9 @@ function seedPluginConfig(modeConfig, orchestratorUrl, configPath = CONFIG_FILE)
   if (!config.plugins || typeof config.plugins !== "object") config.plugins = {};
   if (!config.plugins.entries || typeof config.plugins.entries !== "object") config.plugins.entries = {};
 
+  normalizeTraderPluginEntries(config, modeConfig.pluginId);
+  normalizeTraderAllowlist(config, modeConfig.pluginId);
+
   const entries = config.plugins.entries;
 
   const mergeOrchestratorForId = (pluginId) => {
@@ -453,9 +553,6 @@ function seedPluginConfig(modeConfig, orchestratorUrl, configPath = CONFIG_FILE)
   };
 
   mergeOrchestratorForId(modeConfig.pluginId);
-  for (const legacyId of LEGACY_TRADER_PLUGIN_IDS) {
-    if (entries[legacyId]) mergeOrchestratorForId(legacyId);
-  }
 
   // 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:
@@ -596,6 +693,8 @@ function mergePluginsAllowlist(modeConfig, configPath = CONFIG_FILE) {
     return;
   }
   if (!config.plugins || typeof config.plugins !== "object") config.plugins = {};
+  normalizeTraderPluginEntries(config, modeConfig.pluginId);
+  normalizeTraderAllowlist(config, modeConfig.pluginId);
   const allowSet = new Set(
     Array.isArray(config.plugins.allow) ? config.plugins.allow.filter((id) => typeof id === "string" && id.trim()) : [],
   );
@@ -972,6 +1071,8 @@ function seedXConfig(modeConfig, configPath = CONFIG_FILE, wizardOpts = {}) {
 
   if (!config.plugins || typeof config.plugins !== "object") config.plugins = {};
   if (!config.plugins.entries || typeof config.plugins.entries !== "object") config.plugins.entries = {};
+  normalizeTraderPluginEntries(config, modeConfig.pluginId);
+  normalizeTraderAllowlist(config, modeConfig.pluginId);
 
   const entry = config.plugins.entries[modeConfig.pluginId];
   if (!entry || typeof entry !== "object") return { skipped: true, reason: "plugin entry not found" };
@@ -1047,6 +1148,8 @@ function persistXProfileIdentities(configPath, modeConfig, identities) {
   } catch {
     return { written: 0 };
   }
+  normalizeTraderPluginEntries(config, modeConfig.pluginId);
+  normalizeTraderAllowlist(config, modeConfig.pluginId);
   const entry = config?.plugins?.entries?.[modeConfig.pluginId];
   if (!entry?.config?.x?.profiles || typeof entry.config.x.profiles !== "object") return { written: 0 };
 

package/bin/openclaw-trader.mjs

@@ -13,6 +13,7 @@ const PACKAGE_JSON = JSON.parse(readFileSync(new URL("../package.json", import.m
 const VERSION = PACKAGE_JSON.version;
 const NPM_PACKAGE_NAME = typeof PACKAGE_JSON.name === "string" ? PACKAGE_JSON.name : "solana-traderclaw";
 const PLUGIN_ID = "solana-trader";
+const LEGACY_PLUGIN_IDS = ["traderclaw-v1", "solana-traderclaw-v1", "solana-traderclaw"];
 const CONFIG_DIR = join(homedir(), ".openclaw");
 const CONFIG_FILE = join(CONFIG_DIR, "openclaw.json");
 const WALLET_PRIVATE_KEY_ENV = "TRADERCLAW_WALLET_PRIVATE_KEY";
@@ -166,11 +167,69 @@ function readConfig() {
 }
 
 function writeConfig(config) {
+  normalizePluginConfigShape(config);
   mkdirSync(CONFIG_DIR, { recursive: true });
   writeFileSync(CONFIG_FILE, JSON.stringify(config, null, 2) + "\n", "utf-8");
 }
 
+function isRecord(value) {
+  return !!value && typeof value === "object" && !Array.isArray(value);
+}
+
+function normalizePluginConfigShape(config) {
+  if (!isRecord(config)) return config;
+  if (!isRecord(config.plugins)) config.plugins = {};
+  const plugins = config.plugins;
+  if (!isRecord(plugins.entries)) plugins.entries = {};
+  const entries = plugins.entries;
+
+  let enabledSeen = false;
+  let enabledValue = false;
+  let mergedConfig = {};
+  let found = false;
+
+  for (const sourceId of [...LEGACY_PLUGIN_IDS, PLUGIN_ID]) {
+    const entry = entries[sourceId];
+    if (!isRecord(entry)) continue;
+    found = true;
+    if (typeof entry.enabled === "boolean") {
+      enabledSeen = true;
+      enabledValue = enabledValue || entry.enabled;
+    }
+    if (isRecord(entry.config)) {
+      mergedConfig = { ...mergedConfig, ...entry.config };
+    }
+  }
+
+  if (found) {
+    const canonical = isRecord(entries[PLUGIN_ID]) ? entries[PLUGIN_ID] : {};
+    entries[PLUGIN_ID] = {
+      ...canonical,
+      enabled: typeof canonical.enabled === "boolean" ? canonical.enabled : (enabledSeen ? enabledValue : true),
+      config: mergedConfig,
+    };
+  }
+
+  for (const legacyId of LEGACY_PLUGIN_IDS) {
+    delete entries[legacyId];
+  }
+
+  if (Array.isArray(plugins.allow)) {
+    const seen = new Set();
+    plugins.allow = plugins.allow.filter((id) => {
+      if (typeof id !== "string") return false;
+      const trimmed = id.trim();
+      if (!trimmed || LEGACY_PLUGIN_IDS.includes(trimmed) || seen.has(trimmed)) return false;
+      seen.add(trimmed);
+      return true;
+    });
+  }
+
+  return config;
+}
+
 function getPluginConfig(config) {
+  normalizePluginConfigShape(config);
   const plugins = config.plugins;
   if (!plugins) return null;
   const entries = plugins.entries;
@@ -181,6 +240,7 @@ function getPluginConfig(config) {
 }
 
 function setPluginConfig(config, pluginConfig) {
+  normalizePluginConfigShape(config);
   if (!config.plugins) config.plugins = {};
   if (!config.plugins.entries) config.plugins.entries = {};
   config.plugins.entries[PLUGIN_ID] = {

package/openclaw.plugin.json

@@ -28,6 +28,10 @@
         "type": "string",
         "description": "Refresh token from last session (auto-populated after authentication)"
       },
+      "recoverySecret": {
+        "type": "string",
+        "description": "Consumable recovery secret used to restore a session after refresh-token failure"
+      },
       "walletPublicKey": {
         "type": "string",
         "description": "Solana wallet public key (auto-populated after session establishment)"
@@ -128,6 +132,11 @@
       "sensitive": true,
       "advanced": true
     },
+    "recoverySecret": {
+      "label": "Recovery Secret",
+      "sensitive": true,
+      "advanced": true
+    },
     "walletPublicKey": {
       "label": "Wallet Public Key",
       "advanced": true

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "solana-traderclaw",
-  "version": "1.0.42",
+  "version": "1.0.43",
   "description": "TraderClaw V1-Upgraded — Solana trading for OpenClaw with intelligence lab, tool envelopes, prompt scrubbing, read-only X social intel, and split skill docs",
   "type": "module",
   "main": "./dist/index.js",

package/skills/solana-trader/SKILL.md

@@ -35,7 +35,7 @@ https://docs.traderclaw.ai/docs/installation#troubleshooting-session-expired-aut
 - **Wallet proof** is NOT account signup. It is a cryptographic step proving wallet control.
 - **`traderclaw login`** reuses the saved refresh token when valid.
 - **OpenClaw gateway ≠ your SSH shell.** Exporting env vars in SSH does NOT inject them into the gateway service process.
-- **Plugin id vs npm name:** `solana-traderclaw-v1` npm package with `solana-trader` plugin id is expected.
+- **Plugin id vs npm name:** `solana-traderclaw` is the npm package name, while `solana-trader` is the OpenClaw plugin id used in `plugins.entries` and `plugins.allow`.
 
 ---