evomeme 0.1.10-beta.4 → 0.1.10-beta.8

package/README.md

@@ -5,6 +5,8 @@
 
 npm 包名：`evomeme`。用 `npx` 安装到 AI 工具后，即可在对话里做游戏、生图、提交草稿。
 
+本地 3D 资产工作流默认使用 `evomeme asset`、`evomeme scene export` 和 `evomeme stage`，详见 [资产 CLI 使用说明](../docs/asset-cli.md)。IDE 插件安装不等于全局安装 CLI：使用已发布且支持这些命令的 `npx -y evomeme@latest`，或本地构建后的 `node dist/index.js`；先执行 `asset --help` 检查能力。这 12 个资产/Stage MCP 入口已移除，对应操作使用 CLI；其余 20 个 MCP 工具继续可用。
+
 ---
 
 ## 一、这是什么？

package/dist/canvas-public/features/editing/perfect-pixel.js

@@ -3,7 +3,7 @@ import {
   peekFeatureState,
   notifyFeatureState,
 } from '../../core/feature-state.js'
-import { t, translateWorkerError } from '../../language/index.js'
+import { t } from '../../language/index.js'
 import { api } from '../../core/api.js'
 import { state } from '../../core/state.js'
 import { el } from '../../ui/controls.js'
@@ -85,7 +85,7 @@ export default {
     },
   ],
   runtimeDefaults: () => ({
-    worker: null,
+    previewController: null,
     processTimer: null,
     layoutSaveTimer: null,
     requestId: 0,
@@ -103,21 +103,14 @@ export default {
 function createPerfectPixelTool(context) {
   const { findNodeEl, formatPerfectPixelSourceArea, imageUrl, saveLayout } = context
 
-  function workerErrorText(message) {
-    if (message?.messageKey === 'workers.imageLoadFailed') {
-      return `${t('workers.imageLoadFailed')}${message.messageVariables?.status ?? ''}`
-    }
-    return translateWorkerError(message)
-  }
-
   function perfectPixelSettings(ds) {
     return {
-      autoGrid: ds.autoGrid,
-      pixelSize: ds.pixelSize,
-      sampleMethod: ds.sampleMethod,
-      exportScale: ds.exportScale,
-      alphaMode: ds.alphaMode,
-      alphaThreshold: ds.alphaThreshold,
+      auto_grid: ds.autoGrid,
+      pixel_size: ds.pixelSize,
+      sample_method: ds.sampleMethod,
+      export_scale: ds.exportScale,
+      alpha_mode: ds.alphaMode,
+      alpha_threshold: ds.alphaThreshold,
     }
   }
 
@@ -157,78 +150,60 @@ function createPerfectPixelTool(context) {
     }, 220)
   }
 
-  function startPerfectPixelWorker(editorId, sourceId, requestId) {
+  async function startPerfectPixelPreview(editorId, sourceId, requestId) {
     const ds = peekFeatureState(editorId)
     if (!ds || ds.requestId !== requestId) return
-    ds.worker?.terminate()
-    const worker = new Worker('/workers/perfect-pixel-worker.js')
-    ds.worker = worker
-    worker.addEventListener('message', (event) => {
-      const current = peekFeatureState(editorId)
-      if (!current || current.worker !== worker || current.requestId !== requestId) return
-      const message = event.data || {}
-      if (message.type === 'ready') {
-        worker.postMessage({
-          type: 'process',
-          requestId,
-          settings: perfectPixelSettings(current),
-        })
-        return
+    const controller = new AbortController()
+    ds.previewController = controller
+    try {
+      const response = await fetch('/api/perfect-pixel/preview', {
+        method: 'POST', headers: { 'Content-Type': 'application/json' },
+        body: JSON.stringify({ id: sourceId, ...perfectPixelSettings(ds) }),
+        signal: controller.signal,
+      })
+      if (!response.ok) {
+        const error = await response.json().catch(() => ({}))
+        throw new Error(error.detail || response.statusText)
       }
-      if (message.type === 'result' && message.requestId === requestId && message.blob) {
-        worker.terminate()
-        current.worker = null
-        if (current.previewUrl?.startsWith('blob:')) URL.revokeObjectURL(current.previewUrl)
-        current.resultBlob = message.blob
-        current.previewUrl = URL.createObjectURL(message.blob)
-        current.resultMeta = {
-          width: message.width,
-          height: message.height,
-          gridWidth: message.gridWidth,
-          gridHeight: message.gridHeight,
-          pixelSizeX: message.pixelSizeX,
-          pixelSizeY: message.pixelSizeY,
-          confidence: message.confidence,
-          automatic: message.automatic,
-        }
-        current.pending = false
-        current.error = ''
-        const image = findNodeEl(editorId)?.querySelector('[data-role="perfect-pixel-preview"]')
-        if (image) image.src = current.previewUrl
-        updatePerfectPixelEditorUi(editorId)
-        return
-      }
-      if (message.type === 'error') {
-        worker.terminate()
-        current.worker = null
-        current.pending = false
-        current.resultBlob = null
-        current.resultMeta = null
-        current.error = `${t('features.editing.perfectPixel.text007')}${workerErrorText(message)}`
-        updatePerfectPixelEditorUi(editorId)
+      const meta = JSON.parse(response.headers.get('X-Perfect-Pixel-Metadata'))
+      const blob = await response.blob()
+      const current = peekFeatureState(editorId)
+      if (!current || current.requestId !== requestId || controller.signal.aborted) return
+      if (current.previewUrl?.startsWith('blob:')) URL.revokeObjectURL(current.previewUrl)
+      current.resultBlob = blob
+      current.previewUrl = URL.createObjectURL(blob)
+      current.resultMeta = {
+        width: meta.width, height: meta.height,
+        gridWidth: meta.grid_width, gridHeight: meta.grid_height,
+        pixelSizeX: meta.pixel_size_x, pixelSizeY: meta.pixel_size_y,
+        confidence: meta.confidence, automatic: meta.auto_grid,
       }
-    })
-    worker.addEventListener('error', () => {
+      current.error = ''
+      const image = findNodeEl(editorId)?.querySelector('[data-role="perfect-pixel-preview"]')
+      if (image) image.src = current.previewUrl
+    } catch (error) {
       const current = peekFeatureState(editorId)
-      if (!current || current.worker !== worker || current.requestId !== requestId) return
-      worker.terminate()
-      current.worker = null
-      current.pending = false
+      if (!current || current.requestId !== requestId || controller.signal.aborted) return
       current.resultBlob = null
       current.resultMeta = null
-      current.error = t('features.editing.perfectPixel.text008')
-      updatePerfectPixelEditorUi(editorId)
-    })
-    worker.postMessage({ type: 'init', requestId, url: imageUrl(sourceId) })
+      current.error = t('features.editing.perfectPixel.text007') + error.message
+    } finally {
+      const current = peekFeatureState(editorId)
+      if (current?.requestId === requestId && !controller.signal.aborted) {
+        current.previewController = null
+        current.pending = false
+        updatePerfectPixelEditorUi(editorId)
+      }
+    }
   }
 
-  function schedulePerfectPixelProcess(editorId, delay = 100) {
+  function schedulePerfectPixelProcess(editorId, delay = 200) {
     const ds = peekFeatureState(editorId)
     const item = state.layoutItems.find((candidate) => candidate.id === editorId)
     if (!ds || !item?.sourceId || ds.busy) return
     clearTimeout(ds.processTimer)
-    ds.worker?.terminate()
-    ds.worker = null
+    ds.previewController?.abort()
+    ds.previewController = null
     ds.requestId += 1
     const requestId = ds.requestId
     if (ds.previewUrl?.startsWith('blob:')) URL.revokeObjectURL(ds.previewUrl)
@@ -240,7 +215,7 @@ function createPerfectPixelTool(context) {
     updatePerfectPixelEditorUi(editorId)
     ds.processTimer = setTimeout(() => {
       ds.processTimer = null
-      startPerfectPixelWorker(editorId, item.sourceId, requestId)
+      void startPerfectPixelPreview(editorId, item.sourceId, requestId)
     }, delay)
   }
 
@@ -266,25 +241,12 @@ function createPerfectPixelTool(context) {
     if (!ds) return
     clearTimeout(ds.processTimer)
     clearTimeout(ds.layoutSaveTimer)
-    ds.worker?.terminate()
+    ds.previewController?.abort()
     if (ds.previewUrl?.startsWith('blob:')) URL.revokeObjectURL(ds.previewUrl)
   }
 
   function task(item, ds) {
-    const blob = ds.resultBlob
-    const settings = {
-      source_id: item.sourceId,
-      auto_grid: String(ds.autoGrid),
-      grid_width: String(ds.resultMeta.gridWidth),
-      grid_height: String(ds.resultMeta.gridHeight),
-      pixel_size: String(ds.pixelSize),
-      pixel_size_x: String(ds.resultMeta.pixelSizeX),
-      pixel_size_y: String(ds.resultMeta.pixelSizeY),
-      sample_method: ds.sampleMethod,
-      export_scale: String(ds.exportScale),
-      alpha_mode: ds.alphaMode,
-      alpha_threshold: String(ds.alphaThreshold),
-    }
+    const settings = { id: item.sourceId, ...perfectPixelSettings(ds) }
     return {
       wait: {
         name: t('features.editing.perfectPixel.text009'),
@@ -294,8 +256,9 @@ function createPerfectPixelTool(context) {
       },
       request: (operationId) =>
         api(
-          `/api/perfect-pixel/apply-browser?${new URLSearchParams({ ...settings, client_operation_id: operationId })}`,
-          { method: 'POST', headers: { 'Content-Type': 'image/png' }, body: blob },
+          '/api/perfect-pixel/apply',
+          { method: 'POST', headers: { 'Content-Type': 'application/json' },
+            body: JSON.stringify({ ...settings, client_operation_id: operationId }) },
         ),
     }
   }

package/dist/canvas-public/features/generation/image.js

@@ -1,19 +1,19 @@
 import { state } from '../../core/state.js'
 import { t } from '../../language/index.js'
-import { generationNode, promptField, modelField, refsField, imageWait } from './fields.js'
-
-const sizePresets = (model) => state.meta?.models?.find((entry) => entry.id === model)?.size_presets ||
-  (state.meta?.size_presets || ['2048x2048']).filter((size) => model !== 'asset-lite' || size !== '1024x1024')
-const normalizeModelFields = (p) => {
-  if (p.model !== 'asset-max' && p.background === 'auto') p.background = 'opaque'
-  const supported = state.meta?.models?.find((entry) => entry.id === p.model)?.size_presets
-  if (supported && !supported.includes(p.sizePreset) || p.model === 'asset-lite' && p.sizePreset === '1024x1024') {
-    p.sizePreset = '2048x2048'
-  }
-  return p
-}
-
-export default {
+import { generationNode, promptField, modelField, refsField, imageWait } from './fields.js'
+
+const sizePresets = (model) => state.meta?.models?.find((entry) => entry.id === model)?.size_presets ||
+  (state.meta?.size_presets || ['2048x2048']).filter((size) => model !== 'asset-lite' || size !== '1024x1024')
+const normalizeModelFields = (p) => {
+  if (p.model !== 'asset-max' && p.background === 'auto') p.background = 'opaque'
+  const supported = state.meta?.models?.find((entry) => entry.id === p.model)?.size_presets
+  if (supported && !supported.includes(p.sizePreset) || p.model === 'asset-lite' && p.sizePreset === '1024x1024') {
+    p.sizePreset = '2048x2048'
+  }
+  return p
+}
+
+export default {
   render: (ui) =>
     ui.stack(
       ui.prompt('prompt', 'refs'),
@@ -24,9 +24,9 @@ export default {
   id: 'image',
   title: 'features.generation.generationDialog.text009',
   node: generationNode('gen_dialog', 420),
-  storage: 'imageGeneration',
-  migrate: (saved) => normalizeModelFields(saved),
-  changed: (p, field) => { if (field === 'model') normalizeModelFields(p) },
+  storage: 'imageGeneration',
+  migrate: (saved) => normalizeModelFields(saved),
+  changed: (p, field) => { if (field === 'model') normalizeModelFields(p) },
   fields: [
     promptField({ required: true, placeholder: 'features.generation.imageGeneration.text022' }),
     refsField(),
@@ -34,14 +34,14 @@ export default {
     {
       path: 'background',
       type: 'enum',
-      default: 'opaque',
+      default: 'opaque',
       label: 'inspector.uiInspector.text014',
       visible: (p) => p.model !== 'asset-lite',
-      options: (p) =>
-        ['auto', 'transparent', 'opaque'].flatMap((value, index) => p.model !== 'asset-max' && value === 'auto' ? [] : [{
-          value,
-          labelKey: `features.generation.generationControls.text00${index + 1}`,
-        }]),
+      options: (p) =>
+        ['auto', 'transparent', 'opaque'].flatMap((value, index) => p.model !== 'asset-max' && value === 'auto' ? [] : [{
+          value,
+          labelKey: `features.generation.generationControls.text00${index + 1}`,
+        }]),
     },
     {
       path: 'sizeMode',
@@ -56,9 +56,9 @@ export default {
     {
       path: 'sizePreset',
       type: 'enum',
-      default: () => state.meta?.default_size || '2048x2048',
+      default: () => state.meta?.default_size || '2048x2048',
       label: 'inspector.uiInspector.text018',
-      options: (p) => sizePresets(p.model),
+      options: (p) => sizePresets(p.model),
       visible: (p) => p.sizeMode !== 'custom',
     },
     {