traderclaw-cli 1.0.128 → 1.0.129

package/bin/openclaw-trader.mjs

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 
 import { createInterface } from "readline";
-import { readFileSync, writeFileSync, mkdirSync, appendFileSync, existsSync } from "fs";
+import { readFileSync, writeFileSync, mkdirSync, appendFileSync, existsSync, renameSync } from "fs";
 import { dirname, join } from "path";
 import { fileURLToPath, pathToFileURL } from "url";
 import { homedir } from "os";
@@ -74,6 +74,86 @@ const CONFIG_DIR = join(homedir(), ".openclaw");
 const CONFIG_FILE = join(CONFIG_DIR, "openclaw.json");
 const WALLET_PRIVATE_KEY_ENV = "TRADERCLAW_WALLET_PRIVATE_KEY";
 
+/** Session sidecar directory: explicit plugins.entries.solana-trader.config.dataDir or ~/.traderclaw-v1-data */
+function resolveTraderClawDataDir(pluginConfig) {
+  const raw =
+    pluginConfig && typeof pluginConfig.dataDir === "string" ? pluginConfig.dataDir.trim() : "";
+  if (raw.length > 0) {
+    return raw.replace(/^~(?=$|[/\\])/, homedir());
+  }
+  return join(homedir(), ".traderclaw-v1-data");
+}
+
+function ensureExplicitPluginDataDir(pluginConfig) {
+  if (!pluginConfig || typeof pluginConfig !== "object") return;
+  const raw = typeof pluginConfig.dataDir === "string" ? pluginConfig.dataDir.trim() : "";
+  if (raw.length > 0) {
+    pluginConfig.dataDir = raw.replace(/^~(?=$|[/\\])/, homedir());
+  } else {
+    pluginConfig.dataDir = join(homedir(), ".traderclaw-v1-data");
+  }
+}
+
+function persistSessionSidecar(pluginConfig, tokens) {
+  if (!tokens || typeof tokens.refreshToken !== "string" || tokens.refreshToken.length === 0) {
+    return;
+  }
+  const dataDir = resolveTraderClawDataDir(pluginConfig);
+  const sessionTokensPath = join(dataDir, "session-tokens.json");
+  mkdirSync(dataDir, { recursive: true });
+  let existingSidecar = {};
+  try {
+    if (existsSync(sessionTokensPath)) {
+      existingSidecar = JSON.parse(readFileSync(sessionTokensPath, "utf-8")) || {};
+    }
+  } catch {
+    /* ignore */
+  }
+  const ttlSec =
+    typeof tokens.accessTokenTtlSeconds === "number" && Number.isFinite(tokens.accessTokenTtlSeconds)
+      ? tokens.accessTokenTtlSeconds
+      : 900;
+  const accessTokenExpiresAt = Date.now() + ttlSec * 1000;
+  const walletEntry =
+    pluginConfig.walletPublicKey && String(pluginConfig.walletPublicKey).trim()
+      ? { walletPublicKey: String(pluginConfig.walletPublicKey).trim() }
+      : {};
+  const recoveryEntry =
+    typeof pluginConfig.recoverySecret === "string" && pluginConfig.recoverySecret.trim().length > 0
+      ? { recoverySecret: pluginConfig.recoverySecret.trim() }
+      : {};
+  const payload = {
+    ...existingSidecar,
+    refreshToken: tokens.refreshToken,
+    accessToken: tokens.accessToken,
+    accessTokenExpiresAt,
+    ...walletEntry,
+    ...recoveryEntry,
+  };
+  const tmp = `${sessionTokensPath}.${process.pid}.${Date.now()}.tmp`;
+  writeFileSync(tmp, JSON.stringify(payload, null, 2) + "\n", "utf-8");
+  renameSync(tmp, sessionTokensPath);
+}
+
+function clearSessionSidecarSessionFields(pluginConfig) {
+  const dataDir = resolveTraderClawDataDir(pluginConfig);
+  const sessionTokensPath = join(dataDir, "session-tokens.json");
+  if (!existsSync(sessionTokensPath)) return;
+  try {
+    const raw = JSON.parse(readFileSync(sessionTokensPath, "utf-8"));
+    if (!raw || typeof raw !== "object") return;
+    const next = { ...raw };
+    delete next.refreshToken;
+    delete next.accessToken;
+    delete next.accessTokenExpiresAt;
+    const tmp = `${sessionTokensPath}.${process.pid}.${Date.now()}.tmp`;
+    writeFileSync(tmp, JSON.stringify(next, null, 2) + "\n", "utf-8");
+    renameSync(tmp, sessionTokensPath);
+  } catch {
+    /* ignore */
+  }
+}
+
 /** Linked from CLI errors and setup — keep in sync with SKILL / README. */
 const TRADERCLAW_SESSION_TROUBLESHOOTING_URL =
   "https://docs.traderclaw.ai/docs/installation#troubleshooting-session-expired-auth-errors-or-the-agent-logged-out";
@@ -1290,6 +1370,8 @@ async function cmdSetup(args) {
     if (!pluginConfig.kaybaFolder) pluginConfig.kaybaFolder = "traderclaw";
   }
 
+  ensureExplicitPluginDataDir(pluginConfig);
+
   print("\nWriting configuration...\n");
 
   const existingConfig = readConfig();
@@ -1327,6 +1409,8 @@ async function cmdSetup(args) {
 
   writeConfig(existingConfig);
 
+  persistSessionSidecar(pluginConfig, sessionTokens);
+
   printSuccess(`  Config written to ${CONFIG_FILE}`);
 
   if (kaybaApiKey) {
@@ -1657,7 +1741,9 @@ async function cmdLogin(args) {
   const removedLegacyKey = removeLegacyWalletPrivateKey(pluginConfig);
 
   try {
-    await establishSession(orchestratorUrl, pluginConfig, walletPrivateKeyArg);
+    const tokens = await establishSession(orchestratorUrl, pluginConfig, walletPrivateKeyArg);
+    ensureExplicitPluginDataDir(pluginConfig);
+    persistSessionSidecar(pluginConfig, tokens);
     setPluginConfig(config, pluginConfig);
     writeConfig(config);
     printSuccess("\n  Session established and saved.");
@@ -1706,6 +1792,7 @@ async function cmdLogout() {
   const removedLegacyKey = removeLegacyWalletPrivateKey(pluginConfig);
   setPluginConfig(config, pluginConfig);
   writeConfig(config);
+  clearSessionSidecarSessionFields(pluginConfig);
 
   printSuccess("  Local session cleared.");
   if (removedLegacyKey) {
@@ -4481,7 +4568,7 @@ async function cmdTestSession(args) {
     process.exit(1);
   }
 
-  const dataDir = pluginConfig.dataDir || join(process.cwd(), ".traderclaw-v1-data");
+  const dataDir = resolveTraderClawDataDir(pluginConfig);
   const sessionTokensPath = join(dataDir, "session-tokens.json");
 
   let sidecar = null;
@@ -4666,7 +4753,6 @@ async function cmdTestSession(args) {
       };
       const tmp = `${sessionTokensPath}.${process.pid}.${Date.now()}.tmp`;
       writeFileSync(tmp, JSON.stringify(payload, null, 2) + "\n", "utf-8");
-      const { renameSync } = await import("fs");
       renameSync(tmp, sessionTokensPath);
       printSuccess(`        OK — written to ${sessionTokensPath}`);
       results.push({ test: "persist_sidecar", status: "ok" });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "traderclaw-cli",
-  "version": "1.0.128",
+  "version": "1.0.129",
   "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.128"
+    "solana-traderclaw": "^1.0.129"
   },
   "keywords": [
     "traderclaw",