@ninkch/dsh-infinite-canvas 0.17.13 → 0.17.15

package/index.js

@@ -8,7 +8,7 @@
  */
 import { spawn } from 'node:child_process';
 import fs from 'node:fs/promises';
-import { createReadStream, createWriteStream, existsSync, mkdirSync, readFileSync, readdirSync, renameSync, rmSync, statSync, unlinkSync, writeFileSync } from 'node:fs';
+import { createReadStream, createWriteStream, existsSync, lstatSync, mkdirSync, readFileSync, readdirSync, renameSync, rmdirSync, statSync, unlinkSync, writeFileSync } from 'node:fs';
 import os from 'node:os';
 import path from 'node:path';
 import { fileURLToPath } from 'node:url';
@@ -110,6 +110,23 @@ async function ensureBundleEntry(profileDir, pkg) {
 // 配置存在 ~/.dsh/infinite-canvas/config.json：跨重装/重启稳定，绝不放进包目录。
 const CONFIG_PATH = process.env.DSH_IC_CONFIG_PATH || path.join(os.homedir(), '.dsh', 'infinite-canvas', 'config.json');
 
+/** 安全递归删除目录。
+ *  **禁止用 fs.rmSync(recursive)**：本机 Node（24.x / Windows）在**中文路径**上会原生崩溃
+ *  （STATUS_STACK_BUFFER_OVERRUN，直接把宿主进程带走——删一个中文名项目就能打崩 DSH）。
+ *  这里逐层 readdir + unlink/rmdir，走的是不同的系统调用路径，实测稳定。 */
+function rmrf(target) {
+  let st;
+  try { st = lstatSync(target); } catch { return; } // 不存在 = 已删干净
+  if (!st.isDirectory()) {
+    try { unlinkSync(target); } catch { /* 被占用则残留，无碍 */ }
+    return;
+  }
+  let names = [];
+  try { names = readdirSync(target); } catch { return; }
+  for (const name of names) rmrf(path.join(target, name));
+  try { rmdirSync(target); } catch { /* 被占用则残留，无碍 */ }
+}
+
 function readIcConfig() {
   try { return JSON.parse(readFileSync(CONFIG_PATH, 'utf8')) || {}; } catch { return {}; }
 }
@@ -284,9 +301,7 @@ function removeDataRootProject(pid) {
   const entry = meta.projects.find((p) => p.id === pid);
   meta.projects = meta.projects.filter((p) => p.id !== pid);
   writeDataRootMeta(meta);
-  if (entry) {
-    try { rmSync(path.join(root, 'projects', entry.folder), { recursive: true, force: true }); } catch { /* 占用时残留，无碍 */ }
-  }
+  if (entry) rmrf(path.join(root, 'projects', entry.folder));
 }
 /** 一次性迁移/对齐数据目录布局：旧 pid 文件夹 → 项目名文件夹，并镜像全部项目文档。 */
 function dataRootMigrate() {
@@ -321,7 +336,7 @@ function dataRootMigrate() {
             if (!existsSync(to)) { renameSync(from, to); filesMoved++; }
           }
         }
-        rmSync(oldDir, { recursive: true, force: true });
+        rmrf(oldDir);
       } catch { /* 目录被占用：保留旧目录，下轮再试 */ }
     }
     mirrorProjectToDataRoot(id, doc);
@@ -597,6 +612,17 @@ async function projectsPut(args) {
     if (!dead.has(nid)) merged[nid] = n;
     else delete merged[nid];
   }
+  // 竞态防护：客户端推来的分镜表没有 shots，而 Host 上已有 shots → 保留 Host 的 shots
+  // （客户端旧快照推送会覆盖刚生成的分镜，导致"跑下一个时上一个被清空"）
+  for (const [nid, n] of Object.entries(merged)) {
+    if (!n || n.type !== 'storyboard') continue;
+    const hasNew = Array.isArray(n.data && n.data.shots) && n.data.shots.length;
+    if (hasNew) continue;
+    const prevN = (prev.nodes || {})[nid];
+    if (prevN && prevN.type === 'storyboard' && Array.isArray(prevN.data && prevN.data.shots) && prevN.data.shots.length) {
+      n.data = { ...(n.data || {}), shots: prevN.data.shots, warnings: prevN.data.warnings || [] };
+    }
+  }
   const edgeOk = (e) => e && !deadEdges.has(e.id) && merged[e.fromNode] && merged[e.toNode];
   const clientEdges = (doc.edges || []).filter(edgeOk);
   const prevEdges = (prev.edges || []).filter(edgeOk);
@@ -749,11 +775,42 @@ function agentNode(kind, text, x, y, label) {
   if (label) data.label = String(label).slice(0, 40);
   return { id, type: isText ? 'text' : 'script', x, y, w: isText ? 260 : 320, h: 100, data };
 }
-function nextNodePos(doc) {
-  let maxX = 0;
-  let maxY = 40;
-  for (const n of Object.values(doc.nodes || {})) { if ((n.x || 0) + (n.w || 240) > maxX) { maxX = (n.x || 0) + (n.w || 240); maxY = n.y || 40; } }
-  return { x: maxX + 60, y: maxY };
+/** 新节点布局（用户设计）：
+ *  1) 有 connectFrom 源 → 放在源节点右侧同一行（串联节点横向成对）；
+ *  2) 无连线 → 同类型竖向成列（排在该类型最后一个节点下方，新起一行）；
+ *  3) 碰撞检测：候选位置与任何现有节点（含最小间距 28px）相交 → 自动下移到该节点下方，绝不重叠。 */
+function nextNodePos(doc, type, connectFromId) {
+  const GAP_X = 60, GAP_Y = 40, MIN_GAP = 28;
+  const H = (n) => Number(n && n.h) || 160;
+  const W = (n) => Number(n && n.w) || 280;
+  const nodes = Object.values(doc.nodes || {});
+  const EST_H = { storyboard: 560, 'video-gen': 620, 'image-gen': 560, script: 420, finalcut: 420, text: 220 };
+  const estH = EST_H[type] || 300;
+  const estW = type === 'finalcut' ? 300 : 280;
+  let x = 80;
+  let y = 40;
+  if (connectFromId && doc.nodes && doc.nodes[connectFromId]) {
+    const src = doc.nodes[connectFromId];
+    x = (src.x || 0) + W(src) + GAP_X;
+    y = src.y || 40;
+  } else {
+    const same = nodes.filter((n) => n.type === type);
+    if (same.length) {
+      // 同类型竖向成列：跟在同类型最后一个节点下方
+      x = Math.min(...same.map((n) => n.x || 0));
+      y = Math.max(...same.map((n) => (n.y || 0) + H(n))) + GAP_Y;
+    } else if (nodes.length) {
+      // 该类型还没有节点 → 在最右侧另起一列（绝不插进已有列里跟别的类型混排）
+      x = Math.max(...nodes.map((n) => (n.x || 0) + W(n))) + GAP_X;
+      y = Math.min(...nodes.map((n) => n.y || 0));
+    }
+  }
+  const hit = (yy) => nodes.find((n) => (n.x || 0) < x + estW + MIN_GAP && (n.x || 0) + W(n) + MIN_GAP > x
+    && (n.y || 0) < yy + estH + MIN_GAP && (n.y || 0) + H(n) + MIN_GAP > yy);
+  let blocker = hit(y);
+  let guard = 0;
+  while (blocker && guard++ < 80) { y = (blocker.y || 0) + H(blocker) + MIN_GAP; blocker = hit(y); }
+  return { x, y };
 }
 // ---------- 内置技能（操作规程 + 创作方法论，约束并提升对话的画布创作）----------
 // canvas-studio＝操作硬约束；canvas-craft＝剧本/分镜/提示词创作方法论
@@ -1042,10 +1099,10 @@ function canvasCreateNode(args) {
   if (!['script', 'text', 'image-gen', 'video-gen', 'storyboard', 'finalcut'].includes(type)) throw new Error('不支持的节点类型: ' + type);
   const label = args && args.name ? String(args.name).slice(0, 40) : '';
   const prompt = String((args && args.prompt) || '');
-  const pos = nextNodePos(doc);
+  const connectFrom = String((args && args.connectFrom) || '');
+  const pos = nextNodePos(doc, type, connectFrom);
   let connected = null;
   let autoConnected = null;
-  const connectFrom = String((args && args.connectFrom) || '');
   let node;
   if (type === 'image-gen') {
     node = agentNode('text', '', pos.x, pos.y, label || '图片生成');
@@ -1099,11 +1156,14 @@ function canvasCreateNode(args) {
   const explicitConnect = Boolean(connectFrom);
   if (connectFrom) {
     if (!doc.nodes[connectFrom]) throw new Error('connectFrom 指向的节点不存在: ' + connectFrom);
-    const edge = connectEdge(doc, connectFrom, node.id, args && args.connectFromPort, args && args.connectToPort);
+    // 分镜表默认连「剧本来源」口（script），而不是输入队列里的第一个口（prev）——场景文本是剧本来源，不是承接来源
+    const srcType = doc.nodes[connectFrom] && doc.nodes[connectFrom].type;
+    const defaultToPort = (type === 'storyboard' && (srcType === 'text' || srcType === 'script')) ? 'script' : undefined;
+    const edge = connectEdge(doc, connectFrom, node.id, args && args.connectFromPort, (args && args.connectToPort) || defaultToPort);
     connected = edge.id;
   } else if (autoConnected && (type === 'storyboard' || type === 'video-gen')) {
     // 未指定连线但上游已存在（分镜表→剧本 / 视频生成→分镜表）→ 默认自动连线（工作流的默认形态，不依赖 Agent 记得）
-    const edge = connectEdge(doc, autoConnected.from, node.id);
+    const edge = connectEdge(doc, autoConnected.from, node.id, undefined, type === 'storyboard' ? 'script' : undefined);
     connected = edge.id;
   }
   doc.updatedAt = Date.now();
@@ -1119,6 +1179,62 @@ function canvasCreateNode(args) {
   return { ok: true, projectId: id, nodeId: node.id, type: node.type, label: (node.data && node.data.label) || '', edgeId: connected || undefined, note: note || undefined };
 }
 
+/** 一键重排：按「行」布局——横向数据流决定列，竖向端口（prev/frame）不参与分列；
+ *  每行 = 一个横向连通分量（如「场N文本 ↔ 场N分镜表」），行内同 y 横向配对，
+ *  行高取行内最高节点、行间保留间距，绝不重叠。 */
+function canvasRelayout(args) {
+  const id = String((args && args.projectId) || '');
+  const doc = readDoc(id);
+  const nodes = Object.values(doc.nodes || {});
+  if (!nodes.length) return { ok: true, projectId: id, moved: 0, rows: 0 };
+  const VERT = new Set(['prev', 'frame']);
+  const byId = new Map(nodes.map((n) => [n.id, n]));
+  const depth = new Map(nodes.map((n) => [n.id, 0]));
+  for (let i = 0; i < 12; i++) {
+    for (const e of (doc.edges || [])) {
+      if (VERT.has(String(e.toPort))) continue;
+      if (!byId.has(e.fromNode) || !byId.has(e.toNode)) continue;
+      const d = (depth.get(e.fromNode) || 0) + 1;
+      if ((depth.get(e.toNode) || 0) < d) depth.set(e.toNode, d);
+    }
+  }
+  const parent = new Map(nodes.map((n) => [n.id, n.id]));
+  const find = (x) => { let y = x; while (parent.get(y) !== y) y = parent.get(y); return y; };
+  for (const e of (doc.edges || [])) {
+    if (VERT.has(String(e.toPort))) continue;
+    if (!byId.has(e.fromNode) || !byId.has(e.toNode)) continue;
+    const a = find(e.fromNode); const b = find(e.toNode);
+    if (a !== b) parent.set(b, a);
+  }
+  const rows = new Map();
+  for (const n of nodes) {
+    const r = find(n.id);
+    if (!rows.has(r)) rows.set(r, []);
+    rows.get(r).push(n);
+  }
+  const rowList = [...rows.values()]
+    .map((ids) => ({ ids, minY: Math.min(...ids.map((n) => Number(n.y) || 0)) }))
+    .sort((a, b) => a.minY - b.minY);
+  const colW = new Map();
+  for (const n of nodes) {
+    const d = depth.get(n.id) || 0;
+    colW.set(d, Math.max(colW.get(d) || 280, Number(n.w) || 280));
+  }
+  const colX = new Map();
+  let cx = 80;
+  for (const d of [...colW.keys()].sort((a, b) => a - b)) { colX.set(d, cx); cx += (colW.get(d) || 280) + 60; }
+  let cy = 40;
+  let moved = 0;
+  for (const row of rowList) {
+    const rowH = Math.max(200, ...row.ids.map((n) => Number(n.h) || 200));
+    for (const n of row.ids) { n.x = colX.get(depth.get(n.id) || 0); n.y = cy; moved++; }
+    cy += rowH + 40;
+  }
+  doc.updatedAt = Date.now();
+  writeIcDoc(id, doc);
+  markDocChanged(id);
+  return { ok: true, projectId: id, moved, rows: rowList.length };
+}
 async function canvasDeleteProject(args) {
   const id = String((args && args.projectId) || '');
   const f = projectFile(id);
@@ -1198,10 +1314,14 @@ function storyboardConsistencyWarnings(bible, shots, extraNames) {
     for (const nm of (sh.characters || [])) check(title, '角色', nm);
     check(title, '场景', sh && sh.scene);
     for (const nm of (sh.props || [])) check(title, '道具', nm);
-    // visual/motion 文本里的 @提及 同样纳入检查（数组外的实体也要登记，杜绝检查漏）
+    // visual/motion 文本里的 @资产名@ 提及同样纳入检查（未登记的提示补充——与客户端 parseMentions 词法一致）
     const text = String((sh && sh.visual) || '') + ' ' + String((sh && sh.motion) || '');
-    for (const m of (text.match(/@[^\s@，。；、！？:：（）"'）)]+/g) || [])) {
-      check(title, '提及', m.slice(1).replace(/[）)]+$/, ''));
+    const seenMention = new Set();
+    for (const m of (text.match(/@([^@\s，。；：、,.;:!?！？()（）[\]【】"'“”<>《》/\\|]{1,64}?)@/g) || [])) {
+      const nm = m.replace(/^@/, '').replace(/@$/, '');
+      if (seenMention.has(nm)) continue;
+      seenMention.add(nm);
+      check(title, '提及', nm);
     }
   }
   return warnings;
@@ -1302,8 +1422,15 @@ function connectEdge(doc, fromId, toId, fromPort, toPort) {
   if (fromId === toId) throw new Error('不能把节点连到自己');
   const outs = (PORT_TABLE[from.type] && PORT_TABLE[from.type].outputs) || [];
   const ins = (PORT_TABLE[to.type] && PORT_TABLE[to.type].inputs) || [];
-  const fp = String(fromPort || outs[0].id);
-  const tp = String(toPort || ins[0].id);
+  const fp = String(fromPort || (outs[0] && outs[0].id) || '');
+  // 目标端口缺省时按语义选择，而不是死板取第一个输入口：
+  // 剧本/文本 → 分镜表 = 剧本来源（script）；分镜表 → 分镜表 = 承接上一镜（prev）；其余取第一个输入口
+  let tp = String(toPort || '').trim();
+  if (!tp) {
+    if (to.type === 'storyboard' && (from.type === 'text' || from.type === 'script')) tp = 'script';
+    else if (to.type === 'storyboard' && from.type === 'storyboard') tp = 'prev';
+    else tp = String((ins[0] && ins[0].id) || '');
+  }
   const outDef = outs.find((p) => p.id === fp);
   const inDef = ins.find((p) => p.id === tp);
   if (!outDef) throw new Error('源节点没有输出端口 ' + fp);
@@ -1924,6 +2051,22 @@ export function apply(ctx) {
             return { ok: true, projectId: r.projectId, nodeId: r.nodeId, text: '🗑 已删除节点 ' + r.nodeId + '。' };
           },
         });
+        reg({
+          name: 'canvas_relayout',
+          description: '一键重排画布节点布局（消除重叠）：按「行」排列——横向数据流决定列（文本→分镜表→视频→资产），竖向关系（衔接 prev / 首帧 frame）不参与分列；每行 = 一个横向连通组（如「场N文本 ↔ 场N分镜表」同行对齐），行高取行内最高节点、行间保留间距。节点重叠、或批量建点后布局混乱时调用。',
+          parameters: {
+            type: 'object',
+            properties: { projectId: { type: 'string', description: '项目 id' } },
+            required: ['projectId'],
+            additionalProperties: false,
+          },
+          output: textOutput,
+          timeoutMs: 30000,
+          async execute(args) {
+            const r = canvasRelayout(args);
+            return { ok: true, projectId: r.projectId, text: '✅ 已重排 ' + r.moved + ' 个节点（' + r.rows + ' 行，无重叠）。' };
+          },
+        });
         reg({
           name: 'canvas_delete_project',
           description: '删除无限画布上的一个项目（含其全部节点）。用户明确要求删除项目、或清理误创建的空项目时使用；删除前请先用 canvas_list_projects 确认 id。',
@@ -2249,6 +2392,32 @@ export function apply(ctx) {
           }
         },
       }),
+      // 插件自带静态资源（帮助与反馈用的微信群二维码等）：白名单 assets/ 目录，拒绝路径穿越
+      ctx.webServer.register({
+        kind: 'exact',
+        path: `/${NAME}/api/plugin-asset`,
+        async handler(req, res) {
+          try {
+            if (req.method !== 'GET') { res.statusCode = 405; res.end('仅接受 GET'); return; }
+            const u = new URL(req.url, 'http://localhost');
+            const rel = String(u.searchParams.get('rel') || '').replace(/\\/g, '/').replace(/^\/+/, '');
+            if (rel.includes('..') || !/^assets\/[\w.\u4e00-\u9fa5/-]+$/.test(rel)) { res.statusCode = 400; res.end('非法路径'); return; }
+            const assetsDir = path.join(HERE, 'assets');
+            const abs = path.resolve(path.join(HERE, rel));
+            if (!abs.startsWith(assetsDir)) { res.statusCode = 400; res.end('非法路径'); return; }
+            let st;
+            try { st = statSync(abs); } catch { res.statusCode = 404; res.end('not found'); return; }
+            if (!st.isFile()) { res.statusCode = 404; res.end('not found'); return; }
+            res.setHeader('content-type', mimeOf(abs));
+            res.setHeader('cache-control', 'no-cache');
+            res.setHeader('content-length', String(st.size));
+            pipeFile(abs, {}, res);
+          } catch (e) {
+            res.statusCode = 500;
+            res.end(String((e && e.message) || e));
+          }
+        },
+      }),
     ];
     return () => {
       for (const off of registrations) { try { if (off) off(); } catch { /* 忽略 */ } }

package/package.json

@@ -1,56 +1,57 @@
 {
-  "name": "@ninkch/dsh-infinite-canvas",
-  "version": "0.17.13",
-  "description": "Node-based short-drama studio for DeepSeek Harness: script → storyboard → assets → shots → voiced, subtitled final cut on an infinite canvas.",
-  "keywords": [
-    "dsh",
-    "deepseek-harness",
-    "plugin",
-    "infinite-canvas",
-    "storyboard",
-    "short-drama",
-    "ai-video",
-    "image-generation",
-    "video-generation",
-    "seedance",
-    "photocraft",
-    "filmcraft"
-  ],
-  "license": "Apache-2.0",
-  "author": "NINKCH",
-  "publishConfig": {
-    "registry": "https://registry.npmjs.org/"
-  },
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/NINKCH/dsh-infinite_canvas.git"
-  },
-  "type": "module",
-  "icon": "./icon.svg",
-  "exports": {
-    ".": "./index.js",
-    "./client": "./client.js",
-    "./package.json": "./package.json",
-    "./locale/*.json": "./locale/*.json"
-  },
-  "files": [
-    "index.js",
-    "client.js",
-    "icon.svg",
-    "cordis.patch.yml",
-    "locale/*.json",
-    "assets/*/SKILL.md",
-    "README.md",
-    "README.zh-CN.md",
-    "docs/*.md"
-  ],
-  "dsh": {
-    "bundle": {
-      "patch": "./cordis.patch.yml"
-    },
-    "client": {
-      "platform": "web",
-      "immediately": true
-    }
-  }
-}
+    "name":  "@ninkch/dsh-infinite-canvas",
+    "version":  "0.17.15",
+    "description":  "Node-based short-drama studio for DeepSeek Harness: script → storyboard → assets → shots → voiced, subtitled final cut on an infinite canvas.",
+    "keywords":  [
+                     "dsh",
+                     "deepseek-harness",
+                     "plugin",
+                     "infinite-canvas",
+                     "storyboard",
+                     "short-drama",
+                     "ai-video",
+                     "image-generation",
+                     "video-generation",
+                     "seedance",
+                     "photocraft",
+                     "filmcraft"
+                 ],
+    "license":  "Apache-2.0",
+    "author":  "NINKCH",
+    "publishConfig":  {
+                          "registry":  "https://registry.npmjs.org/"
+                      },
+    "repository":  {
+                       "type":  "git",
+                       "url":  "git+https://github.com/NINKCH/dsh-infinite_canvas.git"
+                   },
+    "type":  "module",
+    "icon":  "./icon.svg",
+    "exports":  {
+                    ".":  "./index.js",
+                    "./client":  "./client.js",
+                    "./package.json":  "./package.json",
+                    "./locale/*.json":  "./locale/*.json"
+                },
+    "files":  [
+                  "index.js",
+                  "client.js",
+                  "icon.svg",
+                  "cordis.patch.yml",
+                  "locale/*.json",
+                  "assets/*/SKILL.md",
+                  "assets/support/*",
+                  "README.md",
+                  "README.zh-CN.md",
+                  "docs/*.md"
+              ],
+    "dsh":  {
+                "bundle":  {
+                               "patch":  "./cordis.patch.yml"
+                           },
+                "client":  {
+                               "platform":  "web",
+                               "immediately":  true
+                           }
+            }
+}