@homie-rocks/studio 0.51.6 → 0.51.8

package/lib/cloudflare.mjs

@@ -435,7 +435,7 @@ async function deployLocked(root, { log = () => {}, homie, fetchFn = null, ownRo
   if (url) {
     const read = await readLiveSite(url, fetchFn ? { fetchFn } : {});
     claim = read.claim;
-    if (claim) step('the site claimed itself in the directory');
+    if (claim) step(listedHere(root,{site:url})?'the site is listed':'the site is claimed, not listed');
     else if (read.state === 'other' && !isWorkersDev(url)) {
       // The studio's own domain answered as something else: say which route is needed (lib/routes.mjs). The deploy
       // itself went through; the zone's other routes are never touched.
@@ -486,7 +486,7 @@ async function deployLocked(root, { log = () => {}, homie, fetchFn = null, ownRo
     ...(reread ? { reread } : {}),
     songs: b.songs.map((slug) => ({ slug, page: url ? `${url}/music/${slug}/` : null })),
     videos: b.videos.map((slug) => ({ slug, page: url ? `${url}/videos/${slug}/` : null })),
-    claim: Boolean(claim), directory,
+    claim: Boolean(claim), listing: listedHere(root,{site:url}) ? 'listed' : claim ? 'claimed, not listed' : 'not listed', directory,
   };
 }
 
@@ -638,7 +638,7 @@ export async function ciDeploy(root, { log = () => {} } = {}) {
   let url = null;
   try { url = siteUrl(root) ?? workersDev; } catch { url = workersDev; }
   const claim = url ? await warmClaim(url) : null;
-  step(claim ? 'the site claimed itself in the directory' : 'no directory claim yet (the site claims itself when the directory first reads it)');
+  step(claim ? (listedHere(root,{site:url})?'the site is listed':'the site is claimed, not listed') : 'no directory claim yet (the site claims itself when the directory first reads it)');
   let games = [];
   try { games = JSON.parse(readFileSync(join(root, 'site', 'dist', 'games.json'), 'utf8')).games.map((g) => g.id); } catch { games = []; }
   const hashes = builtGames(root, games);
@@ -648,7 +648,7 @@ export async function ciDeploy(root, { log = () => {} } = {}) {
     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, ...experienceAddresses(root, id, url), hash: hashes[id]?.hash ?? null })), songs: [], videos: [],
-    claim: Boolean(claim),
+    claim: Boolean(claim), listing: listedHere(root,{site:url}) ? 'listed' : claim ? 'claimed, not listed' : 'not listed',
   };
 }
 

package/lib/connector-token.mjs

@@ -0,0 +1,30 @@
+import {randomBytes,createHash} from 'node:crypto';
+import {mkdtempSync,writeFileSync,rmSync} from 'node:fs';
+import {tmpdir} from 'node:os';
+import {join,resolve} from 'node:path';
+import {runner,configNames} from './cloudflare.mjs';
+import {siteUrl} from './studio.mjs';
+/** D1 administration uses the owner's existing Wrangler login. No bearer enters stdout or argv. */
+export async function connectorToken(root,{url,tools,out,revoke,days=30,execute}={}) {
+ const run=execute??(async file=>{const names=configNames(root);if(!names.d1)throw new Error('Studio database is not configured');const result=runner(root)(['d1','execute',names.d1,'--remote','--file',file]);if(result.code!==0)throw new Error('Connector token database operation failed; check the existing Wrangler login and studio database');});
+ const scratch=mkdtempSync(join(tmpdir(),'homie-connector-'));
+ const sql=async text=>{const file=join(scratch,'token.sql');writeFileSync(file,text,{mode:0o600});await run(file);};
+ const quote=value=>"'"+value.replaceAll("'","''")+"'";
+ try {
+ if(revoke){if(!/^[a-f0-9]{64}$/.test(revoke))throw new Error('Invalid connector id');await sql(`DELETE FROM mcp_kv WHERE key='connector:${revoke}';`);return {ok:true,command:'connector',revoked:revoke};}
+ if(!Array.isArray(tools)||!tools.length||tools.length>100||tools.some(t=>! /^[a-zA-Z0-9_-]{1,128}$/.test(t)))throw new Error('Provide explicit tool names with --tools (no wildcard)');
+ if(!out)throw new Error('Provide --out for the private connector configuration');
+ if(!Number.isInteger(days)||days<1||days>90)throw new Error('Expiry must be 1–90 days');
+ const origin=new URL(url??siteUrl(root)).origin;if(!origin.startsWith('https://'))throw new Error('Connector requires HTTPS');
+ const token='homie_owner_'+randomBytes(32).toString('hex');const id=createHash('sha256').update(token).digest('hex');
+ const expires=Math.floor(Date.now()/1000)+days*86400;
+ const value=JSON.stringify({origin,tools:[...new Set(tools)],expires});
+ // Reserve the destination before minting; never overwrite a credential or follow a symlink.
+ const path=resolve(root,out);writeFileSync(path,'',{flag:'wx',mode:0o600});
+ try{
+ await sql(`INSERT INTO mcp_kv(key,value,expires) VALUES('connector:${id}',${quote(value)},${expires});`);
+ writeFileSync(path,JSON.stringify({mcpServers:{studio:{url:origin+'/mcp/auth',headers:{Authorization:'Bearer '+token}}}},null,2)+'\n',{mode:0o600});
+ }catch(error){rmSync(path,{force:true});throw error;}
+ return {ok:true,command:'connector',id,file:path,expires,tools:[...new Set(tools)]};
+ }finally{rmSync(scratch,{recursive:true,force:true});}
+}

package/lib/mcp-tools.mjs

@@ -1178,7 +1178,7 @@ export function toolDefs(ctx, avail = {}) {
     },
     {
       name: 'stripe_shop_plan', title: 'Plan or verify the Stripe shop',
-      description: 'Default setup with Stripe official MCP. Supply public API observations as {path,params,body}, account ID, mode, and complete booking slots. Returns the exact next read/write with metadata and idempotency. Execute via Stripe stripe_api_search/details/read/write, clear observations after writes, repeat until verified. verify:true saves the public config for stripe_webhook. Never pass webhook creation responses or secrets.',
+      description: 'Default setup with Stripe official MCP. Supply public API observations as {method,path,params,body}, account ID, mode, and complete booking slots. Returns every independent operation in a dependency-ordered batch, with metadata and idempotency. Execute via Stripe stripe_api_search/details/read/write, retain write responses as observations and replan until verified. verify:true saves compact public config for deploy and stripe_webhook. Never pass webhook creation responses or secrets.',
       inputSchema: {type:'object',properties:{...STUDIO_ARG,account:{type:'string'},mode:{enum:['test','live']},url:{type:'string'},slots:{type:'array',items:{type:'object'}},observations:{type:'array',items:{type:'object'}},verify:{type:'boolean'}}},
       annotations:{readOnlyHint:false,destructiveHint:false,openWorldHint:false},
       run:async a=>{

package/lib/shop-links.mjs

@@ -7,7 +7,11 @@ import { HOOK_EVENTS, SHOP_HOOK_EVENTS } from './shop.mjs';
 const hash = (value) => createHash('sha256').update(JSON.stringify(value)).digest('hex');
 const same = (a, b) => Object.keys(a ?? {}).length === Object.keys(b).length && Object.entries(b).every(([k, v]) => a?.[k] === v);
 export const matchesFields = (actual, expected) => Array.isArray(expected) ? Array.isArray(actual) && actual.length === expected.length && expected.every((v,i)=>matchesFields(actual[i],v)) : expected && typeof expected === 'object' ? Object.entries(expected).every(([k,v]) => matchesFields(actual?.[k],v)) : actual === expected;
-export async function reconcilePaymentLinks({ api, shop, slug, site, mode, bookingSlots = [], verifyObjects = false }) {
+export async function reconcilePaymentLinks({ api, shop, slug, site, mode, bookingSlots = [], verifyObjects = false, scoped = false, knownLinks = [], knownPortal }) {
+  if(scoped) {
+    const transport=api;
+    api=(method,path,params={},idempotency)=>transport(method,path,method==='POST'&&path.startsWith('/v1/payment_links/')?{...params,expand:['line_items']}:params,idempotency);
+  }
   const list = async (path, params = {}) => {
     const all = []; let cursor;
     do {
@@ -20,13 +24,32 @@ export async function reconcilePaymentLinks({ api, shop, slug, site, mode, booki
     } while (cursor);
     return all;
   };
-  const products = await list('/v1/products');
-  const prices = await list('/v1/prices');
-  const links = await list('/v1/payment_links');
+  const parallel = async tasks => {
+    if(!scoped){const values=[];for(const task of tasks)values.push(await task());return values;}
+    const results = await Promise.allSettled(tasks.map(task=>task()));
+    const errors=results.filter(r=>r.status==='rejected').map(r=>r.reason);
+    const fatal=errors.find(e=>!e.next&&!e.operations);if(fatal)throw fatal;
+    if(errors.length)throw {operations:errors.flatMap(e=>e.operations??[e.next])};
+    return results.map(r=>r.value);
+  };
+  const search = async kind => {
+    const data=[];let page;
+    do {
+      const result=await api('GET',`/v1/${kind}/search`,{query:`metadata['homie']:'shop-links-v1' AND metadata['studio']:'${slug}' AND metadata['origin']:'${site}'`,limit:100,...(kind==='products'?{expand:['data.default_price']}:{}),...(page?{page}:{})});
+      if(!Array.isArray(result.data)||result.has_more&&!result.next_page||page&&result.next_page===page)throw new Error('Incomplete Stripe pagination');
+      data.push(...result.data);page=result.has_more?result.next_page:null;
+    }while(page);
+    return data;
+  };
+  const [products,prices,links]=await parallel([
+    ()=>scoped?search('products'):list('/v1/products'),
+    ()=>scoped?search('prices'):list('/v1/prices'),
+    ()=>scoped?parallel([...new Set(knownLinks)].map(id=>()=>api('GET',`/v1/payment_links/${id}`,{expand:['line_items']}))):list('/v1/payment_links'),
+  ]);
   const own = (o) => o.metadata?.homie === 'shop-links-v1' && o.metadata?.studio === slug && o.metadata?.origin === site;
   const verifyLink = async (link, params) => {
     if (!verifyObjects) return;
-    const actual=await api('GET',`/v1/payment_links/${link.id}`,{expand:['line_items']});
+    const actual=link.line_items?.data?link:await api('GET',`/v1/payment_links/${link.id}`,{expand:['line_items']});
     const normalized={...actual,line_items:actual.line_items?.data?.map(line=>({...line,price:line.price?.id??line.price}))};
     if(actual.id!==link.id || actual.active!==link.active || actual.url!==link.url || actual.line_items?.has_more===true || !matchesFields(actual.metadata,link.metadata) || !paymentLinkURL(actual.url) || !matchesFields(normalized,params)) throw new Error(`Stripe Payment Link ${link.id} differs from its planned fields. Restore its configuration through Stripe MCP before verifying.`);
   };
@@ -34,21 +57,26 @@ export async function reconcilePaymentLinks({ api, shop, slug, site, mode, booki
   const customText=shop.giving?.receiptText ? {custom_text:{submit:{message:shop.giving.receiptText}}} : {};
   const catalogPrices = new Map();
   const keepPrices = new Set(), keepLinks = new Set(), keepProducts = new Set();
-  for (const item of shop.items) {
+  await parallel(shop.items.map(item=>async()=>{
     const id = await productIdOf(slug, item.id);
     keepProducts.add(id);
     const metadata = { homie: 'shop-links-v1', studio: slug, origin: site };
     const fields = { name: item.name, description:item.blurb??'', tax_code: item.taxCode ?? defaultTaxCode(item), metadata, active: true };
-    let product = products.find((p) => p.id === id);
-    if (!product) product = await api('POST', '/v1/products', { id, ...fields }, `product-${hash(id)}`);
-    else if (!same(product.metadata, metadata) || product.name !== fields.name || (product.description ?? '') !== (fields.description ?? '') || (product.tax_code?.id ?? product.tax_code) !== fields.tax_code || !product.active) await api('POST', `/v1/products/${id}`, fields);
     // Omit an unset minimum: Stripe applies its settlement-currency floor itself.
     // https://docs.stripe.com/api/prices/create#create_price-custom_unit_amount-minimum
     const priceFields = { product: id, currency: shop.currency, ...(item.interval ? { recurring: { interval: item.interval } } : {}), tax_behavior: 'exclusive', ...(item.price === 'choose'
       ? { custom_unit_amount: { enabled: true, ...(item.min > 0 ? { minimum: item.min } : {}), ...(item.max !== null ? { maximum: item.max } : {}) } }
       : { unit_amount: item.price }) };
     const revision = hash(priceFields);
+    const createFields={...fields};if(!createFields.description)delete createFields.description;
+    let product = products.find(p=>p.id===id);
+    if(!product) {
+      const {product:_,...default_price_data}=priceFields;
+      product=await api('POST','/v1/products',{id,...createFields,...(scoped?{default_price_data:{...default_price_data,metadata:{...metadata,revision}},expand:['default_price']}:{})},`product-${hash(id)}`);
+    } else if (!same(product.metadata, metadata) || product.name !== fields.name || (product.description ?? '') !== fields.description || (product.tax_code?.id ?? product.tax_code) !== fields.tax_code || !product.active) await api('POST', `/v1/products/${id}`, fields);
+
     let price = prices.find((p) => own(p) && p.product === id && p.metadata?.revision === revision);
+    if(!price && product.default_price?.id && product.default_price.metadata?.revision===revision)price=product.default_price;
     if (!price) price = await api('POST', '/v1/prices', { ...priceFields, metadata: { ...metadata, revision } }, `price-${hash({ priceFields, metadata })}`);
     if (verifyObjects && ((price.recurring?.interval_count??1)!==1 || Boolean(price.recurring)!==Boolean(item.interval) || Boolean(price.custom_unit_amount)!==(item.price==='choose'))) throw new Error(`Stripe Price ${price.id} has a different payment type from shop.json`);
     if (verifyObjects && !matchesFields({...price, product:price.product?.id??price.product, ...(price.custom_unit_amount?{custom_unit_amount:{...price.custom_unit_amount,enabled:true}}:{})},priceFields)) throw new Error(`Stripe Price ${price.id} differs from shop.json; restore or archive it through Stripe MCP before planning again.`);
@@ -56,7 +84,7 @@ export async function reconcilePaymentLinks({ api, shop, slug, site, mode, booki
     keepPrices.add(price.id);
     catalogPrices.set(item.id, price.id);
     if ((product.default_price?.id ?? product.default_price) !== price.id) await api('POST', `/v1/products/${id}`, { default_price: price.id });
-    if (item.price === 0) continue; // Free orders never leave the studio.
+    if (item.price === 0) return; // Free orders never leave the studio.
     const params = { ...customText, line_items: [{ price: price.id, quantity: 1, ...(item.price !== 'choose' ? { adjustable_quantity: { enabled: shop.policy.repeatPurchases, minimum: 1, maximum: 999999 } } : {}) }],
       after_completion: { type: 'redirect', redirect: { url: `${site}/shop/thanks?session_id={CHECKOUT_SESSION_ID}` } },
       ...(shop.till === 'stripe-managed' ? { managed_payments: { enabled: true } } : { automatic_tax: { enabled: shop.automaticTax } }),
@@ -64,48 +92,54 @@ export async function reconcilePaymentLinks({ api, shop, slug, site, mode, booki
     };
     const linkRevision = hash({ params, item, policy: shop.policy });
     let link = links.find((p) => own(p) && p.metadata?.revision === linkRevision);
-    if (!link) link = await api('POST', '/v1/payment_links', { ...params, metadata: { ...metadata, revision: linkRevision } }, `link-${linkRevision}`);
+    if (!link) link = await api('POST', '/v1/payment_links', { ...params, ...(scoped?{expand:['line_items']}:{}), metadata: { ...metadata, revision: linkRevision } }, `link-${linkRevision}`);
     await verifyLink(link,params);
     if (!link.active) await api('POST', `/v1/payment_links/${link.id}`, { active: true });
     if (!paymentLinkURL(link.url) || !/^plink_\w+$/.test(link.id)) throw new Error('Invalid Payment Link');
     keepLinks.add(link.id);
     config.items.push({ item: item.id, id: link.id, url: link.url, price: price.id, revision: linkRevision });
-  }
+  }));
   // Menus use paid invoice snapshots: Checkout events omit their line items.
   // Stripe allows 20 Payment Link lines; invoice snapshots include only the first
   // 10. Split catalogues so keyless fulfillment needs no authenticated pagination.
   config.menus = [];
   const menuItems = shop.items.filter(i => typeof i.price === 'number' && i.price > 0 && !i.interval);
   const metadata = { homie: 'shop-links-v1', studio: slug, origin: site };
+  const tasks=[];
   const groups=Map.groupBy(menuItems,i=>i.game??'');
   for(const group of (shop.basket ? [] : groups.values())) for (let offset = 0; offset < group.length; offset += 10) {
-    const items = group.slice(offset, offset + 10);
-    if (items.length < 2) continue;
+    const groupOffset=offset;tasks.push(async()=>{
+    const items = group.slice(groupOffset, groupOffset + 10);
+    if (items.length < 2) return;
     const params = { ...customText, line_items: items.map(i => ({price:catalogPrices.get(i.id),quantity:1,adjustable_quantity:{enabled:true,minimum:0,maximum:shop.policy.repeatPurchases?999999:1}})),
       invoice_creation:{enabled:true,invoice_data:{metadata}},
       after_completion:{type:'redirect',redirect:{url:`${site}/shop/thanks?session_id={CHECKOUT_SESSION_ID}`}},
       automatic_tax:{enabled:shop.automaticTax}, payment_intent_data:{metadata} };
     const revision=hash(params);
     let link=links.find(p=>own(p)&&p.metadata?.revision===revision);
-    if(!link)link=await api('POST','/v1/payment_links',{...params,metadata:{...metadata,revision}},`menu-${revision}`);
+    if(!link)link=await api('POST','/v1/payment_links',{...params,...(scoped?{expand:['line_items']}:{}),metadata:{...metadata,revision}},`menu-${revision}`);
     await verifyLink(link,params);
     if(!link.active)await api('POST',`/v1/payment_links/${link.id}`,{active:true});
     keepLinks.add(link.id);
     config.menus.push({id:link.id,url:link.url,revision,items:items.map(i=>({item:i.id,price:catalogPrices.get(i.id)}))});
-  }
+  });}
   // One aggregate payment represents a frozen local basket, including one-item baskets.
   // Runtime uses prefilled_amount, never a shared Price mutation: concurrent
   // guests must receive their own saved totals.
-  if(shop.basket) for(const [game,items] of groups) {
+  if(shop.basket) for(const [game,items] of groups) {tasks.push(async()=>{
     const id=await productIdOf(slug,`basket-${game||'shop'}`);
     keepProducts.add(id);
     const fields={name:shop.basket.name,description:shop.basket.description,metadata,active:true};
-    const product=products.find(p=>p.id===id);
-    if(!product)await api('POST','/v1/products',{id,...fields},`product-${hash(id)}`);
-    else if(product.name!==fields.name || product.description!==fields.description || !product.active)await api('POST',`/v1/products/${id}`,fields);
     const priceFields={product:id,currency:shop.currency,custom_unit_amount:{enabled:true},tax_behavior:'inclusive'};
     const priceRevision=hash(priceFields);
+    let product=products.find(p=>p.id===id);
+    if(!product) {
+      const {product:_,...default_price_data}=priceFields;
+      const createFields={...fields};if(!createFields.description)delete createFields.description;
+      product=await api('POST','/v1/products',{id,...createFields,...(scoped?{default_price_data:{...default_price_data,metadata:{...metadata,revision:priceRevision}},expand:['default_price']}:{})},`product-${hash(id)}`);
+    } else if(product.name!==fields.name || product.description!==fields.description || !product.active)await api('POST',`/v1/products/${id}`,fields);
     let price=prices.find(p=>own(p)&&p.product===id&&p.metadata?.revision===priceRevision);
+    if(!price&&product.default_price?.metadata?.revision===priceRevision)price=product.default_price;
     if(!price)price=await api('POST','/v1/prices',{...priceFields,metadata:{...metadata,revision:priceRevision}},`price-${hash({priceFields,metadata})}`);
     if(!price.active)await api('POST',`/v1/prices/${price.id}`,{active:true});
     keepPrices.add(price.id);
@@ -113,12 +147,13 @@ export async function reconcilePaymentLinks({ api, shop, slug, site, mode, booki
       after_completion:{type:'redirect',redirect:{url:`${site}/shop/thanks?session_id={CHECKOUT_SESSION_ID}`}}};
     const revision=hash(params);
     let link=links.find(p=>own(p)&&p.metadata?.revision===revision);
-    if(!link)link=await api('POST','/v1/payment_links',{...params,metadata:{...metadata,revision}},`basket-${revision}`);
+    if(!link)link=await api('POST','/v1/payment_links',{...params,...(scoped?{expand:['line_items']}:{}),metadata:{...metadata,revision}},`basket-${revision}`);
     if(!link.active)await api('POST',`/v1/payment_links/${link.id}`,{active:true});
+    await verifyLink(link,params);
     if(!paymentLinkURL(link.url))throw new Error('Invalid basket Payment Link');
     keepLinks.add(link.id);
     config.menus.push({id:link.id,url:link.url,revision,price:price.id,basket:true,items:items.map(i=>({item:i.id,price:catalogPrices.get(i.id)}))});
-  }
+  });}
   config.slots=[];
   const pause=async link=>{
     if(link.active) await api('POST',`/v1/payment_links/${link.id}`,{active:false});
@@ -132,12 +167,13 @@ export async function reconcilePaymentLinks({ api, shop, slug, site, mode, booki
     const resource=JSON.stringify([slot.app,slot.slots,slot.slot]);
     if(slotKeys.has(resource))throw new Error('Publish only one service Payment Link per capacity slot');
     slotKeys.add(resource);
+    tasks.push(async()=>{
     const item=shop.items.find(i=>i.id===slot.item);
     if(!item || item.interval || item.price==='choose')throw new Error('Bookings require a fixed one-time service price');
-    if(!item.price)continue;
+    if(!item.price)return;
     const identity=hash({slug,site,app:slot.app,collection:slot.collection,slots:slot.slots,slot:slot.slot});
     let link=links.find(p=>own(p)&&p.metadata?.slot===identity);
-    if(!link && (!slot.capacity||slot.active===false))continue;
+    if(!link && (!slot.capacity||slot.active===false))return;
     if(link?.metadata?.price && link.metadata.price!==catalogPrices.get(item.id))throw new Error('Slot service price changed. Deactivate the old slot and publish a new slot ID after reviewing existing bookings.');
     const seatsRevision=hash({slot,capacity:slot.capacity,confirmed:slot.confirmed});
     const counted=slot.confirmed!==undefined && link?.metadata?.seats_revision===seatsRevision;
@@ -149,7 +185,7 @@ export async function reconcilePaymentLinks({ api, shop, slug, site, mode, booki
     const active=slot.active!==false && limit>count;
     const params={...customText,line_items:[{price:catalogPrices.get(item.id),quantity:1}],payment_method_types:['card'],
       restrictions:{completed_sessions:{limit:Math.max(1,limit)}},after_completion:{type:'redirect',redirect:{url:`${site}/shop/thanks?session_id={CHECKOUT_SESSION_ID}`}}};
-    if(!link)link=await api('POST','/v1/payment_links',{...params,metadata:{...metadata,slot:identity,revision:identity,price:catalogPrices.get(item.id)}},`slot-${identity}`);
+    if(!link)link=await api('POST','/v1/payment_links',{...params,...(scoped?{expand:['line_items']}:{}),metadata:{...metadata,slot:identity,revision:identity,price:catalogPrices.get(item.id)}},`slot-${identity}`);
     else {
       // Pause first whenever publishing a changed budget, so old sessions cannot
       // spend a previous capacity after staff moves or removes a slot.
@@ -159,17 +195,19 @@ export async function reconcilePaymentLinks({ api, shop, slug, site, mode, booki
     await verifyLink(link,params);
     keepLinks.add(link.id);
     config.slots.push({...slot,id:link.id,url:link.url,price:catalogPrices.get(item.id),revision:identity,active:link.active,count:link.restrictions?.completed_sessions?.count??0,limit,paused:slot.active===false});
+    });
   }
-  // Retired booking links must be closed before publishing a configuration which
-  // no longer names them; staff can then move into that local-only slot safely.
-  for(const link of links.filter(p=>own(p)&&p.metadata?.slot&&!keepLinks.has(p.id)))await pause(link);
-  if(shop.items.some(i=>i.interval)) {
-    const portals=await list('/v1/billing_portal/configurations');
+  if(shop.items.some(i=>i.interval)) tasks.push(async()=>{
+    const portals=scoped?(knownPortal?[await api('GET',`/v1/billing_portal/configurations/${knownPortal}`,{})]:[]):await list('/v1/billing_portal/configurations');
     let portal=portals.find(p=>own(p));
     const params={features:{subscription_cancel:{enabled:true},payment_method_update:{enabled:true},invoice_history:{enabled:true}},login_page:{enabled:true},business_profile:{headline:'Manage your membership or giving'},default_return_url:`${site}/shop/`,metadata};
     if (!portal || !matchesFields(portal, params)) portal=await api('POST',portal?`/v1/billing_portal/configurations/${portal.id}`:'/v1/billing_portal/configurations',params, portal?undefined:`portal-${hash({slug,site,params})}`);
-    config.portal=portal.login_page?.url;
-  }
+    config.portal=portal.login_page?.url;config.portalId=portal.id;
+  });
+  await parallel(tasks);
+  // Retired booking links must be closed before publishing a configuration which
+  // no longer names them; staff can then move into that local-only slot safely.
+  for(const link of links.filter(p=>own(p)&&p.metadata?.slot&&!keepLinks.has(p.id)))await pause(link);
   const retire = [
     ...links.filter(p=>own(p)&&p.active&&!keepLinks.has(p.id)).map(p=>({method:'POST',path:`/v1/payment_links/${p.id}`,params:{active:false}})),
     ...prices.filter(p=>own(p)&&p.active&&!keepPrices.has(p.id)).map(p=>({method:'POST',path:`/v1/prices/${p.id}`,params:{active:false}})),

package/lib/shop-mcp.mjs

@@ -1,4 +1,5 @@
-/** Pure, incremental Stripe plan. The owner's AI supplies public API reads; no Stripe transport here. */
+import {canonicalJson} from '../worker/canonical-json.mjs';
+/** Pure, batched Stripe plan. The owner's AI supplies public API reads; no Stripe transport here. */
 import {createHash} from 'node:crypto';
 import {existsSync, readFileSync, mkdirSync, writeFileSync} from 'node:fs';
 import {join} from 'node:path';
@@ -7,7 +8,8 @@ import {readStudio, siteUrl} from './studio.mjs';
 import {reconcilePaymentLinks} from './shop-links.mjs';
 import {fullerReason, LINKS_STRIPE_VERSION} from '../worker/shop-links.mjs';
 const hash = x => createHash('sha256').update(JSON.stringify(x)).digest('hex');
-export const readKey = (path, params) => JSON.stringify([path,Object.fromEntries(Object.entries(params).sort(([a],[b])=>a.localeCompare(b)))]);
+export const readKey = (path, params) => canonicalJson([path,params]);
+const slotsOf=(root,slots)=>slots??(existsSync(join(root,'.studio','booking-slots.json'))?JSON.parse(readFileSync(join(root,'.studio','booking-slots.json'),'utf8')):[]);
 export async function shopMcpPlan(root, {observations = [], mode = 'test', url, slots, verify = false} = {}) {
   const checked=readShop(root);
   if(!checked.ok || checked.absent) return {ok:false,why:'Create and check shop.json first.'};
@@ -20,28 +22,41 @@ export async function shopMcpPlan(root, {observations = [], mode = 'test', url,
   const local=new URL(site).protocol==='http:';
   if(local && (mode!=='test' || !/^(localhost|127\.0\.0\.1|10\.\d+\.\d+\.\d+|192\.168\.\d+\.\d+|172\.(1[6-9]|2\d|3[01])\.\d+\.\d+)$/.test(new URL(site).hostname)))throw new Error('Local checkout requires a private HTTP address and test mode');
   if(!local && new URL(site).protocol!=='https:')throw new Error('Use the studio HTTPS address');
-  const bookingSlots=slots??(existsSync(join(root,'.studio','booking-slots.json'))?JSON.parse(readFileSync(join(root,'.studio','booking-slots.json'),'utf8')):[]);
+  const bookingSlots=slotsOf(root,slots);
   const slug=local?'local-'+createHash('sha256').update(root).digest('hex').slice(0,16):studio.slug;
   // Reject secrets before persisting observations. Webhook creation is never part of this plan.
   if(/(?:whsec_|[rs]k_(?:test|live)_)/.test(JSON.stringify(observations)))throw new Error('Supply only public catalog reads, never credentials or webhook creation responses');
   const api=async(method,path,params={},idempotency)=>{
-    if(method!=='GET')throw {next:{method,path,params,...(idempotency?{idempotency}:{}),retry:'Read fresh before retrying; updates set desired fields and are idempotent.'}};
-    const found=observations.find(o=>readKey(o.path,o.params??{})===readKey(path,params));
-    if(!found)throw {next:{method,path,params}};
+    let found=observations.findLast(o=>(o.method??'GET')===method && readKey(o.path,o.params??{})===readKey(path,params));
+    if(method==='GET'&&path.split('/').length>=4&&!path.endsWith('/search')) {
+      const written=observations.findLast(o=>o.method==='POST'&&o.body?.id===path.split('/').at(-1));
+      if(written&&observations.indexOf(written)>observations.indexOf(found)) {
+        const lines=written.body.line_items??found?.body?.line_items;
+        found={...written,body:{...written.body,...(lines?{line_items:Array.isArray(lines)?{data:lines.map(l=>({...l,price:typeof l.price==='string'?{id:l.price}:l.price}))}:lines}:{})}};
+      }
+    }
+    if(!found)throw {next:{method,path,params,...(idempotency?{idempotency}:{})}};
     const body=found.body;
     if(!body || body.error || body.livemode !== undefined && body.livemode !== (mode==='live') || body.data?.some(o=>o.livemode !== undefined && o.livemode !== (mode==='live')))throw new Error('Stripe read has an error or wrong mode');
     return body;
   };
   const base={command:verify?'shop verify':'shop plan',mode,site,apiVersion:LINKS_STRIPE_VERSION,
     webhook:{method:'POST',path:'/v1/webhook_endpoints',private:true,params:{url:`${site}/api/shop/hook`,enabled_events:SHOP_HOOK_EVENTS,api_version:LINKS_STRIPE_VERSION,metadata:{homie:'shop-v1'},description:'Studio shop'}}};
+  let saved;try{saved=JSON.parse(readFileSync(join(root,'.studio','stripe-mcp.json'),'utf8'));}catch{}
+  const knownLinks=saved?.result?.site===site&&saved.result.mode===mode?[...(saved.result.config.items??[]),...(saved.result.config.menus??[]),...(saved.result.config.slots??[])].map(l=>l.id):[];
+  for(const observation of observations) {
+    const body=observation.body;
+    if(/^plink_[A-Za-z0-9]+$/.test(body?.id??'')&&body.metadata?.homie==='shop-links-v1'&&body.metadata.studio===slug&&body.metadata.origin===site)knownLinks.push(body.id);
+  }
   try {
-    const catalog=await reconcilePaymentLinks({api,shop:checked.shop,slug,site,mode,bookingSlots,verifyObjects:true});
+    const catalog=await reconcilePaymentLinks({api,shop:checked.shop,slug,site,mode,bookingSlots,verifyObjects:true,scoped:true,knownLinks,knownPortal:saved?.result?.site===site&&saved.result.mode===mode?saved.result.config.portalId:undefined});
     if(checked.shop.items.some(item=>item.interval) && !/^https:\/\/billing\.stripe\.com\//.test(catalog.config.portal??''))throw new Error('Invalid Stripe portal URL');
     const result={...base,ok:true,verified:true,verifiedAt:new Date().toISOString(),...catalog,local, fingerprint:hash({shop:checked.shop,bookingSlots,site,mode,catalog})};
     return result;
   } catch(e) {
-    if(!e.next)throw e;
-    return {...base,ok:!verify,verified:false,next:e.next,instructions:e.next.method==='GET'?'Read through Stripe MCP; append {path,params,body} to observations, including every pagination page.':'Perform this exact operation through Stripe MCP. Then discard observations and read fresh before planning again. Do not create the webhook through MCP.'};
+    if(!e.next&&!e.operations)throw e;
+    const operations=e.operations??[e.next];
+    return {...base,ok:!verify,verified:false,operations,next:operations[0],instructions:'Perform every independent operation in this batch through Stripe MCP. Append {method,path,params,body} for reads AND writes and replan to resolve dependencies. Keep observations for this setup; never create a webhook through MCP.'};
   }
 }
 export async function saveMcpVerification(root, options) {
@@ -52,7 +67,19 @@ export async function saveMcpVerification(root, options) {
       saveLocalStripe(root,{STRIPE_CHECKOUT_MODE:'links',STRIPE_SHOP_LINKS:'base64:'+Buffer.from(JSON.stringify(result.config)).toString('base64')});
     }
     mkdirSync(join(root,'.studio'),{recursive:true});
-    writeFileSync(join(root,'.studio','stripe-mcp.json'),JSON.stringify({options,result},null,2));
+    const slots=slotsOf(root,options.slots);
+    if(options.slots!==undefined)writeFileSync(join(root,'.studio','booking-slots.json'),JSON.stringify(slots));
+    writeFileSync(join(root,'.studio','stripe-mcp.json'),JSON.stringify({options:{account:options.account,mode:result.mode,slots,url:result.site},source:hash({shop:readShop(root).shop,slots}),result:{verified:true,verifiedAt:result.verifiedAt,local:result.local,site:result.site,mode:result.mode,config:result.config}},null,2));
   }
   return result;
 }
+
+/** Public verified configuration is tied to the current shop and origin, never to stored API responses. */
+export function verifiedMcpConfig(root) {
+  const file=join(root,'.studio','stripe-mcp.json');if(!existsSync(file))return null;
+  const saved=JSON.parse(readFileSync(file,'utf8'));
+  if(saved.result?.local)return null; // Local builds read .dev.vars, never production bindings.
+  const slots=existsSync(join(root,'.studio','booking-slots.json'))?JSON.parse(readFileSync(join(root,'.studio','booking-slots.json'),'utf8')):saved.options?.slots??[];
+  if(!saved.result?.verified || saved.source!==hash({shop:readShop(root).shop,slots}) || saved.result.site!==new URL(siteUrl(root)).origin)throw new Error('Shop configuration changed; verify through stripe_shop_plan before deploying or installing its webhook.');
+  return saved;
+}

package/lib/stripe-connect.mjs

@@ -90,14 +90,14 @@ export async function shopConnect(root, options = {}) {
   let catalog, mcpAccount;
   if (options.webhookOnly) {
     try {
-      const {saveMcpVerification} = await import('./shop-mcp.mjs');
-      const saved=JSON.parse(readFileSync(join(root,'.studio','stripe-mcp.json'),'utf8'));
+      const {verifiedMcpConfig} = await import('./shop-mcp.mjs');
+      const saved=verifiedMcpConfig(root);
       if(!saved.result?.verifiedAt || Date.now()-Date.parse(saved.result.verifiedAt)>15*60_000) return fail('verify','Run shop verify with fresh Stripe MCP reads before installing the webhook (verification is valid for 15 minutes).');
-      const verified=await saveMcpVerification(root,saved.options);
+      const verified=saved.result;
       if(!verified.verified || verified.local || verified.mode!==mode || verified.site!==new URL(siteUrl(root)).origin) return fail('verify','Run shop verify with fresh Stripe MCP reads for this site and mode first.');
       mcpAccount=saved.options.account;
       if(!/^acct_[A-Za-z0-9]+$/.test(mcpAccount??''))return fail('account','Verify with the Stripe MCP account ID first.');
-      catalog={config:verified.config,retire:verified.retire};
+      catalog={config:verified.config,retire:[]};
     } catch { return fail('verify','Run shop verify with fresh Stripe MCP reads for this site first.'); }
   }
   const id = hash(realpathSync(root)).slice(0, 24);

package/lib/template-history.json

@@ -3795,6 +3795,90 @@
      }
     }
    }
+  },
+  "0.51.7": {
+   "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)": "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.51.8": {
+   "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)": "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/lib/worker-config.mjs

@@ -1,3 +1,4 @@
+import {verifiedMcpConfig} from './shop-mcp.mjs';
 import {readFileSync,writeFileSync,existsSync,renameSync} from 'node:fs';
 import {join} from 'node:path';
 import {configPath,readStudio,layoutOf,listExperiences} from './studio.mjs';
@@ -26,6 +27,8 @@ export function updateWorkerConfig(root,generated) {
     writeFileSync(join(root,'wrangler.custom.json'),JSON.stringify(custom,null,2)+'\n');
   }
   const next=merge(base,custom);
+  const verified=verifiedMcpConfig(root);
+  if(verified)next.vars={...next.vars,STRIPE_CHECKOUT_MODE:'links',STRIPE_SHOP_LINKS:JSON.stringify(verified.result.config)};
   // Crons are additive: studio-owned entries cannot erase required toolkit ticks.
   const crons=[...new Set([...(base.triggers?.crons??[]),...(custom.triggers?.crons??[])])].sort();
   next.triggers={...next.triggers,crons}; // [] explicitly removes old generated triggers in Wrangler.

package/netplay/netplay.ts

@@ -116,6 +116,8 @@ export type Movement = 'owner' | 'host';
 
 /** What the shell injects as `window.HOMIE_NET` before the game boots. */
 export interface NetConfig {
+  /** The served experience kind, independent of standalone packaging. */
+  kind?: 'app';
   v: number;
   /** The relay socket: dev `ws://127.0.0.1:<port>/__net?room=main`, site `wss://<host>/api/table/<CODE>/ws?as=net&s=<nonce>`. */
   url: string;
@@ -1939,6 +1941,7 @@ export function createNetplay<S = unknown, A = unknown, C = unknown>(opts: Netpl
   }
   /** What is true of a page that plays by itself: it never says "reconnecting" to somebody who was never connected. */
   function aloneText(): string {
+    if (cfg?.kind === 'app') return 'Reconnecting. Your saved updates will appear shortly.';
     if (!canOffline) return 'This game needs a connection.';
     if (rulesGame && !rulesHost) return 'Loading offline play…';
     if (aloneWhy === 'reconnect-timeout') return 'Playing on your own · the room dropped, still trying…';

package/package.json

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

package/rules/collision.ts

@@ -123,6 +123,7 @@ function castMap3Uncached(map: Map3, p: Vec3, d: Vec3, body: BodyShape, hits?: H
   charge(24);
   const a = solidAt(p, body), r = body.radius, height = body.height || r * 2;
   let best: Hit3 | null = null;
+  const currentBest = (): Hit3 | null => best;
   const take = (h: Hit3 | null, id?: string): void => { if (h && h.t >= 0 && h.t <= 1) { const hit = id ? {...h, id} : h; if (hits) {charge(8); hits.push(hit);} if (!best || h.t < best.t) best = hit; } };
   for (const axis of ['x', 'y', 'z'] as const) {
     const low = map.bounds.min[axis] + (axis === 'z' ? 0 : r);
@@ -141,10 +142,11 @@ function castMap3Uncached(map: Map3, p: Vec3, d: Vec3, body: BodyShape, hits?: H
     charge(terrain.length*(16+Math.ceil(Math.log2(terrain.length+1))));const order=new Map(terrain.map(t=>[t,first(t)]));terrain.sort((a,b)=>order.get(a)!-order.get(b)!);
   }
   for (const tile of terrain) {
-    if(exactTerrain && !hits && best?.t===0)break;
+    const nearest: Hit3 | null = currentBest();
+    if(exactTerrain && !hits && nearest?.t===0)break;
     // Once a nearer surface is known, later solids only need to beat that time.
     // This also bounds work on densely tessellated terrain behind the first hit.
-    const limit = exactTerrain && !hits && best ? best.t : 1;
+    const limit = exactTerrain && !hits && nearest ? nearest.t : 1;
     const delta = limit < 1 ? point(d.x * limit, d.y * limit, d.z * limit) : d;
     const hit = tile.base === undefined ? castHeightTile(tile, p, delta) : (exactTerrain ? castTerrain : legacyTerrain)(tile, a, delta);
     if (hit) take({...hit, t: hit.t * limit});

package/rules/terrain.ts

@@ -136,12 +136,13 @@ function roundedCast(source:Prism,a:Solid,d:Vec3):Hit3|null {
 
   const speed2=dot(d,d);if(speed2<1e-20)return null;
   let best:Hit3|null=null;
+  const currentBest=():Hit3|null=>best;
   const take=(t:number,normal:Vec3)=>{if(t< -1e-9||t>1||best&&t>=best.t)return;const len=Math.sqrt(dot(normal,normal));if(len<1e-12||dot(normal,d)>=-1e-12)return;best={t:Math.max(0,t),nx:normal.x/len,ny:normal.y/len,nz:normal.z/len};};
   const sphere=(v:Vec3)=>{const o=sub(p,v),b=dot(o,d),c=dot(o,o)-r*r,h=b*b-speed2*c;if(h<0)return;const t=(-b-Math.sqrt(h))/speed2;take(t,sub(add(p,d,t),v));};
   // Reuse the plane times from clipping. Parallel and receding faces cannot
   // be entry contacts; do not project or retest their already-known times.
   for(const {plane,t} of approaching){
-    charge(8);if(best&&t>=best.t)continue;charge(16);const hit=add(add(p,d,t),plane.n,-r);let inside=true;
+    charge(8);const nearest=currentBest();if(nearest&&t>=nearest.t)continue;charge(16);const hit=add(add(p,d,t),plane.n,-r);let inside=true;
     for(const q of prism.planes){charge(4);if(dot(q.n,hit)>q.c+1e-10){inside=false;break;}}
     if(inside)take(t,plane.n);
   }

package/rules/tiles.ts

@@ -45,10 +45,14 @@ export function compileTiles(raw: any, wrap?: MapWrap): {
     return { tiles, boxes };
 }
 export function tileApi(get: () => GameMap) {
-    const cell = (x: unknown, y: unknown) => { const t = get().tiles; if (!t || typeof x !== 'number' || typeof y !== 'number' || !Number.isInteger(x) || !Number.isInteger(y))
-        return -1; const w = get().wrap; if (w?.x)
-        x = ((x % t.width) + t.width) % t.width; if (w?.y)
-        y = ((y % t.height) + t.height) % t.height; return x < 0 || y < 0 || x >= t.width || y >= t.height ? -1 : y * t.width + x; };
+    const cell = (x: unknown, y: unknown) => {
+        const t = get().tiles;
+        if (!t || typeof x !== 'number' || typeof y !== 'number' || !Number.isInteger(x) || !Number.isInteger(y)) return -1;
+        const w = get().wrap;
+        const cx = w?.x ? ((x % t.width) + t.width) % t.width : x;
+        const cy = w?.y ? ((y % t.height) + t.height) % t.height : y;
+        return cx < 0 || cy < 0 || cx >= t.width || cy >= t.height ? -1 : cy * t.width + cx;
+    };
     return {
         tile: (x: unknown, y: unknown) => { charge(4); const id = cell(x, y); return id < 0 ? 1 : get().tiles!.data[id]; },
         distance: (name: unknown, x: unknown, y: unknown) => { charge(4); const id = cell(x, y), f = typeof name === 'string' && get().tiles ? fields.get(get().tiles!)?.get(name) : null; return id < 0 || !f ? -1 : f.distance[id]; },