@homie-rocks/studio 0.58.14 → 0.58.15

package/CHANGELOG.md

@@ -17,6 +17,16 @@ 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.58.15] - 2026-10-20
+
+**Plugin 0.58.9**
+
+A tab left open in a lobby no longer holds a studio move's drain.
+
+### Fixed
+
+- A tab left open in a lobby no longer holds a studio move's drain. Once `homie-studio drain on` has run for 5 minutes, a room still waiting in its lobby (no round started, or the last round over and its results seen) is ended: the people in it are told "This studio is moving. Please join again shortly." and their pages do not knock on the paused door again. A room with a round in progress still plays until it finishes, and a room whose results are not yet saved is never ended. `homie-studio drain status` says how many rooms it ended this way (`idleLobbiesEnded`), so you can see why the drain finished.
+
 ## [0.58.14] - 2026-10-20
 
 **Plugin 0.58.8**

package/lib/move-drain.mjs

@@ -14,5 +14,6 @@ export async function drainCommand(root,action,{run=null,fetchFn=fetch,url=null}
  if(!response.ok)throw Error('Room drain is unmeasured; keep the source running');
  const status=await response.json();
  if(typeof status.draining!=='boolean'||typeof status.drained!=='boolean')throw Error('Upgrade and deploy the toolkit before draining');
- return {ok:true,command:'drain '+action,...status,message:status.drained?'All measured rooms are empty and their pending records are delivered. The source can now be made read-only.':status.draining?'Existing rooms keep playing. New admissions are paused. Run homie-studio drain status until drained is true before freezing or changing hosts.':'Room admissions are open.'};
+ const ended=status.idleLobbiesEnded?` ${status.idleLobbiesEnded===1?'1 room was':status.idleLobbiesEnded+' rooms were'} ended while waiting in a lobby with no round running; ${status.idleLobbiesEnded===1?'its':'their'} people were told the studio is moving and to join again shortly.`:'';
+ return {ok:true,command:'drain '+action,...status,message:status.drained?'All measured rooms are empty and their pending records are delivered.'+ended+' The source can now be made read-only.':status.draining?'Existing rooms keep playing. New admissions are paused. A room still waiting in its lobby 5 minutes after the drain began is ended, and its people are told the studio is moving.'+ended+' Run homie-studio drain status until drained is true before freezing or changing hosts.':'Room admissions are open.'};
 }

package/lib/template-history.json

@@ -4596,6 +4596,48 @@
      }
     }
    }
+  },
+  "0.58.15": {
+   "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": "1dbdf22c03a1e505",
+    "site/src/worker.mjs": "6cc5c6131eaf6fd0"
+   },
+   "sections": {
+    "AGENTS.md": {
+     "(intro)": "af7f2f732505d379",
+     "## Version-matched authoring guides": "f6261a0e5801b96b",
+     "## Layout": "f3a280b8c96cd068",
+     "## Apps: one screen, roles and parts": "c10aa0441ea89702",
+     "## Commands (all through the pinned CLI in node_modules)": "c20d90de21cde0c7",
+     "## 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)": "0df5a5fe1833c624",
+     "## 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)": "8364e05cebefcba4"
+      }
+     }
+    }
+   }
   }
  }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@homie-rocks/studio",
-  "version": "0.58.14",
+  "version": "0.58.15",
   "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/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.58.14","sha256":"c7e10f373715c539c6429b931fa469f4d4c246e4e3e7fa1fda71f370724612c5"});
+export const STUDIO_BUILD = Object.freeze({"version":"0.58.15","sha256":"21d2ff598c3349a401492759f1ee0ce077752b2e3e00b8078973d3eac14197fc"});

package/worker/move-drain.mjs

@@ -14,12 +14,23 @@ export async function drainSince(env,{now=Date.now(),fresh=false}={}){
  readings.set(env.DB,{at:now,since});
  return since;
 }
+/** How long a drain counts rooms before it may say drained: an admission a few seconds late (DRAIN_TTL_MS) is counted well within it. */
+export const DRAIN_CENSUS_MS=240000;
+/** A room still waiting in its lobby this long after the drain began is ended, so a tab left open never holds a move:
+ * a minute past the census, when every late admission has been counted and a lobby has had five minutes to start. */
+export const DRAIN_IDLE_MS=300000;
+/** A round's results stay on screen this long before an idle room may end (the 5 s a launch change gives them too). */
+export const RESULTS_MS=5000;
+export const MOVING_MESSAGE='This studio is moving. Please join again shortly.';
+/** Nothing in play: no round has started, or the last one is over and its results have been seen. A live round is in
+ * play whatever its clock says (only its host says it is over), and so is a phase this toolkit does not name. */
+export function idleLobby(room,now){const r=room.lastRound;return !r||r.phase==='over'&&now-(room.roundOverAt??0)>=RESULTS_MS;}
 export function isAdmission(request){const path=new URL(request.url).pathname;return request.headers.get('upgrade')?.toLowerCase()==='websocket'||/\/api\/(lobby|agents)(\/|$)/.test(path);}
 export const drainResponse=()=>Response.json({ok:false,error:'moving',message:'This studio is moving. Existing rooms can finish; please join again shortly.'},{status:503,headers:{'retry-after':'30','cache-control':'no-store'}});
 /** Read every shard directly: cached public summaries exclude private games and hide outages. */
 export async function drainStatus(env,cat,{now=Date.now()}={}){
  const since=await drainSince(env,{fresh:true});if(!since)return {draining:false,drained:false};
- let clients=0,pending=0,rooms=0;
+ let clients=0,pending=0,rooms=0,idleLobbiesEnded=0;
  for(const game of cat.games??[]){
   const names=new Set();
   let cursor='';
@@ -36,12 +47,12 @@ export async function drainStatus(env,cat,{now=Date.now()}={}){
    for(const room of body.rooms)names.add(room.name);
   }
   for(const name of names){
-   const r=await env.TABLE.get(env.TABLE.idFromName(`${game.id}/${name}`)).fetch(`https://table/__move-status?game=${encodeURIComponent(game.id)}&room=${encodeURIComponent(name)}`);
+   const r=await env.TABLE.get(env.TABLE.idFromName(`${game.id}/${name}`)).fetch(`https://table/__move-status?game=${encodeURIComponent(game.id)}&room=${encodeURIComponent(name)}&since=${since}`);
    if(!r.ok)throw Error('Cannot measure a room while moving');
    const body=await r.json();
-   if(!Number.isSafeInteger(body.clients)||body.clients<0||!Number.isSafeInteger(body.pending)||body.pending<0)throw Error('Invalid room drain receipt');
-   clients+=body.clients;pending+=body.pending;rooms++;
+   if(!Number.isSafeInteger(body.clients)||body.clients<0||!Number.isSafeInteger(body.pending)||body.pending<0||typeof body.idleEnded!=='boolean')throw Error('Invalid room drain receipt');
+   clients+=body.clients;pending+=body.pending;rooms++;if(body.idleEnded)idleLobbiesEnded++;
   }
  }
- return {draining:true,since,clients,pending,rooms,drained:now-since>=240000&&clients===0&&pending===0};
+ return {draining:true,since,clients,pending,rooms,idleLobbiesEnded,idleEndsAt:since+DRAIN_IDLE_MS,drained:now-since>=DRAIN_CENSUS_MS&&clients===0&&pending===0};
 }

package/worker/room.mjs

@@ -379,6 +379,8 @@ export class NetRoom {
     // The results name every AI as AI, whatever the host's game says (section 17).
     const round = retime && this.lastRound?.n === m.round.n && this.lastRound?.phase === m.round.phase ? { ...m.round, ...(this.lastRound.results ? { results: this.lastRound.results } : {}) } : Array.isArray(m.round.results) ? { ...m.round, results: this.labelResults(m.round.results) } : m.round;
     const wasLive = this.lastRound && this.lastRound.phase === 'live' ? Number(this.lastRound.n) : null;
+    // When the results went up: a studio move's drain lets them be seen before it ends an idle room (move-drain.mjs).
+    if (round.phase === 'over' && !(this.lastRound?.phase === 'over' && this.lastRound.n === round.n)) this.roundOverAt = this.now();
     this.lastRound = round;
     // The round a launch change waits for is over: everyone sees its results for a moment, then the room re-gates.
     if (this.regate && round.phase === 'over' && (this.regate.roundN === null || Number(round.n) >= this.regate.roundN)) this.regate.until = Math.min(this.regate.until, this.now() + 5000);

package/worker/table.mjs

@@ -1,4 +1,5 @@
 import {lobbyFor} from './lobby-shards.mjs';
+import {DRAIN_IDLE_MS,MOVING_MESSAGE,drainSince,idleLobby} from './move-drain.mjs';
 import {relayStream} from './relay-channel.mjs';
 import {roomSessions,restoreRoomFields} from './room-sessions.mjs';
 import {idleChatSnapshot,restoreIdleChat,readIdleChat,writeIdleChat,expireIdleChat} from './idle-chat.mjs';
@@ -526,6 +527,26 @@ export class Table {
     this.report();
   }
 
+  /**
+   * A studio move's drain ends a room left waiting in its lobby (no round running, no record waiting; the caller
+   * checked both). Its people are told the studio is moving, as a final word, so no page knocks on the paused door,
+   * and the room forgets everything, as an empty one does.
+   */
+  endForMove(room) {
+    const people = room.live().length;
+    if (this.hostRt) this.finishRoom('moving'); else this.tellLobby({ ended: true });
+    for (const c of [...room.clients.values()]) {
+      if (c.helloed) room.error(c, 'room-over', MOVING_MESSAGE);
+      room.clients.delete(c.id);
+      try { c.conn.close(1000, 'room-over'); } catch { /* gone */ }
+    }
+    room.emptySince = Date.now();
+    room.forget();
+    if (this.house) this.house.sync();
+    this.say({ ev: 'move-idle-ended', people });
+    this.report();
+  }
+
   /**
    * The room's part of the alarm (section 4.5 of the design). A room nobody came back to within a minute of its
    * pause ends: the relay forgets it and its stored seats go (`office` and `recorded` stay). A room in play keeps an
@@ -1090,11 +1111,24 @@ export class Table {
     // The back office (worker/office.mjs), from the studio's Worker only: the room as its owner sees it, and the
     // owner's signed controls, which this room verifies before it applies one (NETPLAY.md section 15).
     if (url.pathname === '/__move-status') {
-      await this.flushRoundRecords();await this.flushFunctionEvents();
       const sql=this.ctx.storage.sql;
-      let pending=0;
-      for(const name of ['round_outbox','function_outbox'])if(sql?.exec("SELECT name FROM sqlite_master WHERE name=?",name).toArray().length)pending+=Number(sql.exec('SELECT COUNT(*) AS n FROM '+name).toArray()[0].n);
-      return json({clients:room.live().length,pending});
+      const pendingNow=async()=>{
+        await this.flushRoundRecords();await this.flushFunctionEvents();
+        let n=0;
+        for(const name of ['round_outbox','function_outbox'])if(sql?.exec("SELECT name FROM sqlite_master WHERE name=?",name).toArray().length)n+=Number(sql.exec('SELECT COUNT(*) AS n FROM '+name).toArray()[0].n);
+        return n;
+      };
+      let pending=await pendingNow();
+      // The drain's deadline for a room left waiting in its lobby (worker/move-drain.mjs). The drain itself is read
+      // here, not taken from the request, and the room remembers which drain ended it so every census counts it.
+      const since=Number(url.searchParams.get('since'));
+      let idleEnded=Number.isSafeInteger(since)&&since>0&&await this.ctx.storage.get('move-idle-ended')===since;
+      if(!idleEnded&&!pending&&room.live().length&&!this.isPersistent()&&idleLobby(room,Date.now())&&Date.now()-since>=DRAIN_IDLE_MS&&await drainSince(this.env,{fresh:true})===since){
+        await this.ctx.storage.put('move-idle-ended',since);
+        this.endForMove(room);idleEnded=true;
+        pending=await pendingNow();
+      }
+      return json({clients:room.live().length,pending,idleEnded});
     }
     if (url.pathname === '/__facts') return json({ ...room.officeFacts(), gates: [...(this.gateMetrics?.values() ?? [])], durability: this.storageHealth ?? { ok: true }, ...(this.house ? { brains: this.house.facts() } : {}) });
     // A chat line as the room keeps it (section 19), for a report: the Worker files the room's own copy, never a reporter's.

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.58.14';
+export const STUDIO_VERSION_TAG = '0.58.15';