@linxin666/dsh-pet 0.3.24 → 0.4.2

package/lib/types/client/settings-form.js

@@ -91,30 +91,30 @@ export class CardForm {
     specs;
     staged = new Map();
     listeners = new Set();
-    /** The scope subscription installed in the constructor; released by dispose(). */
-    disposeScope;
+    /** The form subscription installed in the constructor; released by dispose(). */
+    disposeForm;
     disposed = false;
     saving = false;
     failed = false;
     failedReason;
-    /** @param scope - the bound settings scope for this card's namespace. */
+    /** @param scope - the bound configuration form for this card's namespace. */
     constructor(scope, specs) {
         this.scope = scope;
         this.specs = new Map(specs.map(spec => [spec.field, spec]));
-        this.disposeScope = scope.subscribe(() => { this.publish(); });
+        this.disposeForm = scope.subscribe(() => { this.publish(); });
     }
     /**
-     * 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() {
         if (this.disposed)
             return;
         this.disposed = true;
-        this.disposeScope();
+        this.disposeForm();
         this.listeners.clear();
     }
-    /** 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(project) {
         const store = createSnapshotStore(project());
         this.listeners.add(() => { store.set(project()); });
@@ -168,19 +168,19 @@ export class CardForm {
         };
     }
     /**
-     * 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.
      */
     async save() {
@@ -198,32 +198,35 @@ export class CardForm {
         this.failed = false;
         this.failedReason = undefined;
         this.publish();
-        // One atomic namespace mutation: the 0.1.2 scope contract takes ordered
-        // path operations, so the whole staged batch is validated, persisted, and
+        // One atomic namespace mutation: the form contract takes ordered path
+        // operations, so the whole staged batch is validated, persisted, and
         // recovered together — either every write lands or none does.
         const ops = valid.map(item => item.op.op === 'set'
             ? { op: 'set', path: [item.field], value: item.op.value }
             : { op: 'unset', path: [item.field] });
         let failedReason;
+        let accepted = false;
         try {
-            await this.scope.mutate(ops);
+            accepted = await this.scope.mutate(ops);
         }
         catch (error) {
             failedReason = error instanceof Error ? error.message : String(error);
         }
-        // The 0.1.2 scope resolves even a refused mutation (it recovers with a
-        // fresh view instead of throwing), so resolution alone proves nothing:
-        // judge every planned write against the settled snapshot. The mutation is
-        // atomic, so one missed write fails the whole save and keeps the drafts.
-        const landed = failedReason === undefined && valid.every(item => item.judge());
+        // `false` is the contract's refusal/skip answer, and the form still
+        // resolves after a refusal (it recovers with a fresh view), so the answer
+        // alone is not enough: judge every planned write against the settled
+        // snapshot as well. The mutation is atomic, so one missed write fails the
+        // whole save and keeps the drafts.
+        const landed = accepted && failedReason === undefined && valid.every(item => item.judge());
         for (const [field, before] of pending) {
             if (landed && this.staged.get(field) === before)
                 this.staged.delete(field);
         }
         this.saving = false;
         this.failed = !landed;
-        // A read-back failure carries no server reason: the card surfaces its
-        // generic failure copy; a rejecting scope (the bridge) adds its message.
+        // A refused or unlanded batch carries no server reason: the card surfaces
+        // its generic failure copy; a rejecting transport (the bridge) adds its
+        // message.
         this.failedReason = failedReason;
         this.publish();
     }
@@ -261,7 +264,7 @@ export class CardForm {
      */
     landedSet(field, value) {
         // A redacted secret never appears in any wire view layer: the Host strips
-        // role('secret') fields and reports them through a sidecar the scope
+        // role('secret') fields and reports them through a sidecar the form
         // snapshot does not expose, so there is nothing to compare the draft
         // against. Settling is the only signal the form has; the rest of the
         // batch, when one exists, still carries the atomic verdict by read-back.

package/lib/types/event-projection.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"event-projection.d.ts","sourceRoot":"","sources":["../../src/event-projection.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;GAoBG;AAEH,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAA;AAClE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAA;AAC5D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,YAAY,CAAA;AAC/C,OAAO,EACL,WAAW,EAGX,aAAa,EAGb,KAAK,kBAAkB,EACxB,MAAM,cAAc,CAAA;AAErB,2DAA2D;AAC3D,MAAM,WAAW,uBAAuB;IACtC,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,MAAM,CAAC,EAAE,MAAM,CAAA;CAChB;AAED,qEAAqE;AACrE,MAAM,WAAW,iBAAiB;IAChC,WAAW,EAAE,GAAG,CAAC,MAAM,CAAC,CAAA;IACxB,+EAA+E;IAC/E,SAAS,EAAE,GAAG,CAAC,MAAM,CAAC,CAAA;IACtB,kBAAkB,EAAE,OAAO,CAAA;IAC3B,cAAc,EAAE,OAAO,CAAA;IACvB,qEAAqE;IACrE,KAAK,EAAE,WAAW,CAAA;IAClB,2EAA2E;IAC3E,QAAQ,EAAE,aAAa,CAAA;CACxB;AAED,kFAAkF;AAClF,MAAM,WAAW,qBAAqB;IACpC,KAAK,EAAE,aAAa,CAAA;IACpB,aAAa,CAAC,EAAE,MAAM,CAAA;IACtB,2DAA2D;IAC3D,OAAO,CAAC,EAAE,MAAM,CAAA;CACjB;AAED;;;;;GAKG;AACH,wBAAgB,sBAAsB,CAAC,KAAK,CAAC,EAAE,kBAAkB,GAAG,iBAAiB,CASpF;AAQD,wEAAwE;AACxE,wBAAgB,eAAe,CAAC,KAAK,EAAE,MAAM,GAAG,KAAK,IAAI,aAAa,CAAC,OAAO,CAAC,CAE9E;AAED;;;;GAIG;AACH,wBAAgB,oBAAoB,CAClC,KAAK,EAAE,YAAY,EACnB,OAAO,EAAE,iBAAiB,EAC1B,KAAK,GAAE,MAAmB,GACzB,qBAAqB,GAAG,SAAS,CAiGnC;AAED;;;;;GAKG;AACH,wBAAgB,2BAA2B,CACzC,KAAK,EAAE,oBAAoB,EAC3B,OAAO,EAAE,iBAAiB,EAC1B,KAAK,GAAE,MAAmB,GACzB,qBAAqB,GAAG,SAAS,CAkBnC"}
+{"version":3,"file":"event-projection.d.ts","sourceRoot":"","sources":["../../src/event-projection.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;GAoBG;AAEH,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAA;AAClE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAA;AAC5D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,YAAY,CAAA;AAC/C,OAAO,EACL,WAAW,EAGX,aAAa,EAGb,KAAK,kBAAkB,EACxB,MAAM,cAAc,CAAA;AAErB,2DAA2D;AAC3D,MAAM,WAAW,uBAAuB;IACtC,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,MAAM,CAAC,EAAE,MAAM,CAAA;CAChB;AAED,qEAAqE;AACrE,MAAM,WAAW,iBAAiB;IAChC,WAAW,EAAE,GAAG,CAAC,MAAM,CAAC,CAAA;IACxB,+EAA+E;IAC/E,SAAS,EAAE,GAAG,CAAC,MAAM,CAAC,CAAA;IACtB,kBAAkB,EAAE,OAAO,CAAA;IAC3B,cAAc,EAAE,OAAO,CAAA;IACvB,qEAAqE;IACrE,KAAK,EAAE,WAAW,CAAA;IAClB,2EAA2E;IAC3E,QAAQ,EAAE,aAAa,CAAA;CACxB;AAED,kFAAkF;AAClF,MAAM,WAAW,qBAAqB;IACpC,KAAK,EAAE,aAAa,CAAA;IACpB,aAAa,CAAC,EAAE,MAAM,CAAA;IACtB,2DAA2D;IAC3D,OAAO,CAAC,EAAE,MAAM,CAAA;CACjB;AAED;;;;;GAKG;AACH,wBAAgB,sBAAsB,CAAC,KAAK,CAAC,EAAE,kBAAkB,GAAG,iBAAiB,CASpF;AAQD,wEAAwE;AACxE,wBAAgB,eAAe,CAAC,KAAK,EAAE,MAAM,GAAG,KAAK,IAAI,aAAa,CAAC,OAAO,CAAC,CAE9E;AAED;;;;GAIG;AACH,wBAAgB,oBAAoB,CAClC,KAAK,EAAE,YAAY,EACnB,OAAO,EAAE,iBAAiB,EAC1B,KAAK,GAAE,MAAmB,GACzB,qBAAqB,GAAG,SAAS,CAmGnC;AAED;;;;;GAKG;AACH,wBAAgB,2BAA2B,CACzC,KAAK,EAAE,oBAAoB,EAC3B,OAAO,EAAE,iBAAiB,EAC1B,KAAK,GAAE,MAAmB,GACzB,qBAAqB,GAAG,SAAS,CAkBnC"}

package/lib/types/event-projection.js

@@ -80,9 +80,11 @@ export function projectOfficialEvent(event, runtime, nowMs = Date.now()) {
             };
         }
         case 'tool/result': {
-            const block = event.data.message.content[0];
-            const callId = String(event.data.message.source.callId);
-            const failed = event.data.error !== undefined || block.isError === true;
+            // Session format V4 moved the call identity and the outcome onto the
+            // tool-role message root; the content blocks no longer carry either.
+            const { message } = event.data;
+            const callId = String(message.toolCallId);
+            const failed = event.data.error !== undefined || message.isError === true;
             const wasTest = runtime.testCalls.delete(callId);
             runtime.activeTools.delete(callId);
             runtime.stepHadFailure ||= failed;

package/lib/types/gameplay.d.ts

@@ -11,6 +11,10 @@
  * discipline): the host runs no timers for gameplay.
  * @module @linxin666/dsh-pet/gameplay
  */
+/** One roam direction the pet may walk in. */
+export type PetRoamDirection = 'up' | 'down' | 'left' | 'right';
+/** Every roam direction, in roll order (equal chance each unless restricted). */
+export declare const PET_ROAM_DIRECTIONS: readonly PetRoamDirection[];
 /** One gameplay effect: add amount to a declared stat or a currency. */
 export interface PetGameplayEffect {
     stat?: string;
@@ -62,6 +66,26 @@ export interface PetGameplayShopItem {
         }[];
     };
 }
+/**
+ * One extra named gameplay mode beyond work/sleep (a bath, a play session…).
+ * The host holds `state` while the mode is active and may restore a stat on
+ * a fixed cadence — the same lazy-settle rule the sleep mode uses. A mode is
+ * pure data: adding one to a manifest needs no host change.
+ */
+export interface PetGameplayModeDef {
+    /** frames2d track held for as long as the mode is active. */
+    state: string;
+    /** Action-button label (plain text); falls back to the i18n key pet.gameplay.<name>. */
+    label?: string;
+    /** Label while the mode is active (plain text); falls back to `label`. */
+    activeLabel?: string;
+    /** Periodic stat restore while the mode is active (omitted = no restore). */
+    restore?: {
+        stat: string;
+        amount: number;
+        intervalMs: number;
+    };
+}
 /** The validated manifest 'gameplay' block. */
 export interface PetGameplayManifest {
     idleDirector?: {
@@ -118,6 +142,38 @@ export interface PetGameplayManifest {
             intervalMs: number;
         };
     };
+    /**
+     * Extra named modes beyond work/sleep, keyed by a kebab mode id. Each one
+     * gets its own menu button, holds its track while active and may restore a
+     * stat on a cadence. 'work' and 'sleep' are reserved keys.
+     */
+    modes?: Record<string, PetGameplayModeDef>;
+    /**
+     * Random roaming: on a slow interval the pet rolls whether to wander and
+     * walks to a new spot on screen with `state` held for the travel time. The
+     * chrome owns the motion (clamped to the viewport) and persists the resting
+     * spot the way a drag does; the roll only runs while the pet is idle and no
+     * mode, drag or touch animation owns it.
+     */
+    roam?: {
+        /** frames2d track held while walking. */
+        state: string;
+        /** Ms between roam decisions. */
+        intervalMs: number;
+        /** Chance one decision actually walks (0, 1]. */
+        probability: number;
+        /** Travel per roam in px (distanceMin <= distanceMax). */
+        distanceMin: number;
+        distanceMax: number;
+        /** Walking speed in px per second. */
+        speed: number;
+        /**
+         * Directions the pet may walk in, rolled uniformly (equal chance each).
+         * Omitted = all four. A side-view crawl reads best walking left/right, so
+         * a pet may restrict the list to those two.
+         */
+        directions?: PetRoamDirection[];
+    };
     passiveIncome?: {
         currency: string;
         amount: number;
@@ -147,22 +203,40 @@ export declare function parseGameplayManifest(raw: unknown, hooks: GameplayParse
 export interface PetGameplayState {
     stats: Record<string, number>;
     currencies: Record<string, number>;
-    mode: 'work' | 'sleep' | null;
+    /** Active gameplay mode id ('work' | 'sleep' | a declared extra mode) or null. */
+    mode: string | null;
     /** Epoch ms of the last lazy settle. */
     settledAt: number;
     /** Accumulated remainder ms towards the next passive income tick. */
     incomeCarryMs?: number;
-    /** Accumulated remainder ms towards the next sleep restore tick. */
+    /** Accumulated remainder ms towards the next mode restore tick. */
     restoreCarryMs?: number;
 }
+/** Every mode the menu offers, in manifest order (sleep first, then extras). */
+export declare function declaredModes(manifest: PetGameplayManifest): string[];
+/**
+ * The frames2d track one active mode holds. 'work' is owned by the work loop
+ * (its state, result and fallback are its own), so it resolves to undefined.
+ */
+export declare function modeStateOf(manifest: PetGameplayManifest, mode: string): string | undefined;
+/** The restore rule of one active mode, when it declares one. */
+export declare function modeRestoreOf(manifest: PetGameplayManifest, mode: string | null): {
+    stat: string;
+    amount: number;
+    intervalMs: number;
+} | undefined;
+/** Whether the manifest still declares this gameplay mode id. */
+export declare function isDeclaredMode(manifest: PetGameplayManifest, mode: string): boolean;
 /** Fresh state for one pet: stats at their initial (default max), no currency. */
 export declare function initialGameplayState(manifest: PetGameplayManifest, now: number): PetGameplayState;
 /** Clamp one stat value into [0, max]; currencies into [0, CURRENCY_MAX]. */
 export declare function clampGameplay(state: PetGameplayState, manifest: PetGameplayManifest): void;
 /**
- * Lazy settle: apply stat decay, passive income and sleep restore for the
- * elapsed wall time since the last settle. Mirrors the treats.ts discipline
- * (no host timers; read paths settle). Returns whether anything changed.
+ * Lazy settle: apply stat decay, passive income and the active mode's restore
+ * rule (sleep restores energy, a declared extra mode restores whatever it
+ * declares) for the elapsed wall time since the last settle. Mirrors the
+ * treats.ts discipline (no host timers; read paths settle). Returns whether
+ * anything changed.
  */
 export declare function settleGameplay(state: PetGameplayState, manifest: PetGameplayManifest, now: number, options: {
     sessionActive: boolean;

package/lib/types/gameplay.d.ts.map

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

package/lib/types/gameplay.js

@@ -11,6 +11,8 @@
  * discipline): the host runs no timers for gameplay.
  * @module @linxin666/dsh-pet/gameplay
  */
+/** Every roam direction, in roll order (equal chance each unless restricted). */
+export const PET_ROAM_DIRECTIONS = ['up', 'down', 'left', 'right'];
 /* ------------------------------------------------------------------ *
  * Manifest parsing (fail-closed structure)
  * ------------------------------------------------------------------ */
@@ -23,9 +25,11 @@ const MAX_SHOP_ITEMS = 32;
 const MAX_LOTTERY_TIERS = 16;
 const MAX_PHRASES = 64;
 const PHRASE_MAX_LENGTH = 120;
+const MAX_MODES = 8;
+const MODE_LABEL_MAX_LENGTH = 40;
 const STAT_VALUE_MAX = 1_000_000;
 const CURRENCY_MAX = 9_999_999;
-const KNOWN_GAMEPLAY = new Set(['idleDirector', 'stats', 'hitBox', 'touch', 'work', 'sleep', 'passiveIncome', 'shop', 'dragState', 'dragEndState']);
+const KNOWN_GAMEPLAY = new Set(['idleDirector', 'stats', 'hitBox', 'touch', 'work', 'sleep', 'modes', 'roam', 'passiveIncome', 'shop', 'dragState', 'dragEndState']);
 const KNOWN_STAT = new Set(['max', 'initial', 'decayPerMinute', 'workingDecayPerMinute', 'idleDecayPerMinute']);
 const KNOWN_ZONE = new Set(['name', 'y0', 'y1', 'branches']);
 const KNOWN_TOUCH = new Set(['zones', 'clickBoost']);
@@ -33,6 +37,9 @@ const KNOWN_BRANCH = new Set(['probability', 'effects', 'state', 'stateMs', 'phr
 const KNOWN_EFFECT = new Set(['stat', 'currency', 'amount']);
 const KNOWN_WORK = new Set(['state', 'successState', 'failState', 'tickMs', 'resultMs', 'successProbability', 'success', 'fail']);
 const KNOWN_SLEEP = new Set(['state', 'wakeState', 'restore']);
+const KNOWN_MODE = new Set(['state', 'label', 'activeLabel', 'restore']);
+const KNOWN_ROAM = new Set(['state', 'intervalMs', 'probability', 'distanceMin', 'distanceMax', 'speed', 'directions']);
+const KNOWN_RESTORE = new Set(['stat', 'amount', 'intervalMs']);
 const KNOWN_SHOP_ITEM = new Set(['id', 'label', 'image', 'price', 'currency', 'effects', 'lottery']);
 const KNOWN_LOTTERY = new Set(['effects', 'currency', 'tiers']);
 const KNOWN_IDLE_DIRECTOR = new Set(['intervalMs', 'maxMiss', 'idleWeight', 'acts']);
@@ -113,6 +120,26 @@ function parseStateRef(raw, field, hooks) {
     }
     return raw;
 }
+/** Parse one mode restore rule "{ stat (declared), amount, intervalMs }". */
+function parseModeRestore(raw, field, stats, fail) {
+    if (!isRecord(raw)) {
+        fail(field + ' must be an object { stat, amount, intervalMs }');
+        return undefined;
+    }
+    const extra = unknownKeys(raw, KNOWN_RESTORE);
+    if (extra.length > 0)
+        fail(field + ': unknown field(s) ' + extra.map(k => JSON.stringify(k)).join(', '));
+    const stat = typeof raw.stat === 'string' && stats[raw.stat] !== undefined ? raw.stat : undefined;
+    if (stat === undefined)
+        fail(field + '.stat must reference a declared stat');
+    if (!intIn(raw.amount, 1, 1000))
+        fail(field + '.amount must be an integer in [1, 1000]');
+    if (!intIn(raw.intervalMs, 1000, 600_000))
+        fail(field + '.intervalMs must be an integer in [1000, 600000]');
+    if (stat === undefined || !intIn(raw.amount, 1, 1000) || !intIn(raw.intervalMs, 1000, 600_000))
+        return undefined;
+    return { stat, amount: raw.amount, intervalMs: raw.intervalMs };
+}
 /**
  * Validate the manifest 'gameplay' block (fail-closed). Only frames2d pets
  * may declare gameplay today: every state reference checks against the
@@ -361,18 +388,137 @@ export function parseGameplayManifest(raw, hooks) {
                 fail('gameplay.sleep: unknown field(s) ' + sExtra.map(k => JSON.stringify(k)).join(', '));
             const state = parseStateRef(s.state, 'gameplay.sleep.state', hooks);
             const wakeState = parseStateRef(s.wakeState, 'gameplay.sleep.wakeState', hooks);
-            const restoreStat = typeof s.restore.stat === 'string' && stats[s.restore.stat] !== undefined ? s.restore.stat : undefined;
-            if (restoreStat === undefined)
-                fail('gameplay.sleep.restore.stat must reference a declared stat');
-            if (!intIn(s.restore.amount, 1, 1000))
-                fail('gameplay.sleep.restore.amount must be an integer in [1, 1000]');
-            if (!intIn(s.restore.intervalMs, 1000, 600_000))
-                fail('gameplay.sleep.restore.intervalMs must be an integer in [1000, 600000]');
-            if (state !== undefined && restoreStat !== undefined && intIn(s.restore.amount, 1, 1000) && intIn(s.restore.intervalMs, 1000, 600_000)) {
+            const restore = parseModeRestore(s.restore, 'gameplay.sleep.restore', stats, fail);
+            if (state !== undefined && restore !== undefined) {
                 block.sleep = {
                     state,
                     ...(wakeState === undefined ? {} : { wakeState }),
-                    restore: { stat: restoreStat, amount: s.restore.amount, intervalMs: s.restore.intervalMs },
+                    restore,
+                };
+            }
+        }
+    }
+    // --- extra modes (bath and friends) ---
+    if (raw.modes !== undefined) {
+        if (!isRecord(raw.modes))
+            fail('gameplay.modes must be an object keyed by mode id');
+        else {
+            const entries = Object.entries(raw.modes);
+            if (entries.length > MAX_MODES)
+                fail('gameplay.modes declares too many modes (max ' + MAX_MODES + ')');
+            const modes = {};
+            for (const [name, value] of entries) {
+                if (!validName(name, 24) || name === 'work' || name === 'sleep') {
+                    fail('gameplay.modes: invalid mode id ' + JSON.stringify(name) + ' (kebab, and not the reserved work/sleep)');
+                    continue;
+                }
+                if (!isRecord(value)) {
+                    fail('gameplay.modes.' + name + ' must be an object');
+                    continue;
+                }
+                const mExtra = unknownKeys(value, KNOWN_MODE);
+                if (mExtra.length > 0)
+                    fail('gameplay.modes.' + name + ': unknown field(s) ' + mExtra.map(k => JSON.stringify(k)).join(', '));
+                const state = parseStateRef(value.state, 'gameplay.modes.' + name + '.state', hooks);
+                let usable = state !== undefined;
+                let label;
+                if (value.label !== undefined) {
+                    if (typeof value.label !== 'string' || value.label.trim() === '' || value.label.length > MODE_LABEL_MAX_LENGTH) {
+                        fail('gameplay.modes.' + name + '.label must be a non-empty string of at most ' + MODE_LABEL_MAX_LENGTH + ' chars');
+                        usable = false;
+                    }
+                    else
+                        label = value.label.trim();
+                }
+                let activeLabel;
+                if (value.activeLabel !== undefined) {
+                    if (typeof value.activeLabel !== 'string' || value.activeLabel.trim() === '' || value.activeLabel.length > MODE_LABEL_MAX_LENGTH) {
+                        fail('gameplay.modes.' + name + '.activeLabel must be a non-empty string of at most ' + MODE_LABEL_MAX_LENGTH + ' chars');
+                        usable = false;
+                    }
+                    else
+                        activeLabel = value.activeLabel.trim();
+                }
+                const restore = value.restore === undefined ? undefined : parseModeRestore(value.restore, 'gameplay.modes.' + name + '.restore', stats, fail);
+                if (value.restore !== undefined && restore === undefined)
+                    usable = false;
+                if (usable && state !== undefined) {
+                    modes[name] = {
+                        state,
+                        ...(label === undefined ? {} : { label }),
+                        ...(activeLabel === undefined ? {} : { activeLabel }),
+                        ...(restore === undefined ? {} : { restore }),
+                    };
+                }
+            }
+            if (Object.keys(modes).length > 0)
+                block.modes = modes;
+        }
+    }
+    // --- random roaming ---
+    if (raw.roam !== undefined) {
+        const rm = raw.roam;
+        if (!isRecord(rm))
+            fail('gameplay.roam must be an object');
+        else {
+            const rExtra = unknownKeys(rm, KNOWN_ROAM);
+            if (rExtra.length > 0)
+                fail('gameplay.roam: unknown field(s) ' + rExtra.map(k => JSON.stringify(k)).join(', '));
+            const state = parseStateRef(rm.state, 'gameplay.roam.state', hooks);
+            if (!intIn(rm.intervalMs, 1000, 3_600_000))
+                fail('gameplay.roam.intervalMs must be an integer in [1000, 3600000]');
+            if (!numIn(rm.probability, 0, 1) || rm.probability === 0)
+                fail('gameplay.roam.probability must be a number in (0, 1]');
+            if (!intIn(rm.distanceMin, 1, 2000))
+                fail('gameplay.roam.distanceMin must be an integer in [1, 2000]');
+            if (!intIn(rm.distanceMax, 1, 2000))
+                fail('gameplay.roam.distanceMax must be an integer in [1, 2000]');
+            if (intIn(rm.distanceMin, 1, 2000) && intIn(rm.distanceMax, 1, 2000) && rm.distanceMin > rm.distanceMax) {
+                fail('gameplay.roam.distanceMin must not exceed distanceMax');
+            }
+            if (!intIn(rm.speed, 1, 2000))
+                fail('gameplay.roam.speed must be an integer in [1, 2000] (px per second)');
+            let directions;
+            if (rm.directions !== undefined) {
+                if (!Array.isArray(rm.directions) || rm.directions.length === 0) {
+                    fail('gameplay.roam.directions must be a non-empty array of up, down, left, right');
+                }
+                else {
+                    const picked = [];
+                    for (const entry of rm.directions) {
+                        if (typeof entry !== 'string' || !PET_ROAM_DIRECTIONS.includes(entry)) {
+                            fail('gameplay.roam.directions entries must be up, down, left or right');
+                            picked.length = 0;
+                            break;
+                        }
+                        if (picked.includes(entry)) {
+                            fail('gameplay.roam.directions must not repeat ' + entry);
+                            picked.length = 0;
+                            break;
+                        }
+                        picked.push(entry);
+                    }
+                    if (picked.length > 0)
+                        directions = picked;
+                }
+            }
+            // The guards are repeated inline: tsc only narrows the unknown fields
+            // through a call in the condition itself.
+            if (state !== undefined
+                && intIn(rm.intervalMs, 1000, 3_600_000)
+                && numIn(rm.probability, 0, 1) && rm.probability !== 0
+                && intIn(rm.distanceMin, 1, 2000)
+                && intIn(rm.distanceMax, 1, 2000)
+                && rm.distanceMin <= rm.distanceMax
+                && intIn(rm.speed, 1, 2000)) {
+                block.roam = {
+                    state,
+                    intervalMs: rm.intervalMs,
+                    probability: rm.probability,
+                    distanceMin: rm.distanceMin,
+                    distanceMax: rm.distanceMax,
+                    speed: rm.speed,
+                    ...(directions === undefined ? {} : { directions }),
                 };
             }
         }
@@ -505,6 +651,53 @@ export function parseGameplayManifest(raw, hooks) {
     }
     return failed ? undefined : block;
 }
+/**
+ * One declared extra mode, by OWN key only. A plain `modes[id]` lookup also
+ * answers for Object.prototype members ('constructor', 'toString', …), which
+ * would let a crafted mode id pass the "is it declared?" test.
+ */
+function declaredModeOf(manifest, mode) {
+    const modes = manifest.modes;
+    if (modes === undefined || !Object.prototype.hasOwnProperty.call(modes, mode))
+        return undefined;
+    return modes[mode];
+}
+/** Every mode the menu offers, in manifest order (sleep first, then extras). */
+export function declaredModes(manifest) {
+    return [
+        ...(manifest.sleep === undefined ? [] : ['sleep']),
+        ...Object.keys(manifest.modes ?? {}),
+    ];
+}
+/**
+ * The frames2d track one active mode holds. 'work' is owned by the work loop
+ * (its state, result and fallback are its own), so it resolves to undefined.
+ */
+export function modeStateOf(manifest, mode) {
+    if (mode === 'sleep')
+        return manifest.sleep?.state;
+    if (mode === 'work')
+        return manifest.work?.state;
+    return declaredModeOf(manifest, mode)?.state;
+}
+/** The restore rule of one active mode, when it declares one. */
+export function modeRestoreOf(manifest, mode) {
+    if (mode === null)
+        return undefined;
+    if (mode === 'sleep')
+        return manifest.sleep?.restore;
+    if (mode === 'work')
+        return undefined;
+    return declaredModeOf(manifest, mode)?.restore;
+}
+/** Whether the manifest still declares this gameplay mode id. */
+export function isDeclaredMode(manifest, mode) {
+    if (mode === 'work')
+        return manifest.work !== undefined;
+    if (mode === 'sleep')
+        return manifest.sleep !== undefined;
+    return declaredModeOf(manifest, mode) !== undefined;
+}
 /** Fresh state for one pet: stats at their initial (default max), no currency. */
 export function initialGameplayState(manifest, now) {
     const stats = {};
@@ -527,9 +720,11 @@ export function clampGameplay(state, manifest) {
     }
 }
 /**
- * Lazy settle: apply stat decay, passive income and sleep restore for the
- * elapsed wall time since the last settle. Mirrors the treats.ts discipline
- * (no host timers; read paths settle). Returns whether anything changed.
+ * Lazy settle: apply stat decay, passive income and the active mode's restore
+ * rule (sleep restores energy, a declared extra mode restores whatever it
+ * declares) for the elapsed wall time since the last settle. Mirrors the
+ * treats.ts discipline (no host timers; read paths settle). Returns whether
+ * anything changed.
  */
 export function settleGameplay(state, manifest, now, options) {
     const elapsedMs = now - state.settledAt;
@@ -565,14 +760,14 @@ export function settleGameplay(state, manifest, now, options) {
             changed = true;
         }
     }
-    if (state.mode === 'sleep' && manifest.sleep !== undefined) {
+    const restore = modeRestoreOf(manifest, state.mode);
+    if (restore !== undefined) {
         const restoreElapsed = elapsedMs + (state.restoreCarryMs ?? 0);
-        const interval = manifest.sleep.restore.intervalMs;
+        const interval = restore.intervalMs;
         const ticks = Math.floor(restoreElapsed / interval);
         state.restoreCarryMs = restoreElapsed % interval;
         if (ticks > 0) {
-            const stat = manifest.sleep.restore.stat;
-            state.stats[stat] = (state.stats[stat] ?? 0) + ticks * manifest.sleep.restore.amount;
+            state.stats[restore.stat] = (state.stats[restore.stat] ?? 0) + ticks * restore.amount;
             changed = true;
         }
     }

package/lib/types/http.d.ts

@@ -1,7 +1,9 @@
 /**
  * Shared JSON body/response helpers for the host route families: one strict
  * bounded body reader, one lenient bounded body reader, one JSON object
- * narrow, and one JSON writer. Previously these were copy-pasted across the
+ * narrow, one JSON writer, and the outbound request-init helper that keeps a
+ * host fetch body decodable (withIdentityEncoding). Previously the readers
+ * were copy-pasted across the
  * package route files (routes.ts, update-routes.ts, mobile-api.ts, and each
  * family's route module) with drifting contracts: body caps ranging 4 KiB to
  * 1 MiB and four distinct overflow behaviors (reject, undefined, null, throw).
@@ -34,6 +36,21 @@ export declare function readJsonBody(req: IncomingMessage, opts?: {
 }): Promise<unknown | null>;
 /** Narrow a value to a JSON object, or undefined when it is not one. */
 export declare function asJsonObject(value: unknown): Record<string, unknown> | undefined;
+/**
+ * Request init that asks a remote origin for an uncompressed body.
+ *
+ * The DSH host boots `@deepseek-ai/dsh-http-proxy`, whose top-level import of
+ * the npm `undici` copy replaces the legacy `undici.globalDispatcher.1` slot
+ * Node's built-in `fetch()` reads. That cross-major wrapper drops the
+ * `content-encoding` header and automatic decompression, so a plain fetch
+ * resolves to raw gzip/brotli/zstd bytes — compressed noise no JSON or text
+ * consumer can read. Every host fetch that parses a remote body must request
+ * identity encoding. Caller headers survive; `accept-encoding` is forced to
+ * `identity` because a caller value has no decoder behind it in this host.
+ * @param init - the caller's request init (signal, headers, method, ...).
+ * @returns a copy with `accept-encoding: identity` merged in.
+ */
+export declare function withIdentityEncoding(init?: RequestInit): RequestInit;
 /**
  * Write one JSON response. Default headers are the family defaults
  * (content-type and referrer-policy); caller headers are appended or

package/lib/types/http.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"http.d.ts","sourceRoot":"","sources":["../../src/http.ts"],"names":[],"mappings":"AACA;;;;;;;;;;;;;GAaG;AAEH,OAAO,KAAK,EAAE,eAAe,EAAE,mBAAmB,EAAE,cAAc,EAAE,MAAM,WAAW,CAAA;AAWrF;;;;;GAKG;AACH,wBAAsB,eAAe,CAAC,GAAG,EAAE,eAAe,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAU9F;AAED;;;;;;;GAOG;AACH,wBAAsB,YAAY,CAChC,GAAG,EAAE,eAAe,EACpB,IAAI,GAAE;IAAE,QAAQ,CAAC,EAAE,MAAM,CAAC;IAAC,UAAU,CAAC,EAAE,OAAO,CAAA;CAAO,GACrD,OAAO,CAAC,OAAO,GAAG,IAAI,CAAC,CAsBzB;AAOD,wEAAwE;AACxE,wBAAgB,YAAY,CAAC,KAAK,EAAE,OAAO,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,SAAS,CAEhF;AAED;;;;GAIG;AACH,wBAAgB,SAAS,CACvB,GAAG,EAAE,cAAc,EACnB,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,OAAO,EACb,OAAO,GAAE,mBAAwB,GAChC,IAAI,CAIN"}
+{"version":3,"file":"http.d.ts","sourceRoot":"","sources":["../../src/http.ts"],"names":[],"mappings":"AACA;;;;;;;;;;;;;;;GAeG;AAEH,OAAO,KAAK,EAAE,eAAe,EAAE,mBAAmB,EAAE,cAAc,EAAE,MAAM,WAAW,CAAA;AAWrF;;;;;GAKG;AACH,wBAAsB,eAAe,CAAC,GAAG,EAAE,eAAe,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAU9F;AAED;;;;;;;GAOG;AACH,wBAAsB,YAAY,CAChC,GAAG,EAAE,eAAe,EACpB,IAAI,GAAE;IAAE,QAAQ,CAAC,EAAE,MAAM,CAAC;IAAC,UAAU,CAAC,EAAE,OAAO,CAAA;CAAO,GACrD,OAAO,CAAC,OAAO,GAAG,IAAI,CAAC,CAsBzB;AAOD,wEAAwE;AACxE,wBAAgB,YAAY,CAAC,KAAK,EAAE,OAAO,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,SAAS,CAEhF;AAED;;;;;;;;;;;;;GAaG;AACH,wBAAgB,oBAAoB,CAAC,IAAI,GAAE,WAAgB,GAAG,WAAW,CAIxE;AAED;;;;GAIG;AACH,wBAAgB,SAAS,CACvB,GAAG,EAAE,cAAc,EACnB,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,OAAO,EACb,OAAO,GAAE,mBAAwB,GAChC,IAAI,CAIN"}