@homie-rocks/studio 0.58.2 → 0.58.4

package/CHANGELOG.md

@@ -17,6 +17,40 @@ 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.4] - 2026-10-18
+
+**Plugin 0.58.2**
+
+An open app rests while nobody is changing it. The live connection sleeps with the records object, and a studio MCP client no longer holds an event stream open.
+
+### Fixed
+
+- The open app keeps a hibernating WebSocket. The page renews its role cookie on the Worker every four minutes, so an idle app does not keep the records object awake.
+- A GET of the studio MCP endpoint answers 405. The client treats that as no event stream and does not reconnect. Asking for `events/stream` still works for that one request, and it no longer sends a heartbeat that would wake the object again.
+- 0.58.3 stopped the 15 second heartbeat. The open stream itself still held the object awake for as long as the page was open. This version closes that hold.
+
+### Upgrade notes
+
+- Upgrade the studio to pick this up. A page left open on the older app shell keeps asking for the old stream. The Worker answers 426 and does not wake the records object. Reload the page to open the socket.
+
+## [0.58.3] - 2026-10-18
+
+**Plugin 0.58.2**
+
+An idle studio no longer keeps its lobby awake. Reading who is playing uses the summary already stored for the lounge, and a room that is merely sitting there lets its lobby shard hibernate.
+
+### Fixed
+
+- Who is playing, the office and the room list read the lobby summary instead of waking all 16 lobby shards.
+- A lobby shard publishes that summary in the report itself. It no longer sets a 10 second alarm, which had kept the shard awake for as long as anyone was seated.
+- A room with nobody new arriving reports again after two and a half minutes, which is long enough for the shard to sleep and short enough that "playing now" still includes it.
+- An open event stream or app stream no longer heartbeats every 15 seconds. That heartbeat was shorter than eviction, so the lobby stayed awake for as long as the page was open.
+- The live count on a game page reads today's peak from the stats table. It no longer wakes the peak object every 15 seconds.
+
+### Upgrade notes
+
+- Upgrade the studio to pick this up. Until then, an open office or stats page still wakes every lobby shard.
+
 ## [0.58.2] - 2026-10-17
 
 **Plugin 0.58.2**

package/lib/template-history.json

@@ -4260,6 +4260,90 @@
      }
     }
    }
+  },
+  "0.58.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": "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.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": "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.2",
+  "version": "0.58.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/worker/app-shell.mjs

@@ -49,14 +49,22 @@ export const APP_SHELL_JS = String.raw`(function () {
   }
   function context() {var room=new URLSearchParams(location.search).get('room');return {app:boot.game,origin:location.origin,url:location.origin+'/'+boot.game+'/open'+(room&&/^[A-Za-z0-9_-]{1,32}$/.test(room)?'?room='+encodeURIComponent(room):''),presence:presence,now:clock};}
   function sendContext(){frame?.contentWindow?.postMessage({type:'homie-app-context',context:context()},'*');}
+  var delay=5000,stopped=false,renewTimer=null;
   function connect(){
-    live?.close();
+    if(stopped)return;
+    try{if(live){live.onclose=null;live.close();}}catch(e){}
     var q=query();collections.forEach(function(c){q.append('collection',c);});
-    live=new EventSource((boot.site||'')+'/'+boot.game+'/api/app/live?'+q);
+    var origin=boot.site||location.origin||'';
+    var http=(origin?origin:'')+'/'+boot.game+'/api/app/live?'+q;
+    // A hibernating socket. An idle page does not poll this object. The role cookie is renewed by an ordinary request.
+    live=new WebSocket(/^https?:/.test(http)?http.replace(/^http/,'ws'):http);
+    live.onopen=function(){delay=5000;};
     live.onmessage=function(e){var value=JSON.parse(e.data);if(presence!==value.presence){presence=value.presence;sendContext();}if(value.collections?.length){share({invalidate:true});Promise.allSettled([...pending.values()]).then(function(){share({invalidate:true});frame?.contentWindow?.postMessage({type:'homie-app-changed',collections:value.collections},'*');});}};
+    live.onclose=function(e){if(stopped||(e&&e.code===4403))return;if(typeof setTimeout==='function'){setTimeout(connect,delay);delay=Math.min(delay*2,120000);}};
+    if(!renewTimer&&typeof setInterval==='function')renewTimer=setInterval(function(){fetch((boot.site||'')+'/'+boot.game+'/api/app/live?renew=1&'+query()).catch(function(){});},240000);
   }
   window.homieApp=Object.freeze({get context(){return context();},setTestClock:function(value){if(!boot.test)throw new Error('Local proof session required');if(value!==null&&!Number.isFinite(value))throw new Error('Invalid clock');clock=value;sendContext();}});
-  addEventListener('pagehide',function(){live?.close();});
+  addEventListener('pagehide',function(){stopped=true;if(renewTimer)clearInterval(renewTimer);try{live&&live.close();}catch(e){}});
   addEventListener('message', async function (e) {
     var m = e.data;
     if(frame&&e.source===frame.contentWindow&&m?.type==='homie-app-context'){sendContext();return;}

package/worker/app-streams.mjs

@@ -32,10 +32,22 @@ export async function pushAppRecords(env,cat){
 export class AppRecordStreams {
  constructor(env,ctx){this.env=env;this.ctx=ctx;this.streams=new Set();}
  dispose(){for(const s of [...this.streams])this.close(s);}
- close(s){if(!this.streams.delete(s))return;clearInterval(s.timer);clearTimeout(s.reconnect);try{s.controller.close();}catch{/* The reader already cancelled or the stream already closed. */}this.presence();}
+ close(s){if(!s||s.closed||!this.streams.delete(s))return;s.closed=true;clearTimeout(s.timer);clearTimeout(s.reconnect);try{s.controller?.close();}catch{/* The reader already cancelled or the stream already closed. */}try{if(s.socket&&s.socket.readyState!==3)s.socket.close(s.deny?4403:1000,'closed');}catch{/* already closed */}if(s.id)void this.ctx.storage?.delete?.('app-live:'+s.id);this.presence();}
+ async closeSocket(socket){await this.attachHibernated();const id=socket?.deserializeAttachment?.()?.id;const s=[...this.streams].find(x=>x.socket===socket||(id&&x.id===id));if(s)this.close(s);else if(id){void this.ctx.storage?.delete?.('app-live:'+id);this.presence();}}
  count(s){return [...this.streams].filter(x=>x.app===s.app&&x.room===s.room).length;}
- send(s,data){if(s.controller.desiredSize<=0){this.close(s);return;}try{s.controller.enqueue(frame(data));}catch{this.close(s);}}
+ send(s,data){const text=JSON.stringify(data);if(s.socket){try{s.socket.send(text);}catch{this.close(s);}return;}if(!s.controller||s.controller.desiredSize<=0){this.close(s);return;}try{s.controller.enqueue(frame(data));}catch{this.close(s);}}
  presence(){for(const s of this.streams)this.send(s,{presence:this.count(s)});}
+ async attachHibernated(){
+  if(!this.ctx.getWebSockets)return;
+  for(const socket of this.ctx.getWebSockets()){
+   const attachment=socket.deserializeAttachment?.();
+   if(!attachment||attachment.v!==1||[...this.streams].some(s=>s.id===attachment.id))continue;
+   const saved=await this.ctx.storage?.get?.('app-live:'+attachment.id);
+   if(!saved){try{socket.close(1011,'missing');}catch{/* already closed */}continue;}
+   const headers=saved.headers??{};
+   this.streams.add({...saved,seen:new Map(saved.seen??[]),socket,id:attachment.id,url:new URL(saved.url),request:new Request(saved.url,{headers}),meta:saved.meta});
+  }
+ }
  async authorized(s){
   const access=await appAccess(s.request,this.env,s.meta,s.url);
   if(!access.ok||s.collections.some(c=>!access.can.includes('read:'+c)))return false;
@@ -45,19 +57,23 @@ export class AppRecordStreams {
  async revisions(s){return (await this.env.DB.prepare("SELECT collection,revision FROM app_record_revisions WHERE app=?1 UNION ALL SELECT '*',COALESCE(SUM(r.revision),0) FROM app_tool_namespaces a JOIN tool_data_revisions r ON r.namespace=a.namespace WHERE a.app=?1").bind(s.app).all()).results;}
  async open({meta,url,headers,collections=[]}){
   if(!Array.isArray(collections)||collections.some(c=>typeof c!=='string'||!Object.hasOwn(meta.records?.collections??{},c)))return new Response('unknown collection',{status:400});
-  const s={meta,url:new URL(url),request:new Request(url,{headers}),collections,seen:new Map()};
+  const s={id:crypto.randomUUID(),meta,url:new URL(url),request:new Request(url,{headers}),collections,seen:new Map()};
   if(!await this.authorized(s))return new Response('role cannot read collections',{status:403});
   const session=await localSession(s.request,this.env);
   s.app=session?.app===meta.id&&session.scope?`${meta.id}:check:${session.scope}`:meta.id;
   s.room=s.url.searchParams.get('room')??'main';
   for(const row of await this.revisions(s))s.seen.set(row.collection,row.revision);
+  const cookie=headers?.cookie??headers?.Cookie;
+  if(this.ctx.storage?.put)await this.ctx.storage.put('app-live:'+s.id,{app:s.app,room:s.room,collections:s.collections,seen:[...s.seen],url:String(s.url),headers:cookie?{cookie}:{},meta});
+  const hello=()=>{this.streams.add(s);this.send(s,{collections:s.collections,presence:this.count(s),reset:true});for(const other of this.streams)if(other!==s)this.send(other,{presence:this.count(other)});};
+  // A hibernating socket sleeps while the page is open. The browser renews the short role cookie on its own request, not from this object.
+  if(typeof WebSocketPair!=='undefined'&&this.ctx.acceptWebSocket){
+   const pair=new WebSocketPair(),client=pair[0]??Object.values(pair)[0],server=pair[1]??Object.values(pair)[1];
+   s.socket=server;server.serializeAttachment?.({v:1,id:s.id});this.ctx.acceptWebSocket(server);hello();
+   return new Response(null,{status:101,webSocket:client,headers:{'cache-control':'no-store'}});
+  }
   const body=new ReadableStream({start:controller=>{s.controller=controller;},cancel:()=>this.close(s)});
-  this.streams.add(s);this.send(s,{collections:s.collections,presence:this.count(s),reset:true});
-  for(const other of this.streams)if(other!==s)this.send(other,{presence:this.count(other)});
-  // A fresh HTTP response renews the role cookie; SSE frames cannot set cookies.
-  s.reconnect=setTimeout(()=>this.close(s),240000);
-  // Recovery after a missed wake; this is not the screen's refresh clock.
-  s.timer=setInterval(()=>this.ctx.waitUntil(this.pump(s,true)),15000);
+  hello();
   return new Response(body,{headers:{'content-type':'text/event-stream','cache-control':'no-store'}});
  }
  async pump(s,recheck=false){
@@ -66,9 +82,9 @@ export class AppRecordStreams {
    const changed=new Set();
    for(const row of await this.revisions(s)){if(s.seen.get(row.collection)!==row.revision){if(row.collection==='*')for(const c of s.collections)changed.add(c);else if(s.collections.includes(row.collection))changed.add(row.collection);}s.seen.set(row.collection,row.revision);}
    if(!changed.size&&!recheck)return;
-   if(!await this.authorized(s)){this.close(s);return;}
+   if(!await this.authorized(s)){s.deny=true;this.close(s);return;}
    this.send(s,{collections:[...changed],presence:this.count(s)});
   }catch{this.close(s);}finally{s.busy=false;if(s.dirty){s.dirty=false;await this.pump(s);}}
  }
- async wake(meta){for(const s of this.streams)if(meta)s.meta=meta;await Promise.all([...this.streams].map(s=>this.pump(s)));return new Response('ok');}
+ async wake(meta){await this.attachHibernated();for(const s of this.streams)if(meta)s.meta=meta;await Promise.all([...this.streams].map(s=>this.pump(s)));return new Response('ok');}
 }

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.2","sha256":"5186ba06317a7de1677209dbbba72ee69d4e1cf79a08b46c74e9c20bd92e74a7"});
+export const STUDIO_BUILD = Object.freeze({"version":"0.58.4","sha256":"b84e08e7d2231f25b1b37bde4dd66be05b02a2bc500a601740de08b15b437738"});

package/worker/event-resources.mjs

@@ -93,8 +93,7 @@ export class EventStreams {
       stream.toolSignature=await this.toolSignature(input.tools??[],caller);
       stream.eventSignature=JSON.stringify(await listEvents(this.env,input.cat,caller));
       await this.env.DB.prepare('INSERT INTO mcp_kv(key,value,expires) VALUES(?1,?2,?3) ON CONFLICT(key) DO UPDATE SET value=excluded.value,expires=excluded.expires').bind('tools-stream:'+connection,JSON.stringify({connection}),Math.floor(Date.now()/1000)+300).run();
-      stream.reconnect=setTimeout(()=>this.close(stream),240000);
-      stream.reconnect?.unref?.();
+      // No timer. Production MCP GET never opens this. A caller that does is holding its own request.
       // Replay and later wakes share one ordered pump. Backpressure must not
       // hold up the writer's request or a function handler.
       this.background(input);

package/worker/lazy-objects.mjs

@@ -16,6 +16,9 @@ export class Lobby {
   }
   async fetch(request) {await this.ready;return this.lobby.fetch(request);}
   async alarm() {await this.ready;return this.lobby.alarm();}
+  async webSocketMessage(...args) {await this.ready;return this.lobby.webSocketMessage(...args);}
+  async webSocketClose(...args) {await this.ready;return this.lobby.webSocketClose(...args);}
+  async webSocketError(...args) {await this.ready;return this.lobby.webSocketError(...args);}
 }
 
 export class Gate {
@@ -34,6 +37,9 @@ export class AppRecordHub {
     this.ready=ctx.blockConcurrencyWhile(async()=>{this.hub=new (await import('./stream-objects.mjs')).AppRecordHub(ctx,env);});
   }
   async fetch(request) {await this.ready;return this.hub.fetch(request);}
+  async webSocketMessage(...args) {await this.ready;return this.hub.webSocketMessage(...args);}
+  async webSocketClose(...args) {await this.ready;return this.hub.webSocketClose(...args);}
+  async webSocketError(...args) {await this.ready;return this.hub.webSocketError(...args);}
 }
 export class EventHub {
   constructor(ctx,env) {

package/worker/lobby-peak.mjs

@@ -1,4 +1,5 @@
 import {counter,today} from './stats.mjs';
+import {PRESENCE_MS} from './lobby-summary.mjs';
 
 // One total per bookkeeping shard, never a sum of independent historical peaks.
 // Reports carry their observation time so a delayed request cannot rewind a shard.
@@ -32,7 +33,7 @@ export class LobbyPeak {
       if(!Number.isInteger(row.shard)||row.shard<0||row.shard>=16||!Number.isFinite(row.at)||!Number.isFinite(row.players)||row.players<0)return Response.json({error:'report'},{status:400});
       if(!prior||row.at>prior.at){
         state.shards[row.shard]={players:row.players,at:row.at};
-        const concurrent=Object.values(state.shards).filter(r=>r.at>Date.now()-180000).reduce((n,r)=>n+r.players,0);
+        const concurrent=Object.values(state.shards).filter(r=>r.at>Date.now()-PRESENCE_MS).reduce((n,r)=>n+r.players,0);
         const players=Math.max(state.players,concurrent),room=Math.max(state.room,Number(row.room)||0);
         if(players>state.players||room>state.room)this.dirty=true;
         state.players=players;state.room=room;this.subject=new URL(request.url).searchParams.get('game');

package/worker/lobby-shards.mjs

@@ -1,4 +1,19 @@
 import {roomServer} from './servers.mjs';
+import {liveRoomSummaries} from './lobby-summary.mjs';
+/** Today's high water, from the counter the peak object already wrote. A read must not wake that object. */
+async function peakFromStats(env,game){
+ const peak={players:0,room:0};
+ if(!env.DB)return peak;
+ try{
+  const day=new Date().toISOString().slice(0,10);
+  const {results}=await env.DB.prepare("SELECT metric, MAX(n) AS n FROM stats_daily WHERE day=?1 AND subject=?2 AND metric IN ('peak','peak-room') GROUP BY metric").bind(day,game).all();
+  for(const row of results??[]){
+   if(row.metric==='peak')peak.players=Number(row.n)||0;
+   if(row.metric==='peak-room')peak.room=Number(row.n)||0;
+  }
+ }catch{/* before the stats table, the number is zero and the peak object stays asleep */}
+ return peak;
+}
 export const LOBBY_SHARDS=16;
 export const SHARDED_ROOM_BASE=100000000;
 export function lobbyShard(key) {
@@ -28,6 +43,19 @@ export function lobbyFor(env,game,identity='') {
       const body=JSON.parse(init?.body??await input.clone().text());
       return send(roomShard(body.room),url,init??{method:'POST',body:JSON.stringify(body)});
     }
+    // A read must not wake every shard. The shards write lobby_summaries when they take a report; one D1 read answers the office, the stats page and the lounge. /busiest still asks the shards: a watcher is matched on the live build, which the summary does not carry.
+    if(url.pathname==='/now'||url.pathname==='/rooms'||url.pathname==='/office') {
+      const summaries=await liveRoomSummaries(env);
+      if(summaries){
+        const list=summaries.get(game)??[];
+        if(url.pathname==='/rooms')return Response.json({rooms:list});
+        if(url.pathname==='/office'){
+          const rooms=list.map(r=>({room:r.name??r.room,players:r.players||0,people:r.people??r.players??0,agents:r.agents??0,ai:r.ai??0,at:r.at,server:r.server??roomServer(r.name??r.room),...(r.closedUntil?{closedUntil:r.closedUntil}:{})})).filter(r=>(r.players||0)>0||r.closedUntil).sort((a,b)=>b.players-a.players).slice(0,100);
+          return Response.json({rooms});
+        }
+        return Response.json({players:list.reduce((n,r)=>n+(Number(r.players)||0),0),rooms:list.filter(r=>(r.players||0)>0).length,peak:await peakFromStats(env,game)});
+      }
+    }
     const rows=await Promise.all(Array.from({length:LOBBY_SHARDS},async(_,shard)=>{
       const response=await send(shard,url,init);if(!response.ok)throw Error('Lobby shard unavailable');return response.json();
     }));

package/worker/lobby-summary.mjs

@@ -1,3 +1,5 @@
+/** How long a room still counts as live after its last report. Longer than the lobby heartbeat, so a quiet room stays listed while its shard hibernates. */
+export const PRESENCE_MS=240000;
 export const LIVE_ROOMS_QUERY='SELECT game,rooms,updated FROM lobby_summaries ORDER BY game LIMIT 500';
 /** Queue order is not guaranteed. An older snapshot must never replace a newer one. */
 export async function storeLobbySummary(env, message) {
@@ -10,7 +12,7 @@ export async function storeLobbySummary(env, message) {
 }
 export async function liveRoomSummaries(env) {
   if(!env.BACKGROUND||!env.DB)return null; // Older wrappers still query their Lobby.
-  const result=new Map(),since=Date.now()-180000;
+  const result=new Map(),since=Date.now()-PRESENCE_MS;
   let cursor=null;
   for(;;){
     const query=cursor===null?env.DB.prepare(LIVE_ROOMS_QUERY):env.DB.prepare('SELECT game,rooms,updated FROM lobby_summaries WHERE game>? ORDER BY game LIMIT 500').bind(cursor);

package/worker/lobby.mjs

@@ -8,6 +8,7 @@ import { ROOM_ID } from './page-policy.mjs';
 import { SERVER_ID, pooledRoom, roomCode, roomServer } from './servers.mjs';
 import { seatCount } from './seats.mjs';
 import { counter, today } from './stats.mjs';
+import { PRESENCE_MS } from './lobby-summary.mjs';
 
 import {LOBBY_APP_VERSIONS, LOBBY_ROOMS_MAX} from './lobby-limits.mjs';
 export {LOBBY_APP_VERSIONS, LOBBY_ROOMS_MAX} from './lobby-limits.mjs';
@@ -34,7 +35,7 @@ export class Lobby {
         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 r of this.rooms.values())if(r.players>0&&r.at>Date.now()-180000)this.live.set(r.name,{players:r.players,at:r.at});
+        for(const r of this.rooms.values())if(r.players>0&&r.at>Date.now()-PRESENCE_MS)this.live.set(r.name,{players:r.players,at:r.at});
         if(ctx.storage.sql)for(const row of ctx.storage.sql.exec('SELECT body,expires FROM matchmaking_reservations WHERE expires>?',Date.now()).toArray()) {
           const reservation=JSON.parse(row.body),room=this.rooms.get(reservation.room);
           if(room && reservation.pending!==false)room.pending.push(row.expires-20000);
@@ -51,7 +52,7 @@ export class Lobby {
   notePeak(room, players, game) {
     const now = Date.now();
     if (players > 0) this.live.set(room, { players, at: now }); else this.live.delete(room);
-    for (const [name, r] of this.live) if (now - r.at > 180_000) this.live.delete(name); // a room that stopped reporting
+    for (const [name, r] of this.live) if (now - r.at > PRESENCE_MS) this.live.delete(name); // a room that stopped reporting
     const day = today();
     if (this.peak.day !== day) this.peak = { day, players: 0, room: 0 };
     let all = 0;
@@ -87,10 +88,14 @@ export class Lobby {
     if(new URL(request.url).pathname==='/peak')return (this.peakStore??=new LobbyPeak(this.ctx,this.env)).fetch(request);
     if(['/match','/match-policy'].includes(new URL(request.url).pathname))return (this.matchRouter??=new MatchRouter(this.ctx,this.env)).fetch(request);
     if(new URL(request.url).pathname==='/__app_records') {
-      const {AppRecordStreams}=await import('./app-streams.mjs');
-      this.appStreams??=new AppRecordStreams(this.env,this.ctx);
+      const streams=await this.liveStreams();
+      if(request.headers.get('upgrade')?.toLowerCase()==='websocket'){
+        const meta=JSON.parse(request.headers.get('x-homie-app-meta')||'{}');
+        const page=request.headers.get('x-homie-live-page')||request.url;
+        return streams.open({meta,url:page,headers:Object.fromEntries(request.headers),collections:new URL(request.url).searchParams.getAll('collection')});
+      }
       const input=await request.json();
-      return input.op==='open'?this.appStreams.open(input):this.appStreams.wake(input.meta);
+      return input.op==='open'?streams.open(input):streams.wake(input.meta);
     }
     if(new URL(request.url).pathname==='/__studio_events') {
       const {EventStreams}=await import('./event-resources.mjs');
@@ -99,7 +104,11 @@ export class Lobby {
     }
     try {
       const response=await this.answer(request),url=new URL(request.url);
-      if(response.ok && request.method==='POST' && url.pathname==='/report' && this.env?.BACKGROUND && url.searchParams.get('game')) await this.scheduleSummary(url.searchParams.get('game'),Number(url.searchParams.get('shard'))||0);
+      if(response.ok && request.method==='POST' && url.pathname==='/report' && this.env?.BACKGROUND && url.searchParams.get('game')) {
+        const game=url.searchParams.get('game'),shard=Number(url.searchParams.get('shard'))||0;
+        // Publish in this wake. A +10s alarm restarts the idle clock and, with a heartbeat inside the eviction window, pins the shard for as long as anyone is seated.
+        this.ctx.waitUntil(this.publishSummary(game,shard).catch(error=>console.error(JSON.stringify({ev:'lobby-summary-failed',error:errorLine(error)}))));
+      }
       return response;
     } catch (error) {
       let path = '';
@@ -109,24 +118,26 @@ export class Lobby {
     }
   }
 
-  async scheduleSummary(game,shard=0) {
-    this.summaryShard=shard;
-    if(this.summaryGame!==game) {await this.ctx.storage.put('summary-game',{game,shard});this.summaryGame=game;}
-    if(!this.summaryDue) {
-      this.summaryDue=Date.now()+10000;
-      try {await this.ctx.storage.setAlarm(this.summaryDue);} catch(error) {this.summaryDue=null;throw error;}
-    }
+  async publishSummary(game,shard=0) {
+    if(!game||!this.env?.BACKGROUND)return;
+    const at=Date.now();
+    const rooms=[...this.rooms.values()].filter(r=>r.players>0&&r.at>at-PRESENCE_MS).map(({name,players,agents,ai,server,at:reported})=>({name,players,agents:agents??0,ai:ai??0,server:server??roomServer(name),at:reported}));
+    for(const [name,until] of this.closed)if(until>at&&!rooms.some(r=>r.name===name))rooms.push({name,players:0,agents:0,ai:0,server:roomServer(name),at,closedUntil:until});
+    await this.env.BACKGROUND.send({v:1,type:'lobby.snapshot',game,shard,at,rooms});
   }
+  async liveStreams(){const {AppRecordStreams}=await import('./app-streams.mjs');return this.appStreams??=new AppRecordStreams(this.env,this.ctx);}
+  webSocketMessage(){}
+  async webSocketClose(socket){return (await this.liveStreams()).closeSocket(socket);}
+  async webSocketError(socket){return (await this.liveStreams()).closeSocket(socket);}
   async alarm() {
     if(this.matchRouter)return this.matchRouter.alarm();
     if((await this.ctx.storage.list?.({prefix:'match:',limit:1}))?.size)return (this.matchRouter??=new MatchRouter(this.ctx,this.env)).alarm();
+    // A summary alarm armed by an older build. Publish once and do not arm another: an idle shard has to be able to hibernate.
     this.summaryDue=null;
     const saved=await this.ctx.storage.get('summary-game');
     const game=this.summaryGame??(typeof saved==='string'?saved:saved?.game),shard=this.summaryShard??saved?.shard??0;
-    if(!game||!this.env.BACKGROUND)return;
-    const at=Date.now();
-    const rooms=[...this.rooms.values()].filter(r=>r.players>0&&r.at>at-180000).map(({name,players,agents,ai,server,at})=>({name,players,agents:agents??0,ai:ai??0,server:server??roomServer(name),at}));
-    await this.env.BACKGROUND.send({v:1,type:'lobby.snapshot',game,shard,at,rooms});
+    if(saved)await this.ctx.storage.delete('summary-game').catch(()=>{});
+    await this.publishSummary(game,shard);
   }
 
   reservation(key,result) {
@@ -303,7 +314,7 @@ export class Lobby {
     }
     if (url.pathname === '/office') {
       // The owner's office: every room with somebody seated in the last 3 minutes, public or named, and closed ones.
-      for (const [name, r] of this.seen) if (now - r.at > 180_000) this.seen.delete(name);
+      for (const [name, r] of this.seen) if (now - r.at > PRESENCE_MS) this.seen.delete(name);
       const rooms = new Map([...this.seen.values()].map((r) => [r.room, r]));
       for (const r of this.rooms.values()) if (r.players > 0 && !rooms.has(r.name)) rooms.set(r.name, { room: r.name, players: r.players, people: r.players, agents: r.agents ?? 0, ai: r.ai ?? 0, at: r.at });
       for (const [name, until] of this.closed) if (until > now && !rooms.has(name)) rooms.set(name, { room: name, players: 0, people: 0, at: now, closedUntil: until });
@@ -311,7 +322,7 @@ export class Lobby {
     }
     if (url.pathname === '/now') {
       let players = 0;
-      for (const [name, r] of this.live) { if (Date.now() - r.at > 180_000) this.live.delete(name); else players += r.players; }
+      for (const [name, r] of this.live) { if (Date.now() - r.at > PRESENCE_MS) this.live.delete(name); else players += r.players; }
       return json({ players, rooms: this.live.size, peak: this.peak.day === today() ? { players: this.peak.players, room: this.peak.room } : { players: 0, room: 0 } });
     }
     return json({ error: 'not found' }, 404);

package/worker/mcp-event-streams.mjs

@@ -4,7 +4,7 @@ import {EVENT_ERRORS,terminalEventError,EventsError,eventError,notification,sseF
 /** Connection-scoped push subscriptions hosted by the existing per-connection Lobby. */
 export class McpEventStreams {
   constructor(env,ctx){this.env=env;this.ctx=ctx;this.streams=new Set();}
-  close(stream){if(stream.closed)return;stream.closed=true;clearInterval(stream.timer);stream.resume?.();try{stream.controller.close();}catch{/* The reader already cancelled or the stream already closed. */}this.streams.delete(stream);if(stream.registryKey)this.ctx.waitUntil(this.env.DB.prepare('DELETE FROM mcp_kv WHERE key=?1').bind(stream.registryKey).run().catch(error=>console.warn("MCP stream cleanup deferred to expiry:",error.message)));}
+  close(stream){if(stream.closed)return;stream.closed=true;clearTimeout(stream.timer);clearTimeout(stream.life);stream.resume?.();try{stream.controller.close();}catch{/* The reader already cancelled or the stream already closed. */}this.streams.delete(stream);if(stream.registryKey)this.ctx.waitUntil(this.env.DB.prepare('DELETE FROM mcp_kv WHERE key=?1').bind(stream.registryKey).run().catch(error=>console.warn("MCP stream cleanup deferred to expiry:",error.message)));}
   async write(stream,value,authorize){
     if(stream.closed)return false;
     if(stream.controller.desiredSize<=0)await new Promise(resolve=>{stream.resume=resolve;});
@@ -23,8 +23,8 @@ export class McpEventStreams {
       const stream={...input,registryKey,source:eventSource(feed),cursor:cursorOf(input.params.name,start.after),closed:false,busy:false};
       const body=new ReadableStream({start:controller=>{stream.controller=controller;controller.enqueue(sseFrame(notification('active',{cursor:stream.cursor,truncated:start.truncated},stream.id)));},pull:()=>{const resume=stream.resume;stream.resume=null;resume?.();},cancel:()=>this.close(stream)});
       this.streams.add(stream);
-      // Heartbeats also recheck authorization, catch missed wakes and renew discovery.
-      stream.timer=setInterval(()=>this.pump(stream),15000);
+      // The open body is this request. Cap it so a client that never cancels cannot hold the object past five minutes, and do not wake it again to write heartbeats.
+      stream.life=setTimeout(()=>this.close(stream),300000);
       this.pump(stream);
       return new Response(body,{headers:{'content-type':'text/event-stream','cache-control':'no-store'}});
     }catch(error){return Response.json({jsonrpc:'2.0',id:input.id,error:eventError(error)});}

package/worker/mcp-events.mjs

@@ -45,7 +45,7 @@ export async function pollEvents(env,cat,caller,params,now=Date.now()){
   const hasMore=rows.length>max,page=rows.slice(0,max);
   const events=page.map(row=>{const data=JSON.parse(row.data);if((env.HOMIE_LOCAL_TEST_SECRET||caller.remoteTest)&&caller.localTest&&caller.testScope&&feed.event==='record.changed')data.app=feed.app;return occurrence(params.name,{...row,data},cursorOf(params.name,row.seq));});
   const after=hasMore?page.at(-1).seq:start.through;
-  return {events,cursor:cursorOf(params.name,after),truncated:start.truncated,hasMore,nextPollMs:5000};
+  return {events,cursor:cursorOf(params.name,after),truncated:start.truncated,hasMore,nextPollMs:180000};
 }
 async function subId(caller,params,url){const bytes=await crypto.subtle.digest('SHA-256',new TextEncoder().encode(JSON.stringify([caller.id,url,params.name,{}])));return 'sub_'+Array.from(new Uint8Array(bytes),b=>b.toString(16).padStart(2,'0')).join('');}
 async function stored(env,id){const row=await env.DB.prepare('SELECT value FROM mcp_kv WHERE key=?1').bind(prefix+id).first();return row?JSON.parse(row.value):null;}

package/worker/mcp.mjs

@@ -9,7 +9,7 @@ function freshErrorMessage(error,env,caller) {
   return message;
 }
 import {localCaller} from './local-test.mjs';
-import {eventFeeds,feedUri,readableFeed,feedEvents,matchesFeed,subscribeFeed,eventHub,pushToolList} from './event-resources.mjs';
+import {eventFeeds,feedUri,readableFeed,feedEvents,matchesFeed,subscribeFeed,pushToolList} from './event-resources.mjs';
 import { selling } from './extensions.mjs';
 import OAuthProvider from '@cloudflare/workers-oauth-provider';
 import { createMcpHandler } from 'agents/mcp/server';
@@ -73,11 +73,9 @@ export async function remoteMcp(request,env,ctx,{catalogueOf,definitions=[]}) {
     const refresh=pushToolList(env,cat,tools,origin);
     if(ctx?.waitUntil)ctx.waitUntil(refresh);
     else await refresh;
-    if(request.method==='GET'&&env.LOBBY) {
-      if(!request.headers.get('accept')?.includes('text/event-stream'))return json({error:'Accept text/event-stream required'},406);
-      const connection=caller.connection??'public:'+crypto.randomUUID();
-      return eventHub(env,connection).fetch('https://events/__studio_events',{method:'POST',body:JSON.stringify({op:'stream',connection,lastId:request.headers.get('last-event-id'),cat,origin,tools:tools.map(({name,description,inputSchema,audience,kind})=>({name,description,inputSchema,audience,kind}))})});
-    }
+    // A standing GET is the MCP SSE stream. Holding it pins the event object for as long as the client stays connected.
+    // 405 tells the client there is no stream, and it does not reconnect. Events stay on resources/read and events/poll.
+    if(request.method==='GET')return new Response(null,{status:405,headers:{allow:'POST, DELETE','cache-control':'no-store'}});
     if(request.method==='POST') {
       const body=await request.clone().json().catch(()=>null);
       if(eventMethods.has(body?.method))return eventsRequest(request,env,ctx,cat,caller,body);

package/worker/office.mjs

@@ -1469,10 +1469,12 @@ export async function appRoleSession(response,request,env,meta,launch) {
  const handoff=cookieValues(request,`studio_app_${meta.id}_${role}`)[0];
  const ticket=(handoff&&await appAssetTicket(env,meta.id,handoff,{request,meta,launch,purpose:'handoff',expectedRole:role,renew:true}))||await appAssetTicket(env,meta.id,undefined,{request,meta,launch,purpose:'handoff'});
  if(ticket) {
-  response=new Response(response.body,{status:response.status,statusText:response.statusText,headers:response.headers});
-  // LAN dev uses HTTP: a Secure cookie is discarded before the shell removes access.
   const secure=new URL(request.url).protocol==='https:'?'; Secure':'';
-  response.headers.append('set-cookie',`studio_app_${meta.id}_${role}=${ticket}; Path=/${meta.id}/; Max-Age=300; HttpOnly${secure}; SameSite=Strict`);
+  const cookie=`studio_app_${meta.id}_${role}=${ticket}; Path=/${meta.id}/; Max-Age=300; HttpOnly${secure}; SameSite=Strict`;
+  // Rebuilding a 101 drops the hibernating socket. Append the cookie on the response the object returned.
+  if(response.status===101&&response.webSocket){response.headers.append('set-cookie',cookie);return response;}
+  response=new Response(response.body,{status:response.status,statusText:response.statusText,headers:response.headers});
+  response.headers.append('set-cookie',cookie);
  }
  return response;
 }

package/worker/routes.mjs

@@ -325,7 +325,18 @@ export default async function route(request, env, ctx) {
       };
       if(sub==='api/app/live') {
         if(request.method!=='GET')return new Response('GET required',{status:405});
+        // Cookie renewal is a Worker response. It must not wake the records object.
+        if(url.searchParams.get('renew')==='1')return apiSession(new Response(null,{status:204,headers:{'cache-control':'no-store'}}));
         const {appHub}=await import('./app-streams.mjs');
+        if(typeof WebSocketPair!=='undefined'){
+          if(request.headers.get('upgrade')?.toLowerCase()!=='websocket')return new Response('websocket required',{status:426,headers:{'cache-control':'no-store'}});
+          // The object has to answer the upgrade itself. A JSON subrequest cannot carry the socket back.
+          const headers=new Headers(request.headers);
+          headers.set('x-homie-live-page',request.url);
+          headers.set('x-homie-app-meta',JSON.stringify({id:meta.id,kind:meta.kind,roles:meta.roles,records:meta.records,surfaces:meta.surfaces,launch:meta.launch}));
+          const target=new URL('https://app/__app_records');target.search=new URL(request.url).search;
+          return apiSession(await appHub(env,meta.id).fetch(new Request(target,{headers})));
+        }
         return apiSession(await appHub(env,meta.id).fetch('https://app/__app_records',{method:'POST',body:JSON.stringify({op:'open',meta,url:request.url,headers:Object.fromEntries(request.headers),collections:url.searchParams.getAll('collection')})}));
       }
       if(sub==='api/app/tools')return apiSession(await (await import('./app-tools.mjs')).appToolsRoute(request,env,meta,url,cat,await studioTools()));

package/worker/runtime-support.mjs

@@ -429,8 +429,12 @@ async function serverLive(env, meta, servers, origin, lobby) {
 async function weekOf(env, game) {
   const w = await playedThisWeek(env, game);
   if (!w) return null;
+  // Today's high water is already in stats_daily. Reading the peak object here woke it on every 15s live poll, which is shorter than eviction, so the object never slept while a game page was open.
   let peak = 0;
-  try { peak = (await (await lobbyFor(env,game).fetch('https://lobby/now')).json()).peak?.players ?? 0; } catch { peak = 0; }
+  try {
+    const row = await env.DB.prepare("SELECT MAX(n) AS n FROM stats_daily WHERE day = ?1 AND metric = 'peak' AND subject = ?2").bind(today(), String(game)).first();
+    peak = Number(row?.n) || 0;
+  } catch { peak = 0; }
   return { plays: w.plays, rounds: w.rounds, ...(peak ? { peak } : {}) };
 }
 

package/worker/stats.mjs

@@ -1,4 +1,5 @@
 import {lobbyFor} from './lobby-shards.mjs';
+import {liveRoomSummaries} from './lobby-summary.mjs';
 import {writePageMetric,analyticsStatus} from './analytics.mjs';
 /**
  * STUDIO METRICS: count, don't track (@homie-rocks/studio 0.6.0).
@@ -251,8 +252,17 @@ export async function playersNow(env) {
   } catch { return null; }
 }
 
-/** The Lobby's count of people in every room of each game, right now. */
+/** People in every room of each game, right now. The summary table when this worker has one, so a stats read does not wake a lobby shard. */
 async function playingNow(env, games) {
+  const summaries = await liveRoomSummaries(env).catch(() => null);
+  if (summaries) {
+    const out = {};
+    for (const g of games) {
+      const list = summaries.get(g.id) ?? [];
+      out[g.id] = { players: list.reduce((n, r) => n + (Number(r.players) || 0), 0), rooms: list.filter((r) => (r.players || 0) > 0).length };
+    }
+    return out;
+  }
   const out = {};
   await Promise.all(games.map(async (g) => {
     try {

package/worker/stream-objects.mjs

@@ -1,12 +1,20 @@
 /** Streams use independent namespaces so subscribers never warm matchmaking state. */
 export class AppRecordHub {
   constructor(ctx, env) { this.ctx=ctx; this.env=env; }
+  async records(){const {AppRecordStreams}=await import('./app-streams.mjs');return this.streams??=new AppRecordStreams(this.env,this.ctx);}
   async fetch(request) {
-    const {AppRecordStreams}=await import('./app-streams.mjs');
-    this.streams??=new AppRecordStreams(this.env,this.ctx);
+    const streams=await this.records();
+    if(request.headers.get('upgrade')?.toLowerCase()==='websocket'){
+      const meta=JSON.parse(request.headers.get('x-homie-app-meta')||'{}');
+      const page=request.headers.get('x-homie-live-page')||request.url;
+      return streams.open({meta,url:page,headers:Object.fromEntries(request.headers),collections:new URL(request.url).searchParams.getAll('collection')});
+    }
     const input=await request.json();
-    return input.op==='open'?this.streams.open(input):this.streams.wake(input.meta);
+    return input.op==='open'?streams.open(input):streams.wake(input.meta);
   }
+  webSocketMessage(){}
+  async webSocketClose(socket){return (await this.records()).closeSocket(socket);}
+  async webSocketError(socket){return (await this.records()).closeSocket(socket);}
 }
 export class EventHub {
   constructor(ctx, env) { this.ctx=ctx; this.env=env; }

package/worker/table.mjs

@@ -1447,8 +1447,8 @@ export class Table {
     // People for the stats: seated sockets that are not house QA (players is what the Lobby matches strangers by).
     let people = 0;
     for (const c of room.clients.values()) if (c.helloed && c.seat !== null && !c.agent && !c.conn?.qa) people += 1;
-    // On a change, and once a minute while anybody is here (so the Lobby's "playing now" forgets a room that died).
-    if (players === this.lastReport && people === this.lastPeople && agents === this.lastAgents && ai === this.lastAi && (!players || Date.now() - (this.lastReportAt ?? 0) < 60_000)) return;
+    // On a change, and every two and a half minutes while anybody is here. That is longer than Durable Object eviction, so an occupied room's lobby shard hibernates between heartbeats, and shorter than the presence window, so "playing now" does not drop a live room.
+    if (players === this.lastReport && people === this.lastPeople && agents === this.lastAgents && ai === this.lastAi && (!players || Date.now() - (this.lastReportAt ?? 0) < 150_000)) return;
     this.lastReport = players;
     this.lastPeople = people;
     this.lastAgents = agents;

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