@homie-rocks/studio 0.58.14 → 0.58.16

package/CHANGELOG.md

@@ -17,6 +17,27 @@ 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.16] - 2026-10-21
+
+**Plugin 0.58.10**
+
+A failed deploy says what Cloudflare or the host actually refused.
+
+### Fixed
+
+- A failed deploy whose Worker uses a queue no longer says the token needs Account > Queues > Edit unless Cloudflare refused a Queues request for authentication. Any other failure, an asset upload for one, now shows Wrangler's own error.
+- When the host refuses a database call during a deploy, the reason it gives (for example "A routine does not publish the live site: the owner does.") now shows after "D1 migrations failed" instead of being cut off by Wrangler's closing lines. The same goes for creating the database and registering the studio's functions.
+
+## [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/cloudflare.mjs

@@ -57,12 +57,26 @@ import { LOCAL_STATE, configPath, domainOrigin, isRulesGame, isWorkersDev, layou
 const ANSI = /\u001b\[[0-9;]*m/g;
 
 /** Keep Wrangler's error and its context; progress/footer lines must not hide it. */
-export function wranglerDeployError(out) {
+export function wranglerError(out) {
   const clean = redactText(String(out ?? '').replace(ANSI, '')).text;
   const error = clean.search(/(?:^|\n)[^\n]*\[ERROR\]/);
   return (error >= 0 ? clean.slice(error) : clean).trim();
 }
 
+/**
+ * Each Cloudflare API request Wrangler reports as failed, with the codes Cloudflare answered it with. Wrangler prints
+ * "[ERROR] A request to the Cloudflare API (/accounts/<id>/queues?name=…) failed." and then each of Cloudflare's errors
+ * as "<message> [code: <n>]" (workers-utils cfetch throwFetchError).
+ */
+export function failedRequests(out) {
+  const text = String(out ?? '').replace(ANSI, '');
+  return [...text.matchAll(/\[ERROR\] A request to the Cloudflare API \(([^)\s]+)\) failed\.([\s\S]*?)(?=\n[^\n]*\[ERROR\]|$)/g)]
+    .map(([, resource, notes]) => ({ resource, codes: [...notes.matchAll(/\[code: (\d+)\]/g)].map((m) => Number(m[1])) }));
+}
+// The codes Wrangler itself treats as an authentication error (wrangler's AUTHENTICATION_ERROR_CODES): a token
+// without the permission the request needs is answered with 10000, "Authentication error".
+const AUTH_CODES = new Set([9106, 10000]);
+
 export function experienceAddresses(root, id, url) {
   const app = listGames(root).find(g => g.id === id)?.kind === 'app';
   return { [app ? 'open' : 'play']: url ? `${url}/${id}/${app ? 'open' : 'play'}` : null, wall: url ? `${url}/${id}/tv` : null };
@@ -132,7 +146,9 @@ function parseJson(text) {
 export function explainCloudflare(out, accountId = null) {
   const text = String(out ?? '');
   const dash = accountId ? `https://dash.cloudflare.com/${accountId}` : 'https://dash.cloudflare.com';
-  if (/queue.*(?:permission|authentication|forbidden|unauthori)|(?:permission|authentication|forbidden|unauthori).*queue/is.test(text)) {
+  // Only a Queues API request Cloudflare refused for authentication: a failed deploy that merely binds a queue keeps
+  // Wrangler's own error.
+  if (failedRequests(text).some((r) => /\/accounts\/[^/]+\/queues(?:[/?]|$)/.test(r.resource) && r.codes.some((c) => AUTH_CODES.has(c)))) {
     return {needs:'queues-permission',why:'The deployment token needs Account > Queues > Edit on this account. Update the CI/Workers Builds token permissions, then retry deploy.'};
   }
   if (/(?:cron|schedule).*?(?:limit|maximum|exceed)|(?:limit|maximum|exceed).*?(?:cron|schedule)/i.test(text)) {
@@ -388,7 +404,7 @@ async function deployLocked(root, { log = () => {}, homie, fetchFn = null, ownRo
     if (exists.code === 0) {
       return { ok: false, command: 'deploy', why: `A Worker named "${cf.worker}" already exists on this Cloudflare account and this studio did not create it, so nothing was deployed. Pick another name in studio.json (cloudflare.worker) and site/wrangler.jsonc (name).` };
     }
-    if (!/10007|does not exist/i.test(exists.out)) return refuse(`could not check the Worker name: ${exists.out.trim().split('\n').slice(-3).join(' ')}`, exists.out);
+    if (!/10007|does not exist/i.test(exists.out)) return refuse(`could not check the Worker name: ${wranglerError(exists.out)}`, exists.out);
   }
 
   // D1.
@@ -401,7 +417,7 @@ async function deployLocked(root, { log = () => {}, homie, fetchFn = null, ownRo
   if (!db) {
     const made = w(['d1', 'create', cf.d1]);
     const id = /"?database_id"?\s*[:=]\s*"([0-9a-f-]{36})"/.exec(made.out)?.[1];
-    if (made.code !== 0 || !id) return refuse(`could not create the D1 database "${cf.d1}": ${made.out.trim().split('\n').slice(-4).join(' ')}`, made.out);
+    if (made.code !== 0 || !id) return refuse(`could not create the D1 database "${cf.d1}": ${wranglerError(made.out)}`, made.out);
     db = { name: cf.d1, uuid: id };
     remember(`d1:${cf.d1}`);
     step(`created D1 ${cf.d1}`);
@@ -431,11 +447,11 @@ async function deployLocked(root, { log = () => {}, homie, fetchFn = null, ownRo
   for (const added of ensureMigrations(root)) step(`added ${added} (${migrationWord(added)})`);
   try {await ensureBackgroundQueues(root,w,{accountId,...(fetchFn?{fetchFn}:{})});for(const key of readStudio(root).cloudflare.created??[])created.add(key);} catch(error) {return refuse(error.message);}
   const migrate = w(['d1', 'migrations', 'apply', cf.d1, '--remote']);
-  if (migrate.code !== 0) return refuse(`D1 migrations failed: ${migrate.out.trim().split('\n').slice(-4).join(' ')}`, migrate.out);
+  if (migrate.code !== 0) return refuse(`D1 migrations failed: ${wranglerError(migrate.out)}`, migrate.out);
   try {const replication=await enableReadReplication(root,w,{accountId,databaseId:db.uuid,...(fetchFn?{fetchFn}:{})});step(replication.enabled?'D1 read replication enabled':`D1 uses the primary: ${replication.reason}`);} catch(error) {step(`D1 uses the primary: ${error.message}`);}
   step('D1 migrations applied');
   const subscriptions=w(['d1','execute',cf.d1,'--remote','--command',(await import('./functions-build.mjs')).functionDeploymentSQL(root)]);
-  if(subscriptions.code!==0)return refuse('Could not register studio functions',subscriptions.out);
+  if(subscriptions.code!==0)return refuse(`Could not register studio functions: ${wranglerError(subscriptions.out)}`,subscriptions.out);
 
   const started = Date.now();
   let dep = w(['deploy', ...(workerEntry(root) ? [workerEntry(root)] : []), ...repoVar(root)]);
@@ -447,7 +463,7 @@ async function deployLocked(root, { log = () => {}, homie, fetchFn = null, ownRo
     step(address.created ? 'registered the account’s workers.dev address automatically' : 'kept the account’s existing workers.dev address');
     dep = w(['deploy', ...(workerEntry(root) ? [workerEntry(root)] : []), ...repoVar(root)]);
   }
-  if (dep.code !== 0) return refuse(`wrangler deploy failed: ${wranglerDeployError(dep.out)}`, dep.out);
+  if (dep.code !== 0) return refuse(`wrangler deploy failed: ${wranglerError(dep.out)}`, dep.out);
   try{await ensureStudioSigningKey(readStudio(root),w);}catch(error){return refuse(error.message);}
   if (paidReleases(root).length) {
     const bin = wranglerBin(root);
@@ -658,11 +674,11 @@ export async function ciDeploy(root, { log = () => {}, wrangler = null, preview
   const apply = () => w(['d1', 'migrations', 'apply', names.binding, '--remote']);
   let migrate = apply();
   const first = !target && migrate.code !== 0 && /not found|could(?:n't| not) find|does not exist|no database|database_id/i.test(migrate.out);
-  if (migrate.code !== 0 && !first) return refuse(`D1 migrations failed: ${migrate.out.trim().split('\n').slice(-4).join(' ')}`, migrate.out);
+  if (migrate.code !== 0 && !first) return refuse(`D1 migrations failed: ${wranglerError(migrate.out)}`, migrate.out);
   if (!first) step('D1 migrations applied');
   const register=()=>w(['d1','execute',names.binding,'--remote','--command',functionDeploymentSQL(root)]);
   const {functionDeploymentSQL}=await import('./functions-build.mjs');
-  if(!first) {const registered=register();if(registered.code!==0)return refuse('Could not register studio functions',registered.out);}
+  if(!first) {const registered=register();if(registered.code!==0)return refuse(`Could not register studio functions: ${wranglerError(registered.out)}`,registered.out);}
   step(`Cron triggers: ${(readConfig(root)?.triggers?.crons??[]).join('; ')||'none (remove toolkit triggers)'}`);
   // Workers AI (0.17.0): bound only when a server's AI guides think with it. The checkout is thrown away after.
   if (!first && needsWorkersAi(root, w, names.binding)) {
@@ -674,16 +690,16 @@ export async function ciDeploy(root, { log = () => {}, wrangler = null, preview
   }
   const started = Date.now();
   const dep = w(['deploy', ...(workerEntry(root) ? [workerEntry(root)] : []), ...repoVar(root)]);
-  if (dep.code !== 0) return refuse(`wrangler deploy failed: ${wranglerDeployError(dep.out)}`, dep.out);
+  if (dep.code !== 0) return refuse(`wrangler deploy failed: ${wranglerError(dep.out)}`, dep.out);
   try{await ensureStudioSigningKey(readStudio(root),w);}catch(error){return refuse(error.message);}
   step(`deployed ${names.worker ?? 'the Worker'} in ${Math.round((Date.now() - started) / 1000)} s`);
   const repo = repoOf(root);
   step(repo ? `the live site knows its GitHub repository (${repo}), for the Claude app's hand-off` : 'no GitHub repository found here (no HOMIE_REPO, studio.json "github" or git remote): the Claude app\'s card asks the person which it is');
   if (first) {
     migrate = apply();
-    if (migrate.code !== 0) return refuse(`D1 migrations failed after the first deploy: ${migrate.out.trim().split('\n').slice(-4).join(' ')}`, migrate.out);
+    if (migrate.code !== 0) return refuse(`D1 migrations failed after the first deploy: ${wranglerError(migrate.out)}`, migrate.out);
     step('D1 migrations applied (the database was created with this first deploy)');
-    const registered=register();if(registered.code!==0)return refuse('Could not register studio functions',registered.out);
+    const registered=register();if(registered.code!==0)return refuse(`Could not register studio functions: ${wranglerError(registered.out)}`,registered.out);
   }
   try {const replication=await enableReadReplication(root,w);step(replication.enabled?'D1 read replication enabled':`D1 uses the primary: ${replication.reason}`);} catch(error) {step(`D1 uses the primary: ${error.message}`);}
   // The live address, from what Wrangler printed (a custom domain in studio.json wins).
@@ -735,7 +751,7 @@ export async function storageAdd(root, { log = () => {} } = {}) {
   const buckets = w(['r2', 'bucket', 'list']);
   if (buckets.code !== 0) {
     if (/enable R2|R2 is not enabled|10042|purchase|subscription|payment/i.test(buckets.out)) return enable;
-    return { ok: false, command: 'storage add', ...(explainCloudflare(buckets.out, accountId) ?? { why: `could not list R2 buckets: ${buckets.out.trim().split('\n').slice(-3).join(' ')}` }) };
+    return { ok: false, command: 'storage add', ...(explainCloudflare(buckets.out, accountId) ?? { why: `could not list R2 buckets: ${wranglerError(buckets.out)}` }) };
   }
   const names = [...buckets.out.matchAll(/^name:\s+(\S+)/gm)].map((m) => m[1]);
   if (names.includes(bucket)) {
@@ -744,7 +760,7 @@ export async function storageAdd(root, { log = () => {} } = {}) {
   const made = w(['r2', 'bucket', 'create', bucket]);
   if (made.code !== 0) {
     if (/enable R2|R2 is not enabled|10042|purchase|subscription|payment/i.test(made.out)) return enable;
-    return { ok: false, command: 'storage add', why: `could not create the R2 bucket "${bucket}": ${made.out.trim().split('\n').slice(-4).join(' ')}` };
+    return { ok: false, command: 'storage add', why: `could not create the R2 bucket "${bucket}": ${wranglerError(made.out)}` };
   }
   created.add(`r2:${bucket}`);
   const next = { ...readStudio(root), cloudflare: { ...readStudio(root).cloudflare, accountId, r2: bucket, created: [...created].sort() } };
@@ -844,7 +860,7 @@ export async function mediaMove(root, { paths = null, dryRun = false, verify = f
     // Where the file is meanwhile: on the site when it fits; a bigger one keeps an older R2 copy, or waits.
     const meanwhile = r.bytes <= MAX_ASSET_BYTES ? ' It stays on the site.' : r.held ? ' Its page keeps playing the older copy in R2.' : ' At this size the site cannot carry it, so its page waits until it is in R2.';
     if (put.code !== 0) {
-      failed.push({ path: r.path, bytes: r.bytes, why: `${explainCloudflare(put.out, account)?.why ?? `the upload failed: ${put.out.trim().split('\n').slice(-3).join(' ')}`}${meanwhile}` });
+      failed.push({ path: r.path, bytes: r.bytes, why: `${explainCloudflare(put.out, account)?.why ?? `the upload failed: ${wranglerError(put.out)}`}${meanwhile}` });
       continue;
     }
     const got = await hashRemote(bin, `${bucket}/${key}`, opts);

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,90 @@
      }
     }
    }
+  },
+  "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"
+      }
+     }
+    }
+   }
+  },
+  "0.58.16": {
+   "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.16",
   "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.16","sha256":"b981661e89026fb01e4ebd4e0cc06a403b0f90a5b22cf07d3425afcf6f99b075"});

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.16';