@ash-qw/dsh-theme-prts 2.5.2 → 2.5.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ash-qw/dsh-theme-prts",
-  "version": "2.5.2",
+  "version": "2.5.3",
   "private": false,
   "type": "module",
   "description": "Unofficial Arknights P.R.T.S.-inspired UI theme for DeepSeek Harness Web and the official desktop client",

package/src/client/conversation-control-adapter.js

@@ -11,6 +11,15 @@ function closestWithClassSuffix(node, suffix) {
   return null
 }
 
+function isPendingInteractionAction(button) {
+  if (!button || button.tagName !== 'BUTTON') return false
+  if (button.closest('[data-approval-key]')) return true
+  if (button.closest('[data-question-key]')) {
+    return hasClassSuffix(button, '_waitButton') || Boolean(closestWithClassSuffix(button, '_footerActions'))
+  }
+  return Boolean(button.closest('[data-plan-review-key]') && closestWithClassSuffix(button, '_actions'))
+}
+
 function classify(button, operation) {
   // The host's process disclosure owns its transparent, full-width hit area.
   if (button.hasAttribute('data-turn-process')) return null
@@ -138,14 +147,16 @@ function mountBodyTargetFrame(document, window, operation) {
   // Nonvisual hosts can still mount the theme without an animation clock.
   if (!window?.requestAnimationFrame || !window?.cancelAnimationFrame) return () => {}
   const composerButton=':is([data-composer-card],[data-prts-composer-fallback]) button:not([data-slot="conversation.input.attachments"] *,[data-prts-glass-menu] *,[data-prts-floating-glass] *,[role="menu"] *,[role="listbox"] *)'
-  const selector='[data-prts-conversation-control],[data-presented-file],[data-changed-files],[data-produced-files-row] > button,[data-prts-glass-control],[data-prts-footer-action],[data-prts-transfer] button,'+composerButton
+  const selector='[data-prts-to-bottom],[data-prts-conversation-control],[data-presented-file],[data-changed-files],[data-produced-files-row] > button,[data-prts-glass-control],[data-prts-footer-action],[data-prts-transfer] button,'+composerButton
   const frame=document.createElement('div')
   frame.setAttribute('data-prts-body-target-frame','');frame.setAttribute('aria-hidden','true')
   const corners=Array.from({length:4},()=>frame.appendChild(document.createElement('i')))
   document.body.append(frame)
   if(frame.showPopover)frame.setAttribute('popover','manual')
-  let layer=null
-  const hideFrame=()=>{if(frame.hidePopover && frame.matches(':popover-open'))frame.hidePopover()}
+  let layer=null, imageRetiring=false
+  const hideFrame=()=>{
+    if(frame.hidePopover && frame.matches(':popover-open'))frame.hidePopover()
+  }
   const showFrame=()=>{
     if(!frame.showPopover)return
     const modal=target?.closest('dialog[open]')
@@ -153,27 +164,36 @@ function mountBodyTargetFrame(document, window, operation) {
     if(!frame.matches(':popover-open'))frame.showPopover()
     layer=modal
   }
-  let target=null, hovered=null, focused=null, raf=0, pressed=false, disposed=false
-  let pointer={x:0,y:0}, state=null, settled=false, tween=null, bounds=null, boundsDirty=false, hitDirty=false, exitGoal=null, motionDuration=240, targetArm=7
+  let target=null, hovered=null, focused=null, raf=0, pressed=false, releasePending=false, disposed=false
+  let pointer={x:0,y:0}, state=null, settled=false, tween=null, bounds=null, boundsDirty=false, hitDirty=false, exitGoal=null, motionDuration=240, targetArm=7, retiringBounds=null, targetRetires=false
   const resizeObserver=window.ResizeObserver?new window.ResizeObserver(()=>{boundsDirty=true;wake()}):null
   const reduced=window.matchMedia?.('(prefers-reduced-motion: reduce)')
   const fine=window.matchMedia?.('(hover:hover) and (pointer:fine)')
+  let activeModal=null
   const find=node=>{
+    if(activeModal && !activeModal.contains(node))return null
     if (!node?.closest || node.closest('[data-prts-workspace-actions],[data-prts-session-actions]')) return null
     const card=node.closest('[data-presented-file],[data-changed-files]')
-    const candidate=card || node.closest(selector)
+    const button=node.closest('button')
+    const pendingAction=operation.contains(button) && isPendingInteractionAction(button) ? button : null
+    const candidate=card || pendingAction || node.closest(selector)
     return candidate && !candidate.matches(':disabled,[aria-disabled="true"]') && !candidate.closest('[inert]') ? candidate : null
   }
   const measure=()=>{bounds=target.getBoundingClientRect();targetArm=7+Math.max(0,Math.min(1,(Math.min(bounds.width,bounds.height)-36)/36))*5;boundsDirty=false}
   const wake=()=>{if(!raf && !disposed)raf=window.requestAnimationFrame(draw)}
   const choose=()=>{
-    const next=hovered || focused
+    const next=(hovered?.isConnected?hovered:null) || (focused?.isConnected?focused:null)
     if(next!==target){
+      const retire=!next && target && !target.isConnected && targetRetires && releasePending && bounds && !reduced?.matches
+      imageRetiring=false
+      retiringBounds=retire?{left:bounds.left,top:bounds.top,width:bounds.width,height:bounds.height}:null
       target?.removeAttribute('data-prts-corner-target')
-      pressed=false;settled=false;tween=null;exitGoal=null;motionDuration=240;target=next;boundsDirty=true
+      if(retire){hovered=focused=target=null;boundsDirty=false;resizeObserver?.disconnect();wake();return}
+      pressed=false;releasePending=false;settled=false;tween=null;exitGoal=null;motionDuration=240;target=next;boundsDirty=true
       resizeObserver?.disconnect()
       if(target)resizeObserver?.observe(target)
       if(target){
+        targetRetires=hasClassSuffix(target,'_toBottom') || isPendingInteractionAction(target)
         target.setAttribute('data-prts-corner-target','');showFrame()
         measure();const box=bounds
         if(!state || state.alpha<.01)state={x:(hovered?pointer.x:box.left+box.width/2)-10,y:(hovered?pointer.y:box.top+box.height/2)-10,w:20,h:20,alpha:0,arm:7}
@@ -185,14 +205,15 @@ function mountBodyTargetFrame(document, window, operation) {
   }
   function draw(time) {
     raf=0
+    if(target && !target.isConnected)choose()
     if(hitDirty){hitDirty=false;hovered=find(document.elementFromPoint(pointer.x,pointer.y));choose()}
-    if(target && !target.isConnected){target.removeAttribute('data-prts-corner-target');target=hovered=focused=null;pressed=false;settled=false;exitGoal=null}
+    if(target && !target.isConnected){target.removeAttribute('data-prts-corner-target');target=hovered=focused=null;pressed=false;releasePending=false;settled=false;exitGoal=null}
     if(!state)return
     if(target && boundsDirty){
       measure()
-      if(!bounds.width && !bounds.height){target.removeAttribute('data-prts-corner-target');target=hovered=focused=null;pressed=false;settled=false;exitGoal=null;resizeObserver?.disconnect()}
+      if(!bounds.width && !bounds.height){target.removeAttribute('data-prts-corner-target');target=hovered=focused=null;pressed=false;releasePending=false;settled=false;exitGoal=null;resizeObserver?.disconnect()}
     }
-    const box=target?bounds:null,gap=pressed?3:5
+    const box=target?bounds:retiringBounds,gap=pressed?(imageRetiring?0:3):5
     // Freeze the exit destination: subsequent pointer motion must not restart the fade.
     const goal=box?{x:box.left-gap,y:box.top-gap,w:box.width+gap*2,h:box.height+gap*2,alpha:1,arm:targetArm}:
       (exitGoal ||= {x:pointer.x-10,y:pointer.y-10,w:20,h:20,alpha:0,arm:7})
@@ -223,7 +244,11 @@ function mountBodyTargetFrame(document, window, operation) {
     if(frame.style.opacity!==opacity)frame.style.opacity=opacity
     settled=!moving
     frame.toggleAttribute('data-pressed',pressed)
-    if(moving)wake()
+    if(releasePending && pressed && !moving){
+      if(retiringBounds){exitGoal={...state,alpha:0};retiringBounds=null}
+      releasePending=false;pressed=false;motionDuration=imageRetiring?120:140;settled=false;wake()
+    }
+    else if(moving)wake()
     else {tween=null;if(!state.alpha)hideFrame()}
   }
   const move=event=>{
@@ -240,21 +265,49 @@ function mountBodyTargetFrame(document, window, operation) {
     pointer={x:event.clientX,y:event.clientY}
     if(event.pointerType==='touch')hovered=find(event.target)
     choose()
-    if(target && find(event.target)===target){pressed=true;motionDuration=100;settled=false;wake()}
+    if(target && find(event.target)===target){pressed=true;releasePending=false;motionDuration=100;settled=false;wake()}
+  }
+  const release=()=>{
+    // A tap can release before the first paint. Finish one contraction, then
+    // expand; one flag keeps repeated taps interruptible without a timer queue.
+    if(pressed && !settled && !reduced?.matches){releasePending=true;settled=false;wake()}
+    else {pressed=false;releasePending=false;motionDuration=140;settled=false;wake()}
   }
-  const up=event=>{pressed=false;motionDuration=140;settled=false;if(event.pointerType==='touch')hovered=null;choose()}
+  const up=event=>{release();if(event.pointerType==='touch')hovered=null;choose()}
   const reset=()=>{
     target?.removeAttribute('data-prts-corner-target');hideFrame()
-    hovered=focused=target=null;state=tween=bounds=exitGoal=null
-    pressed=false;settled=true;boundsDirty=hitDirty=false
+    hovered=focused=target=null;state=tween=bounds=exitGoal=retiringBounds=null
+    imageRetiring=false
+    pressed=false;releasePending=false;settled=true;boundsDirty=hitDirty=false
     resizeObserver?.disconnect();window.cancelAnimationFrame(raf);raf=0
     frame.style.opacity='0';frame.removeAttribute('data-pressed')
   }
+  const syncModal=()=>{
+    const modals=[...document.querySelectorAll('dialog[open],[role="dialog"][aria-modal="true"]')]
+    const previousModal=activeModal
+    activeModal=modals.filter(node=>!node.hidden && node.getAttribute('aria-hidden')!=='true').at(-1) ?? null
+    if(activeModal===previousModal)return
+    if(activeModal && target && !activeModal.contains(target) && target.querySelector('img') && activeModal.querySelector('img') && releasePending && bounds && !reduced?.matches){
+      // The preview is opaque: show a bounded click acknowledgment above it,
+      // then fade at the thumbnail position instead of retaining a hover target.
+      imageRetiring=true;motionDuration=120;tween=null
+      retiringBounds={left:bounds.left,top:bounds.top,width:bounds.width,height:bounds.height}
+      target.removeAttribute('data-prts-corner-target');hovered=focused=target=null
+      boundsDirty=hitDirty=false;resizeObserver?.disconnect();settled=false;wake()
+    }else if(imageRetiring || activeModal && (!target || !activeModal.contains(target)))reset()
+  }
+  // Native image previews mount a body portal without moving the pointer.
+  // Watch portal changes only, not the streaming conversation subtree.
+  const modalObserver=window.MutationObserver?new window.MutationObserver(syncModal):null
+  modalObserver?.observe(document.body,{childList:true})
+  const modalToggle=event=>{if(event.target?.matches?.('dialog'))syncModal()}
+  document.addEventListener('toggle',modalToggle,true)
+  syncModal()
   const visibility=()=>{if(document.hidden)reset()}
   const scroll=()=>{if(!target && !state?.alpha)return;boundsDirty=true;hitDirty=!!hovered;wake()}
   document.addEventListener('scroll',scroll,true)
   window.addEventListener('resize',reset)
-  const key=event=>{if(target && (event.key===' ' || event.key==='Enter')){pressed=event.type==='keydown';motionDuration=pressed?100:140;settled=false;wake()}}
+  const key=event=>{if(target && (event.key===' ' || event.key==='Enter')){if(event.type==='keyup')release();else {pressed=true;releasePending=false;motionDuration=100;settled=false;wake()}}}
   const listeners=[
     [document,'pointermove',move],[document,'pointerleave',leave],
     [document,'focusin',focus],[document,'focusout',blur],
@@ -264,6 +317,7 @@ function mountBodyTargetFrame(document, window, operation) {
   ]
   for(const [node,event,handler] of listeners)node.addEventListener(event,handler)
   return ()=>{
+    modalObserver?.disconnect();document.removeEventListener('toggle',modalToggle,true)
     disposed=true;target?.removeAttribute('data-prts-corner-target');hideFrame();window.cancelAnimationFrame(raf);resizeObserver?.disconnect()
     document.removeEventListener('scroll',scroll,true);window.removeEventListener('resize',reset)
     for(const [node,event,handler] of listeners)node.removeEventListener(event,handler)

package/src/client/custom-avatar.js

@@ -43,7 +43,7 @@ export function createAvatarStore({window,document}){
   const focus=()=>{if(window.fetch)void refresh().catch(()=>{})}
   window.addEventListener('focus',focus)
   return{
-    snapshot:()=>state,refresh,
+    snapshot:()=>state,refresh,applySnapshot:apply,
     subscribe(fn){listeners.add(fn);fn(state);return()=>listeners.delete(fn)},
     async edit(role){
       const response=await window.fetch(API+'/edit/'+role,{credentials:'same-origin',signal:controller?.signal})

package/src/client/index.js

@@ -208,6 +208,7 @@ export function applyPrtsPlugin(ctx, environment) {
       document, window, assets, adapter, hostGeometry, customEmblemStore, avatarStore, backgroundStore,
       themeTransfer: themeTransfer ||= createThemeTransfer({ window, getPreferences: () => nativePreferences.value,
         savePreferences: (value, revision) => nativePreferences.replace(value, revision),
+        onAvatarConfiguration: value => avatarStore.applySnapshot(value),
         checkWritable: () => nativePreferences.checkWritable(), checkExport: () => nativePreferences.checkReadable(), themeVersion: version }),
       onSchemeToggle(next, interaction) {
         return theme.setTheme(next, { ...interaction, animate: true })

package/src/client/sidebar-control-adapter.js

@@ -95,9 +95,13 @@ function visibleSessionSummaries(sessions, workspaces, sessionStatus) {
   })
 }
 
+function setSidebarAttribute(node, attribute, value) {
+  if (node.getAttribute(attribute) !== value) node.setAttribute(attribute, value)
+}
+
 function markSidebarNode(node, attribute, next) {
   if (!node) return
-  node.setAttribute(attribute, '')
+  setSidebarAttribute(node, attribute, '')
   next.add(node)
 }
 
@@ -174,9 +178,9 @@ function ensureFacilityFace(document, row, kind, next) {
     face.setAttribute('data-prts-owned-facility', '')
     row.insertBefore(face, row.firstChild)
   }
-  face.setAttribute('data-prts-facility-face', kind)
-  face.setAttribute('data-prts-facility-texture', kind === 'workspace' ? 'silhouette' : 'pickup')
-  face.setAttribute('aria-hidden', 'true')
+  setSidebarAttribute(face, 'data-prts-facility-face', kind)
+  setSidebarAttribute(face, 'data-prts-facility-texture', kind === 'workspace' ? 'silhouette' : 'pickup')
+  setSidebarAttribute(face, 'aria-hidden', 'true')
   next.add(face)
   return face
 }
@@ -188,8 +192,8 @@ function ensureFacilitySpine(document, row, kind, next) {
     spine.setAttribute('data-prts-owned-facility-spine', '')
     row.insertBefore(spine, row.firstChild)
   }
-  spine.setAttribute('data-prts-facility-spine', kind)
-  spine.setAttribute('aria-hidden', 'true')
+  setSidebarAttribute(spine, 'data-prts-facility-spine', kind)
+  setSidebarAttribute(spine, 'aria-hidden', 'true')
   next.add(spine)
   return spine
 }
@@ -223,6 +227,7 @@ export function createSidebarControlAdapter({ document, window, sessions, worksp
   let statusSourcesStarted = false
   let summaryRoot
   let summarySignature = ''
+  let sourceSummarySignature = ''
   let heldPreviewState
   let hoveredSummary, summaryLeaveTimer
   let summaryDismissed = false, pointerLeftSummary = false
@@ -327,18 +332,26 @@ export function createSidebarControlAdapter({ document, window, sessions, worksp
       sourceRetryTimer = undefined
     }
   }
+  function onSummarySourceChange() {
+    // Streaming activity often republishes unchanged title/status summaries.
+    // Native DOM mutations still handle row mounts, selection and hierarchy.
+    const signature = JSON.stringify(visibleSessionSummaries(sessions, workspaces, sessionStatus))
+    if (signature === sourceSummarySignature && !pendingReveal) return
+    sourceSummarySignature = signature
+    queueScan()
+  }
   function connectSummarySources() {
     if (getSessions) sessions = getSessions()
     if (getWorkspaces) workspaces = getWorkspaces()
     if (subscribedSessions !== sessions?.list) {
       stopSessionList()
       subscribedSessions = sessions?.list
-      stopSessionList = subscribedSessions?.subscribe?.(queueScan) ?? (() => {})
+      stopSessionList = subscribedSessions?.subscribe?.(onSummarySourceChange) ?? (() => {})
     }
     if (subscribedWorkspaces !== workspaces?.list) {
       stopWorkspaceList()
       subscribedWorkspaces = workspaces?.list
-      stopWorkspaceList = subscribedWorkspaces?.subscribe?.(queueScan) ?? (() => {})
+      stopWorkspaceList = subscribedWorkspaces?.subscribe?.(onSummarySourceChange) ?? (() => {})
     }
   }
   function connectSessionStatus() {
@@ -346,7 +359,7 @@ export function createSidebarControlAdapter({ document, window, sessions, worksp
     if (source === sessionStatus) return
     stopSessionStatus()
     sessionStatus = source
-    stopSessionStatus = source?.subscribe?.(queueScan) ?? (() => {})
+    stopSessionStatus = source?.subscribe?.(onSummarySourceChange) ?? (() => {})
   }
 
   let selectionTarget, selectionTargetTimer
@@ -861,6 +874,7 @@ export function createSidebarControlAdapter({ document, window, sessions, worksp
   function scan() {
     if (!adapterActive) return
     syncSummarySources()
+    sourceSummarySignature = JSON.stringify(visibleSessionSummaries(sessions, workspaces, sessionStatus))
     const root = document?.querySelector?.('[data-prts-region="sessions"] [data-slot="sidebar.workspaces"]')
     const next = new Set()
     const nextVectorOwners = new Set()
@@ -919,16 +933,16 @@ export function createSidebarControlAdapter({ document, window, sessions, worksp
         }
         markSidebarNode(row, 'data-prts-session-row', next)
         if (state) {
-          row.setAttribute('data-prts-session-state', state)
+          setSidebarAttribute(row, 'data-prts-session-state', state)
           next.add(row)
         } else {
           row.removeAttribute('data-prts-session-state')
         }
-        row.dataset.prtsSessionIndex = sessionIndex
+        setSidebarAttribute(row, 'data-prts-session-index', sessionIndex)
         const title = resolveRowTitle(row, 'session', controls.actions)
         markSidebarNode(title, 'data-prts-row-title', next)
         markSidebarNode(resolveSessionTime(row, title, controls.actions), 'data-prts-session-time', next)
-        if (title) title.dataset.prtsSessionIndex = sessionIndex
+        if (title) setSidebarAttribute(title, 'data-prts-session-index', sessionIndex)
         row.toggleAttribute('data-prts-row-menu-open', controls.menu?.getAttribute('aria-expanded') === 'true'
           || row.classList.contains('menuOpen'))
         markSidebarNode(controls.actions, 'data-prts-session-actions', next)

package/src/client/theme-transfer.js

@@ -101,7 +101,7 @@ export function describeThemePackage(value) {
   return `${count} 项主题设置、${transferSlots.filter(k => a.backgrounds[k]).length} 张背景、${transferRoles.filter(k => a.avatars[k]).length} 个头像、${a.emblems.items.length} 个自定义徽记。将替换当前素材及徽记排列，空项恢复为默认。`
 }
 
-export function createThemeTransfer({ window, getPreferences, savePreferences, checkWritable, checkExport = checkWritable, themeVersion }) {
+export function createThemeTransfer({ window, getPreferences, savePreferences, checkWritable, checkExport = checkWritable, themeVersion, onAvatarConfiguration = () => {} }) {
   let busy = false, backup
   const request = async (path, data, signal) => {
     checkTransferCancelled(signal)
@@ -198,7 +198,10 @@ export function createThemeTransfer({ window, getPreferences, savePreferences, c
       undo.push(async () => {
         const restored = await request(kind + '/configuration', { ...previous, revision: revisions[kind] })
         revisions[kind] = restored.revision
+        if (kind === 'avatars') onAvatarConfiguration(restored)
       })
+      // Apply the acknowledged images locally; SSE remains for other pages.
+      if (kind === 'avatars') onAvatarConfiguration(result)
     }
     try {
       if (value.assets) {

package/src/styles/custom-background.css

@@ -485,3 +485,13 @@ background:color-mix(in srgb,var(--prts-panel) 28%,transparent);
 -webkit-backdrop-filter:blur(12px);
 backdrop-filter:blur(12px);
 }
+
+/* The task manager mounts directly in main, outside the conversation root. */
+html[data-dsh-prts] [data-prts-region="operation"] [data-testid="task-manager-page"],
+html[data-dsh-prts] [data-testid="task-manager-page"] :is([class$="_detail"],[class$="_detailNotice"]) {
+background: var(--prts-canvas);
+}
+html[data-dsh-prts]:is([data-prts-background-mode="full"][data-prts-background-full],[data-prts-background-mode="split"][data-prts-background-conversation]) [data-prts-region="operation"] [data-testid="task-manager-page"],
+html[data-dsh-prts]:is([data-prts-background-mode="full"][data-prts-background-full],[data-prts-background-mode="split"][data-prts-background-conversation]) [data-testid="task-manager-page"] :is([class$="_detail"],[class$="_detailNotice"]) {
+background: transparent;
+}