@lingjingai/scriptctl 0.62.2 → 0.62.4

package/changes/0.62.3.md

@@ -0,0 +1,4 @@
+# 0.62.3
+
+- 梗概、文本整理与结构化文本任务遇到明确的内容审核拒绝时，使用已配置的豆包 Pro Ark Responses 端点兜底。
+- 保持原始文本、结构化 Schema、取消信号及每条实际模型线路的 token 与调用成本记录。

package/changes/0.62.4.md

@@ -0,0 +1,5 @@
+# 0.62.4
+
+- `review --converge-only` 只运行全剧收敛，支持客户端保留已完成集后的续跑。
+- 审核 NDJSON 增加 `unit-started` 事件，提供真实的分集与全剧阶段开始状态。
+- 流式命令在 JSON 模式下直接结束，保持每行一个完整事件。

package/dist/bin.js

@@ -1043,7 +1043,7 @@ var AnthropicModel = class {
   }
 };
 
-// src/infra/llm/doubao-video-model.ts
+// src/infra/llm/doubao-model.ts
 import * as fs7 from "node:fs";
 import * as path7 from "node:path";
 import { File } from "node:buffer";
@@ -1173,7 +1173,7 @@ function httpError(status, message2, detail, context = {}) {
   });
 }
 
-// src/infra/llm/doubao-video-model.ts
+// src/infra/llm/doubao-model.ts
 var POLL_INTERVAL_MS = 2e3;
 function delay2(ms) {
   return new Promise((resolve19) => setTimeout(resolve19, ms));
@@ -1203,7 +1203,7 @@ function extractText(res) {
   }
   return parts.join("").trim();
 }
-var DoubaoVideoModel = class {
+var DoubaoModel = class {
   constructor(model, timeoutMs, maxAttempts, apiKey, baseUrl, client) {
     this.model = model;
     this.timeoutMs = timeoutMs;
@@ -1278,12 +1278,45 @@ var DoubaoVideoModel = class {
     if (request2.responseJsonSchema) {
       params["text"] = { format: { type: "json_schema", name: "video_serial", schema: request2.responseJsonSchema } };
     }
+    return this.generateResponse(params, request2.signal, Boolean(request2.responseJsonSchema));
+  }
+  async generateText(request2) {
+    const params = this.textParams(request2);
+    if (request2.responseFormat) params["text"] = { format: { type: request2.responseFormat } };
+    return this.generateResponse(params, request2.signal, Boolean(request2.responseFormat));
+  }
+  async generateTool(request2) {
+    const params = this.textParams(request2);
+    params["text"] = { format: {
+      type: "json_schema",
+      name: request2.tool.name,
+      description: request2.tool.description,
+      schema: request2.tool.inputSchema
+    } };
+    const response = await this.generateResponse(params, request2.signal, true);
+    return {
+      input: JSON.parse(response.text),
+      finishReason: response.finishReason,
+      attempts: response.attempts,
+      usage: response.usage,
+      raw: response.raw
+    };
+  }
+  textParams(request2) {
+    return {
+      model: this.model,
+      max_output_tokens: request2.maxOutputTokens,
+      instructions: request2.system,
+      input: [{ role: "user", content: [{ type: "input_text", text: request2.user }] }]
+    };
+  }
+  async generateResponse(params, signal, structured) {
     const { value, attempts, failedUsage } = await withTransientRetry(this.maxAttempts, async () => {
       let res;
       try {
-        res = await this.client.createResponse(params, request2.signal);
+        res = await this.client.createResponse(params, signal);
       } catch (error) {
-        throw toArkError(error, request2.signal, "generate", this.model);
+        throw toArkError(error, signal, "generate", this.model);
       }
       const status = (res.status ?? "").toLowerCase();
       const usage = arkUsage(res.usage);
@@ -1294,11 +1327,11 @@ var DoubaoVideoModel = class {
       }
       const text2 = extractText(res);
       if (!text2) throw new LlmTransportError("empty_response", "Doubao returned an empty response.", { retryable: true, usage });
-      if (request2.responseJsonSchema) {
+      if (structured) {
         try {
           JSON.parse(text2);
         } catch {
-          throw new LlmTransportError("invalid_response", "Doubao returned malformed JSON for a structured video response.", {
+          throw new LlmTransportError("invalid_response", "Doubao returned malformed JSON for a structured response.", {
             retryable: true,
             usage,
             context: { provider: "doubao", model: this.model, operation: "generate" }
@@ -2457,6 +2490,12 @@ var ModelRouter = class {
   // Resolve an explicit Doubao route or the default fallback; absent fallback credentials skip it.
   // Overridable in tests to inject a fake Ark client.
   doubaoAdapter(route) {
+    return this.arkAdapter(route);
+  }
+  doubaoTextAdapter() {
+    return this.arkAdapter();
+  }
+  arkAdapter(route) {
     const apiKey = route ? this.videoCredential(route) : (process.env[DOUBAO_FALLBACK.apiKeyEnv] ?? "").trim();
     if (!apiKey) return null;
     const model = route?.info.model ?? this.doubaoModel();
@@ -2464,7 +2503,7 @@ var ModelRouter = class {
     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, baseUrl);
+    const adapter = new DoubaoModel(model, DOUBAO_FALLBACK.timeoutMs, DOUBAO_FALLBACK.maxAttempts, apiKey, baseUrl);
     this.doubaoAdapters.set(key, adapter);
     return adapter;
   }
@@ -2472,19 +2511,29 @@ var ModelRouter = class {
   doubaoModel() {
     return (process.env[DOUBAO_FALLBACK.modelEnv] ?? "").trim() || DOUBAO_FALLBACK.model;
   }
+  async withModerationFallback(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 (signal?.aborted || !(error instanceof LlmTransportError) || error.code !== "content_filtered") throw error;
+      const doubao = this.doubaoTextAdapter();
+      if (!doubao) throw error;
+      process.stderr.write(`\u21AA\uFE0F  \u6587\u672C\u5185\u5BB9\u5BA1\u6838\u62D2\u7EDD\uFF0C\u56DE\u9000\u5230\u8C46\u5305 ${this.doubaoModel()}
+`);
+      return this.tracked(this.doubaoRoute(task), () => generate(doubao));
+    }
+  }
   async generateText(task, request2) {
     const spec2 = LLM_TASK_REGISTRY[task];
     if (spec2.mode !== "text") throw configRuntimeError("The task does not support text generation.", ["text task"], [`task: ${task}`]);
-    const route = this.resolve(task);
-    const adapter = this.adapter(route);
-    return this.tracked(route.info, () => adapter.generateText({ ...request2, maxOutputTokens: spec2.maxOutputTokens }));
+    return this.withModerationFallback(task, request2.signal, (adapter) => adapter.generateText({ ...request2, maxOutputTokens: spec2.maxOutputTokens }));
   }
   async generateTool(task, request2) {
     const spec2 = LLM_TASK_REGISTRY[task];
     if (spec2.mode !== "tool") throw configRuntimeError("The task does not support tool generation.", ["tool task"], [`task: ${task}`]);
-    const route = this.resolve(task);
-    const adapter = this.adapter(route);
-    return this.tracked(route.info, () => adapter.generateTool({ ...request2, maxOutputTokens: spec2.maxOutputTokens }));
+    return this.withModerationFallback(task, request2.signal, (adapter) => adapter.generateTool({ ...request2, maxOutputTokens: spec2.maxOutputTokens }));
   }
 };
 function createLlmExecutor(explicitConfigPath, options) {
@@ -2956,6 +3005,7 @@ function tableText(data) {
   ].join("\n");
 }
 function emit(output, exitCode, jsonMode, format) {
+  if (output.text === "" && Object.keys(output.data).length === 0) return;
   if (format === "addr" && hasRows(output.data)) {
     if (output.data.rows.length === 0) {
       process.stdout.write("");
@@ -2977,7 +3027,6 @@ function emit(output, exitCode, jsonMode, format) {
     payload["exit_code"] = exitCode;
     process.stdout.write(JSON.stringify(payload, null, 2) + "\n");
   } else {
-    if (output.text === "" && Object.keys(output.data).length === 0) return;
     process.stdout.write(withNewline(tableText(output.data) ?? output.text));
   }
 }
@@ -3216,6 +3265,7 @@ async function commandReview(opts) {
       ...episodeList(strOf(opts["episodes"])) ? { episodes: episodeList(strOf(opts["episodes"])) } : {},
       concurrency: positive(opts, "concurrency", 5),
       converge: opts["converge"] !== false,
+      convergeOnly: opts["converge_only"] === true,
       apiKey: profile.apiKey,
       model: profile.model,
       mediaModel: profile.model,
@@ -3244,7 +3294,7 @@ function registerReviewCommand(program, state2) {
     "\u7B2C N \u96C6\u7684\u89C6\u9891\uFF1B\u6309\u96C6\u987A\u5E8F\u91CD\u590D\u4F20\uFF0C\u8986\u76D6 -s \u7684\u76EE\u5F55\u6392\u5E8F",
     (value, previous) => [...previous, value],
     []
-  ).option("--episodes <list>", "\u53EA\u5BA1\u8FD9\u4E9B\u96C6\uFF0C\u9017\u53F7\u5206\u9694\uFF08\u9ED8\u8BA4\u5168\u5267\uFF09").option("--concurrency <n>", "\u540C\u65F6\u5728\u98DE\u7684\u96C6\u6570", Number).option("--episode-timeout-ms <ms>", "\u5355\u96C6\u8D85\u65F6\uFF1B\u5230\u70B9\u6536\u5C3E\u5E76\u4FDD\u7559\u5DF2\u8BB0\u5F55\u7684\u7ED3\u8BBA", Number).option("--max-steps <n>", "\u5355\u96C6\u6700\u591A\u51E0\u6B65\u5DE5\u5177\u8C03\u7528", Number).option("--media-budget <n>", "\u5355\u96C6\u6700\u591A\u51E0\u6B21\u89C6\u9891\u6838\u5BF9", Number).option("--no-converge", "\u8DF3\u8FC7\u5168\u5267\u6536\u655B\u9636\u6BB5").option("--model <profile>", "\u8986\u76D6 LLM profile\uFF08\u9ED8\u8BA4 review-agent\uFF09").option("--llm-config <path>", "LLM configuration file").option("--check", "\u53EA\u68C0\u67E5\u6A21\u578B\u4E0E agent \u662F\u5426\u5C31\u7EEA\uFF0C\u4E0D\u5BA1\u6838").action(dispatch(commandReview, state2));
+  ).option("--episodes <list>", "\u53EA\u5BA1\u8FD9\u4E9B\u96C6\uFF0C\u9017\u53F7\u5206\u9694\uFF08\u9ED8\u8BA4\u5168\u5267\uFF09").option("--concurrency <n>", "\u540C\u65F6\u5728\u98DE\u7684\u96C6\u6570", Number).option("--episode-timeout-ms <ms>", "\u5355\u96C6\u8D85\u65F6\uFF1B\u5230\u70B9\u6536\u5C3E\u5E76\u4FDD\u7559\u5DF2\u8BB0\u5F55\u7684\u7ED3\u8BBA", Number).option("--max-steps <n>", "\u5355\u96C6\u6700\u591A\u51E0\u6B65\u5DE5\u5177\u8C03\u7528", Number).option("--media-budget <n>", "\u5355\u96C6\u6700\u591A\u51E0\u6B21\u89C6\u9891\u6838\u5BF9", Number).option("--converge-only", "\u53EA\u6267\u884C\u5168\u5267\u6536\u655B\uFF0C\u4E0D\u91CD\u65B0\u5BA1\u6838\u5404\u96C6").option("--no-converge", "\u8DF3\u8FC7\u5168\u5267\u6536\u655B\u9636\u6BB5").option("--model <profile>", "\u8986\u76D6 LLM profile\uFF08\u9ED8\u8BA4 review-agent\uFF09").option("--llm-config <path>", "LLM configuration file").option("--check", "\u53EA\u68C0\u67E5\u6A21\u578B\u4E0E agent \u662F\u5426\u5C31\u7EEA\uFF0C\u4E0D\u5BA1\u6838").action(dispatch(commandReview, state2));
 }
 
 // src/cli/register-script.ts
@@ -4552,67 +4602,6 @@ function spanAddresses(doc2, actions) {
   });
 }
 
-// packages/screenplay/dist/references.js
-function references(doc2, address, opts = {}) {
-  const offset = opts.offset ?? 0, limit = opts.limit ?? 20, context = opts.context ?? 3;
-  for (const [name, value, minimum] of [["offset", offset, 0], ["limit", limit, 1], ["context", context, 0]]) {
-    if (!Number.isSafeInteger(value) || value < minimum)
-      throw new Error(`${name} must be an integer >= ${minimum}`);
-  }
-  const node = resolve6(doc2, address);
-  if (node.t !== "asset" && node.t !== "state")
-    throw new Error("references requires an asset or asset/state address; use read for episodes/scenes/actions");
-  const asset2 = node.asset;
-  const state2 = node.t === "state" ? node.state.id : null;
-  const names = [.../* @__PURE__ */ new Set([asset2.id, asset2.name, ...asset2.aliases])].filter(Boolean);
-  const hits = [];
-  for (const ep of doc2.episodes)
-    for (const scene of ep.scenes) {
-      const bindings = [...scene.location ? [scene.location] : [], ...scene.actors, ...scene.props].filter((ref2) => ref2.id === asset2.id && (state2 === null || ref2.states.includes(state2)));
-      if (bindings.length)
-        hits.push({ kind: "scene_binding", scene, matched: bindings.flatMap((ref2) => ref2.states) });
-      for (const action of scene.actions) {
-        if (action.speaker?.id === asset2.id && (state2 === null || action.speaker.state === state2)) {
-          hits.push({ kind: "speaker", scene, action, matched: [asset2.id] });
-        }
-        if (state2 === null) {
-          const matched = names.filter((name) => action.content.includes(name));
-          if (matched.length)
-            hits.push({ kind: "text_mention", scene, action, matched });
-        }
-      }
-    }
-  const end = offset + limit;
-  return {
-    asset_id: asset2.id,
-    state_id: state2,
-    total: hits.length,
-    next_offset: end < hits.length ? end : null,
-    items: hits.slice(offset, end).map(({ kind, scene, action, matched }) => {
-      const index = action ? scene.actions.indexOf(action) : -1;
-      const nearby = action ? scene.actions.slice(Math.max(0, index - context), index + context + 1) : [];
-      const gutter = Math.max(0, ...nearby.map((row) => row.anchor.length));
-      return {
-        kind,
-        address: action?.anchor ?? scene.anchor,
-        scene_address: scene.anchor,
-        episode: scene.ep.no,
-        matched,
-        text: [formatSceneHead(doc2, scene), ...nearby.map((row) => (row === action ? "> " : "  ") + formatAction(doc2, row, gutter))].join("\n")
-      };
-    })
-  };
-}
-function formatReferences(result) {
-  return [
-    `${result.asset_id}${result.state_id === null ? "" : "/" + result.state_id}  ${result.total} references \xB7 showing ${result.items.length}`,
-    "scene_binding=explicit scene presence; speaker=explicit speaker; text_mention=name/alias mention only (not proof of presence).",
-    ...result.items.map((hit) => `${hit.address}  ${hit.kind}  ep=${hit.episode}
-${hit.text}`),
-    result.next_offset === null ? "end" : `Continue: --offset ${result.next_offset}`
-  ].join("\n\n");
-}
-
 // packages/screenplay/dist/tools.js
 var NON_ACTOR_NAMES = ["\u65C1\u767D", "\u5E7F\u64AD", "\u753B\u5916", "\u7FA4\u58F0"];
 var NON_ACTOR_KIND = {
@@ -5740,15 +5729,6 @@ ${issues(d, {})}`
     ...opts["full"] ? { full: true } : {}
   }), "find"), state2));
   describeArguments(find2, ["\u6B63\u5219\uFF1B\u53EA\u6309 speaker/type \u8FC7\u6EE4\u65F6\u53EF\u7701\u7565"]);
-  const refs = withScriptOpts(program.command("refs <addr>"), "read").description("\u53EA\u8BFB\u5B9A\u4F4D\u8D44\u4EA7/\u9020\u578B\u7684\u573A\u666F\u7ED1\u5B9A\u3001\u8BF4\u8BDD\u5F15\u7528\u548C\u6B63\u6587\u63D0\u53CA\uFF0C\u8FD4\u56DE\u53EF read \u7684\u5730\u5740\u53CA\u4E0A\u4E0B\u6587").option("--offset <n>", "\u4ECE\u7B2C\u51E0\u6761\u5F15\u7528\u7EE7\u7EED\uFF08\u4ECE 0 \u5F00\u59CB\uFF09").option("--limit <n>", "\u672C\u6279\u5F15\u7528\u6570\uFF08\u9ED8\u8BA4 20\uFF09").option("--context <n>", "\u6B63\u6587\u547D\u4E2D\u524D\u540E\u5404\u51E0\u6761 action\uFF08\u9ED8\u8BA4 3\uFF09").action(dispatch((opts) => {
-    const result = references(doc(opts), arg(opts), {
-      offset: num(opts, "offset"),
-      limit: num(opts, "limit"),
-      context: num(opts, "context")
-    });
-    return [{ text: formatReferences(result), data: { op: "refs", changed: false, ...result } }, EXIT_OK];
-  }, state2));
-  describeArguments(refs, ["\u4EBA\u7269/\u573A\u666F/\u9053\u5177 ID \u6216\u540D\u79F0\uFF0C\u6216 <\u8D44\u4EA7>/<\u9020\u578B>\uFF1B\u6B63\u6587\u63D0\u53CA\u4E0D\u7B49\u4E8E\u5B9E\u9645\u51FA\u573A"]);
   const span2 = withScriptOpts(program.command("span <range>"), "read").description("\u628A\u4E00\u6BB5 action \u6362\u7B97\u6210\u96C6\u5185\u89C6\u9891\u65F6\u95F4\u7A97\u53E3\uFF08\u534A\u5F00\u533A\u95F4\uFF09").action(dispatch((opts) => text(() => span(doc(opts), arg(opts)), "span"), state2));
   describeArguments(span2, [`${ADDR}\uFF0C\u6216 \`\u8D77ID..\u6B62ID\``]);
   withScriptOpts(program.command("validate"), "read").description("\u8DD1\u6574\u672C\u6821\u9A8C").action(dispatch((opts) => text(() => validate(doc(opts)), "validate"), state2));