@lingjingai/scriptctl 0.61.3 → 0.62.0

package/README.md

@@ -117,3 +117,23 @@ pnpm publish          # access=public，会自动跑 prepublishOnly
 ## License
 
 MIT
+
+### 指定视频理解服务
+
+默认视频 ingest 沿用 Gemini 主流程，失败后由豆包兜底。显式选择服务时只调用所选服务和模型：
+
+```bash
+# 豆包：默认读取 ARK_API_KEY；模型也可通过 ARK_MODEL 设置
+scriptctl ingest --source-path ./video.mp4 --video-provider doubao --provider-model ep-your-endpoint
+
+# 使用自定义凭据来源和服务地址
+scriptctl ingest --source-path ./video.mp4 --video-provider doubao \
+  --provider-model ep-your-endpoint --provider-api-key-env MY_ARK_API_KEY \
+  --provider-base-url https://ark.cn-beijing.volces.com/api/v3
+
+# Gemini：模型省略时使用配置中的视频模型
+scriptctl ingest --source-path ./video.mp4 --video-provider gemini
+```
+
+`--provider-api-key` 与 `--provider-api-key-env` 互斥。豆包仅支持默认的 `--upload-mode file-api`；
+直接选择豆包必须提供模型，且不需要 Gemini key。这些参数只影响视频理解阶段。

package/changes/0.61.4.md

@@ -0,0 +1,13 @@
+# 0.61.4
+
+## Added
+- None.
+
+## Changed
+- None.
+
+## Fixed
+- Preserve Google content-filter reason suffixes and report them as non-retryable filtering instead of empty responses.
+
+## Breaking
+- None.

package/changes/0.61.5.md

@@ -0,0 +1,5 @@
+# 0.61.5
+
+## Fixed
+- Review frame requests now describe even single timestamps as JSON arrays. Framework argument errors are returned to the agent as text so it can correct the request, instead of crashing while treating the error as image results.
+- Valid frame images keep their existing model output format.

package/changes/0.62.0.md

@@ -0,0 +1,13 @@
+# 0.62.0
+
+## Added
+- `scriptctl ingest --video-provider gemini|doubao` supports explicit video provider selection with existing model, API key, and base URL overrides. Direct Doubao requires `--provider-model` or `ARK_MODEL` and file-api upload mode. Explicit selection disables fallback; the default Gemini flow with Doubao fallback is unchanged.
+
+## Changed
+- None.
+
+## Fixed
+- None.
+
+## Breaking
+- None.

package/dist/bin.js

@@ -1648,7 +1648,7 @@ var GeminiVideoModel = class {
     return file;
   }
   async generate(request2) {
-    if (request2.media.kind === "local-fallback") {
+    if (request2.media.kind === "local-fallback" || request2.media.kind === "local") {
       throw new LlmTransportError("invalid_response", "A local fallback video cannot be sent to Gemini.");
     }
     const config = {
@@ -1761,7 +1761,7 @@ var GeminiVideoModel = class {
     return { text: value.text, finishReason: value.finishReason, attempts, usage: addTokenUsage(failedUsage, value.usage), raw: value.raw };
   }
   async release(media, signal) {
-    if (media.kind === "base64" || media.kind === "local-fallback") return;
+    if (media.kind === "base64" || media.kind === "local-fallback" || media.kind === "local") return;
     try {
       await this.client.files.delete({ name: media.file.name });
     } catch (error) {
@@ -1930,7 +1930,7 @@ var OpenAiCompatibleModel = class {
       const choice = firstChoice(payload);
       const reason = finishReason(choice);
       if (reason === "length") throw new LlmTransportError("truncated", "Provider output was truncated.");
-      if (reason === "content_filter") throw new LlmTransportError("content_filtered", "Provider filtered the response.");
+      if (reason === "content_filter" || reason.startsWith("content_filter:")) throw new LlmTransportError("content_filtered", `Provider filtered the response (${reason}).`);
       const text2 = messageText(choice);
       if (!text2) throw new LlmTransportError("empty_response", "Provider returned an empty text response.");
       return { text: text2, finishReason: reason, attempts, usage, raw: payload };
@@ -1957,7 +1957,7 @@ var OpenAiCompatibleModel = class {
       const choice = firstChoice(payload);
       const reason = finishReason(choice);
       if (reason === "length") throw new LlmTransportError("truncated", "Provider tool output was truncated.");
-      if (reason === "content_filter") throw new LlmTransportError("content_filtered", "Provider filtered the response.");
+      if (reason === "content_filter" || reason.startsWith("content_filter:")) throw new LlmTransportError("content_filtered", `Provider filtered the response (${reason}).`);
       const calls = message(choice)?.["tool_calls"];
       if (!Array.isArray(calls)) throw new LlmTransportError("invalid_response", "Provider did not return a tool call.");
       for (const call of calls) {
@@ -2065,6 +2065,11 @@ var ModelRouter = class {
     const cached2 = this.resolvedRoutes.get(task);
     if (cached2) return cached2;
     const spec2 = LLM_TASK_REGISTRY[task];
+    if (spec2.mode === "video" && this.options.videoProvider?.provider === "doubao") {
+      const resolved2 = this.resolveDoubao(task, true);
+      this.resolvedRoutes.set(task, resolved2);
+      return resolved2;
+    }
     const profile = this.config.tasks[task] ?? spec2.defaultProfile;
     const modelConfig = this.config.models[profile];
     if (!modelConfig) throw configRuntimeError("The task route references a missing model profile.", [profile], [`task: ${task}`]);
@@ -2257,25 +2262,37 @@ var ModelRouter = class {
       };
     });
   }
-  doubaoRoute(task) {
-    const provider = {
+  resolveDoubao(task, explicit) {
+    const overrides = explicit ? this.options.videoProvider : void 0;
+    const modelName = explicit ? (overrides?.model ?? process.env["ARK_MODEL"] ?? "").trim() : this.doubaoModel();
+    if (!modelName) {
+      throw configRuntimeError("Doubao requires --provider-model or ARK_MODEL.", ["--provider-model <id> or ARK_MODEL"], ["model: empty"]);
+    }
+    const providerConfig = {
       protocol: "openai-compatible",
-      baseUrl: DOUBAO_FALLBACK.baseUrl,
+      baseUrl: overrides?.baseUrl ? normalizeProviderBaseUrl(overrides.baseUrl, "--provider-base-url") : DOUBAO_FALLBACK.baseUrl,
       apiKeyEnv: DOUBAO_FALLBACK.apiKeyEnv,
       timeoutMs: DOUBAO_FALLBACK.timeoutMs,
       maxAttempts: DOUBAO_FALLBACK.maxAttempts
     };
-    const model = { provider: "doubao", model: this.doubaoModel() };
+    const modelConfig = { provider: "doubao", model: modelName };
     return {
-      task,
-      profile: "doubao-fallback",
-      provider: "doubao",
-      protocol: provider.protocol,
-      baseUrl: provider.baseUrl,
-      model: model.model,
-      fingerprint: routeFingerprint(task, provider, model)
+      info: {
+        task,
+        profile: explicit ? "doubao" : "doubao-fallback",
+        provider: "doubao",
+        protocol: providerConfig.protocol,
+        baseUrl: providerConfig.baseUrl,
+        model: modelName,
+        fingerprint: routeFingerprint(task, providerConfig, modelConfig)
+      },
+      providerConfig,
+      modelConfig
     };
   }
+  doubaoRoute(task) {
+    return this.resolveDoubao(task, false).info;
+  }
   adapter(route) {
     const key = `${route.info.provider}\0${route.info.model}\0${route.modelConfig.thinkingBudgetTokens ?? ""}`;
     const cached2 = this.adapters.get(key);
@@ -2317,6 +2334,38 @@ var ModelRouter = class {
     const spec2 = LLM_TASK_REGISTRY[task];
     if (spec2.mode !== "video") throw configRuntimeError("The task does not support video generation.", ["video task"], [`task: ${task}`]);
     const route = this.resolve(task);
+    if (this.options.videoProvider?.provider === "doubao") {
+      const adapter = this.doubaoAdapter(route);
+      if (!adapter) throw credentialError("doubao");
+      return {
+        prepare: async (localPath, mimeType, mode, signal) => {
+          if (mode !== "file-api") {
+            throw configRuntimeError("Doubao requires file-api upload mode.", ["file-api"], [mode]);
+          }
+          signal?.throwIfAborted();
+          return { kind: "local", path: localPath, mimeType };
+        },
+        generate: (request2) => {
+          if (request2.media.kind !== "local") {
+            throw configRuntimeError("Doubao requires locally prepared video.", ["local media"], [request2.media.kind]);
+          }
+          request2.signal?.throwIfAborted();
+          const { path: localPath, mimeType: localMime } = request2.media;
+          return this.tracked(route.info, () => adapter.run({
+            localPath,
+            localMime,
+            user: request2.user,
+            fps: request2.fps,
+            maxOutputTokens: spec2.maxOutputTokens,
+            ...request2.system ? { system: request2.system } : {},
+            ...request2.responseJsonSchema ? { responseJsonSchema: request2.responseJsonSchema } : {},
+            ...request2.signal ? { signal: request2.signal } : {}
+          }));
+        },
+        release: async () => {
+        }
+      };
+    }
     if (route.providerConfig.protocol !== "google-gemini") {
       throw configRuntimeError(
         "Video tasks require a google-gemini provider.",
@@ -2405,16 +2454,17 @@ var ModelRouter = class {
       }
     };
   }
-  // The Doubao fallback adapter, or null when ARK_API_KEY is unset. Cached per key.
+  // Resolve an explicit Doubao route or the default fallback; absent fallback credentials skip it.
   // Overridable in tests to inject a fake Ark client.
-  doubaoAdapter() {
-    const apiKey = (process.env[DOUBAO_FALLBACK.apiKeyEnv] ?? "").trim();
+  doubaoAdapter(route) {
+    const apiKey = route ? this.videoCredential(route) : (process.env[DOUBAO_FALLBACK.apiKeyEnv] ?? "").trim();
     if (!apiKey) return null;
-    const model = this.doubaoModel();
-    const key = `doubao ${model}`;
+    const model = route?.info.model ?? this.doubaoModel();
+    const baseUrl = route?.providerConfig.baseUrl ?? DOUBAO_FALLBACK.baseUrl;
+    const key = `doubao ${baseUrl} ${model}`;
     const cached2 = this.doubaoAdapters.get(key);
     if (cached2) return cached2;
-    const adapter = new DoubaoVideoModel(model, DOUBAO_FALLBACK.timeoutMs, DOUBAO_FALLBACK.maxAttempts, apiKey, DOUBAO_FALLBACK.baseUrl);
+    const adapter = new DoubaoVideoModel(model, DOUBAO_FALLBACK.timeoutMs, DOUBAO_FALLBACK.maxAttempts, apiKey, baseUrl);
     this.doubaoAdapters.set(key, adapter);
     return adapter;
   }
@@ -12097,6 +12147,7 @@ var intOf = (v, fallback) => {
   return Number.isInteger(n) && n > 0 ? n : fallback;
 };
 var VIDEO_OPTION_KEYS = [
+  "video_provider",
   "upload_mode",
   "provider_base_url",
   "provider_api_key",
@@ -12129,6 +12180,10 @@ function uploadModeOf(opts) {
   return mode;
 }
 function providerOverridesOf(opts) {
+  const provider = requiredOptionValue(opts, "video_provider", "--video-provider");
+  if (provider !== void 0 && provider !== "gemini" && provider !== "doubao") {
+    throw invalidVideoOption("Video provider must be gemini or doubao.", ["--video-provider gemini|doubao"]);
+  }
   const literalKeyProvided = optionProvided(opts, "provider_api_key");
   const keyEnvProvided = optionProvided(opts, "provider_api_key_env");
   if (literalKeyProvided && keyEnvProvided) {
@@ -12147,8 +12202,9 @@ function providerOverridesOf(opts) {
   let apiKey;
   if (literalKey !== void 0) apiKey = { kind: "literal", value: literalKey };
   else if (keyEnv !== void 0) apiKey = { kind: "env", name: keyEnv };
-  if (!baseUrl && !apiKey && !model) return void 0;
+  if (!provider && !baseUrl && !apiKey && !model) return void 0;
   return {
+    ...provider ? { provider } : {},
     ...baseUrl ? { baseUrl } : {},
     ...apiKey ? { apiKey } : {},
     ...model ? { model } : {}
@@ -12176,6 +12232,9 @@ async function commandIngest(opts, composition = PRODUCTION_LLM_COMPOSITION) {
   if (resolved.kind !== "text") {
     const uploadMode = uploadModeOf(opts);
     const videoProvider = providerOverridesOf(opts);
+    if (videoProvider?.provider === "doubao" && uploadMode !== "file-api") {
+      throw invalidVideoOption("Doubao requires --upload-mode file-api.", ["--upload-mode file-api"]);
+    }
     const executorOptions = videoProvider ? { videoProvider } : void 0;
     const executor2 = composition.createExecutor(strOf3(opts["llm_config"]).trim() || void 0, executorOptions);
     const configuredRoute = executor2.route("ingest.video-serial");
@@ -15962,7 +16021,7 @@ function registerWorkflowCommands(program, state2, llm2) {
     "after",
     "\nExample:\n  scriptctl migrate -p ./old-script.json -o ./script-v4.json --to 4\n"
   ).action(dispatch(commandMigrate, state2));
-  const ingest = program.command("ingest").description("Convert source files into a Script v4 workspace").option("-s, --source-path <path>", "Source file or directory").option("-w, --workspace-path <path>", "Workspace directory", "workspace").option("--llm-config <path>", "LLM configuration file").option("--concurrency <n>", "Maximum concurrent model calls").option("--fps <n>", "Video sampling rate").option("--upload-mode <mode>", "Video transport: file-api (default) or base64").option("--provider-base-url <url>", "Gemini-compatible provider service root").option("--provider-api-key <key>", "Provider API key (visible in process arguments; prefer --provider-api-key-env)").option("--provider-api-key-env <name>", "Environment variable containing the provider API key").option("--provider-model <model>", "Gemini-compatible provider model").option("--step", "Process only the next unfinished video episode").option("--force", "Rebuild completed stages").addHelpText("after", "\nExample:\n  scriptctl ingest --source-path ./draft.md --workspace-path ./workspace\n").action(dispatch((options) => commandIngest(options, llm2), state2));
+  const ingest = program.command("ingest").description("Convert source files into a Script v4 workspace").option("-s, --source-path <path>", "Source file or directory").option("-w, --workspace-path <path>", "Workspace directory", "workspace").option("--llm-config <path>", "LLM configuration file").option("--concurrency <n>", "Maximum concurrent model calls").option("--fps <n>", "Video sampling rate").option("--upload-mode <mode>", "Video transport: file-api (default) or base64").option("--video-provider <provider>", "Video provider: gemini or doubao (explicit selection disables fallback)").option("--provider-base-url <url>", "Selected video provider service root").option("--provider-api-key <key>", "Provider API key (visible in process arguments; prefer --provider-api-key-env)").option("--provider-api-key-env <name>", "Environment variable containing the provider API key").option("--provider-model <model>", "Selected video provider model (Doubao defaults to ARK_MODEL)").option("--step", "Process only the next unfinished video episode").option("--force", "Rebuild completed stages").addHelpText("after", "\nExample:\n  scriptctl ingest --source-path ./draft.md --workspace-path ./workspace\n").action(dispatch((options) => commandIngest(options, llm2), state2));
   ingest.command("status").description("Show ingest workspace progress").option("-w, --workspace-path <path>", "Workspace directory").action(dispatch(commandIngestStatus, state2));
   ingest.command("skip").description("Manually accept the next failed video episode as empty").option("-w, --workspace-path <path>", "Workspace directory").requiredOption("--episode <n>", "Failed episode number").requiredOption("--reason <text>", "Why this episode is being skipped").addHelpText("after", '\nExample:\n  scriptctl ingest skip -w ./workspace --episode 7 --reason "provider policy block"\n').action(dispatch(commandSkipVideoEpisode, state2));
   program.command("evidence").description("Generate local original-video reference frames from final Script v4 timestamps").option("-p, --script-path <path>", "Final Script v4 JSON file").requiredOption("-s, --source-path <path>", "Linked source-video file or episode directory").requiredOption("-w, --workspace-path <path>", "Project workspace directory").option("--force", "Re-extract frames even when deterministic output files already exist").addHelpText("after", "\nExample:\n  scriptctl evidence -p ./script.json -s /Volumes/NAS/videos -w ./workspace --force\n").action(dispatch(commandGenerateVideoStateEvidence, state2));