@ninkch/dsh-infinite-canvas 0.17.7 → 0.17.9

package/client.js

@@ -356,6 +356,12 @@ window.__ModuleLoader__.load({
       'dataRootOpen': '打开目录',
       'dataRootMigrate': '迁移历史资产',
       'dataRootMigrated': '已迁移 {n} 个资产到数据根目录',
+      'collapse': '折叠',
+      'foldOpen': '展开',
+      'craftReadyCount': '{r}/{n} 就绪',
+      'craftDirLabel': '当前项目后期目录',
+      'craftDataRootNeed': '请先在上方设置画布数据根目录：Craft 后期文件将存放于 数据根目录\\projects\\<项目>\\craft',
+      'craftRootMismatch': 'ArtCraft 自身数据目录与画布数据根目录不一致：请在 ArtCraft 设置里把数据目录改成同一根目录，否则后期文件会落到两处',
       'dataRootImportBtn': '从数据目录导入',
       'dataRootImported': '导入完成：合并 {n} 个项目、补入 {a} 条资产元数据',
       'dataRootImportHint': '换电脑迁移：把整个数据目录拷到新机器 → 设置为数据根目录 → 点"从数据目录导入"即可恢复项目/节点/设定集/资产',
@@ -687,6 +693,12 @@ window.__ModuleLoader__.load({
       'dataRootOpen': 'Open folder',
       'dataRootMigrate': 'Migrate existing assets',
       'dataRootMigrated': 'Migrated {n} assets to the data root',
+      'collapse': 'Collapse',
+      'foldOpen': 'Expand',
+      'craftReadyCount': '{r}/{n} ready',
+      'craftDirLabel': 'Project craft dir',
+      'craftDataRootNeed': 'Set the canvas data root above first: craft files go to <root>\\projects\\<project>\\craft',
+      'craftRootMismatch': "ArtCraft's own data root differs from the canvas data root — point ArtCraft at the same root or craft files will land in two places",
       'dataRootImportBtn': 'Import from data root',
       'dataRootImported': 'Imported: {n} projects merged, {a} asset records added',
       'dataRootImportHint': 'Migration: copy the whole data folder to the new machine, set it as data root, then click "Import from data root" to restore projects/nodes/bible/assets',
@@ -1092,8 +1104,8 @@ window.__ModuleLoader__.load({
       try { localStorage.setItem(key, JSON.stringify(value)); } catch { /* 忽略配额错误 */ }
     }
     const DEFAULT_SETTINGS = {
-      // 生成参数一律"留空即不发送"，由 Harness 适配器/模型用已配置的默认值（不在代码里写死）
-      textLlm: { provider: '', model: '', maxTokens: '', temperature: '' },
+      // 文本模型全部用 Harness 的当前模型与默认参数：画布只选择模型，不单独配置生成参数
+      textLlm: { provider: '', model: '' },
       imageApis: [],   // [{id, name, baseUrl, apiKey, model, mode, size?, responseFormat?}]
       videoApis: [],   // [{id, name, url, apiKey, model, protocol?, watermark?, generateAudio?}]
       ttsApis: [],     // [{id, name, baseUrl, apiKey, model, voice}]
@@ -1107,7 +1119,7 @@ window.__ModuleLoader__.load({
     function loadSettings() {
       const s = lsGet(LS_SETTINGS, {}) || {};
       const out = {
-        textLlm: { ...DEFAULT_SETTINGS.textLlm, ...(s.textLlm || {}) },
+        textLlm: { provider: (s.textLlm && s.textLlm.provider) || '', model: (s.textLlm && s.textLlm.model) || '' },
         imageApis: Array.isArray(s.imageApis) ? s.imageApis : [],
         videoApis: Array.isArray(s.videoApis) ? s.videoApis : [],
         ttsApis: Array.isArray(s.ttsApis) ? s.ttsApis : [],
@@ -1598,6 +1610,20 @@ window.__ModuleLoader__.load({
       }
       return { migrated: done, total: targets.length };
     }
+    /** 数据根目录就绪后自动把浏览器 IndexedDB 里的存量资产搬到磁盘（替代原"迁移历史资产"按钮，全自动无需手动触发）。 */
+    async function autoMigrateAssetsToRoot() {
+      if (!S.dataRoot) return;
+      try {
+        const all = await idbAll();
+        const pending = all.some((r) => r && r.blob && !r.rel);
+        if (!pending) return;
+        const r = await migrateAssetsToDisk();
+        if (r.migrated) {
+          toast(T('dataRootMigrated').replace('{n}', String(r.migrated)));
+          update((s) => { s.assetsTick++; });
+        }
+      } catch { /* 静默：迁移失败不影响主流程，下次设置数据根目录时再试 */ }
+    }
     function useAssetUrl(id) {
       const [url, setUrl] = useState(null);
       useEffect(() => {
@@ -2302,7 +2328,9 @@ window.__ModuleLoader__.load({
       const pid = S.activeId;
       const map = craftMapLoad(pid);
       if (!opts.force && map[rec.id]) return map[rec.id];
-      const rel = craftProjectSlug() + '/media/' + assetFileBase(rec) + extForMime(rec.mime, rec.name);
+      // Craft 后期数据统一放在**画布数据根目录**的项目目录下：projects/<项目>/<slug 前缀去掉>/craft/…
+      // （ArtCraft 数据根目录 = 画布数据根目录时，即落在 <root>/projects/<项目>/craft/media/）
+      const rel = 'projects/' + craftProjectSlug() + '/craft/media/' + assetFileBase(rec) + extForMime(rec.mime, rec.name);
       const blob = rec.blob || await assetBlob(rec.id);
       if (!blob) throw new Error('资产内容不可用: ' + rec.id);
       await craft.write(rel, blob);
@@ -5331,12 +5359,12 @@ window.__ModuleLoader__.load({
           width: dims.w, height: dims.h,
         });
         try {
-          await craft.writeText(slug + '/craft/timeline.xml', xml);
-          await craft.writeText(slug + '/craft/subs.srt', buildSrt(items));
+          await craft.writeText('projects/' + slug + '/craft/timeline.xml', xml);
+          await craft.writeText('projects/' + slug + '/craft/subs.srt', buildSrt(items));
         } catch (e) { return; /* craftFetch 已提示 */ }
         setFcDialog({
-          args: JSON.stringify(['--project', slug + '/craft/drama.fcproj', '--import', slug + '/craft/timeline.xml', '--export', slug + '/out/final.mp4'], null, 1),
-          outRel: slug + '/out/final.mp4',
+          args: JSON.stringify(['--project', 'projects/' + slug + '/craft/drama.fcproj', '--import', 'projects/' + slug + '/craft/timeline.xml', '--export', 'projects/' + slug + '/craft/out/final.mp4'], null, 1),
+          outRel: 'projects/' + slug + '/craft/out/final.mp4',
         });
       };
       const submitFc = (args, outRel) => {
@@ -6131,13 +6159,12 @@ window.__ModuleLoader__.load({
       // 默认项 = 内置专家 persona + 内置创作方法论 canvas-craft（自动叠加）
       const options = [{ value: '', label: T('builtinExpert') }].concat((data.skills || []).map((x) => ({ value: x.name, label: x.name })));
       return h('div', { className: 'dshic-field' },
-        h('span', { className: 'dshic-field-label' }, label),
+        h('span', { className: 'dshic-field-label' }, label, InfoTip(T('skillHint'))),
         h('select', {
           className: 'dshic-select', value: value || '',
           onChange: (e) => onChange(e.target.value),
           onPointerDown: (e) => e.stopPropagation(),
-        }, options.map((o) => h('option', { key: o.value, value: o.value }, o.label))),
-        h('div', { className: 'dshic-hint' }, T('skillHint')));
+        }, options.map((o) => h('option', { key: o.value, value: o.value }, o.label))));
     }
 
     function LlmModelSelect() {
@@ -6188,7 +6215,6 @@ window.__ModuleLoader__.load({
           },
           onPointerDown: (e) => e.stopPropagation(),
         }),
-        h('div', { className: 'dshic-hint' }, T('llmHint')),
       );
     }
 
@@ -6202,6 +6228,13 @@ window.__ModuleLoader__.load({
           onPointerDown: (e) => e.stopPropagation(),
         }));
     }
+    /** ⓘ 悬停说明：界面简洁化——长解释一律收进悬停提示（原生 title），不再平铺文字。 */
+    function InfoTip(text) {
+      return h('span', {
+        title: String(text || ''), 'aria-label': String(text || ''),
+        style: { flex: 'none', width: 14, height: 14, lineHeight: '13px', textAlign: 'center', fontSize: 10, borderRadius: '50%', border: '1px solid var(--dsw-alias-border-secondary, #777)', color: 'var(--dsw-alias-label-secondary, #999)', cursor: 'help', userSelect: 'none', opacity: 0.85 },
+      }, 'i');
+    }
     function ApiListEditor({ kind }) {
       const [s, setS] = useState(loadSettings);
       const [openId, setOpenId] = useState(null);
@@ -6351,10 +6384,19 @@ window.__ModuleLoader__.load({
     /** T2：设置面板 Craft 后期卡片（连接状态 / 工具灯 / 数据目录）。 */
     function CraftCard() {
       const [, force] = useState(0);
+      const [open, setOpen] = useState(false); // 默认折叠：界面简洁，摘要常显
       useEffect(() => { probeCraft().then(() => force((x) => x + 1)); }, []);
       const cs = S.craftStatus;
       const data = cs && cs.data;
       const slug = craftProjectSlug();
+      // Craft 后期目录 = **画布数据根目录** + 项目目录 + \craft（不再有 ArtCraft 独立数据目录的 second 口径）
+      const craftDir = S.dataRoot ? (S.dataRoot.replace(/[\\/]+$/, '') + '\\projects\\' + slug + '\\craft') : '';
+      // ArtCraft 自身的数据目录若与画布数据根目录不一致 → 后期文件会落到两处，必须提醒
+      const artRoot = data && data.dataRoot ? data.dataRoot.path : '';
+      const rootMismatch = !!(S.dataRoot && artRoot && artRoot.replace(/[\\/]+$/, '') !== S.dataRoot.replace(/[\\/]+$/, ''));
+      // Craft 家族全量动态渲染：ArtCraft /status 返回几款 bins 就渲染几款（当前 12 款），不再写死
+      const binKeys = (data && data.bins ? Object.keys(data.bins) : []).sort();
+      const readyCount = binKeys.filter((k) => data.bins[k] && data.bins[k].found).length;
       const binRow = (key) => {
         const info = data && data.bins ? data.bins[key] : null;
         const ok = !!(info && info.found);
@@ -6366,18 +6408,22 @@ window.__ModuleLoader__.load({
         );
       };
       return h('div', { className: 'dshic-card' },
-        h('div', { className: 'dshic-row' },
+        h('div', {
+          className: 'dshic-row', style: { cursor: 'pointer' },
+          onPointerDown: (e) => e.stopPropagation(), onClick: () => setOpen((x) => !x),
+          title: open ? T('collapse') : T('foldOpen'),
+        },
           Ic('film', 12),
           h('strong', { style: { fontSize: 12, flex: 1, minWidth: 0 } }, T('craftCard')),
-          h('button', { type: 'button', className: 'dshic-mini is-ghost', onPointerDown: (e) => e.stopPropagation(), onClick: () => { probeCraft().then(() => force((x) => x + 1)); } }, '↻'),
+          data ? h('span', { className: 'dshic-hint', style: { flex: 'none' } }, T('craftReadyCount').replace('{r}', String(readyCount)).replace('{n}', String(binKeys.length))) : null,
+          h('button', { type: 'button', className: 'dshic-mini is-ghost', onPointerDown: (e) => e.stopPropagation(), onClick: (e) => { e.stopPropagation(); probeCraft().then(() => force((x) => x + 1)); } }, '↻'),
+          h('span', { style: { flex: 'none', fontSize: 10, transition: 'transform .15s', transform: open ? 'rotate(90deg)' : 'rotate(0deg)' } }, '▶'),
         ),
-        data
-          ? h('div', { className: 'dshic-hint' }, T('craftDataRoot') + '：' + ((data.dataRoot && data.dataRoot.path) || '—'))
-          : h('div', { className: 'dshic-err' }, T('craftUnreachable')),
-        data ? binRow('photocraft') : null,
-        data ? binRow('filmcraft') : null,
-        data ? binRow('effectcraft') : null,
-        data ? h('div', { className: 'dshic-hint' }, T('craftProjectDir') + '：' + slug + '/') : null,
+        open ? [
+          craftDir ? h('div', { className: 'dshic-hint' }, T('craftDirLabel') + '：' + craftDir) : h('div', { className: 'dshic-err' }, T('craftDataRootNeed')),
+          rootMismatch ? h('div', { className: 'dshic-err' }, T('craftRootMismatch')) : null,
+          ...(data ? binKeys.map((k) => binRow(k)) : []),
+        ] : null,
       );
     }
 
@@ -6406,7 +6452,7 @@ window.__ModuleLoader__.load({
         setRunning(true); setErr(null); setProgress('…');
         try {
           const mediaRel = await ensureAssetOnDisk(rec);
-          const outRel = craftProjectSlug() + '/out/graded/' + rec.id + '-graded' + extForMime(rec.mime, rec.name);
+          const outRel = 'projects/' + craftProjectSlug() + '/craft/out/graded/' + rec.id + '-graded' + extForMime(rec.mime, rec.name);
           const job = await craft.jobStart({
             bin: 'photocraft',
             args: ['run', mediaRel, '--cmd', cmd, '--params', JSON.stringify(paramsObj), '--out', outRel],
@@ -6514,7 +6560,6 @@ window.__ModuleLoader__.load({
       const [val, setVal] = useState('');
       const [busy, setBusy] = useState(false);
       const [picking, setPicking] = useState(false);
-      const [mig, setMig] = useState(null); // null | {done,total} | 'done'
       useEffect(() => { if (S.dataRoot) setVal(S.dataRoot); }, [S.dataRoot]);
       const save = async () => {
         if (busy) return;
@@ -6524,7 +6569,7 @@ window.__ModuleLoader__.load({
           await refreshDataRoot();
           toast(T('dataRootSaved') + (S.dataRoot ? '：' + S.dataRoot : ''));
           assetIndexSynced = false; // 换了目录：索引要往新目录重建
-          syncAssetIndexToHost();
+          autoMigrateAssetsToRoot().then(() => syncAssetIndexToHost()); // 先搬存量资产，再对齐索引
         } catch (e) { toast('设置失败：' + ((e && e.message) || e)); }
         setBusy(false);
       };
@@ -6534,7 +6579,7 @@ window.__ModuleLoader__.load({
         setVal(S.dataRoot || root);
         toast(T('dataRootSaved') + '：' + S.dataRoot);
         assetIndexSynced = false; // 换了目录：索引要往新目录重建
-        syncAssetIndexToHost();
+        autoMigrateAssetsToRoot().then(() => syncAssetIndexToHost());
       };
       const browse = async () => {
         if (busy || picking) return;
@@ -6576,18 +6621,12 @@ window.__ModuleLoader__.load({
         } catch (e) { toast('导入失败：' + ((e && e.message) || e)); }
         setBusy(false);
       };
-      const migrate = async () => {
-        if (busy || picking || mig) return;
-        setBusy(true); setMig({ done: 0, total: 0 });
-        try {
-          const r = await migrateAssetsToDisk((done, total) => setMig({ done, total }));
-          setMig('done');
-          toast(T('dataRootMigrated').replace('{n}', String(r.migrated)));
-        } catch (e) { setMig(null); toast('迁移失败：' + ((e && e.message) || e)); }
-        setBusy(false);
-      };
       return h('div', { key: 'dataroot', className: 'dshic-card' },
-        h('div', { className: 'dshic-row' }, Ic('image', 12), h('strong', { style: { fontSize: 12 } }, T('dataRootLabel'))),
+        h('div', { className: 'dshic-row' },
+          Ic('image', 12),
+          h('strong', { style: { fontSize: 12, flex: 1, minWidth: 0 } }, T('dataRootLabel')),
+          InfoTip(T('dataRootHint')),
+        ),
         S.dataRootSupported === false
           ? h('div', { className: 'dshic-hint' }, T('dataRootUnsupported'))
           : [
@@ -6600,17 +6639,12 @@ window.__ModuleLoader__.load({
                 h('button', { type: 'button', className: 'dshic-mini', disabled: busy || picking, onPointerDown: (e) => e.stopPropagation(), onClick: save }, T('dataRootSave')),
               ),
               picking ? h('div', { className: 'dshic-hint', key: 'picking' }, T('dataRootPicking')) : null,
-              h('div', { className: 'dshic-hint', key: 'hint' }, T('dataRootHint')),
               h('div', { className: 'dshic-row', key: 'row2' },
                 S.dataRoot ? h('button', { type: 'button', className: 'dshic-mini', onPointerDown: (e) => e.stopPropagation(), onClick: openDir }, T('dataRootOpen')) : null,
-                S.dataRoot ? h('button', { type: 'button', className: 'dshic-mini', disabled: busy || picking || !!mig, onPointerDown: (e) => e.stopPropagation(), onClick: migrate }, mig === 'done' ? T('dataRootMigratedDone') : T('dataRootMigrate')) : null,
-                (mig && mig !== 'done') ? h('span', { style: { fontSize: 11, opacity: 0.85 } }, T('dataRootMigrating') + ' ' + mig.done + '/' + mig.total) : null,
-              ),
-              h('div', { className: 'dshic-row', key: 'row3' },
                 S.dataRoot ? h('button', { type: 'button', className: 'dshic-mini is-ghost', disabled: busy || picking, onPointerDown: (e) => e.stopPropagation(), onClick: importFromRoot }, Ic('folder', 11), T('dataRootImportBtn')) : null,
+                S.dataRoot ? InfoTip(T('dataRootImportHint')) : null,
                 h('div', { className: 'dshic-flex' }),
               ),
-              S.dataRoot ? h('div', { className: 'dshic-hint', key: 'importHint' }, T('dataRootImportHint')) : null,
             ],
       );
     }
@@ -6626,8 +6660,6 @@ window.__ModuleLoader__.load({
       };
       const field = (label, value, onChange, placeholder, password) => h(Field, { label, value, onChange, placeholder, password });
       return [
-        h(CraftCard, { key: 'craft' }),
-        h(DataRootCard, { key: 'dataroot' }),
         h('div', { key: 'lang', className: 'dshic-card' },
           h('div', { className: 'dshic-row' }, Ic('text', 12), h('strong', { style: { fontSize: 12 } }, T('langLabel'))),
           h('select', {
@@ -6643,24 +6675,27 @@ window.__ModuleLoader__.load({
             h('option', { value: 'zh' }, T('langZh')),
             h('option', { value: 'en' }, T('langEn'))),
         ),
-        h('div', { key: 'llm', className: 'dshic-card' },
-          h('div', { className: 'dshic-row' }, Ic('spark', 12), h('strong', { style: { fontSize: 12 } }, T('llmLabel'))),
-          h(LlmModelSelect),
+        h(DataRootCard, { key: 'dataroot' }),
+        h(CraftCard, { key: 'craft' }),
+        // 专家与技能卡：独立于模型选择
+        h('div', { key: 'skills', className: 'dshic-card' },
           h('div', { className: 'dshic-row' },
-            h(Field, {
-              label: T('llmMaxTokens'), value: s.textLlm.maxTokens || '', placeholder: T('llmParamAuto'),
-              onChange: (v) => apply((d) => { d.textLlm.maxTokens = v; }),
-            }),
-            h(Field, {
-              label: T('llmTemperature'), value: s.textLlm.temperature || '', placeholder: T('llmParamAuto'),
-              onChange: (v) => apply((d) => { d.textLlm.temperature = v; }),
-            }),
+            Ic('spark', 12),
+            h('strong', { style: { fontSize: 12, flex: 1, minWidth: 0 } }, T('skillEnhance')),
+            InfoTip(T('skillHint')),
           ),
-          h('div', { className: 'dshic-hint' }, T('llmParamHint')),
-          h('div', { className: 'dshic-hint' }, T('skillEnhance')),
           h(SkillSelect, { label: T('skillScript'), value: s.skillScript, onChange: (v) => apply((d) => { d.skillScript = v; }) }),
           h(SkillSelect, { label: T('skillStoryboard'), value: s.skillStoryboard, onChange: (v) => apply((d) => { d.skillStoryboard = v; }) }),
         ),
+        // 文本模型卡：只选模型，参数全用 Harness 默认；紧挨图片/视频/TTS 模型卡片
+        h('div', { key: 'llm', className: 'dshic-card' },
+          h('div', { className: 'dshic-row' },
+            Ic('spark', 12),
+            h('strong', { style: { fontSize: 12, flex: 1, minWidth: 0 } }, T('llmLabel')),
+            InfoTip(T('llmHint')),
+          ),
+          h(LlmModelSelect),
+        ),
         h(ApiListEditor, { key: 'imglist', kind: 'image' }),
         h(ApiListEditor, { key: 'vidlist', kind: 'video' }),
         h(ApiListEditor, { key: 'ttslist', kind: 'tts' }),
@@ -7214,8 +7249,8 @@ window.__ModuleLoader__.load({
           probeCraft();
           // 检查更新（Host RPC；Host 旧版未带此方法时静默）
           checkUpdate(true);
-          // 数据根目录（Host 旧版静默降级为 IndexedDB 模式）；就绪后把 IDB 资产元数据补齐进数据目录索引
-          refreshDataRoot().then(() => syncAssetIndexToHost()).catch(() => { /* 静默 */ });
+          // 数据根目录（Host 旧版静默降级为 IndexedDB 模式）；就绪后自动搬存量资产到磁盘，再对齐索引
+          refreshDataRoot().then(() => autoMigrateAssetsToRoot()).then(() => syncAssetIndexToHost()).catch(() => { /* 静默 */ });
           // 对话 ↔ 画布同步（启动一次 + 3s 轮询；旧 Host 自动停轮询）
           hostSyncTick().then(() => pushAllProjectsToHost());
           const hostSyncTimer = setInterval(() => hostSyncTick(), 3000);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ninkch/dsh-infinite-canvas",
-  "version": "0.17.7",
+  "version": "0.17.9",
   "description": "Node-based short-drama studio for DeepSeek Harness: script → storyboard → assets → shots → voiced, subtitled final cut on an infinite canvas.",
   "keywords": [
     "dsh",