traderclaw-cli 1.0.65 → 1.0.68

package/bin/installer-step-engine.mjs

@@ -308,17 +308,25 @@ function privilegeRemediationMessage(cmd, args = [], customLines = []) {
 
 function gatewayTimeoutRemediation() {
   return [
-    "Gateway bootstrap timed out waiting for health checks.",
-    "Run these commands in terminal, then click Start Installation again:",
-    "1) openclaw gateway status --json || true",
-    "2) openclaw gateway probe || true",
+    "Gateway failed to start: service stayed stopped and health checks did not pass.",
+    "This usually means the gateway service is misconfigured, crashed at launch, or the system is out of resources.",
+    "",
+    "Run these commands in your VPS terminal to diagnose and recover:",
+    "1) openclaw gateway status --json || true       # check current state",
+    "2) journalctl --user -u openclaw-gateway -n 50 --no-pager || true  # check service logs",
     "3) openclaw gateway stop || true",
     "4) openclaw gateway install",
     "5) openclaw gateway restart",
-    "6) openclaw gateway status --json",
+    "6) openclaw gateway status --json              # should show running + rpc.ok=true",
     "7) tailscale funnel --bg 18789",
     "8) tailscale funnel status",
-    "If gateway still fails on a low-memory VM, add swap or use a larger staging size (>=2GB RAM recommended).",
+    "",
+    "If the gateway still fails:",
+    "- Check RAM: openclaw gateway requires >=512MB free (>=2GB total recommended)",
+    "- Check disk: df -h ~/.openclaw",
+    "- Try: openclaw config validate && openclaw gateway doctor || true",
+    "- If config schema error appears, run: npm install -g openclaw@latest",
+    "Once the gateway shows 'running' in status, click Start Installation again.",
   ].join("\n");
 }
 
@@ -1332,6 +1340,58 @@ function ensureAgentsDefaultsSchemaCompat(config) {
 }
 
 /** Re-read config from disk and re-apply defaults shape before gateway/plugin commands that validate the file. */
+/**
+ * Proactively writes the minimum gateway fields required for OpenClaw to start.
+ *
+ * OpenClaw (post-2025) requires `gateway.mode` to be explicitly set to "local"
+ * before `openclaw gateway install` / `gateway restart` are called — the service
+ * crashes immediately at launch when the field is absent, producing
+ * "service stayed stopped / health checks never came up".
+ *
+ * We write these proactively rather than waiting for the first failure and
+ * hoping auto-recovery catches it, because newer OpenClaw validates the config
+ * during `gateway install` itself, before the process even starts.
+ */
+function ensureGatewayBootstrapDefaults(configPath = CONFIG_FILE, log = () => {}) {
+  let config = {};
+  try {
+    config = JSON.parse(readFileSync(configPath, "utf-8"));
+  } catch {
+    config = {};
+  }
+
+  if (!config.gateway || typeof config.gateway !== "object") {
+    config.gateway = {};
+  }
+
+  const changed = [];
+  if (!config.gateway.mode) {
+    config.gateway.mode = "local";
+    changed.push("gateway.mode=local");
+  }
+  if (!config.gateway.bind) {
+    config.gateway.bind = "loopback";
+    changed.push("gateway.bind=loopback");
+  }
+  if (!Number.isInteger(config.gateway.port)) {
+    config.gateway.port = 18789;
+    changed.push("gateway.port=18789");
+  }
+
+  ensureAgentsDefaultsSchemaCompat(config);
+
+  if (changed.length > 0) {
+    log(`Gateway bootstrap: pre-writing required config fields: ${changed.join(", ")}`);
+  }
+
+  try {
+    mkdirSync(dirname(configPath), { recursive: true });
+    writeFileSync(configPath, JSON.stringify(config, null, 2) + "\n", "utf-8");
+  } catch (err) {
+    log(`Gateway bootstrap: could not write config defaults (${err?.message || err}) — will proceed anyway`);
+  }
+}
+
 function normalizeOpenClawConfigFileShape(configPath = CONFIG_FILE) {
   let config = {};
   try {
@@ -1868,19 +1928,27 @@ export class InstallerStepEngine {
         });
         await this.runStep("gateway_bootstrap", "Starting OpenClaw gateway and Funnel", async () => {
           try {
-            normalizeOpenClawConfigFileShape(CONFIG_FILE);
+            // Ensure required gateway fields are present BEFORE install/restart.
+            // OpenClaw now requires gateway.mode="local" to be explicitly set;
+            // without it the service crashes immediately at startup.
+            ensureGatewayBootstrapDefaults(CONFIG_FILE, (msg) =>
+              this.emitLog("gateway_bootstrap", "info", msg),
+            );
             await this.runWithPrivilegeGuidance("gateway_bootstrap", "openclaw", ["gateway", "install"]);
             await this.runWithPrivilegeGuidance("gateway_bootstrap", "openclaw", ["gateway", "restart"]);
             return this.runFunnel();
           } catch (err) {
             const text = `${err?.message || ""}\n${err?.stderr || ""}\n${err?.stdout || ""}`.toLowerCase();
             const gatewayModeUnset = text.includes("gateway.mode=local") && text.includes("current: unset");
-            if (
+            const gatewayStartFailed =
               text.includes("gateway restart timed out")
               || text.includes("timed out after 60s waiting for health checks")
               || text.includes("waiting for gateway port")
-              || gatewayModeUnset
-            ) {
+              // OpenClaw ≥ current: shorter-timeout variant of the same class of failure
+              || (text.includes("gateway restart failed") && text.includes("service stayed stopped"))
+              || text.includes("health checks never came up")
+              || text.includes("service stayed stopped");
+            if (gatewayStartFailed || gatewayModeUnset) {
               const recovered = await this.tryAutoRecoverGatewayMode("gateway_bootstrap");
               if (recovered.success) {
                 return this.runFunnel();

package/bin/openclaw-trader.mjs

@@ -9,27 +9,23 @@ import { randomUUID, createPrivateKey, sign as cryptoSign } from "crypto";
 import { execFile, execSync } from "child_process";
 import { promisify } from "util";
 import { createServer } from "http";
-import { sortModelsByPreference, MAX_MODELS_PER_PROVIDER_SORT } from "./llm-model-preference.mjs";
 import { resolvePluginPackageRoot } from "./resolve-plugin-root.mjs";
 
 const execFileAsync = promisify(execFile);
 
 /**
- * Fast wizard catalog lookup: prefer one full list, then only probe key providers.
- * Timeouts are intentionally short — on a fresh install the CLI can't reach providers
- * (no credentials yet) so we want to fail fast and show the curated fallback list
- * rather than making the user wait 10+ seconds.  Target total: ≤ 5 s.
+ * Ordered list of providers for display in the wizard dropdown.
+ * The most commonly used providers appear first.
  */
-const OPENCLAW_MODELS_FLAT_TIMEOUT_MS = 3_000;
-const OPENCLAW_MODELS_PER_PROVIDER_TIMEOUT_MS = 2_500;
-const WIZARD_PRIORITY_PROVIDERS = [
+const WIZARD_PROVIDER_PRIORITY = [
   "anthropic",
   "openai",
   "google",
   "openrouter",
-];
-const WIZARD_PROVIDER_PRIORITY = [
-  ...WIZARD_PRIORITY_PROVIDERS,
+  "xai",
+  "deepseek",
+  "groq",
+  "mistral",
   "perplexity",
   "together",
   "openai-codex",
@@ -44,14 +40,6 @@ const WIZARD_PROVIDER_PRIORITY = [
 ];
 let wizardLlmCatalogPromise = null;
 
-function compareWizardProviderPriority(a, b) {
-  const ai = WIZARD_PROVIDER_PRIORITY.indexOf(a);
-  const bi = WIZARD_PROVIDER_PRIORITY.indexOf(b);
-  const aRank = ai >= 0 ? ai : Number.MAX_SAFE_INTEGER;
-  const bRank = bi >= 0 ? bi : Number.MAX_SAFE_INTEGER;
-  return aRank - bRank || a.localeCompare(b);
-}
-
 const PLUGIN_ROOT = resolvePluginPackageRoot(import.meta.url);
 const PLUGIN_PACKAGE_JSON = JSON.parse(readFileSync(join(PLUGIN_ROOT, "package.json"), "utf-8"));
 const PLUGIN_VERSION =
@@ -1917,35 +1905,29 @@ function parseJsonBody(req) {
   });
 }
 
+/**
+ * Returns the wizard LLM catalog immediately from the curated static list.
+ *
+ * WHY we no longer call `openclaw models list --all`:
+ * The OpenClaw CLI enumerates models by making live network calls to each
+ * provider's API (provider plugins inject catalogs via network).  The wizard
+ * runs BEFORE any API credentials have been configured, so every probe will
+ * always ETIMEDOUT — there is nothing to authenticate with yet.  Calling the
+ * CLI here is architecturally wrong for this stage of setup.
+ *
+ * The curated list below is the correct source for the wizard: it covers all
+ * supported providers with their recommended models and loads in < 1 ms.
+ * After installation the user can run `openclaw models list` to see the full
+ * live catalog for their configured providers.
+ */
 async function loadWizardLlmCatalogAsync() {
-  const supportedProviders = new Set([
-    "anthropic",
-    "openai",
-    "openai-codex",
-    "openrouter",
-    "groq",
-    "mistral",
-    "google",
-    "google-vertex",
-    "xai",
-    "deepseek",
-    "together",
-    "perplexity",
-    "amazon-bedrock",
-    "vercel-ai-gateway",
-    "minimax",
-    "moonshot",
-    "nvidia",
-    "qwen",
-    "cerebras",
-  ]);
-  const fallback = {
-    source: "fallback",
+  return {
+    source: "curated",
     providers: [
       {
         id: "anthropic",
         models: [
-          { id: "anthropic/claude-sonnet-4-6", name: "Claude Sonnet 4.6 (recommended default)" },
+          { id: "anthropic/claude-sonnet-4-6", name: "Claude Sonnet 4.6 (recommended)" },
           { id: "anthropic/claude-opus-4-6", name: "Claude Opus 4.6" },
           { id: "anthropic/claude-haiku-4-5", name: "Claude Haiku 4.5" },
         ],
@@ -1953,7 +1935,7 @@ async function loadWizardLlmCatalogAsync() {
       {
         id: "openai",
         models: [
-          { id: "openai/gpt-5.4", name: "GPT-5.4 (recommended default)" },
+          { id: "openai/gpt-5.4", name: "GPT-5.4 (recommended)" },
           { id: "openai/gpt-5.4-mini", name: "GPT-5.4 mini" },
           { id: "openai/gpt-5.4-nano", name: "GPT-5.4 nano" },
         ],
@@ -1962,29 +1944,48 @@ async function loadWizardLlmCatalogAsync() {
         id: "openai-codex",
         models: [{ id: "openai-codex/gpt-5-codex", name: "GPT-5 Codex" }],
       },
+      {
+        id: "google",
+        models: [
+          { id: "google/gemini-2.5-flash", name: "Gemini 2.5 Flash (recommended)" },
+          { id: "google/gemini-2.5-pro", name: "Gemini 2.5 Pro" },
+        ],
+      },
       {
         id: "xai",
-        models: [{ id: "xai/grok-4", name: "Grok 4" }],
+        models: [
+          { id: "xai/grok-4", name: "Grok 4 (recommended)" },
+          { id: "xai/grok-3", name: "Grok 3" },
+        ],
       },
       {
         id: "deepseek",
-        models: [{ id: "deepseek/deepseek-chat", name: "DeepSeek Chat (V3.2)" }],
+        models: [
+          { id: "deepseek/deepseek-chat", name: "DeepSeek Chat V3 (recommended)" },
+          { id: "deepseek/deepseek-reasoner", name: "DeepSeek Reasoner R1" },
+        ],
       },
       {
-        id: "google",
-        models: [{ id: "google/gemini-2.5-flash", name: "Gemini 2.5 Flash" }],
+        id: "openrouter",
+        models: [
+          { id: "openrouter/anthropic/claude-sonnet-4-6", name: "Claude Sonnet 4.6 via OpenRouter (recommended)" },
+          { id: "openrouter/openai/gpt-5.4", name: "GPT-5.4 via OpenRouter" },
+          { id: "openrouter/google/gemini-2.5-flash", name: "Gemini 2.5 Flash via OpenRouter" },
+        ],
       },
       {
         id: "groq",
-        models: [{ id: "groq/llama-4-scout-17b-16e-instruct", name: "Llama 4 Scout" }],
-      },
-      {
-        id: "openrouter",
-        models: [{ id: "openrouter/anthropic/claude-sonnet-4-6", name: "Claude Sonnet 4.6 (via OpenRouter)" }],
+        models: [
+          { id: "groq/llama-4-scout-17b-16e-instruct", name: "Llama 4 Scout (recommended)" },
+          { id: "groq/llama-4-maverick-17b-128e-instruct", name: "Llama 4 Maverick" },
+        ],
       },
       {
         id: "mistral",
-        models: [{ id: "mistral/mistral-large-latest", name: "Mistral Large" }],
+        models: [
+          { id: "mistral/mistral-large-latest", name: "Mistral Large (recommended)" },
+          { id: "mistral/mistral-medium-latest", name: "Mistral Medium" },
+        ],
       },
       {
         id: "perplexity",
@@ -2002,174 +2003,13 @@ async function loadWizardLlmCatalogAsync() {
         id: "qwen",
         models: [{ id: "qwen/qwen3-235b-a22b", name: "Qwen3 235B A22B" }],
       },
+      {
+        id: "moonshot",
+        models: [{ id: "moonshot/kimi-k2", name: "Kimi K2" }],
+      },
     ],
+    generatedAt: new Date().toISOString(),
   };
-
-  if (!commandExists("openclaw")) {
-    return { ...fallback, warning: "openclaw_not_found" };
-  }
-
-  const providerIds = [...supportedProviders].sort(compareWizardProviderPriority);
-  const priorityProviderIds = providerIds.filter((id) => WIZARD_PRIORITY_PROVIDERS.includes(id));
-
-  async function fetchModelsForProvider(provider) {
-    try {
-      const { stdout } = await execFileAsync(
-        "openclaw",
-        ["models", "list", "--all", "--provider", provider, "--json"],
-        {
-          encoding: "utf-8",
-          maxBuffer: 25 * 1024 * 1024,
-          timeout: OPENCLAW_MODELS_PER_PROVIDER_TIMEOUT_MS,
-          env: NO_COLOR_ENV,
-        },
-      );
-      return { provider, stdout };
-    } catch (err) {
-      return { provider, error: err };
-    }
-  }
-
-  function seedFallbackProviderMap() {
-    return new Map(
-      fallback.providers.map((entry) => [
-        entry.id,
-        entry.models.map((model) => ({ ...model })),
-      ]),
-    );
-  }
-
-  function mergeCatalogModelsIntoMap(providerMap, models, expectedProvider = "") {
-    let added = 0;
-    for (const entry of models) {
-      if (!entry || typeof entry.key !== "string") continue;
-      const modelId = String(entry.key);
-      const slash = modelId.indexOf("/");
-      if (slash <= 0 || slash === modelId.length - 1) continue;
-      const provider = modelId.slice(0, slash);
-      if (!supportedProviders.has(provider)) continue;
-      if (expectedProvider && provider !== expectedProvider) continue;
-      const existing = providerMap.get(provider) || [];
-      existing.push({
-        id: modelId,
-        name: typeof entry.name === "string" && entry.name.trim() ? entry.name : modelId,
-      });
-      providerMap.set(provider, existing);
-      added += 1;
-    }
-    return added;
-  }
-
-  function buildProvidersFromMap(providerMap) {
-    return providerIds
-      .map((id) => {
-        const rawModels = providerMap.get(id) || [];
-        const sortedIds = sortModelsByPreference(
-          id,
-          rawModels.map((m) => m.id),
-        );
-        const byId = new Map(rawModels.map((m) => [m.id, m]));
-        const limitedIds = sortedIds.slice(0, MAX_MODELS_PER_PROVIDER_SORT);
-        const models = limitedIds.map((mid) => byId.get(mid)).filter(Boolean);
-        return { id, models };
-      })
-      .filter((entry) => supportedProviders.has(entry.id))
-      .filter((entry) => entry.models.length > 0);
-  }
-
-  /** When `openclaw models list --all --json` returns models; used if per-provider calls yield nothing. */
-  function mergeFlatCatalogIntoMap(providerMap) {
-    const raw = execSync("openclaw models list --all --json", {
-      encoding: "utf-8",
-      stdio: ["ignore", "pipe", "pipe"],
-      maxBuffer: 50 * 1024 * 1024,
-      timeout: OPENCLAW_MODELS_FLAT_TIMEOUT_MS,
-      env: NO_COLOR_ENV,
-    });
-    const parsed = extractJson(raw);
-    if (!parsed) return 0;
-    const models = Array.isArray(parsed?.models) ? parsed.models : [];
-    return mergeCatalogModelsIntoMap(providerMap, models);
-  }
-
-  try {
-    const t0 = Date.now();
-    const liveProviderMap = new Map();
-    let catalogStrategy = "flat_all";
-    let flatError = "";
-    let liveAdded = 0;
-    try {
-      liveAdded = mergeFlatCatalogIntoMap(liveProviderMap);
-    } catch (err) {
-      flatError = err instanceof Error ? err.message : String(err);
-    }
-
-    let batches = [];
-    if (liveAdded === 0) {
-      catalogStrategy = "priority_parallel";
-      batches = await Promise.all(priorityProviderIds.map((p) => fetchModelsForProvider(p)));
-      for (const batch of batches) {
-        if (batch.error || !batch.stdout) continue;
-        const parsed = extractJson(batch.stdout);
-        if (!parsed) continue;
-        const models = Array.isArray(parsed?.models) ? parsed.models : [];
-        liveAdded += mergeCatalogModelsIntoMap(liveProviderMap, models, batch.provider);
-      }
-    }
-
-    let providers = buildProvidersFromMap(liveProviderMap);
-    if (providers.length === 0) {
-      const failedParallel = batches.filter((b) => b.error).length;
-      const details = [];
-      if (flatError) details.push(`flat list failed: ${flatError.slice(0, 160)}`);
-      if (failedParallel > 0) {
-        details.push(
-          `${failedParallel}/${priorityProviderIds.length} priority provider lookups failed`,
-        );
-      }
-      return {
-        ...fallback,
-        warning: `openclaw_model_catalog_unavailable${details.length ? ` (${details.join("; ")})` : ""}`,
-      };
-    }
-
-    const mergedProviderMap = new Map(liveProviderMap);
-    for (const [provider, models] of seedFallbackProviderMap()) {
-      if (!mergedProviderMap.has(provider) || (mergedProviderMap.get(provider) || []).length === 0) {
-        mergedProviderMap.set(provider, models);
-      }
-    }
-    providers = buildProvidersFromMap(mergedProviderMap);
-
-    const elapsedMs = Date.now() - t0;
-    const source =
-      providers.length > buildProvidersFromMap(liveProviderMap).length ? "hybrid" : "openclaw";
-    const warning =
-      source === "hybrid" && flatError
-        ? `loaded priority providers; kept curated defaults for the rest (${flatError.slice(0, 160)})`
-        : source === "hybrid"
-          ? "loaded priority providers; kept curated defaults for the rest"
-          : "";
-    return {
-      source,
-      providers,
-      generatedAt: new Date().toISOString(),
-      catalogFetchMs: elapsedMs,
-      catalogStrategy,
-      ...(warning ? { warning } : {}),
-    };
-  } catch (err) {
-    const detail = err?.message || String(err);
-    const isBufferErr = detail.includes("maxBuffer") || detail.includes("ENOBUFS");
-    const hint = isBufferErr
-      ? " (stdout exceeded buffer — OpenClaw model catalog may have grown; this version raises the limit)"
-      : "";
-    console.error(`[traderclaw] loadWizardLlmCatalog failed${hint}: ${detail.slice(0, 500)}`);
-    return {
-      ...fallback,
-      warning: `openclaw_models_list_failed: ${detail}`,
-    };
-  }
 }
 
 function wizardHtml(defaults) {
@@ -2468,11 +2308,11 @@ function wizardHtml(defaults) {
           startBtn.textContent = "Loading providers...";
           const updateHint = () => {
             const elapsedSeconds = Math.max(1, Math.floor((Date.now() - llmLoadStartedAt) / 1000));
-            if (elapsedSeconds >= 8) {
-              llmLoadingHintTextEl.textContent = "Still loading provider catalog (" + elapsedSeconds + "s). This should usually finish in under ~10s.";
+            if (elapsedSeconds >= 5) {
+              llmLoadingHintTextEl.textContent = "Still loading (" + elapsedSeconds + "s). Check network or reload.";
               return;
             }
-            llmLoadingHintTextEl.textContent = "Fetching provider list (" + elapsedSeconds + "s)...";
+            llmLoadingHintTextEl.textContent = "Loading provider list (" + elapsedSeconds + "s)...";
           };
           updateHint();
           stopLlmLoadTicker();
@@ -2523,7 +2363,7 @@ function wizardHtml(defaults) {
         setLlmCatalogLoading(true);
         setSelectOptions(llmProviderEl, [{ value: "", label: "Loading providers..." }], "");
         setSelectOptions(llmModelEl, [{ value: "", label: "Loading models..." }], "");
-        setLlmCatalogReady(false, "Loading LLM provider catalog... this can take a few seconds.");
+        setLlmCatalogReady(false, "Loading provider list...");
         try {
           const res = await fetch("/api/llm/options");
           const data = await res.json();
@@ -2532,21 +2372,15 @@ function wizardHtml(defaults) {
           if (providers.length === 0) {
             setSelectOptions(llmProviderEl, [{ value: "", label: "No providers available" }], "");
             refreshModelOptions("");
-            setLlmCatalogReady(false, "No LLM providers were found from OpenClaw. Please check OpenClaw model setup.", true);
+            setLlmCatalogReady(false, "No LLM providers found. Reload the page to try again.", true);
             return;
           }
           setSelectOptions(llmProviderEl, providers, "${defaults.llmProvider}");
           refreshModelOptions("${defaults.llmModel}");
-          const isFallback = llmCatalog.source === "fallback";
-          const isHybrid = llmCatalog.source === "hybrid";
-          const catalogMsg = isFallback
-            ? "Showing curated safe defaults only (could not load live OpenClaw catalog" + (llmCatalog.warning ? ": " + llmCatalog.warning : "") + "). Anthropic and OpenAI stay ready first, with several other providers still available."
-            : isHybrid
-              ? "Loaded priority providers first and filled the rest with curated defaults" + (llmCatalog.warning ? " (" + llmCatalog.warning + ")" : "") + "."
-              : "LLM providers loaded. Select provider and paste credential to continue. Model selection is optional.";
-          setLlmCatalogReady(true, catalogMsg, isFallback || isHybrid);
+          const catalogMsg = "Select your provider, paste your API key, and start installation. After setup, run \`openclaw models list\` to explore your live catalog.";
+          setLlmCatalogReady(true, catalogMsg, false);
         } catch (err) {
-          setLlmCatalogReady(false, "Failed to load LLM providers. Check OpenClaw and reload this page.", true);
+          setLlmCatalogReady(false, "Failed to load LLM providers. Reload the page and try again.", true);
           manualEl.textContent = "Failed to load LLM provider catalog: " + (err && err.message ? err.message : String(err));
         } finally {
           setLlmCatalogLoading(false);

package/package.json

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