@xiaohhhh1/canvas-agent 0.4.56 → 0.4.58

package/dist/agent/worker-pool.js

@@ -37,7 +37,7 @@ export class WorkerPool {
             this.available.push(workerIndex);
     }
 }
-export function boundedWorkerConcurrency(value, fallback = 2, maximum = 4) {
+export function boundedWorkerConcurrency(value, fallback = 4, maximum = 4) {
     const parsed = Number(value);
     if (!Number.isInteger(parsed) || parsed < 1)
         return fallback;

package/dist/workflow/constants.d.ts

@@ -5,6 +5,6 @@ export declare const FLOW_C_SCRIPT_CHUNK_SIZES: readonly [10, 5, 1];
  * 长视频每条都包含总脚本和 2/3 套完整分镜，不能沿用短脚本的 30 条输出量。
  * 小段回传既能更早显示进度，也避免单个 Codex turn 因输出过大而被中断。
  */
-export declare function flowCScriptChunkSizes(durationSeconds: 10 | 20 | 30): readonly [10, 5, 1] | readonly [2, 1] | readonly [1];
+export declare function flowCScriptChunkSizes(durationSeconds: 10 | 20 | 30): readonly [10, 5, 1] | readonly [1];
 /** 将当前缺失 ordinal 切成可独立持久化的子批；长视频绝不恢复 30 条大回合。 */
 export declare function flowCScriptChunks(durationSeconds: 10 | 20 | 30, ordinals: number[], size?: number): number[][];

package/dist/workflow/constants.js

@@ -7,7 +7,7 @@ export const FLOW_C_SCRIPT_CHUNK_SIZES = [10, 5, 1];
  */
 export function flowCScriptChunkSizes(durationSeconds) {
     if (durationSeconds === 20)
-        return [2, 1];
+        return [1];
     if (durationSeconds === 30)
         return [1];
     return FLOW_C_SCRIPT_CHUNK_SIZES;

package/dist/workflow/manager.d.ts

@@ -160,6 +160,8 @@ export declare class WorkflowManager {
         status: string;
     } & {
         error?: string;
+        code?: string;
+        resetOrdinals?: unknown;
     }>;
     submitCandidateChunk(idValue: unknown, groupsValue: unknown): Promise<{
         accepted: number;
@@ -168,6 +170,8 @@ export declare class WorkflowManager {
         selectedCandidates: SelectedCandidate[];
     } & {
         error?: string;
+        code?: string;
+        resetOrdinals?: unknown;
     }>;
     downloadState(): {
         configured: boolean;
@@ -293,6 +297,9 @@ export declare function terminalScriptChunkError(results: Array<{
     error?: string;
     terminal?: boolean;
 }>): string;
+export declare function scriptCreativeReplanOrdinals(results: unknown[]): number[];
+export declare function creativeReplanOrdinals(error: unknown): number[];
+export declare function recordCreativeReplanAttempts(attempts: Map<number, number>, ordinals: number[], limit?: number): void;
 export declare function scriptChunkPrompt(id: string, task: ScriptTask, ordinals: number[]): string;
 export declare function creativeCandidatePrompt(id: string, task: ScriptTask, ordinals: number[]): string;
 /**

package/dist/workflow/manager.js

@@ -253,6 +253,7 @@ export class WorkflowManager {
             record.activeChunks = 0;
             let chunkSizeIndex = 0;
             let candidateChunkSize = 2;
+            const creativeReplanAttempts = new Map();
             while (record.receivedOrdinals.length < task.requested_count) {
                 task = await this.scriptTask(id);
                 const selectedBefore = selectedCandidateOrdinals(task);
@@ -280,6 +281,22 @@ export class WorkflowManager {
                     const terminalError = terminalScriptChunkError(results);
                     if (terminalError)
                         throw new Error(`创意或脚本结构化契约被 Codex 拒绝，已停止自动重试（${terminalError}）`);
+                    const replanOrdinals = scriptCreativeReplanOrdinals(results);
+                    if (replanOrdinals.length) {
+                        recordCreativeReplanAttempts(creativeReplanAttempts, replanOrdinals);
+                        record.message = `中心发现创意骨架重复，正在为 ordinal ${replanOrdinals.join(", ")} 重新选题；已完成脚本保持不变`;
+                        record.updatedAt = now();
+                        this.save();
+                        const replanResults = await Promise.all(replanOrdinals.map((ordinal) => this.runCandidateChunk(id, task, [ordinal], workspace.workspacePath)));
+                        const replanTerminalError = terminalScriptChunkError(replanResults);
+                        if (replanTerminalError)
+                            throw new Error(`创意重新选题被 Codex 拒绝，已停止自动重试（${replanTerminalError}）`);
+                        const replanError = replanResults.find((result) => result.error)?.error;
+                        if (replanError)
+                            throw new Error(`创意重新选题失败（${replanError}），请点击重试`);
+                        chunkSizeIndex = 0;
+                        continue;
+                    }
                     if (record.receivedOrdinals.length > receivedBefore)
                         chunkSizeIndex = 0;
                     if (selectedCandidateOrdinals(task).length > selectedBefore.length) {
@@ -306,6 +323,22 @@ export class WorkflowManager {
                 if (terminalError) {
                     throw new Error(`本机脚本结构化契约被 Codex 拒绝，已停止自动重试且未提交缺失脚本。请先升级或修复 Canvas Agent，再手动重试（${terminalError}）`);
                 }
+                const replanOrdinals = scriptCreativeReplanOrdinals(results);
+                if (replanOrdinals.length) {
+                    recordCreativeReplanAttempts(creativeReplanAttempts, replanOrdinals);
+                    record.message = `中心发现创意骨架重复，正在为 ordinal ${replanOrdinals.join(", ")} 重新选题；已完成脚本保持不变`;
+                    record.updatedAt = now();
+                    this.save();
+                    const replanResults = await Promise.all(replanOrdinals.map((ordinal) => this.runCandidateChunk(id, task, [ordinal], workspace.workspacePath)));
+                    const replanTerminalError = terminalScriptChunkError(replanResults);
+                    if (replanTerminalError)
+                        throw new Error(`创意重新选题被 Codex 拒绝，已停止自动重试（${replanTerminalError}）`);
+                    const replanError = replanResults.find((result) => result.error)?.error;
+                    if (replanError)
+                        throw new Error(`创意重新选题失败（${replanError}），请点击重试`);
+                    chunkSizeIndex = 0;
+                    continue;
+                }
                 const progressed = record.receivedOrdinals.length > before;
                 if (progressed) {
                     chunkSizeIndex = 0;
@@ -396,7 +429,11 @@ export class WorkflowManager {
             return { terminal: false };
         }
         catch (error) {
-            return { error: error instanceof Error ? `结构化脚本未通过本机校验：${error.message}` : "结构化脚本未通过本机校验", terminal: false };
+            return {
+                error: error instanceof Error ? `结构化脚本未通过本机校验：${error.message}` : "结构化脚本未通过本机校验",
+                terminal: false,
+                replanOrdinals: creativeReplanOrdinals(error),
+            };
         }
     }
     /** 只记录阶段、ordinal 和毫秒数；禁止记录 prompt、令牌或中心能力。 */
@@ -572,6 +609,23 @@ export function compareScriptQueueRecords(left, right) {
 export function terminalScriptChunkError(results) {
     return results.find((result) => result.terminal)?.error || "";
 }
+export function scriptCreativeReplanOrdinals(results) {
+    return [...new Set(results.flatMap((result) => (result && typeof result === "object" ? result.replanOrdinals || [] : [])).filter((ordinal) => Number.isInteger(ordinal) && ordinal > 0))].sort((left, right) => left - right);
+}
+export function creativeReplanOrdinals(error) {
+    if (!error || typeof error !== "object" || error.code !== "FLOW_C_CREATIVE_REPLAN_REQUIRED")
+        return [];
+    const values = error.resetOrdinals;
+    return Array.isArray(values) ? [...new Set(values.map(Number).filter((ordinal) => Number.isInteger(ordinal) && ordinal > 0))].sort((left, right) => left - right) : [];
+}
+export function recordCreativeReplanAttempts(attempts, ordinals, limit = 3) {
+    for (const ordinal of ordinals) {
+        const next = Number(attempts.get(ordinal) || 0) + 1;
+        attempts.set(ordinal, next);
+        if (next > limit)
+            throw new Error(`ordinal ${ordinal} 已重新选题 ${limit} 次仍与已完成脚本重复，已停止避免无效循环`);
+    }
+}
 class ExpiredCapabilityError extends Error {
 }
 export function scriptChunkPrompt(id, task, ordinals) {
@@ -765,8 +819,13 @@ async function commerceJson(url, token, tokenHeader, init = {}) {
         headers.set("content-type", "application/json");
     const response = await fetch(url, { ...init, headers, signal: AbortSignal.timeout(120_000) });
     const body = await response.json().catch(() => ({}));
-    if (!response.ok)
-        throw new Error(body.error || `中心接口返回 ${response.status}`);
+    if (!response.ok) {
+        const error = new Error(body.error || `中心接口返回 ${response.status}`);
+        error.status = response.status;
+        error.code = body.code;
+        error.resetOrdinals = body.resetOrdinals;
+        throw error;
+    }
     return body;
 }
 function loadState() {

package/package.json

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