@lingjingai/scriptctl 0.28.0 → 0.28.1

package/dist/usecases/direct.js

@@ -1,7 +1,7 @@
 import * as fs from "node:fs";
 import * as path from "node:path";
 import { CliError, DEFAULT_BATCH_MAX_CHARS, DEFAULT_BATCH_MIN_LINES, DEFAULT_BATCH_MODE, DEFAULT_BATCH_TARGET_LINES, DEFAULT_CONCURRENCY, DEFAULT_MODEL, DEFAULT_PROVIDER, DEFAULT_SUMMARY_GROUP_SIZE, DEFAULT_SUMMARY_REDUCE_THRESHOLD_CHARS, EXIT_INPUT, EXIT_NEEDS_AGENT, EXIT_OK, EXIT_RUNTIME, EXIT_USAGE, SUPPORTED_EXTS, deletePath, directDir, exists, fmtId, readJson, readText, sha256Text, writeJson, } from "../common.js";
-import { compactBatchResult, compactEpisodeResult, buildBatchPlan, buildEpisodePlan, DEFAULT_TITLE_CHUNK_SIZE, chunkEpisodesNeedingTitles, applyEpisodeTitlesToPlan, cleanSynopsisList, episodeTitleResponseMap, extractBatchWithRecovery, mergeEpisodeResults, normalizeEpisodeResult, planSynopsisReduction, readCarriedSynopsis, sortDeep, uniqueAdd, validateEpisodeExtractionQuality, _md_push_asset, curateScriptAssets, applyMetadataToScript, } from "../domain/direct-core.js";
+import { compactBatchResult, compactEpisodeResult, buildBatchPlan, buildEpisodePlan, DEFAULT_TITLE_CHUNK_SIZE, chunkEpisodesNeedingTitles, applyEpisodeTitlesToPlan, cleanSynopsisList, episodeTitleResponseMap, extractBatchWithRecovery, mergeEpisodeResultsWithReport, normalizeEpisodeResult, planSynopsisReduction, readCarriedSynopsis, sortDeep, uniqueAdd, validateEpisodeExtractionQuality, _md_push_asset, curateScriptAssets, applyMetadataToScript, } from "../domain/direct-core.js";
 import { validateScript } from "../domain/script/validate.js";
 import { makeProvider, providerCapabilities } from "../infra/providers.js";
 import { makeSourceManifest, prepareSource, } from "../infra/converters.js";
@@ -211,13 +211,11 @@ function statusFromBatchState(state) {
 function stageSnapshot(name, status, completed, total, message) {
     const boundedTotal = Math.max(0, total);
     const boundedCompleted = Math.max(0, Math.min(completed, boundedTotal));
-    const percent = boundedTotal > 0 ? Math.round((boundedCompleted / boundedTotal) * 100) : status === "success" ? 100 : 0;
     return {
         name,
         status,
         completed: boundedCompleted,
         total: boundedTotal,
-        percent,
         pending: status === "skipped" ? 0 : Math.max(0, boundedTotal - boundedCompleted),
         warning: status === "warning" ? 1 : 0,
         error: status === "error" ? 1 : 0,
@@ -229,6 +227,17 @@ function fileStage(name, filePath, runningStage) {
         return stageSnapshot(name, "success", 1, 1);
     return stageSnapshot(name, runningStage === name ? "running" : "pending", 0, 1);
 }
+function orderedFileStage(name, filePath, runningStage, runStatus) {
+    if (!canTrustStageArtifacts(name, runningStage, runStatus)) {
+        return stageSnapshot(name, "pending", 0, 1);
+    }
+    return fileStage(name, filePath, runningStage ?? "");
+}
+function canTrustStageArtifacts(name, runningStage, runStatus) {
+    if (runStatus !== "init_running" || !runningStage)
+        return true;
+    return stageOrder(name) <= stageOrder(runningStage);
+}
 function readJsonFile(filePath, fallback) {
     if (!exists(filePath))
         return fallback;
@@ -296,15 +305,14 @@ function userStageRows(stages) {
     }
     const rows = [];
     for (const items of byLabel.values()) {
-        const total = items.reduce((sum, item) => sum + stageWeight(item.name), 0);
-        const completed = items.reduce((sum, item) => sum + stageWeight(item.name) * (item.status === "skipped" ? 1 : item.percent / 100), 0);
+        const total = items.reduce((sum, item) => sum + item.total, 0);
+        const completed = items.reduce((sum, item) => sum + (item.status === "skipped" ? item.total : item.completed), 0);
         const status = items.reduce((max, item) => statusPriority(item.status) > statusPriority(max) ? item.status : max, "success");
         rows.push({
             name: items[0].name,
             status,
             completed: Math.round(completed),
             total,
-            percent: total > 0 ? Math.round((completed / total) * 100) : 0,
             pending: items.reduce((sum, item) => sum + item.pending, 0),
             warning: items.reduce((sum, item) => sum + item.warning, 0),
             error: items.reduce((sum, item) => sum + item.error, 0),
@@ -313,31 +321,33 @@ function userStageRows(stages) {
     }
     return rows;
 }
-function stageWeight(name) {
+function stageOrder(name) {
     switch (name) {
-        case "source_prepare": return 3;
-        case "episode_plan": return 7;
-        case "batch_plan": return 5;
-        case "episode_titles": return 5;
-        case "batch_extract": return 45;
-        case "episode_merge": return 8;
-        case "episode_synopsis": return 5;
+        case "source_prepare": return 0;
+        case "episode_plan": return 1;
+        case "episode_titles": return 2;
+        case "batch_plan": return 3;
+        case "batch_extract": return 4;
+        case "episode_merge": return 5;
+        case "episode_synopsis": return 6;
         case "script_merge": return 7;
-        case "asset_curation": return 5;
-        case "metadata_extract": return 3;
-        case "script_synopsis": return 5;
-        case "validate": return 2;
+        case "asset_curation": return 8;
+        case "metadata_extract": return 9;
+        case "script_synopsis": return 10;
+        case "validate": return 11;
     }
 }
-function snapshotProgressPercent(stages) {
-    let done = 0;
-    let total = 0;
-    for (const stage of stages) {
-        const weight = stageWeight(stage.name);
-        total += weight;
-        done += weight * (stage.status === "skipped" ? 1 : stage.percent / 100);
-    }
-    return total > 0 ? Math.max(0, Math.min(100, Math.round((done / total) * 100))) : 0;
+function stageRatio(stage) {
+    if (stage.status === "success" || stage.status === "skipped")
+        return 1;
+    if (stage.total <= 0)
+        return 0;
+    return Math.max(0, Math.min(1, stage.completed / stage.total));
+}
+function stageCountText(stage) {
+    if (stage.status === "skipped")
+        return "-";
+    return `${stage.completed}/${stage.total}`;
 }
 function useProgressColor() {
     return Boolean(process.stderr.isTTY) && process.env.NO_COLOR === undefined;
@@ -363,7 +373,7 @@ function bold(text) {
 }
 function progressBar(stage) {
     const width = 24;
-    const ratio = stage.percent / 100;
+    const ratio = stageRatio(stage);
     const filled = Math.round(ratio * width);
     const bar = `${"█".repeat(filled)}${"░".repeat(width - filled)}`;
     return colorStatus(stage.status, bar);
@@ -387,13 +397,12 @@ function statusMark(stage) {
 }
 function renderProgressLine(stage) {
     const status = colorStatus(stage.status, stage.status.padEnd(7));
-    const percent = `${stage.percent}%`;
     const bits = [
         statusMark(stage),
         bold(stageLabel(stage.name)),
         status,
         progressBar(stage),
-        `${percent} ${stageUnit(stage.name)}`,
+        `${stageCountText(stage)} ${stageUnit(stage.name)}`,
     ];
     if (stage.error > 0)
         bits.push(ansi(31, `error ${stage.error}`));
@@ -406,7 +415,7 @@ function renderProgressLine(stage) {
     return bits.join(" ");
 }
 function renderStageDetail(stage) {
-    const counts = [`${stage.percent}%`];
+    const counts = [stageCountText(stage)];
     if (stage.error > 0)
         counts.push(ansi(31, `error ${stage.error}`));
     if (stage.warning > 0)
@@ -416,9 +425,8 @@ function renderStageDetail(stage) {
     return `  ${dim("stage")} ${stageLabel(stage.name)} ${colorStatus(stage.status, statusText(stage.status))} ${counts.join(", ")}`;
 }
 function renderEpisodeDetail(episode) {
-    const percent = episode.batches_total > 0 ? Math.round((episode.batches_done / episode.batches_total) * 100) : 0;
     const errors = episode.error_batches.length > 0 ? ansi(31, " has errors") : "";
-    return `  ${dim("episode")} ${episode.episode_id} ${colorStatus(episode.status, statusText(episode.status))} ${percent}%, story ${colorStatus(episode.synopsis_status, statusText(episode.synopsis_status))}${errors}`;
+    return `  ${dim("episode")} ${episode.episode_id} ${colorStatus(episode.status, statusText(episode.status))} ${episode.batches_done}/${episode.batches_total}, story ${colorStatus(episode.synopsis_status, statusText(episode.synopsis_status))}${errors}`;
 }
 function renderBatchDetail(batch) {
     const reason = batch.error_code || batch.error_type || batch.message;
@@ -452,11 +460,11 @@ function renderProgressFrame() {
 }
 function progressStageWithStatus(stage, status) {
     if (status === "success")
-        return { ...stage, status, completed: stage.total, percent: 100, pending: 0, warning: 0, error: 0 };
+        return { ...stage, status, completed: stage.total, pending: 0, warning: 0, error: 0 };
     if (status === "warning")
-        return { ...stage, status, completed: stage.total, percent: 100, pending: 0, warning: Math.max(1, stage.warning), error: 0 };
+        return { ...stage, status, completed: stage.total, pending: 0, warning: Math.max(1, stage.warning), error: 0 };
     if (status === "skipped")
-        return { ...stage, status, percent: 100, pending: 0, warning: 0, error: 0 };
+        return { ...stage, status, completed: stage.total, pending: 0, warning: 0, error: 0 };
     if (status === "error")
         return { ...stage, status, error: Math.max(1, stage.error) };
     return { ...stage, status };
@@ -534,7 +542,6 @@ function emitInitProgress(workspace, stageName, fallbackStatus = "running") {
         status: fallbackStatus,
         completed: fallbackStatus === "success" ? 1 : 0,
         total: 1,
-        percent: fallbackStatus === "success" ? 100 : 0,
         pending: fallbackStatus === "running" || fallbackStatus === "pending" ? 1 : 0,
         warning: fallbackStatus === "warning" ? 1 : 0,
         error: fallbackStatus === "error" ? 1 : 0,
@@ -556,11 +563,14 @@ function buildDirectStatusSnapshot(workspace) {
     const batches = asList(batchPlan["batches"]);
     const state = readRunState(workspace);
     const rawRunningStage = strOf(state["init_stage"]);
-    const runningStage = rawRunningStage && rawRunningStage !== "complete" ? rawRunningStage : null;
+    const runningStage = rawRunningStage && rawRunningStage !== "complete" && isDirectStageName(rawRunningStage) ? rawRunningStage : null;
     const runStatus = strOf(state["status"]);
     const failedStage = runStatus === "init_failed" ? runningStage : null;
     const batchResultsDir = path.join(dd, "batch_results");
     const episodeResultsDir = path.join(dd, "episode_results");
+    const trustEpisodeMergeArtifacts = canTrustStageArtifacts("episode_merge", runningStage, runStatus);
+    const trustEpisodeSynopsisArtifacts = canTrustStageArtifacts("episode_synopsis", runningStage, runStatus);
+    const trustScriptSynopsisArtifacts = canTrustStageArtifacts("script_synopsis", runningStage, runStatus);
     const batchesByEpisode = new Map();
     const batchDetails = [];
     let doneBatches = 0;
@@ -601,7 +611,9 @@ function buildDirectStatusSnapshot(workspace) {
         batchesByEpisode.get(detail.episode).push(detail);
     }
     const pendingBatches = batches.length - doneBatches - errorBatches;
-    const degradedSynopsisEpisodes = new Set(asList(state["summary_degraded_episodes"]).map((n) => Number(n)));
+    const degradedSynopsisEpisodes = trustEpisodeSynopsisArtifacts
+        ? new Set(asList(state["summary_degraded_episodes"]).map((n) => Number(n)))
+        : new Set();
     const episodeSnapshots = [];
     let completeEpisodes = 0;
     let episodeResults = 0;
@@ -613,10 +625,10 @@ function buildDirectStatusSnapshot(workspace) {
         const batchesError = epBatches.filter((b) => b.status === "error").length;
         const batchesPending = epBatches.length - batchesDone - batchesError;
         const epResultPath = episodeResultPath(episodeResultsDir, episode);
-        const hasEpisodeResult = readableJsonFile(epResultPath);
+        const hasEpisodeResult = trustEpisodeMergeArtifacts && readableJsonFile(epResultPath);
         if (hasEpisodeResult)
             episodeResults++;
-        const synopsis = readEpisodeSynopsis(episodeResultsDir, episode);
+        const synopsis = trustEpisodeSynopsisArtifacts ? readEpisodeSynopsis(episodeResultsDir, episode) : null;
         if (synopsis)
             episodeSynopses++;
         const status = batchesError > 0
@@ -694,22 +706,23 @@ function buildDirectStatusSnapshot(workspace) {
         ...stageSnapshot("episode_synopsis", episodeSynopsisStatus, episodeSynopses, episodes.length),
         warning: synopsisWarning,
     };
-    const scriptStage = fileStage("script_merge", path.join(dd, "script.initial.json"), runningStage ?? "");
-    const curationStage = fileStage("asset_curation", path.join(dd, "asset_curation.json"), runningStage ?? "");
-    const metadataStage = fileStage("metadata_extract", path.join(dd, "asset_metadata.json"), runningStage ?? "");
+    const scriptStage = orderedFileStage("script_merge", path.join(dd, "script.initial.json"), runningStage, runStatus);
+    const curationStage = orderedFileStage("asset_curation", path.join(dd, "asset_curation.json"), runningStage, runStatus);
+    const metadataStage = orderedFileStage("metadata_extract", path.join(dd, "asset_metadata.json"), runningStage, runStatus);
     const synopsisPath = path.join(dd, "synopsis.json");
     const summaryLine = formatSummaryStatusLine(Boolean(state["summary_skipped"]), Boolean(state["summary_degraded"]), asList(state["summary_degraded_episodes"]).map((n) => Number(n)));
-    const scriptSynopsisStatus = exists(synopsisPath)
+    const hasScriptSynopsis = trustScriptSynopsisArtifacts && exists(synopsisPath);
+    const scriptSynopsisStatus = hasScriptSynopsis
         ? Boolean(state["summary_degraded"]) ? "warning" : "success"
-        : Boolean(state["summary_skipped"])
+        : trustScriptSynopsisArtifacts && Boolean(state["summary_skipped"])
             ? "skipped"
             : runningStage === "script_synopsis"
                 ? "running"
                 : "pending";
-    const scriptSynopsisStage = stageSnapshot("script_synopsis", scriptSynopsisStatus, exists(synopsisPath) ? 1 : 0, 1, summaryLine ?? "");
+    const scriptSynopsisStage = stageSnapshot("script_synopsis", scriptSynopsisStatus, hasScriptSynopsis ? 1 : 0, 1, summaryLine ?? "");
     const validationPath = path.join(dd, "validation.json");
-    let validationStage = fileStage("validate", validationPath, runningStage ?? "");
-    if (exists(validationPath)) {
+    let validationStage = orderedFileStage("validate", validationPath, runningStage, runStatus);
+    if (exists(validationPath) && !(runStatus === "init_running" && runningStage && stageOrder("validate") > stageOrder(runningStage))) {
         const validation = readJson(validationPath);
         validationStage = stageSnapshot("validate", Boolean(validation["passed"]) ? "success" : "warning", 1, 1);
     }
@@ -740,7 +753,6 @@ function buildDirectStatusSnapshot(workspace) {
     return {
         overall_status: overallStatus,
         running_stage: runningStage,
-        progress_percent: snapshotProgressPercent(stages),
         stages,
         episodes: episodeSnapshots,
         batches: batchDetails,
@@ -750,18 +762,17 @@ function renderDirectStatusResult(snapshot) {
     const completedEpisodes = snapshot.episodes.filter((episode) => episode.status === "success").length;
     const result = [
         "Overall",
-        `overall: ${statusText(snapshot.overall_status)}; current: ${snapshot.running_stage && isDirectStageName(snapshot.running_stage) ? stageLabel(snapshot.running_stage) : "-"}; progress: ${snapshot.progress_percent}%`,
-        snapshot.episodes.length > 0 ? `episodes: ${Math.round((completedEpisodes / snapshot.episodes.length) * 100)}% 完成` : "episodes: 等待中",
+        `overall: ${statusText(snapshot.overall_status)}; current: ${snapshot.running_stage && isDirectStageName(snapshot.running_stage) ? stageLabel(snapshot.running_stage) : "-"}`,
+        snapshot.episodes.length > 0 ? `episodes: ${completedEpisodes}/${snapshot.episodes.length} 完成` : "episodes: 等待中",
         "Stages",
     ];
     for (const stage of userStageRows(snapshot.stages)) {
-        result.push(`${stageLabel(stage.name)}: ${statusText(stage.status)} ${stage.percent}%${stage.error ? `, error ${stage.error}` : ""}${stage.warning ? `, warning ${stage.warning}` : ""}${stage.status === "pending" ? ", 等待中" : ""}${stage.message ? ` - ${stage.message}` : ""}`);
+        result.push(`${stageLabel(stage.name)}: ${statusText(stage.status)} ${stageCountText(stage)}${stage.error ? `, error ${stage.error}` : ""}${stage.warning ? `, warning ${stage.warning}` : ""}${stage.status === "pending" ? ", 等待中" : ""}${stage.message ? ` - ${stage.message}` : ""}`);
     }
     result.push("Episodes");
     for (const episode of snapshot.episodes) {
-        const percent = episode.batches_total > 0 ? Math.round((episode.batches_done / episode.batches_total) * 100) : 0;
         const errors = episode.error_batches.length > 0 ? `, error ids: ${episode.error_batches.join(",")}` : "";
-        result.push(`${episode.episode_id}: ${statusText(episode.status)} ${percent}%, story ${statusText(episode.synopsis_status)}${errors}`);
+        result.push(`${episode.episode_id}: ${statusText(episode.status)} ${episode.batches_done}/${episode.batches_total}, story ${statusText(episode.synopsis_status)}${errors}`);
     }
     result.push("Details");
     const noisyBatches = snapshot.batches.filter((batch) => batch.status !== "success");
@@ -1624,7 +1635,7 @@ async function commandInitImpl(opts) {
             result: [
                 `episodes: ${results.length}/${totalEpisodes} complete`,
                 `incomplete episodes: ${incompleteEpisodes.join(", ")}`,
-                `content progress: ${totalBatches > 0 ? Math.round((doneBatches / totalBatches) * 100) : 0}% done, ${erroredBatches} error`,
+                `content: ${doneBatches}/${totalBatches} done, ${erroredBatches} error`,
                 ...(titleDegraded.length > 0 ? [`titles degraded (deterministic): ${titleDegraded.join(", ")}`] : []),
                 `provider: ${providerName}`,
             ],
@@ -1656,9 +1667,14 @@ async function commandInitImpl(opts) {
         last_error: null,
     });
     let script;
+    const assetNormalizationPath = path.join(dd, "asset_normalization.json");
+    let assetNormalization = null;
     try {
         emitInitProgress(workspace, "script_merge");
-        script = mergeEpisodeResults(results, strOf(info["projectName"]) || path.basename(source, path.extname(source)));
+        const merged = mergeEpisodeResultsWithReport(results, strOf(info["projectName"]) || path.basename(source, path.extname(source)));
+        script = merged.script;
+        assetNormalization = merged.assetNormalization;
+        writeJson(assetNormalizationPath, assetNormalization);
     }
     catch (exc) {
         const e = exc;
@@ -1815,6 +1831,12 @@ async function commandInitImpl(opts) {
         : "INIT NEEDS AGENT: Initial script written with repair issues";
     const stats = validation["stats"] ?? {};
     const summaryLine = formatSummaryStatusLine(skipSummary, summaryDegraded, summaryDegradedEpisodes);
+    const normalizationSummary = assetNormalization?.summary ?? {
+        asset_merges: 0,
+        location_states_from_names: 0,
+        location_states_from_time: 0,
+        review_items: 0,
+    };
     const report = {
         title,
         result: [
@@ -1824,7 +1846,8 @@ async function commandInitImpl(opts) {
             `validation: ${passed ? "passed" : "needs repair"}`,
             `provider: ${providerName}`,
             `episodes: ${results.length}/${totalEpisodes} complete`,
-            `content progress: ${totalBatches > 0 ? Math.round((doneBatches / totalBatches) * 100) : 0}% done`,
+            `content: ${doneBatches}/${totalBatches} done`,
+            `normalization: merges=${normalizationSummary.asset_merges}, states=${normalizationSummary.location_states_from_names + normalizationSummary.location_states_from_time}, review=${normalizationSummary.review_items}`,
             ...(titleDegraded.length > 0 ? [`titles degraded (deterministic): ${titleDegraded.join(", ")}`] : []),
             ...(summaryLine ? [summaryLine] : []),
         ],
@@ -1835,6 +1858,7 @@ async function commandInitImpl(opts) {
             path.join(dd, "batch_plan.json"),
             batchResultsDir,
             episodeResultsDir,
+            assetNormalizationPath,
             path.join(dd, "asset_curation.json"),
             path.join(dd, "asset_metadata.json"),
             path.join(dd, "synopsis.json"),
@@ -1883,7 +1907,6 @@ export function commandStatus(opts) {
         artifacts: [path.join(dd, "batch_results"), path.join(dd, "episode_results"), path.join(dd, "run_state.json")],
         overall_status: snapshot.overall_status,
         running_stage: snapshot.running_stage,
-        progress_percent: snapshot.progress_percent,
         stages: snapshot.stages,
         episodes: snapshot.episodes,
         batches: snapshot.batches,
@@ -2114,6 +2137,24 @@ function renderAssetCurationSummary(curation) {
     }
     return lines;
 }
+function renderAssetNormalizationSummary(normalization) {
+    const summary = isDict(normalization["summary"]) ? normalization["summary"] : {};
+    const lines = [
+        `normalization: ` +
+            `merges ${summary["asset_merges"] ?? 0}, ` +
+            `location-states ${(Number(summary["location_states_from_names"] ?? 0) + Number(summary["location_states_from_time"] ?? 0))}, ` +
+            `review ${summary["review_items"] ?? 0}`,
+    ];
+    for (const decision of asList(normalization["decisions"])) {
+        if (!isDict(decision))
+            continue;
+        const action = strOf(decision["action"]);
+        if (action !== "canonical_merge" && action !== "location_state_from_name" && action !== "location_state_from_time")
+            continue;
+        lines.push(`normalization ${action}: ${decision["from"] || "-"} -> ${decision["into"] || "-"}${decision["state"] ? ` state=${decision["state"]}` : ""} — ${decision["reason"] || "-"}`);
+    }
+    return lines;
+}
 // Collect batch extraction failures (batch_results/<key>.error.json) keyed by
 // episode. Shared by both review views — these are direct-stage failures the
 // final-script `issues` query can't see.
@@ -2208,6 +2249,12 @@ export function commandReview(opts) {
     // (validation issues recomputed live, plus batch extraction failures).
     const lines = [];
     const curationPath = path.join(dd, "asset_curation.json");
+    const normalizationPath = path.join(dd, "asset_normalization.json");
+    if (exists(normalizationPath)) {
+        const normalization = readJson(normalizationPath);
+        if (isDict(normalization))
+            lines.push(...renderAssetNormalizationSummary(normalization));
+    }
     if (exists(curationPath)) {
         const curation = readJson(curationPath);
         if (isDict(curation))
@@ -2236,7 +2283,7 @@ export function commandReview(opts) {
     const report = {
         title: "DIRECT REVIEW",
         result: lines.length > 0 ? lines : ["No issues, curation decisions, or batch failures to review."],
-        artifacts: [scriptPath, path.join(dd, "asset_curation.json"), batchResultsDir],
+        artifacts: [scriptPath, normalizationPath, path.join(dd, "asset_curation.json"), batchResultsDir],
         next: [
             "Run `direct review --episode <n>` for source↔extract alignment.",
             "Edit with `--draft` (e.g. `scriptctl rename … --draft`), then validate/export.",