@maka/maka-cli 5.117.0 → 5.119.0

package/bundle/typescript/src/commands/game/sideQuest/utilities/marks.d.ts

@@ -14,7 +14,47 @@ export declare const MAX_MARKS = 3;
 /** Everything this placer has marked, gone at once -- their reboot,
  *  jack-out, or GOD convergence (all reboot the persona). */
 export declare function clearMarksPlacedBy(scene: Scene, placerName: string): void;
-/** A target rebooting shakes every mark off itself. */
-export declare function clearMarksOn(actor: Player): number;
+/**
+ * A target rebooting shakes every mark off itself -- "all of your marks,
+ * as well as the ones others may have put on your icon, are erased"
+ * (p.242, RAG-checked 2026-09-02). With a scene that is every persona on
+ * the PAN ledger AND every host's entry for this persona (web report:
+ * after a jack-out the ledger still read "The Circuit Bazaar host x2").
+ * Returns how many placers were shaken off.
+ */
+export declare function clearMarksOn(actor: Player, scene?: Scene): number;
+/**
+ * THE REBOOT, as far as marks go -- one door for every route that reboots
+ * the persona: "reboot", jack-out (p.240 reboots the device), a forced
+ * dump, GOD's convergence. Both ledgers go (p.242) and the sheet hears it.
+ */
+export declare function rebootWipe(scene: Scene, actor: Player): {
+    placed: void;
+    on: number;
+};
 /** The placer's standing marks, for the bare "mark" listing. */
 export declare function describeMarks(scene: Scene, placerName: string): string[];
+/**
+ * The marks this persona HOLDS, for the live sheet (contract 2026-09-02,
+ * web accepts first): every host and PAN it has marked, named the way
+ * describeMarks prints them, count 1..3. Read at beat time, so the reboot
+ * clear and convergence show on the next beat with no clear-site wiring.
+ * The site caps the list at 24 entries.
+ */
+export declare function marksPlaced(scene: Scene, placerName: string): {
+    target: string;
+    count: number;
+}[];
+/**
+ * WHO HOLDS MARKS ON THIS PERSONA, one row each, for the live sheet
+ * (contract 2026-09-02). Every host in the scene that MADE the persona --
+ * not only the one it stands inside: a host's mark on you outlives your
+ * exit and dies with your reboot (p.236 -- marks last the session; the
+ * ledger is Host.marksOn, cleared by clearMarksOn). A session log showed
+ * three marks across two hosts while the inside-host number could show
+ * one host's worth. Plus every persona on the PAN ledger.
+ */
+export declare function marksOnYou(scene: Scene, player: Player): {
+    placer: string;
+    count: number;
+}[];

package/bundle/typescript/src/commands/game/sideQuest/utilities/marks.js

@@ -27,12 +27,40 @@ export function clearMarksPlacedBy(scene, placerName) {
         Logger.getInstance().write(`Marks: ${placerName}'s ${cleared} marked icon(s) cleared (persona reboot).`);
     }
 }
-/** A target rebooting shakes every mark off itself. */
-export function clearMarksOn(actor) {
-    const had = actor.panMarksBy.size;
-    actor.panMarksBy.clear();
+/**
+ * A target rebooting shakes every mark off itself -- "all of your marks,
+ * as well as the ones others may have put on your icon, are erased"
+ * (p.242, RAG-checked 2026-09-02). With a scene that is every persona on
+ * the PAN ledger AND every host's entry for this persona (web report:
+ * after a jack-out the ledger still read "The Circuit Bazaar host x2").
+ * Returns how many placers were shaken off.
+ */
+export function clearMarksOn(actor, scene) {
+    // Optional chaining: test stubs stand in for a Player here (link-lock.test.ts).
+    let had = [...(actor.panMarksBy?.values() ?? [])].filter(n => n > 0).length;
+    actor.panMarksBy?.clear();
+    if (scene) {
+        for (const room of Object.values(scene.getRooms())) {
+            if ((room.host?.marksOn.get(actor.name) ?? 0) > 0)
+                had++;
+            room.host?.marksOn.delete(actor.name);
+        }
+    }
     return had;
 }
+/**
+ * THE REBOOT, as far as marks go -- one door for every route that reboots
+ * the persona: "reboot", jack-out (p.240 reboots the device), a forced
+ * dump, GOD's convergence. Both ledgers go (p.242) and the sheet hears it.
+ */
+export function rebootWipe(scene, actor) {
+    const placed = clearMarksPlacedBy(scene, actor.name);
+    const on = clearMarksOn(actor, scene);
+    if (on > 0)
+        Logger.getInstance().write(`Marks: ${on} placer(s) shaken off ${actor.name} (persona reboot).`);
+    actor.noteConditionChanged?.();
+    return { placed, on };
+}
 /** The placer's standing marks, for the bare "mark" listing. */
 export function describeMarks(scene, placerName) {
     const lines = [];
@@ -48,4 +76,47 @@ export function describeMarks(scene, placerName) {
     }
     return lines;
 }
+/**
+ * The marks this persona HOLDS, for the live sheet (contract 2026-09-02,
+ * web accepts first): every host and PAN it has marked, named the way
+ * describeMarks prints them, count 1..3. Read at beat time, so the reboot
+ * clear and convergence show on the next beat with no clear-site wiring.
+ * The site caps the list at 24 entries.
+ */
+export function marksPlaced(scene, placerName) {
+    const out = [];
+    for (const room of Object.values(scene.getRooms())) {
+        const n = room.hostMarksBy.get(placerName) ?? 0;
+        if (n > 0)
+            out.push({ target: hostLabel(room, { capital: true }), count: n });
+    }
+    for (const a of scene.allActors) {
+        const n = a.panMarksBy.get(placerName) ?? 0;
+        if (n > 0)
+            out.push({ target: `${a.name}'s PAN`, count: n });
+    }
+    return out.slice(0, 24);
+}
+/**
+ * WHO HOLDS MARKS ON THIS PERSONA, one row each, for the live sheet
+ * (contract 2026-09-02). Every host in the scene that MADE the persona --
+ * not only the one it stands inside: a host's mark on you outlives your
+ * exit and dies with your reboot (p.236 -- marks last the session; the
+ * ledger is Host.marksOn, cleared by clearMarksOn). A session log showed
+ * three marks across two hosts while the inside-host number could show
+ * one host's worth. Plus every persona on the PAN ledger.
+ */
+export function marksOnYou(scene, player) {
+    const out = [];
+    for (const room of Object.values(scene.getRooms())) {
+        const n = room.host?.marksOn.get(player.name) ?? 0;
+        if (n > 0)
+            out.push({ placer: hostLabel(room, { capital: true }), count: n });
+    }
+    for (const [placer, count] of player.panMarksBy.entries()) {
+        if (count > 0)
+            out.push({ placer, count });
+    }
+    return out.slice(0, 24);
+}
 //# sourceMappingURL=marks.js.map

package/bundle/typescript/src/commands/game/sideQuest/utilities/marks.js.map

@@ -1 +1 @@
-{"version":3,"file":"marks.js","sourceRoot":"","sources":["../../../../../../../src/commands/game/sideQuest/utilities/marks.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAE5C,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAErC;;;;;;;;;GASG;AAEH,MAAM,CAAC,MAAM,SAAS,GAAG,CAAC,CAAC;AAE3B;6DAC6D;AAC7D,MAAM,UAAU,kBAAkB,CAAC,KAAY,EAAE,UAAkB;IACjE,IAAI,OAAO,GAAG,CAAC,CAAC;IAChB,KAAK,MAAM,IAAI,IAAI,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC,EAAE,CAAC;QACnD,IAAI,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,UAAU,CAAC;YAAE,OAAO,EAAE,CAAC;IACrD,CAAC;IACD,KAAK,MAAM,CAAC,IAAI,KAAK,CAAC,SAAS,EAAE,CAAC;QAChC,IAAI,CAAC,CAAC,UAAU,CAAC,MAAM,CAAC,UAAU,CAAC;YAAE,OAAO,EAAE,CAAC;IACjD,CAAC;IACD,IAAI,OAAO,GAAG,CAAC,EAAE,CAAC;QAChB,MAAM,CAAC,WAAW,EAAE,CAAC,KAAK,CAAC,UAAU,UAAU,MAAM,OAAO,2CAA2C,CAAC,CAAC;IAC3G,CAAC;AACH,CAAC;AAED,uDAAuD;AACvD,MAAM,UAAU,YAAY,CAAC,KAAa;IACxC,MAAM,GAAG,GAAG,KAAK,CAAC,UAAU,CAAC,IAAI,CAAC;IAClC,KAAK,CAAC,UAAU,CAAC,KAAK,EAAE,CAAC;IACzB,OAAO,GAAG,CAAC;AACb,CAAC;AAED,gEAAgE;AAChE,MAAM,UAAU,aAAa,CAAC,KAAY,EAAE,UAAkB;IAC5D,MAAM,KAAK,GAAa,EAAE,CAAC;IAC3B,KAAK,MAAM,IAAI,IAAI,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC,EAAE,CAAC;QACnD,MAAM,CAAC,GAAG,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;QAChD,IAAI,CAAC,GAAG,CAAC;YAAE,KAAK,CAAC,IAAI,CAAC,KAAK,SAAS,CAAC,IAAI,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,GAAG,CAAC,IAAI,SAAS,CAAC,CAAC,CAAC,yBAAyB,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;IACvJ,CAAC;IACD,KAAK,MAAM,CAAC,IAAI,KAAK,CAAC,SAAS,EAAE,CAAC;QAChC,MAAM,CAAC,GAAG,CAAC,CAAC,UAAU,CAAC,GAAG,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;QAC5C,IAAI,CAAC,GAAG,CAAC;YAAE,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,IAAI,aAAa,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC,CAAC;IAC/E,CAAC;IACD,OAAO,KAAK,CAAC;AACf,CAAC"}
+{"version":3,"file":"marks.js","sourceRoot":"","sources":["../../../../../../../src/commands/game/sideQuest/utilities/marks.ts"],"names":[],"mappings":"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"}

package/bundle/typescript/src/commands/game/sideQuest/utilities/matrix-roster.d.ts

@@ -0,0 +1,62 @@
+import type { Player } from '../models/player.js';
+import type { Item } from '../models/item.js';
+import type { Room } from '../models/room.js';
+import { NPC } from '../models/npc.js';
+import type { Scene } from '../models/scene.js';
+import type { Host } from '../models/host.js';
+/**
+ * WHO A PERSONA CAN REACH (increment 2 of the Matrix position model,
+ * 2026-09-02). The persona's position is `Player.matrixPosition` -- on a
+ * grid, or inside a Host -- and its body stays in `currentLocation` on
+ * every plane. So a persona inside a host is NOT in the host room's
+ * actor set any more, and the nine verbs that used to read
+ * `getActorsInRoom(room)` + `sameHostSide` for Matrix targets read these
+ * instead. One utility, one answer, both sides of the wall (SR5 p.246:
+ * inside a host you see and touch only what is inside it; outside, you
+ * cannot touch the interior).
+ */
+/** The wall test: same host, or both out on a grid, or both off-Matrix (undefined === undefined stays deliberately harmless). */
+export declare function sameMatrixSide(a: Player, b: Player): boolean;
+/** Everyone whose persona is inside this host -- players, ice, sprites, agents. */
+export declare function personasInside(scene: Scene, host: Host): (Player | NPC)[];
+/** Matrix-plane actors on the persona's side of the wall, excluding the persona. */
+export declare function personasOnMySide(scene: Scene, actor: Player): (Player | NPC)[];
+/** Constructs a spike or a decompile can reach: NPC icons on my side, still running. */
+export declare function matrixConstructsInReach(scene: Scene, actor: Player): NPC[];
+/** Cybercombat targets: icons on my side that share the combat plane. */
+export declare function cybercombatCandidates(scene: Scene, actor: Player): (Player | NPC)[];
+/** Who hears a persona speak: every persona on its side of the wall. Bodies hear nothing. */
+export declare function speechAudience(scene: Scene, actor: Player): (Player | NPC)[];
+/** Delivers a persona's words to its audience, the way Room.say delivers a body's. */
+export declare function speakOnTheGrid(scene: Scene, actor: Player, message: string): (Player | NPC)[];
+/**
+ * The combat exchange's "same place": on the matrix plane it is the
+ * same side of the host wall (distance is noise, not range); in the meat
+ * it is the same room, as it always was.
+ */
+export declare function samePlace(a: Player, b: Player): boolean;
+/**
+ * Sprites and agents ride with their owner's persona: across a host wall
+ * on enter/exit, and between grids on a hop. Bodies do not move.
+ */
+export declare function movePersonaWith(game: {
+    companions: {
+        kind: string;
+        npc: NPC;
+    }[];
+} | undefined, actor: Player): NPC[];
+/**
+ * WHERE A NAMED THING IS, when it is not where the persona stands: the
+ * first room in reach holding an item by that name, and what stands
+ * between the persona and it. 'offline' = an air-gapped server (only a
+ * body in that room reaches it, p.233); 'host' = inside a host's vault
+ * (enter first, p.246); 'open' = loose on the grid, a dim icon at the
+ * noise the distance costs; 'meat' = a physical thing, not an icon.
+ */
+export declare function whereIsThat(rooms: Record<string, Room>, actor: Player, name: string): {
+    room: Room;
+    item: Item;
+    reach: 'offline' | 'host' | 'open' | 'meat';
+    noise: number;
+    remembered: boolean;
+} | undefined;

package/bundle/typescript/src/commands/game/sideQuest/utilities/matrix-roster.js

@@ -0,0 +1,97 @@
+import { roomsInReach } from './grid-reach.js';
+import { NPC } from '../models/npc.js';
+/**
+ * WHO A PERSONA CAN REACH (increment 2 of the Matrix position model,
+ * 2026-09-02). The persona's position is `Player.matrixPosition` -- on a
+ * grid, or inside a Host -- and its body stays in `currentLocation` on
+ * every plane. So a persona inside a host is NOT in the host room's
+ * actor set any more, and the nine verbs that used to read
+ * `getActorsInRoom(room)` + `sameHostSide` for Matrix targets read these
+ * instead. One utility, one answer, both sides of the wall (SR5 p.246:
+ * inside a host you see and touch only what is inside it; outside, you
+ * cannot touch the interior).
+ */
+/** The wall test: same host, or both out on a grid, or both off-Matrix (undefined === undefined stays deliberately harmless). */
+export function sameMatrixSide(a, b) {
+    return a.hostInside === b.hostInside;
+}
+/** Everyone whose persona is inside this host -- players, ice, sprites, agents. */
+export function personasInside(scene, host) {
+    return scene.allActors.filter(a => a.plane === 'matrix' && a.hostInside === host);
+}
+/** Matrix-plane actors on the persona's side of the wall, excluding the persona. */
+export function personasOnMySide(scene, actor) {
+    return scene.allActors.filter(a => a !== actor && a.plane === 'matrix' && sameMatrixSide(actor, a));
+}
+/** Constructs a spike or a decompile can reach: NPC icons on my side, still running. */
+export function matrixConstructsInReach(scene, actor) {
+    return personasOnMySide(scene, actor).filter((a) => a instanceof NPC && !a.deathClaimed);
+}
+/** Cybercombat targets: icons on my side that share the combat plane. */
+export function cybercombatCandidates(scene, actor) {
+    return personasOnMySide(scene, actor).filter(a => a.sharesCombatPlane(actor));
+}
+/** Who hears a persona speak: every persona on its side of the wall. Bodies hear nothing. */
+export function speechAudience(scene, actor) {
+    return personasOnMySide(scene, actor);
+}
+/** Delivers a persona's words to its audience, the way Room.say delivers a body's. */
+export function speakOnTheGrid(scene, actor, message) {
+    const audience = speechAudience(scene, actor);
+    for (const recipient of audience) {
+        void Promise.resolve(recipient.hear(actor, message, { broadcast: true })).catch(() => undefined);
+    }
+    return audience;
+}
+/**
+ * The combat exchange's "same place": on the matrix plane it is the
+ * same side of the host wall (distance is noise, not range); in the meat
+ * it is the same room, as it always was.
+ */
+export function samePlace(a, b) {
+    if (a.plane === 'matrix' || b.plane === 'matrix') {
+        return a.plane === b.plane && sameMatrixSide(a, b);
+    }
+    return a.currentLocation === b.currentLocation;
+}
+/**
+ * Sprites and agents ride with their owner's persona: across a host wall
+ * on enter/exit, and between grids on a hop. Bodies do not move.
+ */
+export function movePersonaWith(game, actor) {
+    const moved = [];
+    for (const c of game?.companions ?? []) {
+        if ((c.kind === 'sprite' || c.kind === 'agent') && c.npc.plane === 'matrix') {
+            c.npc.matrixPosition = actor.matrixPosition;
+            moved.push(c.npc);
+        }
+    }
+    return moved;
+}
+/**
+ * WHERE A NAMED THING IS, when it is not where the persona stands: the
+ * first room in reach holding an item by that name, and what stands
+ * between the persona and it. 'offline' = an air-gapped server (only a
+ * body in that room reaches it, p.233); 'host' = inside a host's vault
+ * (enter first, p.246); 'open' = loose on the grid, a dim icon at the
+ * noise the distance costs; 'meat' = a physical thing, not an icon.
+ */
+export function whereIsThat(rooms, actor, name) {
+    const q = name.trim().toLowerCase();
+    for (const { room, noise } of roomsInReach(rooms, actor)) {
+        const item = room.inventory.getAllItems().find(i => i.name.toLowerCase() === q)
+            ?? room.inventory.getAllItems().find(i => i.name.toLowerCase().includes(q));
+        if (!item)
+            continue;
+        const reach = item.plane !== 'matrix' ? 'meat'
+            : room.offlineServer ? 'offline'
+                : room.host && !room.host.cracked ? 'host'
+                    : 'open';
+        // A room is named only from MEMORY (p.243: the grid does not give away
+        // a device's address): the runner has stood in it, or searched it.
+        const remembered = room.visitedBy.has(actor.name) || room.searchedBy.has(actor.name) || room === actor.currentLocation;
+        return { room, item, reach, noise, remembered };
+    }
+    return undefined;
+}
+//# sourceMappingURL=matrix-roster.js.map

package/bundle/typescript/src/commands/game/sideQuest/utilities/matrix-roster.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"matrix-roster.js","sourceRoot":"","sources":["../../../../../../../src/commands/game/sideQuest/utilities/matrix-roster.ts"],"names":[],"mappings":"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"}

package/bundle/typescript/src/commands/game/sideQuest/utilities/overwatch.js

@@ -1,6 +1,6 @@
 import { Logger } from './logger.js';
 import { rollPool, formatRoll } from './dice.js';
-import { clearMarksPlacedBy } from './marks.js';
+import { rebootWipe } from './marks.js';
 /**
  * GOD -- the Grid Overwatch Division (canon p.221/231-232, player go
  * 2026-08-23). Every illegal Matrix action (Attack or Sleaze) leaves
@@ -102,8 +102,8 @@ function converge(scene, actor) {
         lines.push(`  You shed the hammerblow -- barely.`);
     }
     resetOverwatch(actor, 'convergence force-reboot');
-    // "Erasing all of your marks" (p.231-232) -- now literal.
-    clearMarksPlacedBy(scene, actor.name);
+    // "Erasing all of your marks" (p.231-232) -- and the ones on you (p.242).
+    rebootWipe(scene, actor);
     actor.addNotoriety(`GOD converged on their persona -- location burned to the authorities`);
     scene.addWorldEvent(`GOD converged on ${actor.name} -- their physical location in ${actor.bodyRoom?.name ?? actor.currentLocation.name} is burned to the authorities.`);
     // "Reported to the authorities" now MEANS something: the district's

package/bundle/typescript/src/commands/game/sideQuest/utilities/overwatch.js.map

@@ -1 +1 @@
-{"version":3,"file":"overwatch.js","sourceRoot":"","sources":["../../../../../../../src/commands/game/sideQuest/utilities/overwatch.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"overwatch.js","sourceRoot":"","sources":["../../../../../../../src/commands/game/sideQuest/utilities/overwatch.ts"],"names":[],"mappings":"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"}

package/bundle/typescript/src/commands/game/sideQuest/utilities/persistence.d.ts

@@ -88,9 +88,7 @@ export declare function serializeItem(item: Item): ISavedItem;
 export declare function restoreItem(json: ISavedItem): Item;
 type EquipmentShape = Player['equipment'];
 export declare function serializeEquipment(eq: EquipmentShape): ISavedEquipment;
-/** Clears EVERY slot first (an NPC auto-equips at synthesis; the save
- *  is authoritative), then lays in the saved blobs. */
-export declare function restoreEquipment(eq: EquipmentShape, saved: ISavedEquipment): void;
+export declare function restoreEquipment(eq: EquipmentShape, saved: ISavedEquipment, spill?: (item: Item) => void): void;
 export declare function replaceInventory(inv: Inventory, items: ISavedItem[]): void;
 export declare function serializePlayer(p: Player): ISavedPlayer;
 /**

package/bundle/typescript/src/commands/game/sideQuest/utilities/persistence.js

@@ -1,4 +1,5 @@
 import * as fs from 'fs';
+import { normalizeStance } from '../models/player.js';
 import { resolveSpot } from './spots.js';
 import { isAspectKey } from '../aspects.js';
 import * as path from 'path';
@@ -157,6 +158,8 @@ export function serializeItem(item) {
         out.quantity = item.quantity;
     if (item.isFirearm() && item.ammo !== Item.MAGAZINE_CAPACITY)
         out.ammo = item.ammo;
+    if (item.loadedAmmo)
+        out.loadedAmmo = item.loadedAmmo;
     if (item.jammed)
         out.jammed = true;
     if (item.deckDamage > 0)
@@ -165,6 +168,12 @@ export function serializeItem(item) {
         out.droneDamage = item.droneDamage;
     if (item.loadedPrograms.length > 0)
         out.loadedPrograms = [...item.loadedPrograms];
+    if (item.storedPrograms.length > 0)
+        out.storedPrograms = [...item.storedPrograms];
+    if (item.papers.length > 0)
+        out.papers = item.papers.map(serializeItem);
+    if (item.linkedSin)
+        out.linkedSin = item.linkedSin;
     if (item.isCyberdeck() && item.deckOrder.join() !== '0,1,2,3')
         out.deckOrder = item.deckOrder;
     return out;
@@ -200,6 +209,8 @@ export function restoreItem(json) {
         item.quantity = json.quantity;
     if (json.ammo !== undefined)
         item.ammo = json.ammo;
+    if (json.loadedAmmo)
+        item.loadedAmmo = json.loadedAmmo;
     if (json.jammed)
         item.jammed = true;
     if (json.deckDamage)
@@ -208,6 +219,16 @@ export function restoreItem(json) {
         item.takeDroneDamage(json.droneDamage);
     if (json.loadedPrograms)
         item.loadedPrograms = [...json.loadedPrograms];
+    if (json.storedPrograms)
+        item.storedPrograms = [...json.storedPrograms];
+    if (json.papers)
+        item.papers = json.papers.map(restoreItem);
+    if (json.linkedSin)
+        item.linkedSin = json.linkedSin;
+    // A running program is in storage by definition -- saves from before
+    // storage existed carried only the running set.
+    for (const k of item.loadedPrograms)
+        item.installProgram(k);
     if (json.deckOrder)
         item.configureDeck(json.deckOrder);
     return item;
@@ -226,7 +247,27 @@ export function serializeEquipment(eq) {
 }
 /** Clears EVERY slot first (an NPC auto-equips at synthesis; the save
  *  is authoritative), then lays in the saved blobs. */
-export function restoreEquipment(eq, saved) {
+/**
+ * The paired slots collapsed to one per region on 2026-09-02 (canon has no
+ * sides). A save from before carries the old keys; each lands on the new
+ * slot, and a second item for the same region goes to the bag via `spill`
+ * rather than to nowhere.
+ */
+/** The three skillsoft rows pulled from the shelf on 2026-09-02, at the price they sold for. */
+const SKILLSOFT_REFUNDS = [
+    { test: /^Activesoft/i, nuyen: 15000 },
+    { test: /^Knowsoft/i, nuyen: 6000 },
+    { test: /^Linguasoft/i, nuyen: 3000 },
+];
+const LEGACY_SLOTS = {
+    'torso.leftShoulder': 'torso.shoulder', 'torso.rightShoulder': 'torso.shoulder',
+    'legs.leftHip': 'legs.hip', 'legs.rightHip': 'legs.hip',
+    'feet.leftAnkle': 'feet.ankle', 'feet.rightAnkle': 'feet.ankle',
+    'arms.leftForearm': 'arms.forearm', 'arms.rightForearm': 'arms.forearm',
+    'arms.leftBicept': 'arms.bicep', 'arms.rightBicept': 'arms.bicep',
+    'gloves.leftWrist': 'gloves.wrist', 'gloves.rightWrist': 'gloves.wrist',
+};
+export function restoreEquipment(eq, saved, spill) {
     for (const group of Object.values(eq)) {
         if (!group)
             continue;
@@ -237,13 +278,23 @@ export function restoreEquipment(eq, saved) {
     for (const [pathKey, savedItem] of Object.entries(saved)) {
         if (!savedItem)
             continue;
-        const [groupKey, slotKey] = pathKey.split('.');
+        let key = LEGACY_SLOTS[pathKey] ?? pathKey;
+        // A pair of gloves used to sit on the wrist; it has its own slot now.
+        if (key === 'gloves.wrist' && savedItem.category === 'Gloves')
+            key = 'gloves.gloves';
+        const [groupKey, slotKey] = key.split('.');
         const group = eq[groupKey];
         if (!group || !(slotKey in group)) {
             Logger.getInstance().write(`restoreEquipment: unknown slot "${pathKey}" -- item "${savedItem.name}" dropped to nowhere, skipping.`);
             continue;
         }
-        group[slotKey] = restoreItem(savedItem);
+        const item = restoreItem(savedItem);
+        if (group[slotKey]) {
+            Logger.getInstance().write(`restoreEquipment: "${item.name}" (${pathKey}) -- ${key} already holds ${group[slotKey].name}; ${spill ? 'bagged' : 'dropped'}.`);
+            spill?.(item);
+            continue;
+        }
+        group[slotKey] = item;
     }
 }
 export function replaceInventory(inv, items) {
@@ -287,6 +338,7 @@ export function serializePlayer(p) {
         augmentations: [...p.augmentations],
         augmentationGrades: [...p.augGrades.entries()],
         qualities: [...p.qualities],
+        qualityRatings: [...p.qualityRatings.entries()],
         activeSin: p.activeSin,
         metamagics: [...p.metamagics],
         initiationGrade: p.initiationGrade,
@@ -318,8 +370,11 @@ export function serializePlayer(p) {
  */
 export function restorePlayer(p, s) {
     const logger = Logger.getInstance();
+    // Ratings ride beside the keys (contract 2026-09-02); a legacy "<key>-1"
+    // resolves inside addQuality to the rated key at 1.
+    const ratings = new Map(s.qualityRatings ?? []);
     for (const q of s.qualities)
-        p.addQuality(q);
+        p.addQuality(q, ratings.get(q));
     p.activeSin = s.activeSin;
     p.baseMagic = s.baseMagic;
     p.baseResonance = s.baseResonance;
@@ -459,7 +514,7 @@ export function restorePlayer(p, s) {
     p.sleepStreak = s.needs.sleepStreak;
     p.edgeRemaining = s.edgeRemaining;
     p.haggledThisJob = s.haggledThisJob;
-    p.autoStance = s.autoStance;
+    p.autoStance = normalizeStance(s.autoStance);
     if (s.archetypeName)
         p.archetypeName = s.archetypeName;
     if (s.gender)
@@ -470,7 +525,30 @@ export function restorePlayer(p, s) {
     for (const name of s.visitedRooms ?? [])
         p.visitedRooms.add(name);
     replaceInventory(p.inventory, s.inventory);
-    restoreEquipment(p.equipment, s.equipment);
+    // PROGRAMS LIVE ON THE DECK (p.227; 2026-09-02): a save from before
+    // carried its library as loose chips. They move into the carried deck
+    // here, once, and the log says how many.
+    // SKILLSOFTS BOUGHT BEFORE THE SHELF WAS FIXED are refunded at the price
+    // paid: nothing in the engine could ever run them (catalog-data.ts note).
+    for (const chip of [...p.inventory.getAllItems()]) {
+        const refund = SKILLSOFT_REFUNDS.find(r => chip.category === Category.Software && r.test.test(chip.name));
+        if (!refund)
+            continue;
+        p.inventory.removeItem(chip.name);
+        p.adjustCurrency(refund.nuyen);
+        Logger.getInstance().write(`restorePlayer: ${chip.name} refunded (${refund.nuyen} nuyen) -- no skillwires or skilljack exist to run it.`);
+    }
+    // PAPERS LIVE ON THE COMMLINK (p.443; 2026-09-02): a save from before
+    // carried fake SINs and licenses loose in the pack. They move onto the
+    // carried commlink (or deck) here, once; a loose license links to the
+    // best fake SIN, and the log says what moved.
+    const papers = p.sweepPapersOntoDevice();
+    if (papers > 0)
+        Logger.getInstance().write(`restorePlayer: ${papers} paper(s) moved onto ${p.paperDevice()?.name ?? 'the device'} (papers live on the commlink now).`);
+    const swept = p.sweepProgramChipsIntoDeck();
+    if (swept > 0)
+        Logger.getInstance().write(`restorePlayer: ${swept} program chip(s) installed into ${p.getAnyCyberdeck()?.name ?? 'the deck'} (programs live in deck storage now).`);
+    restoreEquipment(p.equipment, s.equipment, item => p.addInventory(item));
 }
 // ============================= Hub world =============================
 function serializeRoomOverlay(room, player) {
@@ -669,7 +747,7 @@ export function applyHubOverlay(scene, saved, player, homeRoom) {
             npc.setObjective(overlay.objective);
         npc.restoreHistory(overlay.history);
         replaceInventory(npc.inventory, overlay.inventory);
-        restoreEquipment(npc.equipment, overlay.equipment);
+        restoreEquipment(npc.equipment, overlay.equipment, item => npc.inventory.addItem(item));
     }
     // 4. Devices: the one flag -- door lock state was restored in step 2,
     //    so a door relocked after its device opened stays relocked.