dsh-novel-generator 0.1.8 → 0.1.10

package/client.js

@@ -197,6 +197,11 @@ body[data-ds-dark-theme] .dsn-shell{color-scheme:dark}
 
 /* workspace track */
 .dsn-stage{flex:1;position:relative;overflow:hidden;min-width:0}
+.dsn-lock{position:absolute;inset:0;z-index:40;display:flex;align-items:center;justify-content:center;background:color-mix(in srgb, var(--dsw-alias-bg-overlay) 88%, transparent);backdrop-filter:blur(2px);cursor:progress}
+.dsn-lock-box{max-width:420px;padding:20px 24px;border-radius:14px;border:1px solid var(--dsw-alias-border-l1);background:var(--dsw-alias-bg-layer-3);box-shadow:0 18px 48px rgba(0,0,0,.28);text-align:center}
+.dsn-lock-title{font-size:15px;font-weight:600;color:var(--dsw-alias-label-primary)}
+.dsn-lock-text{margin-top:8px;font-size:13px;line-height:1.6;color:var(--dsw-alias-label-secondary);word-break:break-word}
+.dsn-lock-hint{margin-top:10px;font-size:12px;color:var(--dsw-alias-label-tertiary)}
 .dsn-track{display:flex;height:100%;transition:transform .28s ease}
 .dsn-page{width:100%;height:100%;flex:0 0 100%;display:flex;flex-direction:column;min-width:0}
 .dsn-pagehead{display:flex;align-items:center;gap:10px;padding:10px 16px;border-bottom:1px solid var(--dsw-alias-border-l1)}
@@ -1465,7 +1470,10 @@ body[data-ds-dark-theme] .dsn-shell{color-scheme:dark}
     function ProjectWorkspace({ detail, onReload, notify, onRegisterLeaveGuard }) {
       const [view, setView] = useState('world');
       const [chapterId, setChapterId] = useState(null);
-      const [snapshotBusy, setSnapshotBusy] = useState(false);
+      // A running snapshot job: { label, message }. Non-null locks the studio,
+      // because the job keeps rewriting this work's snapshots.
+      const [snapshotJob, setSnapshotJob] = useState(null);
+      const snapshotBusy = snapshotJob !== null;
       const [dialogOpen, setDialogOpen] = useState(false);
       const [text, setText] = useState('');
       const [dirty, setDirty] = useState(false);
@@ -1583,36 +1591,57 @@ body[data-ds-dark-theme] .dsn-shell{color-scheme:dark}
         }
       }, [detail.projectId, onReload, notify]);
 
-      /** Poll one snapshot job until it settles, then refresh the work. */
-      const waitSnapshotJob = useCallback((jobId, doneText) => {
+      /**
+       * Poll one snapshot job until it settles. While it runs the studio stays
+       * locked and the work is reloaded on every tick, so newly written
+       * snapshots appear on the timeline as they land.
+       */
+      const waitSnapshotJob = useCallback((jobId, label, doneText) => {
+        setSnapshotJob({ label, message: label });
+        let failures = 0;
+        const startedAt = Date.now();
         const timer = setInterval(async () => {
           try {
             const job = await api(`/job?id=${encodeURIComponent(jobId)}`);
-            if (job.state === 'running') return;
-            clearInterval(timer);
-            setSnapshotBusy(false);
-            if (job.state === 'done') {
-              notify(doneText, 'success');
+            failures = 0;
+            if (job.state === 'running') {
+              if (Date.now() - startedAt > 45 * 60 * 1000) {
+                clearInterval(timer);
+                setSnapshotJob(null);
+                notify(t('快照任务超时，已解除锁定', 'The snapshot job timed out; the studio is unlocked.'), 'error');
+                return;
+              }
+              setSnapshotJob({ label, message: job.message || label });
               await onReload();
-            } else {
-              notify(job.error || t('世界快照更新失败', "World snapshot update failed"), 'error');
+              return;
             }
-          } catch (error) {
             clearInterval(timer);
-            setSnapshotBusy(false);
-            notify(messageOf(error), 'error');
+            setSnapshotJob(null);
+            await onReload();
+            if (job.state === 'done') notify(doneText, 'success');
+            else notify(job.error || t('世界快照更新失败', "World snapshot update failed"), 'error');
+          } catch (error) {
+            failures += 1;
+            // Three failed polls in a row mean the studio cannot be held.
+            if (failures >= 3) {
+              clearInterval(timer);
+              setSnapshotJob(null);
+              notify(messageOf(error), 'error');
+            }
           }
         }, 2500);
       }, [onReload, notify]);
 
       const refreshSnapshot = useCallback(async (day) => {
-        setSnapshotBusy(true);
         try {
           const started = await api('/snapshot/refresh', { projectId: detail.projectId, day });
           notify(t('正在结算世界快照…', "Settling the world snapshot…"), 'success');
-          waitSnapshotJob(started.jobId, t('世界快照已更新，时间线向前延伸', "World snapshot updated; the timeline moved forward."));
+          waitSnapshotJob(
+            started.jobId,
+            t('正在生成第 {day} 天的世界快照…', 'Generating the world snapshot for day {day}…', { day }),
+            t('世界快照已更新，时间线向前延伸', "World snapshot updated; the timeline moved forward."),
+          );
         } catch (error) {
-          setSnapshotBusy(false);
           notify(messageOf(error), 'error');
         }
       }, [detail.projectId, notify, waitSnapshotJob]);
@@ -1627,13 +1656,14 @@ body[data-ds-dark-theme] .dsn-shell{color-scheme:dark}
           text: t('将清除所有世界快照，并按当前间隔（每 {unit} 天）从第 {unit} 天起逐格重建到第 {end} 天，共 {count} 份。每份都要调用一次模型，耗时较长。', 'Every world snapshot is deleted and rebuilt point by point — {count} of them, from day {unit} to day {end} at the current {unit}-day interval. Each one calls the model, so this takes a while.', { unit, end, count: Math.max(0, Math.floor(end / unit)) }),
           confirmLabel: t('清除并重建', 'Clear and rebuild'),
           action: async () => {
-            setSnapshotBusy(true);
             try {
               const started = await api('/snapshot/reset', { projectId: detail.projectId });
-              notify(t('正在重建世界快照…', 'Rebuilding world snapshots…'), 'success');
-              waitSnapshotJob(started.jobId, t('世界快照已全部重建', 'All world snapshots rebuilt'));
+              waitSnapshotJob(
+                started.jobId,
+                t('正在重建世界快照…', 'Rebuilding world snapshots…'),
+                t('世界快照已全部重建', 'All world snapshots rebuilt'),
+              );
             } catch (error) {
-              setSnapshotBusy(false);
               notify(messageOf(error), 'error');
             }
           },
@@ -1643,6 +1673,15 @@ body[data-ds-dark-theme] .dsn-shell{color-scheme:dark}
       const trackIndex = view === 'world' ? 0 : view === 'story' ? 1 : 2;
 
       return h('div', { className: 'dsn-stage' },
+        // A running snapshot job owns the work: nothing else may be edited
+        // while it rewrites snapshots underneath.
+        snapshotBusy
+          ? h('div', { className: 'dsn-lock' },
+            h('div', { className: 'dsn-lock-box' },
+              h('div', { className: 'dsn-lock-title' }, snapshotJob.label),
+              h('div', { className: 'dsn-lock-text' }, snapshotJob.message),
+              h('div', { className: 'dsn-lock-hint' }, t('快照生成期间界面不可操作，完成后会自动刷新', 'The studio is locked while snapshots are generated; it refreshes when done.'))))
+          : null,
         h('div', { className: 'dsn-track', style: { transform: `translateX(-${trackIndex * 100}%)` } },
           h('section', { className: 'dsn-page' },
             h(WorldPage, {

package/index.js

@@ -1040,8 +1040,10 @@ function snapshotPrompt(project, previous, chapters, pointDay) {
   lines.push('');
   lines.push('要求：');
   lines.push('- 保留上一版中尚未被推翻的设定；角色、势力要包含新登场者；关系用「甲 乙 关系」三段式。');
-  lines.push('- items 记录这段时间出现或变化的关键物品（下落、归属、状态）；没有就给空数组。');
-  lines.push(`- events 记录这段时间发生的具体事件，day 用故事天数（整数，不超过 ${pointDay}），title 一行、desc 一两句，最近的排最前；没有就给空数组。`);
+  lines.push('- items 必填：列出这段时间出现、易手或状态变化的关键物品（法宝、信物、丹药、线索等），每项 name + desc（下落/归属/用途）。');
+  lines.push(`- events 必填：这段时间每发生一件值得记录的事就写一条，day 为故事天数（整数，0~${pointDay}），title 一行，desc 一两句，按 day 从大到小排列。只要这段时间有章节内容，就至少写 1 条。`);
+  lines.push('- 只有这段时间确实没有任何可记录的物品或事件时，才给空数组。');
+  lines.push('注意：输出的 JSON 必须同时包含 items 与 events 两个键，缺任何一个都算不合格（没有内容就写 []）。');
   lines.push('不要调用任何工具，不要反问，只输出这个 JSON。');
   return lines.join('\n');
 }
@@ -1146,7 +1148,7 @@ async function bootstrap(ctx, root) {
     }
   }
   return {
-    revision: '2026-10-20.20',
+    revision: '2026-10-20.28',
     projects,
     models: {
       default: modelCatalog.default || null,
@@ -1505,22 +1507,25 @@ function chaptersForPoint(project, fromDay, point) {
  */
 function registerSnapshot(ctx, root, registry, projectId, targetDay) {
   return startJob(registry, { kind: 'snapshot', projectId }, async (job) => {
+    // The sequence is fixed from the state at the start of the job: recomputing
+    // it every round would regenerate the last point forever once it exists.
+    const initial = await readProject(root, projectId);
+    const unit = Math.max(1, initial.timeline.unitDays || 30);
+    const target = Math.floor(Math.max(1, Math.round(Number(targetDay) || 0)) / unit) * unit;
+    if (target < unit) throw httpError(409, '目标时间还不到一个快照间隔，无法生成世界快照');
+    const startBase = (initial.snapshots || []).filter((snapshot) => snapshot.day < target).pop() || null;
+    let first = (startBase ? startBase.day : 0) + unit;
+    // Nothing new below the target means "redo the target point itself".
+    if (first > target) first = target;
+    const points = [];
+    for (let point = first; point <= target; point += unit) points.push(point);
+
     const made = [];
-    let target = Math.max(1, Math.round(Number(targetDay) || 0));
-    for (;;) {
+    for (const point of points) {
       const project = await readProject(root, projectId);
-      const unit = Math.max(1, project.timeline.unitDays || 30);
-      target = Math.floor(target / unit) * unit;
-      if (target < unit) throw httpError(409, '目标时间还不到一个快照间隔，无法生成世界快照');
-      const snapshots = project.snapshots || [];
-      const base = snapshots.filter((snapshot) => snapshot.day < target).pop() || null;
-      const point = (base ? base.day : 0) + unit;
-      if (point > target) {
-        await exportProjectInfo(await readProject(root, projectId));
-        return { made, target };
-      }
+      const base = (project.snapshots || []).filter((snapshot) => snapshot.day < point).pop() || null;
       const chapters = chaptersForPoint(project, base ? base.day : 0, point);
-      job.message = `正在生成第 ${point} 天的世界快照（第 ${made.length + 1} 份，目标第 ${target} 天）`;
+      job.message = `正在生成第 ${point} 天的世界快照（第 ${made.length + 1}/${points.length} 份，目标第 ${target} 天）`;
       const reply = await askAgent(ctx, project, snapshotPrompt(project, base, chapters, point));
       const parsed = parseJsonReply(reply);
       if (!parsed) throw httpError(502, '模型没有返回可解析的快照 JSON');
@@ -1528,6 +1533,25 @@ function registerSnapshot(ctx, root, registry, projectId, targetDay) {
       if (normalized.world === '' && normalized.characters.length === 0 && normalized.factions.length === 0) {
         throw httpError(502, '模型返回的快照为空');
       }
+      // A chapter boundary is a fact of the work itself, so it seeds the event
+      // list even when the model leaves `events` empty; model-written events win
+      // by title and anything else is added.
+      const seeded = chapters.map((chapter) => {
+        const span = chapterWindow(project, chapter);
+        return {
+          day: span.end,
+          title: chapter.title || `第 ${chapter.index + 1} 章`,
+          desc: ((chapter.outline && chapter.outline.synopsis) || '').slice(0, 120),
+        };
+      });
+      const known = new Set(normalized.events.map((event) => event.title));
+      for (const event of seeded) {
+        if (!known.has(event.title)) {
+          normalized.events.push(event);
+          known.add(event.title);
+        }
+      }
+      normalized.events.sort((a, b) => (b.day === null ? -1 : b.day) - (a.day === null ? -1 : a.day));
       const snapshot = {
         snapshotId: randomUUID(),
         day: point,
@@ -1545,6 +1569,8 @@ function registerSnapshot(ctx, root, registry, projectId, targetDay) {
       await exportSnapshot(project, snapshot);
       made.push(point);
     }
+    await exportProjectInfo(await readProject(root, projectId));
+    return { made, target };
   });
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-novel-generator",
-  "version": "0.1.8",
+  "version": "0.1.10",
   "type": "module",
   "description": "Novel studio for DeepSeek Harness: a draggable story timeline, world snapshots, chapter outlines, and chapters written by the work's own agent.",
   "license": "MIT",