jimeng-cli 0.3.1 → 0.3.2

package/dist/cli/index.cjs

@@ -5627,6 +5627,17 @@ var import_mime = __toESM(require("mime"), 1);
 var import_axios = __toESM(require("axios"), 1);
 var import_uuid = require("uuid");
 var import_date_fns = require("date-fns");
+var CRC32_TABLE = (() => {
+  const table = [];
+  for (let i = 0; i < 256; i++) {
+    let crc = i;
+    for (let j = 0; j < 8; j++) {
+      crc = crc & 1 ? 3988292384 ^ crc >>> 1 : crc >>> 1;
+    }
+    table[i] = crc;
+  }
+  return table;
+})();
 var util = {
   uuid: (separator = true) => separator ? (0, import_uuid.v4)() : (0, import_uuid.v4)().replace(/-/g, ""),
   getDateString(format = "yyyy-MM-dd", date = /* @__PURE__ */ new Date()) {
@@ -5672,18 +5683,10 @@ var util = {
    * @returns CRC32 十六进制字符串
    */
   calculateCRC32(buffer) {
-    const crcTable = [];
-    for (let i = 0; i < 256; i++) {
-      let crc2 = i;
-      for (let j = 0; j < 8; j++) {
-        crc2 = crc2 & 1 ? 3988292384 ^ crc2 >>> 1 : crc2 >>> 1;
-      }
-      crcTable[i] = crc2;
-    }
     let crc = 0 ^ -1;
     const bytes = buffer instanceof ArrayBuffer ? new Uint8Array(buffer) : new Uint8Array(buffer.buffer, buffer.byteOffset, buffer.byteLength);
     for (let i = 0; i < bytes.length; i++) {
-      crc = crc >>> 8 ^ crcTable[(crc ^ bytes[i]) & 255];
+      crc = crc >>> 8 ^ CRC32_TABLE[(crc ^ bytes[i]) & 255];
     }
     return ((crc ^ -1) >>> 0).toString(16).padStart(8, "0");
   }
@@ -5996,16 +5999,18 @@ var JimengErrorHandler = class {
    * 处理轮询超时错误
    * @returns 如果有部分结果，返回 void 而不抛出异常
    */
-  static handlePollingTimeout(pollCount, maxPollCount, elapsedTime, status, itemCount, historyId) {
-    const message = `\u8F6E\u8BE2\u8D85\u65F6: \u5DF2\u8F6E\u8BE2 ${pollCount} \u6B21\uFF0C\u8017\u65F6 ${elapsedTime} \u79D2\uFF0C\u6700\u7EC8\u72B6\u6001: ${status}\uFF0C\u56FE\u7247\u6570\u91CF: ${itemCount}`;
+  static handlePollingTimeout(pollCount, maxPollCount, elapsedTime, status, itemCount, historyId, type = "image") {
+    const typeText = type === "image" ? "\u56FE\u7247" : "\u89C6\u9891";
+    const message = `\u8F6E\u8BE2\u8D85\u65F6: \u5DF2\u8F6E\u8BE2 ${pollCount} \u6B21\uFF0C\u8017\u65F6 ${elapsedTime} \u79D2\uFF0C\u6700\u7EC8\u72B6\u6001: ${status}\uFF0C${typeText}\u6570\u91CF: ${itemCount}`;
     logger_default.warn(message + (historyId ? `\uFF0C\u5386\u53F2ID: ${historyId}` : ""));
     if (itemCount === 0) {
+      const exception = type === "image" ? exceptions_default.API_IMAGE_GENERATION_FAILED : exceptions_default.API_VIDEO_GENERATION_FAILED;
       throw new APIException(
-        exceptions_default.API_IMAGE_GENERATION_FAILED,
-        `\u751F\u6210\u8D85\u65F6\u4E14\u65E0\u7ED3\u679C\uFF0C\u72B6\u6001\u7801: ${status}${historyId ? `\uFF0C\u5386\u53F2ID: ${historyId}` : ""}`
+        exception,
+        `${typeText}\u751F\u6210\u8D85\u65F6\u4E14\u65E0\u7ED3\u679C\uFF0C\u72B6\u6001\u7801: ${status}${historyId ? `\uFF0C\u5386\u53F2ID: ${historyId}` : ""}`
       );
     }
-    logger_default.info(`\u8F6E\u8BE2\u8D85\u65F6\u4F46\u5DF2\u83B7\u5F97 ${itemCount} \u5F20\u56FE\u7247\uFF0C\u5C06\u8FD4\u56DE\u73B0\u6709\u7ED3\u679C`);
+    logger_default.info(`\u8F6E\u8BE2\u8D85\u65F6\u4F46\u5DF2\u83B7\u5F97 ${itemCount} \u4E2A${typeText}\uFF0C\u5C06\u8FD4\u56DE\u73B0\u6709\u7ED3\u679C`);
   }
   /**
    * 处理生成失败错误
@@ -6070,7 +6075,7 @@ var BASE_URL_IMAGEX_US = "https://imagex16-normal-us-ttp.capcutapi.us";
 var BASE_URL_DREAMINA_HK = "https://mweb-api-sg.capcut.com";
 var BASE_URL_IMAGEX_HK = "https://imagex-normal-sg.capcutapi.com";
 var WEB_VERSION = "7.5.0";
-var DA_VERSION = "3.3.8";
+var DA_VERSION = "3.3.12";
 
 // src/api/consts/common.ts
 var BASE_URL_CN = "https://jimeng.jianying.com";
@@ -6091,7 +6096,7 @@ var VERSION_CODE = "8.4.0";
 var DEFAULT_IMAGE_MODEL = "jimeng-4.5";
 var DEFAULT_IMAGE_MODEL_US = "jimeng-4.5";
 var DEFAULT_VIDEO_MODEL = "jimeng-video-3.5-pro";
-var DRAFT_VERSION = "3.3.8";
+var DRAFT_VERSION = "3.3.9";
 var DRAFT_MIN_VERSION = "3.0.2";
 var DRAFT_VERSION_OMNI = "3.3.9";
 var OMNI_BENEFIT_TYPE = "dreamina_video_seedance_20_video_add";
@@ -6604,6 +6609,9 @@ function checkResult(result) {
 }
 async function getTokenLiveStatus(refreshToken, regionInfo) {
   try {
+    if (regionInfo.isInternational) {
+      return await checkInternationalTokenLive(refreshToken, regionInfo);
+    }
     const result = await request(
       "POST",
       "/passport/account/info/v2",
@@ -6622,6 +6630,44 @@ async function getTokenLiveStatus(refreshToken, regionInfo) {
     return false;
   }
 }
+async function checkInternationalTokenLive(refreshToken, regionInfo) {
+  const aid = getAssistantId(regionInfo);
+  const countryCode = regionInfo.isUS ? "us" : regionInfo.isJP ? "jp" : regionInfo.isHK ? "hk" : "sg";
+  const cookie = generateCookie(refreshToken);
+  try {
+    const response = await import_axios2.default.get(
+      "https://dreamina.capcut.com/passport/web/account/info/",
+      {
+        params: {
+          aid,
+          account_sdk_source: "web",
+          sdk_version: "2.1.10-tiktok",
+          language: countryCode === "jp" ? "ja" : "en"
+        },
+        headers: {
+          ...FAKE_HEADERS,
+          Cookie: cookie,
+          Referer: "https://dreamina.capcut.com/ai-tool/home/",
+          Origin: "https://dreamina.capcut.com",
+          Appid: String(aid),
+          "store-country-code": countryCode,
+          "store-country-code-src": "uid"
+        },
+        timeout: 15e3
+      }
+    );
+    const data = response.data;
+    if (data && typeof data === "object") {
+      const obj = data;
+      if (obj.user_id || obj.email || obj.data) {
+        return true;
+      }
+    }
+    return false;
+  } catch {
+    return false;
+  }
+}
 
 // src/lib/session-pool.ts
 function sample(arr) {
@@ -7226,8 +7272,7 @@ var import_node_path = __toESM(require("path"), 1);
 var import_promises2 = require("fs/promises");
 var import_minimist2 = __toESM(require("minimist"), 1);
 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) {
@@ -7242,14 +7287,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}`);
   }
 }
@@ -7288,6 +7333,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 = (0, import_minimist2.default)(argv, {
@@ -7299,74 +7368,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 = (0, import_minimist2.default)(argv, {
-      boolean: ["help", "json"]
-    });
-    const usage = deps.getUsage("list");
+    const args = (0, import_minimist2.default)(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 = (0, import_minimist2.default)(argv, {
@@ -7378,45 +7441,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) {
@@ -7435,28 +7483,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 = (0, import_minimist2.default)(argv, {
-      string: ["token"],
-      boolean: ["help", "json"]
-    });
+    const args = (0, import_minimist2.default)(argv, { string: ["token"], boolean: ["help", "json"] });
     const usage = deps.getUsage(action);
     if (args.help) {
       console.log(usage);
@@ -7478,44 +7530,34 @@ function createTokenSubcommands(deps) {
     deps.printJson(deps.unwrapBody(payload));
   };
   const handleTokenPool = async (argv) => {
-    const args = (0, import_minimist2.default)(argv, {
-      boolean: ["help", "json"]
-    });
-    const usage = deps.getUsage("pool");
+    const args = (0, import_minimist2.default)(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 = (0, import_minimist2.default)(argv, {
-      boolean: ["help", "json"]
-    });
-    const usage = deps.getUsage(action);
+    const args = (0, import_minimist2.default)(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;
@@ -7532,12 +7574,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
       ],
@@ -7545,12 +7587,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
       ],
@@ -7558,12 +7600,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
       ],
@@ -7851,7 +7893,7 @@ var SmartPoller = class {
   /**
    * 根据状态码计算智能轮询间隔
    */
-  getSmartInterval(status, itemCount) {
+  getSmartInterval(status, _itemCount) {
     const baseInterval = this.options.pollInterval;
     switch (status) {
       case 20:
@@ -7888,9 +7930,6 @@ var SmartPoller = class {
     if (status === 30) {
       return { shouldExit: true, reason: "\u4EFB\u52A1\u5931\u8D25" };
     }
-    if (itemCount >= this.options.expectedItemCount && (status === 10 || status === 50)) {
-      return { shouldExit: true, reason: `\u5DF2\u83B7\u5F97\u5B8C\u6574\u7ED3\u679C\u96C6(${itemCount}/${this.options.expectedItemCount})` };
-    }
     if (this.pollCount >= this.options.maxPollCount) {
       return { shouldExit: true, reason: "\u8F6E\u8BE2\u6B21\u6570\u8D85\u9650" };
     }
@@ -7907,6 +7946,7 @@ var SmartPoller = class {
     logger_default.info(`\u5F00\u59CB\u667A\u80FD\u8F6E\u8BE2: historyId=${historyId || "N/A"}, \u6700\u5927\u8F6E\u8BE2\u6B21\u6570=${this.options.maxPollCount}, \u671F\u671B\u7ED3\u679C\u6570=${this.options.expectedItemCount}`);
     let lastData;
     let lastStatus = { status: 20, itemCount: 0 };
+    let exitReason = "";
     while (true) {
       this.pollCount++;
       const elapsedTime = Math.round((Date.now() - this.startTime) / 1e3);
@@ -7920,6 +7960,7 @@ var SmartPoller = class {
         }
         const { shouldExit, reason } = this.shouldExitPolling(status);
         if (shouldExit) {
+          exitReason = reason;
           logger_default.info(`\u9000\u51FA\u8F6E\u8BE2: ${reason}, \u6700\u7EC8${this.options.type === "image" ? "\u56FE\u7247" : "\u89C6\u9891"}\u6570\u91CF=${status.itemCount}`);
           if (status.status === 30) {
             handleGenerationFailure(status.status, status.failCode, historyId, this.options.type, status.itemCount);
@@ -7931,7 +7972,8 @@ var SmartPoller = class {
               elapsedTime,
               status.status,
               status.itemCount,
-              historyId
+              historyId,
+              this.options.type
             );
           }
           break;
@@ -7975,7 +8017,7 @@ var SmartPoller = class {
       itemCount: lastStatus.itemCount,
       elapsedTime: finalElapsedTime,
       pollCount: this.pollCount,
-      exitReason: this.shouldExitPolling(lastStatus).reason
+      exitReason
     };
     logger_default.info(`${this.options.type === "image" ? "\u56FE\u50CF" : "\u89C6\u9891"}\u751F\u6210\u5B8C\u6210: \u6210\u529F\u751F\u6210 ${lastStatus.itemCount} \u4E2A\u7ED3\u679C\uFF0C\u603B\u8017\u65F6 ${finalElapsedTime} \u79D2\uFF0C\u6700\u7EC8\u72B6\u6001: ${this.getStatusName(lastStatus.status)}`);
     return { result, data: lastData };
@@ -8021,17 +8063,20 @@ function extractImageUrls(itemList) {
   return itemList.map((item, index) => extractImageUrl(item, index)).filter((url) => url !== null);
 }
 function extractVideoUrl(item) {
-  var _a, _b, _c, _d, _e, _f;
-  if ((_c = (_b = (_a = item == null ? void 0 : item.video) == null ? void 0 : _a.transcoded_video) == null ? void 0 : _b.origin) == null ? void 0 : _c.video_url) {
+  var _a, _b, _c, _d, _e, _f, _g, _h, _i;
+  if ((_c = (_b = (_a = item == null ? void 0 : item.common_attr) == null ? void 0 : _a.transcoded_video) == null ? void 0 : _b.origin) == null ? void 0 : _c.video_url) {
+    return item.common_attr.transcoded_video.origin.video_url;
+  }
+  if ((_f = (_e = (_d = item == null ? void 0 : item.video) == null ? void 0 : _d.transcoded_video) == null ? void 0 : _e.origin) == null ? void 0 : _f.video_url) {
     return item.video.transcoded_video.origin.video_url;
   }
-  if ((_d = item == null ? void 0 : item.video) == null ? void 0 : _d.play_url) {
+  if ((_g = item == null ? void 0 : item.video) == null ? void 0 : _g.play_url) {
     return item.video.play_url;
   }
-  if ((_e = item == null ? void 0 : item.video) == null ? void 0 : _e.download_url) {
+  if ((_h = item == null ? void 0 : item.video) == null ? void 0 : _h.download_url) {
     return item.video.download_url;
   }
-  if ((_f = item == null ? void 0 : item.video) == null ? void 0 : _f.url) {
+  if ((_i = item == null ? void 0 : item.video) == null ? void 0 : _i.url) {
     return item.video.url;
   }
   return null;
@@ -8061,20 +8106,15 @@ async function fetchHighQualityVideoUrl(itemId, refreshToken, regionInfo) {
         return videoUrl;
       }
     }
-    const hqUrlMatch = responseStr.match(/https:\/\/v[0-9]+-dreamnia\.jimeng\.com\/[^"\s\\]+/);
-    if (hqUrlMatch && hqUrlMatch[0]) {
-      logger_default.info(`\u6B63\u5219\u63D0\u53D6\u5230\u9AD8\u8D28\u91CF\u89C6\u9891URL (dreamnia): ${hqUrlMatch[0]}`);
-      return hqUrlMatch[0];
-    }
-    const jimengUrlMatch = responseStr.match(/https:\/\/v[0-9]+-[^"\\]*\.jimeng\.com\/[^"\s\\]+/);
-    if (jimengUrlMatch && jimengUrlMatch[0]) {
-      logger_default.info(`\u6B63\u5219\u63D0\u53D6\u5230jimeng\u89C6\u9891URL: ${jimengUrlMatch[0]}`);
-      return jimengUrlMatch[0];
+    const cdnUrlMatch = responseStr.match(/https:\/\/v[0-9]+-[^"\\]*\.(jimeng|capcut|dreamina)\.com\/[^"\s\\]+/);
+    if (cdnUrlMatch && cdnUrlMatch[0]) {
+      logger_default.info(`\u6B63\u5219\u63D0\u53D6\u5230\u89C6\u9891URL: ${cdnUrlMatch[0]}`);
+      return cdnUrlMatch[0];
     }
-    const anyVideoUrlMatch = responseStr.match(/https:\/\/v[0-9]+-[^"\\]*\.(vlabvod|jimeng)\.com\/[^"\s\\]+/);
-    if (anyVideoUrlMatch && anyVideoUrlMatch[0]) {
-      logger_default.info(`\u4ECEget_local_item_list\u63D0\u53D6\u5230\u89C6\u9891URL: ${anyVideoUrlMatch[0]}`);
-      return anyVideoUrlMatch[0];
+    const vlabUrlMatch = responseStr.match(/https:\/\/v[0-9]+-[^"\\]*\.vlabvod\.com\/[^"\s\\]+/);
+    if (vlabUrlMatch && vlabUrlMatch[0]) {
+      logger_default.info(`\u6B63\u5219\u63D0\u53D6\u5230\u89C6\u9891URL: ${vlabUrlMatch[0]}`);
+      return vlabUrlMatch[0];
     }
     logger_default.warn(`\u672A\u80FD\u4ECEget_local_item_list\u54CD\u5E94\u4E2D\u63D0\u53D6\u5230\u89C6\u9891URL`);
     return null;
@@ -8327,11 +8367,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 = (0, import_minimist3.default)(argv, {
-      boolean: ["help", "json"]
-    });
+    const args = (0, import_minimist3.default)(argv, { boolean: ["help", "json"] });
     if (args.help) {
       console.log(deps.usageModelsRefresh());
       return;
@@ -8359,48 +8450,68 @@ function createQueryCommandHandlers(deps) {
   const handleModelsList = async (argv) => {
     const args = (0, import_minimist3.default)(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 = (0, import_minimist3.default)(argv, {
@@ -8417,42 +8528,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 = (0, import_minimist3.default)(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) {
@@ -8463,41 +8545,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 = (0, import_minimist3.default)(argv, {
@@ -8508,24 +8567,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,
@@ -8544,9 +8597,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 {
@@ -8556,12 +8607,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);
     }
   };
 }
@@ -8782,7 +8833,7 @@ async function uploadImageBuffer(imageBuffer, refreshToken, regionInfo) {
           "Authorization": auth,
           "Connection": "keep-alive",
           "Content-CRC32": crc32,
-          "Content-Disposition": 'attachment; filename="undefined"',
+          "Content-Disposition": 'attachment; filename="upload.bin"',
           "Content-Type": "application/octet-stream",
           "Origin": origin,
           "Referer": RegionUtils.getRefererPath(regionInfo),
@@ -10730,7 +10781,8 @@ async function generateVideo(_model, prompt, {
       isDefaultSeed: 1,
       originSubmitId,
       isRegenerate: false,
-      enterFrom: "click",
+      enterFrom: "use_bgimage_prompt",
+      position: "page_bottom_box",
       functionMode: flFunctionMode,
       sceneOptions: JSON.stringify([sceneOption])
     });
@@ -10855,7 +10907,7 @@ async function generateVideo(_model, prompt, {
     timeoutSeconds: pollerOptions.timeoutSeconds
   });
   const { result: pollingResult, data: finalHistoryData } = await poller.poll(async () => {
-    var _a2, _b2, _c2, _d2, _e2, _f2, _g2, _h2, _i2, _j2, _k2;
+    var _a2, _b2, _c2, _d2, _e2, _f2, _g2, _h2, _i2, _j2, _k2, _l, _m, _n, _o;
     pollAttempts++;
     const result = await request("post", "/mweb/v1/get_history_by_ids", refreshToken, regionInfo, {
       data: {
@@ -10880,7 +10932,7 @@ async function generateVideo(_model, prompt, {
     const currentItemList = historyData.item_list || [];
     const finishTime = ((_a2 = historyData.task) == null ? void 0 : _a2.finish_time) || 0;
     if (currentItemList.length > 0) {
-      const tempVideoUrl = ((_e2 = (_d2 = (_c2 = (_b2 = currentItemList[0]) == null ? void 0 : _b2.video) == null ? void 0 : _c2.transcoded_video) == null ? void 0 : _d2.origin) == null ? void 0 : _e2.video_url) || ((_g2 = (_f2 = currentItemList[0]) == null ? void 0 : _f2.video) == null ? void 0 : _g2.play_url) || ((_i2 = (_h2 = currentItemList[0]) == null ? void 0 : _h2.video) == null ? void 0 : _i2.download_url) || ((_k2 = (_j2 = currentItemList[0]) == null ? void 0 : _j2.video) == null ? void 0 : _k2.url);
+      const tempVideoUrl = ((_e2 = (_d2 = (_c2 = (_b2 = currentItemList[0]) == null ? void 0 : _b2.common_attr) == null ? void 0 : _c2.transcoded_video) == null ? void 0 : _d2.origin) == null ? void 0 : _e2.video_url) || ((_i2 = (_h2 = (_g2 = (_f2 = currentItemList[0]) == null ? void 0 : _f2.video) == null ? void 0 : _g2.transcoded_video) == null ? void 0 : _h2.origin) == null ? void 0 : _i2.video_url) || ((_k2 = (_j2 = currentItemList[0]) == null ? void 0 : _j2.video) == null ? void 0 : _k2.play_url) || ((_m = (_l = currentItemList[0]) == null ? void 0 : _l.video) == null ? void 0 : _m.download_url) || ((_o = (_n = currentItemList[0]) == null ? void 0 : _n.video) == null ? void 0 : _o.url);
       if (tempVideoUrl) {
         logger_default.info(`\u68C0\u6D4B\u5230\u89C6\u9891URL: ${tempVideoUrl}`);
       }
@@ -11143,7 +11195,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}`);
   }
@@ -11212,6 +11276,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(
@@ -11528,12 +11595,15 @@ var import_node_child_process = require("child_process");
 var import_node_fs3 = require("fs");
 var import_node_path4 = __toESM(require("path"), 1);
 var import_node_os = __toESM(require("os"), 1);
-var import_node_url = require("url");
 var import_minimist5 = __toESM(require("minimist"), 1);
 var import_meta = {};
-var __filename = (0, import_node_url.fileURLToPath)(import_meta.url);
-var __dirname = import_node_path4.default.dirname(__filename);
-var LOGIN_SCRIPT = import_node_path4.default.join(__dirname, "..", "..", "scripts", "jimeng_login_helper.py");
+var LOGIN_SCRIPT = import_node_path4.default.join(
+  import_node_path4.default.dirname(new URL(import_meta.url).pathname),
+  "..",
+  "..",
+  "scripts",
+  "jimeng_login_helper.py"
+);
 function createLoginCommandHandler(deps) {
   return async (argv) => {
     const args = (0, import_minimist5.default)(argv, {
@@ -11737,10 +11807,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() {
@@ -11900,7 +11980,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",
@@ -11911,7 +11991,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",
@@ -11924,7 +12004,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,
@@ -12069,7 +12149,6 @@ var queryHandlers = createQueryCommandHandlers({
   usageTaskWait,
   usageTaskList,
   getSingleString,
-  getRegionWithDefault,
   parseRegionOrFail,
   ensureTokenPoolReady,
   pickDirectTokenForTask,