@linxin666/dsh-pet 0.1.19 → 0.1.20

package/src/client/index.ts

@@ -11,7 +11,7 @@
  * @module @linxin666/dsh-pet/client
  */
 
-import type { ClientContext, SettingsScope, SettingsScopeSpec } from '@deepseek-ai/dsh-client-runtime/client'
+import type { ClientContext, ISessions, SessionId, SettingsScope, SettingsScopeSpec } from '@deepseek-ai/dsh-client-runtime/client'
 // Type-only: pulls the locale plugin's Context merge (ctx.locale).
 import type {} from '@deepseek-ai/dsh-client-locale/client'
 // Type-only: pulls the settings-surface Context merge (ctx.settingsScope).
@@ -72,8 +72,8 @@ const POLL_MS = 2000
 /** Settings namespace the pet settings card edits (the Host plugin registers it). */
 const PET_SETTINGS_NS = 'pet'
 
-/** Required services. */
-export const inject = ['slots', 'locale', 'connection', 'settingsScope', 'remote']
+/** Required services (sessions powers bubble-to-session navigation). */
+export const inject = ['slots', 'locale', 'connection', 'settingsScope', 'remote', 'sessions']
 
 /** Re-exported for consumers that type against the injected face. */
 export type { PetInjected, PetDockEntryProps } from './PetDockEntry.tsx'
@@ -152,6 +152,11 @@ export function apply(ctx: ClientContext): void {
       // tick tries again. After it lands, one list feeds both the sprite and
       // the settings card's choices.
       let petsLoaded = false
+      // Latest-wins guard: the 2s tick, visibility recovery, and
+      // interaction-triggered refreshes can overlap; only the newest
+      // response may publish, so a slow older one can never roll the
+      // snapshot back.
+      let stateSeq = 0
       const pollNow = (): void => {
         if (!petsLoaded) {
           petApi.pets().then((list) => {
@@ -161,9 +166,13 @@ export function apply(ctx: ClientContext): void {
             // Retry on the next poll tick.
           })
         }
+        const seq = stateSeq + 1
+        stateSeq = seq
         petApi.state().then((snapshot) => {
+          if (seq !== stateSeq) return
           setSnapshot(snapshot)
         }, () => {
+          if (seq !== stateSeq) return
           setState('error', 'pet.state transport error')
         })
       }
@@ -202,9 +211,23 @@ export function apply(ctx: ClientContext): void {
         }
       }, 'pet: poll')
 
+      // Clicking a session bubble jumps the GUI to that session. A bubble
+      // can outlive its disposed session by one poll tick, and the sessions
+      // service fails loud on unknown ids, so consult the live list first.
+      // The pet's type program also loads the host-side dsh-session package
+      // through the service types, whose Context merge declares a different
+      // 'sessions' face; pin the browser runtime's outward face here.
+      const sessions = ctx.sessions as unknown as ISessions
+      const openSession = (sessionId: string): void => {
+        const list = sessions.list.getSnapshot()
+        if (list.byId[sessionId as SessionId] === undefined) return
+        sessions.open(sessionId as SessionId)
+      }
+
       const injected = (): PetInjected => ({
         store: petStore,
         ensure: pollNow,
+        openSession,
         pet: () => {
           petApi.interact('pet').then((result) => {
             setFeedback({

package/src/client/locales.ts

@@ -19,6 +19,7 @@ export const zh = {
   'pet.treats': '小鱼干 ×{n}',
   'pet.state.loading': '宠物正在赶来…',
   'pet.state.error': '宠物迷路了（连接失败）',
+  'pet.openSessionHint': '点击跳转到对应会话',
   // 一级设置页（settings.section 席位）。
   'settings.title': '宠物',
   'settings.description': '选择宠物并调整它的显示布局。',
@@ -64,6 +65,7 @@ export const en = {
   'pet.treats': 'Treats ×{n}',
   'pet.state.loading': 'The pet is on its way…',
   'pet.state.error': 'The pet is lost (connection failed)',
+  'pet.openSessionHint': 'Click to jump to this session',
   // First-level settings section (the `settings.section` seat).
   'settings.title': 'Pet',
   'settings.description': 'Pick a pet and tune its display layout.',

package/src/client/pet.module.css

@@ -48,7 +48,7 @@
 
 /* 多会话气泡栈：并行会话各自一个气泡，自精灵头顶向上堆叠，
    最近更新的会话在最上。栈内气泡改流入列布局，不再绝对定位
-   互相覆盖。 */
+   互相覆盖。气泡可点击：点击跳转到对应会话。 */
 .bubbleStack {
   position: absolute;
   bottom: 100%;
@@ -56,13 +56,32 @@
   flex-direction: column;
   align-items: center;
   gap: 4px;
-  pointer-events: none;
+  pointer-events: auto;
 }
 
 .bubbleStack .bubble {
   position: relative;
   bottom: auto;
   margin-bottom: 0;
+  pointer-events: auto;
+}
+
+.bubbleClickable {
+  cursor: pointer;
+  font: inherit;
+  text-align: center;
+  appearance: none;
+  transition: filter 120ms ease, box-shadow 120ms ease;
+}
+
+.bubbleClickable:hover {
+  filter: brightness(1.12);
+}
+
+.bubbleClickable:focus-visible {
+  outline: none;
+  /* 2px accent ring on the pet's own palette, theme-agnostic. */
+  box-shadow: 0 0 0 2px rgba(56, 189, 248, 0.85);
 }
 
 @keyframes pet-bubble-pop {
@@ -86,9 +105,14 @@
   }
 }
 
+/* 悬浮面板位于精灵左侧（bottom 对齐），不再占据精灵上方的空间：
+   会话气泡栈独占精灵头顶区域，两者互不遮挡 —— 气泡因此可以始终
+   显示并保持可点击，不必在 hover 时让位给面板。 */
 .panel {
   position: absolute;
-  bottom: 100%;
+  bottom: 0;
+  right: 100%;
+  margin-right: 8px;
   background: rgba(15, 23, 42, 0.92);
   border: 1px solid rgba(148, 163, 184, 0.35);
   border-radius: 10px;
@@ -103,18 +127,17 @@
   min-width: 132px;
 }
 
-/* 面板底边与图标顶边之间的 hover 桥接（issue #49）：
-   面板绝对定位在图标上方（bottom: 100%），若两者之间存在哪怕几个
-   像素的间隙，指针滑过间隙时会触发容器的 pointerleave，面板在指针
-   抵达按钮前就收起。这段透明伪元素把命中区向下延伸、覆盖图标顶部，
-   使指针在图标与按钮之间始终停留在 hover 区域内。 */
+/* 面板右缘与图标左缘之间的 hover 桥接（issue #49 的水平版）：
+   面板在图标左侧留有 8px 间隙，指针滑过间隙时会触发容器的
+   pointerleave，面板会在指针抵达按钮前收起。这段透明伪元素把命中区
+   向右延伸、覆盖间隙，使指针在图标与按钮之间始终停留在 hover 区域。 */
 .panel::after {
   content: '';
   position: absolute;
-  top: 100%;
-  left: 0;
-  right: 0;
-  height: 14px;
+  top: 0;
+  bottom: 0;
+  left: 100%;
+  width: 14px;
 }
 
 .rankRow {

package/src/client/spritesheet.ts

@@ -7,7 +7,7 @@
  * @module @linxin666/dsh-pet/client/spritesheet
  */
 
-import type { PetAnimation } from '../state.ts'
+import { rowOf, type PetAnimation } from '../state.ts'
 import type { PetCell, PetTrackDef } from '../registry.ts'
 
 /** Animation track shape the frame loop consumes. */
@@ -15,18 +15,8 @@ export type TrackDef = PetTrackDef
 
 /** Row index of one animation track (the fixed 9-row contract). */
 export function rowOfTrack(animation: PetAnimation): number {
-  const rows: Record<PetAnimation, number> = {
-    idle: 0,
-    'running-right': 1,
-    'running-left': 2,
-    waving: 3,
-    jumping: 4,
-    failed: 5,
-    waiting: 6,
-    running: 7,
-    review: 8,
-  }
-  return rows[animation]
+  // The table itself lives in state.ts (rowOf) — the single source of truth.
+  return rowOf(animation)
 }
 
 /**

package/src/index.ts

@@ -19,6 +19,7 @@ import { PetService, PET_SETTINGS_NAMESPACE, type PetConfig, type PetSettingsSec
 import { makePetRoutes } from './routes.ts'
 import { loadPetRegistry, petPackageRoot } from './registry.ts'
 import { DISPLAY_INSET_MAX, DISPLAY_SIZE_MAX, DISPLAY_SIZE_MIN } from './persist.ts'
+import { mountOnce } from './mount-once.ts'
 
 export { PetService, MAX_SESSION_BUBBLES } from './service.ts'
 export type {
@@ -137,7 +138,9 @@ export function makePetSettingsSchema(fallbackPetId: string) {
 }
 
 /** Register the pet service and its API + asset routes on the context. */
-export function apply(ctx: Context, config: PetConfig = {}): void {
+export const apply = mountOnce('@linxin666/dsh-pet', applyImpl)
+
+function applyImpl(ctx: Context, config: PetConfig = {}): void {
   const registry = config.registry
     ?? loadPetRegistry({
       packageRoot: petPackageRoot(import.meta.url),

package/src/mount-once.ts

@@ -0,0 +1,48 @@
+// Generated by scripts/sync-shared.mjs from shared/host/mount-once.ts. Do not edit this copy; edit the shared source and run "node scripts/sync-shared.mjs".
+/**
+ * Host single-instance guard shared by the plugin family. The family bundle
+ * (dsh-web-ui-all / dsh-skins) namespaces every child row id (web-ui-*), so
+ * the loader accepts a standalone install of the same package side by side;
+ * without this guard the second instance would still re-register the same
+ * webserver routes, tools, settings namespaces, and system-prompt sections
+ * and fail the boot. mountOnce makes the second host apply a no-op for the
+ * lifetime of the first instance (the browser half is already deduped by
+ * package name in the client module host).
+ *
+ * The registry rides a global symbol so two module instances of the same
+ * package (npm copy vs repository link) still share one verdict. cordis
+ * `ctx.effect` runs its callback immediately and treats the callback's
+ * return value as the fiber disposer, so the unmarker is returned, not run.
+ */
+
+const MOUNTED = Symbol.for('dsh-web-ui.mounted-plugins')
+
+interface MountRegistry {
+  [MOUNTED]?: Set<string>
+}
+
+function mountedSet(): Set<string> {
+  const registry = globalThis as MountRegistry
+  return (registry[MOUNTED] ??= new Set())
+}
+
+/**
+ * Wrap a cordis plugin apply so the package runs at most once per process.
+ * The first mount registers normally and unmarks when its fiber disposes;
+ * any later mount of the same package name is a no-op.
+ * @param packageName - npm package identity shared by every install source.
+ * @param fn - the original plugin apply.
+ * @returns an apply of the same shape.
+ */
+export function mountOnce<T extends (...args: any[]) => unknown>(packageName: string, fn: T): T {
+  return ((...args: unknown[]) => {
+    const mounted = mountedSet()
+    if (mounted.has(packageName)) return
+    mounted.add(packageName)
+    const ctx = args[0] as { effect?: (effect: () => unknown) => unknown } | undefined
+    ctx?.effect?.(() => () => {
+      mounted.delete(packageName)
+    })
+    return fn(...args)
+  }) as T
+}

package/src/service.ts

@@ -96,9 +96,12 @@ export interface PetSettingsSection {
 export const PET_SETTINGS_NAMESPACE = 'pet'
 
 /**
- * One active session as the pet displays it. Sessions run in parallel, so
- * each gets its own bubble while the sprite itself follows the most recent
- * meaningful event (the display session).
+ * One active TOP-LEVEL session as the pet displays it. Sessions run in
+ * parallel, so each gets its own bubble while the sprite itself follows the
+ * most recent meaningful event (the display session). Subagent children
+ * report no bubble of their own: their work is already reflected by the
+ * bubble of the conversation that spawned them, and the bubble buttons
+ * navigate to GUI sessions, which subagents are not.
  */
 export interface PetSessionView {
   /** Session identity (stringified for the wire; never exposed as a key). */
@@ -121,9 +124,10 @@ export interface PetStateView {
   phase: PetStateSnapshot['phase']
   sessionActive: boolean
   /**
-   * Per-session bubbles for every concurrently active session, most recent
-   * first; optional so older hosts without the multi-session view stay
-   * consumable. The single 'bubble' above mirrors the display session.
+   * Per-session bubbles for every concurrently active TOP-LEVEL session,
+   * most recent first; optional so older hosts without the multi-session
+   * view stay consumable. The single 'bubble' above mirrors the display
+   * session.
    */
   sessions?: PetSessionView[]
   /** Affinity ledger snapshot. */
@@ -472,12 +476,16 @@ export class PetService extends Service {
   private view(): PetStateView {
     const snapshot = this.machine.render()
     const entry = this.activeEntry()
-    // One bubble per concurrently active session, most recent first.
+    // One bubble per concurrently active TOP-LEVEL session, most recent
+    // first. Subagent children render no bubble of their own (their activity
+    // already shows through the spawning conversation's bubble/display, and
+    // the bubble buttons navigate to GUI sessions, which subagents are not).
     // Sessions whose own machine has settled (no bubble copy) drop out, so a
     // finished turn does not leave a stale bubble behind.
     const sessions: PetSessionView[] = []
     for (const [session, activity] of [...this.sessionActivity.entries()].reverse()) {
       if (sessions.length >= MAX_SESSION_BUBBLES) break
+      if (session.header?.origin === 'subagent') continue
       const perSession = activity.machine.render()
       if (perSession.bubble === undefined) continue
       sessions.push({