@lingjingai/scriptctl 0.57.0 → 0.58.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/changes/0.57.1.md +13 -0
- package/changes/0.58.0.md +14 -0
- package/dist/cli/register-workflows.js +17 -0
- package/dist/cli/register-workflows.js.map +1 -1
- package/dist/domain/creative-draft/compose.d.ts +18 -0
- package/dist/domain/creative-draft/compose.js +403 -0
- package/dist/domain/creative-draft/compose.js.map +1 -0
- package/dist/domain/ingest/video-apply.js +15 -1
- package/dist/domain/ingest/video-apply.js.map +1 -1
- package/dist/domain/ingest/video-serial-md.js +14 -1
- package/dist/domain/ingest/video-serial-md.js.map +1 -1
- package/dist/domain/ingest/video-source-evolution.d.ts +4 -0
- package/dist/domain/ingest/video-source-evolution.js +0 -3
- package/dist/domain/ingest/video-source-evolution.js.map +1 -1
- package/dist/domain/ingest/video-state-evidence.d.ts +66 -0
- package/dist/domain/ingest/video-state-evidence.js +385 -0
- package/dist/domain/ingest/video-state-evidence.js.map +1 -0
- package/dist/infra/ingest/video-discovery.js +10 -4
- package/dist/infra/ingest/video-discovery.js.map +1 -1
- package/dist/infra/ingest/video-source-snapshot.d.ts +1 -1
- package/dist/infra/ingest/video-source-snapshot.js +26 -3
- package/dist/infra/ingest/video-source-snapshot.js.map +1 -1
- package/dist/infra/ingest/video-state-evidence.d.ts +14 -0
- package/dist/infra/ingest/video-state-evidence.js +140 -0
- package/dist/infra/ingest/video-state-evidence.js.map +1 -0
- package/dist/llm/config.js +1 -1
- package/dist/llm/router.js +4 -6
- package/dist/llm/router.js.map +1 -1
- package/dist/llm/tasks/ingest/video-serial.js +20 -1
- package/dist/llm/tasks/ingest/video-serial.js.map +1 -1
- package/dist/llm/tasks/schemas.js +3 -0
- package/dist/llm/tasks/schemas.js.map +1 -1
- package/dist/usecases/ingest/generate-video-state-evidence.d.ts +23 -0
- package/dist/usecases/ingest/generate-video-state-evidence.js +124 -0
- package/dist/usecases/ingest/generate-video-state-evidence.js.map +1 -0
- package/dist/usecases/ingest/video-pipeline.d.ts +6 -1
- package/dist/usecases/ingest/video-pipeline.js +49 -10
- package/dist/usecases/ingest/video-pipeline.js.map +1 -1
- package/dist/usecases/script/compose-creative-draft.d.ts +3 -0
- package/dist/usecases/script/compose-creative-draft.js +106 -0
- package/dist/usecases/script/compose-creative-draft.js.map +1 -0
- package/package.json +1 -1
- package/skills/scriptctl/SKILL.md +30 -9
- package/skills/scriptctl/references/ingest-workflow.md +4 -2
|
@@ -0,0 +1,13 @@
|
|
|
1
|
+
# 0.57.1
|
|
2
|
+
|
|
3
|
+
## Added
|
|
4
|
+
- None.
|
|
5
|
+
|
|
6
|
+
## Changed
|
|
7
|
+
- None.
|
|
8
|
+
|
|
9
|
+
## Fixed
|
|
10
|
+
- `scriptctl ingest` video finalize no longer fails with `duplicate prop ref` when a scene lists the same prop more than once (or aliases collapse to one prop).
|
|
11
|
+
|
|
12
|
+
## Breaking
|
|
13
|
+
- None.
|
|
@@ -0,0 +1,14 @@
|
|
|
1
|
+
# 0.58.0
|
|
2
|
+
|
|
3
|
+
## Added
|
|
4
|
+
- Add `scriptctl compose` for ID-free readable scene drafts. It deterministically resolves or creates assets and variants, allocates IDs and timestamps, merges adjacent scenes with the same canonical location/space/time, and preserves plan/digest/apply transaction safety.
|
|
5
|
+
|
|
6
|
+
## Changed
|
|
7
|
+
- The bundled Skill now directs Agent/LLM screenplay generation through readable creative drafts while retaining `.scriptctl` authoring for deterministic programs, advanced batch transactions, migration, and legacy compatibility.
|
|
8
|
+
- Video ingest now uses the stable `gemini-3.7-flash` model for both its built-in route and Gemini fallback.
|
|
9
|
+
|
|
10
|
+
## Fixed
|
|
11
|
+
- Duplicate readable actor or prop references are coalesced before Script v4 validation, and dialogue with repeated speaker prefixes or quotation wrappers is rejected before it reaches the formal script.
|
|
12
|
+
|
|
13
|
+
## Breaking
|
|
14
|
+
- None.
|
|
@@ -1,11 +1,13 @@
|
|
|
1
1
|
import { commandIngest } from "../usecases/ingest/command.js";
|
|
2
2
|
import { commandIngestStatus } from "../usecases/ingest/status.js";
|
|
3
3
|
import { commandSkipVideoEpisode } from "../usecases/ingest/skip-video-episode.js";
|
|
4
|
+
import { commandGenerateVideoStateEvidence } from "../usecases/ingest/generate-video-state-evidence.js";
|
|
4
5
|
import { commandView } from "../usecases/ingest/view-command.js";
|
|
5
6
|
import { commandExportAuthoring } from "../usecases/script/export-authoring.js";
|
|
6
7
|
import { commandMigrate } from "../usecases/script/migrate.js";
|
|
7
8
|
import { commandCheckout, commandWorkingCopyPublish, commandWorkingCopyStatus, } from "../usecases/script/working-copy.js";
|
|
8
9
|
import { commandWriteAuthoring } from "../usecases/script/write-authoring.js";
|
|
10
|
+
import { commandComposeCreativeDraft } from "../usecases/script/compose-creative-draft.js";
|
|
9
11
|
import { describeArguments, dispatch, withScriptOpts, withWorkingCopyOpts, } from "./registry.js";
|
|
10
12
|
export function registerWorkflowCommands(program, state, llm) {
|
|
11
13
|
program.command("migrate")
|
|
@@ -44,6 +46,14 @@ export function registerWorkflowCommands(program, state, llm) {
|
|
|
44
46
|
.requiredOption("--reason <text>", "Why this episode is being skipped")
|
|
45
47
|
.addHelpText("after", "\nExample:\n scriptctl ingest skip -w ./workspace --episode 7 --reason \"provider policy block\"\n")
|
|
46
48
|
.action(dispatch(commandSkipVideoEpisode, state));
|
|
49
|
+
program.command("evidence")
|
|
50
|
+
.description("Generate local original-video reference frames from final Script v4 timestamps")
|
|
51
|
+
.option("-p, --script-path <path>", "Final Script v4 JSON file")
|
|
52
|
+
.requiredOption("-s, --source-path <path>", "Linked source-video file or episode directory")
|
|
53
|
+
.requiredOption("-w, --workspace-path <path>", "Project workspace directory")
|
|
54
|
+
.option("--force", "Re-extract frames even when deterministic output files already exist")
|
|
55
|
+
.addHelpText("after", "\nExample:\n scriptctl evidence -p ./script.json -s /Volumes/NAS/videos -w ./workspace --force\n")
|
|
56
|
+
.action(dispatch(commandGenerateVideoStateEvidence, state));
|
|
47
57
|
program.command("view")
|
|
48
58
|
.description("Render or serve the workspace review page")
|
|
49
59
|
.option("-w, --workspace-path <path>", "Workspace directory", "workspace")
|
|
@@ -69,6 +79,13 @@ export function registerWorkflowCommands(program, state, llm) {
|
|
|
69
79
|
.addHelpText("after", "\nExample:\n scriptctl write scene.scriptctl --replace\n scriptctl write scene.scriptctl --replace --apply --plan <digest>\n")
|
|
70
80
|
.action(dispatch(commandWriteAuthoring, state));
|
|
71
81
|
describeArguments(write, ["Authoring source file"]);
|
|
82
|
+
const compose = withScriptOpts(program.command("compose <file>"))
|
|
83
|
+
.description("Plan or apply a readable screenplay scene draft without Script IDs")
|
|
84
|
+
.option("--apply", "Apply the exact plan")
|
|
85
|
+
.option("--plan <digest>", "Exact plan digest to apply")
|
|
86
|
+
.addHelpText("after", "\nExample:\n scriptctl compose scene.json -p script.json\n scriptctl compose scene.json -p script.json --apply --plan <digest>\n")
|
|
87
|
+
.action(dispatch(commandComposeCreativeDraft, state));
|
|
88
|
+
describeArguments(compose, ["Readable creative draft JSON file"]);
|
|
72
89
|
const exportCommand = program.command("export")
|
|
73
90
|
.description("Export script content as an authoring document")
|
|
74
91
|
.action(() => exportCommand.outputHelp());
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"register-workflows.js","sourceRoot":"","sources":["../../src/cli/register-workflows.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"register-workflows.js","sourceRoot":"","sources":["../../src/cli/register-workflows.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,18 @@
|
|
|
1
|
+
import type { ScriptV4 } from "../script/v4/types.js";
|
|
2
|
+
import { validateScriptV4 } from "../script/v4/validation.js";
|
|
3
|
+
export interface CreativeDraftComposeResult {
|
|
4
|
+
script: ScriptV4;
|
|
5
|
+
validation: ReturnType<typeof validateScriptV4>;
|
|
6
|
+
episodeNumber: number;
|
|
7
|
+
sceneNumber: number;
|
|
8
|
+
sceneId: string;
|
|
9
|
+
actionIds: string[];
|
|
10
|
+
joinedPreviousScene: boolean;
|
|
11
|
+
created: {
|
|
12
|
+
actors: string[];
|
|
13
|
+
locations: string[];
|
|
14
|
+
props: string[];
|
|
15
|
+
states: string[];
|
|
16
|
+
};
|
|
17
|
+
}
|
|
18
|
+
export declare function composeCreativeDraft(current: ScriptV4, rawDraft: unknown): CreativeDraftComposeResult;
|
|
@@ -0,0 +1,403 @@
|
|
|
1
|
+
import * as crypto from "node:crypto";
|
|
2
|
+
import { CliError, EXIT_INPUT } from "../../common.js";
|
|
3
|
+
import { canonicalNameKey } from "../script/names.js";
|
|
4
|
+
import { V4_ID_ALPHABET, V4_ID_PREFIXES } from "../script/v4/ids.js";
|
|
5
|
+
import { validateScriptV4 } from "../script/v4/validation.js";
|
|
6
|
+
function invalid(message, actual = []) {
|
|
7
|
+
throw new CliError(message, {
|
|
8
|
+
exitCode: EXIT_INPUT,
|
|
9
|
+
errorCode: "CREATIVE_DRAFT_INVALID",
|
|
10
|
+
hint: "Use the readable creative draft schema; do not include Script IDs or .scriptctl syntax.",
|
|
11
|
+
data: { actual: actual.map(String) },
|
|
12
|
+
});
|
|
13
|
+
}
|
|
14
|
+
function isRecord(value) {
|
|
15
|
+
return value !== null && typeof value === "object" && !Array.isArray(value);
|
|
16
|
+
}
|
|
17
|
+
function clean(value, fallback = "") {
|
|
18
|
+
return String(value ?? "").replace(/\s+/gu, " ").trim() || fallback;
|
|
19
|
+
}
|
|
20
|
+
function positiveInteger(value, label) {
|
|
21
|
+
const parsed = Number(value);
|
|
22
|
+
if (!Number.isSafeInteger(parsed) || parsed < 1)
|
|
23
|
+
invalid(`${label} must be a positive integer.`, [value]);
|
|
24
|
+
return parsed;
|
|
25
|
+
}
|
|
26
|
+
function extensionMap(value) {
|
|
27
|
+
if (value === undefined)
|
|
28
|
+
return {};
|
|
29
|
+
if (!isRecord(value))
|
|
30
|
+
invalid("Action extensions must be an object.");
|
|
31
|
+
return structuredClone(value);
|
|
32
|
+
}
|
|
33
|
+
function existingIds(script) {
|
|
34
|
+
const ids = new Set();
|
|
35
|
+
for (const actor of script.actors) {
|
|
36
|
+
ids.add(actor.actor_id);
|
|
37
|
+
for (const state of actor.states)
|
|
38
|
+
ids.add(state.state_id);
|
|
39
|
+
}
|
|
40
|
+
for (const location of script.locations) {
|
|
41
|
+
ids.add(location.location_id);
|
|
42
|
+
for (const state of location.states)
|
|
43
|
+
ids.add(state.state_id);
|
|
44
|
+
}
|
|
45
|
+
for (const prop of script.props) {
|
|
46
|
+
ids.add(prop.prop_id);
|
|
47
|
+
for (const state of prop.states)
|
|
48
|
+
ids.add(state.state_id);
|
|
49
|
+
}
|
|
50
|
+
for (const episode of script.episodes) {
|
|
51
|
+
ids.add(episode.episode_id);
|
|
52
|
+
for (const scene of episode.scenes) {
|
|
53
|
+
ids.add(scene.scene_id);
|
|
54
|
+
for (const action of scene.actions)
|
|
55
|
+
ids.add(action.action_id);
|
|
56
|
+
}
|
|
57
|
+
}
|
|
58
|
+
return ids;
|
|
59
|
+
}
|
|
60
|
+
function stableId(kind, seed, used) {
|
|
61
|
+
for (let nonce = 0; nonce < 128; nonce += 1) {
|
|
62
|
+
const bytes = crypto.createHash("sha256").update(`${kind}:${seed}:${nonce}`).digest();
|
|
63
|
+
let suffix = "";
|
|
64
|
+
for (let index = 0; index < 6; index += 1) {
|
|
65
|
+
suffix += V4_ID_ALPHABET[bytes[index] % V4_ID_ALPHABET.length];
|
|
66
|
+
}
|
|
67
|
+
const candidate = `${V4_ID_PREFIXES[kind]}${suffix}`;
|
|
68
|
+
if (!used.has(candidate)) {
|
|
69
|
+
used.add(candidate);
|
|
70
|
+
return candidate;
|
|
71
|
+
}
|
|
72
|
+
}
|
|
73
|
+
invalid(`Could not allocate a stable ${kind} ID.`);
|
|
74
|
+
}
|
|
75
|
+
function timestampMs(value) {
|
|
76
|
+
const match = clean(value).match(/^(\d+):([0-5]\d)(?:\.(\d{1,3}))?$/u);
|
|
77
|
+
if (!match)
|
|
78
|
+
return null;
|
|
79
|
+
return (Number(match[1]) * 60 + Number(match[2])) * 1_000
|
|
80
|
+
+ Number((match[3] ?? "").padEnd(3, "0"));
|
|
81
|
+
}
|
|
82
|
+
function formatTimestamp(value) {
|
|
83
|
+
return `${Math.floor(value / 60_000)}:${String(Math.floor((value % 60_000) / 1_000)).padStart(2, "0")}.${String(value % 1_000).padStart(3, "0")}`;
|
|
84
|
+
}
|
|
85
|
+
function actionDuration(action) {
|
|
86
|
+
const explicit = Number(action.extend?.["duration_ms"] ?? action.extend?.["rewrite_duration_ms"]);
|
|
87
|
+
return Number.isFinite(explicit) && explicit > 0 ? Math.round(explicit) : 1_200;
|
|
88
|
+
}
|
|
89
|
+
function episodeCursor(episode) {
|
|
90
|
+
let cursor = 0;
|
|
91
|
+
for (const action of episode.scenes.flatMap((scene) => scene.actions)) {
|
|
92
|
+
const explicitStart = timestampMs(action.extend?.["timestamp"]);
|
|
93
|
+
cursor = (explicitStart ?? cursor) + actionDuration(action);
|
|
94
|
+
}
|
|
95
|
+
return cursor;
|
|
96
|
+
}
|
|
97
|
+
function readableVariants(value) {
|
|
98
|
+
if (value === undefined)
|
|
99
|
+
return [];
|
|
100
|
+
if (!Array.isArray(value) || !value.every(isRecord))
|
|
101
|
+
invalid("Asset variants must be an array of readable objects.");
|
|
102
|
+
return value;
|
|
103
|
+
}
|
|
104
|
+
function declaredAssets(draft, kind) {
|
|
105
|
+
const assets = draft["assets"];
|
|
106
|
+
if (assets === undefined)
|
|
107
|
+
return [];
|
|
108
|
+
if (!isRecord(assets))
|
|
109
|
+
invalid("assets must be an object.");
|
|
110
|
+
const values = assets[kind];
|
|
111
|
+
if (values === undefined)
|
|
112
|
+
return [];
|
|
113
|
+
if (!Array.isArray(values) || !values.every(isRecord))
|
|
114
|
+
invalid(`assets.${kind} must be an array.`);
|
|
115
|
+
return values;
|
|
116
|
+
}
|
|
117
|
+
function assetName(kind, value) {
|
|
118
|
+
if (kind === "actors")
|
|
119
|
+
return value.actor_name;
|
|
120
|
+
if (kind === "locations")
|
|
121
|
+
return value.location_name;
|
|
122
|
+
return value.prop_name;
|
|
123
|
+
}
|
|
124
|
+
function assetId(kind, value) {
|
|
125
|
+
if (kind === "actors")
|
|
126
|
+
return value.actor_id;
|
|
127
|
+
if (kind === "locations")
|
|
128
|
+
return value.location_id;
|
|
129
|
+
return value.prop_id;
|
|
130
|
+
}
|
|
131
|
+
function assetList(script, kind) {
|
|
132
|
+
return script[kind];
|
|
133
|
+
}
|
|
134
|
+
function nameForms(kind, value) {
|
|
135
|
+
return [assetName(kind, value), ...(value.aliases ?? [])].map(canonicalNameKey);
|
|
136
|
+
}
|
|
137
|
+
function resolveDeclaration(draft, kind, name) {
|
|
138
|
+
const key = canonicalNameKey(name);
|
|
139
|
+
return declaredAssets(draft, kind).find((entry) => ([entry["name"], ...(Array.isArray(entry["aliases"]) ? entry["aliases"] : [])]
|
|
140
|
+
.map((value) => canonicalNameKey(clean(value)))
|
|
141
|
+
.includes(key))) ?? null;
|
|
142
|
+
}
|
|
143
|
+
function createAsset(script, draft, kind, name, used, created) {
|
|
144
|
+
const declaration = resolveDeclaration(draft, kind, name);
|
|
145
|
+
if (!declaration)
|
|
146
|
+
invalid(`${name} is not an existing ${kind} asset and has no readable declaration.`);
|
|
147
|
+
const canonicalName = clean(declaration["name"], name);
|
|
148
|
+
const variants = readableVariants(declaration["variants"]);
|
|
149
|
+
const states = [{
|
|
150
|
+
state_id: "default",
|
|
151
|
+
state_name: clean(variants.find((item) => canonicalNameKey(clean(item["name"])) === "default")?.["name"], "默认"),
|
|
152
|
+
description: clean(variants.find((item) => canonicalNameKey(clean(item["name"])) === "default")?.["description"], clean(declaration["description"], `${canonicalName}的基础参考外观。`)),
|
|
153
|
+
}];
|
|
154
|
+
for (const variant of variants) {
|
|
155
|
+
const variantName = clean(variant["name"]);
|
|
156
|
+
if (!variantName || ["default", "默认"].includes(canonicalNameKey(variantName)))
|
|
157
|
+
continue;
|
|
158
|
+
const stateId = stableId("state", `${kind}:${canonicalName}:${variantName}`, used);
|
|
159
|
+
states.push({
|
|
160
|
+
state_id: stateId,
|
|
161
|
+
state_name: variantName,
|
|
162
|
+
description: clean(variant["description"], `${canonicalName}的${variantName}造型。`),
|
|
163
|
+
});
|
|
164
|
+
created.states.push(`${canonicalName}/${variantName}`);
|
|
165
|
+
}
|
|
166
|
+
const common = {
|
|
167
|
+
aliases: Array.isArray(declaration["aliases"])
|
|
168
|
+
? [...new Set(declaration["aliases"].map((alias) => clean(alias)).filter((alias) => alias && alias !== canonicalName))]
|
|
169
|
+
: [],
|
|
170
|
+
importance: declaration["importance"] === "background" ? "background" : "featured",
|
|
171
|
+
description: clean(declaration["description"], `${canonicalName}的基础设定。`),
|
|
172
|
+
states,
|
|
173
|
+
};
|
|
174
|
+
if (kind === "actors") {
|
|
175
|
+
const value = {
|
|
176
|
+
...common,
|
|
177
|
+
actor_id: stableId("actor", canonicalName, used),
|
|
178
|
+
actor_name: canonicalName,
|
|
179
|
+
...(declaration["roleType"] === "主角" || declaration["roleType"] === "配角"
|
|
180
|
+
? { role_type: declaration["roleType"] }
|
|
181
|
+
: {}),
|
|
182
|
+
};
|
|
183
|
+
script.actors.push(value);
|
|
184
|
+
created.actors.push(canonicalName);
|
|
185
|
+
return value;
|
|
186
|
+
}
|
|
187
|
+
if (kind === "locations") {
|
|
188
|
+
const value = {
|
|
189
|
+
...common,
|
|
190
|
+
location_id: stableId("location", canonicalName, used),
|
|
191
|
+
location_name: canonicalName,
|
|
192
|
+
};
|
|
193
|
+
script.locations.push(value);
|
|
194
|
+
created.locations.push(canonicalName);
|
|
195
|
+
return value;
|
|
196
|
+
}
|
|
197
|
+
const value = {
|
|
198
|
+
...common,
|
|
199
|
+
prop_id: stableId("prop", canonicalName, used),
|
|
200
|
+
prop_name: canonicalName,
|
|
201
|
+
};
|
|
202
|
+
script.props.push(value);
|
|
203
|
+
created.props.push(canonicalName);
|
|
204
|
+
return value;
|
|
205
|
+
}
|
|
206
|
+
function resolveAsset(script, draft, kind, nameValue, used, created) {
|
|
207
|
+
const name = clean(nameValue);
|
|
208
|
+
if (!name)
|
|
209
|
+
invalid(`${kind} reference requires a readable name.`);
|
|
210
|
+
const key = canonicalNameKey(name);
|
|
211
|
+
const existing = assetList(script, kind).find((candidate) => nameForms(kind, candidate).includes(key));
|
|
212
|
+
return existing ?? createAsset(script, draft, kind, name, used, created);
|
|
213
|
+
}
|
|
214
|
+
function resolveState(owner, variantValue, used, created) {
|
|
215
|
+
const variant = clean(variantValue, "默认");
|
|
216
|
+
const key = canonicalNameKey(variant);
|
|
217
|
+
const existing = owner.states.find((state) => (canonicalNameKey(state.state_name) === key
|
|
218
|
+
|| (state.state_id === "default" && ["default", "默认"].includes(key))));
|
|
219
|
+
if (existing)
|
|
220
|
+
return existing.state_id;
|
|
221
|
+
const ownerName = "actor_name" in owner ? owner.actor_name : "location_name" in owner ? owner.location_name : owner.prop_name;
|
|
222
|
+
const state = {
|
|
223
|
+
state_id: stableId("state", `${ownerName}:${variant}`, used),
|
|
224
|
+
state_name: variant,
|
|
225
|
+
description: `${ownerName}的${variant}造型。`,
|
|
226
|
+
};
|
|
227
|
+
owner.states.push(state);
|
|
228
|
+
created.states.push(`${ownerName}/${variant}`);
|
|
229
|
+
return state.state_id;
|
|
230
|
+
}
|
|
231
|
+
function readableRefs(value, label) {
|
|
232
|
+
if (value === undefined)
|
|
233
|
+
return [];
|
|
234
|
+
if (!Array.isArray(value) || !value.every(isRecord))
|
|
235
|
+
invalid(`${label} must be an array of readable references.`);
|
|
236
|
+
return value;
|
|
237
|
+
}
|
|
238
|
+
function mergeStateRefs(current, incoming, idOf) {
|
|
239
|
+
const result = structuredClone(current);
|
|
240
|
+
for (const ref of incoming) {
|
|
241
|
+
const existing = result.find((candidate) => idOf(candidate) === idOf(ref));
|
|
242
|
+
if (!existing)
|
|
243
|
+
result.push(structuredClone(ref));
|
|
244
|
+
else
|
|
245
|
+
existing.state_ids = [...new Set([...existing.state_ids, ...ref.state_ids])].sort();
|
|
246
|
+
}
|
|
247
|
+
return result;
|
|
248
|
+
}
|
|
249
|
+
function sameSetup(previous, incoming) {
|
|
250
|
+
return Boolean(previous
|
|
251
|
+
&& previous.location?.location_id
|
|
252
|
+
&& incoming.location?.location_id
|
|
253
|
+
&& previous.location.location_id === incoming.location.location_id
|
|
254
|
+
&& clean(previous.environment?.space) === clean(incoming.environment?.space)
|
|
255
|
+
&& clean(previous.environment?.time) === clean(incoming.environment?.time));
|
|
256
|
+
}
|
|
257
|
+
function draftActions(value, script, draft, actors, sceneSeed, cursorStart, used, created) {
|
|
258
|
+
if (!Array.isArray(value) || value.length === 0 || !value.every(isRecord)) {
|
|
259
|
+
invalid("scene.actions must contain at least one readable Action.");
|
|
260
|
+
}
|
|
261
|
+
const actorRefs = structuredClone(actors);
|
|
262
|
+
let cursor = cursorStart;
|
|
263
|
+
const actions = value.map((item, index) => {
|
|
264
|
+
const type = clean(item["type"], "action");
|
|
265
|
+
if (!["action", "transition", "dialogue", "inner_thought"].includes(type)) {
|
|
266
|
+
invalid(`Action ${index + 1} has an unsupported type.`, [type]);
|
|
267
|
+
}
|
|
268
|
+
const content = clean(item["content"]);
|
|
269
|
+
if (!content)
|
|
270
|
+
invalid(`Action ${index + 1} has empty content.`);
|
|
271
|
+
const duration = Math.max(400, Math.min(8_000, Math.round(Number(item["durationMs"]) || Number(item["weight"] || 1) * 1_200)));
|
|
272
|
+
const extensions = extensionMap(item["extensions"]);
|
|
273
|
+
extensions["timestamp"] = formatTimestamp(cursor);
|
|
274
|
+
extensions["duration_ms"] = duration;
|
|
275
|
+
if (extensions["rewrite_duration_ms"] !== undefined)
|
|
276
|
+
extensions["rewrite_duration_ms"] = duration;
|
|
277
|
+
const base = {
|
|
278
|
+
action_id: stableId("action", `${sceneSeed}:${index + 1}:${content}`, used),
|
|
279
|
+
type: type,
|
|
280
|
+
content,
|
|
281
|
+
extend: extensions,
|
|
282
|
+
};
|
|
283
|
+
cursor += duration;
|
|
284
|
+
if (type === "action" || type === "transition")
|
|
285
|
+
return base;
|
|
286
|
+
const speakerName = clean(item["speaker"]);
|
|
287
|
+
if (!speakerName)
|
|
288
|
+
invalid(`Action ${index + 1} requires a speaker.`);
|
|
289
|
+
const escapedSpeaker = speakerName.replace(/[.*+?^${}()|[\]\\]/gu, "\\$&");
|
|
290
|
+
if (new RegExp(`^${escapedSpeaker}\\s*[::]`, "iu").test(content)) {
|
|
291
|
+
invalid(`Action ${index + 1} repeats the speaker name in dialogue content.`);
|
|
292
|
+
}
|
|
293
|
+
if (/^(?:“[^”]+”|「[^」]+」|『[^』]+』|"[^"]+")$/u.test(content)) {
|
|
294
|
+
invalid(`Action ${index + 1} wraps dialogue content in quotation marks.`);
|
|
295
|
+
}
|
|
296
|
+
const special = canonicalNameKey(speakerName);
|
|
297
|
+
if (["旁白", "narrator"].includes(special)) {
|
|
298
|
+
return { ...base, speaker: { kind: "broadcast", label: "旁白" }, ...(clean(item["parenthetical"]) ? { parenthetical: clean(item["parenthetical"]) } : {}) };
|
|
299
|
+
}
|
|
300
|
+
if (["画外音", "offscreen"].includes(special)) {
|
|
301
|
+
return { ...base, speaker: { kind: "offscreen", label: "画外音" }, ...(clean(item["parenthetical"]) ? { parenthetical: clean(item["parenthetical"]) } : {}) };
|
|
302
|
+
}
|
|
303
|
+
const actor = resolveAsset(script, draft, "actors", speakerName, used, created);
|
|
304
|
+
const stateId = resolveState(actor, item["speakerVariant"], used, created);
|
|
305
|
+
const existing = actorRefs.find((ref) => ref.actor_id === actor.actor_id);
|
|
306
|
+
if (!existing)
|
|
307
|
+
actorRefs.push({ actor_id: actor.actor_id, state_ids: [stateId] });
|
|
308
|
+
else
|
|
309
|
+
existing.state_ids = [...new Set([...existing.state_ids, stateId])].sort();
|
|
310
|
+
return {
|
|
311
|
+
...base,
|
|
312
|
+
speaker: { actor_id: actor.actor_id, state_id: stateId },
|
|
313
|
+
...(clean(item["parenthetical"]) ? { parenthetical: clean(item["parenthetical"]) } : {}),
|
|
314
|
+
};
|
|
315
|
+
});
|
|
316
|
+
return { actions, actorRefs };
|
|
317
|
+
}
|
|
318
|
+
export function composeCreativeDraft(current, rawDraft) {
|
|
319
|
+
if (!isRecord(rawDraft) || rawDraft["version"] !== 1)
|
|
320
|
+
invalid("Creative draft version must be 1.");
|
|
321
|
+
if (!isRecord(rawDraft["episode"]) || !isRecord(rawDraft["scene"]))
|
|
322
|
+
invalid("Creative draft requires episode and scene objects.");
|
|
323
|
+
const draft = structuredClone(rawDraft);
|
|
324
|
+
const episodeDraft = draft["episode"];
|
|
325
|
+
const sceneDraft = draft["scene"];
|
|
326
|
+
const script = structuredClone(current);
|
|
327
|
+
const used = existingIds(script);
|
|
328
|
+
const created = { actors: [], locations: [], props: [], states: [] };
|
|
329
|
+
const episodeNumber = positiveInteger(episodeDraft["number"], "episode.number");
|
|
330
|
+
if (episodeNumber > script.episodes.length + 1)
|
|
331
|
+
invalid("Episodes must be composed in order.", [episodeNumber]);
|
|
332
|
+
let episode = script.episodes[episodeNumber - 1];
|
|
333
|
+
if (!episode) {
|
|
334
|
+
episode = {
|
|
335
|
+
episode_id: stableId("episode", `episode:${episodeNumber}`, used),
|
|
336
|
+
title: clean(episodeDraft["title"], `第 ${episodeNumber} 集`),
|
|
337
|
+
synopsis: clean(episodeDraft["synopsis"], `第 ${episodeNumber} 集剧情。`),
|
|
338
|
+
scenes: [],
|
|
339
|
+
};
|
|
340
|
+
script.episodes.push(episode);
|
|
341
|
+
}
|
|
342
|
+
else {
|
|
343
|
+
if (!clean(episode.title))
|
|
344
|
+
episode.title = clean(episodeDraft["title"], `第 ${episodeNumber} 集`);
|
|
345
|
+
if (!clean(episode.synopsis))
|
|
346
|
+
episode.synopsis = clean(episodeDraft["synopsis"], `第 ${episodeNumber} 集剧情。`);
|
|
347
|
+
}
|
|
348
|
+
const location = resolveAsset(script, draft, "locations", sceneDraft["location"], used, created);
|
|
349
|
+
const locationState = resolveState(location, sceneDraft["locationVariant"], used, created);
|
|
350
|
+
const actorRefs = readableRefs(sceneDraft["actors"], "scene.actors").map((ref) => {
|
|
351
|
+
const actor = resolveAsset(script, draft, "actors", ref["name"], used, created);
|
|
352
|
+
return { actor_id: actor.actor_id, state_ids: [resolveState(actor, ref["variant"], used, created)] };
|
|
353
|
+
});
|
|
354
|
+
const actors = mergeStateRefs([], actorRefs, (ref) => ref.actor_id);
|
|
355
|
+
const propRefs = readableRefs(sceneDraft["props"], "scene.props").map((ref) => {
|
|
356
|
+
const prop = resolveAsset(script, draft, "props", ref["name"], used, created);
|
|
357
|
+
return { prop_id: prop.prop_id, state_ids: [resolveState(prop, ref["variant"], used, created)] };
|
|
358
|
+
});
|
|
359
|
+
const props = mergeStateRefs([], propRefs, (ref) => ref.prop_id);
|
|
360
|
+
const previous = episode.scenes.at(-1);
|
|
361
|
+
const incomingBase = {
|
|
362
|
+
scene_id: stableId("scene", `episode:${episodeNumber}:scene:${episode.scenes.length + 1}:${clean(sceneDraft["title"])}`, used),
|
|
363
|
+
environment: { space: clean(sceneDraft["space"], "interior"), time: clean(sceneDraft["time"], "day") },
|
|
364
|
+
location: { location_id: location.location_id, state_ids: [locationState] },
|
|
365
|
+
actors,
|
|
366
|
+
props,
|
|
367
|
+
actions: [],
|
|
368
|
+
extend: { scene_title: clean(sceneDraft["title"], `第 ${episode.scenes.length + 1} 场`) },
|
|
369
|
+
};
|
|
370
|
+
const boundary = clean(sceneDraft["boundary"], "auto");
|
|
371
|
+
if (!["auto", "new", "continue"].includes(boundary))
|
|
372
|
+
invalid("scene.boundary must be auto, new, or continue.");
|
|
373
|
+
const setupMatches = sameSetup(previous, incomingBase);
|
|
374
|
+
if (boundary === "continue" && !setupMatches)
|
|
375
|
+
invalid("scene.boundary=continue requires the same location, space, and time as the previous scene.");
|
|
376
|
+
const joinedPreviousScene = boundary !== "new" && setupMatches;
|
|
377
|
+
const targetScene = joinedPreviousScene && previous ? previous : incomingBase;
|
|
378
|
+
const sceneNumber = joinedPreviousScene ? episode.scenes.length : episode.scenes.length + 1;
|
|
379
|
+
const composed = draftActions(sceneDraft["actions"], script, draft, targetScene.actors, targetScene.scene_id, episodeCursor(episode), used, created);
|
|
380
|
+
targetScene.actors = mergeStateRefs(targetScene.actors, composed.actorRefs, (ref) => ref.actor_id);
|
|
381
|
+
targetScene.props = mergeStateRefs(targetScene.props, incomingBase.props, (ref) => ref.prop_id);
|
|
382
|
+
if (targetScene.location && incomingBase.location) {
|
|
383
|
+
targetScene.location.state_ids = [...new Set([...targetScene.location.state_ids, ...incomingBase.location.state_ids])].sort();
|
|
384
|
+
}
|
|
385
|
+
targetScene.actions.push(...composed.actions);
|
|
386
|
+
if (!joinedPreviousScene)
|
|
387
|
+
episode.scenes.push(targetScene);
|
|
388
|
+
const validation = validateScriptV4(script);
|
|
389
|
+
if (!validation.ok) {
|
|
390
|
+
invalid("Composed screenplay does not pass Script v4 validation.", validation.errors.slice(0, 12).map((issue) => `${issue.path}: ${issue.message}`));
|
|
391
|
+
}
|
|
392
|
+
return {
|
|
393
|
+
script,
|
|
394
|
+
validation,
|
|
395
|
+
episodeNumber,
|
|
396
|
+
sceneNumber,
|
|
397
|
+
sceneId: targetScene.scene_id,
|
|
398
|
+
actionIds: composed.actions.map((action) => action.action_id),
|
|
399
|
+
joinedPreviousScene,
|
|
400
|
+
created,
|
|
401
|
+
};
|
|
402
|
+
}
|
|
403
|
+
//# sourceMappingURL=compose.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"compose.js","sourceRoot":"","sources":["../../../src/domain/creative-draft/compose.ts"],"names":[],"mappings":"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"}
|
|
@@ -96,13 +96,27 @@ export function docsToNameScript(docs, title) {
|
|
|
96
96
|
return out;
|
|
97
97
|
});
|
|
98
98
|
const loc = (s.location ?? "").trim();
|
|
99
|
+
// Scene props must be unique by normalized name: Script v3 forbids
|
|
100
|
+
// duplicate prop_id on one scene, and the video model occasionally
|
|
101
|
+
// lists the same prop twice (or alias-collapsed names become one).
|
|
102
|
+
const props = [];
|
|
103
|
+
const seenProps = new Set();
|
|
104
|
+
for (const p of s.props ?? []) {
|
|
105
|
+
if (!p)
|
|
106
|
+
continue;
|
|
107
|
+
const key = p.normalize("NFC").replace(/\s+/g, " ").trim();
|
|
108
|
+
if (!key || seenProps.has(key))
|
|
109
|
+
continue;
|
|
110
|
+
seenProps.add(key);
|
|
111
|
+
props.push({ name: p });
|
|
112
|
+
}
|
|
99
113
|
return {
|
|
100
114
|
identity_key: sceneIdentityKey,
|
|
101
115
|
scene_id: `scn_${pad(++scn)}`,
|
|
102
116
|
...(env.space || env.time ? { environment: env } : {}),
|
|
103
117
|
location: loc ? { name: loc } : null,
|
|
104
118
|
actors,
|
|
105
|
-
props
|
|
119
|
+
props,
|
|
106
120
|
actions,
|
|
107
121
|
};
|
|
108
122
|
}),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"video-apply.js","sourceRoot":"","sources":["../../../src/domain/ingest/video-apply.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"video-apply.js","sourceRoot":"","sources":["../../../src/domain/ingest/video-apply.ts"],"names":[],"mappings":"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"}
|
|
@@ -155,7 +155,20 @@ export function parseSerialMd(md, _episode) {
|
|
|
155
155
|
}
|
|
156
156
|
else if (/^-\s*道具[::]/.test(t)) {
|
|
157
157
|
const v = t.replace(/^-\s*道具[::]\s*/, "").trim();
|
|
158
|
-
|
|
158
|
+
if (/^无$/.test(v)) {
|
|
159
|
+
scene.props = [];
|
|
160
|
+
}
|
|
161
|
+
else {
|
|
162
|
+
const seen = new Set();
|
|
163
|
+
scene.props = [];
|
|
164
|
+
for (const raw of v.split(/[,,]/).map((x) => x.trim()).filter(Boolean)) {
|
|
165
|
+
const key = raw.normalize("NFC").replace(/\s+/g, " ").trim();
|
|
166
|
+
if (!key || seen.has(key))
|
|
167
|
+
continue;
|
|
168
|
+
seen.add(key);
|
|
169
|
+
scene.props.push(raw);
|
|
170
|
+
}
|
|
171
|
+
}
|
|
159
172
|
}
|
|
160
173
|
else if (/^>/.test(t)) {
|
|
161
174
|
const a = parseAnchor(t);
|