traderclaw-cli 1.0.102 → 1.0.104

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/installer-step-engine.mjs

@@ -1533,6 +1533,7 @@ function fallbackModelForProvider(provider) {
   if (provider === "moonshot") return "moonshot/kimi-k2";
   if (provider === "cerebras") return "cerebras/llama-4-scout-17b-16e-instruct";
   if (provider === "qwen") return "qwen/qwen3-235b-a22b";
+  if (provider === "cli-cloud") return "cli-cloud/gemma-e4b";
   return `${provider}/default`;
 }
 
@@ -1552,6 +1553,7 @@ function providerEnvKey(provider) {
   if (provider === "moonshot") return "MOONSHOT_API_KEY";
   if (provider === "cerebras") return "CEREBRAS_API_KEY";
   if (provider === "qwen") return "DASHSCOPE_API_KEY";
+  if (provider === "cli-cloud") return "CLI_CLOUD_API_KEY";
   return "";
 }
 
@@ -1702,8 +1704,9 @@ function configureOpenClawLlmProvider({ provider, model, credential }, configPat
   if (!config.env || typeof config.env !== "object") config.env = {};
   config.env[envKey] = credential;
 
-  // Clean stale/broken provider objects from previous buggy writes.
-  if (config.models && config.models.providers && config.models.providers[provider]) {
+  // Clean stale/broken provider objects from previous buggy writes (skip custom providers that need their entry).
+  const CUSTOM_PROVIDERS_WITH_BASEURL = ["cli-cloud"];
+  if (!CUSTOM_PROVIDERS_WITH_BASEURL.includes(provider) && config.models && config.models.providers && config.models.providers[provider]) {
     delete config.models.providers[provider];
     if (Object.keys(config.models.providers).length === 0) {
       delete config.models.providers;
@@ -1713,6 +1716,13 @@ function configureOpenClawLlmProvider({ provider, model, credential }, configPat
     }
   }
 
+  // Write baseUrl for custom OpenAI-compatible providers.
+  if (provider === "cli-cloud") {
+    if (!config.models) config.models = {};
+    if (!config.models.providers) config.models.providers = {};
+    config.models.providers["cli-cloud"] = { baseUrl: "https://app.cli.cloud/llm/v1" };
+  }
+
   if (!config.agents) config.agents = {};
   if (!config.agents.defaults) config.agents.defaults = {};
   ensureAgentsDefaultsSchemaCompat(config);
@@ -2224,6 +2234,7 @@ export class InstallerStepEngine {
   }
 
   async configureLlmStep() {
+    const CUSTOM_PROVIDERS_NO_PROBE = ["cli-cloud"];
     const provider = String(this.options.llmProvider || "").trim();
     const requestedModel = String(this.options.llmModel || "").trim();
     const credential = String(this.options.llmCredential || "").trim();
@@ -2293,15 +2304,19 @@ export class InstallerStepEngine {
         onEvent: (evt) => this.emitLog("configure_llm", evt.type === "stderr" ? "warn" : "info", evt.text, evt.urls || []),
       });
 
-      try {
-        await runCommandWithEvents("openclaw", ["models", "status", "--check", "--probe-provider", provider], {
-          onEvent: (evt) => this.emitLog("configure_llm", evt.type === "stderr" ? "warn" : "info", evt.text, evt.urls || []),
-        });
-      } catch (err) {
-        const details = `${err?.stderr || ""}\n${err?.stdout || ""}\n${err?.message || ""}`.trim();
-        throw new Error(
-          `LLM provider validation failed for '${provider}'. Check OAuth login and model, then retry.\n${details}`,
-        );
+      if (CUSTOM_PROVIDERS_NO_PROBE.includes(provider)) {
+        this.emitLog("configure_llm", "info", `Skipping openclaw provider probe for custom provider '${provider}'.`);
+      } else {
+        try {
+          await runCommandWithEvents("openclaw", ["models", "status", "--check", "--probe-provider", provider], {
+            onEvent: (evt) => this.emitLog("configure_llm", evt.type === "stderr" ? "warn" : "info", evt.text, evt.urls || []),
+          });
+        } catch (err) {
+          const details = `${err?.stderr || ""}\n${err?.stdout || ""}\n${err?.message || ""}`.trim();
+          throw new Error(
+            `LLM provider validation failed for '${provider}'. Check OAuth login and model, then retry.\n${details}`,
+          );
+        }
       }
 
       return { configured: true, provider, model, configPath: saved.configPath, authMode: "oauth" };
@@ -2326,15 +2341,19 @@ export class InstallerStepEngine {
       onEvent: (evt) => this.emitLog("configure_llm", evt.type === "stderr" ? "warn" : "info", evt.text, evt.urls || []),
     });
 
-    try {
-      await runCommandWithEvents("openclaw", ["models", "status", "--check", "--probe-provider", provider], {
-        onEvent: (evt) => this.emitLog("configure_llm", evt.type === "stderr" ? "warn" : "info", evt.text, evt.urls || []),
-      });
-    } catch (err) {
-      const details = `${err?.stderr || ""}\n${err?.stdout || ""}\n${err?.message || ""}`.trim();
-      throw new Error(
-        `LLM provider validation failed for '${provider}'. Check credential/model and retry.\n${details}`,
-      );
+    if (CUSTOM_PROVIDERS_NO_PROBE.includes(provider)) {
+      this.emitLog("configure_llm", "info", `Skipping openclaw provider probe for custom provider '${provider}'.`);
+    } else {
+      try {
+        await runCommandWithEvents("openclaw", ["models", "status", "--check", "--probe-provider", provider], {
+          onEvent: (evt) => this.emitLog("configure_llm", evt.type === "stderr" ? "warn" : "info", evt.text, evt.urls || []),
+        });
+      } catch (err) {
+        const details = `${err?.stderr || ""}\n${err?.stdout || ""}\n${err?.message || ""}`.trim();
+        throw new Error(
+          `LLM provider validation failed for '${provider}'. Check credential/model and retry.\n${details}`,
+        );
+      }
     }
 
     return { configured: true, provider, model, configPath: saved.configPath, authMode: "api_key" };

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";
@@ -38,6 +38,7 @@ const WIZARD_PROVIDER_PRIORITY = [
   "qwen",
   "cerebras",
   "minimax",
+  "cli-cloud",
 ];
 let wizardLlmCatalogPromise = null;
 
@@ -65,6 +66,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";
@@ -469,6 +473,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 {};
@@ -829,6 +875,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]) {
@@ -878,6 +925,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);
 
@@ -1216,12 +1266,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 = {};
   }
@@ -1251,6 +1319,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");
 
@@ -2155,6 +2234,10 @@ async function loadWizardLlmCatalogAsync() {
         id: "moonshot",
         models: [{ id: "moonshot/kimi-k2", name: "Kimi K2" }],
       },
+      {
+        id: "cli-cloud",
+        models: [{ id: "cli-cloud/gemma-e4b", name: "Gemma E4B (personal partner endpoint)" }],
+      },
     ],
     generatedAt: new Date().toISOString(),
   };
@@ -2265,6 +2348,7 @@ function wizardHtml(defaults) {
           <label>LLM API key or token (required)</label>
           <input id="llmCredential" type="password" placeholder="Paste the credential for the selected provider/model" />
           <p class="muted">Written to OpenClaw <code>config.env</code> for the selected provider. If you do not choose a model manually, the installer picks a safe default.</p>
+          <p class="muted hidden" id="llmCliCloudHint">Routes to <code>https://app.cli.cloud/llm/v1</code> — paste your personal CLI Cloud API key above.</p>
         </div>
         <div style="margin-top:12px;" id="llmOauthBlock" class="hidden">
           <p class="muted" style="margin-bottom:12px;">
@@ -2442,6 +2526,7 @@ function wizardHtml(defaults) {
       const llmAuthModeOauth = document.getElementById("llmAuthModeOauth");
       const llmProviderWrap = document.getElementById("llmProviderWrap");
       const llmOauthProviderNote = document.getElementById("llmOauthProviderNote");
+      const llmCliCloudHint = document.getElementById("llmCliCloudHint");
       const llmApiKeyBlock = document.getElementById("llmApiKeyBlock");
       const llmOauthBlock = document.getElementById("llmOauthBlock");
       const telegramTokenEl = document.getElementById("telegramToken");
@@ -3217,7 +3302,13 @@ function wizardHtml(defaults) {
         await copyWithFeedback(copyRestartBtn, restartCommandEl.textContent || "");
       });
       finishWizardBtn.addEventListener("click", finishWizardServer);
-      llmProviderEl.addEventListener("change", () => refreshModelOptions(""));
+      llmProviderEl.addEventListener("change", () => {
+        refreshModelOptions("");
+        if (llmCliCloudHint) {
+          if (llmProviderEl.value === "cli-cloud") llmCliCloudHint.classList.remove("hidden");
+          else llmCliCloudHint.classList.add("hidden");
+        }
+      });
       llmModelManualEl.addEventListener("change", () => {
         llmModelEl.disabled = !llmModelManualEl.checked;
         updateStartButtonState();
@@ -4242,15 +4333,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
@@ -4287,6 +4380,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
@@ -4453,17 +4548,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.102",
+  "version": "1.0.104",
   "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.102"
+    "solana-traderclaw": "^1.0.104"
   },
   "keywords": [
     "traderclaw",