@xiaohhhh1/canvas-agent 0.4.46 → 0.4.47

package/dist/workflow/constants.d.ts

@@ -1,3 +1,8 @@
 /** Flow C 脚本分段的唯一上限和自动降级顺序，MCP 与调度器必须共用。 */
 export declare const FLOW_C_SCRIPT_CHUNK_SIZES: readonly [30, 15, 10];
 export declare const FLOW_C_SCRIPT_CHUNK_MAX: 30;
+/**
+ * 长视频每条都包含总脚本和 2/3 套完整分镜，不能沿用短脚本的 30 条输出量。
+ * 小段回传既能更早显示进度，也避免单个 Codex turn 因输出过大而被中断。
+ */
+export declare function flowCScriptChunkSizes(durationSeconds: 10 | 20 | 30): readonly [30, 15, 10] | readonly [2, 1] | readonly [1];

package/dist/workflow/constants.js

@@ -1,3 +1,14 @@
 /** Flow C 脚本分段的唯一上限和自动降级顺序，MCP 与调度器必须共用。 */
 export const FLOW_C_SCRIPT_CHUNK_SIZES = [30, 15, 10];
 export const FLOW_C_SCRIPT_CHUNK_MAX = FLOW_C_SCRIPT_CHUNK_SIZES[0];
+/**
+ * 长视频每条都包含总脚本和 2/3 套完整分镜，不能沿用短脚本的 30 条输出量。
+ * 小段回传既能更早显示进度，也避免单个 Codex turn 因输出过大而被中断。
+ */
+export function flowCScriptChunkSizes(durationSeconds) {
+    if (durationSeconds === 20)
+        return [2, 1];
+    if (durationSeconds === 30)
+        return [1];
+    return FLOW_C_SCRIPT_CHUNK_SIZES;
+}

package/dist/workflow/manager.js

@@ -9,7 +9,7 @@ import { restartCodexApp, runCodexTurn, startCodexThread } from "../agent/codex.
 import { CONFIG_DIR, ensureSiteWorkspace } from "../config.js";
 import { logger } from "../utils/logger.js";
 import { windowsPowerShellExecutable } from "../utils/windows.js";
-import { FLOW_C_SCRIPT_CHUNK_MAX, FLOW_C_SCRIPT_CHUNK_SIZES } from "./constants.js";
+import { FLOW_C_SCRIPT_CHUNK_MAX, flowCScriptChunkSizes } from "./constants.js";
 import { flowCScriptOutputSchema, parseFlowCScriptOutput } from "./script-output.js";
 const STATE_FILE = path.join(CONFIG_DIR, "workflow-state.json");
 export const FLOW_C_CODEX_TURN_TIMEOUT_MS = 8 * 60 * 1000;
@@ -59,6 +59,9 @@ export class WorkflowManager {
         const id = workflowId(idValue, "脚本交接 ID");
         const record = this.scriptRecord(id);
         record.status = "queued";
+        // A failed manual attempt may leave a very large or interrupted thread.
+        // Retrying in a fresh thread avoids carrying that damaged context forward.
+        delete record.threadId;
         record.priorityAt = now();
         record.message = "正在重新连接本机 Codex";
         record.updatedAt = now();
@@ -232,11 +235,13 @@ export class WorkflowManager {
                 record.threadId = String(thread.id || "");
                 this.save();
             }
+            const durationSeconds = Number(task.duration_seconds || 10);
+            const chunkSizes = flowCScriptChunkSizes(durationSeconds);
             while (record.receivedOrdinals.length < task.requested_count) {
                 let progressed = false;
                 let lastRange = "";
                 let lastError = "";
-                for (const [attemptIndex, chunkSize] of FLOW_C_SCRIPT_CHUNK_SIZES.entries()) {
+                for (const [attemptIndex, chunkSize] of chunkSizes.entries()) {
                     const missing = missingOrdinals(task.requested_count, record.receivedOrdinals).slice(0, chunkSize);
                     if (!missing.length) {
                         progressed = true;
@@ -248,7 +253,7 @@ export class WorkflowManager {
                     record.message = `本机 Codex 正在写第 ${missing[0]}–${missing.at(-1)} 条（总计 ${task.requested_count} 条）`;
                     record.updatedAt = now();
                     this.save();
-                    const result = await runCodexScriptWithTimeout(scriptChunkPrompt(id, task, missing), this.emit, { threadId: record.threadId, cwd: workspace.workspacePath, permissionMode: "full", outputSchema: flowCScriptOutputSchema(Number(task.duration_seconds || 10), missing.length), onThread: (threadId) => { record.threadId = threadId; this.save(); } });
+                    const result = await runCodexScriptWithTimeout(scriptChunkPrompt(id, task, missing), this.emit, { threadId: record.threadId, cwd: workspace.workspacePath, permissionMode: "full", outputSchema: flowCScriptOutputSchema(durationSeconds, missing.length), onThread: (threadId) => { record.threadId = threadId; this.save(); } });
                     await this.scriptTask(id);
                     progressed = record.receivedOrdinals.length > before;
                     if (!progressed && result.ok && result.text) {
@@ -266,8 +271,8 @@ export class WorkflowManager {
                     // Keep provider/client details out of the browser-facing state. The
                     // underlying Codex runner already records the technical error locally.
                     lastError ||= result.ok ? "Codex 未返回可用的结构化脚本" : "Codex 本轮执行失败";
-                    if (attemptIndex < FLOW_C_SCRIPT_CHUNK_SIZES.length - 1) {
-                        const nextSize = FLOW_C_SCRIPT_CHUNK_SIZES[attemptIndex + 1];
+                    if (attemptIndex < chunkSizes.length - 1) {
+                        const nextSize = chunkSizes[attemptIndex + 1];
                         record.message = `第 ${lastRange} 条未成功回传，正在换新会话并缩小为每段 ${nextSize} 条重试`;
                         const thread = await startCodexThread(this.emit, workspace.workspacePath, "full");
                         record.threadId = String(thread.id || "");
@@ -275,7 +280,7 @@ export class WorkflowManager {
                     }
                 }
                 if (!progressed)
-                    throw new Error(`本机 Codex 已自动换会话并降级到每段 10 条，仍未回传第 ${lastRange} 条${lastError ? `（${lastError}）` : ""}，请点击重试`);
+                    throw new Error(`本机 Codex 已自动换会话并降级到每段 ${chunkSizes.at(-1)} 条，仍未回传第 ${lastRange} 条${lastError ? `（${lastError}）` : ""}，请点击重试`);
             }
             const finalTask = await this.scriptTask(id);
             if (finalTask.status === "ready" && record.receivedOrdinals.length === task.requested_count) {

package/dist/workflow/script-output.js

@@ -8,10 +8,6 @@ function continuitySchema(frameField) {
 }
 function segmentSchema() {
     return object({
-        // The central Flow C API receives each long-video segment as an
-        // independently executable script. Do not omit this just because the
-        // richer storyboard fields below are also present.
-        script: { type: "string", minLength: 40 },
         continuityMode: { type: "string", enum: ["reset", "continue"] },
         continuity: continuitySchema("previousEndingFrame"),
         endingState: continuitySchema("endingFrame"),
@@ -52,5 +48,33 @@ export function parseFlowCScriptOutput(value, expectedOrdinals) {
     const actual = parsed.jobs.map((job) => Number(job?.ordinal));
     if (actual.some((ordinal, index) => ordinal !== expectedOrdinals[index]))
         throw new Error("Codex 返回的 ordinal 与当前分段不一致");
-    return parsed.jobs;
+    return parsed.jobs.map(canonicalizeSegmentContinuity);
+}
+/**
+ * 将后一段的起点锁定为前一段的终点。模型常会用语义相同但措辞不同的
+ * 文字复述角色/场景，中心严格校验时会误判不连续；这里复制模型自己写的
+ * endingState，不发明新内容，同时保证生成阶段真正无缝承接。
+ */
+function canonicalizeSegmentContinuity(jobValue) {
+    const job = recordOf(jobValue);
+    if (!job || !Array.isArray(job.segments))
+        return jobValue;
+    const segments = job.segments.map((segmentValue, index, source) => {
+        const segment = recordOf(segmentValue);
+        if (!segment)
+            return segmentValue;
+        if (index === 0)
+            return { ...segment, continuityMode: "reset" };
+        const previous = recordOf(source[index - 1]);
+        const endingState = recordOf(previous?.endingState);
+        if (!endingState)
+            return { ...segment, continuityMode: "continue" };
+        const continuity = Object.fromEntries(continuityFields.map((field) => [field, endingState[field]]));
+        continuity.previousEndingFrame = endingState.endingFrame;
+        return { ...segment, continuityMode: "continue", continuity };
+    });
+    return { ...job, segments };
+}
+function recordOf(value) {
+    return value && typeof value === "object" && !Array.isArray(value) ? value : null;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xiaohhhh1/canvas-agent",
-  "version": "0.4.46",
+  "version": "0.4.47",
   "type": "module",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",