@homie-rocks/studio 0.48.1 → 0.48.4

package/CHANGELOG.md

@@ -17,6 +17,45 @@ To bring a studio up to date, tell Claude: "Upgrade my studio to the newest Homi
 `npx -y @homie-rocks/studio@latest upgrade`, which shows what's new since the version your studio pins (from this
 file) and what the upgrade would change, and changes nothing until you agree.
 
+## [0.48.4] - 2026-10-13
+
+**Plugin 0.48.4** · Deploys go right.
+
+Requested deploys proceed, visitors reach the current build, and paired screens keep their private room.
+
+### Fixed
+
+- An owner's task to run the studio's deploy authorizes it and its retries in Claude, Codex and Grok. Codex also recovers the original user request from its session transcript when a prompt event is absent; unrelated follow-ups do not erase it. Unrequested deploys still explain how to approve them.
+- The Lobby retires rooms that the current hosting kind or server build cannot run before matching visitors, including after storage recovery and at a server's room allowance. Late reports cannot bring those rooms back.
+- A TV and its paired phone keep their private room name through an incompatible build. The room starts its new match immediately, and page rematching preserves private room addresses instead of choosing quick play.
+- Building the first server-rules game wires an untouched generated Worker or stops with the exact hostRules fix for a custom Worker. Live check reports that same fix before opening browsers instead of waiting for seats.
+
+### Upgrade notes
+
+Update the toolkit and plugin together. A custom site/src/worker.mjs must import the generated rules table and call hostRules at module scope; build prints the two lines when needed. No new studio limits or owner confirmation steps.
+
+## [0.48.3] - 2026-10-13
+
+**Plugin 0.48.3** · Restore rewind-based hits with input history.
+
+Rules input history fits the wire without starving current aim and trigger controls.
+
+### Fixed
+
+- **0.48.1 misjudged rewind-based hits.** Repeated input history and sub-tick
+  metadata could exceed the relay's 2 KB input limit, even with no latency or
+  loss. The server then kept stale aim and trigger state while the player's
+  predictor showed hits against the current aim. Input frames now fit that
+  existing byte limit, prioritizing current controls and missing receipts.
+- Optional sub-tick metadata uses only the space left after complete input
+  values and their sequence numbers. Integrated held durations, reliable
+  pulses, measured round trips and the rewind cap keep their existing meaning.
+  Bounded history recovery, application receipts and correction blending remain.
+
+### Upgrade notes
+
+- Existing games need no code changes.
+
 ## [0.48.1] - 2026-10-13
 
 **Plugin 0.48.1** · Input history under loss.

package/lib/build.mjs

@@ -510,6 +510,7 @@ export function orderGames(games, order, log = () => {}) {
 export async function build(root, { only = null, log = () => {}, deploy = process.env.WORKERS_CI === '1', maps = false, types = false, beforePublish = async () => {}, longCheck = false } = {}) {
   const esbuild = await studioEsbuild(root);
   const studio = readStudio(root);
+  if (listGames(root).some(g => isRulesGame(g) && g.room?.host !== 'browser' && g.room?.host !== 'offline')) await (await import('./rules-wiring.mjs')).ensureRulesWiring(root);
   await (await import('./tools-build.mjs')).buildTools(root, esbuild);
   await (await import('./functions-build.mjs')).buildFunctions(root, esbuild);
   // The shop first (shop/SHOP.md): invalid shop settings stop the build before anything is built.

package/lib/check.mjs

@@ -129,10 +129,6 @@ export function judgeRounds(browsers, missed = new Map()) {
 
 export async function check({ url, game, roundTimeoutMs = 150_000, rounds = 3, shots = null, userAgentTag = 'homie-studio-check', log = () => {}, report = null }) {
   if (!url || !game) throw new Error('usage: homie-studio check <game> --url <site url>');
-  const chrome = findChrome();
-  if (!chrome) return { ok: false, command: 'check', why: noChrome() };
-  let puppeteer;
-  try { puppeteer = (await import('puppeteer-core')).default; } catch { return { ok: false, command: 'check', why: 'puppeteer-core is not installed (it comes with @homie-rocks/studio; run npm install)' }; }
   const base = String(url).replace(/\/+$/, '');
   const play = `${base}/${game}/play`;
   // One preflight from this process, in the same words as perf, shoot and port check (lib/net.mjs siteRefusal).
@@ -143,7 +139,15 @@ export async function check({ url, game, roundTimeoutMs = 150_000, rounds = 3, s
   const cannotAsk = siteRefusal(await reachSite(base, { path: `/${game}/play`, timeout: 15_000 }), { command: 'check', play });
   if (cannotAsk?.preflight === 'local') return cannotAsk;
   let appMeta = null;
-  try { appMeta = (await (await fetch(`${base}/api/games`)).json()).games?.find((g) => g.id === game && g.kind === 'app'); } catch { /* browser preflight below still names failures */ }
+  try {
+    const meta = (await (await fetch(`${base}/api/games`, { signal: AbortSignal.timeout(5000) })).json()).games?.find(g => g.id === game);
+    if (meta?.rulesError) return { ok: false, command: 'check', why: meta.rulesError };
+    if (meta?.kind === 'app') appMeta = meta;
+  } catch { /* browser preflight below still names failures */ }
+  const chrome = findChrome();
+  if (!chrome) return { ok: false, command: 'check', why: noChrome() };
+  let puppeteer;
+  try { puppeteer = (await import('puppeteer-core')).default; } catch { return { ok: false, command: 'check', why: 'puppeteer-core is not installed (it comes with @homie-rocks/studio; run npm install)' }; }
   if (appMeta) return checkApp({ url: base, game, meta: appMeta, shots, log, report, puppeteer, chrome });
   if (shots) mkdirSync(shots, { recursive: true });
   const profiles = [];

package/lib/rules-wiring.mjs

@@ -0,0 +1,30 @@
+import { readFileSync, writeFileSync } from 'node:fs';
+import { join } from 'node:path';
+import { parse } from '@babel/parser';
+import { RULES_WIRING_MESSAGE } from '../worker/rules-wiring.mjs';
+
+/** Check executable module statements, never a comment or a function nobody calls. */
+export function registersRules(text) {
+  const body = parse(text, { sourceType: 'module' }).program.body;
+  const hosts = new Set(), tables = new Set();
+  for (const node of body) if (node.type === 'ImportDeclaration') {
+    for (const s of node.specifiers) {
+      if (/^@homie-rocks\/studio\/worker(?:\/selling)?$/.test(node.source.value) && s.imported?.name === 'hostRules') hosts.add(s.local.name);
+      if (node.source.value === './rules/index.mjs' && s.type === 'ImportDefaultSpecifier') tables.add(s.local.name);
+    }
+  }
+  return body.some(n => n.type === 'ExpressionStatement' && n.expression.type === 'CallExpression' && hosts.has(n.expression.callee.name) && tables.has(n.expression.arguments[0]?.name));
+}
+
+export async function ensureRulesWiring(root) {
+  const file = join(root, 'site/src/worker.mjs');
+  let text;
+  try { text = readFileSync(file, 'utf8'); } catch { throw new Error(RULES_WIRING_MESSAGE); }
+  if (registersRules(text)) return;
+  // Upgrade already knows every exact generated Worker fingerprint. Reuse that
+  // ownership check; a comment claiming to be generated is not ownership.
+  const { upgradePlan } = await import('./upgrade.mjs');
+  const update = upgradePlan(root).changes?.find(c => c.file === 'site/src/worker.mjs' && c.kind === 'update-file');
+  if (update && registersRules(update.text)) { writeFileSync(file, update.text); return; }
+  throw new Error(RULES_WIRING_MESSAGE);
+}

package/lib/scaffold.mjs

@@ -555,7 +555,7 @@ chat's card follows the work from then on) and, for a studio still being set up,
   the budget until the person says Proceed, and takes keys out of command output. In Codex the plugin's hooks hold
   unrequested deploys and the other held calls until the person's own \`proceed <code>\`, once the person has trusted them, and in Grok Build once
   the plugin is trusted. \`npx --no-install homie-studio setup status --client codex\` (or \`grok\`) says whether Homie's
-  holds are on. A deploy the person requested in their own words is already approved for that task; do not ask again or demand a typed code. Stop an unrequested deploy and ask once. When a call is refused, say what you
+  holds are on. A deploy the person requested in their own words is already approved for that task; do not ask again or demand a typed code. The original task also counts in non-interactive sessions, including a prompt piped into codex exec. Stop an unrequested deploy and ask once: the person can say “Please deploy this studio.” When a call is refused, say what you
   meant to do and why; do not retry it unless the person asks.
 
 ## Telling Homie

package/lib/template-history.json

@@ -3027,6 +3027,90 @@
      }
     }
    }
+  },
+  "0.48.3": {
+   "files": {
+    "CLAUDE.md": "ddf2b2a0376202f6",
+    "README.md": "684b3cca8001673c",
+    "HANDOFF.md": "29337e2ace95b2e7",
+    "games/README.md": "5ad32fe80c61f117",
+    "music/README.md": "a3dc042dadd39df8",
+    "videos/README.md": "16babc3437d5545b",
+    "posts/README.md": "37841aae476bd540",
+    "site/README.md": "732894273a32dc3f",
+    "site/src/worker.mjs": "6cc5c6131eaf6fd0"
+   },
+   "sections": {
+    "AGENTS.md": {
+     "(intro)": "394cbbe934e80722",
+     "## Version-matched authoring guides": "f6261a0e5801b96b",
+     "## Layout": "f3a280b8c96cd068",
+     "## Apps: one screen, roles and parts": "8596f2b25edda3e2",
+     "## Commands (all through the pinned CLI in node_modules)": "5222e08ca55e326e",
+     "## The site": "0cb8dd9a6f8a0096",
+     "## Making games": "bb715272fd1a615b",
+     "## The Game Codex and progress": "0738ef719cef3a4c",
+     "## Art direction and models": "a48fff7bf0a5f2fc",
+     "## Running live games (the back office)": "51ebf2ab756f6e4d",
+     "## Servers and AI seats": "1ccfd549d2369a60",
+     "## Selling things (the shop)": "9e020d69dd6a954e",
+     "## Continuing a build from the Claude app": "0d68081e924ca419",
+     "## Rules": "27881d11d3ff3803",
+     "## Telling Homie": "80b46fdd9e578db8",
+     "## Beta": "9d02638207a26e73"
+    }
+   },
+   "named": {
+    "Homie Arcade": {
+     "sections": {
+      "AGENTS.md": {
+       "## Commands (all through the pinned CLI in node_modules)": "611b437f5b3303f0"
+      }
+     }
+    }
+   }
+  },
+  "0.48.4": {
+   "files": {
+    "CLAUDE.md": "ddf2b2a0376202f6",
+    "README.md": "684b3cca8001673c",
+    "HANDOFF.md": "29337e2ace95b2e7",
+    "games/README.md": "5ad32fe80c61f117",
+    "music/README.md": "a3dc042dadd39df8",
+    "videos/README.md": "16babc3437d5545b",
+    "posts/README.md": "37841aae476bd540",
+    "site/README.md": "732894273a32dc3f",
+    "site/src/worker.mjs": "6cc5c6131eaf6fd0"
+   },
+   "sections": {
+    "AGENTS.md": {
+     "(intro)": "394cbbe934e80722",
+     "## Version-matched authoring guides": "f6261a0e5801b96b",
+     "## Layout": "f3a280b8c96cd068",
+     "## Apps: one screen, roles and parts": "8596f2b25edda3e2",
+     "## Commands (all through the pinned CLI in node_modules)": "5222e08ca55e326e",
+     "## The site": "0cb8dd9a6f8a0096",
+     "## Making games": "bb715272fd1a615b",
+     "## The Game Codex and progress": "0738ef719cef3a4c",
+     "## Art direction and models": "a48fff7bf0a5f2fc",
+     "## Running live games (the back office)": "51ebf2ab756f6e4d",
+     "## Servers and AI seats": "1ccfd549d2369a60",
+     "## Selling things (the shop)": "9e020d69dd6a954e",
+     "## Continuing a build from the Claude app": "0d68081e924ca419",
+     "## Rules": "b2234d80f6cbe71d",
+     "## Telling Homie": "80b46fdd9e578db8",
+     "## Beta": "9d02638207a26e73"
+    }
+   },
+   "named": {
+    "Homie Arcade": {
+     "sections": {
+      "AGENTS.md": {
+       "## Commands (all through the pinned CLI in node_modules)": "611b437f5b3303f0"
+      }
+     }
+    }
+   }
   }
  }
 }

package/netplay/NETPLAY.md

@@ -2336,7 +2336,12 @@ A rules step keeps its `[tickOffset, ...fields, ...ownerClaim]` prefix. Current
 views append `[-471, sequence, changeCount, ...changes]`, where each change is
 `[fieldIndex, changeSequence, fractionOfTick, value]`. All components are numbers.
 Input frames repeat recent entries, sorted by tick; the retained window is
-4–64 ticks based on measured authority RTT and jitter. The host deduplicates
+4–64 ticks based on measured authority RTT and jitter. Each frame also fits the
+existing 2 KB input cap: current controls first, then missing receipts, then
+acknowledged history. Optional sub-tick metadata uses the remaining bytes; the
+complete row retains its integrated held values and sequence even when the
+metadata is omitted. Retained entries not selected for this frame remain
+available for subsequent recovery frames. The host deduplicates
 entry sequences, including history received after a missing frame. Duplicate
 history is not a fresh lead observation. Frames without the trailer keep the
 legacy input semantics.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@homie-rocks/studio",
-  "version": "0.48.1",
+  "version": "0.48.4",
   "description": "A studio for games, music and video on its own Cloudflare: scaffold, multiplayer starters on the netplay contract, a port toolkit that makes existing single-player web games multiplayer, the site Worker with public rooms (Table/Lobby Durable Objects and D1, all on the free Workers plan, no payment method), a site with the hub's sections (Home, Games, Music, Videos, Rooms, Posts with feeds) in the studio's own look, an epic landing page for every game, big songs and videos in the studio's own R2 once it has storage (uploaded, checked by SHA-256, served at the same addresses), deploy, and the homie.rocks directory.",
   "type": "module",
   "license": "Apache-2.0",

package/rules/view.ts

@@ -6,7 +6,7 @@ import type { RayQueries, RayOptions } from './types.ts';
 import { snapshotDecoder } from './interest.mjs';
 import { collisionMap, collisionTargets, revisionAt, type CollisionRevision } from './live.ts';
 import { rulesOutput } from '../netplay/rules-output.mjs';
-import { rulesCaps, rulesRates } from '../worker/limits.mjs';
+import { LIMITS, rulesCaps, rulesRates } from '../worker/limits.mjs';
 /*
  * view.ts — what a rules game's view imports: the room, as a browser sees it.
  * =============================================================================
@@ -608,7 +608,33 @@ export function openRoom<R = unknown>(opts: OpenRoomOptions = {}): Room<R> {
     const windowTicks = Math.min(64, Math.max(4, recoveryTicks, Math.ceil((2 * authorityRtt() + 250) / period + targetLead())));
     sentHistory = sentHistory.filter(e => e.t >= t - windowTicks).slice(-64);
     const first = Math.min(k, sentHistory[0]?.t ?? k);
-    const rows: StepEntry[] = sentHistory.map((e) => [e.t - first, ...e.row]);
+    // Repeated history must fit the relay's existing byte cap, including its
+    // envelope and snapshot acknowledgement. Always carry the newest controls;
+    // spend the remaining space on missing receipts before acknowledged history.
+    // Sub-tick samples are optional metadata: the row already contains the held
+    // duration integrated by heldMean. Never truncate its values or sequence.
+    const budget = LIMITS.in - 128;
+    const selected = new Map<number, StepEntry>();
+    let bytes = 2;
+    const newest = sentHistory.at(-1);
+    const candidates = [...(newest ? [newest] : []),
+      ...sentHistory.filter(e => e !== newest && !applications.has(e.row[marker + 1])),
+      ...sentHistory.filter(e => e !== newest && applications.has(e.row[marker + 1])).reverse()];
+    for (const e of candidates) {
+      const row = [e.t - first, ...e.row.slice(0, marker + 2), 0];
+      const size = JSON.stringify(row).length + (selected.size ? 1 : 0);
+      if (bytes + size > budget) continue;
+      selected.set(e.t, row); bytes += size;
+    }
+    // Use spare bytes for sample metadata only after reserving control history.
+    for (const e of candidates) {
+      const compact = selected.get(e.t);
+      if (!compact) continue;
+      const row = [e.t - first, ...e.row];
+      const extra = JSON.stringify(row).length - JSON.stringify(compact).length;
+      if (bytes + extra <= budget) { selected.set(e.t, row); bytes += extra; }
+    }
+    const rows = [...selected].sort((a, b) => a[0] - b[0]).map(([, row]) => row);
     entries = [];
     if (net.steps(epoch, first, rows, mine.r)) lastSendAt = now;
   }

package/worker/build-id.mjs

@@ -1,2 +1,2 @@
 // Generated by lib/build-identity.mjs; identifies the bundled runtime sources.
-export const STUDIO_BUILD = Object.freeze({"version":"0.48.1","sha256":"01670eff45e75c7fca0bee9df359442e097aa916cc837e2d8b772a452a105dea"});
+export const STUDIO_BUILD = Object.freeze({"version":"0.48.4","sha256":"5a637b57c0a41bb68ece5691250f4f8e7f646d489608a0a2721f571053602b2f"});

package/worker/index.mjs

@@ -1,3 +1,4 @@
+import { RULES_WIRING_MESSAGE } from './rules-wiring.mjs';
 import { characterStore, characterRequest } from './characters.mjs';
 export { useFunctions } from './functions.mjs';
 import { appAccess, appRecordsRoute } from './app-records.mjs';
@@ -763,7 +764,7 @@ async function route(request, env, ctx) {
   }
   if (path === '/api/games') {
     const cat = await getCat();
-    return json({ studio: cat.studio, games: cat.games, live: await liveCounts(env, cat.games ?? []) });
+    return json({ studio: cat.studio, games: (cat.games ?? []).map(g => g.room?.host === 'server' && !hostedGame(g.id) ? { ...g, rulesError: RULES_WIRING_MESSAGE } : g), live: await liveCounts(env, cat.games ?? []) });
   }
   if (path === '/api/rooms') {
     const cat = await getCat();
@@ -1051,7 +1052,7 @@ async function route(request, env, ctx) {
         // The big screen picks its room now, so the QR it shows puts every phone in that same room.
         let room = asked;
         if (!room) {
-          try { room = (await (await lobby().fetch(`https://lobby/join?max=${humanSeats(pol)}&server=${srv.id}&rooms=${srv.roomsMax}${versionOf(meta?.netplay?.version) ? `&ver=${encodeURIComponent(versionOf(meta.netplay.version))}` : ''}`, { method: 'POST' })).json()).room ?? null; } catch { room = null; }
+          try { room = (await (await lobby().fetch(`https://lobby/join?host=${meta?.room?.host === 'server' ? 'server' : 'browser'}&max=${humanSeats(pol)}&server=${srv.id}&rooms=${srv.roomsMax}${versionOf(meta?.netplay?.version) ? `&ver=${encodeURIComponent(versionOf(meta.netplay.version))}` : ''}`, { method: 'POST' })).json()).room ?? null; } catch { room = null; }
         }
         const joinUrl = `${url.origin}${openPath(meta)}${room ? `?room=${encodeURIComponent(room)}` : ''}`;
         // Local development: no phone can open this computer's own address, so no code for it; the card says to deploy.
@@ -1124,7 +1125,7 @@ async function route(request, env, ctx) {
         if (not.split(',').includes(room)) return json({ ok: false, error: 'world-unavailable', message: 'This world is unavailable. Choose another named world.' }, 409);
         return json({ room, players: 0, max: humanSeats(pol), server: srv.id });
       }
-      return lobby().fetch(`https://lobby/join?max=${humanSeats(pol)}&server=${srv.id}&rooms=${srv.roomsMax}${not ? `&not=${encodeURIComponent(not)}` : ''}${ver ? `&ver=${encodeURIComponent(ver)}` : ''}${app ? '&app=1' : ''}`, { method: 'POST' });
+      return lobby().fetch(`https://lobby/join?host=${meta?.room?.host === 'server' ? 'server' : 'browser'}&max=${humanSeats(pol)}&server=${srv.id}&rooms=${srv.roomsMax}${not ? `&not=${encodeURIComponent(not)}` : ''}${ver ? `&ver=${encodeURIComponent(ver)}` : ''}${app ? '&app=1' : ''}`, { method: 'POST' });
     }
     if (sub === 'api/agent') {
       // An AI's seat (worker/agents.mjs): its pass, the server's policy, a room with people in it, a ticket.
@@ -1136,7 +1137,7 @@ async function route(request, env, ctx) {
         join: async (srv, pol) => {
           try {
             const reserve = pol.aiSeats + pol.guides;
-            const r = await (await lobby().fetch(`https://lobby/join?max=${max}&server=${srv.id}&agent=1&ai=${reserve}${versionOf(meta?.netplay?.version) ? `&ver=${encodeURIComponent(versionOf(meta.netplay.version))}` : ''}`, { method: 'POST' })).json();
+            const r = await (await lobby().fetch(`https://lobby/join?host=${meta?.room?.host === 'server' ? 'server' : 'browser'}&max=${max}&server=${srv.id}&agent=1&ai=${reserve}${versionOf(meta?.netplay?.version) ? `&ver=${encodeURIComponent(versionOf(meta.netplay.version))}` : ''}`, { method: 'POST' })).json();
             return r.room ?? null;
           } catch { return null; }
         },
@@ -1429,7 +1430,7 @@ export class Table {
   ensureHost(room, hosted) {
     if (this.hostRt || !this.game) return;
     if (!hostedGame(this.game)) {
-      if (hosted) room.failServerHost('This game runs its rules on the server, and this build of the site does not hold them. Build and deploy it again.');
+      if (hosted) room.failServerHost(RULES_WIRING_MESSAGE);
       return;
     }
     let restoring = false;
@@ -1461,7 +1462,7 @@ export class Table {
         this.finishRoom(why);
         room.forget(); room.ended = null;
         // Only a holder returning to the old match is rematched. A new visitor uses this name immediately.
-        if (!expired) room.endedMatch = { why, ver: build.build, tokens, until: Date.now() + ROOM_PAUSE_MS };
+        if (!expired && pooledRoom(this.code)) room.endedMatch = { why, ver: build.build, tokens, until: Date.now() + ROOM_PAUSE_MS };
         this.room = room; saved = null; restoring = false; boot = { epoch: 0, count: 0 };
       }
       this.roomSave = saved;
@@ -2469,7 +2470,7 @@ export class Table {
     const lobby = this.env.LOBBY.get(this.env.LOBBY.idFromName(this.game));
     // The build this room runs (section 23): the Lobby sends a visitor only to a room of the live build.
     const ver = room.gameVer === undefined ? undefined : room.gameVer ?? '';
-    this.ctx.waitUntil(lobby.fetch(`https://lobby/report?game=${encodeURIComponent(this.game)}`, { method: 'POST', body: JSON.stringify({ room: this.code, players, people, agents, ai, ...(ver !== undefined ? { ver } : {}) }) }).catch(() => {}));
+    this.ctx.waitUntil(lobby.fetch(`https://lobby/report?game=${encodeURIComponent(this.game)}`, { method: 'POST', body: JSON.stringify({ room: this.code, players, people, agents, ai, host: room.server ? 'server' : 'browser', ...(ver !== undefined ? { ver } : {}) }) }).catch(() => {}));
   }
 
   /** A round the host called over becomes one D1 row (once per round number). */
@@ -2523,6 +2524,7 @@ export class Lobby {
     ctx.blockConcurrencyWhile(async () => {
       const saved = await ctx.storage.get('lobby');
       if (saved) {
+        this.current = saved.current ?? null;
         this.next = typeof saved.next === 'number' ? { public: saved.next } : saved.next && typeof saved.next === 'object' ? { public: 1, ...saved.next } : { public: 1 };
         for (const r of saved.rooms ?? []) this.rooms.set(r.name, { ...r, server: r.server ?? roomServer(r.name), agents: r.agents ?? 0, ai: r.ai ?? 0, ver: typeof r.ver === 'string' ? r.ver : '', pending: [], agentPending: [] });
         for (const [name, until] of saved.closed ?? []) if (until > Date.now()) this.closed.set(name, until);
@@ -2550,7 +2552,7 @@ export class Lobby {
     if (list.length) this.ctx.waitUntil(this.env.DB.batch(list).catch(() => {}));
   }
 
-  save() { this.ctx.storage.put('lobby', { next: this.next, rooms: [...this.rooms.values()].map(({ name, players, agents, ai, server, at, ver }) => ({ name, players, agents, ai, server, at, ...(ver ? { ver } : {}) })), closed: [...this.closed] }).catch(() => {}); }
+  save() { this.ctx.storage.put('lobby', { current: this.current ?? null, next: this.next, rooms: [...this.rooms.values()].map(({ name, players, agents, ai, server, at, ver, host }) => ({ name, players, agents, ai, server, at, ...(host ? { host } : {}), ...(ver ? { ver } : {}) })), closed: [...this.closed] }).catch(() => {}); }
 
   prune(now) {
     for (const [name, r] of this.rooms) {
@@ -2578,6 +2580,17 @@ export class Lobby {
     // the build of a game that names none ('').
     const ver = versionOf(url.searchParams.get('ver')) ?? '';
     if (url.pathname === '/join') {
+      // A server build can run only its current rules. Persisted browser rooms
+      // (including pre-kind records) and old server revisions must not consume
+      // the pool or become the fallback of a server with roomsMax=1.
+      const host = url.searchParams.get('host');
+      if ((host === 'server' || host === 'browser') && (this.current?.host !== host || this.current?.ver !== ver)) {
+        this.current = { host, ver };
+        for (const [name, r] of this.rooms) if (
+          host === 'server' ? (r.host ?? 'browser') !== host || (r.ver ?? '') !== ver : r.host === 'server'
+        ) { this.rooms.delete(name); this.seen.delete(name); this.live.delete(name); }
+        this.save();
+      }
       const max = seatCount(url.searchParams.get('max'));
       const sid = url.searchParams.get('server') ?? 'public';
       const server = sid === 'public' || SERVER_ID.test(sid) ? sid : 'public';
@@ -2640,7 +2653,7 @@ export class Lobby {
       if (!room) {
         let n = this.next[server] ?? 1;
         while (not.has(roomCode(server, n)) || this.closed.has(roomCode(server, n)) || this.rooms.has(roomCode(server, n))) n += 1;
-        room = { name: roomCode(server, n), server, players: 0, agents: 0, ai: 0, at: now, ver, pending: [], agentPending: [] };
+        room = { name: roomCode(server, n), server, players: 0, agents: 0, ai: 0, at: now, ver, ...(host ? { host } : {}), pending: [], agentPending: [] };
         this.next[server] = n + 1;
         this.rooms.set(room.name, room);
       }
@@ -2659,6 +2672,11 @@ export class Lobby {
         this.save();
         return json({ ok: true, closed: body.closed > now });
       }
+      // A retiring isolate may send its last report after the new pool was
+      // selected. It cannot resurrect an incompatible public room.
+      if (pooledRoom(body.room) && this.current && (this.current.host === 'server'
+        ? (body.host ?? 'browser') !== 'server' || (body.ver ?? '') !== this.current.ver
+        : body.host === 'server')) return json({ ok: true, retired: true });
       const seated = Math.max(0, Math.floor(Number(body.players) || 0));
       const agents = Math.max(0, Math.floor(Number(body.agents) || 0));
       const ai = Math.max(agents, Math.floor(Number(body.ai) || 0));
@@ -2674,6 +2692,7 @@ export class Lobby {
       const rver = typeof body.ver === 'string' ? versionOf(body.ver) ?? '' : r.ver ?? '';
       const changed = !this.rooms.has(r.name) || r.players !== seated || (r.agents ?? 0) !== agents || (r.ai ?? 0) !== ai || (r.ver ?? '') !== rver;
       r.ver = rver;
+      if (body.host === 'server' || body.host === 'browser') r.host = body.host;
       r.pending.splice(0, grew);
       if ((r.agents ?? 0) < agents) (r.agentPending ?? []).splice(0, agents - (r.agents ?? 0));
       r.players = seated;

package/worker/pages.mjs

@@ -597,7 +597,8 @@ const SHELL_JS = String.raw`${BUILD_RETRY_JS}(function () {
       // playing in its own room: it loads again at the round's break, or at once on a big screen (nothing to lose).
       if (m.what === 'rematch' && m.room === room) {
         var fresh = new URL(location.href);
-        fresh.searchParams.delete('room'); fresh.searchParams.set('not', room);
+        if (/^(?:pub-[1-9][0-9]*|s-[a-z0-9][a-z0-9-]*-[1-9][0-9]*)$/.test(room)) { fresh.searchParams.delete('room'); fresh.searchParams.set('not', room); }
+        else { fresh.searchParams.set('room', room); fresh.searchParams.delete('not'); }
         location.replace(fresh.href);
         return;
       }
@@ -1357,7 +1358,8 @@ const WATCH_JS = String.raw`${BUILD_RETRY_JS}(function () {
       var m = ev.data;
       if (!m || typeof m !== 'object' || m.t !== 'homie-net') return;
       if (m.what === 'rematch' && m.room === room) {
-        var fresh = new URL(location.href); fresh.searchParams.delete('room'); fresh.searchParams.set('not', room);
+        var fresh = new URL(location.href); if (/^(?:pub-[1-9][0-9]*|s-[a-z0-9][a-z0-9-]*-[1-9][0-9]*)$/.test(room)) { fresh.searchParams.delete('room'); fresh.searchParams.set('not', room); }
+        else { fresh.searchParams.set('room', room); fresh.searchParams.delete('not'); }
         location.replace(fresh.href); return;
       }
       if (m.what === 'wait') updating.stop();

package/worker/rules-wiring.mjs

@@ -0,0 +1,2 @@
+/** Shared build/live diagnosis: the studio's Worker must register its generated rules. */
+export const RULES_WIRING_MESSAGE = "site/src/worker.mjs does not register this studio's server rules. Add hostRules to its import from '@homie-rocks/studio/worker', then add these two lines at module scope:\nimport rules from './rules/index.mjs';\nhostRules(rules);\nBuild and deploy again.";

package/worker/version.mjs

@@ -1,2 +1,2 @@
 /** The @homie-rocks/studio version this Worker code is (package.json's; a test keeps them equal). Cache-busts /_homie/site.js. */
-export const STUDIO_VERSION_TAG = '0.48.1';
+export const STUDIO_VERSION_TAG = '0.48.4';