@yangda611/dsh-scriptor 8.4.6 → 8.4.8

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/README.md CHANGED
@@ -1,23 +1,23 @@
1
1
  # Webnovel Writer · 网文写作工作台
2
2
 
3
- Scriptor 8.4.6 适配 DSH 0.2.2-rc.1。安装范围为 `>=0.2.2-rc.1 <0.3.0-0`,Node最低24.9;实际验证按具体版本记录。
3
+ Scriptor 8.4.8 适配 DSH 0.2.2-rc.1。安装范围为 `>=0.2.2-rc.1 <0.3.0-0`,Node最低24.9;实际验证按具体版本记录。
4
4
 
5
5
  [产品主页](https://yangda611.github.io/dsh-scriptor-full/) · [新手教程](https://yangda611.github.io/dsh-scriptor-full/docs/beginner.html)
6
6
 
7
- > Scriptor 8.4.6 配套 **DSH 0.2.2-rc.1**。旧格式先备份并使用书仓维护预览,按明确批准执行升级。
7
+ > Scriptor 8.4.8 配套 **DSH 0.2.2-rc.1**。旧格式先备份并使用书仓维护预览,按明确批准执行升级。
8
8
 
9
- DSH 插件 `@yangda611/dsh-scriptor` 提供写作工作台。8.4.6包含14个写作与维护技能和八个脚本入口。
9
+ DSH 插件 `@yangda611/dsh-scriptor` 提供写作工作台。8.4.8包含14个写作与维护技能和八个脚本入口。
10
10
  要求 Node.js至少24.9,DSH 0.2.2-rc.1。许可证 GPL-3.0-only。
11
11
 
12
12
  ## 安装
13
13
 
14
- 在 DSH 0.2.2-rc.1 桌面端侧栏打开“插件 → 添加插件”,输入 `@yangda611/dsh-scriptor@8.4.6`,核对后安装并应用变更。桌面端自带运行时,不需要另外安装 Node/pnpm。
14
+ 在 DSH 0.2.2-rc.1 桌面端侧栏打开“插件 → 添加插件”,输入 `@yangda611/dsh-scriptor@8.4.8`,核对后安装并应用变更。桌面端自带运行时,不需要另外安装 Node/pnpm。
15
15
 
16
16
  以下是进阶用户创建独立 Web profile 的方式,不用于桌面端保留的 `desktop` profile:
17
17
 
18
18
  ```powershell
19
19
  dsh --profile webnovel --from-default-profile web --dump-config
20
- dsh plugin --profile webnovel add C:/scriptor-dist/yangda611-dsh-scriptor-8.4.6.tgz
20
+ dsh plugin --profile webnovel add C:/scriptor-dist/yangda611-dsh-scriptor-8.4.8.tgz
21
21
  dsh --profile webnovel --host 127.0.0.1 --port 6104 --no-open
22
22
  ```
23
23
 
@@ -27,7 +27,7 @@ dsh --profile webnovel --host 127.0.0.1 --port 6104 --no-open
27
27
 
28
28
  ## 更新与卸载
29
29
 
30
- 先停止指定 profile 的运行实例,再安装目标精确版本并重启(本版为 `C:/scriptor-dist/yangda611-dsh-scriptor-8.4.6.tgz`)。
30
+ 先停止指定 profile 的运行实例,再安装目标精确版本并重启(本版为 `C:/scriptor-dist/yangda611-dsh-scriptor-8.4.8.tgz`)。
31
31
  卸载后可执行上面的安装命令重装:
32
32
 
33
33
  ```powershell
@@ -37,7 +37,7 @@ dsh --profile webnovel --dump-config
37
37
 
38
38
  卸载插件不会删除作品书仓。安装不需要源码、安装时构建或 npm 账号。tarball 放在无空格目录,并核对对应 Release 提供的 SHA256。首次下载宿主依赖仍可能需要网络。
39
39
 
40
- ## 8.4.6 更新与旧项目升级
40
+ ## 8.4.8 更新与旧项目升级
41
41
 
42
42
  本二开版保持原有的千章关系星团、证据轨迹、原生设置与书仓维护能力。先升级到 DSH 0.2.2-rc.1,再更新已用插件。旧格式须先备份,检查并预览整仓升级;正常读取不再转换旧字段。升级后新建写作模式对话,打开原工作区继续;旧对话不会自动迁移。
43
43
 
@@ -49,7 +49,7 @@ dsh --profile webnovel --dump-config
49
49
 
50
50
  ## 公开文档
51
51
 
52
- 当前主包 8.4.6。完整的安装、配置、首章和备份教程见 [公开使用文档](https://github.com/yangda611/dsh-scriptor-full/tree/main/docs/user)。
52
+ 当前主包 8.4.8。完整的安装、配置、首章和备份教程见 [公开使用文档](https://github.com/yangda611/dsh-scriptor-full/tree/main/docs/user)。
53
53
 
54
54
  第三方组件的原始声明见 [THIRD_PARTY_NOTICES.md](THIRD_PARTY_NOTICES.md),许可证文本随包放在 licenses/。源码及校验和由对应的 GitHub Release 提供。
55
55
 
package/lib/cli.js CHANGED
@@ -11334,6 +11334,11 @@ function inside(root, rel) {
11334
11334
  if (!isInsideCanonicalRoot(root, abs)) throw new Error(`\u4E8B\u52A1\u8DEF\u5F84\u9003\u9038\u4E66\u4ED3\uFF1A${rel}`);
11335
11335
  return abs;
11336
11336
  }
11337
+ function hasReservedTopLevel(relPath) {
11338
+ let first = relPath.split("/")[0]?.toLowerCase() ?? "";
11339
+ if (process.platform === "win32") first = first.replace(/[. ]+$/, "");
11340
+ return first === RUNTIME_DIR || first === ".git";
11341
+ }
11337
11342
  function writeDurable(file, content, flag = "wx") {
11338
11343
  const fd = fs6.openSync(file, flag, 438);
11339
11344
  try {
@@ -11668,11 +11673,16 @@ function runLocked(root, ops, options2) {
11668
11673
  const id = `${Date.now().toString(36)}-${process.pid}-${randomBytes(5).toString("hex")}`;
11669
11674
  const normalized = ops.map((op) => ({ relPath: safeRel(op.relPath), content: op.content }));
11670
11675
  for (const op of normalized) {
11671
- const first = op.relPath.split("/")[0]?.toLowerCase();
11672
- if (first === RUNTIME_DIR || first === ".git") throw new Error(`\u4E8B\u52A1\u76EE\u6807\u4E3A\u4FDD\u7559\u8DEF\u5F84\uFF1A${op.relPath}`);
11676
+ if (hasReservedTopLevel(op.relPath)) throw new Error(`\u4E8B\u52A1\u76EE\u6807\u4E3A\u4FDD\u7559\u8DEF\u5F84\uFF1A${op.relPath}`);
11673
11677
  inside(root, op.relPath);
11674
11678
  }
11675
- if (new Set(normalized.map((op) => op.relPath)).size !== normalized.length) {
11679
+ const targets = normalized.map((op) => {
11680
+ const target = canonicalizePath(inside(root, op.relPath));
11681
+ const relative10 = path6.relative(root, target).split(path6.sep).map((part) => process.platform === "win32" ? part.replace(/[. ]+$/, "").toLowerCase() : part).join("/");
11682
+ if (hasReservedTopLevel(relative10)) throw new Error(`\u4E8B\u52A1\u76EE\u6807\u4E3A\u4FDD\u7559\u8DEF\u5F84\uFF1A${op.relPath}`);
11683
+ return relative10;
11684
+ });
11685
+ if (new Set(targets).size !== normalized.length) {
11676
11686
  throw new Error("\u4E8B\u52A1\u76EE\u6807\u8DEF\u5F84\u91CD\u590D");
11677
11687
  }
11678
11688
  const txRoot = path6.join(root, TRANSACTION_DIR, id);
@@ -18851,10 +18861,10 @@ function computeScreenplayExport(bookRoot, options2) {
18851
18861
  if (options2.\u5F62\u6001 !== "\u7535\u5F71\u5267\u672C" && options2.\u5F62\u6001 !== "\u77ED\u5267") return fail3(["\u5BFC\u51FA\u5F62\u6001\u5FC5\u987B\u662F \u7535\u5F71\u5267\u672C \u6216 \u77ED\u5267"]);
18852
18862
  const \u683C\u5F0F = options2.\u683C\u5F0F ?? "storyboard";
18853
18863
  if (\u683C\u5F0F !== "storyboard" && \u683C\u5F0F !== "master-scene" && \u683C\u5F0F !== "fountain" && \u683C\u5F0F !== "both") {
18854
- return fail3(["\u5BFC\u51FA\u683C\u5F0F\u5FC5\u987B\u662F storyboard\u3001master-scene\u3001fountain \u6216 both\uFF08\u65E7\u503C markdown \u5DF2\u5E9F\u5F03\uFF1A\u7535\u5F71\u9ED8\u8BA4 storyboard\uFF0C\u6B21\u8981\u5BFC\u51FA\u7528 master-scene\uFF09"]);
18864
+ return fail3(["\u5BFC\u51FA\u683C\u5F0F\u5FC5\u987B\u662F storyboard\u3001master-scene\u3001fountain \u6216 both\u3002\u65E7\u503C markdown \u5DF2\u5E9F\u5F03\u3002\u7535\u5F71\u9ED8\u8BA4 storyboard\uFF0C\u6B21\u8981\u5BFC\u51FA\u7528 master-scene\u3002"]);
18855
18865
  }
18856
18866
  if (options2.\u5F62\u6001 === "\u77ED\u5267" && \u683C\u5F0F === "master-scene") {
18857
- return fail3(["\u77ED\u5267\u6CA1\u6709 master-scene \u5F62\u6001\uFF08\u77ED\u5267\u5267\u672C\u672C\u8EAB\u5C31\u662F\u5206\u955C\u5267\u672C\uFF09\uFF1A\u7528 storyboard\uFF08\u9ED8\u8BA4\uFF09\u3001fountain \u6216 both"]);
18867
+ return fail3(["\u77ED\u5267\u6CA1\u6709 master-scene \u5F62\u6001\uFF0C\u77ED\u5267\u5267\u672C\u672C\u8EAB\u5C31\u662F\u5206\u955C\u5267\u672C\u3002\u8BF7\u7528 storyboard\uFF08\u9ED8\u8BA4\uFF09\u3001fountain \u6216 both\u3002"]);
18858
18868
  }
18859
18869
  if (options2.\u5F62\u6001 === "\u77ED\u5267" && (options2.\u96C6 === void 0 || !Number.isSafeInteger(options2.\u96C6) || options2.\u96C6 < 1 || options2.\u96C6 > 100)) {
18860
18870
  return fail3(["\u77ED\u5267\u5BFC\u51FA\u5FC5\u987B\u4F20 --\u96C6 1\u2013100 \u7684\u96C6\u53F7"]);
@@ -18877,9 +18887,9 @@ function computeScreenplayExport(bookRoot, options2) {
18877
18887
  const \u5B9A\u7A3F\u76F8\u5BF9\u8DEF\u5F84 = options2.\u5F62\u6001 === "\u7535\u5F71\u5267\u672C" ? paths.\u7535\u5F71\u5267\u672C() : paths.\u77ED\u5267\u96C6(options2.\u96C6);
18878
18888
  let source;
18879
18889
  try {
18880
- source = fs39.readFileSync(path44.join(root, \u5B9A\u7A3F\u76F8\u5BF9\u8DEF\u5F84), "utf-8");
18881
- } catch {
18882
- return fail3([`\u5267\u672C\u5B9A\u7A3F\u4E0D\u5B58\u5728\uFF1A${\u5B9A\u7A3F\u76F8\u5BF9\u8DEF\u5F84}\uFF08\u5148\u628A\u5267\u672C\u5B9A\u7A3F\u5230 \u5267\u672C/ \u76EE\u5F55\uFF0C\u89C1 docs/book-format.md\u300C\u5267\u672C\u5B9A\u7A3F\u76EE\u5F55\u300D\uFF09`]);
18890
+ source = readMaterialFile(root, \u5B9A\u7A3F\u76F8\u5BF9\u8DEF\u5F84).text;
18891
+ } catch (error) {
18892
+ return fail3([`\u5267\u672C\u5B9A\u7A3F\u8BFB\u53D6\u5931\u8D25\uFF1A${\u5B9A\u7A3F\u76F8\u5BF9\u8DEF\u5F84}\uFF08${error instanceof Error ? error.message : String(error)}\uFF09\u3002\u8BF7\u5148\u628A\u5267\u672C\u5B9A\u7A3F\u5230 \u5267\u672C/ \u76EE\u5F55\u3002\u76EE\u5F55\u7EA6\u5B9A\u89C1 docs/book-format.md\u300C\u5267\u672C\u5B9A\u7A3F\u76EE\u5F55\u300D\u3002`]);
18883
18893
  }
18884
18894
  const stem = safeFileStem(\u4E66\u540D);
18885
18895
  if (options2.\u603B\u7EB2 !== void 0) \u603B\u7EB2\u6587\u4EF6 = `${stem}-\u603B\u7EB2.md`;
@@ -18945,6 +18955,7 @@ function computeScreenplayExport(bookRoot, options2) {
18945
18955
  const parsed = parseEpisodeScript(source);
18946
18956
  if (!parsed.ok || parsed.episode === void 0) return fail3(parsed.problems);
18947
18957
  const episode = parsed.episode;
18958
+ if (episode.\u96C6 !== options2.\u96C6) return fail3(["\u96C6\u53F7\u4E0D\u4E00\u81F4\uFF1A\u5B9A\u7A3F\u6587\u4EF6\u540D\u548C\u5267\u672C\u6B63\u6587\u5FC5\u987B\u5C5E\u4E8E\u540C\u4E00\u96C6"]);
18948
18959
  let rendered;
18949
18960
  try {
18950
18961
  rendered = renderEpisodeScript(episode);
@@ -19419,12 +19430,14 @@ function ingestAuthorRevisionLocked(bookRoot, key, body) {
19419
19430
  const baseVer = parent === null ? initialVersion("\u4F5C\u8005\u624B\u6539") : bumpVersion(parent, "\u4F5C\u8005\u624B\u6539");
19420
19431
  const ver = { ...baseVer, \u751F\u6210\u6A21\u5757: "\u4F5C\u8005\u624B\u6539" };
19421
19432
  const relPath = path46.posix.join(paths.\u8349\u7A3F\u76EE\u5F55(key.\u5377, key.\u7AE0\u540D), nextDraftFileName(bookRoot, key));
19422
- demoteOtherPendingDrafts(bookRoot, key, relPath);
19423
19433
  const fields = applyVersionFields(
19424
19434
  { ...doc.data.fields, \u89D2\u8272: "\u5F85\u5BA1\u7A3F", \u9009\u5B9A: true },
19425
19435
  ver
19426
19436
  );
19427
- writeFileAtomic(bookRoot, relPath, serializeDocument(fields, body, \u8349\u7A3F\u5B57\u6BB5\u5E8F));
19437
+ writeBatchAtomic(bookRoot, [
19438
+ ...prepareDraftDemotions(bookRoot, key, relPath),
19439
+ { relPath, content: serializeDocument(fields, body, \u8349\u7A3F\u5B57\u6BB5\u5E8F) }
19440
+ ]);
19428
19441
  const record = loadReviewRecord(bookRoot, key);
19429
19442
  const followup = followupReport(bookRoot, key, body, record);
19430
19443
  const diff = lineDiff(parentBody, body);
@@ -19628,12 +19641,8 @@ function readText8(root, rel) {
19628
19641
  return null;
19629
19642
  }
19630
19643
  }
19631
- function bodyOnly2(text) {
19632
- const r2 = parseDocument(text);
19633
- return (r2.ok ? r2.data.body : text).trim();
19634
- }
19635
19644
  function stripSummaryHeading2(text) {
19636
- return bodyOnly2(text).replace(/^#\s*章摘要\s*\n+/, "").trim();
19645
+ return text.trim().replace(/^#\s*章摘要\s*\n+/, "").trim();
19637
19646
  }
19638
19647
  function extractSection2(body, title) {
19639
19648
  const lines = body.replace(/\r\n/g, "\n").split("\n");
@@ -19673,7 +19682,9 @@ function computeVolumeSummaryCandidate(bookRoot, \u5377) {
19673
19682
  \u7F3A\u7AE0\u6458\u8981.push(c.\u7AE0);
19674
19683
  continue;
19675
19684
  }
19676
- const content = stripSummaryHeading2(text);
19685
+ const parsed = parseDocument(text);
19686
+ if (!parsed.ok) return { ok: false, reason: `\u7AE0\u6458\u8981\u89E3\u6790\u5931\u8D25\uFF1A${rel}\uFF1B${parsed.detail}\uFF0C\u4E0D\u4EA7\u5019\u9009\u4E0D\u843D\u76D8`, \u7F3A\u7AE0\u6458\u8981: [] };
19687
+ const content = stripSummaryHeading2(parsed.data.body);
19677
19688
  if (content === "" || content === "\uFF08\u65E0\u6458\u8981\u6C89\u6DC0\uFF09") {
19678
19689
  \u7F3A\u7AE0\u6458\u8981.push(c.\u7AE0);
19679
19690
  continue;
@@ -19708,7 +19719,9 @@ ${content}`);
19708
19719
  }
19709
19720
  const \u7EBF\u7D22\u6BB5 = \u7EBF\u7D22\u6BB5Parts.join("\n");
19710
19721
  const \u5377\u7EB2\u6587 = readText8(bookRoot, paths.\u5377\u7EB2(\u5377));
19711
- const \u5377\u672B\u5151\u73B0 = \u5377\u7EB2\u6587 === null ? null : extractSection2(bodyOnly2(\u5377\u7EB2\u6587), "\u5377\u672B\u5151\u73B0");
19722
+ const \u5377\u7EB2 = \u5377\u7EB2\u6587 === null ? null : parseDocument(\u5377\u7EB2\u6587);
19723
+ if (\u5377\u7EB2 !== null && !\u5377\u7EB2.ok) return { ok: false, reason: `\u5377\u7EB2\u89E3\u6790\u5931\u8D25\uFF1A${paths.\u5377\u7EB2(\u5377)}\uFF1B${\u5377\u7EB2.detail}\uFF0C\u4E0D\u4EA7\u5019\u9009\u4E0D\u843D\u76D8`, \u7F3A\u7AE0\u6458\u8981: [] };
19724
+ const \u5377\u672B\u5151\u73B0 = \u5377\u7EB2 === null ? null : extractSection2(\u5377\u7EB2.data.body, "\u5377\u672B\u5151\u73B0");
19712
19725
  const \u5019\u9009 = [
19713
19726
  "# \u5377\u6458\u8981",
19714
19727
  "",
@@ -20424,6 +20437,9 @@ function ingestFindingsLocked(bookRoot, key, \u6A21\u5757\u540D, rawFindings, ex
20424
20437
  if (check === void 0) {
20425
20438
  return { ok: false, reason: `\u672A\u6CE8\u518C\u7684\u5BA1\u8BFB\u6A21\u5757:${\u6A21\u5757\u540D}`, record: null };
20426
20439
  }
20440
+ if (check.\u9002\u7528\u8303\u56F4 !== "\u7AE0") {
20441
+ return { ok: false, reason: `\u5BA1\u8BFB\u6A21\u5757 ${\u6A21\u5757\u540D} \u9002\u7528\u8303\u56F4\u662F ${check.\u9002\u7528\u8303\u56F4}\uFF0C\u4E0D\u80FD\u56DE\u5199\u8FDB\u7AE0\u7684\u5BA1\u6838\u8BB0\u5F55`, record: null };
20442
+ }
20427
20443
  const authorOpinion = check.\u6267\u884C\u5F62\u6001 === "\u4F5C\u8005";
20428
20444
  if (!authorOpinion && (typeof expectedFingerprint !== "string" || expectedFingerprint.trim() === "")) {
20429
20445
  return { ok: false, reason: "\u81EA\u52A8\u5BA1\u8BFB\u7ED3\u679C\u5FC5\u987B\u643A\u5E26\u5BA1\u8BFB\u6307\u7EB9\uFF1A\u6BCF\u4E2A\u6A21\u5757\u56DE\u5199\u5747\u9700\u63D0\u4F9B\u5B9E\u9645\u5BA1\u8BFB\u8F93\u5165\u7684\u6307\u7EB9\uFF0C\u8BF7\u91CD\u65B0\u8FD0\u884C\u5BA1\u6838", record: null };
@@ -20554,6 +20570,9 @@ function computeScreenplayReview(bookRoot, input) {
20554
20570
  }
20555
20571
  function computeEpisodeReview(bookRoot, key, input) {
20556
20572
  registerFilmDramaChecks();
20573
+ if (key.\u96C6 !== input.\u5267\u672C.\u96C6 || key.\u96C6 !== input.\u5927\u7EB2.\u96C6) {
20574
+ return { ok: false, reason: "\u96C6\u53F7\u4E0D\u4E00\u81F4\uFF1A\u5BA1\u6838\u8BB0\u5F55\u3001\u5355\u96C6\u5267\u672C\u548C\u5206\u96C6\u5927\u7EB2\u5FC5\u987B\u5C5E\u4E8E\u540C\u4E00\u96C6", record: null };
20575
+ }
20557
20576
  const \u5267\u672C\u6587\u672C = renderEpisodeScript(input.\u5267\u672C).\u5185\u5BB9;
20558
20577
  const computed = computeEpisodeFindings({ \u96C6: key.\u96C6, \u5267\u672C: input.\u5267\u672C, \u5267\u672C\u6587\u672C, \u5927\u7EB2: input.\u5927\u7EB2, \u6750\u6599\u7248\u672C: input.\u6750\u6599\u7248\u672C });
20559
20578
  const existing = loadEpisodeReviewRecord(bookRoot, key.\u96C6) ?? emptyReviewRecord();