@ninkch/dsh-infinite-canvas 0.19.19 → 0.19.20

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.
Files changed (40) hide show
  1. package/assets/canvas-director/genres/absurd-parable.md +33 -35
  2. package/assets/canvas-director/genres/action-mission.md +36 -24
  3. package/assets/canvas-director/genres/adventure.md +34 -35
  4. package/assets/canvas-director/genres/broken-mirror-reunion.md +35 -77
  5. package/assets/canvas-director/genres/class-vertical.md +36 -36
  6. package/assets/canvas-director/genres/counterattack.md +35 -24
  7. package/assets/canvas-director/genres/county-drift.md +35 -35
  8. package/assets/canvas-director/genres/crime-police.md +36 -35
  9. package/assets/canvas-director/genres/family-melodrama.md +35 -35
  10. package/assets/canvas-director/genres/family-relation.md +38 -24
  11. package/assets/canvas-director/genres/fantasy.md +36 -38
  12. package/assets/canvas-director/genres/gambling-den.md +35 -35
  13. package/assets/canvas-director/genres/gunstandoff.md +35 -35
  14. package/assets/canvas-director/genres/hk-retro.md +35 -35
  15. package/assets/canvas-director/genres/identity-swap.md +37 -24
  16. package/assets/canvas-director/genres/institutional-eccentric.md +35 -35
  17. package/assets/canvas-director/genres/mo-lei-tau.md +36 -37
  18. package/assets/canvas-director/genres/modern-urban.md +34 -35
  19. package/assets/canvas-director/genres/multi-thread-caper.md +35 -35
  20. package/assets/canvas-director/genres/neon-dystopia.md +36 -35
  21. package/assets/canvas-director/genres/parent-child-secret.md +40 -75
  22. package/assets/canvas-director/genres/period-power-struggle.md +38 -24
  23. package/assets/canvas-director/genres/rebirth-transmigration.md +37 -24
  24. package/assets/canvas-director/genres/revenge-face-slap.md +38 -24
  25. package/assets/canvas-director/genres/shanhaijing-myth.md +85 -40
  26. package/assets/canvas-director/genres/slice-of-life.md +36 -24
  27. package/assets/canvas-director/genres/smalltown-uncanny.md +34 -35
  28. package/assets/canvas-director/genres/social-traverse.md +34 -35
  29. package/assets/canvas-director/genres/survival-fate.md +35 -35
  30. package/assets/canvas-director/genres/suspense-rule.md +38 -24
  31. package/assets/canvas-director/genres/system-flow.md +38 -24
  32. package/assets/canvas-director/genres/wasteland-chase.md +35 -35
  33. package/assets/canvas-director/genres/wealthy-romance.md +38 -24
  34. package/assets/canvas-director/genres/workplace-comedy.md +37 -24
  35. package/assets/canvas-director/genres/wuxia.md +35 -35
  36. package/assets/canvas-director/genres/xianxia-cultivation.md +38 -24
  37. package/assets/canvas-director/genres/youth-distance.md +35 -35
  38. package/assets/canvas-director/pack.js +3 -2
  39. package/client.js +82 -35
  40. package/package.json +1 -1
package/client.js CHANGED
@@ -297,7 +297,7 @@ function revealCanvasInRight() {
297
297
  const MULTI_INPUT_PORTS = new Set(['ref', 'char', 'scene', 'prop']);
298
298
  // 分镜端口期望的资产分类(仅用于连接时的非阻断提示)
299
299
  const PORT_CATEGORY = { char: 'character', scene: 'scene', prop: 'prop' };
300
- const CATEGORIES = ['character', 'scene', 'prop', 'script', 'storyboard', 'audio', 'finalcut', 'image', 'general'];
300
+ const CATEGORIES = ['character', 'scene', 'prop', 'script', 'storyboard', 'audio', 'finalcut', 'general'];
301
301
  const RATIOS = ['16:9', '9:16', '1:1', '4:3', '3:4', '21:9'];
302
302
  const IMAGE_SIZES = ['1K', '2K', '4K'];
303
303
  // 时长选项放宽到 30s(万相 3.0 等支持长视频);各厂商上限不同——超限由接口报错,系统不做静默截断
@@ -882,7 +882,7 @@ function revealCanvasInRight() {
882
882
  'projectName': '项目名称',
883
883
  'renameHint': '双击名称重命名',
884
884
  'delProjectHint': '删除项目及其资产',
885
- 'import': '导入图片/视频',
885
+ 'import': '导入',
886
886
  'addAssetNode': '添加到画布',
887
887
  'download': '下载',
888
888
  'viewOriginal': '查看原图',
@@ -1829,7 +1829,7 @@ function revealCanvasInRight() {
1829
1829
  'projectName': 'Project name',
1830
1830
  'renameHint': 'Double-click to rename',
1831
1831
  'delProjectHint': 'Delete project and its assets',
1832
- 'import': 'Import image/video',
1832
+ 'import': 'Import',
1833
1833
  'addAssetNode': 'Add to canvas',
1834
1834
  'download': 'Download',
1835
1835
  'viewOriginal': 'View original',
@@ -2759,6 +2759,12 @@ body[data-ds-dark-theme] .dshic-studio-modal{border-color:var(--dsw-alias-border
2759
2759
  .dshic-asset-pageinput:focus{outline:none;border-color:var(--dsw-alias-brand-primary);box-shadow:var(--dshic-shadow-sel);}
2760
2760
  .dshic-asset-pagetotal,.dshic-asset-pagecount{font-variant-numeric:tabular-nums;white-space:nowrap;}
2761
2761
  .dshic-asset-pagecount{opacity:.75;}
2762
+ /* 搜索行:搜索框(≈2/3,右侧内嵌放大镜)+ 项目选择(≈1/3)同行;窄窗口自动换行 */
2763
+ .dshic-asset-searchrow{display:flex;align-items:center;gap:8px;flex-wrap:wrap;}
2764
+ .dshic-asset-search{position:relative;flex:2 1 320px;min-width:220px;}
2765
+ .dshic-asset-search .dshic-input{width:100%;padding-right:26px;box-sizing:border-box;}
2766
+ .dshic-asset-scope{flex:1.1 1 200px;min-width:180px;display:flex;}
2767
+ .dshic-asset-scope .dshic-msel{width:100%;}
2762
2768
  /* 设定集条目:行 + 已绑定资产缩略图 */
2763
2769
  .dshic-bible-item{display:flex;flex-direction:column;gap:4px;padding:5px 0;border-bottom:1px dashed var(--dsw-alias-border-l1);}
2764
2770
  .dshic-bible-thumbs{display:flex;gap:5px;flex-wrap:wrap;padding-left:4px;}
@@ -10085,6 +10091,12 @@ function queueThumb(assetId) {
10085
10091
  };
10086
10092
  return map[c] || c;
10087
10093
  }
10094
+ /** 资产分类归一(纯函数供回归):「图片」分类已移除——角色/道具/场景本来就是图片,
10095
+ * 其余一律归「通用」。历史已标 image 的资产在展示/过滤/搜索层归一,不迁移数据库。 */
10096
+ function normCat(c) {
10097
+ const v = String(c || '').trim();
10098
+ return !v || v === 'image' ? 'general' : v;
10099
+ }
10088
10100
  function portWorldPos(nodeId, portId, dir) {
10089
10101
  const n = S.graph.nodes[nodeId];
10090
10102
  if (!n) return { x: 0, y: 0 };
@@ -14813,6 +14825,11 @@ function queueThumb(assetId) {
14813
14825
  });
14814
14826
  const KIND = { script: ['剧本', 'script'], storyboard: ['分镜', 'storyboard'], prompt: ['提示词', 'prompt'], assets: ['资产设定图', 'asset sheet'] };
14815
14827
  const kl = (KIND[kind] || [kind])[zh ? 0 : 1];
14828
+ // 剧本能力切片的总纲:机制库条目 = 可自由组合的零件,绝不规定唯一走向;
14829
+ // 素材优先级:已有小说/剧本原文与设定集 > 题材素材库(库条目供二次创作借形)。
14830
+ const scriptDoctrine = zh
14831
+ ? '【机制与素材】题材卡的机制库条目是可自由组合的零件:按当下故事的需要选择、改造、混搭或不用,事件与走向由剧本决定,条目绝不规定唯一走向,也绝不要求"用某设定就必须叠加某机制"。【素材优先级】已有小说/剧本原文与设定集设定 > 题材素材库:库条目仅供二次创作借形,绝不替代或改写既有设定。风格基调与导演运镜始终有效。'
14832
+ : '[Mechanics & material] Genre mechanism entries are freely combinable parts: pick, adapt, mix or skip per the story at hand - events and direction belong to the script, entries never mandate a single direction, and no entry implies "use X therefore Y". [Material precedence] Existing novel/script text and the series bible outrank the genre library: library entries are optional shapes for adaptation, never replacements for established settings. Style and camera direction always apply.';
14816
14833
  if (zh) {
14817
14834
  return [
14818
14835
  '【画布技能包 · ' + kl + '】',
@@ -14821,6 +14838,7 @@ function queueThumb(assetId) {
14821
14838
  + ' 规格:' + (nameOf('forms', profile.form) || '未选')
14822
14839
  + ' 影调:' + (profile.look ? nameOf('looks', profile.look) : '跟随导演'),
14823
14840
  '优先级:用户显式指令 > 导演透镜 > 规格(仅单镜时长与结构上压过透镜;画幅由视频节点生成时决定,不在此列)> 题材 > 影调。以下为对应切片,写提示词时按它执行;与本块冲突的通用规则让位于本块。',
14841
+ ...(kind === 'script' ? [scriptDoctrine] : []),
14824
14842
  ].join('\n');
14825
14843
  }
14826
14844
  return [
@@ -14830,6 +14848,7 @@ function queueThumb(assetId) {
14830
14848
  + ' Spec: ' + (nameOf('forms', profile.form) || 'none')
14831
14849
  + ' Look: ' + (profile.look ? nameOf('looks', profile.look) : 'follow the lens'),
14832
14850
  'Precedence: explicit user instruction > director lens > spec (clip length and structure only; aspect is set on the video node) > genre > look. The slices below are binding; generic rules that disagree give way.',
14851
+ ...(kind === 'script' ? [scriptDoctrine] : []),
14833
14852
  ].join('\n');
14834
14853
  }
14835
14854
 
@@ -18331,7 +18350,10 @@ const DIRECTOR_KEY_HELP = [
18331
18350
  if (a.kind === 'text') {
18332
18351
  const c = worldCenter();
18333
18352
  const nd = addNodeAt('text', { x: c.x - 120, y: c.y - 60 });
18334
- update((s) => { const n2 = s.graph.nodes[nd.id]; if (n2) n2.data.text = a.text || ''; });
18353
+ update((s) => {
18354
+ const n2 = s.graph.nodes[nd.id];
18355
+ if (n2) { n2.data.text = a.text || ''; n2.data.label = a.name || n2.data.label; } // 节点名 = 资产名
18356
+ });
18335
18357
  return;
18336
18358
  }
18337
18359
  const c = worldCenter();
@@ -18339,7 +18361,7 @@ const DIRECTOR_KEY_HELP = [
18339
18361
  const n = addNodeAt(type, { x: c.x + (Math.random() * 60 - 30), y: c.y + (Math.random() * 60 - 30) });
18340
18362
  update((s) => {
18341
18363
  const nd = s.graph.nodes[n.id];
18342
- if (nd) { nd.data.assetId = a.id; nd.data.status = 'done'; }
18364
+ if (nd) { nd.data.assetId = a.id; nd.data.status = 'done'; nd.data.label = a.name || nd.data.label; } // 节点名 = 资产名
18343
18365
  });
18344
18366
  };
18345
18367
  const changeCategory = (a, category) => {
@@ -18354,13 +18376,22 @@ const DIRECTOR_KEY_HELP = [
18354
18376
  let failed = 0;
18355
18377
  for (const f of files) {
18356
18378
  const kind = f.type.startsWith('video/') ? 'video' : f.type.startsWith('image/') ? 'image' : null;
18357
- if (!kind) continue;
18358
18379
  try {
18359
- await saveAssetRecord(S.activeId, kind, f, { name: f.name, source: 'upload', category: 'general' });
18380
+ // 文本(.txt/.md):入库为文本资产(名称=文件名去扩展名,分类=剧本,归属=当前项目)——
18381
+ // 多集小说/剧本一键导入,入库后在资产面板多选批量铺画布(text 节点可直接连分镜表当剧本源)
18382
+ if (!kind && /\.(txt|md|markdown)$/i.test(f.name)) {
18383
+ const text = await f.text();
18384
+ await saveTextAssetRecord(S.activeId, {
18385
+ name: f.name.replace(/\.(txt|md|markdown)$/i, ''),
18386
+ text, category: 'script', source: 'upload',
18387
+ });
18388
+ } else if (kind) {
18389
+ await saveAssetRecord(S.activeId, kind, f, { name: f.name, source: 'upload', category: 'general' });
18390
+ } else { continue; }
18360
18391
  } catch { failed++; } // 单个失败不影响其余文件
18361
18392
  }
18362
18393
  if (failed) toast(T('uploadFailed') + '(' + failed + '/' + files.length + ')');
18363
- if (files.length) bumpView();
18394
+ if (files.length) { bumpView(); update((s) => { s.assetsTick++; }); }
18364
18395
  };
18365
18396
  const del = async (a) => {
18366
18397
  // 服务端删除(SQL:行 + FTS + CAS 引用计数;JSON:文件 + assets.json),随后清本地缓存
@@ -18411,6 +18442,7 @@ const DIRECTOR_KEY_HELP = [
18411
18442
  const nd = newNode(a.kind === 'text' ? 'text' : a.kind, pts[k]);
18412
18443
  if (a.kind === 'text') nd.data.text = a.text || '';
18413
18444
  else { nd.data.assetId = a.id; nd.data.status = 'done'; }
18445
+ nd.data.label = a.name || nd.data.label; // 节点名 = 资产名(不再叫 图片1/视频2/文本1)
18414
18446
  s.graph.nodes[nd.id] = nd;
18415
18447
  newIds.push(nd.id);
18416
18448
  });
@@ -18458,11 +18490,14 @@ const DIRECTOR_KEY_HELP = [
18458
18490
  toast(T('craftSyncDone').replace('{ok}', String(okN)).replace('{fail}', String(failN)));
18459
18491
  };
18460
18492
  const filtered = assets.filter((a) => {
18461
- if (scope !== 'all' && scope !== GENERAL_PID && a.projectId !== scope && a.projectId !== GENERAL_PID) return false;
18462
- if (filter !== 'all' && (a.category || 'general') !== filter) return false;
18493
+ // 严格项目隔离:scope=具体项目 → 只见该项目资产;通用项目(GENERAL_PID)资产不再
18494
+ // 混入其他项目(旧口径"通用资产多项目共享"改为显式——要看通用资产请把 scope 切到
18495
+ // 「通用项目」或「全部」;跨项目取素材的功能面(@引用/设定集绑定)不受影响)。
18496
+ if (scope !== 'all' && a.projectId !== scope) return false;
18497
+ if (filter !== 'all' && normCat(a.category) !== filter) return false;
18463
18498
  if (!q) return true;
18464
18499
  const hay = [
18465
- a.name, a.prompt || '', a.text || '', catLabel(a.category || 'general'),
18500
+ a.name, a.prompt || '', a.text || '', catLabel(normCat(a.category)),
18466
18501
  projectName(a.projectId), a.kind === 'image' ? T('kindImage') : a.kind === 'video' ? T('kindVideo') : 'text',
18467
18502
  ].join(' ').toLowerCase();
18468
18503
  return hay.includes(q);
@@ -18492,18 +18527,24 @@ const DIRECTOR_KEY_HELP = [
18492
18527
  onClick: () => setFilter(c.id),
18493
18528
  }, c.label)),
18494
18529
  ),
18495
- h('input', {
18496
- key: 'search', className: 'dshic-input', value: search,
18497
- placeholder: T('searchLabel'),
18498
- onChange: (e) => setSearch(e.target.value),
18499
- onPointerDown: (e) => e.stopPropagation(),
18500
- }),
18501
- h(MiniSelect, {
18502
- key: 'scope', value: scope, title: T('projectFilter'),
18503
- options: [{ value: 'all', label: T('allProjects') }, { value: GENERAL_PID, label: T('generalProject') }]
18504
- .concat(S.projects.map((p) => ({ value: p.id, label: p.name }))),
18505
- onChange: (v) => setScope(v),
18506
- }),
18530
+ // 搜索行:搜索框(≈2/3,右侧内嵌放大镜)+ 项目选择(≈1/3)同行;窄窗口自动换行
18531
+ h('div', { key: 'searchrow', className: 'dshic-asset-searchrow', 'data-role': 'assets-searchrow' },
18532
+ h('div', { className: 'dshic-asset-search' },
18533
+ h('input', {
18534
+ className: 'dshic-input', value: search,
18535
+ placeholder: T('searchLabel'),
18536
+ onChange: (e) => setSearch(e.target.value),
18537
+ onPointerDown: (e) => e.stopPropagation(),
18538
+ }),
18539
+ h('span', { className: 'dshic-search-ic', 'aria-hidden': 'true' }, Ic('search', 12))),
18540
+ h('div', { className: 'dshic-asset-scope' },
18541
+ h(MiniSelect, {
18542
+ value: scope, title: T('projectFilter'),
18543
+ options: [{ value: 'all', label: T('allProjects') }, { value: GENERAL_PID, label: T('generalProject') }]
18544
+ .concat(S.projects.map((p) => ({ value: p.id, label: p.name }))),
18545
+ onChange: (v) => setScope(v),
18546
+ })),
18547
+ ),
18507
18548
  // 工具栏(项目下一行):所有操作按钮 + 分页集中在一行,窄窗口自动换行、分页始终靠右。
18508
18549
  // 按钮统一「透明底 + 1px 线框 + 文字」(UI-RULES:禁止灰底色块)。
18509
18550
  h('div', { key: 'toolbar', className: 'dshic-asset-toolbar', 'data-role': 'assets-toolbar' },
@@ -18559,7 +18600,7 @@ const DIRECTOR_KEY_HELP = [
18559
18600
  h('span', { className: 'dshic-asset-pagecount', 'data-role': 'assets-page-info' }, T('assetsTotalCount').replace('{n}', String(filtered.length))),
18560
18601
  ),
18561
18602
  ),
18562
- h('input', { key: 'file', ref: fileRef, type: 'file', accept: 'image/*,video/*', multiple: true, style: { display: 'none' }, onChange: onImport }),
18603
+ h('input', { key: 'file', ref: fileRef, type: 'file', accept: 'image/*,video/*,.txt,.md,text/plain,text/markdown', multiple: true, style: { display: 'none' }, onChange: onImport }),
18563
18604
  loading && !assets.length
18564
18605
  ? h('div', { key: 'loading', className: 'dshic-hint' }, T('aiRunning'))
18565
18606
  : shown.length === 0
@@ -18648,6 +18689,17 @@ const DIRECTOR_KEY_HELP = [
18648
18689
  onClick: startRename,
18649
18690
  }, Ic('pencil', 11));
18650
18691
  const downloadName = (a.name || 'asset') + extForDownload(a.mime, a.name, a.kind);
18692
+ // 项目归属下拉(全部资产同款,含文本资产):看归属 + 就地改归属(onMove 服务端写回)
18693
+ const projSel = h('select', {
18694
+ className: 'dshic-asset-project', title: T('projectFilter'),
18695
+ value: a.projectId || GENERAL_PID,
18696
+ onClick: (e) => e.stopPropagation(),
18697
+ onPointerDown: (e) => e.stopPropagation(),
18698
+ onChange: (e) => { e.stopPropagation(); onMove(a, e.target.value); },
18699
+ },
18700
+ h('option', { value: GENERAL_PID }, T('generalProject')),
18701
+ S.projects.map((pp) => h('option', { key: pp.id, value: pp.id }, pp.name)),
18702
+ );
18651
18703
  return h('div', {
18652
18704
  className: cls('dshic-asset', checked && 'is-checked'),
18653
18705
  onClick: () => onToggleSel(a),
@@ -18681,16 +18733,7 @@ const DIRECTOR_KEY_HELP = [
18681
18733
  renameBtn)
18682
18734
  : null,
18683
18735
  a.kind !== 'text'
18684
- ? h('select', {
18685
- className: 'dshic-asset-project', title: T('projectFilter'),
18686
- value: a.projectId || GENERAL_PID,
18687
- onClick: (e) => e.stopPropagation(),
18688
- onPointerDown: (e) => e.stopPropagation(),
18689
- onChange: (e) => { e.stopPropagation(); onMove(a, e.target.value); },
18690
- },
18691
- h('option', { value: GENERAL_PID }, T('generalProject')),
18692
- S.projects.map((pp) => h('option', { key: pp.id, value: pp.id }, pp.name)),
18693
- )
18736
+ ? projSel
18694
18737
  : null,
18695
18738
  h('div', { className: 'dshic-asset-actions' },
18696
18739
  (a.kind === 'image' || a.kind === 'video')
@@ -18730,8 +18773,10 @@ const DIRECTOR_KEY_HELP = [
18730
18773
  ? h('audio', { src: url, controls: true, style: { width: '100%', height: 30 }, onPointerDown: (e) => e.stopPropagation(), onClick: (e) => e.stopPropagation(), preload: 'metadata' })
18731
18774
  : null,
18732
18775
  h('div', { className: 'dshic-asset-meta' },
18776
+ // 文本资产:meta 行补项目下拉(媒体资产的下拉在名称行下,文本卡片放这里——位置不同、控件同款)
18777
+ a.kind === 'text' ? projSel : null,
18733
18778
  h('select', {
18734
- className: 'dshic-cat', title: T('catLabel'), value: a.category || 'general',
18779
+ className: 'dshic-cat', title: T('catLabel'), value: normCat(a.category),
18735
18780
  onClick: (e) => e.stopPropagation(),
18736
18781
  onPointerDown: (e) => e.stopPropagation(),
18737
18782
  onChange: (e) => { e.stopPropagation(); onCat(a, e.target.value); },
@@ -20974,6 +21019,8 @@ const DIRECTOR_KEY_HELP = [
20974
21019
  assetsPageIndex,
20975
21020
  // 尾帧入库决策(一次生成只入一张:best 优先,best=last 才用 last)
20976
21021
  tailFrameDecision,
21022
+ // 资产分类归一(image→general,空→general):「图片」分类已移除,展示/过滤/搜索层归一
21023
+ normCat,
20977
21024
  // 历史条死条目裁剪 / 资产回链候选挑选与回链计划(纯函数,供回归测试直接断言)
20978
21025
  pruneDeadHistory, repairPickAsset, repairPlan,
20979
21026
  // 媒体节点指针空值保护(Host 合并不得用 null 覆盖本地有效 assetId/lastAssetId)
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@ninkch/dsh-infinite-canvas",
3
- "version": "0.19.19",
3
+ "version": "0.19.20",
4
4
  "description": "无限画布(Infinite Canvas)for DeepSeek Harness:节点式创作工作室(剧本/分镜/生成/成片),内置「媒体创作」预设模式(导演第一视角 + 引导工作坊)。Version-agnostic: reads the live catalog from the installed package at load time.",
5
5
  "keywords": [
6
6
  "dsh",