@lingjingai/scriptctl 0.63.3 → 0.63.4

package/README.md

@@ -136,7 +136,7 @@ MIT
 
 ### 指定视频理解服务
 
-Gemini 文本、结构化工具和视频请求在当前路由重试耗尽或被审核拦截后，由已配置的豆包兜底。视频的默认路由与显式指定的 Gemini 均保留所选主模型；视频上传失败时豆包读取同一份本地文件。用户取消不触发兜底。豆包使用 `ARK_API_KEY`，`ARK_MODEL` 可指定已开通的视频理解端点，默认 `ep-20260721150136-98dj9`。直接选择豆包时只调用豆包：
+Gemini 文本、结构化工具和视频请求先使用配置的主模型，再按 `gemini-3.8-flash → gemini-3.7-flash → gemini-3.6-flash` 尝试尚未调用的模型，全部失败后使用豆包。每个 Gemini 模型按 provider 的 `maxAttempts` 重试暂时性错误，豆包最多尝试 3 次；审核拒绝等不可重试错误直接进入下一模型，用户取消立即停止。切换 Gemini 模型保留服务地址、凭据和同一份视频；公共 Files API 上传重试耗尽时，由豆包读取本地视频。豆包使用 `ARK_API_KEY`，`ARK_MODEL` 可指定已开通的视频理解端点，默认 `ep-20260721150136-98dj9`。完整模型链耗尽后才汇总报错，调用和用量逐模型记录。直接选择豆包时只调用豆包：
 
 ```bash
 # 豆包：默认读取 ARK_API_KEY；模型也可通过 ARK_MODEL 设置

package/changes/0.63.4.md

@@ -0,0 +1,5 @@
+# 0.63.4
+
+- Gemini 文本、结构化工具和视频请求先使用所选模型，再按 3.8 Flash → 3.7 Flash → 3.6 Flash 补齐尚未尝试的模型，最后由豆包兜底。
+- 每个 Gemini 模型独立执行配置的暂时性错误重试，豆包保留最多 3 次尝试；完整模型链耗尽后汇总报错，取消立即停止。
+- 复用 Gemini 视频媒体与已有分集检查点，保留各模型的实际用量、重试次数和失败原因。

package/dist/bin.js

@@ -7802,6 +7802,7 @@ var DOUBAO_FALLBACK = {
   timeoutMs: 6e5,
   maxAttempts: 3
 };
+var GEMINI_FLASH_MODELS = ["gemini-3.8-flash", "gemini-3.7-flash", "gemini-3.6-flash"];
 function normalizeBaseUrl(value) {
   return value?.trim().replace(/\/+$/, "") ?? "anthropic-sdk-default";
 }
@@ -7842,9 +7843,9 @@ function routedFailure(error, route) {
     message: error.message
   });
 }
-function fallbackFailure(primary, error, route) {
-  const failures = [primary, routedFailure(error, route)];
-  const aggregate = aggregateFailures(failures, "Primary model and Doubao fallback both failed.");
+function exhaustedFailure(error, failures) {
+  if (failures.length === 1) return error;
+  const aggregate = aggregateFailures(failures, "All configured model routes failed.");
   return new LlmTransportError(error.code, aggregate.message, {
     retryable: aggregate.retryable,
     classification: classificationOf(aggregate),
@@ -7856,6 +7857,19 @@ function fallbackFailure(primary, error, route) {
 function isGeminiRoute(route) {
   return route.protocol === "google-gemini" || /(^|\/)gemini-/i.test(route.model);
 }
+function geminiRoutes(primary) {
+  const prefix = primary.info.model.slice(0, primary.info.model.lastIndexOf("/") + 1);
+  const models = /* @__PURE__ */ new Set([primary.info.model, ...GEMINI_FLASH_MODELS.map((model) => prefix + model)]);
+  return [...models].map((model) => {
+    if (model === primary.info.model) return primary;
+    const modelConfig = { ...primary.modelConfig, model };
+    return {
+      ...primary,
+      modelConfig,
+      info: { ...primary.info, model, fingerprint: routeFingerprint(primary.info.task, primary.providerConfig, modelConfig) }
+    };
+  });
+}
 function canFallback(error, signal) {
   return !signal?.aborted && error instanceof LlmTransportError && error.code !== "cancelled";
 }
@@ -8162,25 +8176,43 @@ var ModelRouter = class {
       generate: async (request2) => {
         request2.signal?.throwIfAborted();
         if (request2.media.kind === "local-fallback") {
-          return this.generateDoubaoVideo(task, request2, request2.media.primaryFailure);
+          return this.generateDoubaoVideo(task, request2, [request2.media.primaryFailure]);
         }
-        try {
-          return await this.tracked(route.info, () => adapter.generate({ ...request2, maxOutputTokens: spec2.maxOutputTokens }));
-        } catch (error) {
-          if (!canFallback(error, request2.signal) || !this.doubaoAdapter() || !request2.localPath) throw error;
-          return this.generateDoubaoVideo(task, request2, routedFailure(error, route.info));
+        const routes = geminiRoutes(route);
+        const failures = [];
+        for (const [index, candidate] of routes.entries()) {
+          request2.signal?.throwIfAborted();
+          try {
+            return await this.tracked(candidate.info, () => this.videoAdapter(candidate).generate({
+              ...request2,
+              maxOutputTokens: spec2.maxOutputTokens
+            }));
+          } catch (error) {
+            if (!canFallback(error, request2.signal)) throw error;
+            const failure = routedFailure(error, candidate.info);
+            failures.push(failure);
+            const next = routes[index + 1];
+            if (next) {
+              process.stderr.write(`\u21AA\uFE0F  ${candidate.info.model} \u8BF7\u6C42\u5931\u8D25\uFF0C\u5207\u6362\u5230 ${next.info.model} (${formatFailure(failure)})
+`);
+              continue;
+            }
+            if (!this.doubaoAdapter() || !request2.localPath) throw exhaustedFailure(error, failures);
+            return this.generateDoubaoVideo(task, request2, failures);
+          }
         }
+        throw new Error("Gemini model routes cannot be empty.");
       }
     };
   }
-  async generateDoubaoVideo(task, request2, primary) {
+  async generateDoubaoVideo(task, request2, failures) {
     const adapter = this.doubaoAdapter();
     if (!adapter) throw credentialError("doubao");
     const localPath = request2.media.kind === "local-fallback" ? request2.media.path : request2.localPath;
     if (!localPath) throw configRuntimeError("Doubao video fallback requires the local video.", ["localPath"], ["localPath: missing"]);
     const localMime = request2.localMime ?? (request2.media.kind === "file-api" ? request2.media.file.mimeType : request2.media.mimeType);
     const route = this.doubaoRoute(task);
-    process.stderr.write(`\u21AA\uFE0F  ${primary.model} \u8BF7\u6C42\u5931\u8D25\uFF0C\u56DE\u9000\u5230\u8C46\u5305 ${route.model} (${formatFailure(primary)})
+    process.stderr.write(`\u21AA\uFE0F  Gemini \u8DEF\u7531\u5DF2\u8017\u5C3D\uFF0C\u56DE\u9000\u5230\u8C46\u5305 ${route.model}
 `);
     try {
       return await this.tracked(route, () => adapter.run({
@@ -8195,7 +8227,7 @@ var ModelRouter = class {
       }));
     } catch (error) {
       if (!canFallback(error, request2.signal)) throw error;
-      throw fallbackFailure(primary, error, route);
+      throw exhaustedFailure(error, [...failures, routedFailure(error, route)]);
     }
   }
   // Resolve the default fallback or explicitly selected Doubao video.
@@ -8224,24 +8256,38 @@ var ModelRouter = class {
   }
   async withTextFallback(task, signal, generate) {
     const route = this.resolve(task);
-    const adapter = this.adapter(route);
-    try {
-      return await this.tracked(route.info, () => generate(adapter));
-    } catch (error) {
-      if (!canFallback(error, signal) || !isGeminiRoute(route.info) && error.code !== "content_filtered") throw error;
-      const doubao = this.doubaoTextAdapter();
-      if (!doubao) throw error;
-      const primary = routedFailure(error, route.info);
-      const fallback = this.doubaoRoute(task);
-      process.stderr.write(`\u21AA\uFE0F  ${route.info.model} \u8BF7\u6C42\u5931\u8D25\uFF0C\u56DE\u9000\u5230\u8C46\u5305 ${fallback.model} (${formatFailure(primary)})
-`);
+    const gemini = isGeminiRoute(route.info);
+    const routes = gemini ? geminiRoutes(route) : [route];
+    const failures = [];
+    for (const [index, candidate] of routes.entries()) {
+      signal?.throwIfAborted();
+      const adapter = this.adapter(candidate);
       try {
-        return await this.tracked(fallback, () => generate(doubao));
-      } catch (fallbackError) {
-        if (!canFallback(fallbackError, signal)) throw fallbackError;
-        throw fallbackFailure(primary, fallbackError, fallback);
+        return await this.tracked(candidate.info, () => generate(adapter));
+      } catch (error) {
+        if (!canFallback(error, signal) || !gemini && error.code !== "content_filtered") throw error;
+        const failure = routedFailure(error, candidate.info);
+        failures.push(failure);
+        const next = routes[index + 1];
+        if (next) {
+          process.stderr.write(`\u21AA\uFE0F  ${candidate.info.model} \u8BF7\u6C42\u5931\u8D25\uFF0C\u5207\u6362\u5230 ${next.info.model} (${formatFailure(failure)})
+`);
+          continue;
+        }
+        const doubao = this.doubaoTextAdapter();
+        if (!doubao) throw exhaustedFailure(error, failures);
+        const fallback = this.doubaoRoute(task);
+        process.stderr.write(`\u21AA\uFE0F  \u4E3B\u6A21\u578B\u8DEF\u7531\u5DF2\u8017\u5C3D\uFF0C\u56DE\u9000\u5230\u8C46\u5305 ${fallback.model}
+`);
+        try {
+          return await this.tracked(fallback, () => generate(doubao));
+        } catch (fallbackError) {
+          if (!canFallback(fallbackError, signal)) throw fallbackError;
+          throw exhaustedFailure(fallbackError, [...failures, routedFailure(fallbackError, fallback)]);
+        }
       }
     }
+    throw new Error("Text model routes cannot be empty.");
   }
   async generateText(task, request2) {
     const spec2 = LLM_TASK_REGISTRY[task];