@linxin666/dsh-pet 0.3.24 → 0.3.25

package/lib/types/client/gameplay-hud.js

@@ -10,7 +10,7 @@ import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-run
  * @module @linxin666/dsh-pet/client/GameplayHud
  */
 import { useEffect, useLayoutEffect, useRef, useState, useSyncExternalStore } from 'react';
-import { touchZoneAt } from "../gameplay.js";
+import { declaredModes, modeStateOf, PET_ROAM_DIRECTIONS, touchZoneAt } from "../gameplay.js";
 import styles from './pet.module.css';
 let floatSeq = 0;
 /** The gameplay overlay for one frames2d pet that declares 'gameplay'. */
@@ -19,7 +19,6 @@ export function GameplayHud(props) {
     const ui = useSyncExternalStore(store.subscribe, store.getSnapshot);
     const def = definition.gameplay;
     const view = ui.snapshot?.gameplay;
-    const phase = ui.snapshot?.phase ?? 'idle';
     // Host-persisted skin selection for this pet (undefined = default look).
     const persistedSkin = ui.snapshot?.skin;
     const [open, setOpen] = useState(false);
@@ -34,12 +33,19 @@ export function GameplayHud(props) {
     // Mutable driver state (refs so intervals never re-arm on a poll tick).
     const modeRef = useRef(view?.mode ?? null);
     modeRef.current = view?.mode ?? null;
-    const phaseRef = useRef(phase);
-    phaseRef.current = phase;
+    /** Live gameplay view for the interval loops (def identity is stable, view is not). */
+    const viewRef = useRef(view);
+    viewRef.current = view;
     const draggingRef = useRef(false);
     const touchLockUntilRef = useRef(0);
     const missRef = useRef(0);
     const busyRef = useRef(false);
+    /** A roam walk owns the visual right now (the idle director must not steal it). */
+    const roamHeldRef = useRef(false);
+    /** A one-shot idle-director act owns the visual right now (the roam must not cut in). */
+    const actHeldRef = useRef(false);
+    /** Pending release of the roam's walk track (cleared when another owner takes it). */
+    const roamTimerRef = useRef(0);
     // Dynamic-key lookups (stat ids / currency ids are manifest data).
     const tr = props.t;
     const statLabel = (name) => tr('pet.gameplay.stat.' + name);
@@ -55,6 +61,19 @@ export function GameplayHud(props) {
         if (result.view !== undefined)
             store.actions.setGameplayView(result.view);
     };
+    /**
+     * Give up the roam's claim on the shared track-override slot. Every other
+     * owner (a mode, a touch reaction, a drag) calls this before it takes the
+     * slot, so a walk that is still in flight can never release someone else's
+     * track when its own hold window elapses.
+     */
+    const yieldRoam = () => {
+        if (roamTimerRef.current !== 0) {
+            window.clearTimeout(roamTimerRef.current);
+            roamTimerRef.current = 0;
+        }
+        roamHeldRef.current = false;
+    };
     // Tap handling (registered on the bus; PetSprite reports sprite-box
     // fractions). Sleep wakes on tap; work blocks taps; a held touch
     // animation turns taps into the plain-click boost.
@@ -69,6 +88,7 @@ export function GameplayHud(props) {
         // consecutive taps cannot retrigger mid-play (skin click actions and
         // default touch-zone reactions share this path).
         const holdTrack = (track, holdMs) => {
+            yieldRoam();
             bus.setTrack?.(track);
             touchLockUntilRef.current = Date.now() + holdMs;
             window.setTimeout(() => {
@@ -86,7 +106,9 @@ export function GameplayHud(props) {
         // base idle, so holding the lock for the full loop is unnecessary).
         const trackDuration = (track) => definition.frames2d?.tracks[track]?.durations.reduce((sum, ms) => sum + ms, 0) ?? 0;
         bus.tap = (fx, fy) => {
-            if (modeRef.current === 'sleep') {
+            // Any non-work mode ends on a tap (sleep wakes up, a bath steps out);
+            // work keeps swallowing taps while its round is running.
+            if (modeRef.current !== null && modeRef.current !== 'work') {
                 void api.setMode(null).then(applyResult, () => undefined);
                 return;
             }
@@ -180,21 +202,25 @@ export function GameplayHud(props) {
         return () => { window.removeEventListener('resize', place); };
         // eslint-disable-next-line react-hooks/exhaustive-deps -- one placement per open/page change
     }, [open, page]);
-    // Drag gestures wake a sleeping pet (miku behavior); the drag stream also
-    // feeds the idle director's suppression check.
+    // Drag gestures end any non-work mode (sleep wakes, a bath steps out); the
+    // drag stream also feeds the idle director's suppression check.
     useEffect(() => {
         return props.drag.subscribe((dragging) => {
             draggingRef.current = dragging;
-            if (dragging && modeRef.current === 'sleep') {
+            if (dragging)
+                yieldRoam();
+            if (dragging && modeRef.current !== null && modeRef.current !== 'work') {
                 void api.setMode(null).then(applyResult, () => undefined);
             }
         });
         // eslint-disable-next-line react-hooks/exhaustive-deps -- one subscription per drag stream
     }, [props.drag]);
     // Idle director: weighted rolls between staying idle and playing an act.
-    // Runs only while the phase mapping owns the visual (idle phase, no mode,
-    // no drag, no held touch animation); maxMiss forces an act after too many
-    // idle rolls in a row.
+    // Rolls in every phase -- an ambient act is not a waiting-room performance,
+    // and the idle phase only appears when neither the agent nor the user is busy
+    // -- but only while nothing else owns the visual: no mode, no drag, no held
+    // touch animation, no roam walk and no act already playing. maxMiss forces an
+    // act after too many idle rolls in a row.
     useEffect(() => {
         const director = def?.idleDirector;
         if (def === undefined || director === undefined)
@@ -202,13 +228,16 @@ export function GameplayHud(props) {
         const total = director.idleWeight + director.acts.reduce((sum, act) => sum + act.weight, 0);
         if (total <= 0)
             return undefined;
+        let actTimer = 0;
         const timer = window.setInterval(() => {
-            if (phaseRef.current !== 'idle')
-                return;
             if (modeRef.current !== null || draggingRef.current)
                 return;
             if (Date.now() < touchLockUntilRef.current)
                 return;
+            if (roamHeldRef.current)
+                return; // a roam walk owns the visual
+            if (actHeldRef.current)
+                return; // the previous act is still playing
             let pickedAct;
             if (missRef.current >= director.maxMiss) {
                 // Forced act: pick among the acts only.
@@ -237,14 +266,24 @@ export function GameplayHud(props) {
                 return;
             }
             missRef.current = 0;
+            actHeldRef.current = true;
             bus.setTrack?.(pickedAct.track);
+            // A one-shot act owns the visual until its own duration elapses (the
+            // renderer then falls back to the phase map); the roam must not cut in.
+            const holdMs = definition.frames2d?.tracks[pickedAct.track]?.durations.reduce((sum, ms) => sum + ms, 0) ?? 0;
+            window.clearTimeout(actTimer);
+            actTimer = window.setTimeout(() => { actHeldRef.current = false; }, holdMs > 0 ? holdMs : 3000);
             // Acts with a phrase pool speak one line while they play (miku parity).
             if (pickedAct.phrases !== undefined && pickedAct.phrases.length > 0) {
                 const phrase = pickedAct.phrases[Math.floor(Math.random() * pickedAct.phrases.length)];
                 store.actions.setFeedback({ text: phrase, kind: 'none', at: Date.now() });
             }
         }, director.intervalMs);
-        return () => window.clearInterval(timer);
+        return () => {
+            window.clearInterval(timer);
+            window.clearTimeout(actTimer);
+            actHeldRef.current = false;
+        };
         // eslint-disable-next-line react-hooks/exhaustive-deps -- one director per pet definition
     }, [definition.id, def]);
     // Work loop: hold the work track, adjudicate one round per tick, play the
@@ -290,24 +329,99 @@ export function GameplayHud(props) {
         };
         // eslint-disable-next-line react-hooks/exhaustive-deps -- the loop keys on the mode and the selected skin
     }, [definition.id, def, view?.mode, skinId]);
-    // Sleep loop: hold the sleep track; restore is host-side (lazy settle).
-    // While a skin with a gameplayTracks.sleep override is selected, the skin's
-    // own track replaces the default sleep track (e.g. a skin-specific doze).
+    // Mode loop: hold the active non-work mode's track (sleep, a bath, any
+    // extra 'modes' entry). The stat restore is host-side (lazy settle). While a
+    // skin with a matching gameplayTracks override is selected, the skin's own
+    // track replaces the default one (e.g. a skin-specific doze).
     useEffect(() => {
-        const sleep = def?.sleep;
-        if (def === undefined || sleep === undefined || view?.mode !== 'sleep')
+        const active = view?.mode;
+        if (def === undefined || active === undefined || active === null || active === 'work')
+            return undefined;
+        const hold = modeStateOf(def, active);
+        if (hold === undefined)
             return undefined;
         const skinGameplay = definition.frames2d?.skins?.find(skin => skin.id === skinIdRef.current)?.gameplayTracks;
-        const hold = skinGameplay?.['sleep'] ?? sleep.state;
-        bus.setTrack?.(hold);
+        yieldRoam();
+        bus.setTrack?.(skinGameplay?.[active] ?? hold);
         return () => bus.setTrack?.(undefined);
         // eslint-disable-next-line react-hooks/exhaustive-deps -- the loop keys on the mode value
     }, [definition.id, def, view?.mode, skinId]);
+    // Random roaming (manifest 'roam'): on a slow interval -- in any phase, as long
+    // as no mode, drag, touch animation or director act owns the pet -- roll a
+    // wander. The chrome walks the sprite and persists the new spot; this side
+    // holds the walk track for exactly the travel time.
+    useEffect(() => {
+        const roam = def?.roam;
+        if (def === undefined || roam === undefined)
+            return undefined;
+        const roll = () => {
+            // Every phase: a wandering pet is ambient, not a performance, so she
+            // keeps walking while the agent works (the idle director's acts stay
+            // idle-only). A mode, a drag, a touch animation and a director
+            // act all still own the pet and suppress the roll.
+            if (modeRef.current !== null || draggingRef.current)
+                return;
+            if (Date.now() < touchLockUntilRef.current)
+                return;
+            if (roamHeldRef.current || actHeldRef.current)
+                return;
+            if (Math.random() >= roam.probability)
+                return;
+            const span = roam.distanceMax - roam.distanceMin;
+            const distance = roam.distanceMin + Math.random() * span;
+            const directions = roam.directions ?? PET_ROAM_DIRECTIONS;
+            const direction = directions[Math.floor(Math.random() * directions.length)] ?? 'left';
+            const travelled = bus.walk?.(direction, distance, roam.speed) ?? 0;
+            if (travelled === 0)
+                return;
+            roamHeldRef.current = true;
+            bus.setTrack?.(roam.state);
+            roamTimerRef.current = window.setTimeout(() => {
+                roamTimerRef.current = 0;
+                if (!roamHeldRef.current)
+                    return; // another owner already took the slot
+                roamHeldRef.current = false;
+                bus.setTrack?.(undefined);
+            }, Math.max(150, (Math.abs(travelled) / roam.speed) * 1000));
+        };
+        // The two decision timers must never share a tick. The roam starts half an
+        // interval late, so its ticks interleave with the idle director's instead
+        // of landing on the same instant (10 s and 15 s coincide every 30 s).
+        let timer = 0;
+        const lead = window.setTimeout(() => {
+            roll();
+            timer = window.setInterval(roll, roam.intervalMs);
+        }, Math.round(roam.intervalMs / 2));
+        return () => {
+            window.clearTimeout(lead);
+            window.clearInterval(timer);
+            yieldRoam();
+        };
+        // eslint-disable-next-line react-hooks/exhaustive-deps -- one director per pet definition
+    }, [definition.id, def]);
     if (def === undefined || view === undefined)
         return null;
     const mode = view.mode;
     const stats = def.stats ?? {};
     const shop = def.shop;
+    // Every menu mode beyond work: sleep plus any extra 'modes' the pet declares.
+    const menuModes = declaredModes(def);
+    /** Action-button label for one mode (active = the button that leaves it). */
+    const modeLabel = (name, active) => {
+        if (name === 'sleep')
+            return tr(active ? 'pet.gameplay.wake' : 'pet.gameplay.sleep');
+        const declared = def.modes?.[name];
+        return (active ? declared?.activeLabel ?? declared?.label : declared?.label) ?? tr('pet.gameplay.' + name);
+    };
+    /** Chip label for the mode the pet is in right now. */
+    const modeChip = (name) => {
+        if (name === 'work')
+            return tr('pet.gameplay.working');
+        if (name === 'sleep')
+            return tr('pet.gameplay.sleeping');
+        const declared = def.modes?.[name];
+        return declared?.activeLabel ?? declared?.label ?? tr('pet.gameplay.' + name);
+    };
     const buy = (itemId) => {
         void api.buy(itemId).then((result) => {
             applyResult(result);
@@ -362,8 +476,8 @@ export function GameplayHud(props) {
             restore();
         }, restore);
     };
-    return (_jsxs("div", { ref: hudRef, className: styles.gameplayHud, "data-dsh-pet-gameplay": definition.id, children: [floats.map(entry => (_jsx("div", { className: styles.gameplayFloat, children: entry.text }, entry.id))), mode !== null && (_jsx("div", { className: styles.gameplayModeChip, children: tr(mode === 'work' ? 'pet.gameplay.working' : 'pet.gameplay.sleeping') })), open && (_jsxs("div", { ref: cardRef, className: styles.gameplayCard, "data-page": page, children: [page === 'root' && (_jsxs(_Fragment, { children: [_jsx("div", { className: styles.gameplayBars, children: Object.entries(stats).map(([name, stat]) => {
+    return (_jsxs("div", { ref: hudRef, className: styles.gameplayHud, "data-dsh-pet-gameplay": definition.id, children: [floats.map(entry => (_jsx("div", { className: styles.gameplayFloat, children: entry.text }, entry.id))), mode !== null && (_jsx("div", { className: styles.gameplayModeChip, children: modeChip(mode) })), open && (_jsxs("div", { ref: cardRef, className: styles.gameplayCard, "data-page": page, children: [page === 'root' && (_jsxs(_Fragment, { children: [_jsx("div", { className: styles.gameplayBars, children: Object.entries(stats).map(([name, stat]) => {
                                     const value = view.stats[name] ?? 0;
                                     return (_jsxs("div", { className: styles.gameplayBarRow, title: statLabel(name) + ' ' + String(value) + '/' + String(stat.max), children: [_jsx("span", { className: styles.gameplayBarLabel, children: statLabel(name) }), _jsx("span", { className: styles.gameplayBarTrack, children: _jsx("span", { className: styles.gameplayBarFill, style: { width: Math.round((value / stat.max) * 100) + '%' } }) })] }, name));
-                                }) }), _jsxs("div", { className: styles.gameplayActions, children: [def.sleep !== undefined && (_jsx("button", { type: "button", className: styles.action, onClick: () => setMode(mode === 'sleep' ? null : 'sleep'), children: tr(mode === 'sleep' ? 'pet.gameplay.wake' : 'pet.gameplay.sleep') })), shop !== undefined && (_jsx("button", { type: "button", className: styles.action, onClick: () => setPage('shop'), children: tr('pet.gameplay.shop') })), skins !== undefined && skins.length > 0 && (_jsx("button", { type: "button", className: styles.action, onClick: () => setPage('skins'), children: tr('pet.gameplay.skin') })), def.work !== undefined && (_jsx("button", { type: "button", className: styles.action, onClick: () => setMode(mode === 'work' ? null : 'work'), children: tr(mode === 'work' ? 'pet.gameplay.stopWork' : 'pet.gameplay.work') }))] })] })), page === 'shop' && shop !== undefined && (_jsxs(_Fragment, { children: [_jsx("div", { className: styles.gameplayShopItems, children: shop.items.map(item => (_jsxs("button", { type: "button", className: styles.gameplayShopItem, onClick: () => buy(item.id), title: item.label + ' — ' + String(item.price) + ' ' + currencyLabel(item.currency), children: [item.image !== undefined && (_jsx("img", { className: styles.gameplayShopItemImage, src: item.image, alt: "", draggable: false })), _jsx("span", { className: styles.gameplayShopItemLabel, children: item.label }), _jsxs("span", { className: styles.gameplayShopItemPrice, children: [item.price, " ", currencyLabel(item.currency)] })] }, item.id))) }), _jsx("div", { className: styles.gameplayActions, children: _jsx("button", { type: "button", className: styles.action, onClick: () => setPage('root'), children: tr('pet.gameplay.back') }) })] })), page === 'skins' && skins !== undefined && (_jsxs(_Fragment, { children: [_jsxs("div", { className: styles.gameplaySkinItems, children: [_jsx("button", { type: "button", className: skinId === undefined ? styles.gameplaySkinItem + ' ' + styles.gameplaySkinItemActive : styles.gameplaySkinItem, onClick: () => selectSkin(undefined), children: tr('pet.gameplay.skinDefault') }), skins.map(skin => (_jsx("button", { type: "button", className: skinId === skin.id ? styles.gameplaySkinItem + ' ' + styles.gameplaySkinItemActive : styles.gameplaySkinItem, onClick: () => selectSkin(skin), children: skin.label }, skin.id)))] }), _jsx("div", { className: styles.gameplayActions, children: _jsx("button", { type: "button", className: styles.action, onClick: () => setPage('root'), children: tr('pet.gameplay.back') }) })] })), _jsx("button", { type: "button", className: styles.gameplayClose, "aria-label": tr('pet.gameplay.back'), onClick: () => setOpen(false), children: "\u00D7" })] }))] }));
+                                }) }), _jsxs("div", { className: styles.gameplayActions, children: [menuModes.map(name => (_jsx("button", { type: "button", className: styles.action, onClick: () => setMode(mode === name ? null : name), children: modeLabel(name, mode === name) }, name))), shop !== undefined && (_jsx("button", { type: "button", className: styles.action, onClick: () => setPage('shop'), children: tr('pet.gameplay.shop') })), skins !== undefined && skins.length > 0 && (_jsx("button", { type: "button", className: styles.action, onClick: () => setPage('skins'), children: tr('pet.gameplay.skin') })), def.work !== undefined && (_jsx("button", { type: "button", className: styles.action, onClick: () => setMode(mode === 'work' ? null : 'work'), children: tr(mode === 'work' ? 'pet.gameplay.stopWork' : 'pet.gameplay.work') }))] })] })), page === 'shop' && shop !== undefined && (_jsxs(_Fragment, { children: [_jsx("div", { className: styles.gameplayShopItems, children: shop.items.map(item => (_jsxs("button", { type: "button", className: styles.gameplayShopItem, onClick: () => buy(item.id), title: item.label + ' — ' + String(item.price) + ' ' + currencyLabel(item.currency), children: [item.image !== undefined && (_jsx("img", { className: styles.gameplayShopItemImage, src: item.image, alt: "", draggable: false })), _jsx("span", { className: styles.gameplayShopItemLabel, children: item.label }), _jsxs("span", { className: styles.gameplayShopItemPrice, children: [item.price, " ", currencyLabel(item.currency)] })] }, item.id))) }), _jsx("div", { className: styles.gameplayActions, children: _jsx("button", { type: "button", className: styles.action, onClick: () => setPage('root'), children: tr('pet.gameplay.back') }) })] })), page === 'skins' && skins !== undefined && (_jsxs(_Fragment, { children: [_jsxs("div", { className: styles.gameplaySkinItems, children: [_jsx("button", { type: "button", className: skinId === undefined ? styles.gameplaySkinItem + ' ' + styles.gameplaySkinItemActive : styles.gameplaySkinItem, onClick: () => selectSkin(undefined), children: tr('pet.gameplay.skinDefault') }), skins.map(skin => (_jsx("button", { type: "button", className: skinId === skin.id ? styles.gameplaySkinItem + ' ' + styles.gameplaySkinItemActive : styles.gameplaySkinItem, onClick: () => selectSkin(skin), children: skin.label }, skin.id)))] }), _jsx("div", { className: styles.gameplayActions, children: _jsx("button", { type: "button", className: styles.action, onClick: () => setPage('root'), children: tr('pet.gameplay.back') }) })] })), _jsx("button", { type: "button", className: styles.gameplayClose, "aria-label": tr('pet.gameplay.back'), onClick: () => setOpen(false), children: "\u00D7" })] }))] }));
 }

package/lib/types/client/index.d.ts

@@ -13,7 +13,7 @@
  * @module @linxin666/dsh-pet/client
  */
 import type { Context as ClientContext } from '@deepseek-ai/cordis';
-import type { SettingsScope, SettingsScopeSpec } from '@deepseek-ai/dsh-client-ui-settings/client';
+import type { ConfigForm } from '@deepseek-ai/dsh-client-ui-settings/client';
 /** Required services (sessions powers bubble-to-session navigation). */
 export declare const inject: string[];
 /** Re-exported for consumers that type against the injected face. */
@@ -26,12 +26,15 @@ export type { PetDefinition } from '../registry.ts';
 declare module '@deepseek-ai/cordis' {
     interface Context {
         /**
-         * Optional rc.6 compatibility binder provided by dsh-web-settings;
-         * absent when that group plugin is not installed, so callers fall back to
-         * the official settings scope.
+         * Optional family binder provided by dsh-web-settings; absent when that
+         * group plugin is not installed, so callers fall back to the shared
+         * per-entry form.
          */
         webUiSettings?: {
-            bind<S>(spec: SettingsScopeSpec<S>): SettingsScope<S>;
+            bind<S>(spec: {
+                namespace: string;
+                decode?: (section: unknown) => S | undefined;
+            }): ConfigForm<S>;
         };
     }
 }

package/lib/types/client/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/client/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;GAaG;AAEH,OAAO,KAAK,EAAE,OAAO,IAAI,aAAa,EAAE,MAAM,qBAAqB,CAAA;AAGnE,OAAO,KAAK,EAAE,aAAa,EAAE,iBAAiB,EAAE,MAAM,4CAA4C,CAAA;AAiFlG,wEAAwE;AACxE,eAAO,MAAM,MAAM,UAA2E,CAAA;AAE9F,qEAAqE;AACrE,YAAY,EAAE,WAAW,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAA;AACxE,YAAY,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAA;AACrD,YAAY,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAA;AAC7D,YAAY,EAAE,mBAAmB,EAAE,oBAAoB,EAAE,MAAM,uBAAuB,CAAA;AACtF,YAAY,EAAE,uBAAuB,EAAE,MAAM,uBAAuB,CAAA;AACpE,YAAY,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAA;AAEnD,OAAO,QAAQ,qBAAqB,CAAC;IACnC,UAAU,OAAO;QACf;;;;WAIG;QACH,aAAa,CAAC,EAAE;YAAE,IAAI,CAAC,CAAC,EAAE,IAAI,EAAE,iBAAiB,CAAC,CAAC,CAAC,GAAG,aAAa,CAAC,CAAC,CAAC,CAAA;SAAE,CAAA;KAC1E;CACF;AAuBD,wBAAgB,KAAK,CAAC,GAAG,EAAE,aAAa,GAAG,IAAI,CAqU9C"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/client/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;GAaG;AAEH,OAAO,KAAK,EAAE,OAAO,IAAI,aAAa,EAAE,MAAM,qBAAqB,CAAA;AAGnE,OAAO,KAAK,EAAE,UAAU,EAAe,MAAM,4CAA4C,CAAA;AAqFzF,wEAAwE;AACxE,eAAO,MAAM,MAAM,UAAwF,CAAA;AAE3G,qEAAqE;AACrE,YAAY,EAAE,WAAW,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAA;AACxE,YAAY,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAA;AACrD,YAAY,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAA;AAC7D,YAAY,EAAE,mBAAmB,EAAE,oBAAoB,EAAE,MAAM,uBAAuB,CAAA;AACtF,YAAY,EAAE,uBAAuB,EAAE,MAAM,uBAAuB,CAAA;AACpE,YAAY,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAA;AAEnD,OAAO,QAAQ,qBAAqB,CAAC;IACnC,UAAU,OAAO;QACf;;;;WAIG;QACH,aAAa,CAAC,EAAE;YACd,IAAI,CAAC,CAAC,EAAE,IAAI,EAAE;gBAAE,SAAS,EAAE,MAAM,CAAC;gBAAC,MAAM,CAAC,EAAE,CAAC,OAAO,EAAE,OAAO,KAAK,CAAC,GAAG,SAAS,CAAA;aAAE,GAAG,UAAU,CAAC,CAAC,CAAC,CAAA;SAClG,CAAA;KACF;CACF;AA0DD,wBAAgB,KAAK,CAAC,GAAG,EAAE,aAAa,GAAG,IAAI,CAoU9C"}

package/lib/types/client/index.js

@@ -23,6 +23,7 @@ import { frames2dRenderer } from "./renderers/frames2d.js";
 import { registerPetUiTeardown, takeoverPetUiTeardown } from "./ui-teardown.js";
 import { PetSettingsSection, PetSettingsCardController } from "./PetSettingsCard.js";
 import { NS, en, zh, t } from "./locales.js";
+import { mainViewSessionId } from "./main-session.js";
 import { reportDailyHeartbeat } from "./telemetry.js";
 /** Same-origin JSON fetch helper (GET without body, POST with JSON body). */
 async function petFetch(path, body) {
@@ -56,10 +57,44 @@ const petApi = {
 };
 /** Poll interval for the host snapshot. */
 const POLL_MS = 2000;
-/** Settings namespace the pet settings card edits (the Host plugin registers it). */
+/** Settings namespace of the pet's settings page. It is the profile entry id the Host serves a form for. */
 const PET_SETTINGS_NS = 'pet';
 /** Required services (sessions powers bubble-to-session navigation). */
-export const inject = ['slots', 'locale', 'connection', 'settingsScope', 'remote', 'sessions'];
+export const inject = ['slots', 'locale', 'connection', 'configForms', 'remote', 'sessions', 'uiWorkspace'];
+/**
+ * The configuration form the settings card stages and saves through: the
+ * family binder when dsh-web-settings is mounted, otherwise the shared form of
+ * this plugin's own profile entry.
+ *
+ * The two are not interchangeable by name. A plugin's settings ARE its own
+ * config on 0.1.7, so the form belongs to the profile entry that carries the
+ * plugin — and only the family binder knows which entry that is, because the
+ * family bundle renames child rows ('pet' becomes 'web-ui-pet' there) while a
+ * standalone install keeps the package's own id.
+ * @param ctx - client root context.
+ * @returns the form for the pet's settings page.
+ */
+const AGGREGATE_ENTRY_ID = 'web-ui-pet';
+const PET_ENTRY_IDS = [AGGREGATE_ENTRY_ID, 'ui-pet', PET_SETTINGS_NS];
+function servedEntryId(forms) {
+    let served;
+    try {
+        served = forms.describe().getSnapshot().view?.namespaces.map(view => view.ns);
+    }
+    catch {
+        served = undefined;
+    }
+    if (!served || served.length === 0)
+        return PET_SETTINGS_NS;
+    return PET_ENTRY_IDS.find(id => served.includes(id)) ?? PET_SETTINGS_NS;
+}
+function petSettingsForm(ctx) {
+    const binder = ctx.get('webUiSettings');
+    if (binder !== undefined && typeof binder.bind === 'function') {
+        return binder.bind({ namespace: PET_SETTINGS_NS });
+    }
+    return ctx.configForms.get(servedEntryId(ctx.configForms));
+}
 /**
  * Client plugin body: register dictionaries, mount the global pet entry and
  * poll loop while the plugin is enabled, and seat the settings card as a
@@ -94,23 +129,22 @@ export function apply(ctx) {
     // M3). Registration is idempotent (id wins), so re-applies stay clean.
     defaultPetRendererRegistry.register(live2dRenderer);
     defaultPetRendererRegistry.register(frames2dRenderer);
-    const binder = ctx.get('webUiSettings') ?? ctx.settingsScope;
-    const settingsScope = binder.bind({ namespace: PET_SETTINGS_NS });
+    const settingsForm = petSettingsForm(ctx);
     const enabled = () => {
-        const snapshot = settingsScope.getSnapshot();
+        const snapshot = settingsForm.getSnapshot();
         return snapshot.status === 'ready'
             ? snapshot.value?.enabled ?? true
             : snapshot.status === 'unavailable';
     };
-    // First-level settings section: one staged form over the 'pet' settings
-    // namespace, registered as a top-level settings page. The controller loads
-    // the petId choices from the registry endpoint itself — the registry lists
-    // the available pets (built-in assets plus user dirs), so the section only
-    // ever shows installed pets. Installing new pets happens in the Workshop
-    // store.
-    const petSettings = new PetSettingsCardController(settingsScope);
+    // First-level settings section: one staged form over the 'pet' profile
+    // entry's configuration, registered as a top-level settings page. The
+    // controller loads the petId choices from the registry endpoint itself — the
+    // registry lists the available pets (built-in assets plus user dirs), so the
+    // section only ever shows installed pets. Installing new pets happens in the
+    // Workshop store.
+    const petSettings = new PetSettingsCardController(settingsForm);
     // The section entry owns the controller: unregistering it (fiber disposal,
-    // hot reload) releases the scope subscription through petSettings.dispose.
+    // hot reload) releases the form subscription through petSettings.dispose.
     ctx.slots.inject('settings.section', () => {
         try {
             const unregister = ctx.slots.register({
@@ -159,19 +193,17 @@ export function apply(ctx) {
             const setPets = petStore.actions.setPets;
             const setState = petStore.actions.setState;
             const setFeedback = petStore.actions.setFeedback;
-            // Clicking a session bubble jumps the GUI to that session; the same
-            // sessions face reports which session the user is currently on, so the
-            // host can lead the bubble stack with it. 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.
+            // Clicking a session bubble jumps the GUI to that session; the
+            // catalog's main-view ownership marker tells which session the main view
+            // holds (the multi-instance replacement for the removed list.current), so
+            // the host can lead the bubble stack with it. A bubble can outlive its
+            // disposed session by one poll tick, and navigation rejects 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;
-            const currentSessionId = () => {
-                const current = sessions.list.getSnapshot().current;
-                return current === undefined ? undefined : String(current);
-            };
+            const currentSessionId = () => mainViewSessionId(sessions.list.getSnapshot().byId);
             // The registry list is fetched lazily with retries baked into the poll
             // cycle: until it lands, the dock entry renders nothing and every 2s
             // tick tries again. After it lands, one list feeds both the sprite and
@@ -251,7 +283,9 @@ export function apply(ctx) {
                 const list = sessions.list.getSnapshot();
                 if (list.byId[sessionId] === undefined)
                     return;
-                sessions.open(sessionId);
+                // Navigation belongs to the workspace UI since the multi-instance Client
+                // Session model; the Session Controller no longer opens one.
+                ctx.uiWorkspace.openSession(sessionId);
             };
             const injected = () => ({
                 store: petStore,
@@ -393,7 +427,7 @@ export function apply(ctx) {
     // (issue #785): disposal drops the subscription and tears the UI down
     // (terminal), so a hot-reloaded or re-injected bundle never leaves the
     // previous React root, container, or poll loop behind on document.body.
-    const unsubscribeSettings = settingsScope.subscribe(syncUi);
+    const unsubscribeSettings = settingsForm.subscribe(syncUi);
     ctx.effect(() => () => {
         unsubscribeSettings();
         killUi();

package/lib/types/client/main-session.d.ts

@@ -0,0 +1,33 @@
+/**
+ * Main-view Session derivation for the multi-instance Client Session model.
+ *
+ * The Client Session Controller carries no global "current" selection: view
+ * selection belongs to the workspace UI, which owns the main-area reference and
+ * publishes it through the catalog's per-source ownership counts
+ * (`SessionSummary.retainedBy.mainView`). A plugin that needs the Session the
+ * main view shows derives it from that marker instead of the removed
+ * `SessionListState.current` field.
+ *
+ * The marker describes view ownership, not authority. It is the right input for
+ * presentation and for deciding which view a navigation targets; it is not a
+ * business fallback, because source counts never imply visibility or success.
+ * @module dsh-web/shared/main-session
+ */
+/** The catalog row subset this helper reads (a `SessionSummary` projection). */
+export interface MainViewOwnedRow<Id extends string = string> {
+    /** Catalog row identity. */
+    readonly id: Id;
+    /** Per-source local ownership counts; absent rows are never owned. */
+    readonly retainedBy?: Readonly<Partial<Record<string, number>>> | undefined;
+}
+/**
+ * Resolve the Session the main view currently shows.
+ *
+ * Reads the catalog's rows rather than a per-id retain-info source: ownership
+ * counts ride the list snapshot, so this neither allocates observers nor opens
+ * history, and a subscription to the list still fires when the selection moves.
+ * @param byId - the session catalog's rows (`SessionListState.byId`), when available.
+ * @returns the main-view session id, or undefined when the main view shows none.
+ */
+export declare function mainViewSessionId<Id extends string>(byId: Readonly<Record<Id, MainViewOwnedRow<Id> | undefined>> | undefined | null): Id | undefined;
+//# sourceMappingURL=main-session.d.ts.map

package/lib/types/client/main-session.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"main-session.d.ts","sourceRoot":"","sources":["../../../src/client/main-session.ts"],"names":[],"mappings":"AACA;;;;;;;;;;;;;;GAcG;AAEH,gFAAgF;AAChF,MAAM,WAAW,gBAAgB,CAAC,EAAE,SAAS,MAAM,GAAG,MAAM;IAC1D,4BAA4B;IAC5B,QAAQ,CAAC,EAAE,EAAE,EAAE,CAAA;IACf,sEAAsE;IACtE,QAAQ,CAAC,UAAU,CAAC,EAAE,QAAQ,CAAC,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC,GAAG,SAAS,CAAA;CAC5E;AAED;;;;;;;;GAQG;AACH,wBAAgB,iBAAiB,CAAC,EAAE,SAAS,MAAM,EACjD,IAAI,EAAE,QAAQ,CAAC,MAAM,CAAC,EAAE,EAAE,gBAAgB,CAAC,EAAE,CAAC,GAAG,SAAS,CAAC,CAAC,GAAG,SAAS,GAAG,IAAI,GAC9E,EAAE,GAAG,SAAS,CAMhB"}

package/lib/types/client/main-session.js

@@ -0,0 +1,34 @@
+// Generated by scripts/sync-shared.mjs from shared/client/main-session.ts. Do not edit this copy; edit the shared source and run "node scripts/sync-shared.mjs".
+/**
+ * Main-view Session derivation for the multi-instance Client Session model.
+ *
+ * The Client Session Controller carries no global "current" selection: view
+ * selection belongs to the workspace UI, which owns the main-area reference and
+ * publishes it through the catalog's per-source ownership counts
+ * (`SessionSummary.retainedBy.mainView`). A plugin that needs the Session the
+ * main view shows derives it from that marker instead of the removed
+ * `SessionListState.current` field.
+ *
+ * The marker describes view ownership, not authority. It is the right input for
+ * presentation and for deciding which view a navigation targets; it is not a
+ * business fallback, because source counts never imply visibility or success.
+ * @module dsh-web/shared/main-session
+ */
+/**
+ * Resolve the Session the main view currently shows.
+ *
+ * Reads the catalog's rows rather than a per-id retain-info source: ownership
+ * counts ride the list snapshot, so this neither allocates observers nor opens
+ * history, and a subscription to the list still fires when the selection moves.
+ * @param byId - the session catalog's rows (`SessionListState.byId`), when available.
+ * @returns the main-view session id, or undefined when the main view shows none.
+ */
+export function mainViewSessionId(byId) {
+    if (byId === undefined || byId === null)
+        return undefined;
+    for (const row of Object.values(byId)) {
+        if (row !== undefined && (row.retainedBy?.mainView ?? 0) > 0)
+            return row.id;
+    }
+    return undefined;
+}

package/lib/types/client/settings-form.d.ts

@@ -6,7 +6,7 @@
  * each plugin's client bundle; mirrors the official ui-plugin-config
  * card-store pattern.
  */
-import type { SettingsScope } from '@deepseek-ai/dsh-client-ui-settings/client';
+import type { ConfigForm } from '@deepseek-ai/dsh-client-ui-settings/client';
 import type { SnapshotStore } from '@deepseek-ai/dsh-client-store';
 /** The write one field's staged text performs when the card is saved. */
 export type FieldWrite = {
@@ -86,7 +86,7 @@ export interface CardActions {
     /** Drop every staged edit. */
     discard: () => void;
 }
-/** One durable write inside the save's atomic scope mutation. */
+/** One durable write inside the save's atomic form mutation. */
 export interface BatchedWrite {
     /** Field this entry writes. */
     field: string;
@@ -130,20 +130,20 @@ export declare class CardForm<T> {
     private readonly specs;
     private readonly staged;
     private readonly listeners;
-    /** The scope subscription installed in the constructor; released by dispose(). */
-    private readonly disposeScope;
+    /** The form subscription installed in the constructor; released by dispose(). */
+    private readonly disposeForm;
     private disposed;
     private saving;
     private failed;
     private failedReason;
-    /** @param scope - the bound settings scope for this card's namespace. */
-    constructor(scope: SettingsScope<T>, specs: FieldSpec[]);
+    /** @param scope - the bound configuration form for this card's namespace. */
+    constructor(scope: ConfigForm<T>, specs: FieldSpec[]);
     /**
-     * Release the scope subscription and every bound store listener. The card
+     * Release the form subscription and every bound store listener. The card
      * must call this on teardown; later calls are no-ops.
      */
     dispose(): void;
-    /** Publish a projection of this form, rebuilt whenever the scope or a draft changes. */
+    /** Publish a projection of this form, rebuilt whenever the form or a draft changes. */
     bind<S>(project: () => S): SnapshotStore<S>;
     /** Read the card-level state: what the Host serves, and what a save would do. */
     shell(): CardShell;
@@ -152,19 +152,19 @@ export declare class CardForm<T> {
     /** The actions the card's slot registration injects. */
     actions(): CardActions;
     /**
-     * Write every staged edit in one atomic scope mutation, then re-seed from
+     * Write every staged edit in one atomic form mutation, then re-seed from
      * what the Host accepted.
      *
      * The whole batch rides one mutate, so cross-field validate hooks
      * (baseURL+model) judge it as a unit: the Host either applies every write
-     * or refuses the batch. The 0.1.2 scope contract never rejects a refused
-     * mutation — the scope recovers with a fresh Host view and resolves — so
-     * resolution alone proves nothing: the outcome is judged by reading the
-     * settled snapshot back, one planned write at a time, and one missed write
-     * fails the whole save. A scope that still rejects on refusal (the dsh-web
-     * bridge scope) reports through the same failure path with its rejection
-     * message. A save that did not land keeps its drafts, so the user can
-     * correct them instead of retyping.
+     * or refuses the batch. The form contract answers a refusal or a skipped
+     * write with `false` (it recovers with a fresh Host view instead of
+     * throwing), so the outcome is judged twice: the answer itself, and then the
+     * settled snapshot read back one planned write at a time. One missed write
+     * fails the whole save. A transport that rejects instead (the dsh-web bridge
+     * controller on a dead connection) reports through the same failure path
+     * with its rejection message. A save that did not land keeps its drafts, so
+     * the user can correct them instead of retyping.
      * @returns settlement after the mutation and the read-back.
      */
     save(): Promise<void>;

package/lib/types/client/settings-form.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"settings-form.d.ts","sourceRoot":"","sources":["../../../src/client/settings-form.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"settings-form.d.ts","sourceRoot":"","sources":["../../../src/client/settings-form.ts"],"names":[],"mappings":"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"}