traderclaw-cli 1.0.101 → 1.0.103

package/bin/gateway-persistence-linux.mjs

@@ -198,23 +198,34 @@ export async function ensureLinuxGatewayPersistence(options = {}) {
   let unitEnabled = false;
   try {
     await runSpawn("systemctl", ["--user", "daemon-reload"]);
-    await runSpawn("systemctl", ["--user", "enable", unitName]);
+    await runSpawn("systemctl", ["--user", "enable", "--now", unitName]);
     unitEnabled = true;
-    emit("info", `systemd user unit enabled: ${unitName}`);
+    emit("info", `systemd user unit enabled and started: ${unitName}`);
   } catch (err) {
     const msg = err?.stderr || err?.message || String(err);
-    errors.push(`systemctl --user enable: ${msg}`);
+    errors.push(`systemctl --user enable --now: ${msg}`);
     emit(
       "warn",
-      `Could not enable user unit ${unitName} (${msg.trim()}). If the gateway was installed, try: systemctl --user enable ${unitName}`,
+      `Could not enable/start user unit ${unitName} (${msg.trim()}). If the gateway was installed, try: systemctl --user enable --now ${unitName}`,
     );
   }
 
+  let unitActive = false;
+  try {
+    await runSpawn("systemctl", ["--user", "is-active", unitName]);
+    unitActive = true;
+    emit("info", `${unitName} is active.`);
+  } catch {
+    // is-active exits non-zero when inactive; not a hard error
+    emit("info", `${unitName} is not yet active (may need: openclaw gateway restart).`);
+  }
+
   return {
     skipped: false,
     linger: lingerOk,
     unitName,
     unitEnabled,
+    unitActive,
     errors: errors.length ? errors : undefined,
   };
 }

package/bin/openclaw-trader.mjs

@@ -6,7 +6,7 @@ import { dirname, join } from "path";
 import { fileURLToPath, pathToFileURL } from "url";
 import { homedir } from "os";
 import { randomUUID, createPrivateKey, sign as cryptoSign } from "crypto";
-import { execFile, execFileSync, execSync } from "child_process";
+import { execFile, execFileSync, execSync, spawnSync } from "child_process";
 import { promisify } from "util";
 import { createServer } from "http";
 import { resolvePluginPackageRoot } from "./resolve-plugin-root.mjs";
@@ -65,6 +65,9 @@ try {
 const VERSION = CLI_VERSION || PLUGIN_VERSION;
 const PLUGIN_ID = "solana-trader";
 const LEGACY_PLUGIN_IDS = ["traderclaw-v1", "solana-traderclaw-v1", "solana-traderclaw"];
+const KAYBA_TRACING_PLUGIN_ID = "kayba-tracing";
+const KAYBA_TRACING_NPM_PACKAGE = "@kayba_ai/openclaw-tracing";
+const KAYBA_TRACING_FOLDER_DEFAULT = "traderclaw-agent";
 const CONFIG_DIR = join(homedir(), ".openclaw");
 const CONFIG_FILE = join(CONFIG_DIR, "openclaw.json");
 const WALLET_PRIVATE_KEY_ENV = "TRADERCLAW_WALLET_PRIVATE_KEY";
@@ -171,6 +174,53 @@ function extractJson(raw) {
 /** Env vars passed to every openclaw CLI invocation to suppress colour output. */
 const NO_COLOR_ENV = { ...process.env, NO_COLOR: "1", FORCE_COLOR: "0" };
 
+function delay(ms) {
+  return new Promise((resolve) => setTimeout(resolve, ms));
+}
+
+/** True when OpenClaw / ClawHub reports HTTP 429 or rate limiting (retry installs instead of failing). */
+function isOpenClawClawHubRateLimit(combinedOutput) {
+  const t = stripAnsi(String(combinedOutput || "")).toLowerCase();
+  return /\b429\b/.test(t) || t.includes("rate limit") || t.includes("too many requests");
+}
+
+/**
+ * Runs `openclaw plugins install … --force` with backoff retries when ClawHub returns 429.
+ */
+async function runOpenclawPluginsInstallWithRetry(installArgs, installSpec) {
+  const maxAttempts = 5;
+  const baseDelayMs = 12000;
+  for (let attempt = 1; attempt <= maxAttempts; attempt++) {
+    try {
+      const r = await execFileAsync("openclaw", installArgs, {
+        maxBuffer: 15 * 1024 * 1024,
+        env: NO_COLOR_ENV,
+      });
+      if (r.stdout) process.stdout.write(r.stdout);
+      if (r.stderr) process.stderr.write(r.stderr);
+      return;
+    } catch (e) {
+      const stdout =
+        typeof e.stdout === "string" ? e.stdout : Buffer.isBuffer(e.stdout) ? e.stdout.toString("utf-8") : "";
+      const stderr =
+        typeof e.stderr === "string" ? e.stderr : Buffer.isBuffer(e.stderr) ? e.stderr.toString("utf-8") : "";
+      const combined = `${stdout}${stderr}${e.message || ""}`;
+      if (stdout) process.stdout.write(stdout);
+      if (stderr) process.stderr.write(stderr);
+      const retryable = isOpenClawClawHubRateLimit(combined);
+      if (attempt < maxAttempts && retryable) {
+        const waitMs = Math.min(baseDelayMs * 2 ** (attempt - 1), 180000);
+        printWarn(
+          `  ClawHub rate limited while installing ${installSpec} (attempt ${attempt}/${maxAttempts}). Waiting ${Math.round(waitMs / 1000)}s, then retrying…`,
+        );
+        await delay(waitMs);
+        continue;
+      }
+      throw e;
+    }
+  }
+}
+
 function getCommandOutput(cmd) {
   try {
     return execSync(cmd, { encoding: "utf-8", stdio: ["pipe", "pipe", "pipe"], shell: true, maxBuffer: 50 * 1024 * 1024, env: NO_COLOR_ENV }).trim();
@@ -422,6 +472,48 @@ function setPluginConfig(config, pluginConfig) {
   };
 }
 
+function setKaybaTracingPluginConfig(config, kaybaApiKey, folder) {
+  normalizePluginConfigShape(config);
+  if (!config.plugins) config.plugins = {};
+  if (!config.plugins.entries) config.plugins.entries = {};
+  if (!Array.isArray(config.plugins.allow)) config.plugins.allow = [];
+  if (!config.plugins.allow.includes(KAYBA_TRACING_PLUGIN_ID)) {
+    config.plugins.allow.push(KAYBA_TRACING_PLUGIN_ID);
+  }
+  const prev = config.plugins.entries[KAYBA_TRACING_PLUGIN_ID];
+  const prevConfig = prev && typeof prev.config === "object" && prev.config !== null ? prev.config : {};
+  config.plugins.entries[KAYBA_TRACING_PLUGIN_ID] = {
+    enabled: true,
+    hooks: { allowConversationAccess: true },
+    config: {
+      ...prevConfig,
+      apiKey: kaybaApiKey,
+      folder: prevConfig.folder || folder || KAYBA_TRACING_FOLDER_DEFAULT,
+    },
+  };
+}
+
+async function installAndEnableKaybaTracingPlugin() {
+  // Best-effort: openclaw plugins install <pkg> + enable <id>. Returns null on success, error message on failure.
+  try {
+    await execFileAsync("openclaw", ["plugins", "install", KAYBA_TRACING_NPM_PACKAGE], { env: NO_COLOR_ENV });
+  } catch (err) {
+    const text = `${err?.message || ""}\n${err?.stderr || ""}`.toLowerCase();
+    if (!text.includes("already exists") && !text.includes("already installed")) {
+      return err instanceof Error ? err.message : String(err);
+    }
+  }
+  try {
+    await execFileAsync("openclaw", ["plugins", "enable", KAYBA_TRACING_PLUGIN_ID], { env: NO_COLOR_ENV });
+  } catch (err) {
+    const text = `${err?.message || ""}\n${err?.stderr || ""}`.toLowerCase();
+    if (!text.includes("already enabled")) {
+      return err instanceof Error ? err.message : String(err);
+    }
+  }
+  return null;
+}
+
 function getGatewayConfig(config) {
   if (!config || typeof config !== "object") return {};
   if (!config.gateway || typeof config.gateway !== "object") return {};
@@ -782,6 +874,7 @@ async function cmdSetup(args) {
   let forwardTelegramRecipientArg = "";
   let referralCodeArg = "";
   let referralInvalidRetries = 0;
+  let kaybaApiKeyArg = "";
 
   for (let i = 0; i < args.length; i++) {
     if ((args[i] === "--api-key" || args[i] === "-k") && args[i + 1]) {
@@ -831,6 +924,9 @@ async function cmdSetup(args) {
     if ((args[i] === "--referral-code" || args[i] === "-r") && args[i + 1]) {
       referralCodeArg = args[++i];
     }
+    if ((args[i] === "--kayba-key" || args[i] === "--kayba-api-key") && args[i + 1]) {
+      kaybaApiKeyArg = args[++i];
+    }
   }
   const runtimeWalletPrivateKey = getRuntimeWalletPrivateKey(walletPrivateKey);
 
@@ -1169,12 +1265,30 @@ async function cmdSetup(args) {
     }
   }
 
+  let kaybaApiKey = (kaybaApiKeyArg || process.env.KAYBA_API_KEY || prevPlugin?.kaybaApiKey || "").trim();
+  if (!kaybaApiKey) {
+    print("\nKayba tracing (optional)...\n");
+    printInfo("  Capture every agent turn — full LLM prompts, tool calls, replies — for observability.");
+    printInfo("  Get a key at https://use.kayba.ai/settings/api-keys, or use one provided by your operator.");
+    kaybaApiKey = (await prompt("Kayba API key (kayba_ak_..., Enter to skip)", "")).trim();
+  } else {
+    printInfo(`\n  Reusing Kayba API key: ${maskKey(kaybaApiKey)}`);
+  }
+  if (kaybaApiKey) {
+    pluginConfig.kaybaApiKey = kaybaApiKey;
+    if (!pluginConfig.kaybaFolder) pluginConfig.kaybaFolder = "traderclaw";
+  }
+
   print("\nWriting configuration...\n");
 
   const existingConfig = readConfig();
   removeLegacyWalletPrivateKey(pluginConfig);
   setPluginConfig(existingConfig, pluginConfig);
 
+  if (kaybaApiKey) {
+    setKaybaTracingPluginConfig(existingConfig, kaybaApiKey, KAYBA_TRACING_FOLDER_DEFAULT);
+  }
+
   if (!existingConfig.agents || typeof existingConfig.agents !== "object") {
     existingConfig.agents = {};
   }
@@ -1204,6 +1318,17 @@ async function cmdSetup(args) {
 
   printSuccess(`  Config written to ${CONFIG_FILE}`);
 
+  if (kaybaApiKey) {
+    print(`\nInstalling ${KAYBA_TRACING_PLUGIN_ID} plugin (one-time)...\n`);
+    const installErr = await installAndEnableKaybaTracingPlugin();
+    if (installErr) {
+      printWarn(`  Plugin install failed: ${installErr}`);
+      printWarn(`  Finish manually: openclaw plugins install ${KAYBA_TRACING_NPM_PACKAGE} && openclaw plugins enable ${KAYBA_TRACING_PLUGIN_ID}`);
+    } else {
+      printSuccess(`  ${KAYBA_TRACING_PLUGIN_ID} installed and enabled (folder: ${KAYBA_TRACING_FOLDER_DEFAULT})`);
+    }
+  }
+
   if (!skipGatewayRegistration) {
     print("\nGateway forwarding setup (required for event-driven wakeups)...\n");
 
@@ -4195,15 +4320,17 @@ Setup options:
   --gateway-token, -t     Gateway bearer token (defaults to API key)
   --telegram-recipient    Telegram @username or chat id (aliases: --forward-telegram-chat-id, --telegram-chat-id)
   --referral-code, -r   Optional referral code for new signups (extra trial time when valid)
+  --kayba-key             Kayba API key (kayba_ak_...) — captures every agent turn to your Kayba dashboard.
+                          Aliases: --kayba-api-key. Env fallback: KAYBA_API_KEY. Skip with empty value.
   --skip-gateway-registration  Skip gateway URL registration with orchestrator
   --show-api-key     Extra hint after signup (full key is always shown once; confirm with API_KEY_STORED)
   --show-wallet-private-key  Reveal full wallet private key in setup output
   --signup           Force signup flow (create new account)
   --write-gateway-env  Write TRADERCLAW_WALLET_PRIVATE_KEY to a systemd EnvironmentFile for the user gateway (Linux)
-  --no-ensure-gateway-persistent  Skip automatic Linux loginctl linger + user unit enable after setup
+  --no-ensure-gateway-persistent  Skip automatic Linux loginctl linger + systemctl --user enable --now after setup
 
 Gateway subcommands:
-  gateway ensure-persistent   Linux: enable loginctl linger and systemd --user unit for OpenClaw gateway
+  gateway ensure-persistent   Linux: enable loginctl linger and systemctl --user enable --now for OpenClaw gateway
 
 Login options:
   --wallet-private-key <k>  Base58 key for wallet proof (runtime only, never saved). Optional in a
@@ -4240,6 +4367,8 @@ Examples:
   traderclaw setup --api-key oc_xxx --url https://api.traderclaw.ai
   traderclaw setup --gateway-base-url https://gateway.myhost.ts.net
   traderclaw setup --telegram-recipient @myusername
+  traderclaw setup --kayba-key kayba_ak_xxx     # one-shot Kayba tracing setup (installs kayba-tracing plugin)
+  KAYBA_API_KEY=kayba_ak_xxx traderclaw setup    # same via env var
   traderclaw login
   traderclaw login --force-reauth --wallet-private-key <base58_key>
   traderclaw logout
@@ -4361,9 +4490,27 @@ async function cmdUpdate(args) {
                 `\n  Forcing full integration: openclaw plugins install ${installSpec} --force\n` +
                   "  (extension on disk + plugins.installs / integrity.)\n",
               );
-              execFileSync("openclaw", installArgs, { stdio: "inherit" });
+              await runOpenclawPluginsInstallWithRetry(installArgs, installSpec);
               printSuccess(`\n  Forced install complete: ${installSpec}.`);
-            } catch {
+            } catch (e) {
+              const out =
+                typeof e.stdout === "string"
+                  ? e.stdout
+                  : Buffer.isBuffer(e.stdout)
+                    ? e.stdout.toString("utf-8")
+                    : "";
+              const err =
+                typeof e.stderr === "string"
+                  ? e.stderr
+                  : Buffer.isBuffer(e.stderr)
+                    ? e.stderr.toString("utf-8")
+                    : "";
+              const blob = `${out}${err}${e.message || ""}`;
+              if (isOpenClawClawHubRateLimit(blob)) {
+                printWarn(
+                  `  ClawHub rate limit persisted after retries — plugin files may still match the version from "plugins update" until this step succeeds.`,
+                );
+              }
               printError(`"openclaw plugins install ${installSpec} --force" failed. Try manually:`);
               print(`  openclaw plugins install ${installSpec} --force`);
               process.exit(1);
@@ -4388,17 +4535,46 @@ async function cmdUpdate(args) {
   }
 
   if (dryRun) {
-    print(`\n  [dry-run] Would run: openclaw gateway restart\n`);
+    print(`\n  [dry-run] Would run: systemctl --user enable --now + restart (Linux) or openclaw gateway restart\n`);
   } else {
-    if (!commandExists("openclaw")) {
-      printWarn("\n  Skipping gateway restart: openclaw not in PATH. After fixing PATH: openclaw gateway restart");
-    } else {
+    const { isLinuxGatewayPersistenceEligible, ensureLinuxGatewayPersistence, resolveGatewayUnitNameFromStatusJson, readOpenclawGatewayStatusJson } = await import("./gateway-persistence-linux.mjs");
+    if (isLinuxGatewayPersistenceEligible()) {
+      print("\n  Gateway persistence (Linux)...\n");
+      let unitName = "openclaw-gateway.service";
+      try {
+        const statusJson = readOpenclawGatewayStatusJson();
+        unitName = resolveGatewayUnitNameFromStatusJson(statusJson);
+        await ensureLinuxGatewayPersistence({
+          emitLog: (level, text) => {
+            if (level === "warn") printWarn(`  ${text}`);
+            else printInfo(`  ${text}`);
+          },
+        });
+      } catch (err) {
+        printWarn(`  Gateway persistence (optional): ${err.message || err}`);
+      }
       print("\n  Restarting gateway...\n");
       try {
-        execFileSync("openclaw", ["gateway", "restart"], { stdio: "inherit" });
-        printSuccess("  Gateway restarted.");
-      } catch {
-        printWarn("  Gateway restart returned non-zero. Try manually: openclaw gateway restart");
+        const r = spawnSync("systemctl", ["--user", "restart", unitName], { stdio: "inherit" });
+        if (r.status === 0) {
+          printSuccess(`  Gateway restarted (systemctl --user restart ${unitName}).`);
+        } else {
+          printWarn(`  systemctl --user restart returned ${r.status}. Try: systemctl --user restart ${unitName}`);
+        }
+      } catch (err) {
+        printWarn(`  systemctl --user restart: ${err.message || err}. Try manually: systemctl --user restart ${unitName}`);
+      }
+    } else {
+      if (!commandExists("openclaw")) {
+        printWarn("\n  Skipping gateway restart: openclaw not in PATH. After fixing PATH: openclaw gateway restart");
+      } else {
+        print("\n  Restarting gateway...\n");
+        try {
+          execFileSync("openclaw", ["gateway", "restart"], { stdio: "inherit" });
+          printSuccess("  Gateway restarted.");
+        } catch {
+          printWarn("  Gateway restart returned non-zero. Try manually: openclaw gateway restart");
+        }
       }
     }
   }

package/package.json

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