dsh-novel-generator 0.1.15 → 0.1.17

package/client.js

@@ -1041,7 +1041,7 @@ body[data-ds-dark-theme] .dsn-shell{color-scheme:dark}
 
     /* ---------------------------------------------------------- outline page */
 
-    function OutlinePage({ detail, chapter, isFirstChapter, onBack, onSaved, notify, onRegisterGuard, requestConfirm }) {
+    function OutlinePage({ detail, chapter, isFirstChapter, onBack, onSaved, notify, onRegisterGuard, requestConfirm, onBusyChange }) {
       const buildForm = useCallback(() => ({
         title: chapter ? chapter.title || '' : '',
         durationDays: chapter && chapter.outline ? chapter.outline.durationDays : (detail.timeline.unitDays || 30),
@@ -1182,6 +1182,22 @@ body[data-ds-dark-theme] .dsn-shell{color-scheme:dark}
         });
       }, [requestConfirm, startJob]);
 
+      // Report the running job upward so the studio can lock itself and warn
+      // before the panel is closed mid-generation.
+      useEffect(() => {
+        if (typeof onBusyChange !== 'function') return;
+        const running = job && job.state === 'running';
+        if (!running) {
+          onBusyChange(null);
+          return undefined;
+        }
+        onBusyChange({
+          label: job.kind === 'compose' ? t('正在自动推演…', 'Deducing…') : t('正在生成章节故事…', 'Generating the chapter…'),
+          message: job.message || '',
+        });
+        return () => onBusyChange(null);
+      }, [job ? job.jobId : null, job ? job.state : null, job ? job.message : null, onBusyChange]);
+
       useEffect(() => {
         if (!job) return;
         if (job.kind === 'generate' && job.state === 'done') {
@@ -1281,6 +1297,21 @@ body[data-ds-dark-theme] .dsn-shell{color-scheme:dark}
               composing ? (job.message || t('正在自动推演…', "Deducing…")) : t('正在生成章节故事…', "Generating the chapter…"))
             : null,
           h('div', { className: 'dsn-spacer' }),
+          generating || composing
+            ? h('button', {
+              className: 'dsn-btn danger ghost',
+              type: 'button',
+              onClick: async () => {
+                try {
+                  await api('/job/cancel', { jobId: job.jobId });
+                  setJob((current) => ({ ...(current || {}), state: 'error', error: t('已手动停止', 'Stopped') }));
+                  notify(t('已请求停止生成', 'Generation stop requested'), 'success');
+                } catch (stopError) {
+                  notify(messageOf(stopError), 'error');
+                }
+              },
+            }, t('停止生成', "Stop"))
+            : null,
           h('button', { className: 'dsn-btn', type: 'button', disabled: !complete || saving || Boolean(generating || composing), onClick: () => submit(false) },
             saving ? t('保存中…', "Saving…") : t('保存', "Save")),
           h('button', {
@@ -1297,7 +1328,7 @@ body[data-ds-dark-theme] .dsn-shell{color-scheme:dark}
      * The only place a chapter is created: word bounds and the story length are
      * required, and one button can deduce the synopsis and write the chapter.
      */
-    function NewChapterDialog({ detail, startDay, onCancel, onCreated, notify }) {
+    function NewChapterDialog({ detail, startDay, onCancel, onCreated, notify, onBusyChange }) {
       const [form, setForm] = useState({
         title: '',
         minWords: 1200,
@@ -1322,6 +1353,20 @@ body[data-ds-dark-theme] .dsn-shell{color-scheme:dark}
 
       const composing = Boolean(job && job.state === 'running' && job.kind === 'compose');
 
+      // A deducing dialog locks the studio behind it and warns before closing.
+      useEffect(() => {
+        if (typeof onBusyChange !== 'function') return undefined;
+        if (!composing) {
+          onBusyChange(null);
+          return undefined;
+        }
+        onBusyChange({
+          label: t('正在自动推演新章节…', 'Deducing a new chapter…'),
+          message: (job && job.message) || '',
+        });
+        return () => onBusyChange(null);
+      }, [composing, job ? job.message : null, onBusyChange]);
+
       const create = useCallback(async () => {
         setBusy(true);
         setError('');
@@ -1485,13 +1530,25 @@ body[data-ds-dark-theme] .dsn-shell{color-scheme:dark}
 
     /* ------------------------------------------------------------- workspace */
 
-    function ProjectWorkspace({ detail, onReload, notify, onRegisterLeaveGuard }) {
+    function ProjectWorkspace({ detail, onReload, notify, onRegisterLeaveGuard, onBusyChange }) {
       const [view, setView] = useState('world');
       const [chapterId, setChapterId] = useState(null);
       // 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;
+      // The same idea for the chapter jobs (自动推演 / 生成章节故事), reported up
+      // by the pages that own them.
+      const [childBusy, setChildBusy] = useState(null);
+      const busy = snapshotJob || childBusy;
+      const snapshotBusy = Boolean(snapshotJob);
+
+      // Tell the shell whether a long operation is in flight, so closing the
+      // panel can ask first.
+      useEffect(() => {
+        if (typeof onBusyChange !== 'function') return undefined;
+        onBusyChange(busy ? { label: busy.label, message: busy.message } : null);
+        return () => onBusyChange(null);
+      }, [busy ? busy.label : null, busy ? busy.message : null, onBusyChange]);
       const [dialogOpen, setDialogOpen] = useState(false);
       const [text, setText] = useState('');
       const [dirty, setDirty] = useState(false);
@@ -1691,14 +1748,14 @@ 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
+        // Any running job owns the work: nothing else may be edited while it
+        // rewrites the novel underneath.
+        busy
           ? 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.'))))
+              h('div', { className: 'dsn-lock-title' }, busy.label),
+              h('div', { className: 'dsn-lock-text' }, busy.message),
+              h('div', { className: 'dsn-lock-hint' }, t('生成期间界面不可操作，完成后会自动刷新', 'The studio is locked while this runs; it refreshes when done.'))))
           : null,
         h('div', { className: 'dsn-track', style: { transform: `translateX(-${trackIndex * 100}%)` } },
           h('section', { className: 'dsn-page' },
@@ -1741,6 +1798,7 @@ body[data-ds-dark-theme] .dsn-shell{color-scheme:dark}
               notify,
               onRegisterGuard: registerOutlineGuard,
               requestConfirm: setConfirmRequest,
+              onBusyChange: setChildBusy,
               isFirstChapter: Boolean(chapter && chapters.length > 0 && chapter.chapterId === chapters[0].chapterId),
             }))),
         confirmRequest
@@ -1789,6 +1847,7 @@ body[data-ds-dark-theme] .dsn-shell{color-scheme:dark}
             onCancel: () => setDialogOpen(false),
             onCreated: created,
             notify,
+            onBusyChange: setChildBusy,
           })
           : null);
     }
@@ -1803,6 +1862,8 @@ body[data-ds-dark-theme] .dsn-shell{color-scheme:dark}
       const [projectId, setProjectId] = useState(null);
       const [detail, setDetail] = useState(null);
       const [toast, setToast] = useToast();
+      // Set while a work runs a model job, so leaving the panel can warn first.
+      const [busyNow, setBusyNow] = useState(null);
       const [modelTarget, setModelTarget] = useState(null);
       const leaveGuard = useRef(null);
       const registerLeaveGuard = useCallback((guard) => {
@@ -1810,13 +1871,21 @@ body[data-ds-dark-theme] .dsn-shell{color-scheme:dark}
       }, []);
       /** Every way out of the studio asks the workspace first. */
       const requestLeave = useCallback((proceed) => {
+        // A running generation outranks the editor guard: say it is still going
+        // before anything closes.
+        if (busyNow) {
+          const label = busyNow.label || t('正在生成', 'Generation is running');
+          if (!window.confirm(t('{label}，现在离开吗？生成会在后台继续，回来时刷新即可看到结果。', '{label} — leave now? It keeps running in the background; reopen the panel later to see the result.', { label }))) return;
+          proceed();
+          return;
+        }
         const guard = leaveGuard.current;
         if (typeof guard === 'function') {
           guard(proceed);
           return;
         }
         proceed();
-      }, []);
+      }, [busyNow]);
       const close = useCallback(() => requestLeave(() => setOverlayOpen(false)), [requestLeave]);
 
       const loadBoot = useCallback(async () => {
@@ -1896,6 +1965,7 @@ body[data-ds-dark-theme] .dsn-shell{color-scheme:dark}
                   onReload: reloadDetail,
                   notify,
                   onRegisterLeaveGuard: registerLeaveGuard,
+                  onBusyChange: setBusyNow,
                 })),
         modelTarget
           ? h(ModelDialog, {

package/index.js

@@ -22,8 +22,12 @@ export const inject = ['webServer'];
 const ROUTE_PREFIX = '/dsh-novel-generator/api';
 /** Largest accepted JSON body: a long chapter plus its outline. */
 const MAX_BODY_BYTES = 8 * 1024 * 1024;
-/** A generation can legitimately take minutes on a long chapter. */
-const AGENT_TIMEOUT_MS = 20 * 60 * 1000;
+/**
+ * How long one model turn may run. A model that ignores the word limit can
+ * stream for many minutes, so the bound keeps the studio responsive; what it
+ * did write is still taken when the turn is cut.
+ */
+const AGENT_TIMEOUT_MS = 6 * 60 * 1000;
 /** Finished jobs stay readable this long for a polling Client. */
 const JOB_TTL_MS = 30 * 60 * 1000;
 
@@ -722,6 +726,34 @@ function wordCount(text) {
   return String(text || '').replace(/\s+/gu, '').length;
 }
 
+/**
+ * Bring a runaway reply back inside the requested length.
+ *
+ * Models that ignore the word range keep streaming until their token cap (one
+ * real reply was 50k characters for a 1200–3500 字 request), which also repeats
+ * itself. The reply is cut at the first sign of a loop and trimmed at a sentence
+ * boundary near the upper bound, so what lands in the chapter is a chapter.
+ */
+function fitChapterText(text, maxWords) {
+  let body = String(text || '').replace(/\r\n/gu, '\n').trim();
+  const limit = Math.max(200, Math.round(Number(maxWords) || 3000));
+  // Drop a leading Markdown title line the prompt asked not to add.
+  body = body.replace(/^#{1,6}\s*[^\n]*\n+/u, '');
+  // A phrase repeated back-to-back is a degenerate loop: stop at the first one.
+  const loop = body.match(/([\s\S]{12,80}?)\1{3,}/u);
+  if (loop) body = body.slice(0, loop.index).trim();
+  if (wordCount(body) <= limit * 1.15) return { text: body, trimmed: false };
+  // Cut on a sentence end as close to the limit as possible.
+  const sentences = body.split(/(?<=[。！？…”』\n])/u);
+  let kept = '';
+  for (const sentence of sentences) {
+    if (wordCount(kept + sentence) > limit) break;
+    kept += sentence;
+  }
+  if (kept.trim() === '') kept = body.slice(0, Math.round(limit * 1.2));
+  return { text: kept.trim(), trimmed: true };
+}
+
 function textOfMessage(message) {
   const blocks = Array.isArray(message && message.content) ? message.content : [];
   return blocks
@@ -859,6 +891,9 @@ async function rebindSession(ctx, root, project) {
     draft.sessionId = sessionId;
   });
   try {
+    // The memo skips projects already grouped; a rebind starts a new session
+    // that has never been grouped, so the entry has to go.
+    ensuredWorkspaces.delete(project.projectId);
     await ensureWorkspace(ctx, root, project);
   } catch {
     // Grouping is cosmetic; the session works either way.
@@ -1101,11 +1136,15 @@ function stretchLines(project, chapter, snapshot) {
 function chapterPrompt(project, chapter, previous) {
   const window = chapterWindow(project, chapter);
   const outline = chapter.outline || {};
+  const minWords = outline.minWords || 800;
+  const maxWords = outline.maxWords || 3000;
   const { snapshot } = snapshotDistance(project, chapter);
   const lines = [];
   lines.push('你现在是这部小说的执笔作者。只输出本章正文，不要解释、不要标题、不要分点提纲。');
+  lines.push(`【篇幅】本章正文必须控制在 ${minWords}～${maxWords} 字之间，写够 ${maxWords} 字附近就收尾，超过 ${maxWords} 字视为不合格。`);
   lines.push('');
-  lines.push(`【本章】第 ${chapter.index + 1} 章 ${chapter.title || ''}（第 ${window.start}→${window.end} 天，跨度 ${chapter.durationDays} 天）`);
+  const shownTitle = chapter.title && !/^第\s*\d+\s*章$/u.test(chapter.title) ? ` ${chapter.title}` : '';
+  lines.push(`【本章】第 ${chapter.index + 1} 章${shownTitle}（第 ${window.start}→${window.end} 天，跨度 ${chapter.durationDays} 天）`);
   lines.push('');
   lines.push('【最近的世界快照】');
   lines.push(snapshotBlock(snapshot));
@@ -1125,7 +1164,7 @@ function chapterPrompt(project, chapter, previous) {
   lines.push('- 以上"已发生的章节梗概"是既定事实，不得改写；本章正文要接着它往下写。');
   lines.push('- 按"本章梗概"把这一章的内容写出来，情节推进、场景与对话要完整。');
   lines.push('- 不要调用任何工具，不要反问，不要输出计划或步骤说明，直接给出最终正文。');
-  lines.push(`- 字数控制在 ${outline.minWords || 800} 到 ${outline.maxWords || 3000} 字之间。`);
+  lines.push(`- 再说一次篇幅：正文 ${minWords}～${maxWords} 字，到 ${maxWords} 字就停笔，不要用重复段落凑字。`);
   lines.push('- 与世界观、角色、势力、物品、事件和人物关系保持一致，不要引入与快照冲突的设定。');
   return lines.join('\n');
 }
@@ -1210,6 +1249,36 @@ function createJobRegistry() {
   return { jobs, put, sweep, get: (id) => jobs.get(id) };
 }
 
+/**
+ * Stop a running job: cancel the work's agent turn, and mark the job so the
+ * Client stops polling it.
+ */
+async function cancelJob(ctx, root, registry, body) {
+  const jobId = asText(body.jobId);
+  const job = registry.get(jobId);
+  if (!job) throw httpError(404, '任务不存在或已过期');
+  const controller = ctx.get('sessionController');
+  let cancelled = false;
+  if (controller && job.projectId) {
+    try {
+      const project = await readProject(root, job.projectId);
+      if (project.sessionId) {
+        controller.cancel({ sessionId: project.sessionId });
+        cancelled = true;
+      }
+    } catch {
+      cancelled = false;
+    }
+  }
+  if (job.state === 'running') {
+    job.state = 'error';
+    job.error = '已手动停止';
+    job.message = '已手动停止';
+    job.finishedAt = Date.now();
+  }
+  return { cancelled, jobId };
+}
+
 function startJob(registry, spec, run) {
   const job = registry.put({
     jobId: randomUUID(),
@@ -1295,7 +1364,7 @@ async function bootstrap(ctx, root) {
     }
   }
   return {
-    revision: '2026-10-20.42',
+    revision: '2026-10-20.45',
     projects,
     models: {
       default: modelCatalog.default || null,
@@ -1841,9 +1910,12 @@ async function startGenerate(ctx, root, registry, body) {
       .filter((entry) => entry.chapterId !== chapter.chapterId && entry.startDay <= chapter.startDay)
       .sort((a, b) => b.startDay - a.startDay)[0] || null;
     job.message = '正在生成章节正文';
-    const content = await askStory(ctx, root, project, chapterPrompt(project, chapter, previous), (note) => {
+    const raw = await askStory(ctx, root, project, chapterPrompt(project, chapter, previous), (note) => {
       job.message = note;
     });
+    const fitted = fitChapterText(raw, (chapter.outline && chapter.outline.maxWords) || 3000);
+    const content = fitted.text;
+    if (fitted.trimmed) job.message = '模型写超了字数，已按上限截断';
     const saved = await mutateProject(root, projectId, (draft) => {
       const target = draft.chapters.find((entry) => entry.chapterId === chapterId);
       if (!target) throw httpError(404, `章节不存在: ${chapterId}`);
@@ -1977,9 +2049,12 @@ async function startCompose(ctx, root, registry, body) {
     const fresh = await readProject(root, projectId);
     const target = fresh.chapters.find((entry) => entry.chapterId === chapterId);
     if (!target) throw httpError(500, '章节写入失败');
-    const content = await askStory(ctx, root, fresh, chapterPrompt(fresh, target, previous), (note) => {
+    const raw = await askStory(ctx, root, fresh, chapterPrompt(fresh, target, previous), (note) => {
       job.message = note;
     });
+    const fitted = fitChapterText(raw, (target.outline && target.outline.maxWords) || 3000);
+    const content = fitted.text;
+    if (fitted.trimmed) job.message = '模型写超了字数，已按上限截断';
 
     await mutateProject(root, projectId, (current) => {
       const entry = current.chapters.find((item) => item.chapterId === chapterId);
@@ -2087,6 +2162,8 @@ async function dispatch(ctx, root, registry, method, path, url, body) {
   }
   if (method !== 'POST') throw httpError(405, '只支持 GET 与 POST');
   switch (path) {
+    case '/job/cancel':
+      return cancelJob(ctx, root, registry, body);
     case '/project/create':
       return createProject(ctx, root, body);
     case '/project/delete': {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-novel-generator",
-  "version": "0.1.15",
+  "version": "0.1.17",
   "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",