traderclaw-cli 1.0.52 → 1.0.54

package/bin/cli.ts

@@ -204,6 +204,8 @@ async function cmdSetup(args: string[]) {
   let apiKey = "";
   let orchestratorUrl = "";
 
+  let forwardTelegramRecipientArg = "";
+
   for (let i = 0; i < args.length; i++) {
     if ((args[i] === "--api-key" || args[i] === "-k") && args[i + 1]) {
       apiKey = args[++i];
@@ -211,6 +213,14 @@ async function cmdSetup(args: string[]) {
     if ((args[i] === "--url" || args[i] === "-u") && args[i + 1]) {
       orchestratorUrl = args[++i];
     }
+    if (
+      (args[i] === "--telegram-recipient" ||
+        args[i] === "--forward-telegram-chat-id" ||
+        args[i] === "--telegram-chat-id") &&
+      args[i + 1]
+    ) {
+      forwardTelegramRecipientArg = args[++i];
+    }
   }
 
   if (!apiKey) {
@@ -344,6 +354,17 @@ async function cmdSetup(args: string[]) {
     process.exit(1);
   }
 
+  print("\nTelegram delivery (optional)...\n");
+  printInfo("  Enter your Telegram @username or numeric chat id so agent replies can be routed to you.");
+  printInfo("  Usernames are resolved with Telegram getChat (set TELEGRAM_BOT_TOKEN on the gateway, or");
+  printInfo("  export it here for immediate resolution). Private chats: message your bot once first.\n");
+
+  let forwardTelegramRecipient = forwardTelegramRecipientArg.trim();
+  if (!forwardTelegramRecipient) {
+    forwardTelegramRecipient = await prompt("Telegram @username or chat id (optional, Enter to skip)", "");
+  }
+  forwardTelegramRecipient = forwardTelegramRecipient.trim();
+
   print("\nWriting configuration...\n");
 
   const existingConfig = readConfig();
@@ -353,6 +374,32 @@ async function cmdSetup(args: string[]) {
     apiKey,
     apiTimeout: 120000,
   };
+
+  if (forwardTelegramRecipient) {
+    try {
+      const { resolveTelegramRecipientToChatId, looksLikeTelegramChatId } = await import("../src/telegram-resolve.ts");
+      const botToken = String(
+        process.env.TELEGRAM_BOT_TOKEN || process.env.OPENCLAW_TELEGRAM_BOT_TOKEN || "",
+      ).trim();
+      if (looksLikeTelegramChatId(forwardTelegramRecipient)) {
+        pluginConfig.forwardTelegramRecipient = forwardTelegramRecipient;
+        printSuccess(`  Saved Telegram chat id`);
+      } else if (botToken) {
+        const id = await resolveTelegramRecipientToChatId({ botToken, raw: forwardTelegramRecipient });
+        pluginConfig.forwardTelegramRecipient = id;
+        printSuccess(`  Resolved @${forwardTelegramRecipient.replace(/^@/, "")} → chat id ${id}`);
+      } else {
+        pluginConfig.forwardTelegramRecipient = forwardTelegramRecipient;
+        printInfo(
+          "  Saved as-is; start the gateway with TELEGRAM_BOT_TOKEN set to resolve @username on first run.",
+        );
+      }
+    } catch (err) {
+      printWarn(`  Telegram resolve failed: ${err instanceof Error ? err.message : String(err)}`);
+      printInfo("  Saving your username anyway — fix token or use numeric chat id.");
+      pluginConfig.forwardTelegramRecipient = forwardTelegramRecipient;
+    }
+  }
   setPluginConfig(existingConfig, pluginConfig);
   writeConfig(existingConfig);
 
@@ -365,6 +412,7 @@ async function cmdSetup(args: string[]) {
   Orchestrator:  ${orchestratorUrl}
   Wallet:        ${walletLabel} (ID: ${walletId})
   API Key:       ${maskKey(apiKey)}
+  Telegram fwd:  ${(pluginConfig.forwardTelegramRecipient as string) || "(not set)"}
   Config:        ${CONFIG_FILE}
 `);
   print("Next steps:");
@@ -575,8 +623,9 @@ Commands:
   config             View and manage configuration
 
 Setup options:
-  --api-key, -k      API key (skip interactive prompt)
-  --url, -u          Orchestrator URL (skip interactive prompt)
+  --api-key, -k              API key (skip interactive prompt)
+  --url, -u                  Orchestrator URL (skip interactive prompt)
+  --telegram-recipient   Telegram @username or chat id (alias: --forward-telegram-chat-id)
 
 Config subcommands:
   config show        Show current configuration
@@ -586,6 +635,7 @@ Config subcommands:
 Examples:
   openclaw-trader setup
   openclaw-trader setup --api-key sk_live_abc123 --url https://api.traderclaw.ai
+  openclaw-trader setup --telegram-recipient @MyChannelOrUser
   openclaw-trader status
   openclaw-trader config show
   openclaw-trader config set apiTimeout 60000

package/bin/openclaw-trader.mjs

@@ -1856,6 +1856,51 @@ async function loadWizardLlmCatalogAsync() {
     }
   }
 
+  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: 45_000,
+      env: NO_COLOR_ENV,
+    });
+    const parsed = extractJson(raw);
+    if (!parsed) return;
+    const models = Array.isArray(parsed?.models) ? parsed.models : [];
+    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;
+      const existing = providerMap.get(provider) || [];
+      existing.push({
+        id: modelId,
+        name: typeof entry.name === "string" && entry.name.trim() ? entry.name : modelId,
+      });
+      providerMap.set(provider, existing);
+    }
+  }
+
   try {
     const t0 = Date.now();
     const batches = await Promise.all(providerIds.map((p) => fetchModelsForProvider(p)));
@@ -1883,23 +1928,28 @@ async function loadWizardLlmCatalogAsync() {
       }
     }
 
-    const providers = providerIds
-      .map((id) => {
-        const rawModels = providerMap.get(id) || [];
-        const sortedIds = sortModelsByPreference(
-          id,
-          rawModels.map((m) => m.id),
+    let providers = buildProvidersFromMap(providerMap);
+    let catalogStrategy = "parallel";
+
+    if (providers.length === 0) {
+      catalogStrategy = "legacy_fallback";
+      try {
+        mergeFlatCatalogIntoMap(providerMap);
+        providers = buildProvidersFromMap(providerMap);
+      } catch (legacyErr) {
+        console.error(
+          `[traderclaw] loadWizardLlmCatalog legacy fallback failed: ${legacyErr instanceof Error ? legacyErr.message : String(legacyErr)}`,
         );
-        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);
+      }
+    }
 
     if (providers.length === 0) {
-      return { ...fallback, warning: "openclaw_model_catalog_empty" };
+      const failedParallel = batches.filter((b) => b.error).length;
+      const hint =
+        failedParallel > 0
+          ? ` (${failedParallel}/${batches.length} per-provider openclaw calls failed — check OpenClaw version supports: openclaw models list --all --provider <id> --json)`
+          : "";
+      return { ...fallback, warning: `openclaw_model_catalog_empty${hint}` };
     }
 
     const elapsedMs = Date.now() - t0;
@@ -1908,6 +1958,7 @@ async function loadWizardLlmCatalogAsync() {
       providers,
       generatedAt: new Date().toISOString(),
       catalogFetchMs: elapsedMs,
+      catalogStrategy,
     };
   } catch (err) {
     const detail = err?.message || String(err);
@@ -2211,7 +2262,7 @@ function wizardHtml(defaults) {
           const updateHint = () => {
             const elapsedSeconds = Math.max(1, Math.floor((Date.now() - llmLoadStartedAt) / 1000));
             if (elapsedSeconds >= 8) {
-              llmLoadingHintTextEl.textContent = "Still loading provider catalog (" + elapsedSeconds + "s). First run can take up to ~20s.";
+              llmLoadingHintTextEl.textContent = "Still loading provider catalog (" + elapsedSeconds + "s). First run can take up to ~60s.";
               return;
             }
             llmLoadingHintTextEl.textContent = "Fetching provider list (" + elapsedSeconds + "s)...";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "traderclaw-cli",
-  "version": "1.0.52",
+  "version": "1.0.54",
   "description": "Global TraderClaw CLI (install --wizard, setup, precheck). Installs solana-traderclaw as a dependency for OpenClaw plugin files.",
   "type": "module",
   "bin": {