@ash-qw/dsh-theme-prts 1.1.1 → 1.2.0

package/src/client/theme-settings-workbench.js

@@ -293,6 +293,7 @@ export function createThemeSettingsOverlay({
       panel.setAttribute('data-prts-settings-visible', '')
       ;(panel.querySelector('[data-prts-theme-settings-close]') ?? focusable()[0] ?? panel).focus?.()
     } else {
+      customEditor.close?.()
       panel.removeAttribute('data-prts-settings-visible')
       hidePanel()
       setResetConfirmation(false)
@@ -533,6 +534,7 @@ export function createThemeSettingsOverlay({
     const scroller = panel?.querySelector('[data-prts-theme-settings-scroll]')
     const section = panel?.querySelector(`[data-prts-settings-section="${key}"]`)
     if (!scroller || !section) return
+    if (key === 'particles') void customEditor.prefetch?.()
     if (key !== activeSection) {
       sectionScroll.set(activeSection, scroller.scrollTop)
       customEditor.cancelReorder?.()
@@ -642,7 +644,11 @@ export function createThemeSettingsOverlay({
     else if (!event.shiftKey && document.activeElement === last) { event.preventDefault(); first.focus() }
   }
 
-  function onCancel(event) { event.preventDefault(); setOpen(false) }
+  function onCancel(event) {
+    // File inputs also emit bubbling cancel events when their picker is dismissed.
+    if (event.target !== panel) return
+    event.preventDefault(); setOpen(false)
+  }
   const toggle = () => setOpen(!isOpen)
   const closeFromBackdrop = () => setOpen(false)
   const renderMediaState = () => renderState()

package/src/index.js

@@ -12,5 +12,5 @@ export async function apply(ctx) {
   const service=await createEmblemService(directory)
   const disposers=emblemTools(service,ctx.attachments).map(tool=>ctx.tools.register(tool))
   disposers.push(registerEmblemApi(ctx,service))
-  ctx.on('dispose',()=>{for(const dispose of disposers.reverse())dispose()})
+  ctx.on('dispose',async()=>{for(const dispose of disposers.reverse())dispose();await service.dispose()})
 }

package/src/server/api.js

@@ -28,7 +28,7 @@ export function registerEmblemApi(ctx,service) {
       if(req.method==='GET'&&exported){json(res,200,await service.exportAsset(exported[1]));return}
       const match=path.match(/^\/draft\/([a-zA-Z0-9-]+)(?:\/(preview\.png|source))?$/)
       if(req.method==='GET'&&match){
-        if(!match[2]){const d=await service.draft(match[1]);json(res,200,{...draftView(d),value:d.value});return}
+        if(!match[2]){const d=await service.draft(match[1]);json(res,200,{...draftView(d),value:d.value,previewPoints:d.previewPoints});return}
         const bytes=await service.image(match[1],match[2]==='source')
         res.writeHead(200,{'content-type':match[2]==='source'?'application/octet-stream':'image/png','cache-control':'private, max-age=3600','x-content-type-options':'nosniff'});res.end(bytes);return
       }
@@ -40,12 +40,12 @@ export function registerEmblemApi(ctx,service) {
       if(path==='/configuration'){json(res,200,await service.save(data.configuration,data.revision,controller.signal));return}
       if(path==='/import'){
         const d=await service.importAsset(data,controller.signal)
-        json(res,200,{...draftView(d),value:d.value});return
+        json(res,200,{...draftView(d),value:d.value,previewPoints:d.previewPoints});return
       }
       if(path==='/preview'){
         if(data.image && (typeof data.image!=='string'||! /^(?:[A-Za-z0-9+/]{4})*(?:[A-Za-z0-9+/]{2}==|[A-Za-z0-9+/]{3}=)?$/.test(data.image)))throw fault(400,'图片编码无效')
         const d=await service.preview({bytes:data.image?Buffer.from(data.image,'base64'):undefined,baseId:data.draftId,params:data.params,label:data.label},controller.signal)
-        json(res,200,{...draftView(d),value:d.value});return
+        json(res,200,{...draftView(d),value:d.value,previewPoints:d.previewPoints});return
       }
       throw fault(404,'接口不存在')
     }catch(error){if(!res.headersSent)json(res,error.status||500,{error:error.message});else res.end()}

package/src/server/emblems.js

@@ -8,36 +8,43 @@ export const EMBLEMS = [
   ['rhodes-island','罗德岛'],['lungmen','龙门'],['penguin-logistics','企鹅物流'],['rhine-lab','莱茵生命'],['reunion','整合运动'],
 ].map(([key,label])=>({key,label}))
 export const API = '/prts-theme-api/emblems'
-export const DEFAULT_PARAMS = Object.freeze({mode:'auto',threshold:128,zoom:.85,x:0,y:0})
+export const DEFAULT_PARAMS = Object.freeze({mode:'auto',lineSource:'edges',cleanup:2,threshold:128,zoom:.85,x:0,y:0})
 export function fault(status,message) { return Object.assign(new Error(message),{status}) }
 export function parameters(input = {}, base = DEFAULT_PARAMS) {
   if (!input || typeof input !== 'object' || Array.isArray(input)) throw fault(400,'编辑参数无效')
-  const result = {...base,...input}
-  if (Object.keys(result).some(k=>!Object.hasOwn(DEFAULT_PARAMS,k)) || !['auto','alpha','dark','light'].includes(result.mode)
+  const result = {...DEFAULT_PARAMS,...base,...input}
+  if (Object.keys(result).some(k=>!Object.hasOwn(DEFAULT_PARAMS,k)) || !['auto','alpha','dark','light','lineart'].includes(result.mode)
+    || !['edges','ink'].includes(result.lineSource) || !Number.isInteger(result.cleanup) || result.cleanup<0 || result.cleanup>12
     || !Number.isInteger(result.threshold) || result.threshold<1 || result.threshold>254
     || !Number.isFinite(result.zoom) || result.zoom<.5 || result.zoom>2
     || !Number.isFinite(result.x) || Math.abs(result.x)>.5 || !Number.isFinite(result.y) || Math.abs(result.y)>.5) throw fault(400,'编辑参数超出范围')
   return result
 }
-export function processImage(bytes, params, signal) {
+export function processImage(bytes, params, signal, prepared, reusableWorker) {
   signal?.throwIfAborted()
   return new Promise((resolve,reject)=>{
-    const worker = new Worker(new URL('./image-worker.js',import.meta.url), {workerData:{bytes,params},execArgv:[]})
+    const worker = reusableWorker || new Worker(new URL('./image-worker.js',import.meta.url), {workerData:{bytes,params,prepared},execArgv:[]})
+    worker.ref()
     let settled = false
     const finish = async (error,value) => {
       if(settled)return; settled=true;clearTimeout(timer);signal?.removeEventListener('abort',abort)
-      await worker.terminate()
+      if(error || !reusableWorker) await worker.terminate()
+      worker.off('error',onError);worker.off('exit',onExit);worker.off('message',onMessage)
+      worker.unref()
       if(error)reject(error);else resolve(value)
     }
     const abort = ()=>void finish(signal.reason || new Error('已取消'))
+    const onError = error=>void finish(error)
+    const onExit = code=>{if(!settled)void finish(new Error(`图片处理进程提前退出 (${code})`))}
+    const onMessage = result=>void finish(result.error?fault(400,result.error):null,result)
     const timer = setTimeout(()=>void finish(fault(408,'图片处理超时，请缩小图片后重试')),15000)
     signal?.addEventListener('abort',abort,{once:true})
-    worker.once('error',error=>void finish(error))
-    worker.once('exit',code=>{if(!settled)void finish(new Error(`图片处理进程提前退出 (${code})`))})
-    worker.once('message',result=>void finish(result.error?fault(400,result.error):null,result))
+    worker.once('error',onError);worker.once('exit',onExit);worker.once('message',onMessage)
     if(signal?.aborted)abort()
+    else if(reusableWorker) worker.postMessage({bytes,params,prepared})
   })
 }
+
 async function atomic(path,value) {
   const temp = `${path}.${randomUUID()}.tmp`
   await writeFile(temp,value,{mode:0o600});await rename(temp,path)
@@ -53,7 +60,7 @@ export async function createEmblemService(directory) {
     if(!Number.isInteger(stored.revision)||!validEmblemConfiguration(stored.configuration,EMBLEMS))throw Error('已保存的徽记配置无效')
     state=stored
   } catch(error) { if(error.code!=='ENOENT')throw error }
-  let queue=Promise.resolve(), processing=false
+  let queue=Promise.resolve(), previewQueue=Promise.resolve(), preparedCache, imageWorker, workerIdleTimer, disposed=false
   const listeners=new Set()
   const serialize=fn=>{const next=queue.then(fn);queue=next.catch(()=>{});return next}
   const snapshot=()=>structuredClone(state)
@@ -84,6 +91,11 @@ export async function createEmblemService(directory) {
   })
   return {
     snapshot,save,draft,
+    async dispose() {
+      disposed=true;clearTimeout(workerIdleTimer);preparedCache=undefined
+      const worker=imageWorker;imageWorker=undefined
+      if(worker)await worker.terminate()
+    },
     async exportAsset(id) {
       const d=await draft(id)
       const bytes=await readFile(join(directory,`${d.sourceId}.source`))
@@ -101,10 +113,10 @@ export async function createEmblemService(directory) {
     },
     previewPath: id=>join(directory,`${checkedId(id)}.png`),
     subscribe(fn){listeners.add(fn);return()=>listeners.delete(fn)},
-    async preview({bytes,params={},baseId,label},signal) {
-      if(processing)throw fault(409,'正在处理另一张徽记，请稍后重试')
-      processing=true
-      try {
+    preview({bytes,params={},baseId,label},signal) {
+      const pending = previewQueue.then(async () => {
+        if(disposed)throw fault(503,'徽记服务已关闭')
+        signal?.throwIfAborted()
         const previous=baseId?await draft(baseId):null
         const effective=parameters(params,previous?.params)
         if(previous)bytes=await readFile(join(directory,`${previous.sourceId}.source`))
@@ -119,15 +131,36 @@ export async function createEmblemService(directory) {
           for(const d of expired){await unlink(join(directory,`${d.id}.draft.json`));await unlink(join(directory,`${d.id}.png`))}
           for(const sourceId of new Set(expired.map(d=>d.sourceId)))if(!retainedSources.has(sourceId))await unlink(join(directory,`${sourceId}.source`))
         })
-        const result=await processImage(bytes,effective,signal)
         signal?.throwIfAborted()
-        const id=randomUUID(),sourceId=createHash('sha256').update(bytes).digest('hex')
-        const value={id,sourceId,params:effective,label:String(label||previous?.label||'自定义徽记').slice(0,100),createdAt:Date.now(),value:result.value}
+        const sourceHash=createHash('sha256').update(bytes).digest('hex')
+        const cacheKey=`${sourceHash}:${effective.zoom}`
+        clearTimeout(workerIdleTimer)
+        if (!imageWorker || imageWorker.threadId === -1) imageWorker = new Worker(new URL('./image-worker.js',import.meta.url),{execArgv:[]})
+        let result
+        try {
+          result=await processImage(bytes,effective,signal,preparedCache?.key===cacheKey?preparedCache.data:undefined,imageWorker)
+        } finally {
+          // Reuse the warmed-up worker while editing, then release its memory.
+          if (!disposed) {
+          workerIdleTimer=setTimeout(()=>{
+            void imageWorker?.terminate();imageWorker=undefined;preparedCache=undefined
+          },30000)
+          workerIdleTimer.unref()
+          }
+        }
+        if(disposed)throw fault(503,'徽记服务已关闭')
+        preparedCache={key:cacheKey,data:result.prepared}
+        signal?.throwIfAborted()
+        const id=randomUUID(),sourceId=sourceHash
+        const value={id,sourceId,params:effective,label:String(label||previous?.label||'自定义徽记').slice(0,100),createdAt:Date.now(),value:result.value,previewPoints:result.previewPoints}
         await atomic(join(directory,`${sourceId}.source`),bytes)
         await atomic(join(directory,`${id}.png`),result.preview)
         await atomic(join(directory,`${id}.draft.json`),JSON.stringify(value))
         return value
-      } finally {processing=false}
+      })
+      // A cancelled worker must fully exit before the next request starts.
+      previewQueue=pending.catch(()=>{})
+      return pending
     },
     async image(id,source=false) {const d=await draft(id);return readFile(join(directory,source?`${d.sourceId}.source`:`${d.id}.png`))},
     async apply({draftId,target,entryKey,revision},signal) {

package/src/server/image-worker.js

@@ -2,31 +2,48 @@ import { parentPort, workerData } from 'node:worker_threads'
 import sharp from 'sharp'
 import { processCustomEmblemPixels } from '../client/custom-emblem.js'
 
+async function run(job) {
 try {
-  const { bytes, params } = workerData
+  const { bytes, params } = job
+  let prepared = job.prepared
+  if (!prepared) {
   const image = sharp(Buffer.from(bytes), { limitInputPixels: 16000000, failOn: 'error' }).rotate()
   const metadata = await image.metadata()
   if (!['png','jpeg','webp'].includes(metadata.format)) throw new Error('仅支持 PNG、JPEG、WebP 图片')
   const { data, info } = await image.ensureAlpha().raw().toBuffer({ resolveWithObject: true })
-  let mode = params.mode
-  if (mode === 'auto') {
-    mode = 'dark'
-    for (let i = 3; i < data.length; i += 4) if (data[i] < 128) { mode = 'alpha'; break }
-  }
+  let autoMode = 'dark'
+  for (let i = 3; i < data.length; i += 4) if (data[i] < 128) { autoMode = 'alpha'; break }
   const scale = 320 / Math.max(info.width, info.height) * params.zoom
   const width = Math.max(1, Math.round(info.width * scale)), height = Math.max(1, Math.round(info.height * scale))
   const resized = await sharp(data, { raw: info }).resize(width, height).raw().toBuffer()
-  const rgba = new Uint8ClampedArray(320 * 320 * 4)
-  const left = Math.round((320-width)/2 + params.x*320), top = Math.round((320-height)/2 + params.y*320)
-  for (let y = Math.max(0,top); y < Math.min(320,top+height); y++) {
-    const x = Math.max(0,left), end = Math.min(320,left+width)
-    if (end > x) rgba.set(resized.subarray(((y-top)*width+x-left)*4,((y-top)*width+end-left)*4),(y*320+x)*4)
+  // Extract the entire centered image before applying the viewport translation.
+  const size = Math.max(320, width, height)
+  const rgba = new Uint8ClampedArray(size * size * 4)
+  const left = Math.round((size-width)/2), top = Math.round((size-height)/2)
+  for (let y = Math.max(0,top); y < Math.min(size,top+height); y++) {
+    const x = Math.max(0,left), end = Math.min(size,left+width)
+    if (end > x) rgba.set(resized.subarray(((y-top)*width+x-left)*4,((y-top)*width+end-left)*4),(y*size+x)*4)
+  }
+  prepared = {rgba,size,autoMode}
   }
-  const value = processCustomEmblemPixels(rgba,320,mode,params.threshold)
+  const {rgba,size,autoMode} = prepared
+  const mode = params.mode === 'auto' ? autoMode : params.mode
+  const value = processCustomEmblemPixels(rgba,size,mode,params.threshold,undefined,params)
+  let previewPoints
+  for (const [density, points] of Object.entries(value.targets)) {
+    const shifted = points.map(p => ({...p, x:p.x*size/320+params.x, y:p.y*size/320+params.y}))
+    if (density === 'standard') previewPoints = shifted
+    value.targets[density] = shifted.filter(p => Math.abs(p.x)<=.5 && Math.abs(p.y)<=.5)
+  }
+  if (Object.values(value.targets).some(points => points.length < 4)) throw new Error('取景框内可用轮廓太少，请调整位置或缩放')
   const dots = value.targets.standard.map(p => {
     const r = p.kind === 'skeleton' ? 1.2 : .9
     return `<circle cx="${192+p.x*350}" cy="${192+p.y*350}" r="${r}"/>`
   }).join('')
   const preview = await sharp(Buffer.from(`<svg xmlns="http://www.w3.org/2000/svg" width="384" height="384"><rect width="384" height="384" fill="#0d1114"/><g fill="#edf1f2">${dots}</g></svg>`)).png().toBuffer()
-  parentPort.postMessage({ value, preview })
+  parentPort.postMessage({ value, preview, previewPoints, prepared })
 } catch (error) { parentPort.postMessage({ error: error.message }) }
+
+}
+parentPort.on('message',run)
+if (workerData?.bytes) void run(workerData)

package/src/server/tools.js

@@ -2,10 +2,21 @@ import { draftView, stateView, fault } from './emblems.js'
 
 export function sessionImages(agent) {
   if(!agent?.session)throw fault(400,'请在 DSH 会话中调用此工具')
-  const images=new Map()
+  const images=new Map(), calls=new Map()
   for(const event of agent.session.snapshotEvents()) {
-    if(event.type!=='user/message')continue
-    for(const part of event.data.content ?? [])if(part.attachment && (part.type==='image' || part.type==='file' && /\.(png|jpe?g|webp)$/i.test(part.attachment.name || '')))images.set(part.attachment.attachmentId,{...part.attachment,attachmentKind:part.type})
+    if(event.type==='tool/call')calls.set(event.data.callId,event.data.name)
+    const uploaded=event.type==='user/message'
+    const message=uploaded?event.data:event.type==='tool/result'?event.data.message:null
+    const toolName=calls.get(message?.toolCallId ?? message?.source?.callId)
+    // Preview attachments are rendered particle images, not editable source images.
+    if(!message || message.isError || toolName==='prts_emblem_preview')continue
+    for(const part of message.content ?? []) {
+      const ref=part.attachment
+      if(!ref || typeof ref.attachmentId!=='string' || !ref.attachmentId)continue
+      if(part.type!=='image' && !(part.type==='file' && (/^image\/(png|jpeg|webp)$/.test(ref.mediaType || '') || /\.(png|jpe?g|webp)$/i.test(ref.name || ''))))continue
+      if(images.has(ref.attachmentId))continue
+      images.set(ref.attachmentId,{...ref,attachmentKind:part.type,origin:uploaded?'upload':'tool',...(toolName?{toolName}:{})})
+    }
   }
   return [...images.values()]
 }
@@ -13,15 +24,15 @@ export function emblemTools(service,attachments) {
   const output={schema:{type:'object'},render:(_args,value)=>[{type:'text',text:JSON.stringify(value)},...(value.previewImage&&value.imageForModel?[{type:'image',attachment:value.previewImage}]:[])]}
   return [{
     name:'prts_emblem_inspect',
-    description:'查看 PRTS 主题的新会话徽记、正文轮换列表、配置版本，以及当前会话已上传的图片。仅当用户要求查看或调整主题徽记时使用。徽记设置跨工作区和会话共享；工具不会修改设置。',
+    description:'查看 PRTS 主题的新会话徽记、正文轮换列表、配置版本，以及当前会话上传或工具返回的图片。仅当用户要求查看或调整主题徽记时使用。徽记设置跨工作区和会话共享；工具不会修改设置。',
     parameters:{type:'object',properties:{},additionalProperties:false},output,isConcurrencySafe:()=>true,
     async execute(_args,exec){return JSON.parse(JSON.stringify({...stateView(service.snapshot()),images:sessionImages(exec.agent)}))}
   },{
     name:'prts_emblem_preview',
-    description:'将当前会话上传的图片制作成 PRTS 粒子徽记草稿，或继续调整已有草稿。传 attachmentId（来自 inspect）或 draftId，二选一。调整已有正式徽记可使用 inspect 返回的 draftId。仅生成预览，不应用。优先原样使用返回的 previewMarkdown 展示给用户；没有此字段时，告知用户可展开工具卡片查看。不要将 previewUrl 当成本地图片路径。标准密度预览不是原图。用户满意后使用 apply。不要声称已看到预览，除非实际通过视觉工具查看。',
+    description:'将当前会话上传或工具返回的图片制作成 PRTS 粒子徽记草稿，或继续调整已有草稿。传 attachmentId（来自 inspect）或 draftId，二选一。调整已有正式徽记可使用 inspect 返回的 draftId。仅生成预览，不应用。优先原样使用返回的 previewMarkdown 展示给用户；没有此字段时，告知用户可展开工具卡片查看。不要将 previewUrl 当成本地图片路径。AI 生成或编辑的本地图片先用 read_image 读取，再 inspect 获取 attachmentId，无需用户重新上传。线稿效果使用 params.mode=lineart，阈值越高保留的轮廓越少；彩色图用 lineSource=edges，纯线稿用 lineSource=ink 避免双边缘；cleanup=0..12 去除孤立碎线，五官细节丢失时降低到 0。无需自行对齐粒子格点。标准密度预览不是原图。用户满意后使用 apply。不要声称已看到预览，除非实际通过视觉工具查看。',
     parameters:{type:'object',additionalProperties:false,properties:{
       attachmentId:{type:'string'},draftId:{type:'string'},label:{type:'string',maxLength:100},
-      params:{type:'object',additionalProperties:false,properties:{mode:{type:'string',enum:['auto','alpha','dark','light']},threshold:{type:'integer',minimum:1,maximum:254},zoom:{type:'number',minimum:.5,maximum:2},x:{type:'number',minimum:-.5,maximum:.5},y:{type:'number',minimum:-.5,maximum:.5}}},
+      params:{type:'object',additionalProperties:false,properties:{mode:{type:'string',enum:['auto','alpha','dark','light','lineart']},lineSource:{type:'string',enum:['edges','ink']},cleanup:{type:'integer',minimum:0,maximum:12},threshold:{type:'integer',minimum:1,maximum:254},zoom:{type:'number',minimum:.5,maximum:2},x:{type:'number',minimum:-.5,maximum:.5},y:{type:'number',minimum:-.5,maximum:.5}}},
     }},output,isConcurrencySafe:()=>false,
     async execute(args,exec){
       const images=sessionImages(exec.agent)
@@ -29,9 +40,9 @@ export function emblemTools(service,attachments) {
       let bytes,label=args.label
       if(args.attachmentId) {
         const ref=images.find(e=>e.attachmentId===args.attachmentId)
-        if(!ref)throw fault(404,'当前会话没有这张图片，请先上传图片或重新读取图片列表')
+        if(!ref)throw fault(404,'当前会话没有这张图片，请先上传图片或用 read_image 读取生成图，再重新读取图片列表')
         if(ref.bytes>8*1024*1024)throw fault(400,'图片超过 8 MB')
-        const {attachmentKind,...attachment}=ref
+        const {attachmentKind,origin,toolName,...attachment}=ref
         if(attachmentKind==='file') {
           const chunks=[];let total=0
           for await(const chunk of attachments.readFileStream(attachment,exec.signal)) {