solana-traderclaw 1.0.140 → 1.0.144

package/dist/{chunk-6GSGHMUH.js → chunk-E7QOPXSU.js}

@@ -1,5 +1,38 @@
 // src/http-client.ts
 import kayba, { SpanType } from "@kayba_ai/tracing";
+var OrchestratorRateLimitError = class extends Error {
+  code = "RATE_LIMIT_EXCEEDED";
+  retryAfterMs;
+  status;
+  constructor(message, retryAfterMs, status) {
+    super(message);
+    this.name = "OrchestratorRateLimitError";
+    this.retryAfterMs = retryAfterMs;
+    this.status = status;
+  }
+};
+function parseRetryAfterMs(headerValue, maxMs) {
+  if (!headerValue) return null;
+  const trimmed = headerValue.trim();
+  if (trimmed === "") return null;
+  const asSeconds = Number(trimmed);
+  if (Number.isFinite(asSeconds) && asSeconds >= 0) {
+    return Math.min(Math.round(asSeconds * 1e3), maxMs);
+  }
+  const asDate = Date.parse(trimmed);
+  if (Number.isFinite(asDate)) {
+    return Math.max(0, Math.min(asDate - Date.now(), maxMs));
+  }
+  return null;
+}
+function sleep(ms) {
+  return new Promise((resolve) => {
+    const t = setTimeout(resolve, ms);
+    if (t && typeof t === "object" && "unref" in t) {
+      t.unref();
+    }
+  });
+}
 async function orchestratorRequest(opts) {
   if (!kayba.isConfigured()) {
     return doRequest(opts);
@@ -21,7 +54,7 @@ async function orchestratorRequest(opts) {
     throw err;
   }
 }
-async function doRequest(opts, isRetry = false) {
+async function doRequest(opts, isRetry = false, rateLimitAttempt = 0) {
   const url = `${opts.baseUrl.replace(/\/$/, "")}${opts.path}`;
   const controller = new AbortController();
   const timeoutId = setTimeout(
@@ -64,7 +97,25 @@ async function doRequest(opts, isRetry = false) {
     if ((res.status === 401 || res.status === 403) && !isRetry && opts.onUnauthorized) {
       clearTimeout(timeoutId);
       const newToken = await opts.onUnauthorized();
-      return doRequest({ ...opts, accessToken: newToken }, true);
+      return doRequest({ ...opts, accessToken: newToken }, true, rateLimitAttempt);
+    }
+    const bodyCodeIsRateLimit = typeof dataObj?.code === "string" && /\bRATE_LIMIT\b/i.test(dataObj.code);
+    const isRateLimited = res.status === 429 || !res.ok && bodyCodeIsRateLimit;
+    if (isRateLimited) {
+      clearTimeout(timeoutId);
+      const maxWait = opts.rateLimitMaxRetryWaitMs ?? 3e4;
+      const maxRetries = opts.rateLimitMaxRetries ?? 1;
+      const retryAfter = parseRetryAfterMs(res.headers.get("Retry-After"), maxWait) ?? Math.min(maxWait, 1e3 * Math.pow(2, rateLimitAttempt));
+      const bodyMessage = typeof dataObj?.message === "string" ? dataObj.message : typeof dataObj?.error === "string" ? dataObj.error : `HTTP ${res.status}`;
+      if (rateLimitAttempt < maxRetries) {
+        await sleep(retryAfter);
+        return doRequest(opts, isRetry, rateLimitAttempt + 1);
+      }
+      throw new OrchestratorRateLimitError(
+        `RATE_LIMIT_EXCEEDED: ${bodyMessage}`,
+        retryAfter,
+        res.status
+      );
     }
     if (!res.ok) {
       const errBody = data && typeof data === "object" && !Array.isArray(data) ? data : null;
@@ -87,5 +138,6 @@ async function doRequest(opts, isRetry = false) {
 }
 
 export {
+  OrchestratorRateLimitError,
   orchestratorRequest
 };

package/dist/index.js

@@ -1,7 +1,5 @@
 import {
-  readRecoverySecretFromDisk,
-  writeRecoverySecretToOpenclawAtomic,
-  writeRefreshTokenToOpenclawAtomic
+  readRecoverySecretFromDisk
 } from "./chunk-IAQC34O7.js";
 import {
   SessionManager,
@@ -30,7 +28,7 @@ import {
 } from "./chunk-R24UDHQG.js";
 import {
   orchestratorRequest
-} from "./chunk-6GSGHMUH.js";
+} from "./chunk-E7QOPXSU.js";
 import {
   IntelligenceLab
 } from "./chunk-FBS5FGW2.js";
@@ -775,6 +773,26 @@ function registerWebFetchTool(api, Type2, logPrefix, options) {
 }
 
 // index.ts
+var SOLANA_TRADER_LIFECYCLE_SINGLETON_KEY = Symbol.for(
+  "openclaw.solana-trader.lifecycle.v1"
+);
+var __solanaTraderGlobalSingletonHolder = globalThis;
+function __solanaTraderDisposePreviousLifecycle(logger) {
+  const prev = __solanaTraderGlobalSingletonHolder[SOLANA_TRADER_LIFECYCLE_SINGLETON_KEY];
+  if (!prev) return;
+  __solanaTraderGlobalSingletonHolder[SOLANA_TRADER_LIFECYCLE_SINGLETON_KEY] = void 0;
+  try {
+    logger?.info("[solana-trader] Disposing previous plugin lifecycle before re-register");
+    prev.dispose();
+  } catch (err) {
+    logger?.warn(
+      `[solana-trader] Previous lifecycle dispose error: ${err instanceof Error ? err.message : String(err)}`
+    );
+  }
+}
+function __solanaTraderSetCurrentLifecycle(lc) {
+  __solanaTraderGlobalSingletonHolder[SOLANA_TRADER_LIFECYCLE_SINGLETON_KEY] = lc;
+}
 var TRADERCLAW_WALLET_PRIVATE_KEY_ENV = "TRADERCLAW_WALLET_PRIVATE_KEY";
 function walletPrivateKeyFromPluginConfigRecord(obj) {
   const w = typeof obj.walletPrivateKey === "string" ? obj.walletPrivateKey.trim() : "";
@@ -923,6 +941,8 @@ var solanaTraderPlugin = {
   name: "Solana Trader",
   description: "Autonomous Solana memecoin trading agent \u2014 V1-Upgraded with intelligence lab, tool envelopes, prompt scrubbing, and split skill architecture",
   register(api) {
+    __solanaTraderDisposePreviousLifecycle(api.logger);
+    const __solanaTraderDisposers = [];
     const pluginConfigRaw = api.pluginConfig && typeof api.pluginConfig === "object" && !Array.isArray(api.pluginConfig) ? api.pluginConfig : {};
     const walletPrivateKeyFromPluginJsonOnly = walletPrivateKeyFromPluginConfigRecord(pluginConfigRaw);
     const config = parseConfig(api.pluginConfig);
@@ -1005,14 +1025,6 @@ var solanaTraderPlugin = {
             `[solana-trader] Failed to write rotated recovery secret to sidecar: ${err instanceof Error ? err.message : String(err)}`
           );
         }
-        try {
-          writeRecoverySecretToOpenclawAtomic(newSecret);
-          api.logger.info("[solana-trader] Persisted rotated recovery secret to openclaw.json");
-        } catch (err) {
-          api.logger.warn(
-            `[solana-trader] Failed to write rotated recovery secret to openclaw.json: ${err instanceof Error ? err.message : String(err)}`
-          );
-        }
       },
       clientLabel: "openclaw-plugin-runtime",
       timeout: apiTimeout,
@@ -1035,14 +1047,6 @@ var solanaTraderPlugin = {
             `[solana-trader] Failed to persist session sidecar: ${err instanceof Error ? err.message : String(err)}`
           );
         }
-        try {
-          writeRefreshTokenToOpenclawAtomic(tokens.refreshToken);
-          api.logger.info("[solana-trader] Persisted rotated refresh token to openclaw.json");
-        } catch (err) {
-          api.logger.warn(
-            `[solana-trader] Failed to write rotated refresh token to openclaw.json: ${err instanceof Error ? err.message : String(err)}`
-          );
-        }
       },
       logger: {
         info: (msg) => api.logger.info(`[solana-trader] ${msg}`),
@@ -1050,6 +1054,12 @@ var solanaTraderPlugin = {
         error: (msg) => api.logger.error(`[solana-trader] ${msg}`)
       }
     });
+    __solanaTraderDisposers.push(() => {
+      try {
+        sessionManager.destroy();
+      } catch {
+      }
+    });
     const onUnauthorized = async () => {
       api.logger.warn("[solana-trader] Received 401 \u2014 refreshing session...");
       return sessionManager.handleUnauthorized();
@@ -2435,6 +2445,12 @@ ${notes}
         error: (msg) => api.logger.error(`[solana-trader] ${msg}`)
       }
     });
+    __solanaTraderDisposers.push(() => {
+      try {
+        bitqueryStreamManager.close();
+      } catch {
+      }
+    });
     api.registerTool({
       name: "solana_bitquery_subscribe",
       description: "Subscribe to a managed real-time Bitquery data stream. The orchestrator manages the WebSocket connection and broadcasts events. Available templates: realtimeTokenPricesSolana, ohlc1s, dexPoolLiquidityChanges, pumpFunTokenCreation, pumpFunTrades, pumpSwapTrades, raydiumNewPools. Returns a subscriptionId for tracking. Pass agentId to enable event-to-agent forwarding \u2014 orchestrator delivers each event to your Gateway via /v1/responses in addition to normal WS delivery. Subscriptions expire after 24h and emit subscription_expiring/subscription_expired events. See websocket-streaming.md in the solana-trader skill for the full message contract and usage patterns.",
@@ -2568,6 +2584,12 @@ ${notes}
         error: (msg) => api.logger.error(`[solana-trader] ${msg}`)
       }
     });
+    __solanaTraderDisposers.push(() => {
+      try {
+        void alphaStreamManager.unsubscribe().catch(() => void 0);
+      } catch {
+      }
+    });
     let startupGateRunning = null;
     let startupGateState = { ok: false, ts: 0, steps: [] };
     let lastForwardProbeState = null;
@@ -4297,11 +4319,30 @@ Context compaction triggered. STATE.md synced from last persisted state. Decisio
       }
     );
     let solanaTraderSessionWatchdogTimer = null;
-    api.registerService({
-      id: "solana-trader-session",
-      start: async () => {
+    let solanaTraderLifecycleDisposed = false;
+    __solanaTraderDisposers.push(() => {
+      solanaTraderLifecycleDisposed = true;
+    });
+    __solanaTraderDisposers.push(() => {
+      if (solanaTraderSessionWatchdogTimer !== null) {
+        clearInterval(solanaTraderSessionWatchdogTimer);
+        solanaTraderSessionWatchdogTimer = null;
+      }
+    });
+    let solanaTraderBootstrapPromise = null;
+    const bootstrapSessionAndArmWatchdog = () => {
+      if (solanaTraderBootstrapPromise) return solanaTraderBootstrapPromise;
+      solanaTraderBootstrapPromise = (async () => {
+        const checkDisposed = (stage) => {
+          if (solanaTraderLifecycleDisposed) {
+            api.logger.info(`[solana-trader] Bootstrap aborted at ${stage}: lifecycle disposed by newer register`);
+            return true;
+          }
+          return false;
+        };
         try {
           await sessionManager.initialize();
+          if (checkDisposed("after sessionManager.initialize")) return;
           const info = sessionManager.getSessionInfo();
           api.logger.info(
             `[solana-trader] Session active. Tier: ${info.tier}, Scopes: ${info.scopes.join(", ")}`
@@ -4323,6 +4364,7 @@ Context compaction triggered. STATE.md synced from last persisted state. Decisio
             timeout: 5e3,
             accessToken: await sessionManager.getAccessToken()
           });
+          if (checkDisposed("after healthz")) return;
           api.logger.info(`[solana-trader] Orchestrator healthz OK at ${orchestratorUrl}`);
           if (healthz && typeof healthz === "object") {
             const h = healthz;
@@ -4331,8 +4373,10 @@ Context compaction triggered. STATE.md synced from last persisted state. Decisio
         } catch (err) {
           api.logger.warn(`[solana-trader] /healthz unreachable at ${orchestratorUrl}: ${err instanceof Error ? err.message : String(err)}`);
         }
+        if (checkDisposed("after healthz catch")) return;
         try {
           const status = await get("/api/system/status");
+          if (checkDisposed("after /api/system/status")) return;
           api.logger.info(`[solana-trader] Connected to orchestrator (walletId: ${walletId})`);
           if (status && typeof status === "object") {
             api.logger.info(`[solana-trader] System status: ${JSON.stringify(status)}`);
@@ -4340,8 +4384,10 @@ Context compaction triggered. STATE.md synced from last persisted state. Decisio
         } catch (err) {
           api.logger.warn(`[solana-trader] /api/system/status unreachable: ${err instanceof Error ? err.message : String(err)}`);
         }
+        if (checkDisposed("after system-status catch")) return;
         try {
           const startupGate = await runStartupGate({ autoFixGateway: true, force: true });
+          if (checkDisposed("after startup gate")) return;
           api.logger.info(`[solana-trader] Startup gate completed: ok=${startupGate.ok}, passed=${startupGate.summary.passed}, failed=${startupGate.summary.failed}`);
           if (!startupGate.ok) {
             api.logger.warn(`[solana-trader] Startup gate failures: ${JSON.stringify(startupGate.steps.filter((step) => !step.ok))}`);
@@ -4349,12 +4395,15 @@ Context compaction triggered. STATE.md synced from last persisted state. Decisio
         } catch (err) {
           api.logger.warn(`[solana-trader] Startup gate run failed: ${err instanceof Error ? err.message : String(err)}`);
         }
+        if (checkDisposed("after startup gate catch")) return;
         try {
           const probe = await runForwardProbe({ agentId: config.agentId || "main", source: "service_startup" });
+          if (checkDisposed("after forward probe")) return;
           api.logger.info(`[solana-trader] Forward probe result: ${JSON.stringify(probe)}`);
         } catch (err) {
           api.logger.warn(`[solana-trader] Forward probe failed: ${err instanceof Error ? err.message : String(err)}`);
         }
+        if (checkDisposed("before watchdog arm")) return;
         const WATCHDOG_INTERVAL_MS = 20 * 60 * 1e3;
         const FORWARD_PROBE_WATCHDOG_MS = 7 * 60 * 1e3;
         const STARTUP_GATE_AFTER_PROBE_FAIL_COOLDOWN_MS = 10 * 60 * 1e3;
@@ -4454,6 +4503,18 @@ Context compaction triggered. STATE.md synced from last persisted state. Decisio
         if (solanaTraderSessionWatchdogTimer && typeof solanaTraderSessionWatchdogTimer === "object" && "unref" in solanaTraderSessionWatchdogTimer) {
           solanaTraderSessionWatchdogTimer.unref();
         }
+        if (solanaTraderLifecycleDisposed && solanaTraderSessionWatchdogTimer !== null) {
+          clearInterval(solanaTraderSessionWatchdogTimer);
+          solanaTraderSessionWatchdogTimer = null;
+          api.logger.info("[solana-trader] Bootstrap cleared freshly-armed watchdog: lifecycle disposed during setInterval window");
+        }
+      })();
+      return solanaTraderBootstrapPromise;
+    };
+    api.registerService({
+      id: "solana-trader-session",
+      start: async () => {
+        await bootstrapSessionAndArmWatchdog();
       },
       stop: async () => {
         if (solanaTraderSessionWatchdogTimer !== null) {
@@ -4547,6 +4608,21 @@ Context compaction triggered. STATE.md synced from last persisted state. Decisio
     api.logger.info(
       `[solana-trader] V1-Upgraded-Public: Registered ${totalToolCount} tools (${baseToolCount} base + ${intelligenceToolCount} intelligence + ${webFetchCount} web_fetch = ${totalRegistered} Solana + ${xToolCount} X/Twitter read-only) for walletId ${walletId} (session auth mode)`
     );
+    __solanaTraderSetCurrentLifecycle({
+      dispose: () => {
+        for (let i = __solanaTraderDisposers.length - 1; i >= 0; i--) {
+          try {
+            __solanaTraderDisposers[i]();
+          } catch {
+          }
+        }
+      }
+    });
+    void bootstrapSessionAndArmWatchdog().catch((err) => {
+      api.logger.error(
+        `[solana-trader] Post-register bootstrap failed: ${err instanceof Error ? err.message : String(err)}`
+      );
+    });
   }
 };
 var index_default = solanaTraderPlugin;

package/dist/src/http-client.js

@@ -1,6 +1,8 @@
 import {
+  OrchestratorRateLimitError,
   orchestratorRequest
-} from "../chunk-6GSGHMUH.js";
+} from "../chunk-E7QOPXSU.js";
 export {
+  OrchestratorRateLimitError,
   orchestratorRequest
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "solana-traderclaw",
-  "version": "1.0.140",
+  "version": "1.0.144",
   "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",