@homie-rocks/studio 0.51.1 → 0.51.2

package/lib/build.mjs

@@ -1,3 +1,5 @@
+import { directoryUrl } from '../worker/directory-choice.mjs';
+import { domainOrigin } from './studio.mjs';
 import { appProblems } from '../worker/app-format.mjs';
 /**
  * `homie-studio build` — every game in games/ bundled into site/dist, plus the
@@ -707,8 +709,8 @@ async function buildInto(dist, { esbuild, studio, shop, live, games, before, typ
       ...(studio.rooms?.share === false ? { rooms: { share: false } } : {}),
       // The directory the live site claims itself in (0.10.0); studio.json `homie.directory: false` keeps it out.
       // HOMIE_DIRECTORY (a build variable) points one build at another directory, such as a staging one.
-      directory: /^https:\/\/[a-z0-9.-]+$/i.test(process.env.HOMIE_DIRECTORY ?? '') ? process.env.HOMIE_DIRECTORY
-        : studio.homie?.directory === false || studio.homie?.directory === null ? null : String(studio.homie?.directory ?? 'https://homie.rocks'),
+      directory: directoryUrl(process.env.HOMIE_DIRECTORY ?? studio.homie?.directory),
+      canonical: domainOrigin(studio.cloudflare?.domain) ?? domainOrigin(studio.cloudflare?.url),
       // A copy of the public template that nobody has named yet shows the name typed in Cloudflare's form.
       ...(studio.template === true ? { template: true } : {}),
       // studio.json audience is a studio label; shop policies are optional.

package/lib/cloudflare.mjs

@@ -1,3 +1,4 @@
+import { directoryUrl } from '../worker/directory-choice.mjs';
 import { roomLayout } from '../worker/gate.mjs';
 import {workerEntry} from './worker-build.mjs';
 import { seatCount } from '../worker/seats.mjs';
@@ -51,6 +52,11 @@ import { projectsCloudflareEnv } from './projects-env.mjs';
 
 const ANSI = /\u001b\[[0-9;]*m/g;
 
+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 };
+}
+
 export function wranglerBin(root) {
   const local = join(root, 'node_modules', '.bin', 'wrangler');
   return existsSync(local) ? local : null;
@@ -65,6 +71,8 @@ export function runner(root, env) {
   const bin = wranglerBin(root);
   if (!bin) throw new Error('Wrangler is not installed in this studio yet: run `npm install` in the studio folder first');
   return (args, { cwd = workerDir(root), input } = {}) => {
+    const dev = join(workerDir(root), '.wrangler', 'homie-dev.wrangler.json');
+    if (args.includes('--local') && !args.includes('--config') && existsSync(dev)) args = [...args, '--config', dev, '--persist-to', join(workerDir(root), '.wrangler', 'state')];
     const res = spawnSync(bin, args, {
       cwd, env: { ...process.env, ...projectsCloudflareEnv(root), ...env, WRANGLER_SEND_METRICS: 'false', CI: '1' }, encoding: 'utf8',
       input, maxBuffer: 64 * 1024 * 1024, timeout: 10 * 60_000,
@@ -211,11 +219,13 @@ export function deployPlan(root) {
         ? { kind: 'R2 bucket', name: storage, what: 'the studio\'s big media: songs and videos over the size studio.json media.r2Over names (1 MiB unless set) or that git leaves out, uploaded and checked by SHA-256 before the site stops carrying them, served at their same addresses', state: 'exists (this studio made it)', plan: 'R2 (payment method on the account; 10 GB-month free)' }
         : { kind: 'R2 bucket', name: null, what: 'none: a new studio needs no storage. `homie-studio storage add` adds it later, for large media only', state: 'not created', plan: null },
     ],
-    cost: 'Account subscription not queried. Cloudflare bills usage under the account’s current plan; estimates are not a billing quote.',
+    cost: null,
     login: 'One approval: `npx wrangler login` opens Cloudflare in the person\'s browser (a free account works; a new one verifies its email address first).',
     address: `https://${cf.worker}.<the account's workers.dev subdomain>.workers.dev`,
     directory: {
-      site: studio.homie?.directory || 'https://homie.rocks',
+      site: directoryUrl(studio.homie?.directory),
+      requested: Boolean(directoryUrl(studio.homie?.directory)),
+      choice: 'A deploy claims a listing only when homie.directory is true or a directory URL. Existing claims stay honoured; studios that never asked are not listed.',
       stores: 'the site\'s address and a claim token, the studio\'s name and slug, the @homie-rocks/studio version, and each game\'s id, name, blurb and Play/page links. Never code, media, keys or accounts.',
     },
     never: 'It never touches a Worker, database or bucket this studio did not create, and it never adds a payment method or buys anything.',
@@ -302,8 +312,7 @@ async function deployLocked(root, { log = () => {}, homie, fetchFn = null, ownRo
     const account = who.accounts.find((a) => a.id === accountId)?.name ?? 'the signed-in account';
     announced.push(
       `First deploy of ${studio.name} to the Cloudflare account "${account}". It creates: the Worker ${cf.worker} (the site and its rooms), the D1 database ${cf.d1} (rounds, and the studio's own stats: counts for the owner, never a visitor's identity), and the Durable Objects Table and Lobby (SQLite-backed).`,
-      'Account subscription not queried; usage is billed under the account’s current Cloudflare plan.',
-      `The directory (${homie || studio.homie?.directory || 'https://homie.rocks'}) will store the site's address and claim, the studio's name, and each game's name, blurb and Play link.`,
+      deployPlan(root).directory.choice,
     );
     for (const line of announced) log(line);
   }
@@ -425,7 +434,7 @@ async function deployLocked(root, { log = () => {}, homie, fetchFn = null, ownRo
     if (!synced.ok) return refuse('Site deployed, but open part Checkouts could not be closed. Retry deploy: ' + (synced.message ?? synced.why ?? 'no answer'));
     step(`closed ${synced.expired} obsolete part Checkouts`);
   }
-  const directory = homie || studio.homie?.directory || 'https://homie.rocks';
+  const directory = directoryUrl(homie ?? studio.homie?.directory);
   recordDeploy(root, builtNow);
   let claim = null;
   if (url) {
@@ -441,10 +450,10 @@ async function deployLocked(root, { log = () => {}, homie, fetchFn = null, ownRo
     } else if (read.state === 'unreachable') {
       // This computer could not ask (its own name lookup, no connection): a network preflight failure, never a
       // verdict on the site that was just deployed.
-      const said = `deployed, but this computer could not read ${url} back to check it: ${read.why}. ${read.preflight === 'dns' ? 'That is this computer\'s name lookup (a browser here may still open the site), not the deploy.' : 'That is this computer\'s connection, not the deploy.'} The site claims itself when the directory first reads it.`;
+      const said = `deployed, but this computer could not read ${url} back to check it: ${read.why}. ${read.preflight === 'dns' ? 'That is this computer\'s name lookup (a browser here may still open the site), not the deploy.' : 'That is this computer\'s connection, not the deploy.'} Listing follows the studio’s directory choice.`;
       notes.push(said);
       step(said, { preflight: read.preflight ?? 'network' });
-    } else step('the directory claim is not there yet (the site claims itself when the directory first reads it)');
+    } else step(directory ? 'the requested directory claim is not there yet' : 'no new listing requested; existing claims are honoured');
   }
 
   // The deploy before this one came from a toolkit that still had remix, and left games open to be taken whole. No
@@ -454,7 +463,7 @@ async function deployLocked(root, { log = () => {}, homie, fetchFn = null, ownRo
   let reread = null;
   if (url && delta.withdrawn.length) {
     const which = delta.withdrawn.join(', ');
-    const dir = String(directory).replace(/\/+$/, '');
+    const dir = directory ?? readLocal(root).listed?.directory;
     if (listedHere(root, { site: url, directory: dir })) {
       const again = await publish(root, { homie: dir, site: url, ...(fetchFn ? { fetchFn } : {}) });
       reread = { ok: again.ok, games: delta.withdrawn, ...(again.ok ? {} : { why: again.why }), ...(again.publishes ? { publishes: again.publishes } : {}) };
@@ -474,7 +483,7 @@ async function deployLocked(root, { log = () => {}, homie, fetchFn = null, ownRo
   return {
     ok: true, command: 'deploy', url, mcp: url ? `${url}/mcp` : null, connectAI: url ? `${url}/_studio/office/connections` : null, ...(workersDev ? { workersDev, local: LOCAL_STATE } : {}), worker: cf.worker, d1: cf.d1, r2, account: accountId, announced, steps,
     ...(media ? { media: { moved: media.moved ?? [], failed: media.failed ?? [], inR2: media.inR2 ?? null } } : {}),
-    games: b.catalogue.map((id) => { const g = delta.games.find((x) => x.id === id); return { id, page: url ? `${url}/${id}/` : null, play: url ? `${url}/${id}/play` : null, hash: g?.hash ?? null, change: delta.first ? 'first deploy from this computer' : g?.change ?? null }; }),
+    games: b.catalogue.map((id) => { const g = delta.games.find((x) => x.id === id); return { id, page: url ? `${url}/${id}/` : null, ...experienceAddresses(root, id, url), hash: g?.hash ?? null, change: delta.first ? 'first deploy from this computer' : g?.change ?? null }; }),
     ...(delta.removed.length ? { removed: delta.removed } : {}),
     ...(routes ? { routes: routes.map((r) => r.pattern) } : {}),
     ...(zone ? { zone: zoneView(zone) } : {}),
@@ -643,7 +652,7 @@ export async function ciDeploy(root, { log = () => {} } = {}) {
     ok: true, command: 'deploy', ci: true, url, mcp: url ? `${url}/mcp` : null, connectAI: url ? `${url}/_studio/office/connections` : null, worker: names.worker, d1: names.d1, r2: null, steps, announced: [],
     commit: process.env.WORKERS_CI_COMMIT_SHA ?? null, branch: process.env.WORKERS_CI_BRANCH ?? null,
     // A CI checkout has no earlier deploy to compare with: each game's content hash only (lib/deploy-state.mjs).
-    games: games.map((id) => ({ id, page: url ? `${url}/${id}/` : null, play: url ? `${url}/${id}/play` : null, hash: hashes[id]?.hash ?? null })), songs: [], videos: [],
+    games: games.map((id) => ({ id, page: url ? `${url}/${id}/` : null, ...experienceAddresses(root, id, url), hash: hashes[id]?.hash ?? null })), songs: [], videos: [],
     claim: Boolean(claim),
   };
 }

package/lib/dev.mjs

@@ -197,7 +197,7 @@ export function devConfig(root, remoteAi) {
   const routed = ROUTE_KEYS.some((k) => k in json);
   const aiNote = remoteAi ? 'AI guides think with Workers AI (remote, billed to the signed-in account).' : null;
   const entry=workerEntry(root);
-  if (!entry && Boolean(json.ai) === remoteAi && !routed) return { args: [], note: aiNote, stripped: [] };
+  // Always retain the exact local binding configuration for CLI commands after a deploy.
   const abs = (p) => (p && !p.startsWith('/') ? join(base, p) : p);
   delete json.$schema;
   json.main = entry ?? abs(json.main);

package/lib/directory.mjs

@@ -4,8 +4,9 @@
  * claim the directory gave it (`homie-studio deploy` stores it in D1), so
  * nobody can list games under someone else's site.
  */
+import { directoryUrl } from '../worker/directory-choice.mjs';
 import { request } from './net.mjs';
-import { listExperiences as listGames, readLocal, readStudio, siteUrl, writeLocal } from './studio.mjs';
+import { domainOrigin, listExperiences as listGames, readLocal, readStudio, siteUrl, writeLocal, writeStudio } from './studio.mjs';
 import { licenceProblems, readManifest } from './asset-manifest.mjs';
 import { partsPlanLines, partsPublishReport } from './parts-build.mjs';
 
@@ -103,8 +104,8 @@ function licenceRefusals(root) {
  */
 export async function publishBefore(root, { homie, site, log = () => {}, fetchFn } = {}) {
   const studio = readStudio(root);
-  const directory = (homie || studio.homie?.directory || 'https://homie.rocks').replace(/\/+$/, '');
-  const url = site || siteUrl(root, studio);
+  const directory = directoryUrl(homie ?? studio.homie?.directory) ?? 'https://homie.rocks';
+  const url = domainOrigin(studio.cloudflare?.domain) || site || siteUrl(root, studio);
   const refused = licenceRefusals(root);
   const parts = partsForListing(root);
   const local = publishesSoFar(root);
@@ -140,8 +141,8 @@ export async function publishBefore(root, { homie, site, log = () => {}, fetchFn
 
 export async function publish(root, { homie, site, log = () => {}, fetchFn } = {}) {
   const studio = readStudio(root);
-  const directory = (homie || studio.homie?.directory || 'https://homie.rocks').replace(/\/+$/, '');
-  const url = site || siteUrl(root, studio);
+  const directory = directoryUrl(homie ?? studio.homie?.directory) ?? 'https://homie.rocks';
+  const url = domainOrigin(studio.cloudflare?.domain) || site || siteUrl(root, studio);
   // Licences first: a public game may ship only assets with a licence record that allows it.
   const refused = licenceRefusals(root);
   if (refused.length) return { ok: false, command: 'publish', refused, why: `not listed: ${refused.length} asset licence problem${refused.length === 1 ? '' : 's'}:\n${refused.map((p) => `  ${p.game}/${p.asset}: ${p.problem}${p.fix ? ` (${p.fix})` : ''}`).join('\n')}\nhomie-studio assets check <id> says the same; fix them, deploy, then publish again.` };
@@ -149,6 +150,22 @@ export async function publish(root, { homie, site, log = () => {}, fetchFn } = {
   // Parts from other studios in the games about to be listed: their licences and credits, and plainly when two
   // cannot be combined, in the same lines the deploy plan gave (lib/parts-build.mjs). Said before anything is sent.
   // It does not stop the listing: the person decides, having been told.
+  // An explicit publish is itself the choice to list. Seed the same D1 claim the
+  // Worker uses, so a studio deployed without opt-in does not need another deploy.
+  if (!directoryUrl(studio.homie?.directory)) {
+    let origin;
+    try { origin = new URL(url).origin; } catch { return {ok:false,command:'publish',why:'Invalid studio address'}; }
+    const claimed = await request(`${directory}/api/studio/claim?site=${encodeURIComponent(origin)}`, {}, {timeout:15_000,...(fetchFn?{fetchFn}:{})});
+    const token = claimed.body?.claim;
+    if (!claimed.ok || !/^[a-f0-9]{16,128}$/.test(token ?? '')) return {ok:false,command:'publish',why:claimed.why ?? 'The directory did not return a claim; nothing was listed.'};
+    const {runner} = await import('./cloudflare.mjs');
+    const {loopback} = await import('./stats.mjs');
+    const local = loopback(origin);
+    const w = runner(root, !local && studio.cloudflare?.accountId ? {CLOUDFLARE_ACCOUNT_ID:studio.cloudflare.accountId} : {});
+    const saved = w(['d1','execute',studio.cloudflare.d1,local?'--local':'--remote','--command',`INSERT OR REPLACE INTO meta (key,value) VALUES ('homie_claim:${origin.replaceAll("'", "''")}','${token}');`]);
+    if(saved.code!==0)return {ok:false,command:'publish',why:'Could not store the directory claim in the studio database: '+saved.out};
+    writeStudio(root,{...studio,homie:{...studio.homie,directory}});
+  }
   const parts = partsForListing(root);
   for (const line of partsPlanLines(parts, { at: 'publish' })) log(line);
   const before = publishesSoFar(root);

package/lib/giving-preset.mjs

@@ -0,0 +1,9 @@
+/** Defaults shared by shop init and the upgrade of an untouched earlier preset. */
+export function givingItems(amounts = [1000, 2000, 2500, 5000]) {
+  return amounts.flatMap(amount => [false, true].map(monthly => ({
+    id: `gift-${amount}${monthly ? '-monthly' : ''}`, kind: 'donation',
+    name: monthly ? 'Monthly gift' : 'One-time gift', price: amount,
+    ...(monthly ? { interval: 'month' } : {}), gives: [],
+    blurb: monthly ? 'Give this amount each month. Manage your gift through Stripe.' : 'A gift to support our work.',
+  })));
+}

package/lib/mcp-tools.mjs

@@ -1171,7 +1171,7 @@ export function toolDefs(ctx, avail = {}) {
           if (!r.ended) return stillRunning(r.job, 'The deploy plan');
           if (r.job.code !== 0) return fail(whyOf(r.job));
           const p = r.result;
-          return ok([`What going online does for ${p.studio}:`, 'Rules rooms resume when their stored shape matches. Changes to fields, declaration order or maximum seats start a fresh match.', ...p.cloudflare.map((x) => `  ${x.kind}${x.name ? ` ${x.name}` : ''}: ${x.what} [${x.state}]`), `Cost: ${p.cost}`, `Sign-in: ${p.login}`, `The directory stores: ${p.directory?.stores ?? ''}`, ...(p.parts ? partsPlanLines(p.parts) : []), ...(p.zone?.warning ? [`Warning (say this to the person as it is): ${p.zone.warning}`] : p.zone?.why ? [p.zone.why] : []), 'The card on screen shows this plan (nothing is made yet): tell the person its gist in two or three lines, then go on.'].join('\n'), { kind: 'deploy-plan', ...p });
+          return ok([`What going online does for ${p.studio}:`, 'Rules rooms resume when their stored shape matches. Changes to fields, declaration order or maximum seats start a fresh match.', ...p.cloudflare.map((x) => `  ${x.kind}${x.name ? ` ${x.name}` : ''}: ${x.what} [${x.state}]`), ...(p.cost ? [`Cost: ${p.cost}`] : []), `Sign-in: ${p.login}`, ...(p.directory?.choice ? [p.directory.choice] : []), ...(p.directory?.site ? [`The directory stores: ${p.directory.stores}`] : []), ...(p.parts ? partsPlanLines(p.parts) : []), ...(p.zone?.warning ? [`Warning (say this to the person as it is): ${p.zone.warning}`] : p.zone?.why ? [p.zone.why] : []), 'The card on screen shows this plan (nothing is made yet): tell the person its gist in two or three lines, then go on.'].join('\n'), { kind: 'deploy-plan', ...p });
         }
         const studio = readStudio(root);
         return startRun(ctx, root, { kind: 'deploy', game: null, title: `${studio.name}: online`, steps: [{ label: 'deploy', args: ['deploy', ...(a.ownRoute === true ? ['--own-route'] : [])] }] });

package/lib/office.mjs

@@ -1,3 +1,4 @@
+import { signinTarget } from '../worker/signin-target.mjs';
 /**
  * `homie-studio office` — the studio's back office from the studio folder (worker/office.mjs says what it is).
  *
@@ -83,7 +84,7 @@ export async function officeShow(root, { url } = {}) {
 }
 
 export function officeLink(root, { url, to } = {}) {
-  const target = to && /^\/[A-Za-z0-9_/-]{1,80}$/.test(String(to)) ? String(to) : '/_studio/office';
+  const target = signinTarget(to, '/_studio/office');
   const r = signinTo(root, url, target);
   if (!r.ok) return { ok: false, command: 'office link', why: r.why };
   return {

package/lib/scaffold.mjs

@@ -245,8 +245,8 @@ studio's pinned copy, never a registry lookup of the bare name.
 - **Workers Builds** (Cloudflare's own CI, set up by the "Deploy to Cloudflare" button or in the dashboard): on
   every push to \`main\` it runs \`npm run build\` and \`npm run deploy\`, which in Workers Builds only applies
   the D1 migrations and deploys (it never creates or refuses anything); on every other branch it runs
-  \`npm run build\` and \`npx wrangler preview\`, a Preview URL with its own rooms. The live site claims itself
-  in the homie.rocks directory the first time it is read, so nothing is stored by hand.
+  \`npm run build\` and \`npx wrangler preview\`, a Preview URL with its own rooms. A live site requests a directory claim only with
+  studio.json \`homie.directory: true\` (homie.rocks) or a directory URL. Existing claims stay honoured.
 - \`npx --no-install homie-studio storage add\` — only when the studio has songs or videos: an R2
   bucket on the studio's own Cloudflare account. Cloudflare asks for a payment method on the account
   before R2 works, so this is a separate step the person agrees to; nothing else needs it. R2 has no
@@ -1085,14 +1085,17 @@ export function newStudio(folder, { name, homie, slug: askedSlug, install = true
   if (real) {
     if (!statSync(real).isDirectory()) throw new Error(`${real} is a file. Nothing was written.`);
     const entries = readdirSync(real).filter((n) => n !== '.DS_Store' && n !== '.git');
-    if (entries.length) throw new Error(`${real} is not empty (${entries.slice(0, 5).join(', ')}${entries.length > 5 ? ', …' : ''}). A new studio goes in a new or empty folder. Nothing was written.`);
+    let resume = false;
+    try { const existing = JSON.parse(readFileSync(join(real, 'studio.json'), 'utf8')); resume = existing.name === String(name).trim() && existing.slug === slugify(askedSlug || name) && Boolean(existing.homie?.studio); } catch {}
+    if (entries.length && !resume) throw new Error(`${real} is not empty (${entries.slice(0, 5).join(', ')}${entries.length > 5 ? ', …' : ''}). A new studio goes in a new or empty folder. Nothing was written.`);
   }
   const slug = slugify(askedSlug || name);
-  const files = studioFiles({ name: String(name).trim(), slug, homie: homie || 'https://homie.rocks', template, kind });
+  const files = studioFiles({ name: String(name).trim(), slug, homie: homie ?? null, template, kind });
   mkdirSync(dir, { recursive: true });
   const wrote = [];
   for (const [rel, content] of Object.entries(files)) {
     const path = join(dir, rel);
+    if (existsSync(path)) continue;
     mkdirSync(dirname(path), { recursive: true });
     writeFileSync(path, content);
     wrote.push(rel);

package/lib/shop.mjs

@@ -1,3 +1,4 @@
+import {givingItems} from './giving-preset.mjs';
 import { paidReleases } from './parts-upload.mjs';
 /**
  * `homie-studio shop` — a studio's shop from the studio folder (@homie-rocks/studio 0.24.0; worker/shop.mjs has the
@@ -115,7 +116,7 @@ export function shopInit(root, { supporter = false, giving = false, currency = n
   const shop = {
     ...(giving ? { giving: { receiptText: '' } } : {}),
     till: managed ? 'stripe-managed' : 'stripe', currency: String(currency ?? studio.currency ?? 'usd').toLowerCase(),
-    items: giving ? [1000, 2000, 2500, 5000].flatMap(amount => [false, true].map(monthly => ({ id: `gift-${amount}${monthly ? '-monthly' : ''}`, kind: 'donation', name: monthly ? 'Monthly gift' : 'One-time gift', price: amount, ...(monthly ? { interval: 'month' } : {}), gives: [], blurb: monthly ? 'Give this amount each month. Manage your gift through Stripe.' : 'A gift to support our work.' }))) : supporter ? [supporterItem({ price: Number(price) })] : [],
+    items: giving ? givingItems() : supporter ? [supporterItem({ price: Number(price) })] : [],
   };
   const r = checkShop(shop, { games: listGames(root).map((g) => g.id) });
   if (!r.ok) return { ok: false, command: 'shop init', why: r.errors.map((e) => e.message).join('; ') };

package/lib/template-history.json

@@ -3553,7 +3553,10 @@
      "## Version-matched authoring guides": "f6261a0e5801b96b",
      "## Layout": "f3a280b8c96cd068",
      "## Apps: one screen, roles and parts": "c10aa0441ea89702",
-     "## Commands (all through the pinned CLI in node_modules)": "5222e08ca55e326e",
+     "## Commands (all through the pinned CLI in node_modules)": [
+      "5222e08ca55e326e",
+      "c20d90de21cde0c7"
+     ],
      "## The site": "0cb8dd9a6f8a0096",
      "## Making games": "bb715272fd1a615b",
      "## The Game Codex and progress": "0738ef719cef3a4c",
@@ -3571,7 +3574,52 @@
     "Homie Arcade": {
      "sections": {
       "AGENTS.md": {
-       "## Commands (all through the pinned CLI in node_modules)": "611b437f5b3303f0"
+       "## Commands (all through the pinned CLI in node_modules)": [
+        "611b437f5b3303f0",
+        "8364e05cebefcba4"
+       ]
+      }
+     }
+    }
+   }
+  },
+  "0.51.2": {
+   "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)": "394cbbe934e80722",
+     "## 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)": "43a3556be93d1235",
+     "## 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/lib/upgrade-app-presets.mjs

@@ -0,0 +1,49 @@
+import {givingItems} from './giving-preset.mjs';
+import {createHash} from 'node:crypto';
+import {readFileSync,existsSync,readdirSync} from 'node:fs';
+import {join} from 'node:path';
+import {fileURLToPath} from 'node:url';
+const history=JSON.parse(readFileSync(new URL('./app-preset-history.json',import.meta.url),'utf8'));
+const presets=fileURLToPath(new URL('../app-starters/',import.meta.url));
+const equal=(a,b)=>JSON.stringify(a)===JSON.stringify(b);
+const object=x=>x&&typeof x==='object'&&!Array.isArray(x);
+// A three-way merge: only values still equal to the old preset take the new default.
+function merge(mine,old,next) {
+ if(equal(mine,old))return next;
+ if(!object(mine)||!object(old)||!object(next))return mine;
+ const result={...mine};
+ for(const key of new Set([...Object.keys(old),...Object.keys(next)])) {
+  const value=merge(mine[key],old[key],next[key]);
+  if(value===undefined)delete result[key];else result[key]=value;
+ }
+ return result;
+}
+export function appPresetChanges(root) {
+ const changes=[];
+ const shopFile=join(root,'shop.json');
+ if(existsSync(shopFile)) {
+  const from=readFileSync(shopFile,'utf8');let shop;try{shop=JSON.parse(from);}catch{}
+  if(shop?.giving && equal(shop.items,givingItems([1000,2500,5000]))) {
+   changes.push({file:'shop.json',kind:'update-file',what:'refresh untouched giving choices; keep currency and receipt wording',from,text:JSON.stringify({...shop,items:givingItems()},null,2)+'\n'});
+  }
+ }
+ const apps=join(root,'apps');if(!existsSync(apps))return changes;
+ for(const entry of readdirSync(apps,{withFileTypes:true})) {
+  if(!entry.isDirectory())continue;
+  const rel=`apps/${entry.name}`,file=join(root,rel,'app.json');if(!existsSync(file))continue;
+  const text=readFileSync(file,'utf8');let mine;try{mine=JSON.parse(text);}catch{continue;}
+  const kind=mine.starter?.kind,old=history[kind];if(!old)continue;
+  const next=JSON.parse(readFileSync(join(presets,kind,'app.json'),'utf8'));
+  const merged=merge(mine,old.meta,next);merged.id=mine.id;merged.name=mine.name;
+  if(!equal(mine,merged))changes.push({file:rel+'/app.json',kind:'update-file',what:'refresh unchanged app preset defaults; keep studio edits',from:text,text:JSON.stringify(merged,null,2)+'\n'});
+  for(const [path,hash] of Object.entries(old.files)) {
+   if(path==='app.json'||!existsSync(join(root,rel,path))||!existsSync(join(presets,kind,path)))continue;
+   const from=readFileSync(join(root,rel,path),'utf8');
+   const normalized=from.replaceAll(`game: '${mine.id}'`,"game: 'welcome'");
+   if(createHash('sha256').update(normalized).digest('hex')!==hash)continue;
+   const want=readFileSync(join(presets,kind,path),'utf8').replaceAll("game: 'welcome'",`game: '${mine.id}'`);
+   if(from!==want)changes.push({file:rel+'/'+path,kind:'update-file',what:'refresh untouched app preset file',from,text:want});
+  }
+ }
+ return changes;
+}

package/lib/upgrade.mjs

@@ -1,3 +1,4 @@
+import {appPresetChanges} from './upgrade-app-presets.mjs';
 import {refreshWorkerConfig} from './worker-config.mjs';
 /**
  * `homie-studio upgrade [--apply] [--diff]` — an existing studio takes what this version's template adds, and
@@ -174,7 +175,7 @@ export function upgradePlan(root, { history = readHistory() } = {}) {
   const who = { name, slug };
   const tmpl = studioFiles({ name, slug, homie: studio.homie?.directory ?? 'https://homie.rocks' });
   const { files: oldFiles, secs: oldSecs } = known(history, who);
-  const changes = [];
+  const changes = appPresetChanges(root);
   const kept = [];
 
   // package.json: the pin, and the scripts the template's studios have.

package/mcp/ui/build.js

@@ -70,9 +70,10 @@
         C.add(C.el('div', 'cb'), C.el('b', '', x.kind + ' ' + x.name), C.el('span', '', x.state + (x.plan ? ' · ' + x.plan : '')))));
     });
     card.appendChild(ul);
-    if (p.cost) card.appendChild(C.el('p', 'note', p.cost));
+    if (p.cost) card.appendChild(C.el('p', 'note billing', p.cost));
     card.appendChild(C.el('p', 'fine', 'Cloudflare asks you to approve once in your browser if this computer is not signed in (a free account works).'));
-    if (p.directory && p.directory.stores) card.appendChild(C.el('p', 'fine', 'The Homie directory stores ' + p.directory.stores));
+    if (p.directory && p.directory.choice) card.appendChild(C.el('p', 'directory-choice', p.directory.choice));
+    if (p.directory && p.directory.site && p.directory.stores) card.appendChild(C.el('p', 'fine', 'The Homie directory stores ' + p.directory.stores));
     if (p.never) card.appendChild(C.el('p', 'fine', p.never));
     return card;
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@homie-rocks/studio",
-  "version": "0.51.1",
+  "version": "0.51.2",
   "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/site/SITE.md

@@ -591,3 +591,16 @@ credentials.
 X decides what it shows, may cache tags, and may change or stop this behavior.
 Local success does not prove that X will display a card. The studio can use the
 off switch above if it does not want to offer a game through a video-oriented card.
+
+
+## Canonical address and decorative app frames
+
+Set `cloudflare.domain` for the canonical public address. The manifest uses that
+address even when fetched from workers.dev; browser pages on the alias redirect,
+while discovery and tool transports remain reachable. Listing requires an explicit
+`homie.directory: true` or URL; existing claims remain valid.
+
+An iframe inside `.hero-media` is decorative and lets the parent page scroll.
+Add `data-interactive` only when people should interact with the hero. Ordinary app
+frames permit Web Share and downloads; browser capability and a user gesture still
+apply. App shells allow normal touch scrolling and text selection.

package/tools/TOOLS.md

@@ -179,3 +179,12 @@ and removes secrets directly; remote owner tools `studio_events_webhook_status`
 and `studio_events_webhook_test` inspect delivery and test it. The receiver verifies
 Standard Webhooks signatures, deduplicates events, then wakes the owner's AI to use
 its own service connectors.
+
+
+## Signed-in connector address
+
+Use `/mcp/auth` for owner and staff connectors. Its anonymous 401 includes the
+`WWW-Authenticate` resource metadata URL for `/.well-known/oauth-protected-resource/mcp`.
+Both transports use the same `/mcp` OAuth resource; `/mcp` remains public without a
+token. An approved connection retains the account’s current app grants, not a copy
+of its old permissions. Manage connections at `/_studio/office/connections`.

package/worker/arrival.mjs

@@ -1,3 +1,4 @@
+import {appWords} from './app-format.mjs';
 /**
  * THE ARRIVAL (0.26.0): the play page and the big screen never open on a blank screen. From the page's first paint
  * until the game says it is playable, an arrival card covers the game's frame in the game's own look: its title and
@@ -66,7 +67,7 @@ export function arrivalCard(cat, g, { screen = false, off = false } = {}) {
   const pitch = String(L.pitch ?? '').trim() || firstSentence(g?.blurb);
   const studio = cat?.studio?.name ?? '';
   const keys = screen
-    ? [['tv', L.controls?.tv ?? 'Phones are the controllers: scan the code to play.']]
+    ? [['tv', L.controls?.tv ?? (g.kind === 'app' ? appWords(g).join : 'Phones are the controllers: scan the code to play.')]]
     : [['phone', L.controls?.phone], ['desk', L.controls?.computer]].filter(([, v]) => v);
   const art = wide || tall
     ? `<picture class="arrive-art">${wide && tall ? `<source media="(min-aspect-ratio: 3/4)" srcset="${esc(wide)}">` : ''}<img src="${esc(tall ?? wide)}" alt="" decoding="async" fetchpriority="high" style="object-position:${esc(focus)}"></picture>`

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.51.1","sha256":"6919e263e0a419df6b77a79f359497fb74c099fdfec14d267dc3417413607e6e"});
+export const STUDIO_BUILD = Object.freeze({"version":"0.51.2","sha256":"bffe9d1a55a4cbe04cb14a1c1d20fe5d32e7a1aa2d2a637d81b45c10c4087b64"});

package/worker/directory-choice.mjs

@@ -0,0 +1,9 @@
+/** Only an explicit choice enables a new directory claim. */
+export function directoryUrl(value) {
+  if (value === true) return 'https://homie.rocks';
+  if (typeof value !== 'string') return null;
+  try {
+    const url = new URL(value);
+    return url.protocol === 'https:' || url.protocol === 'http:' && ['localhost', '127.0.0.1'].includes(url.hostname) ? url.origin : null;
+  } catch { return null; }
+}

package/worker/index.mjs

@@ -1,3 +1,4 @@
+import { directoryUrl } from './directory-choice.mjs';
 import {APP_STORAGE_JS} from './app-frame.mjs';
 import {recordsPage} from './records-page.mjs';
 import { RULES_WIRING_MESSAGE } from './rules-wiring.mjs';
@@ -235,13 +236,7 @@ const repoOf = (env) => { const r = String(env.HOMIE_REPO ?? '').trim(); return
 const repoSaid = new Map();
 
 export function directoryOf(cat) {
-  const d = cat?.studio?.directory;
-  if (d === null || d === false) return null;
-  const at = String(d ?? 'https://homie.rocks').replace(/\/+$/, '');
-  try {
-    const u = new URL(at);
-    return u.protocol === 'https:' || (u.protocol === 'http:' && ['127.0.0.1', 'localhost'].includes(u.hostname)) ? u.origin : null;
-  } catch { return null; }
+  return directoryUrl(cat?.studio?.directory);
 }
 
 /** This address's claim: kept, else asked of the directory now (and kept), else an older studio's single claim. */
@@ -251,6 +246,7 @@ async function claimOf(env, cat, url) {
   if (claimed.has(origin) && (!repo || repoSaid.get(origin) === repo)) return claimed.get(origin);
   const kept = await storedClaim(env, origin);
   if (kept?.own && (!repo || kept.repo === repo)) { claimed.set(origin, kept.own); if (repo) repoSaid.set(origin, repo); return kept.own; }
+  if (kept?.older) return kept.older;
   const directory = directoryOf(cat);
   const local = url.protocol === 'http:' && ['127.0.0.1', 'localhost'].includes(url.hostname);
   const may = directory && env.DB && env.HOMIE_PREVIEW !== '1' && (url.protocol === 'https:' || (local && directory.startsWith('http://')))
@@ -543,7 +539,7 @@ async function gameDocument(request, env, url, game, meta, cat, { agent = null }
       'cache-control': 'no-store, no-transform',
       'access-control-allow-origin': '*',
       // The game runs in an opaque origin: it cannot read this site's storage or cookies.
-      'content-security-policy': `sandbox allow-scripts allow-pointer-lock allow-forms allow-modals allow-popups; frame-ancestors ${embedded ? `'self' ${embedAncestors(cat, url.origin, env.HOMIE_EMBED_PREVIEW === '1').replace("'none'", '')}` : frameAncestors(cat)}`,
+      'content-security-policy': `sandbox allow-scripts allow-pointer-lock allow-forms allow-modals allow-popups${meta.kind === 'app' ? ' allow-downloads' : ''}; frame-ancestors ${embedded ? `'self' ${embedAncestors(cat, url.origin, env.HOMIE_EMBED_PREVIEW === '1').replace("'none'", '')}` : frameAncestors(cat)}`,
     },
   });
 }
@@ -678,9 +674,18 @@ async function route(request, env, ctx) {
   const getAll = () => (catP ??= catalogue(env, url.origin).then((cat) => named(cat, env)));
   const getCat = () => (pubP ??= Promise.all([getAll(), settingsOf(env)]).then(([cat, settings]) => publicCatalogue(cat, settings, env)));
 
+  // Keep tool transports and discovery on the alias; redirect browser pages only.
+  if (read && url.hostname.endsWith('.workers.dev') && env.HOMIE_PREVIEW !== '1'
+      && request.headers.get('upgrade')?.toLowerCase() !== 'websocket'
+      && !/\/(?:api|__[a-z]+)(?:\/|$)/.test(path)
+      && !/^\/(?:\.well-known(?:\/|$)|api(?:\/|$)|mcp(?:\/|$)|oauth(?:\/|$)|hooks(?:\/|$)|_studio(?:\/|$))/.test(path)) {
+    const canonical = (await getAll()).studio?.canonical;
+    if (canonical && canonical !== url.origin) return Response.redirect(canonical + url.pathname + url.search, 308);
+  }
+
   if (path === '/_studio/office/functions') return (await import('./functions.mjs')).functionsRoute(request,env,await getAll());
 
-  if (path === '/mcp' || path.startsWith('/hooks/tools/') || path.startsWith('/oauth/') || path.startsWith('/.well-known/oauth-') || path === '/_studio/office/connections') {
+  if (path === '/mcp' || path === '/mcp/auth' || path.startsWith('/hooks/tools/') || path.startsWith('/oauth/') || path.startsWith('/.well-known/oauth-') || path === '/_studio/office/connections') {
     const { remoteMcp } = await import('./mcp.mjs');
     return remoteMcp(request, env, ctx, { catalogueOf: getAll, definitions: await studioTools() });
   }
@@ -726,6 +731,10 @@ async function route(request, env, ctx) {
   }
   if (path === '/.well-known/homie-studio.json') {
     const cat = await getCat();
+    const canonical = cat.studio?.canonical;
+    if (canonical && env.HOMIE_PREVIEW !== '1' && url.protocol === 'https:') {
+      const address = new URL(canonical); url.protocol = address.protocol; url.host = address.host;
+    }
     const sharing = Boolean(cat.studio?.stats?.share);
     const [played, byGame] = sharing ? await Promise.all([playedThisWeek(env), playedByGame(env)]) : [null, null];
     // studio.json `"rooms": { "share": false }` keeps the rooms off the hub: a manifest that names no `rooms` shares none.

package/worker/mcp.mjs

@@ -158,7 +158,7 @@ export async function remoteMcp(request,env,ctx,{catalogueOf,definitions=[]}) {
       });
       return s;
     };
-    return createMcpHandler(server)(request,env,ctx);
+    return createMcpHandler(server,{route:path === '/mcp/auth' ? '/mcp/auth' : '/mcp'})(request,env,ctx);
   };
   if(localIdentity)return api(request,scoped,ctx);
   const provider=new OAuthProvider({
@@ -211,7 +211,7 @@ export async function remoteMcp(request,env,ctx,{catalogueOf,definitions=[]}) {
         const rows=(await env.DB.prepare(owner?'SELECT c.*,p.name FROM mcp_connections c LEFT JOIN players p ON p.id=c.person ORDER BY c.created DESC LIMIT 100 OFFSET ?1':'SELECT c.*,p.name FROM mcp_connections c LEFT JOIN players p ON p.id=c.person WHERE c.person=?1 ORDER BY c.created DESC LIMIT 100 OFFSET ?2').bind(...(owner?[offset]:[person,offset])).all()).results;
         const events=owner?(await env.DB.prepare('SELECT a.*,p.name FROM mcp_audit a LEFT JOIN players p ON p.id=a.person ORDER BY a.id DESC LIMIT 100 OFFSET ?1').bind(offset).all()).results:[];
         const names=new Map(await Promise.all([...new Set([...rows,...events].map(r=>r.client).filter(Boolean))].map(async id=>[id,(await oauth.lookupClient(id).catch(()=>null))?.clientName??id])));
-        return html(`<h1>Your studio's AI connections</h1><p>MCP address: <code>${esc(origin)}/mcp</code></p><ul>${rows.map(r=>`<li>${esc(r.name??(r.person.startsWith('office-')?'Owner browser':r.person))} · ${esc(names.get(r.client))} · ${r.revoked?'Revoked':`<form method="post"><input type="hidden" name="connection" value="${esc(r.id)}"><button>Revoke</button></form>`}</li>`).join('')}</ul><h2>Recent tool calls</h2><ul>${events.map(r=>`<li>${esc(new Date(r.at).toISOString())} · ${esc(r.name??(r.person?.startsWith('office-')?'Owner browser':r.person)??'Public')} · ${esc(names.get(r.client)??'Anonymous')} · ${esc(r.tool)} · ${esc(r.outcome)}</li>`).join('')}</ul><nav>${page?`<a href="?page=${page-1}">Newer</a>`:''}${rows.length===100||events.length===100?`<a href="?page=${page+1}">Older</a>`:''}</nav>`);
+        return html(`<h1>Your studio's AI connections</h1><p>Signed-in MCP address: <code>${esc(origin)}/mcp/auth</code> · Public: <code>${esc(origin)}/mcp</code></p><ul>${rows.map(r=>`<li>${esc(r.name??(r.person.startsWith('office-')?'Owner browser':r.person))} · ${esc(names.get(r.client))} · ${r.revoked?'Revoked':`<form method="post"><input type="hidden" name="connection" value="${esc(r.id)}"><button>Revoke</button></form>`}</li>`).join('')}</ul><h2>Recent tool calls</h2><ul>${events.map(r=>`<li>${esc(new Date(r.at).toISOString())} · ${esc(r.name??(r.person?.startsWith('office-')?'Owner browser':r.person)??'Public')} · ${esc(names.get(r.client)??'Anonymous')} · ${esc(r.tool)} · ${esc(r.outcome)}</li>`).join('')}</ul><nav>${page?`<a href="?page=${page-1}">Newer</a>`:''}${rows.length===100||events.length===100?`<a href="?page=${page+1}">Older</a>`:''}</nav>`);
       }
       return json({error:'not found'},404);
     }},