@ash-qw/dsh-theme-prts 1.2.2 → 1.3.1

package/src/client/preferences.js

@@ -38,6 +38,8 @@ export const DEFAULT_PREFERENCES = Object.freeze({
   sessionFlowColorFront: SESSION_FLOW_PALETTES.triad.front,
   sessionFlowSpeed: SESSION_FLOW_SPEED_DEFAULT,
   conversationStyle: 'native',
+  bakerGroupAvatars: true,
+  conversationEmblem: true,
 })
 
 export const VISUAL_PRESETS = Object.freeze({
@@ -79,7 +81,7 @@ export const PREFERENCE_GROUPS = Object.freeze({
   material: Object.freeze(['glass']),
   accessibility: Object.freeze(['motion', 'bootAnimation', 'cursor']),
   navigation: Object.freeze(['railDefaultHidden']),
-  conversation: Object.freeze(['sessionFlow', 'sessionGlow', 'sessionFlowPalette', 'sessionFlowColorBack', 'sessionFlowColorCore', 'sessionFlowColorFront', 'sessionFlowSpeed', 'conversationStyle']),
+  conversation: Object.freeze(['sessionFlow', 'sessionGlow', 'sessionFlowPalette', 'sessionFlowColorBack', 'sessionFlowColorCore', 'sessionFlowColorFront', 'sessionFlowSpeed', 'conversationStyle', 'bakerGroupAvatars', 'conversationEmblem']),
 })
 
 const TEXTURES = new Set(['off', 'restrained', 'full'])
@@ -195,6 +197,8 @@ export function normalizePreferences(value) {
     sessionFlowColorCore: sessionFlowColors.core,
     sessionFlowColorFront: sessionFlowColors.front,
     sessionFlowSpeed: sessionFlowSpeedOr(input.sessionFlowSpeed, DEFAULT_PREFERENCES.sessionFlowSpeed),
+    conversationEmblem: booleanOr(input.conversationEmblem, DEFAULT_PREFERENCES.conversationEmblem),
+    bakerGroupAvatars: booleanOr(input.bakerGroupAvatars, DEFAULT_PREFERENCES.bakerGroupAvatars),
     conversationStyle: enumOr(input.conversationStyle, CONVERSATION_STYLES, DEFAULT_PREFERENCES.conversationStyle),
   }
   normalized.preset = matchedVisualPreset(normalized)

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

@@ -1,3 +1,4 @@
+import { avatarMarkup, mountAvatarSettings } from './custom-avatar.js'
 import { customEmblemMarkup, mountCustomEmblemEditor } from './custom-emblem.js'
 import { PARTICLE_TRAVERSAL_SPEED_DEFAULT, PARTICLE_TRAVERSAL_SPEED_MAX, PARTICLE_TRAVERSAL_SPEED_MIN, PARTICLE_TRAVERSAL_SPEED_STEP, SESSION_FLOW_SPEED_DEFAULT, SESSION_FLOW_SPEED_MAX, SESSION_FLOW_SPEED_MIN, SESSION_FLOW_SPEED_STEP, resolveParticleDetail } from './preferences.js'
 
@@ -50,12 +51,16 @@ function settingButtons(key, label, options) {
         ? '<small data-prts-setting-note>立即切换会话背景、头像与消息气泡</small>'
       : key === 'sessionFlow'
         ? '<small data-prts-setting-note>仅控制当前会话卡片的三色流线</small>'
+      : key === 'conversationEmblem'
+        ? '<small data-prts-setting-note>控制经典主题正文中的粒子徽记，不影响新会话徽记</small>'
+      : key === 'bakerGroupAvatars'
+        ? '<small data-prts-setting-note>过程正文仅首条显示头像，最终回答独立保留；关闭后每条回复均显示</small>'
       : key === 'sessionGlow'
         ? '<small data-prts-setting-note>为流线添加柔和的同色辉光</small>'
       : key === 'sessionFlowPalette'
         ? '<small data-prts-setting-note>同时适配日间与夜间模式</small>'
       : ''
-  if (['cursor', 'railDefaultHidden', 'sessionFlow', 'sessionGlow'].includes(key)) return `<div data-prts-setting-row="${key}">
+  if (['cursor', 'railDefaultHidden', 'sessionFlow', 'sessionGlow', 'bakerGroupAvatars', 'conversationEmblem'].includes(key)) return `<div data-prts-setting-row="${key}">
     <span><strong>${label}</strong>${note}</span>
     <button type="button" role="switch" aria-label="${label}" aria-checked="false" data-prts-setting-switch="${key}" ${key === 'cursor' ? 'data-prts-cursor-switch' : ''}><span aria-hidden="true"></span></button>
   </div>`
@@ -156,9 +161,18 @@ export function themeSettingsMarkup() {
             <header><span><strong>界面外观</strong></span></header>
             <div data-prts-settings-common-grid>
               ${COMMON_CONTROLS.filter(([key]) => ['texture', 'glass'].includes(key)).map(([key, label, options]) => settingButtons(key, label, options)).join('')}
-              ${settingButtons('conversationStyle', '会话主题', [['native', '原有'], ['deck-chat', '通讯链路']])}
             </div>
           </section>
+          <section data-prts-conversation-settings>
+            <header><strong>会话主题</strong><small>选择消息的呈现方式</small></header>
+            <div data-prts-conversation-cards>
+              <button type="button" data-prts-setting-key="conversationStyle" data-prts-setting-value="native" aria-pressed="false"><span data-prts-conversation-sample="classic" aria-hidden="true"><i></i><i></i></span><strong>经典</strong><small>简洁正文，保留熟悉的阅读布局</small></button>
+              <button type="button" data-prts-setting-key="conversationStyle" data-prts-setting-value="deck-chat" aria-pressed="false"><span data-prts-conversation-sample="baker" aria-hidden="true"><i></i><i></i></span><strong>Baker</strong><small>终末地通讯风格，圆形头像与消息气泡</small></button>
+            </div>
+            <div data-prts-classic-options>${settingButtons('conversationEmblem', '正文徽记', [])}</div>
+            ${avatarMarkup()}
+            <div data-prts-baker-options>${settingButtons('bakerGroupAvatars', '合并过程回复头像', [])}</div>
+          </section>
           </section>
           <section data-prts-settings-common data-prts-settings-section="interaction" role="tabpanel" id="prts-page-interaction" aria-labelledby="prts-tab-interaction" tabindex="0" hidden>
             <header data-prts-section-heading><strong>交互</strong><small>光标、导航栏与动态反馈</small></header>
@@ -207,7 +221,7 @@ export function createThemeSettingsOverlay({
   trigger,
   panel,
   backdrop,
-  customEmblemStore,
+  customEmblemStore, avatarStore,
   onOpen = () => {},
   onPreferenceChange = () => {},
   onPreferencePreview = () => {},
@@ -215,6 +229,7 @@ export function createThemeSettingsOverlay({
   onRetrySave = () => {},
 }) {
   const window = document?.defaultView
+  const avatarEditor = mountAvatarSettings({panel,window,store:avatarStore})
   const customEditor = mountCustomEmblemEditor({ panel, window, store: customEmblemStore })
   const transparencyMedia = window?.matchMedia?.('(prefers-reduced-transparency: reduce)')
   const motionMedia = window?.matchMedia?.('(prefers-reduced-motion: reduce)')
@@ -294,6 +309,7 @@ export function createThemeSettingsOverlay({
       ;(panel.querySelector('[data-prts-theme-settings-close]') ?? focusable()[0] ?? panel).focus?.()
     } else {
       customEditor.close?.()
+      avatarEditor.close?.()
       panel.removeAttribute('data-prts-settings-visible')
       hidePanel()
       setResetConfirmation(false)
@@ -678,6 +694,11 @@ export function createThemeSettingsOverlay({
 
   return {
     update(preferences, status, persistenceState = currentPersistence) {
+      const emblemNote = panel.querySelector('[data-prts-emblem-baker-note]')
+      if (emblemNote) emblemNote.hidden = preferences?.conversationStyle !== 'deck-chat'
+      panel.querySelector('[data-prts-classic-options]').hidden = preferences?.conversationStyle === 'deck-chat'
+      panel.querySelector('[data-prts-baker-options]').hidden = preferences?.conversationStyle !== 'deck-chat'
+      panel.querySelector('[data-prts-avatars]').hidden = preferences?.conversationStyle !== 'deck-chat'
       currentPreferences = preferences
       currentStatus = status
       currentPersistence = persistenceState ?? { phase: 'idle', revision: 0 }
@@ -693,6 +714,7 @@ export function createThemeSettingsOverlay({
     toggle,
     dispose() {
       customEditor.dispose()
+      avatarEditor.dispose()
       isOpen = false
       hidePanel()
       if (savedTimer !== undefined) window?.clearTimeout?.(savedTimer)

package/src/index.js

@@ -1,6 +1,8 @@
+import { createAvatarService, registerAvatarApi } from './server/avatars.js'
 import { join } from 'node:path'
 import { homedir } from 'node:os'
 import { createEmblemService } from './server/emblems.js'
+import { avatarTools } from './server/avatar-tools.js'
 import { emblemTools } from './server/tools.js'
 import { registerEmblemApi } from './server/api.js'
 export const PACKAGE_ID = '@ash-qw/dsh-theme-prts'
@@ -10,7 +12,8 @@ export const inject = ['tools', 'attachments', 'connection', 'webServer']
 export async function apply(ctx) {
   const directory=join(process.env.DSH_HOME?.trim() || join(homedir(),'.dsh'),'plugins','dsh-theme-prts','emblems')
   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',async()=>{for(const dispose of disposers.reverse())dispose();await service.dispose()})
+  const avatars=await createAvatarService(join(directory,'..','avatars'))
+  const disposers=[...emblemTools(service,ctx.attachments),...avatarTools(avatars,ctx.attachments)].map(tool=>ctx.tools.register(tool))
+  disposers.push(registerEmblemApi(ctx,service),registerAvatarApi(ctx,avatars))
+  ctx.effect(()=>async()=>{for(const dispose of disposers.reverse())dispose();await service.dispose()})
 }

package/src/server/api.js

@@ -1,16 +1,22 @@
 import { API, draftView, fault } from './emblems.js'
 
-async function body(req) {
+// Avoid repeated groups: multi-megabyte images can exhaust V8's regexp stack.
+export function isBase64(value){return typeof value==='string'&&value.length%4===0&&/^[A-Za-z0-9+/]*={0,2}$/.test(value)}
+
+export async function body(req) {
   const chunks=[];let size=0
   for await(const chunk of req){size+=chunk.length;if(size>16*1024*1024)throw fault(413,'请求过大');chunks.push(chunk)}
   try{return JSON.parse(Buffer.concat(chunks).toString('utf8'))}catch{throw fault(400,'请求数据无效')}
 }
-function json(res,status,value){res.writeHead(status,{'content-type':'application/json; charset=utf-8','cache-control':'no-store'});res.end(JSON.stringify(value))}
+export function json(res,status,value){res.writeHead(status,{'content-type':'application/json; charset=utf-8','cache-control':'no-store'});res.end(JSON.stringify(value))}
 export function registerEmblemApi(ctx,service) {
+  const connection=ctx.connection
+  let disposed=false
   const streams=new Set()
   const dispose=ctx.webServer.register({kind:'prefix',path:API,handler:async(req,res)=>{
     try {
-      const admission=ctx.connection.admit(req)
+      if(disposed){json(res,503,{error:'主题服务正在重新加载，请稍后重试'});return}
+      const admission=connection.admit(req)
       if('rejection' in admission){json(res,401,{error:'请先登录 DSH'});return}
       const path=new URL(req.url,'http://localhost').pathname.slice(API.length)
       if(req.method==='GET'&&path==='/events') {
@@ -43,12 +49,12 @@ export function registerEmblemApi(ctx,service) {
         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,'图片编码无效')
+        if(data.image && !isBase64(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,previewPoints:d.previewPoints});return
       }
       throw fault(404,'接口不存在')
     }catch(error){if(!res.headersSent)json(res,error.status||500,{error:error.message});else res.end()}
   }})
-  return()=>{dispose();for(const res of streams)res.end();streams.clear()}
+  return()=>{disposed=true;dispose();for(const res of streams)res.end();streams.clear()}
 }

package/src/server/avatar-tools.js

@@ -0,0 +1,67 @@
+import sharp from 'sharp'
+import { sessionImages } from './tools.js'
+import { fault } from './emblems.js'
+
+const limit=5*1024*1024
+const cropSchema={type:'object',additionalProperties:false,properties:{
+  zoom:{type:'number',minimum:1,maximum:4},x:{type:'number',minimum:0,maximum:1},y:{type:'number',minimum:0,maximum:1},
+},required:['zoom','x','y']}
+const view=state=>({revision:state.revision,user:{custom:Boolean(state.user)},assistant:{custom:Boolean(state.assistant)}})
+export function avatarTools(service,attachments){
+  const output={schema:{type:'object'},render:(_args,value)=>[{type:'text',text:JSON.stringify(value)}]}
+  return [{
+    name:'prts_avatar_inspect',
+    description:'查看 PRTS 主题 Baker 会话头像的配置版本、用户和 AI 头像的原图尺寸与裁剪参数，以及当前会话上传或工具返回的图片。头像在同一 DSH 实例的所有会话中共享，仅在 Baker 样式下显示；此工具不修改设置。AI 生成或编辑的本地图片先用 read_image 读取，再调用本工具获取 attachmentId。',
+    parameters:{type:'object',properties:{},additionalProperties:false},output,isConcurrencySafe:()=>true,
+    async execute(_args,exec){
+      const images=sessionImages(exec.agent),state=service.snapshot(),result=view(state)
+      // Capture both sources before awaiting so metadata and revision describe one snapshot.
+      const originals=['user','assistant'].map(role=>[role,service.edit(role)])
+      for(const [role,source] of originals){
+        if(!source.image)continue
+        const meta=await sharp(Buffer.from(source.image,'base64'),{limitInputPixels:25000000,animated:false}).metadata()
+        const swapped=[5,6,7,8].includes(meta.orientation)
+        result[role]={custom:true,width:swapped?meta.height:meta.width,height:swapped?meta.width:meta.height,crop:source.crop}
+      }
+      return {...result,images}
+    },
+  },{
+    name:'prts_avatar_apply',
+    description:'按用户要求修改 Baker 头像。role=user 为用户头像，assistant 为 AI 头像。action=replace 使用当前会话的 attachmentId 替换图片；recrop 使用服务器当前原图重新裁剪；reset 恢复默认并删除自定义原图。crop 的 x/y 是相对于按 EXIF 转正后原图宽高的裁剪中心（0..1），zoom=1..4，默认居中且 zoom=1；圆形裁剪直径为原图短边除以 zoom，越界会被限制。先 inspect 获取 revision，冲突时重新检查，勿盲目覆盖。修改立即影响同一实例所有会话；保存替换后旧原图不保留。单图最大 5 MB、2500 万像素。工具不会切换用户本机的会话主题。',
+    parameters:{type:'object',additionalProperties:false,properties:{
+      role:{type:'string',enum:['user','assistant']},action:{type:'string',enum:['replace','recrop','reset']},
+      attachmentId:{type:'string'},crop:cropSchema,revision:{type:'integer',minimum:0},
+    },required:['role','action','revision']},output,isConcurrencySafe:()=>false,
+    async execute(args,exec){
+      const images=sessionImages(exec.agent)
+      if(!['user','assistant'].includes(args.role)||!['replace','recrop','reset'].includes(args.action))throw fault(400,'头像类型或操作无效')
+      if(args.revision!==service.snapshot().revision)throw fault(409,'头像已更新，请重新检查配置')
+      if(args.action!=='replace'&&args.attachmentId)throw fault(400,'仅替换头像时可以指定图片')
+      if(args.action==='reset'&&args.crop)throw fault(400,'恢复默认时不需要裁剪参数')
+      let image=null
+      if(args.action==='replace'){
+        const ref=images.find(image=>image.attachmentId===args.attachmentId)
+        if(!ref)throw fault(404,'当前会话没有这张图片，请先上传或用 read_image 读取图片，再 inspect')
+        if(ref.bytes>limit)throw fault(400,'图片超过 5 MB')
+        const {attachmentKind,origin,toolName,...attachment}=ref
+        let bytes
+        if(attachmentKind==='file'){
+          const chunks=[];let size=0
+          for await(const chunk of attachments.readFileStream(attachment,exec.signal)){
+            size+=chunk.length;if(size>limit)throw fault(400,'图片超过 5 MB');chunks.push(chunk)
+          }
+          bytes=Buffer.concat(chunks)
+        }else bytes=(await attachments.readImage(attachment,exec.signal)).data
+        if(bytes.length>limit)throw fault(400,'图片超过 5 MB')
+        image=Buffer.from(bytes).toString('base64')
+      }else if(args.action==='recrop'){
+        image=service.edit(args.role).image
+        if(!image)throw fault(400,'尚未设置自定义头像，请先替换图片')
+        if(!args.crop)throw fault(400,'请提供新的裁剪参数')
+      }
+      exec.signal?.throwIfAborted()
+      const state=await service.save({role:args.role,image,crop:args.crop,revision:args.revision})
+      return {applied:true,...view(state)}
+    },
+  }]
+}

package/src/server/avatars.js

@@ -0,0 +1,93 @@
+import { mkdir, readFile, writeFile, rename, rm } from 'node:fs/promises'
+import { join } from 'node:path'
+import { randomUUID } from 'node:crypto'
+import sharp from 'sharp'
+import { fault } from './emblems.js'
+import { body, json, isBase64 } from './api.js'
+
+export const AVATAR_API = '/prts-theme-api/avatars'
+export async function createAvatarService(directory) {
+  await mkdir(directory,{recursive:true,mode:0o700})
+  const path=join(directory,'avatars.json')
+  let state={revision:0,user:null,assistant:null}, queue=Promise.resolve()
+  try{state=JSON.parse(await readFile(path,'utf8'))}catch(error){if(error.code!=='ENOENT')throw error}
+  const listeners=new Set()
+  const snapshot=()=>({revision:state.revision,user:state.user,assistant:state.assistant})
+  return {
+    snapshot,
+    edit(role){
+      if(!['user','assistant'].includes(role))throw fault(400,'头像类型无效')
+      return structuredClone({revision:state.revision,image:state.sources?.[role]?.image||state[role]?.split(',')[1]||null,crop:state.sources?.[role]?.crop||{zoom:1,x:.5,y:.5}})
+    },
+    subscribe(fn){listeners.add(fn);return()=>listeners.delete(fn)},
+    save(data){
+      const next=queue.then(async()=>{
+        if(!['user','assistant'].includes(data?.role))throw fault(400,'头像类型无效')
+        if(data.revision!==state.revision)throw fault(409,'头像已在其他页面更新，请重试')
+        let image=null
+        if(data.image!==null){
+          if(typeof data.image!=='string'||data.image.length>8*1024*1024||!isBase64(data.image))throw fault(400,'请上传不超过 5 MB 的图片')
+          const bytes=Buffer.from(data.image,'base64')
+          if(!bytes.length||bytes.length>5*1024*1024)throw fault(400,'请上传不超过 5 MB 的图片')
+          try{
+            const input=sharp(bytes,{limitInputPixels:25000000,animated:false})
+            const meta=await input.metadata()
+            if(!['png','jpeg','webp','gif','avif'].includes(meta.format))throw Error('format')
+            let pipeline=input.rotate()
+            if(data.crop!==undefined){
+              const c=data.crop
+              if(!c||!Number.isFinite(c.zoom)||c.zoom<1||c.zoom>4||!Number.isFinite(c.x)||c.x<0||c.x>1||!Number.isFinite(c.y)||c.y<0||c.y>1)throw Error('crop')
+              const swapped=[5,6,7,8].includes(meta.orientation)
+              const width=swapped?meta.height:meta.width,height=swapped?meta.width:meta.height
+              const size=Math.max(1,Math.round(Math.min(width,height)/c.zoom))
+              const left=Math.max(0,Math.min(width-size,Math.round(c.x*width-size/2)))
+              const top=Math.max(0,Math.min(height-size,Math.round(c.y*height-size/2)))
+              pipeline=pipeline.extract({left,top,width:size,height:size})
+            }
+            const result=await pipeline.resize(256,256,{fit:'cover'}).png().toBuffer()
+            image='data:image/png;base64,'+result.toString('base64')
+          }catch{throw fault(400,'图片无法读取，请使用 PNG、JPEG、WebP、GIF 或 AVIF 图片（不超过 2500 万像素）')}
+        }
+        const updated={...state,revision:state.revision+1,[data.role]:image,sources:{...state.sources,[data.role]:image?{image:data.image,crop:data.crop||{zoom:1,x:.5,y:.5}}:null}}
+        const temp=path+'.'+randomUUID()+'.tmp'
+        // Atomically replace the current records; no source-image history is retained.
+        try{await writeFile(temp,JSON.stringify(updated),{mode:0o600});await rename(temp,path)}
+        finally{await rm(temp,{force:true}).catch(()=>{})}
+        state=updated
+        for(const fn of listeners){try{fn(state.revision)}catch{}}
+        return snapshot()
+      })
+      queue=next.catch(()=>{})
+      return next
+    },
+  }
+}
+
+export function registerAvatarApi(ctx,service){
+  const connection=ctx.connection
+  let disposed=false
+  const streams=new Set()
+  const dispose=ctx.webServer.register({kind:'prefix',path:AVATAR_API,handler:async(req,res)=>{
+    try{
+      if(disposed){json(res,503,{error:'主题服务正在重新加载，请稍后重试'});return}
+      if('rejection' in connection.admit(req)){json(res,401,{error:'请先登录 DSH'});return}
+      const path=new URL(req.url,'http://localhost').pathname.slice(AVATAR_API.length)
+      if(req.method==='GET'&&path==='/events'){
+        res.writeHead(200,{'content-type':'text/event-stream','cache-control':'no-cache','x-accel-buffering':'no'})
+        streams.add(res)
+        const send=revision=>res.write('data: '+JSON.stringify({revision})+'\n\n')
+        const unsubscribe=service.subscribe(send);send(service.snapshot().revision)
+        const timer=setInterval(()=>res.write(': heartbeat\n\n'),25000)
+        res.on('close',()=>{clearInterval(timer);unsubscribe();streams.delete(res)})
+        return
+      }
+      if(req.method==='GET'&&path.startsWith('/edit/')){json(res,200,service.edit(path.slice(6)));return}
+      if(path!=='/configuration')throw fault(404,'接口不存在')
+      if(req.method==='GET'){json(res,200,service.snapshot());return}
+      if(req.method!=='POST')throw fault(404,'接口不存在')
+      if(req.headers['x-prts-request']!=='1')throw fault(403,'缺少请求标识')
+      json(res,200,await service.save(await body(req)))
+    }catch(error){if(!res.headersSent)json(res,error.status||500,{error:error.message});else res.end()}
+  }})
+  return()=>{disposed=true;dispose();for(const res of streams)res.end();streams.clear()}
+}

package/src/server/tools.js

@@ -13,7 +13,7 @@ export function sessionImages(agent) {
     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(part.type!=='image' && !(part.type==='file' && (/^image\/(png|jpeg|webp|gif|avif)$/.test(ref.mediaType || '') || /\.(png|jpe?g|webp|gif|avif)$/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}:{})})
     }