dsh-novel-generator 0.1.12 → 0.1.14

package/README.md

@@ -38,7 +38,8 @@ dsh plugin --profile web add dsh-novel-generator
 - **物品 / 事件**：快照里除了世界观、角色、势力、关系，还有物品（名称 + 下落/用途）和事件（故事天数 + 标题 + 一句话），事件按时间从新到旧排列。
 - **生成依据（统一规则）**：先找本章之前最近的那份世界快照。若「本章起始日 − 快照落点 > 当前间隔」，判定快照过旧，直接拒绝并提示先去时间长河更新快照；否则自动推演用「最近快照 + 快照落点之后、本章之前各章梗概」，写正文在此基础上再加一段「待生成的本章梗概」，并在提示里区分已发生与待生成两部分。
 
-## 数据与接口
+> 侧栏分组：DSH 的分组按目录归属，一个分组只收同目录下的会话，所以不同工作目录的作品会各有一个「小说工坊 · 目录名」分组；空分组与临时目录下的残留分组会被自动清理。
+
 
 
 - **索引文件**：`<DSH_HOME>/novel-studio/projects/<项目id>/project.json`（`DSH_HOME` 缺省为 `~/.dsh`，本机即 `C:\Users\Admin\.dsh\novel-studio`）。时间线、大纲、快照字段都记在这里；`dataDir` 配置可改这块的位置。

package/index.js

@@ -12,7 +12,7 @@
  */
 import { randomUUID } from 'node:crypto';
 import { mkdir, readFile, readdir, rename, rm, rmdir, stat, unlink, writeFile } from 'node:fs/promises';
-import { homedir } from 'node:os';
+import { homedir, tmpdir } from 'node:os';
 import { basename, join } from 'node:path';
 
 export const name = 'dsh-novel-generator';
@@ -859,7 +859,7 @@ async function rebindSession(ctx, root, project) {
     draft.sessionId = sessionId;
   });
   try {
-    await ensureWorkspace(ctx, project);
+    await ensureWorkspace(ctx, root, project);
   } catch {
     // Grouping is cosmetic; the session works either way.
   }
@@ -916,6 +916,15 @@ async function askAgent(ctx, root, project, prompt, onNote) {
     const before = project.sessionId;
     const { controller, agent } = await resolveAgent(ctx, root, project, attempt === 0 ? onNote : undefined);
     if (project.sessionId !== before) rebuilt = true;
+    // Only messages added by THIS prompt are eligible: reading further back
+    // would hand back the previous turn's reply (a snapshot JSON, for one) when
+    // the model stays silent.
+    let seen = 0;
+    try {
+      seen = agent.session.deriveMessages().length;
+    } catch {
+      seen = 0;
+    }
     const admission = new AbortController();
     await withTimeout(controller.prompt({
       sessionId: project.sessionId,
@@ -932,7 +941,7 @@ async function askAgent(ctx, root, project, prompt, onNote) {
       }
     });
     const messages = agent.session.deriveMessages();
-    for (let index = messages.length - 1; index >= 0; index -= 1) {
+    for (let index = messages.length - 1; index >= seen; index -= 1) {
       const message = messages[index];
       if (!message || message.role !== 'assistant') continue;
       const text = textOfMessage(message);
@@ -948,6 +957,36 @@ async function askAgent(ctx, root, project, prompt, onNote) {
     : httpError(502, '模型没有返回任何正文');
 }
 
+/** True when a reply is structured data rather than prose (a snapshot JSON). */
+function looksStructured(text) {
+  const head = String(text || '').trim();
+  if (head === '') return false;
+  if (!head.startsWith('{') && !head.startsWith('[')) {
+    return head.startsWith('```') && (head.includes('"world"') || head.includes('"characters"'));
+  }
+  try {
+    JSON.parse(head);
+    return true;
+  } catch {
+    return head.includes('"world"') || head.includes('"characters"') || head.includes('"synopsis"');
+  }
+}
+
+/**
+ * Ask for prose. A model that answers a writing prompt with JSON (it just
+ * produced a snapshot, say) gets one firm reminder instead of having structured
+ * text saved as the chapter body.
+ */
+async function askStory(ctx, root, project, prompt, onNote) {
+  const first = await askAgent(ctx, root, project, prompt, onNote);
+  if (!looksStructured(first)) return first;
+  if (onNote) onNote('模型返回了结构化数据，正在要求它改写为正文');
+  const retryPrompt = `${prompt}\n\n【纠正】上一轮你返回的是 JSON/结构化数据，那是错的。现在只输出这一章的小说正文（中文散文），不要 JSON、不要字段名、不要标题行。`;
+  const second = await askAgent(ctx, root, project, retryPrompt, onNote);
+  if (looksStructured(second)) throw httpError(502, '模型反复返回结构化数据而不是正文，请稍后重试或换一个模型');
+  return second;
+}
+
 function snapshotBlock(snapshot) {
   if (!snapshot) return '（暂无世界快照，请依据本章梗概自行建立最基本的设定）';
   const lines = [];
@@ -1215,9 +1254,11 @@ async function bootstrap(ctx, root) {
   const projects = await listProjects(root);
   // Repair projects created before sessions were placed in the sidebar group,
   // and stamp works made before folders carried an ownership mark.
+  const workspaceRegistry = ctx.get('workspaceRegistry');
+  if (workspaceRegistry) tidyWorkspaceGroups(workspaceRegistry).catch(() => {});
   for (const project of projects) {
     try {
-      await ensureWorkspace(ctx, project);
+      await ensureWorkspace(ctx, root, project);
     } catch {
       // A missing directory or an older harness simply leaves the session as is.
     }
@@ -1239,7 +1280,7 @@ async function bootstrap(ctx, root) {
     }
   }
   return {
-    revision: '2026-10-20.35',
+    revision: '2026-10-20.40',
     projects,
     models: {
       default: modelCatalog.default || null,
@@ -1322,7 +1363,7 @@ async function createProject(ctx, root, body) {
   // Put the session in a sidebar workspace instead of leaving it ungrouped.
   let workspace = null;
   try {
-    workspace = await ensureWorkspace(ctx, project);
+    workspace = await ensureWorkspace(ctx, root, project);
   } catch (error) {
     const message = `会话已创建，但没能放进「${WORKSPACE_TITLE}」分组：${error instanceof Error ? error.message : String(error)}`;
     warning = warning === null ? message : `${warning} ${message}`;
@@ -1489,14 +1530,18 @@ const WORKSPACE_TITLE = '小说工坊';
 const ensuredWorkspaces = new Set();
 
 /**
- * Put a project's session under a sidebar workspace instead of 未分组: reuse the
- * workspace that owns the project's directory, otherwise create one titled
- * 小说工坊 for it. Idempotent, so bootstrap can repair older projects too.
+ * Put a project's session under a sidebar workspace titled 小说工坊.
+ *
+ * DSH groups sessions by directory: a workspace owns one canonical path, and a
+ * session only shows under the workspace matching its cwd. Works in different
+ * directories therefore need different groups, so each group is titled with its
+ * directory to keep them apart.
  */
-async function ensureWorkspace(ctx, project) {
+async function ensureWorkspace(ctx, root, project) {
   const registry = ctx.get('workspaceRegistry');
   if (!registry || !project || !project.sessionId || !project.cwd) return null;
   if (ensuredWorkspaces.has(project.projectId)) return null;
+
   const attached = registry.list()
     .some((workspace) => Array.isArray(workspace.sessionIds) && workspace.sessionIds.includes(project.sessionId));
   if (attached) {
@@ -1509,12 +1554,46 @@ async function ensureWorkspace(ctx, project) {
   } catch {
     workspace = undefined;
   }
-  if (!workspace) workspace = await registry.create(project.cwd, WORKSPACE_TITLE);
+  if (!workspace) {
+    const label = project.cwd.split(/[\\/]/).filter(Boolean).pop() || '根目录';
+    workspace = await registry.create(project.cwd, `${WORKSPACE_TITLE} · ${label}`);
+  }
   await workspace.attachSession(project.sessionId);
   ensuredWorkspaces.add(project.projectId);
   return workspace;
 }
 
+/** Remove empty groups this plugin leaves behind; never touches a used one. */
+async function tidyWorkspaceGroups(registry) {
+  for (const workspace of registry.list()) {
+    if (!workspace.title.startsWith(WORKSPACE_TITLE)) continue;
+    const sessions = Array.isArray(workspace.sessionIds) ? workspace.sessionIds : [];
+    if (sessions.length === 0) {
+      try {
+        await registry.delete(workspace.id);
+      } catch {
+        // Leaving one empty group is harmless.
+      }
+      continue;
+    }
+    // A group rooted in the OS temp directory can only be a leftover from a
+    // throwaway test work: archive what it holds, then drop the group.
+    if (!workspace.path.toLowerCase().startsWith(tmpdir().toLowerCase())) continue;
+    for (const sessionId of sessions) {
+      try {
+        await registry.archiveSession(sessionId, { stopActivity: true });
+      } catch {
+        // An active session stays; the group stays with it.
+      }
+    }
+    try {
+      await registry.delete(workspace.id);
+    } catch {
+      // The group stays visible if it could not be removed.
+    }
+  }
+}
+
 /**
  * The grid point a new chapter brings the story to, or null when nothing new is
  * due. A chapter spanning several points targets the last point it covers; the
@@ -1719,7 +1798,7 @@ 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 askAgent(ctx, root, project, chapterPrompt(project, chapter, previous), (note) => {
+    const content = await askStory(ctx, root, project, chapterPrompt(project, chapter, previous), (note) => {
       job.message = note;
     });
     const saved = await mutateProject(root, projectId, (draft) => {
@@ -1813,7 +1892,7 @@ async function startCompose(ctx, root, registry, body) {
       job.message = note;
     });
     const deduced = parseJsonReply(deduceReply) || {};
-    const synopsis = asText(firstOf(deduced, ['synopsis', '梗概', 'summary']));
+    const synopsis = asText(firstOf(deduced, ['synopsis', '梗概', '本章梗概']));
     if (synopsis === '') throw httpError(502, '模型没有给出章节梗概');
     const title = draft.title
       || asText(firstOf(deduced, ['title', '标题']))
@@ -1855,7 +1934,7 @@ 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 askAgent(ctx, root, fresh, chapterPrompt(fresh, target, previous), (note) => {
+    const content = await askStory(ctx, root, fresh, chapterPrompt(fresh, target, previous), (note) => {
       job.message = note;
     });
 
@@ -1910,7 +1989,7 @@ async function startDeduce(ctx, root, registry, body) {
     });
     const parsed = parseJsonReply(reply);
     if (!parsed) throw httpError(502, '模型没有返回可解析的大纲 JSON');
-    const synopsis = asText(firstOf(parsed, ['synopsis', '梗概', 'summary']));
+    const synopsis = asText(firstOf(parsed, ['synopsis', '梗概', '本章梗概']));
     const durationDays = Math.max(1, Math.round(Number(firstOf(parsed, ['durationDays', 'duration', '时间长度', 'days'])) || project.timeline.unitDays));
     const minWords = Math.max(1, Math.round(Number(firstOf(parsed, ['minWords', '最低字数'])) || 1200));
     const maxWords = Math.max(minWords + 1, Math.round(Number(firstOf(parsed, ['maxWords', '最多字数'])) || 3500));

package/package.json

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