@linxin666/dsh-pet 0.4.2 → 0.4.4

package/src/client/PetSettingsCard.tsx

@@ -61,8 +61,6 @@ export interface PetSettingsCardState extends CardShell {
   decorationEnabled: CardFieldState
   /** Pet choices (registry ids + display names), loaded from the host. */
   petChoices: readonly { value: string; label: string }[]
-  /** Registry diagnostics (v1 migration hints, invalid entries), host-served. */
-  petDiagnostics: readonly PetDiagnosticView[]
 }
 
 /** The registration-side face the card's slot entry injects. */
@@ -79,12 +77,6 @@ interface PetChoice {
   displayName: string
 }
 
-/** One registry diagnostic as served by '/api/pet/diagnostics' (#623). */
-export interface PetDiagnosticView {
-  level: 'error' | 'warning'
-  message: string
-}
-
 /** Fetch the registry list (the same data the sprite renders from). */
 async function fetchPetChoices(): Promise<PetChoice[]> {
   const response = await fetch('/api/pet/pets')
@@ -92,21 +84,22 @@ async function fetchPetChoices(): Promise<PetChoice[]> {
   return (await response.json()) as PetChoice[]
 }
 
-/** Fetch the registry diagnostics (v1 migration hints, invalid entries). */
-async function fetchPetDiagnostics(): Promise<PetDiagnosticView[]> {
-  const response = await fetch('/api/pet/diagnostics')
-  if (!response.ok) throw new Error('pet diagnostics failed: ' + response.status)
-  const body = (await response.json()) as { diagnostics?: PetDiagnosticView[] }
-  return body.diagnostics ?? []
+/** The persisted state the fallback mirrors: the selection and its visibility. */
+interface PetState {
+  /** Selected registry id. */
+  petId: string
+  /** Whether the pet is currently rendered. */
+  visible: boolean
 }
 
-/** Read the selection from the same persisted state the pet renders. */
-async function fetchSelectedPetId(): Promise<string> {
+/** Read the selection and visibility from the same persisted state the pet renders. */
+async function fetchPetState(): Promise<PetState> {
   const response = await fetch('/api/pet/state')
   if (!response.ok) throw new Error('pet state failed: ' + response.status)
-  const body = (await response.json()) as { pet?: { id?: unknown } }
+  const body = (await response.json()) as { pet?: { id?: unknown }; display?: { visible?: unknown } }
   if (typeof body.pet?.id !== 'string') throw new Error('pet state has no selected pet')
-  return body.pet.id
+  // A Host without the display block predates the visibility switch; the pet shows.
+  return { petId: body.pet.id, visible: body.display?.visible !== false }
 }
 
 /** Bridges the 'pet' scope onto the card's staged form. */
@@ -118,9 +111,10 @@ export class PetSettingsCardController {
   // without rebuilding the form.
   private readonly petChoices: string[] = []
   private readonly petLabels = new Map<string, string>()
-  private diagnostics: PetDiagnosticView[] = []
   private selectedPetId: string | undefined
+  private selectedVisible: boolean | undefined
   private stagedPetId: string | undefined
+  private stagedVisible: boolean | undefined
   private savingPet = false
   private petSaveFailed = false
   private loaded = false
@@ -150,22 +144,10 @@ export class PetSettingsCardController {
       this.pendingTimer = undefined
       if (this.disposed) return
       void this.loadPets()
-      void this.loadDiagnostics()
-      void this.loadSelectedPet()
+      void this.loadPetState()
     }, 0)
   }
 
-  /** Fetch registry diagnostics once (soft-fail: an empty list on error). */
-  private async loadDiagnostics(): Promise<void> {
-    try {
-      this.diagnostics = await fetchPetDiagnostics()
-      if (this.disposed) return
-      this.store.set(this.projection())
-    } catch {
-      this.diagnostics = []
-    }
-  }
-
   /** Resolve the registry choices once (retried a few times on failure). */
   private async loadPets(): Promise<void> {
     if (this.loaded || this.disposed) return
@@ -189,11 +171,12 @@ export class PetSettingsCardController {
     }
   }
 
-  private async loadSelectedPet(): Promise<void> {
+  private async loadPetState(): Promise<void> {
     try {
-      const petId = await fetchSelectedPetId()
+      const state = await fetchPetState()
       if (this.disposed) return
-      this.selectedPetId = petId
+      this.selectedPetId = state.petId
+      this.selectedVisible = state.visible
       this.store.set(this.projection())
     } catch {
       // The Host form remains the authority when it is available. An absent
@@ -206,24 +189,58 @@ export class PetSettingsCardController {
     return shell.available && !shell.exposed && this.selectedPetId !== undefined
   }
 
-  private async savePetSelection(): Promise<void> {
+  /**
+   * The visibility the fallback switch renders: the staged draft when the user
+   * moved it, the persisted value otherwise. There is no user layer to override
+   * here, so the field is never marked overridden.
+   */
+  private fallbackVisible(): CardFieldState {
+    const value = this.stagedVisible ?? this.selectedVisible
+    return { text: value === undefined ? '' : String(value), overridden: false, invalid: false }
+  }
+
+  /**
+   * Persist the staged selection and visibility through the pet API — the only
+   * writer available when the aggregate shell serves this card, since there is
+   * no Host settings form to mutate — then confirm the read-back before the
+   * drafts are cleared.
+   */
+  private async saveFallback(): Promise<void> {
     const petId = this.stagedPetId
-    if (petId === undefined || this.savingPet || !this.petChoices.includes(petId)) return
+    const visible = this.stagedVisible
+    if (this.savingPet) return
+    if (petId === undefined && visible === undefined) return
+    if (petId !== undefined && !this.petChoices.includes(petId)) return
     this.savingPet = true
     this.petSaveFailed = false
     this.store.set(this.projection())
     try {
-      const response = await fetch('/api/pet/set-pet', {
-        method: 'POST',
-        headers: { 'content-type': 'application/json' },
-        body: JSON.stringify({ petId }),
-      })
-      const result = (await response.json()) as { ok?: boolean; petId?: string }
-      if (!response.ok || result.ok !== true || result.petId !== petId || await fetchSelectedPetId() !== petId) {
-        throw new Error('pet selection was not persisted')
+      if (petId !== undefined) {
+        const response = await fetch('/api/pet/set-pet', {
+          method: 'POST',
+          headers: { 'content-type': 'application/json' },
+          body: JSON.stringify({ petId }),
+        })
+        const result = (await response.json()) as { ok?: boolean; petId?: string }
+        if (!response.ok || result.ok !== true || result.petId !== petId) {
+          throw new Error('pet selection was not persisted')
+        }
       }
-      this.selectedPetId = petId
+      if (visible !== undefined) {
+        const response = await fetch('/api/pet/set-visible', {
+          method: 'POST',
+          headers: { 'content-type': 'application/json' },
+          body: JSON.stringify({ visible }),
+        })
+        if (!response.ok) throw new Error('pet visibility was not persisted')
+      }
+      const persisted = await fetchPetState()
+      if (petId !== undefined && persisted.petId !== petId) throw new Error('pet selection was not persisted')
+      if (visible !== undefined && persisted.visible !== visible) throw new Error('pet visibility was not persisted')
+      this.selectedPetId = persisted.petId
+      this.selectedVisible = persisted.visible
       if (this.stagedPetId === petId) this.stagedPetId = undefined
+      if (this.stagedVisible === visible) this.stagedVisible = undefined
     } catch {
       this.petSaveFailed = true
     } finally {
@@ -241,7 +258,8 @@ export class PetSettingsCardController {
       ...(fallback ? {
         exposed: true,
         writable: true,
-        dirty: this.stagedPetId !== undefined && this.stagedPetId !== this.selectedPetId,
+        dirty: this.stagedPetId !== undefined && this.stagedPetId !== this.selectedPetId
+          || this.stagedVisible !== undefined && this.stagedVisible !== this.selectedVisible,
         invalid: this.stagedPetId !== undefined && !this.petChoices.includes(this.stagedPetId),
         saving: this.savingPet,
         failed: this.petSaveFailed,
@@ -250,7 +268,7 @@ export class PetSettingsCardController {
       petSelectionFallback: fallback,
       enabled: this.form.field('enabled'),
       decorationEnabled: this.form.field('decorationEnabled'),
-      visible: this.form.field('visible'),
+      visible: fallback ? this.fallbackVisible() : this.form.field('visible'),
       size: this.form.field('size'),
       right: this.form.field('right'),
       bottom: this.form.field('bottom'),
@@ -261,7 +279,6 @@ export class PetSettingsCardController {
           ? { ...configuredPet, text: this.selectedPetId }
           : configuredPet,
       petChoices: this.petChoices.map(id => ({ value: id, label: this.petLabels.get(id) ?? id })),
-      petDiagnostics: this.diagnostics,
     }
   }
 
@@ -275,22 +292,25 @@ export class PetSettingsCardController {
       hooks: { petSettingsCard: this.store },
       edit: (field, value) => {
         if (!this.fallback()) return actions.edit(field, value)
-        if (field !== 'petId') return
-        this.stagedPetId = value === '' ? undefined : value
+        if (field === 'petId') this.stagedPetId = value === '' ? undefined : value
+        else if (field === 'visible') this.stagedVisible = value === '' ? undefined : value === 'true'
+        else return
         this.petSaveFailed = false
         this.store.set(this.projection())
       },
       resetField: (field) => {
         if (!this.fallback()) return actions.resetField(field)
-        if (field !== 'petId') return
-        this.stagedPetId = undefined
+        if (field === 'petId') this.stagedPetId = undefined
+        else if (field === 'visible') this.stagedVisible = undefined
+        else return
         this.petSaveFailed = false
         this.store.set(this.projection())
       },
-      save: () => { if (this.fallback()) void this.savePetSelection(); else actions.save() },
+      save: () => { if (this.fallback()) void this.saveFallback(); else actions.save() },
       discard: () => {
         if (!this.fallback()) return actions.discard()
         this.stagedPetId = undefined
+        this.stagedVisible = undefined
         this.petSaveFailed = false
         this.store.set(this.projection())
       },
@@ -378,17 +398,7 @@ export function PetSettingsCard(props: PetSettingsCardProps) {
         onEdit={(text) => { props.edit('petId', text) }}
         onReset={() => { props.resetField('petId') }}
       />
-      {state.petDiagnostics.length === 0 ? null : (
-        <li className={sectionCss.diagnostics} data-dsh-part="diagnostics">
-          <span className={sectionCss.diagnosticsTitle}>{t('settings.diagnosticsTitle')}</span>
-          <ul>
-            {state.petDiagnostics.map((diagnostic, index) => (
-              <li key={index} data-level={diagnostic.level}>{diagnostic.message}</li>
-            ))}
-          </ul>
-        </li>
-      )}
-      {state.petSelectionFallback ? null : <BooleanField
+      <BooleanField
         id="settings-pet-visible"
         label={t('settings.visible')}
         hint={t('settings.visibleHint')}
@@ -399,7 +409,7 @@ export function PetSettingsCard(props: PetSettingsCardProps) {
         {...state.visible}
         onEdit={(text) => { props.edit('visible', text) }}
         onReset={() => { props.resetField('visible') }}
-      />}
+      />
       {state.petSelectionFallback ? null : <ValueField
         id="settings-pet-size"
         label={t('settings.size')}

package/src/client/locales.ts

@@ -57,7 +57,6 @@ export const zh = {
   'pet.collapseSessions': '收起会话气泡',
   // 一级设置页（settings.section 席位）。
   'settings.title': '宠物',
-  'settings.diagnosticsTitle': '宠物目录诊断',
   'settings.description': '选择宠物并调整它的显示布局。',
   'settings.pet': '宠物',
   'settings.petHint': '选择显示哪只宠物；每只宠物独立命名，可在宠物悬浮面板改名。',
@@ -143,7 +142,6 @@ export const en = {
   'pet.collapseSessions': 'Collapse session bubbles',
   // First-level settings section (the `settings.section` seat).
   'settings.title': 'Pet',
-  'settings.diagnosticsTitle': 'Pet directory diagnostics',
   'settings.description': 'Pick a pet and tune its display layout.',
   'settings.pet': 'Pet',
   'settings.petHint': 'Choose which pet shows. Names are stored per pet; rename from the pet hover panel.',

package/src/client/pet-css.test.ts

@@ -2,6 +2,14 @@ import { readFileSync } from 'node:fs'
 import { describe, expect, it } from 'vitest'
 
 const css = readFileSync(new URL('./pet.module.css', import.meta.url), 'utf8')
+const settingsCss = readFileSync(new URL('./settings-section.module.css', import.meta.url), 'utf8')
+
+describe('pet settings section css', () => {
+  it('carries no leftover registry diagnostics block after its removal', () => {
+    expect(settingsCss).not.toContain('.diagnostics')
+    expect(settingsCss).toContain('.sectionList')
+  })
+})
 
 describe('pet bubble typography (#1549)', () => {
   it('scales the bubble text and padding from the sprite-supplied variable', () => {

package/src/client/settings-section.module.css

@@ -3,26 +3,3 @@
   margin: 0;
   padding: 0;
 }
-
-/* Registry diagnostics block (pet-center M2 P7, issue #623). */
-.diagnostics {
-  margin: 8px 0;
-  padding: 8px 12px;
-  border: 1px dashed var(--dsw-alias-border-l2);
-  border-radius: 8px;
-  font-size: 12px;
-  color: var(--dsw-alias-label-tertiary);
-}
-.diagnosticsTitle {
-  display: block;
-  font-weight: 600;
-  margin-bottom: 4px;
-  color: var(--dsw-alias-label-primary);
-}
-.diagnostics ul {
-  margin: 0;
-  padding-left: 16px;
-}
-.diagnostics li[data-level="error"] {
-  color: var(--dsw-alias-label-error, #c04848);
-}

package/src/index.test.ts

@@ -117,3 +117,42 @@ describe('petSettingsSection', () => {
     expect(section.petId).toBe('doro')
   })
 })
+
+describe('petSettingsSection display persistence', () => {
+  /** The layout a user dragged the pet to, as its own pet.json holds it. */
+  const dragged = { visible: true, size: 160, right: 1428, bottom: 167, bubbleScale: 1 }
+
+  it('user keeps the dragged position when the profile never committed one', () => {
+    // Given a pet.json holding the layout the pet was dragged to
+    // And a row config that never set the display fields, so they read back as
+    // the schema defaults (the bottom-right corner)
+    // When the plugin starts and resolves its active settings
+    const section = petSettingsSection(Config({}), 'ouo-neko', dragged)
+    // Then the dragged layout stands instead of snapping back to those defaults
+    expect(section).toMatchObject({ right: 1428, bottom: 167 })
+  })
+
+  it('user commits a display field and the profile value outranks the persisted one', () => {
+    // Given a dragged layout and a profile layer that committed a right inset
+    const section = petSettingsSection(Config({}), 'ouo-neko', dragged, { right: 48 })
+    // Then the explicit choice wins and the untouched field keeps the dragged one
+    expect(section).toMatchObject({ right: 48, bottom: 167 })
+  })
+
+  it('user commits the schema default and the choice is not mistaken for unset', () => {
+    // Given a dragged layout and a profile layer that committed the default inset
+    const section = petSettingsSection(Config({}), 'ouo-neko', dragged, { right: 24 })
+    // Then the explicit (default-valued) choice stands over the persisted one
+    expect(section.right).toBe(24)
+  })
+
+  it('user commits a layout at runtime and the result outranks the persisted one', () => {
+    // Given a live reference the Host committed into the running config
+    const resolved = Config({})
+    commitLive(resolved.right, 500)
+    // When the plugin resolves the section against an older persisted layout
+    const section = petSettingsSection(resolved, 'ouo-neko', dragged)
+    // Then the live commit wins and the persisted value fills the other fields
+    expect(section).toMatchObject({ right: 500, bottom: 167 })
+  })
+})

package/src/index.ts

@@ -16,10 +16,10 @@ import { Context, type Volatile } from '@deepseek-ai/cordis'
 import type {} from '@deepseek-ai/dsh-settings'
 import type {} from '@deepseek-ai/dsh-host-webserver'
 import z from '@deepseek-ai/schemastery'
-import { PetService, type PetConfig, type PetSettingsSection } from './service.ts'
+import { PET_SETTINGS_NAMESPACE, PetService, type PetConfig, type PetSettingsSection } from './service.ts'
 import { makePetRoutes } from './routes.ts'
 import { loadPetRegistry, petPackageRoot } from './registry.ts'
-import { BUBBLE_SCALE_MAX, BUBBLE_SCALE_MIN, DEFAULT_PET_ID, DISPLAY_INSET_MAX, DISPLAY_SIZE_MAX, DISPLAY_SIZE_MIN } from './persist.ts'
+import { BUBBLE_SCALE_MAX, BUBBLE_SCALE_MIN, DEFAULT_PET_ID, DISPLAY_INSET_MAX, DISPLAY_SIZE_MAX, DISPLAY_SIZE_MIN, type PetDisplayConfig } from './persist.ts'
 import { mountOnce } from './mount-once.ts'
 
 export { PetService, MAX_SESSION_BUBBLES } from './service.ts'
@@ -203,29 +203,115 @@ function readLive<T>(field: LiveField<T> | undefined, fallback: T): T {
   return typeof ref.get === 'function' ? ref.get() ?? fallback : field as T
 }
 
+/**
+ * Resolve one display field of the section. The precedence is deliberate:
+ *
+ * 1. an explicit profile value (`committed`) — the user's own choice, and the
+ *    only signal that carries a value equal to the schema default on purpose;
+ * 2. a live value the row committed at runtime, i.e. one that differs from the
+ *    schema default, which is all an untouched field ever resolves to;
+ * 3. what the pet's own `pet.json` already holds (`persisted`), so a field the
+ *    profile never touched keeps the position the user dragged instead of
+ *    snapping back to the schema default on the next mount.
+ *
+ * Step 3 is what makes a drag survive a restart. The display fields carry
+ * schema defaults (`right: 24`, `bottom: 20` — the bottom-right corner), and a
+ * config that never set them reads back exactly like one that set them to the
+ * defaults, so without `persisted` the startup section resets the layout every
+ * time the profile commits none — which is what an aggregate install does.
+ * @param key - the display field to resolve.
+ * @param live - the row config's own field, absent when the entry declares none.
+ * @param persisted - the display the pet already shows (its own `pet.json`).
+ * @param committed - the profile layer's explicit display values, when known.
+ * @returns the value the pet runs with.
+ */
+function displayField<K extends keyof PetDisplayConfig>(
+  key: K,
+  live: LiveField<PetDisplayConfig[K]> | undefined,
+  persisted: Partial<PetDisplayConfig>,
+  committed: Partial<PetDisplayConfig>,
+): PetDisplayConfig[K] {
+  const explicit = committed[key]
+  if (explicit !== undefined) return explicit
+  const value = readLive<PetDisplayConfig[K]>(live, PET_FORM_DEFAULTS[key])
+  if (value !== PET_FORM_DEFAULTS[key]) return value
+  const kept = persisted[key]
+  return kept === undefined ? value : kept
+}
+
 /**
  * The settings section the pet runs with: the effective values of the row's
  * own config. `fallbackPetId` covers a mount whose config names no pet at all
  * (a direct mount outside a Loader) — under a Loader the schema default is
  * always present, so the persisted selection stands whenever the config
- * carries it.
+ * carries it. `persisted` and `committed` give the display fields the same
+ * treatment; see {@link displayField}.
  * @param config - the effective config of the pet row.
  * @param fallbackPetId - pet id to use when the config names none.
+ * @param persisted - the display the pet already shows (its own `pet.json`).
+ * @param committed - the profile layer's explicit display values, when known.
  * @returns the resolved settings section.
  */
-export function petSettingsSection(config: PetFormConfig, fallbackPetId: string): PetSettingsSection {
+export function petSettingsSection(
+  config: PetFormConfig,
+  fallbackPetId: string,
+  persisted: Partial<PetDisplayConfig> = {},
+  committed: Partial<PetDisplayConfig> = {},
+): PetSettingsSection {
   return {
-    visible: readLive(config.visible, PET_FORM_DEFAULTS.visible),
-    size: readLive(config.size, PET_FORM_DEFAULTS.size),
-    right: readLive(config.right, PET_FORM_DEFAULTS.right),
-    bottom: readLive(config.bottom, PET_FORM_DEFAULTS.bottom),
-    bubbleScale: readLive(config.bubbleScale, PET_FORM_DEFAULTS.bubbleScale),
+    visible: displayField('visible', config.visible, persisted, committed),
+    size: displayField('size', config.size, persisted, committed),
+    right: displayField('right', config.right, persisted, committed),
+    bottom: displayField('bottom', config.bottom, persisted, committed),
+    bubbleScale: displayField('bubbleScale', config.bubbleScale, persisted, committed),
     petId: readLive(config.petId, fallbackPetId),
     enabled: readLive(config.enabled, PET_FORM_DEFAULTS.enabled),
     decorationEnabled: readLive(config.decorationEnabled, PET_FORM_DEFAULTS.decorationEnabled),
   }
 }
 
+/** The settings row ids a pet install is served under, most specific first. */
+const PET_SETTINGS_ROW_IDS: readonly string[] = ['web-ui-pet', 'ui-pet', PET_SETTINGS_NAMESPACE]
+
+/**
+ * The fields this host half reads off one settings descriptor. The settings
+ * service serves one descriptor per plugin row (see `describe`), and a plugin's
+ * own config IS its settings page, so the two that matter here are the row's
+ * namespace and the profile layer's explicit values.
+ */
+interface ServedSettingsRow {
+  /** The profile entry's id, which is also this plugin's settings namespace. */
+  ns: string
+  /** The profile layer's explicit values; absent fields were never committed. */
+  user?: Partial<PetDisplayConfig>
+}
+
+/**
+ * The settings row serving this plugin's own config, or undefined when the
+ * settings service is not mounted (a direct mount) or serves no row for the pet.
+ *
+ * Every settings write has to address this row's id, and that id is not the
+ * package's plugin name: an aggregate bundle renames child rows (`pet` becomes
+ * `web-ui-pet`). The browser half resolves the same id through its own
+ * `servedEntryId`, so both halves write to one namespace.
+ * @param ctx - the plugin's context.
+ * @returns the serving row, when there is one.
+ */
+function servedRow(ctx: Context): ServedSettingsRow | undefined {
+  try {
+    const settings = ctx.get('settings', false) as { describe(): readonly ServedSettingsRow[] } | undefined
+    if (settings === undefined) return undefined
+    const rows = settings.describe()
+    for (const id of PET_SETTINGS_ROW_IDS) {
+      const row = rows.find(candidate => candidate.ns === id)
+      if (row !== undefined) return row
+    }
+    return undefined
+  } catch {
+    return undefined
+  }
+}
+
 /** Register the pet service and its API + asset routes on the context. */
 export const apply = mountOnce('@linxin666/dsh-pet', applyImpl)
 
@@ -244,13 +330,21 @@ function applyImpl(ctx: Context, config: PetPluginConfig = {}): void {
     decorationEnabled: readLive(config.decorationEnabled, PET_FORM_DEFAULTS.decorationEnabled),
     registry,
   })
+  // The mirror back into the settings document (see syncSettingsFromPet) has to
+  // address the row that serves this plugin's config, which an aggregate bundle
+  // renames; the id is resolved lazily, once the composition serves it.
+  service.settingsNamespaceProvider = () => servedRow(ctx)?.ns
 
   // The effective settings ARE this row's own config: the Host serves one form
   // per profile entry from `Config` above, and every edit is committed into the
   // running config, so the plugin re-reads the section here instead of holding
   // a separate settings document (0.1.6 registered one through
-  // settings.installSection/register and re-resolved it on every change).
-  const current = (): PetSettingsSection => petSettingsSection(config, service.selectedPetId())
+  // settings.installSection/register and re-resolved it on every change). The
+  // display fields additionally read the persisted layout and the profile layer,
+  // so a mount with a config that never set them cannot reset a dragged
+  // position to the schema defaults (see displayField).
+  const current = (): PetSettingsSection =>
+    petSettingsSection(config, service.selectedPetId(), service.display(), servedRow(ctx)?.user)
   // The browser half talks to the pet through same-origin JSON endpoints and
   // loads each pet's atlas from the registry's own media route (RPC domains
   // are platform-registered, so the pet serves its own API — the same