@lingjingai/scriptctl 0.10.0 → 0.10.2

package/dist/usecases/script.d.ts

@@ -4,14 +4,12 @@ type Dict = Record<string, unknown>;
 export declare class ScriptEditSession {
     workspace: string;
     script: Dict;
-    scriptPath: string | null;
     client: ScriptOutputStore | null;
     projectGroupNo: string | null;
     revision: number | null;
     constructor(opts: {
         workspace: string;
         script: Dict;
-        scriptPath?: string | null;
         client?: ScriptOutputStore | null;
         projectGroupNo?: string | null;
         revision?: number | null;

package/dist/usecases/script.js

@@ -1,13 +1,10 @@
-import * as fs from "node:fs";
-import * as os from "node:os";
 import * as path from "node:path";
-import { randomUUID } from "node:crypto";
 import { CliError, EXIT_INPUT, EXIT_NEEDS_AGENT, EXIT_OK, EXIT_RUNTIME, EXIT_USAGE, directDir, exists, readJson, readText, sha256Text, writeJson, } from "../common.js";
 import { applyPatchOperations, collectAssetRefs, collectStateRefs, parseAnyAddress, parseStateTarget, validateScript, PATCH_OP_SCHEMA, } from "../domain/script-core.js";
 import { RemoteScriptOutputStore } from "../infra/script-output-api.js";
 import { LocalScriptOutputStore } from "../infra/local-script-output-store.js";
 import { ScriptOutputApiError, resolveOutputMode, } from "../infra/script-output-store.js";
-import { markMetadataConfidenceReviewed, readRunState, summarizeIssues, updateRunState, } from "./direct.js";
+import { readRunState, summarizeIssues, updateRunState, } from "./direct.js";
 function strOf(v) {
     if (v === null || v === undefined)
         return "";
@@ -65,14 +62,12 @@ function episodeCharCounts(scenes) {
 export class ScriptEditSession {
     workspace;
     script;
-    scriptPath;
     client;
     projectGroupNo;
     revision;
     constructor(opts) {
         this.workspace = opts.workspace;
         this.script = opts.script;
-        this.scriptPath = opts.scriptPath ?? null;
         this.client = opts.client ?? null;
         this.projectGroupNo = opts.projectGroupNo ?? null;
         this.revision = opts.revision ?? null;
@@ -81,16 +76,10 @@ export class ScriptEditSession {
         return this.client !== null;
     }
     get artifactLabel() {
-        if (this.remote) {
-            // Public label — strips the internal `db:/script-output/project-groups/`
-            // storage prefix (which leaks implementation), but keeps the project id
-            // and revision so two different project groups at the same revision stay
-            // distinguishable in user-visible report.artifacts entries. The project
-            // id is not a secret: the user supplies it themselves via
-            // `--project-group-no` or env config.
-            return `script-output/${this.projectGroupNo}@revision/${this.revision ?? 0}`;
-        }
-        return this.scriptPath ?? "";
+        // Public label — keeps the project id + revision (not secret; the user
+        // supplies the project id via --project-group-no/env) so two project groups
+        // at the same revision stay distinguishable in report.artifacts.
+        return `script-output/${this.projectGroupNo}@revision/${this.revision ?? 0}`;
     }
 }
 export function scriptOutputClient(opts) {
@@ -231,12 +220,28 @@ export async function currentRevisionOrZero(client) {
     }
     catch (exc) {
         if (exc instanceof ScriptOutputApiError) {
-            throw apiErrorToCli("SCRIPT API BLOCKED: Revision query failed", exc);
+            // WORKAROUND (see TODO.md "getRevision not-found signal"): the script-output
+            // backend returns a generic error (UNKNOWN_EXCEPTION, not a recognizable
+            // "no script yet" signal) when a project group has no published script, so
+            // a first publish can't tell first-publish from a real failure here.
+            // getRevision is only an optimistic-lock hint, not a correctness gate, so
+            // fall back to baseRevision 0 and let replaceScript decide. This is SAFE:
+            // replaceScript enforces the baseRevision lock server-side — it CREATES only
+            // when no script exists and REJECTS with a revision conflict if one already
+            // does — so base 0 never overwrites an existing script. A genuine
+            // gateway/auth failure still surfaces on the subsequent replaceScript call.
+            // Note: once a script exists, getRevision returns cleanly, so this fallback
+            // only ever engages on the no-script (first-publish) path.
+            return 0;
         }
         throw exc;
     }
 }
-async function loadRemoteScript(opts, workspace) {
+// All reads/edits operate on the DB-backed final script. The intermediate
+// script.initial.json is a private artifact between `import init` and
+// `import push`; it is not an editable surface.
+async function loadScript(opts) {
+    const workspace = strOf(opts["workspace_path"] || "workspace");
     const client = scriptOutputClient(opts);
     let script;
     let revision;
@@ -276,34 +281,22 @@ async function loadRemoteScript(opts, workspace) {
         revision: Number((revision ?? {})["revision"] ?? 0),
     });
 }
-async function loadScriptForEdit(opts) {
-    // All reads/edits operate on the DB-backed final script. The intermediate
-    // script.initial.json is a private artifact between `import init` and
-    // `import push`; it is no longer an editable surface.
-    const workspace = strOf(opts["workspace_path"] || "workspace");
-    return loadRemoteScript(opts, workspace);
-}
 function validateSession(session, opts = {}) {
-    const requireSource = opts.requireSource ?? false;
-    if (!session.remote) {
-        return validateScript(session.workspace, session.scriptPath, { requireSource });
-    }
-    const tmpPath = path.join(os.tmpdir(), `scriptctl-db-script-${randomUUID()}.json`);
-    try {
-        fs.writeFileSync(tmpPath, JSON.stringify(session.script, null, 2) + "\n", "utf-8");
-        const validation = validateScript(session.workspace, tmpPath, { requireSource });
-        validation["script_path"] = session.artifactLabel;
+    const persist = opts.persist ?? true;
+    // Validate the in-memory DB script directly (no tmp file). scriptData also
+    // tells validateScript not to read the local asset_metadata.json/episode_plan.json
+    // parse artifacts — those describe the local initial.json, not the DB script.
+    // requireSource:false (DB validation never needs source.txt). persist:false so
+    // validateScript doesn't write; we own the write below to set the nicer label.
+    const validation = validateScript(session.workspace, null, {
+        requireSource: false,
+        scriptData: session.script,
+        persist: false,
+    });
+    validation["script_path"] = session.artifactLabel;
+    if (persist)
         writeJson(path.join(directDir(session.workspace), "validation.json"), validation);
-        return validation;
-    }
-    finally {
-        try {
-            fs.unlinkSync(tmpPath);
-        }
-        catch {
-            // ignore
-        }
-    }
+    return validation;
 }
 function validationIssuePath(issue) {
     if (issue["path"])
@@ -393,12 +386,8 @@ function requestIdForScriptWrite(opts, op, payload) {
     return `scriptctl:${op}:${sha256Text(canonical)}`;
 }
 async function saveScriptSession(session, opts, op) {
-    if (!session.remote) {
-        writeJson(session.scriptPath, session.script);
-        return [null, false];
-    }
     if (session.client === null)
-        throw new Error("remote script session missing client");
+        throw new Error("script session missing client");
     const baseRevision = Number(session.revision ?? 0);
     const requestId = requestIdForScriptWrite(opts, op, { script: session.script });
     let res;
@@ -460,7 +449,7 @@ function patchOperationsFromPayload(payload) {
 // ---------------------------------------------------------------------------
 export async function commandScriptValidate(opts) {
     const workspace = strOf(opts["workspace_path"] || "workspace");
-    const session = await loadScriptForEdit(opts);
+    const session = await loadScript(opts);
     const validation = validateSession(session);
     await syncValidationResult(session, validation);
     const stats = validation["stats"] ?? {};
@@ -590,13 +579,13 @@ export async function commandScriptPatch(opts) {
     }
     const operations = patchOperationsFromPayload(payload);
     const dryRun = Boolean(opts["dry_run"]);
-    const session = await loadScriptForEdit(opts);
+    const session = await loadScript(opts);
     const script = session.script;
     const applied = applyPatchOperations(script, scriptSourceText(workspace), operations);
     if (dryRun) {
         // Validate the in-memory mutated script WITHOUT calling saveScriptSession.
         // Run validate but skip syncValidationResult (which writes to remote) too.
-        const validation = validateSession(session);
+        const validation = validateSession(session, { persist: false });
         const passed = Boolean(validation["passed"]);
         const report = {
             title: passed ? "SCRIPT PATCH DRY-RUN PASSED" : "SCRIPT PATCH DRY-RUN: Validation needs repair",
@@ -618,9 +607,6 @@ export async function commandScriptPatch(opts) {
     const [newRevision, idempotent] = await saveScriptSession(session, opts, applied.length === 1 ? applied[0] : "script.patch");
     const validation = validateSession(session);
     await syncValidationResult(session, validation, newRevision);
-    // Patching worldview/role/description clears the parse-time
-    // LOW_CONFIDENCE_METADATA advisory (asset_metadata.json low → medium).
-    markMetadataConfidenceReviewed(workspace, operations);
     const passed = Boolean(validation["passed"]);
     const resultLines = [
         `operations: ${applied.length}`,
@@ -648,7 +634,7 @@ export async function commandScriptPatch(opts) {
 // ---------------------------------------------------------------------------
 async function applySingleScriptOp(opts, op) {
     const workspace = strOf(opts["workspace_path"] || "workspace");
-    const session = await loadScriptForEdit(opts);
+    const session = await loadScript(opts);
     const script = session.script;
     const applied = applyPatchOperations(script, scriptSourceText(workspace), [op]);
     const opName = applied[0] ?? strOf(op["op"]);
@@ -690,7 +676,7 @@ function summarizeScriptOp(_script, op) {
     return `已执行 ${kind}`;
 }
 async function commandStateRefs(opts, plan = false) {
-    const session = await loadScriptForEdit(opts);
+    const session = await loadScript(opts);
     const script = session.script;
     const args = asList(opts["_args"]);
     const [targetKind, targetId, stateId] = parseStateTarget(args[0] ?? "");
@@ -744,7 +730,10 @@ export async function commandPush(opts) {
     }
     const state = readRunState(workspace);
     const provider = strOf(state["provider"]);
-    if (provider === "mock" && process.env.SCRIPTCTL_ALLOW_MOCK_EXPORT !== "1") {
+    // SCRIPTCTL_ALLOW_MOCK_PUSH is the current name; SCRIPTCTL_ALLOW_MOCK_EXPORT is
+    // still honored for back-compat with environments configured before the rename.
+    const allowMock = process.env.SCRIPTCTL_ALLOW_MOCK_PUSH === "1" || process.env.SCRIPTCTL_ALLOW_MOCK_EXPORT === "1";
+    if (provider === "mock" && !allowMock) {
         const report = {
             title: "PUSH BLOCKED: Mock provider result",
             result: ["script.initial.json was produced by --provider mock and was not pushed."],
@@ -776,15 +765,13 @@ export async function commandPush(opts) {
         });
     }
     // Validation is advisory, not a gate: push always publishes so the agent can
-    // self-review and repair on the DB script afterwards. Results are still
-    // computed and synced so the review subagent has the issue list to act on.
-    const validation = validateScript(workspace, scriptPath);
+    // self-review and repair on the DB script afterwards. requireSource:false so a
+    // missing source.txt never aborts the publish. Results are still computed and
+    // synced so the review subagent has the issue list to act on.
+    const validation = validateScript(workspace, scriptPath, { requireSource: false });
     const client = scriptOutputClient(opts);
     const baseRevision = await currentRevisionOrZero(client);
-    // Sorted-keys serialization mirrors Python json.dumps(sort_keys=True, separators=(",",":"))
-    const sortedScript = sortDeep(script);
-    const scriptHash = sha256Text(JSON.stringify(sortedScript));
-    const requestId = strOf(opts["request_id"]).trim() || `scriptctl-import-push:${scriptHash}`;
+    const requestId = requestIdForScriptWrite(opts, "import.push", { script });
     let replaceRes;
     try {
         replaceRes = await client.replaceScript({
@@ -971,7 +958,7 @@ function buildReport(op, title, lines, artifactLabel, next) {
 }
 // ----- summary --------------------------------------------------------------
 export async function commandSummary(opts) {
-    const session = await loadScriptForEdit(opts);
+    const session = await loadScript(opts);
     const script = session.script;
     const episodes = asList(script["episodes"]);
     const scenes = [];
@@ -994,7 +981,7 @@ export async function commandSummary(opts) {
 }
 // ----- episodes -------------------------------------------------------------
 export async function commandEpisodes(opts) {
-    const session = await loadScriptForEdit(opts);
+    const session = await loadScript(opts);
     const script = session.script;
     const itemId = strOf(opts["id"]).trim();
     const minChars = parseBound(opts["min_chars"]);
@@ -1048,7 +1035,7 @@ function formatScene(epId, scene, names) {
     return `${epId}/${scene["scene_id"]} [${space} ${time}] location=${locations.join(",") || "-"} actors=${actors.join(",") || "-"} props=${props.join(",") || "-"} actions=${actionCount}`;
 }
 export async function commandScenes(opts) {
-    const session = await loadScriptForEdit(opts);
+    const session = await loadScript(opts);
     const script = session.script;
     const inFilter = parseInFilter(strOf(opts["in"]));
     const hasActor = strOf(opts["has_actor"]).trim();
@@ -1086,7 +1073,7 @@ export async function commandScenes(opts) {
 }
 // ----- actions --------------------------------------------------------------
 export async function commandActions(opts) {
-    const session = await loadScriptForEdit(opts);
+    const session = await loadScript(opts);
     const script = session.script;
     const inFilter = parseInFilter(strOf(opts["in"]));
     const grep = strOf(opts["grep"]);
@@ -1271,7 +1258,7 @@ function listAssetsByKind(script, kind, opts) {
     return lines;
 }
 export async function commandActors(opts) {
-    const session = await loadScriptForEdit(opts);
+    const session = await loadScript(opts);
     const lines = listAssetsByKind(session.script, "actor", {
         id: strOf(opts["id"]).trim(),
         name: strOf(opts["name"]).trim(),
@@ -1280,7 +1267,7 @@ export async function commandActors(opts) {
     return [buildReport("query.actors", "ACTORS", lines, session.artifactLabel, ["Use `scriptctl rename actor:<id>` / `describe` / `merge` to edit."]), EXIT_OK];
 }
 export async function commandLocations(opts) {
-    const session = await loadScriptForEdit(opts);
+    const session = await loadScript(opts);
     const lines = listAssetsByKind(session.script, "location", {
         id: strOf(opts["id"]).trim(),
         name: strOf(opts["name"]).trim(),
@@ -1289,7 +1276,7 @@ export async function commandLocations(opts) {
     return [buildReport("query.locations", "LOCATIONS", lines, session.artifactLabel, ["Use `scriptctl rename location:<id>` etc. to edit."]), EXIT_OK];
 }
 export async function commandProps(opts) {
-    const session = await loadScriptForEdit(opts);
+    const session = await loadScript(opts);
     const lines = listAssetsByKind(session.script, "prop", {
         id: strOf(opts["id"]).trim(),
         name: strOf(opts["name"]).trim(),
@@ -1298,7 +1285,7 @@ export async function commandProps(opts) {
     return [buildReport("query.props", "PROPS", lines, session.artifactLabel, ["Use `scriptctl rename prop:<id>` etc. to edit."]), EXIT_OK];
 }
 export async function commandAssets(opts) {
-    const session = await loadScriptForEdit(opts);
+    const session = await loadScript(opts);
     const kindFilter = strOf(opts["kind"]).trim();
     const nameOpt = strOf(opts["name"]).trim();
     const idOpt = strOf(opts["id"]).trim();
@@ -1313,7 +1300,7 @@ export async function commandAssets(opts) {
 }
 // ----- speakers -------------------------------------------------------------
 export async function commandSpeakers(opts) {
-    const session = await loadScriptForEdit(opts);
+    const session = await loadScript(opts);
     const script = session.script;
     const idOpt = strOf(opts["id"]).trim();
     const nameOpt = strOf(opts["name"]).trim();
@@ -1336,7 +1323,7 @@ export async function commandSpeakers(opts) {
 }
 // ----- issues ---------------------------------------------------------------
 export async function commandIssues(opts) {
-    const session = await loadScriptForEdit(opts);
+    const session = await loadScript(opts);
     const severityFilter = strOf(opts["severity"]).trim();
     const codeFilter = strOf(opts["code"]).trim();
     const validation = validateSession(session);
@@ -1358,7 +1345,7 @@ export async function commandIssues(opts) {
 }
 // ----- refs (unified reverse lookup) ----------------------------------------
 export async function commandRefs(opts) {
-    const session = await loadScriptForEdit(opts);
+    const session = await loadScript(opts);
     const script = session.script;
     const args = asList(opts["_args"]);
     const target = strOf(args[0]).trim();