@xiaohhhh1/canvas-agent 0.4.53 → 0.4.55

package/dist/workflow/creative-candidates.d.ts

@@ -1,5 +1,5 @@
 type JsonSchema = Record<string, unknown>;
-export declare const FLOW_C_CREATIVE_CANDIDATE_CONTRACT_VERSION = "flow-c-creative-candidates-v1";
+export declare const FLOW_C_CREATIVE_CANDIDATE_CONTRACT_VERSION = "flow-c-creative-candidates-v2";
 export declare function flowCCreativeCandidateOutputSchema(count: number): JsonSchema;
 export declare function parseFlowCCreativeCandidateOutput(value: string, expectedOrdinals: number[]): Record<string, unknown>[];
 export {};

package/dist/workflow/creative-candidates.js

@@ -1,5 +1,5 @@
 import { assertStrictResponseSchema } from './script-output.js';
-export const FLOW_C_CREATIVE_CANDIDATE_CONTRACT_VERSION = 'flow-c-creative-candidates-v1';
+export const FLOW_C_CREATIVE_CANDIDATE_CONTRACT_VERSION = 'flow-c-creative-candidates-v2';
 const text = { type: 'string', minLength: 1 };
 function object(properties) {
     return { type: 'object', properties, required: Object.keys(properties), additionalProperties: false };
@@ -17,6 +17,13 @@ function candidateSchema() {
         truthBoundary: text,
         riskFlags: { type: 'array', minItems: 0, maxItems: 8, items: text },
         firstFrame: text,
+        firstFrameFocus: text,
+        visualContrast: text,
+        sensoryTexture: text,
+        motionPeak: text,
+        compositionLighting: text,
+        localNativeDetail: text,
+        antiFlatness: text,
         creativeFingerprint: object({
             characterRelation: text,
             scene: text,

package/dist/workflow/manager.d.ts

@@ -20,20 +20,19 @@ type ScriptRecord = {
     updatedAt: string;
 };
 type ReferenceStyleCard = {
+    id?: unknown;
     visualPremisePattern?: unknown;
     mutationAxes?: unknown;
     culturePattern?: unknown;
     spectaclePattern?: unknown;
     productIntegrationPattern?: unknown;
-    openingComposition?: unknown;
-    visualDensity?: unknown;
-    conflictContrast?: unknown;
-    characterProductEntrance?: unknown;
-    rhythm?: unknown;
-    turn?: unknown;
-    proofMethod?: unknown;
+    openingPattern?: unknown;
+    proofPattern?: unknown;
+    rhythmPattern?: unknown;
+    capturePattern?: unknown;
     voiceTone?: unknown;
-    categoryFit?: unknown;
+    sourceEvidenceTier?: unknown;
+    truthBoundaries?: unknown;
     applicability?: {
         markets?: unknown;
         categories?: unknown;
@@ -60,6 +59,13 @@ type SelectedCandidate = {
     truthBoundary: string;
     riskFlags: string[];
     firstFrame: string;
+    firstFrameFocus: string;
+    visualContrast: string;
+    sensoryTexture: string;
+    motionPeak: string;
+    compositionLighting: string;
+    localNativeDetail: string;
+    antiFlatness: string;
     creativeFingerprint: Record<string, string>;
     fingerprintKey?: string;
     selectionScore?: number;
@@ -264,7 +270,6 @@ export declare class WorkflowManager {
     private pumpScriptQueue;
     private finishDownloadDirectorySelection;
     private runScript;
-    private ensureCreativeCandidateSelections;
     private runCandidateChunk;
     /** 一个 chunk 使用独立线程；解析与中心持久化失败不会影响并行 lane。 */
     private runScriptChunk;
@@ -290,5 +295,17 @@ export declare function terminalScriptChunkError(results: Array<{
 }>): string;
 export declare function scriptChunkPrompt(id: string, task: ScriptTask, ordinals: number[]): string;
 export declare function creativeCandidatePrompt(id: string, task: ScriptTask, ordinals: number[]): string;
+/**
+ * 已选创意永远优先进入脚本扩写；只有当前没有可写脚本时才生成下一小波候选。
+ * 每次最多占用受控 worker 数量的子批，避免把整批候选提前塞满 worker 队列。
+ */
+export declare function nextScriptPipelineWave(task: Pick<ScriptTask, "requested_count" | "selected_candidates">, receivedOrdinals: number[], durationSeconds: 10 | 20 | 30, scriptChunkSize: number, candidateChunkSize?: number, concurrency?: number): {
+    stage: "script";
+    chunks: number[][];
+} | {
+    stage: "candidate";
+    chunks: number[][];
+};
+export declare function immediateScriptOrdinals(task: Pick<ScriptTask, "selected_candidates">, receivedOrdinals: number[], candidateOrdinals: number[]): number[];
 export declare function missingOrdinals(total: number, received: number[]): number[];
 export {};

package/dist/workflow/manager.js

@@ -244,7 +244,6 @@ export class WorkflowManager {
             if (Date.parse(task.expires_at) <= Date.now())
                 throw new ExpiredCapabilityError("脚本交接已过期，请在网页重新点击交给本机 Codex");
             const workspace = ensureSiteWorkspace(this.config);
-            task = await this.ensureCreativeCandidateSelections(id, task, workspace.workspacePath);
             const durationSeconds = Number(task.duration_seconds || 10);
             const chunkSizes = flowCScriptChunkSizes(durationSeconds);
             // Fail locally before starting any worker if a future schema edit
@@ -253,17 +252,55 @@ export class WorkflowManager {
                 flowCScriptOutputSchema(durationSeconds, chunkSize);
             record.activeChunks = 0;
             let chunkSizeIndex = 0;
+            let candidateChunkSize = 2;
             while (record.receivedOrdinals.length < task.requested_count) {
+                task = await this.scriptTask(id);
+                const selectedBefore = selectedCandidateOrdinals(task);
+                const wave = nextScriptPipelineWave(task, record.receivedOrdinals, durationSeconds, chunkSizes[chunkSizeIndex], candidateChunkSize);
+                if (wave.stage === "candidate") {
+                    const receivedBefore = record.receivedOrdinals.length;
+                    record.message = `本机 Codex 正在选择下一小批创意（${selectedBefore.length}/${task.requested_count}）；选好后立即写对应脚本`;
+                    record.activeChunks = 0;
+                    record.updatedAt = now();
+                    this.save();
+                    const pipelineResults = await Promise.all(wave.chunks.map(async (ordinals) => {
+                        const candidateResult = await this.runCandidateChunk(id, task, ordinals, workspace.workspacePath);
+                        if (candidateResult.error)
+                            return [candidateResult];
+                        const selectedTask = await this.scriptTask(id);
+                        const scriptOrdinals = immediateScriptOrdinals(selectedTask, this.scriptRecord(id).receivedOrdinals, ordinals);
+                        if (!scriptOrdinals.length)
+                            return [candidateResult];
+                        this.scriptRecord(id).attempts += 1;
+                        const scriptResult = await this.runScriptChunk(id, selectedTask, scriptOrdinals, workspace.workspacePath);
+                        return [candidateResult, scriptResult];
+                    }));
+                    const results = pipelineResults.flat();
+                    task = await this.scriptTask(id);
+                    const terminalError = terminalScriptChunkError(results);
+                    if (terminalError)
+                        throw new Error(`创意或脚本结构化契约被 Codex 拒绝，已停止自动重试（${terminalError}）`);
+                    if (record.receivedOrdinals.length > receivedBefore)
+                        chunkSizeIndex = 0;
+                    if (selectedCandidateOrdinals(task).length > selectedBefore.length) {
+                        candidateChunkSize = 2;
+                        continue;
+                    }
+                    if (candidateChunkSize > 1) {
+                        candidateChunkSize = 1;
+                        continue;
+                    }
+                    const lastError = results.map((result) => result.error).filter(Boolean).at(-1) || "候选生成或中心选题未返回结果";
+                    throw new Error(`创意候选阶段已隔离到单条仍失败（${lastError}），请点击重试`);
+                }
                 const before = record.receivedOrdinals.length;
-                const missing = missingOrdinals(task.requested_count, record.receivedOrdinals);
                 const chunkSize = chunkSizes[chunkSizeIndex];
-                const chunks = flowCScriptChunks(durationSeconds, missing, chunkSize);
                 record.chunkSize = chunkSize;
-                record.attempts += chunks.length;
-                record.message = `本机 Codex 正在用 ${FLOW_C_CODEX_WORKER_CONCURRENCY} 个受控 worker 写 ${chunks.length} 个独立子批（${before}/${task.requested_count}）`;
+                record.attempts += wave.chunks.length;
+                record.message = `创意已选 ${selectedBefore.length}/${task.requested_count}；正在立即写 ${wave.chunks.length} 个对应脚本子批（已回传 ${before}/${task.requested_count}）`;
                 record.updatedAt = now();
                 this.save();
-                const results = await Promise.all(chunks.map((ordinals) => this.runScriptChunk(id, task, ordinals, workspace.workspacePath)));
+                const results = await Promise.all(wave.chunks.map((ordinals) => this.runScriptChunk(id, task, ordinals, workspace.workspacePath)));
                 task = await this.scriptTask(id);
                 const terminalError = terminalScriptChunkError(results);
                 if (terminalError) {
@@ -304,36 +341,6 @@ export class WorkflowManager {
             this.runningScripts.delete(id);
         }
     }
-    async ensureCreativeCandidateSelections(id, initialTask, cwd) {
-        let task = initialTask;
-        let chunkSize = 2;
-        while (selectedCandidateOrdinals(task).length < task.requested_count) {
-            const before = selectedCandidateOrdinals(task).length;
-            const missing = missingOrdinals(task.requested_count, selectedCandidateOrdinals(task));
-            const chunks = chunkNumbers(missing, chunkSize);
-            const record = this.scriptRecord(id);
-            record.message = `本机 Codex 正在生成可审核创意候选，中心将自动选题（${before}/${task.requested_count}）`;
-            record.activeChunks = 0;
-            record.updatedAt = now();
-            this.save();
-            const results = await Promise.all(chunks.map((ordinals) => this.runCandidateChunk(id, task, ordinals, cwd)));
-            task = await this.scriptTask(id);
-            const terminalError = terminalScriptChunkError(results);
-            if (terminalError)
-                throw new Error(`创意候选结构化契约被 Codex 拒绝，已停止自动重试（${terminalError}）`);
-            if (selectedCandidateOrdinals(task).length > before) {
-                chunkSize = 2;
-                continue;
-            }
-            if (chunkSize > 1) {
-                chunkSize = 1;
-                continue;
-            }
-            const lastError = results.map((result) => result.error).filter(Boolean).at(-1) || "候选生成或中心选题未返回结果";
-            throw new Error(`创意候选阶段已隔离到单条仍失败（${lastError}），请点击重试`);
-        }
-        return task;
-    }
     async runCandidateChunk(id, task, ordinals, cwd) {
         const result = await runCodexWorkflowTurn(creativeCandidatePrompt(id, task, ordinals), this.emit, {
             cwd,
@@ -583,7 +590,7 @@ export function scriptChunkPrompt(id, task, ordinals) {
 ${compactJson([...selected.values()], 16_000)}
 ${durationRules}
 写作要求：
-1. visualHook、conflict、escalation/turn、productIntervention、visibleProof、callbackMotivation 与所有 shots 必须执行选中卡的 visualPremise、firstFrame、spectacleEscalation、productProofAction 和 truthBoundary；不得扩大功效或换成普通模板。
+1. visualHook、conflict、escalation/turn、productIntervention、visibleProof、callbackMotivation 与所有 shots 必须执行选中卡的 visualPremise、firstFrame、spectacleEscalation、productProofAction、truthBoundary 以及七项视觉执行字段；不得扩大功效、稀释构图或换成普通模板。
 2. 每条生成一份稳定 voiceProfile；每段只写简短 voiceCue。口播必须是目标市场 ${task.market} 的自然原生语言、偏快但清晰；导演说明统一用简洁制作英文。
 3. 每段永远是独立 0–10 秒，含 1–8 个按剧情需要决定的 shots、准确 voiceover、onScreenText、evidence、soundBgm、emotionalNote 与 endingState；模型不要输出 continuity 或 continuityMode。
 4. shot.visual 要直接写出主体位置、景别、光线、材质、动作峰值和当地自然环境，并保留真实皮肤、细发、布料/商品微纹理和实景混合光；禁止塑料蜡感、静态举产品、品牌广告片、电视购物或伪造工厂/销量/来源。
@@ -601,13 +608,14 @@ Optional learned style abstractions: ${compactJson(styleCards, 5_000)}
 Already accepted fingerprint ledger: ${compactJson(ledger, 8_000)}
 For each ordinal return exactly 6 short, auditable candidate cards. These are visible structured alternatives, not hidden reasoning. Vary the overall creative skeleton through open dimensions such as relationship/identity, scene mismatch, scale/quantity, group reaction, viewpoint, sensory texture and proof action; do not rotate a fixed template list.
 Every card must be surprising but physically filmable and product-relevant. productProofAction and truthBoundary must follow supplied facts. For food, baby, medical/efficacy and personal-hygiene products, reject unhygienic display, fear marketing, dangerous use and unsupported promises.
+Every card must also contain a concrete visual execution card, not mood adjectives: firstFrameFocus names one dominant subject and its approximate 35%-85% frame share; visualContrast defines one readable scale/color/light/relationship contrast; sensoryTexture names truthful category-specific material evidence; motionPeak names the single peak physical instant; compositionLighting specifies foreground/midground/background, practical light direction and one plausible exposure/optical imperfection; localNativeDetail names observable local behavior/environment/aesthetic density with the same evidence discipline as culturalAnchors; antiFlatness names the exact generic catalogue treatment this concept must avoid. The firstFrame must pass a screenshot test: even without dialogue, a still image must show the unusual relationship, product relevance and depth hierarchy.
 Cultural anchors are optional (0–3). source must be learned-style-card, product-market-evidence, or conservative-everyday-detail. A learned-style-card anchor must cite the supplied card id in evidence. A product-market-evidence anchor must cite a concrete supplied product/market fact; if none exists, use conservative-everyday-detail and explicitly say it is ordinary context, not a custom claim. Never use flags, national costumes, royalty/public figures, religion, stereotypes or cultural mockery as shortcut hooks. Locality belongs in consumption context, natural interaction, language rhythm and aesthetic density.
 creativeFingerprint must use five concise semantic labels: characterRelation, scene, firstFrameComposition, spectacleMechanism and proofMethod. Do not hide duplicate ideas behind paraphrases. Do not copy people, clothing, sets, dialogue or shot sequences from references. Return only the candidate schema; do not write scripts or call tools.`;
 }
 function compactReferenceStyleCard(value) {
     if (!value || typeof value !== "object")
         return "";
-    const fields = ["visualPremisePattern", "mutationAxes", "culturePattern", "spectaclePattern", "productIntegrationPattern", "openingComposition", "visualDensity", "conflictContrast", "characterProductEntrance", "rhythm", "turn", "proofMethod", "voiceTone", "categoryFit"];
+    const fields = ["id", "visualPremisePattern", "mutationAxes", "culturePattern", "spectaclePattern", "productIntegrationPattern", "openingPattern", "proofPattern", "rhythmPattern", "capturePattern", "voiceTone", "sourceEvidenceTier"];
     const compact = Object.fromEntries(fields.flatMap((field) => {
         const text = String(value[field] || "").trim().replace(/\s+/g, " ").slice(0, 400);
         return text ? [[field, text]] : [];
@@ -616,7 +624,7 @@ function compactReferenceStyleCard(value) {
     const markets = Array.isArray(value.applicability?.markets) ? value.applicability.markets.map((item) => String(item || "").trim()).filter(Boolean).slice(0, 8) : [];
     if (categories.length || markets.length)
         Object.assign(compact, { applicability: { categories, markets } });
-    return Object.keys(compact).length ? JSON.stringify(compact) : "";
+    return Object.keys(compact).length ? compact : null;
 }
 function relevantStyleCards(cards, products) {
     const categories = new Set(products.map((product) => String(product.category || "").trim().toLowerCase()).filter(Boolean));
@@ -654,11 +662,19 @@ function selectedCandidatePlan(value) {
         truthBoundary: value.truthBoundary,
         riskFlags: value.riskFlags,
         firstFrame: value.firstFrame,
+        firstFrameFocus: value.firstFrameFocus,
+        visualContrast: value.visualContrast,
+        sensoryTexture: value.sensoryTexture,
+        motionPeak: value.motionPeak,
+        compositionLighting: value.compositionLighting,
+        localNativeDetail: value.localNativeDetail,
+        antiFlatness: value.antiFlatness,
         creativeFingerprint: value.creativeFingerprint,
         fingerprintKey: value.fingerprintKey,
         selectionScore: value.selectionScore,
         selectionBreakdown: value.selectionBreakdown,
         selectionMode: value.selectionMode,
+        visualExecutionVersion: "flow-c-visual-execution-v1",
     };
 }
 function chunkNumbers(values, size) {
@@ -667,6 +683,25 @@ function chunkNumbers(values, size) {
         chunks.push(values.slice(index, index + size));
     return chunks;
 }
+/**
+ * 已选创意永远优先进入脚本扩写；只有当前没有可写脚本时才生成下一小波候选。
+ * 每次最多占用受控 worker 数量的子批，避免把整批候选提前塞满 worker 队列。
+ */
+export function nextScriptPipelineWave(task, receivedOrdinals, durationSeconds, scriptChunkSize, candidateChunkSize = 2, concurrency = FLOW_C_CODEX_WORKER_CONCURRENCY) {
+    const selected = selectedCandidateOrdinals(task);
+    const selectedSet = new Set(selected);
+    const scriptReady = missingOrdinals(task.requested_count, receivedOrdinals).filter((ordinal) => selectedSet.has(ordinal));
+    if (scriptReady.length) {
+        return { stage: "script", chunks: flowCScriptChunks(durationSeconds, scriptReady, scriptChunkSize).slice(0, concurrency) };
+    }
+    const candidateMissing = missingOrdinals(task.requested_count, selected);
+    return { stage: "candidate", chunks: chunkNumbers(candidateMissing, candidateChunkSize).slice(0, concurrency) };
+}
+export function immediateScriptOrdinals(task, receivedOrdinals, candidateOrdinals) {
+    const selected = new Set(selectedCandidateOrdinals(task));
+    const received = new Set(receivedOrdinals);
+    return candidateOrdinals.filter((ordinal) => selected.has(ordinal) && !received.has(ordinal));
+}
 function compactJson(value, limit) {
     return JSON.stringify(value).slice(0, limit);
 }

package/package.json

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