jimeng-cli 0.3.1 → 0.3.2

package/dist/cli/index.js

@@ -17,7 +17,7 @@ import {
   session_pool_default,
   upscaleImage,
   waitForTaskResponse
-} from "../chunk-2IIK4X7C.js";
+} from "../chunk-FAXTAAQO.js";
 
 // src/cli/app.ts
 import process2 from "process";
@@ -28,8 +28,7 @@ import path from "path";
 import { access, readFile } from "fs/promises";
 import minimist from "minimist";
 function maskToken(token) {
-  const n = token.length;
-  if (n <= 10) return "***";
+  if (token.length <= 10) return "***";
   return `${token.slice(0, 4)}...${token.slice(-4)}`;
 }
 function formatUnixMs(value) {
@@ -44,14 +43,14 @@ function printTokenEntriesTable(items) {
   console.log("token	region	enabled	live	lastCredit	lastCheckedAt	failures");
   for (const item of items) {
     if (!item || typeof item !== "object") continue;
-    const entry = item;
-    const token = typeof entry.token === "string" ? entry.token : "-";
-    const region = typeof entry.region === "string" ? entry.region : "-";
-    const enabled = typeof entry.enabled === "boolean" ? String(entry.enabled) : "-";
-    const live = typeof entry.live === "boolean" ? String(entry.live) : "-";
-    const lastCredit = typeof entry.lastCredit === "number" ? String(entry.lastCredit) : "-";
-    const lastCheckedAt = formatUnixMs(entry.lastCheckedAt);
-    const failures = typeof entry.consecutiveFailures === "number" ? String(entry.consecutiveFailures) : "-";
+    const e = item;
+    const token = typeof e.token === "string" ? e.token : "-";
+    const region = typeof e.region === "string" ? e.region : "-";
+    const enabled = typeof e.enabled === "boolean" ? String(e.enabled) : "-";
+    const live = typeof e.live === "boolean" ? String(e.live) : "-";
+    const lastCredit = typeof e.lastCredit === "number" ? String(e.lastCredit) : "-";
+    const lastCheckedAt = formatUnixMs(e.lastCheckedAt);
+    const failures = typeof e.consecutiveFailures === "number" ? String(e.consecutiveFailures) : "-";
     console.log(`${token}	${region}	${enabled}	${live}	${lastCredit}	${lastCheckedAt}	${failures}`);
   }
 }
@@ -90,6 +89,30 @@ ${usage}`);
   }
   return deduped;
 }
+function resolveTokenRegionPairs(explicitTokens, regionCode, deps, opts) {
+  if (explicitTokens.length > 0) {
+    return explicitTokens.map((token) => {
+      var _a;
+      const entryRegion = (_a = session_pool_default.getTokenEntry(token)) == null ? void 0 : _a.region;
+      const finalRegion = regionCode || entryRegion;
+      if (!finalRegion) {
+        deps.fail(`Missing region for token ${maskToken(token)}. Provide --region or register token in token-pool.`);
+      }
+      return { token, region: finalRegion };
+    });
+  }
+  const requireLive = (opts == null ? void 0 : opts.requireLive) ?? true;
+  const entries = session_pool_default.getEntries(false).filter((item) => {
+    if (!item.enabled || !item.region) return false;
+    if (requireLive && item.live === false) return false;
+    if (regionCode && item.region !== regionCode) return false;
+    return true;
+  });
+  if (entries.length === 0) {
+    deps.fail("No token available. Provide --token or configure token-pool.");
+  }
+  return entries.map((item) => ({ token: item.token, region: item.region }));
+}
 function createTokenSubcommands(deps) {
   const handleTokenCheck = async (argv) => {
     const args = minimist(argv, {
@@ -101,74 +124,68 @@ function createTokenSubcommands(deps) {
       console.log(usage);
       return;
     }
-    const region = deps.getRegionWithDefault(args);
-    const regionCode = deps.parseRegionOrFail(region);
-    if (!regionCode) {
-      deps.fail("Missing region. Use --region cn/us/hk/jp/sg.");
-    }
-    const tokens = await collectTokensFromArgs(args, usage, deps, true);
+    const explicitRegion = deps.getSingleString(args, "region");
+    const regionCode = explicitRegion ? deps.parseRegionOrFail(explicitRegion) : void 0;
+    await deps.ensureTokenPoolReady();
+    const explicitTokens = await collectTokensFromArgs(args, usage, deps, false);
+    const pairs = resolveTokenRegionPairs(explicitTokens, regionCode, deps, { requireLive: false });
     if (!args.json) {
-      console.log(`Checking ${tokens.length} token(s)`);
+      console.log(`Checking ${pairs.length} token(s)`);
     }
-    await deps.ensureTokenPoolReady();
     let invalid = 0;
     let requestErrors = 0;
     const results = [];
-    for (const token of tokens) {
+    for (const { token, region } of pairs) {
       const masked = maskToken(token);
       try {
-        const live = await getTokenLiveStatus(token, buildRegionInfo(regionCode));
+        const live = await getTokenLiveStatus(token, buildRegionInfo(region));
         await session_pool_default.syncTokenCheckResult(token, live);
-        if (live === true) {
-          if (!args.json) console.log(`[OK]   ${masked} live=true`);
+        if (live) {
+          if (!args.json) console.log(`[OK]   ${masked} (${region}) live=true`);
+          results.push({ token_masked: masked, region, live: true });
         } else {
           invalid += 1;
-          if (!args.json) console.log(`[FAIL] ${masked} live=false`);
+          if (!args.json) console.log(`[FAIL] ${masked} (${region}) live=false`);
+          results.push({ token_masked: masked, region, live: false });
         }
-        results.push({ token_masked: masked, live: live === true });
       } catch (error) {
         requestErrors += 1;
         const message = error instanceof Error ? error.message : String(error);
-        if (!args.json) console.log(`[ERROR] ${masked} ${message}`);
-        results.push({ token_masked: masked, error: message });
+        if (!args.json) console.log(`[ERROR] ${masked} (${region}) ${message}`);
+        results.push({ token_masked: masked, region, error: message });
       }
     }
     if (args.json) {
       deps.printCommandJson("token.check", results, {
-        total: tokens.length,
+        total: pairs.length,
         invalid,
         request_errors: requestErrors
       });
     } else {
-      console.log(`Summary: total=${tokens.length} invalid=${invalid} request_errors=${requestErrors}`);
+      console.log(`Summary: total=${pairs.length} invalid=${invalid} request_errors=${requestErrors}`);
     }
     if (requestErrors > 0) process.exit(3);
     if (invalid > 0) process.exit(2);
   };
   const handleTokenList = async (argv) => {
-    const args = minimist(argv, {
-      boolean: ["help", "json"]
-    });
-    const usage = deps.getUsage("list");
+    const args = minimist(argv, { boolean: ["help", "json"] });
     if (args.help) {
-      console.log(usage);
+      console.log(deps.getUsage("list"));
       return;
     }
     await deps.ensureTokenPoolReady();
-    const normalized = buildTokenPoolSnapshot();
+    const snapshot = buildTokenPoolSnapshot();
     if (args.json) {
-      deps.printCommandJson("token.list", normalized);
+      deps.printCommandJson("token.list", snapshot);
       return;
     }
-    const body = normalized && typeof normalized === "object" ? normalized : {};
-    const summary = body.summary;
-    if (summary && typeof summary === "object") {
+    const body = snapshot && typeof snapshot === "object" ? snapshot : {};
+    if (body.summary && typeof body.summary === "object") {
       console.log("Summary:");
-      deps.printJson(summary);
+      deps.printJson(body.summary);
     }
-    const items = Array.isArray(body.items) ? body.items : [];
     console.log("Entries:");
-    printTokenEntriesTable(items);
+    printTokenEntriesTable(Array.isArray(body.items) ? body.items : []);
   };
   const handleTokenPointsOrReceive = async (argv, action) => {
     const args = minimist(argv, {
@@ -180,45 +197,30 @@ function createTokenSubcommands(deps) {
       console.log(usage);
       return;
     }
-    const region = deps.getRegionWithDefault(args);
-    const regionCode = deps.parseRegionOrFail(region);
+    const regionArg = deps.getSingleString(args, "region");
+    const regionCode = regionArg ? deps.parseRegionOrFail(regionArg) : void 0;
     await deps.ensureTokenPoolReady();
-    const tokens = await collectTokensFromArgs(args, usage, deps, false);
-    const resolvedTokens = tokens.length > 0 ? tokens.map((token) => {
-      var _a;
-      const entryRegion = (_a = session_pool_default.getTokenEntry(token)) == null ? void 0 : _a.region;
-      const finalRegion = regionCode || entryRegion;
-      if (!finalRegion) {
-        deps.fail(`Missing region for token ${maskToken(token)}. Provide --region or register token region in token-pool.`);
-      }
-      return { token, region: finalRegion };
-    }) : session_pool_default.getEntries(false).filter((item) => item.enabled && item.live !== false && item.region).filter((item) => regionCode ? item.region === regionCode : true).map((item) => ({ token: item.token, region: item.region }));
-    if (resolvedTokens.length === 0) {
-      deps.fail("No token available. Provide --token or configure token-pool.");
-    }
+    const explicitTokens = await collectTokensFromArgs(args, usage, deps, false);
+    const pairs = resolveTokenRegionPairs(explicitTokens, regionCode, deps);
     const payload = action === "points" ? await Promise.all(
-      resolvedTokens.map(async (item) => ({
-        token: item.token,
-        points: await getCredit(item.token, buildRegionInfo(item.region))
+      pairs.map(async ({ token, region }) => ({
+        token,
+        points: await getCredit(token, buildRegionInfo(region))
       }))
     ) : await Promise.all(
-      resolvedTokens.map(async (item) => {
-        const currentCredit = await getCredit(item.token, buildRegionInfo(item.region));
+      pairs.map(async ({ token, region }) => {
+        const regionInfo = buildRegionInfo(region);
+        const currentCredit = await getCredit(token, regionInfo);
         if (currentCredit.totalCredit <= 0) {
           try {
-            await receiveCredit(item.token, buildRegionInfo(item.region));
-            const updatedCredit = await getCredit(item.token, buildRegionInfo(item.region));
-            return { token: item.token, credits: updatedCredit, received: true };
+            await receiveCredit(token, regionInfo);
+            const updatedCredit = await getCredit(token, regionInfo);
+            return { token, credits: updatedCredit, received: true };
           } catch (error) {
-            return {
-              token: item.token,
-              credits: currentCredit,
-              received: false,
-              error: (error == null ? void 0 : error.message) || String(error)
-            };
+            return { token, credits: currentCredit, received: false, error: (error == null ? void 0 : error.message) || String(error) };
           }
         }
-        return { token: item.token, credits: currentCredit, received: false };
+        return { token, credits: currentCredit, received: false };
       })
     );
     if (args.json) {
@@ -237,28 +239,32 @@ function createTokenSubcommands(deps) {
       console.log(usage);
       return;
     }
-    const region = deps.getRegionWithDefault(args);
     await deps.ensureTokenPoolReady();
     const tokens = await collectTokensFromArgs(args, usage, deps, true);
-    const regionCode = deps.parseRegionOrFail(region);
-    const payload = action === "add" ? {
-      ...await session_pool_default.addTokens(tokens, { defaultRegion: regionCode || void 0 }),
-      summary: session_pool_default.getSummary()
-    } : {
-      ...await session_pool_default.removeTokens(tokens),
-      summary: session_pool_default.getSummary()
-    };
+    let payload;
+    let jsonMeta;
+    if (action === "add") {
+      const region = deps.getRegionWithDefault(args);
+      const regionCode = deps.parseRegionOrFail(region);
+      payload = {
+        ...await session_pool_default.addTokens(tokens, { defaultRegion: regionCode || void 0 }),
+        summary: session_pool_default.getSummary()
+      };
+      jsonMeta = { region };
+    } else {
+      payload = {
+        ...await session_pool_default.removeTokens(tokens),
+        summary: session_pool_default.getSummary()
+      };
+    }
     if (args.json) {
-      deps.printCommandJson(`token.${action}`, deps.unwrapBody(payload), { region });
+      deps.printCommandJson(`token.${action}`, deps.unwrapBody(payload), jsonMeta);
       return;
     }
     deps.printJson(deps.unwrapBody(payload));
   };
   const handleTokenEnableOrDisable = async (argv, action) => {
-    const args = minimist(argv, {
-      string: ["token"],
-      boolean: ["help", "json"]
-    });
+    const args = minimist(argv, { string: ["token"], boolean: ["help", "json"] });
     const usage = deps.getUsage(action);
     if (args.help) {
       console.log(usage);
@@ -280,44 +286,34 @@ function createTokenSubcommands(deps) {
     deps.printJson(deps.unwrapBody(payload));
   };
   const handleTokenPool = async (argv) => {
-    const args = minimist(argv, {
-      boolean: ["help", "json"]
-    });
-    const usage = deps.getUsage("pool");
+    const args = minimist(argv, { boolean: ["help", "json"] });
     if (args.help) {
-      console.log(usage);
+      console.log(deps.getUsage("pool"));
       return;
     }
     await deps.ensureTokenPoolReady();
-    const normalized = buildTokenPoolSnapshot();
+    const snapshot = buildTokenPoolSnapshot();
     if (args.json) {
-      deps.printCommandJson("token.pool", normalized);
+      deps.printCommandJson("token.pool", snapshot);
       return;
     }
-    const body = normalized && typeof normalized === "object" ? normalized : {};
+    const body = snapshot && typeof snapshot === "object" ? snapshot : {};
     console.log("Summary:");
     deps.printJson(body.summary ?? {});
     console.log("Entries:");
     printTokenEntriesTable(Array.isArray(body.items) ? body.items : []);
   };
   const handleTokenPoolCheckOrReload = async (argv, action) => {
-    const args = minimist(argv, {
-      boolean: ["help", "json"]
-    });
-    const usage = deps.getUsage(action);
+    const args = minimist(argv, { boolean: ["help", "json"] });
     if (args.help) {
-      console.log(usage);
+      console.log(deps.getUsage(action));
       return;
     }
     await deps.ensureTokenPoolReady();
-    const payload = action === "pool-check" ? {
-      ...await session_pool_default.runHealthCheck(),
-      summary: session_pool_default.getSummary()
-    } : (await session_pool_default.reloadFromDisk(), {
-      reloaded: true,
-      summary: session_pool_default.getSummary(),
-      items: buildTokenPoolSnapshot().items
-    });
+    const payload = action === "pool-check" ? { ...await session_pool_default.runHealthCheck(), summary: session_pool_default.getSummary() } : (() => {
+      session_pool_default.reloadFromDisk();
+      return { reloaded: true, summary: session_pool_default.getSummary(), items: buildTokenPoolSnapshot().items };
+    })();
     if (args.json) {
       deps.printCommandJson(`token.${action}`, deps.unwrapBody(payload));
       return;
@@ -334,12 +330,12 @@ function createTokenSubcommands(deps) {
     },
     {
       name: "check",
-      description: "Validate tokens directly",
-      usageLine: "  jimeng token check --token <token> [--token <token> ...] [options]",
+      description: "Validate tokens",
+      usageLine: "  jimeng token check [options]",
       options: [
-        "  --token <token>          Token, can be repeated",
+        "  --token <token>          Token, can be repeated (default: all enabled tokens)",
         "  --token-file <path>      Read tokens from file (one per line, # for comments)",
-        "  --region <region>        X-Region, default cn (cn/us/hk/jp/sg)",
+        "  --region <region>        Override region (default: token's registered region)",
         deps.jsonOption,
         deps.helpOption
       ],
@@ -347,12 +343,12 @@ function createTokenSubcommands(deps) {
     },
     {
       name: "points",
-      description: "Query token points directly",
+      description: "Query token points",
       usageLine: "  jimeng token points [options]",
       options: [
         "  --token <token>          Token, can be repeated",
         "  --token-file <path>      Read tokens from file (one per line, # for comments)",
-        "  --region <region>        Filter tokens by X-Region, default cn (cn/us/hk/jp/sg)",
+        "  --region <region>        Filter tokens by region (cn/us/hk/jp/sg)",
         deps.jsonOption,
         deps.helpOption
       ],
@@ -360,12 +356,12 @@ function createTokenSubcommands(deps) {
     },
     {
       name: "receive",
-      description: "Receive token credits directly",
+      description: "Receive token credits",
       usageLine: "  jimeng token receive [options]",
       options: [
         "  --token <token>          Token, can be repeated",
         "  --token-file <path>      Read tokens from file (one per line, # for comments)",
-        "  --region <region>        Filter tokens by X-Region, default cn (cn/us/hk/jp/sg)",
+        "  --region <region>        Filter tokens by region (cn/us/hk/jp/sg)",
         deps.jsonOption,
         deps.helpOption
       ],
@@ -497,11 +493,62 @@ function printTaskInfo(task, deps) {
     deps.printJson(task.data);
   }
 }
+function outputTaskResult(command, normalized, isJson, deps) {
+  const taskInfo = collectTaskInfo(normalized, deps);
+  if (!taskInfo) {
+    const body = deps.unwrapBody(normalized);
+    if (isJson) deps.printCommandJson(command, body);
+    else deps.printJson(body);
+    return;
+  }
+  if (isJson) deps.printCommandJson(command, taskInfo);
+  else printTaskInfo(taskInfo, deps);
+}
+function resolveSingleQueryToken(explicitToken, explicitRegion, deps) {
+  var _a;
+  const regionCode = explicitRegion ? deps.parseRegionOrFail(explicitRegion) : void 0;
+  if (explicitToken) {
+    const poolRegion = (_a = session_pool_default.getTokenEntry(explicitToken)) == null ? void 0 : _a.region;
+    const region = regionCode || poolRegion;
+    if (!region) {
+      deps.fail("Missing region for token. Provide --region or register token in token-pool.");
+    }
+    return { token: explicitToken, region };
+  }
+  if (!regionCode) {
+    const entry = session_pool_default.getEntries(false).find(
+      (item) => item.enabled && item.live !== false && item.region
+    );
+    if (!entry) {
+      deps.fail("No token available. Provide --token, --region, or --all.");
+    }
+    return { token: entry.token, region: entry.region };
+  }
+  return { token: void 0, region: regionCode };
+}
+function printModelIds(models) {
+  for (const item of models) {
+    if (!item || typeof item !== "object") continue;
+    const id = item.id;
+    if (typeof id === "string" && id.length > 0) console.log(id);
+  }
+}
+function printModelVerbose(models) {
+  console.log("id	type	desc	capabilities");
+  for (const item of models) {
+    if (!item || typeof item !== "object") continue;
+    const m = item;
+    const id = typeof m.id === "string" ? m.id : "";
+    if (!id) continue;
+    const type = typeof m.model_type === "string" ? m.model_type : "-";
+    const desc = typeof m.description === "string" ? m.description : "-";
+    const caps = Array.isArray(m.capabilities) ? m.capabilities.filter((c) => typeof c === "string").join(",") : "-";
+    console.log(`${id}	type=${type}	desc=${desc}	capabilities=${caps}`);
+  }
+}
 function createQueryCommandHandlers(deps) {
   const handleModelsRefresh = async (argv) => {
-    const args = minimist2(argv, {
-      boolean: ["help", "json"]
-    });
+    const args = minimist2(argv, { boolean: ["help", "json"] });
     if (args.help) {
       console.log(deps.usageModelsRefresh());
       return;
@@ -529,48 +576,68 @@ function createQueryCommandHandlers(deps) {
   const handleModelsList = async (argv) => {
     const args = minimist2(argv, {
       string: ["region", "token"],
-      boolean: ["help", "json", "verbose"]
+      boolean: ["help", "json", "verbose", "all"]
     });
     if (args.help) {
       console.log(deps.usageModelsList());
       return;
     }
-    const region = deps.getRegionWithDefault(args);
-    const parsedRegion = deps.parseRegionOrFail(region);
-    const token = deps.getSingleString(args, "token");
+    const isJson = Boolean(args.json);
+    const isVerbose = Boolean(args.verbose);
+    const explicitRegion = deps.getSingleString(args, "region");
+    const explicitToken = deps.getSingleString(args, "token");
     await deps.ensureTokenPoolReady();
-    const auth = token ? `Bearer ${token}` : void 0;
-    const direct = await getLiveModels(auth, parsedRegion || region);
-    const normalized = { object: "list", data: direct.data };
-    if (args.json) {
-      deps.printCommandJson("models.list", normalized, { region: region || null });
+    if (args.all) {
+      const entries = session_pool_default.getEntries(false).filter(
+        (item) => item.enabled && item.live !== false && item.region
+      );
+      if (entries.length === 0) {
+        deps.fail("No enabled+live tokens with region found in pool.");
+      }
+      const results = [];
+      for (const entry of entries) {
+        const masked = entry.token.length <= 10 ? "***" : `${entry.token.slice(0, 4)}...${entry.token.slice(-4)}`;
+        try {
+          const direct2 = await getLiveModels(`Bearer ${entry.token}`, entry.region);
+          results.push({
+            token: masked,
+            region: entry.region,
+            models: direct2.data.map((m) => m.id)
+          });
+        } catch (error) {
+          results.push({ token: masked, region: entry.region, error: error.message });
+        }
+      }
+      if (isJson) {
+        deps.printCommandJson("models.list", results);
+        return;
+      }
+      for (const r of results) {
+        console.log(`[${r.region}] ${r.token}`);
+        if (r.error) {
+          console.log(`  error: ${r.error}`);
+        } else {
+          for (const id of r.models) console.log(`  ${id}`);
+        }
+        console.log("");
+      }
       return;
     }
-    const data = normalized && typeof normalized === "object" && Array.isArray(normalized.data) ? normalized.data : [];
-    if (data.length === 0) {
-      deps.fail(`No models found in response: ${JSON.stringify(normalized)}`);
-    }
-    if (args.verbose) {
-      console.log("id	type	desc	capabilities");
-      for (const item of data) {
-        if (!item || typeof item !== "object") continue;
-        const model = item;
-        const id = typeof model.id === "string" ? model.id : "";
-        if (!id) continue;
-        const modelType = typeof model.model_type === "string" ? model.model_type : "-";
-        const description = typeof model.description === "string" ? model.description : "-";
-        const capabilities = Array.isArray(model.capabilities) ? model.capabilities.filter((cap) => typeof cap === "string").join(",") : "-";
-        console.log(`${id}	type=${modelType}	desc=${description}	capabilities=${capabilities}`);
-      }
+    const { token, region } = resolveSingleQueryToken(explicitToken, explicitRegion, deps);
+    const direct = await getLiveModels(token ? `Bearer ${token}` : void 0, region);
+    const models = direct.data;
+    if (isJson) {
+      deps.printCommandJson("models.list", { object: "list", data: models }, {
+        region: region || null,
+        token: token ? `${token.slice(0, 4)}...` : null
+      });
       return;
     }
-    for (const item of data) {
-      if (!item || typeof item !== "object") continue;
-      const id = item.id;
-      if (typeof id === "string" && id.length > 0) {
-        console.log(id);
-      }
+    if (models.length === 0) {
+      deps.fail("No models found.");
     }
+    if (isVerbose) printModelVerbose(models);
+    else printModelIds(models);
   };
   const handleTaskGet = async (argv) => {
     const args = minimist2(argv, {
@@ -587,42 +654,13 @@ function createQueryCommandHandlers(deps) {
 ${deps.usageTaskGet()}`);
     const type = parseTaskTypeOrFail(deps.getSingleString(args, "type"), deps);
     const responseFormat = parseResponseFormatOrFail(deps.getSingleString(args, "response-format"), deps);
-    const token = deps.getSingleString(args, "token");
-    const region = deps.getRegionWithDefault(args);
-    const isJson = Boolean(args.json);
-    const pick = await deps.pickDirectTokenForTask(token, region);
-    const normalized = await getTaskResponse(
-      taskId,
-      pick.token,
-      buildRegionInfo(pick.region),
-      {
-        type,
-        responseFormat
-      }
-    );
-    const taskInfo = collectTaskInfo(normalized, deps);
-    if (!taskInfo) {
-      if (isJson) {
-        deps.printCommandJson("task.get", deps.unwrapBody(normalized));
-      } else {
-        deps.printJson(deps.unwrapBody(normalized));
-      }
-      return;
-    }
-    if (isJson) deps.printCommandJson("task.get", taskInfo);
-    else printTaskInfo(taskInfo, deps);
+    const pick = await deps.pickDirectTokenForTask(deps.getSingleString(args, "token"), deps.getSingleString(args, "region"));
+    const normalized = await getTaskResponse(taskId, pick.token, buildRegionInfo(pick.region), { type, responseFormat });
+    outputTaskResult("task.get", normalized, Boolean(args.json), deps);
   };
   const handleTaskWait = async (argv) => {
     const args = minimist2(argv, {
-      string: [
-        "token",
-        "region",
-        "task-id",
-        "type",
-        "response-format",
-        "wait-timeout-seconds",
-        "poll-interval-ms"
-      ],
+      string: ["token", "region", "task-id", "type", "response-format", "wait-timeout-seconds", "poll-interval-ms"],
       boolean: ["help", "json"]
     });
     if (args.help) {
@@ -633,41 +671,18 @@ ${deps.usageTaskGet()}`);
     if (!taskId) deps.fail(`Missing required --task-id.
 
 ${deps.usageTaskWait()}`);
-    const token = deps.getSingleString(args, "token");
-    const region = deps.getRegionWithDefault(args);
-    const isJson = Boolean(args.json);
-    const body = {};
     const type = parseTaskTypeOrFail(deps.getSingleString(args, "type"), deps);
     const responseFormat = parseResponseFormatOrFail(deps.getSingleString(args, "response-format"), deps);
-    if (type) body.type = type;
-    body.response_format = responseFormat;
     const waitTimeoutSeconds = parsePositiveNumberOption(args, "wait-timeout-seconds", deps);
-    if (waitTimeoutSeconds !== void 0) body.wait_timeout_seconds = waitTimeoutSeconds;
     const pollIntervalMs = parsePositiveNumberOption(args, "poll-interval-ms", deps);
-    if (pollIntervalMs !== void 0) body.poll_interval_ms = pollIntervalMs;
-    const pick = await deps.pickDirectTokenForTask(token, region);
-    const normalized = await waitForTaskResponse(
-      taskId,
-      pick.token,
-      buildRegionInfo(pick.region),
-      {
-        type,
-        responseFormat,
-        waitTimeoutSeconds: typeof body.wait_timeout_seconds === "number" ? body.wait_timeout_seconds : void 0,
-        pollIntervalMs: typeof body.poll_interval_ms === "number" ? body.poll_interval_ms : void 0
-      }
-    );
-    const taskInfo = collectTaskInfo(normalized, deps);
-    if (!taskInfo) {
-      if (isJson) {
-        deps.printCommandJson("task.wait", deps.unwrapBody(normalized));
-      } else {
-        deps.printJson(deps.unwrapBody(normalized));
-      }
-      return;
-    }
-    if (isJson) deps.printCommandJson("task.wait", taskInfo);
-    else printTaskInfo(taskInfo, deps);
+    const pick = await deps.pickDirectTokenForTask(deps.getSingleString(args, "token"), deps.getSingleString(args, "region"));
+    const normalized = await waitForTaskResponse(taskId, pick.token, buildRegionInfo(pick.region), {
+      type,
+      responseFormat,
+      waitTimeoutSeconds,
+      pollIntervalMs
+    });
+    outputTaskResult("task.wait", normalized, Boolean(args.json), deps);
   };
   const handleTaskList = async (argv) => {
     const args = minimist2(argv, {
@@ -678,24 +693,18 @@ ${deps.usageTaskWait()}`);
       console.log(deps.usageTaskList());
       return;
     }
-    const token = deps.getSingleString(args, "token");
-    const region = deps.getRegionWithDefault(args);
     const type = deps.getSingleString(args, "type");
-    const countRaw = deps.getSingleString(args, "count");
-    const count = countRaw ? Number(countRaw) : 20;
-    const isJson = Boolean(args.json);
     if (type && type !== "image" && type !== "video" && type !== "all") {
       deps.fail(`Invalid --type: ${type}. Use image, video, or all.`);
     }
-    const pick = await deps.pickDirectTokenForTask(token, region);
-    const result = await getAssetList(
-      pick.token,
-      buildRegionInfo(pick.region),
-      {
-        count: Number.isFinite(count) && count > 0 ? count : 20,
-        type
-      }
-    );
+    const countRaw = deps.getSingleString(args, "count");
+    const count = countRaw ? Number(countRaw) : 20;
+    const isJson = Boolean(args.json);
+    const pick = await deps.pickDirectTokenForTask(deps.getSingleString(args, "token"), deps.getSingleString(args, "region"));
+    const result = await getAssetList(pick.token, buildRegionInfo(pick.region), {
+      count: Number.isFinite(count) && count > 0 ? count : 20,
+      type
+    });
     if (isJson) {
       deps.printCommandJson("task.list", {
         has_more: result.hasMore,
@@ -714,9 +723,7 @@ ${deps.usageTaskWait()}`);
       const modelShort = item.modelName || item.modelReqKey || "-";
       const promptShort = item.prompt.length > 50 ? item.prompt.slice(0, 50) + "..." : item.prompt;
       console.log(`${item.id}  ${typeLabel}  ${statusLabel.padEnd(4)}  ${time}  ${modelShort.padEnd(20)}  ${promptShort}`);
-      if (item.imageUrl) {
-        console.log(`         ${item.imageUrl}`);
-      }
+      if (item.imageUrl) console.log(`         ${item.imageUrl}`);
     }
   };
   return {
@@ -726,12 +733,12 @@ ${deps.usageTaskWait()}`);
     handleTaskWait,
     handleTaskList,
     printTaskInfo: (task) => {
-      const normalized = collectTaskInfo(task, deps);
-      if (!normalized) {
+      const info = collectTaskInfo(task, deps);
+      if (!info) {
         deps.printJson(task);
         return;
       }
-      printTaskInfo(normalized, deps);
+      printTaskInfo(info, deps);
     }
   };
 }
@@ -965,7 +972,19 @@ function applyWaitOptionsToBody(body, args, deps, includeWaitFlag = true) {
   return wait;
 }
 async function downloadBinary(url, deps) {
-  const response = await fetch(url);
+  const controller = new AbortController();
+  const timeout = setTimeout(() => controller.abort(), 12e4);
+  let response;
+  try {
+    response = await fetch(url, { signal: controller.signal });
+  } catch (err) {
+    clearTimeout(timeout);
+    if (err.name === "AbortError") {
+      deps.fail(`Download timed out after 120s: ${url}`);
+    }
+    throw err;
+  }
+  clearTimeout(timeout);
   if (!response.ok) {
     deps.fail(`Download failed (${response.status}): ${url}`);
   }
@@ -1034,6 +1053,9 @@ function createMediaCommandHandlers(deps) {
       if (!Number.isFinite(parsed)) {
         deps.fail(`Invalid --sample-strength: ${sampleStrengthRaw}`);
       }
+      if (parsed < 0 || parsed > 1) {
+        deps.fail(`Invalid --sample-strength: ${sampleStrengthRaw} (must be between 0 and 1)`);
+      }
       body.sample_strength = parsed;
     }
     const pick = await deps.pickDirectTokenForGeneration(
@@ -1350,11 +1372,14 @@ import { execSync, spawn } from "child_process";
 import { existsSync } from "fs";
 import path4 from "path";
 import os from "os";
-import { fileURLToPath } from "url";
 import minimist4 from "minimist";
-var __filename = fileURLToPath(import.meta.url);
-var __dirname = path4.dirname(__filename);
-var LOGIN_SCRIPT = path4.join(__dirname, "..", "..", "scripts", "jimeng_login_helper.py");
+var LOGIN_SCRIPT = path4.join(
+  path4.dirname(new URL(import.meta.url).pathname),
+  "..",
+  "..",
+  "scripts",
+  "jimeng_login_helper.py"
+);
 function createLoginCommandHandler(deps) {
   return async (argv) => {
     const args = minimist4(argv, {
@@ -1558,10 +1583,20 @@ function usageRoot() {
 }
 function usageModelsList() {
   return buildUsageText("  jimeng models list [options]", [
-    "  --region <region>        X-Region header, default cn (cn/us/hk/jp/sg)",
+    "  --token <token>          Query with specific token",
+    "  --region <region>        Query with specific region (cn/us/hk/jp/sg)",
+    "  --all                    Query all tokens in pool, grouped by token/region",
     "  --verbose                Print rich model fields",
     "  --json                   Print full JSON response",
     HELP_OPTION
+  ], [
+    {
+      title: "Notes:",
+      lines: [
+        "  Without --token, --region, or --all, uses the first available token in pool.",
+        "  With --all, queries every enabled+live token and groups results by token/region."
+      ]
+    }
   ]);
 }
 function usageModelsRefresh() {
@@ -1721,7 +1756,7 @@ function usageVideoGenerate() {
 function usageTaskGet() {
   return buildUsageText("  jimeng task get --task-id <id> [options]", [
     "  --token <token>          Optional, override token-pool selection",
-    "  --region <region>        X-Region header, default cn (cn/us/hk/jp/sg)",
+    "  --region <region>        Filter token by region (cn/us/hk/jp/sg)",
     "  --task-id <id>           Required history/task id",
     "  --type <type>            Optional image or video",
     "  --response-format <fmt>  Optional url or b64_json",
@@ -1732,7 +1767,7 @@ function usageTaskGet() {
 function usageTaskWait() {
   return buildUsageText("  jimeng task wait --task-id <id> [options]", [
     "  --token <token>          Optional, override token-pool selection",
-    "  --region <region>        X-Region header, default cn (cn/us/hk/jp/sg)",
+    "  --region <region>        Filter token by region (cn/us/hk/jp/sg)",
     "  --task-id <id>           Required history/task id",
     "  --type <type>            Optional image or video",
     "  --response-format <fmt>  Optional url or b64_json",
@@ -1745,7 +1780,7 @@ function usageTaskWait() {
 function usageTaskList() {
   return buildUsageText("  jimeng task list [options]", [
     "  --token <token>          Optional, override token-pool selection",
-    "  --region <region>        X-Region header, default cn (cn/us/hk/jp/sg)",
+    "  --region <region>        Filter token by region (cn/us/hk/jp/sg)",
     "  --type <type>            Filter by type: image, video, or all (default all)",
     "  --count <num>            Number of items per page (default 20)",
     JSON_OPTION,
@@ -1890,7 +1925,6 @@ var queryHandlers = createQueryCommandHandlers({
   usageTaskWait,
   usageTaskList,
   getSingleString,
-  getRegionWithDefault,
   parseRegionOrFail,
   ensureTokenPoolReady,
   pickDirectTokenForTask,