@homie-rocks/studio 0.51.8 → 0.53.0

package/lib/shop-links.mjs

@@ -7,7 +7,7 @@ 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, scoped = false, knownLinks = [], knownPortal }) {
+export async function reconcilePaymentLinks({ api, shop, slug, site, mode, bookingSlots = [], verifyObjects = false, scoped = false, 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);
@@ -44,7 +44,7 @@ export async function reconcilePaymentLinks({ api, shop, slug, site, mode, booki
   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'),
+    ()=>list('/v1/payment_links',scoped?{expand:['data.line_items']}:{}),
   ]);
   const own = (o) => o.metadata?.homie === 'shop-links-v1' && o.metadata?.studio === slug && o.metadata?.origin === site;
   const verifyLink = async (link, params) => {
@@ -85,7 +85,7 @@ export async function reconcilePaymentLinks({ api, shop, slug, site, mode, booki
     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) 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 } } : {}) }],
+    const params = { ...customText, line_items: [{ price: price.id, quantity: 1, ...(item.price !== 'choose' && !['supporter','deposit'].includes(item.kind) ? { 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 } }),
       ...(item.interval ? { subscription_data: { metadata } } : { payment_intent_data: { metadata } }),
@@ -103,7 +103,7 @@ export async function reconcilePaymentLinks({ api, shop, slug, site, mode, booki
   // 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 menuItems = shop.items.filter(i => !['supporter','deposit'].includes(i.kind) && 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??'');
@@ -198,7 +198,7 @@ export async function reconcilePaymentLinks({ api, shop, slug, site, mode, booki
     });
   }
   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');
+    const portals=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})}`);
@@ -258,9 +258,9 @@ export async function syncPaymentLinks(options) {
     secret = endpoint.secret;
   }
   const fingerprint = hash({config, purchases:purchases?.config});
-  const unchanged = current && !secret && receipt?.fingerprint === fingerprint && has('STRIPE_SHOP_LINKS') && !has('STRIPE_KEY');
+  const unchanged = current && !secret && receipt?.fingerprint === fingerprint && (options.catalog || has('STRIPE_SHOP_LINKS')) && !has('STRIPE_KEY');
   if (!unchanged) {
-    const saved = await w(['secret', 'bulk'], { input: JSON.stringify({ STRIPE_CHECKOUT_MODE: 'links', STRIPE_SHOP_LINKS: JSON.stringify(config), ...purchaseSecrets, ...(purchases && (purchases.config.offers.length || has('PURCHASE_LINKS')) ? { PURCHASE_LINKS: JSON.stringify(purchases.config) } : {}), ...(secret ? { STRIPE_WEBHOOK_SECRET: secret } : {}) }) });
+    const saved = await w(['secret', 'bulk'], { input: JSON.stringify({ STRIPE_CHECKOUT_MODE: 'links', ...(options.catalog ? {} : {STRIPE_SHOP_LINKS: JSON.stringify(config)}), ...purchaseSecrets, ...(purchases && (purchases.config.offers.length || has('PURCHASE_LINKS')) ? { PURCHASE_LINKS: JSON.stringify(purchases.config) } : {}), ...(secret ? { STRIPE_WEBHOOK_SECRET: secret } : {}) }) });
     if (saved.code !== 0) return { ok: false, needs: 'cloudflare', why: 'Cloudflare could not save the shop connection. Run shop connect again; existing webhooks remain active.' };
     // Explicitly running connect selects keyless; manual selects the existing keyed checkout.
     if (has('STRIPE_KEY') && (await w(['secret', 'delete', 'STRIPE_KEY'], { input: 'y\n' })).code !== 0) return { ok: false, needs: 'cloudflare', why: 'The links are ready; run shop connect again to finish removing the old checkout credential.' };

package/lib/shop-mcp.mjs

@@ -6,11 +6,11 @@ import {join} from 'node:path';
 import {readShop, SHOP_HOOK_EVENTS} from './shop.mjs';
 import {readStudio, siteUrl} from './studio.mjs';
 import {reconcilePaymentLinks} from './shop-links.mjs';
-import {fullerReason, LINKS_STRIPE_VERSION} from '../worker/shop-links.mjs';
+import {fullerReason, linkSettings, LINKS_STRIPE_VERSION} from '../worker/shop-links.mjs';
 const hash = x => createHash('sha256').update(JSON.stringify(x)).digest('hex');
 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} = {}) {
+export async function shopMcpPlan(root, {observations = [], mode = 'test', url, slots, verify = false, refresh = false, account} = {}) {
   const checked=readShop(root);
   if(!checked.ok || checked.absent) return {ok:false,why:'Create and check shop.json first.'};
   if(!['test','live'].includes(mode))throw new Error('Choose test or live mode');
@@ -26,8 +26,38 @@ export async function shopMcpPlan(root, {observations = [], mode = 'test', url,
   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');
+  let saved;try{saved=JSON.parse(readFileSync(join(root,'.studio','stripe-mcp.json'),'utf8'));}catch{}
+  const cacheFile=join(root,'.studio','stripe-mcp-observations.json');
+  let cache;try{cache=JSON.parse(readFileSync(cacheFile,'utf8'));}catch{}
+  const source=hash({shop:checked.shop,slots:bookingSlots});
+  const reusable=!refresh && cache?.site===site && cache.mode===mode && (!account || cache.account===account);
+  const legacy=!refresh && saved?.result?.site===site && saved.result.mode===mode && (!account || saved.options?.account===account);
+  let prior=reusable?cache.observations:legacy?saved.options?.observations??[]:[];
+  // Catalogue edits retain product/price discovery, but refresh mutable slot counts and writes.
+  const legacySourceMatches=legacy && (saved.source===source || saved.result.fingerprint===hash({shop:checked.shop,bookingSlots,site,mode,catalog:{config:saved.result.config,retire:saved.result.retire??[]}}));
+  if(reusable && cache.source!==source || !reusable && legacy && !legacySourceMatches)prior=prior.filter(o=>/\/v1\/(products|prices)(\/|$)/.test(o.path));
+  observations=[...prior,...observations];
+  if(/(?:whsec_|[rs]k_(?:test|live)_)/.test(JSON.stringify(observations)))throw new Error('Supply only public catalog reads, never credentials or webhook creation responses');
+  // Latest response per operation, bounded by operations rather than replanning attempts.
+  const latest=new Map();
+  for(const o of observations){const key=canonicalJson([o.method??'GET',o.path,o.params??{}]);latest.delete(key);latest.set(key,o);}
+  observations=[...latest.values()];
+  const observedAt=refresh?new Date().toISOString():reusable?cache.observedAt:legacy?saved.result.verifiedAt??new Date().toISOString():new Date().toISOString();
+  mkdirSync(join(root,'.studio'),{recursive:true});
+  writeFileSync(cacheFile,JSON.stringify({site,mode,account:account??cache?.account??saved?.options?.account,source,observedAt,observations}));
   const api=async(method,path,params={},idempotency)=>{
     let found=observations.findLast(o=>(o.method??'GET')===method && readKey(o.path,o.params??{})===readKey(path,params));
+    // Upgrade old list reads to the scoped searches, and hydrate old link lists
+    // from the expanded reads already saved by 0.51.6.
+    if(!found && method==='GET' && /\/v1\/(products|prices)\/search$/.test(path) && !params.page)
+      found=observations.findLast(o=>(o.method??'GET')==='GET' && o.path===path.replace('/search','') && o.body?.has_more===false);
+    if(!found && method==='GET' && path==='/v1/payment_links' && !params.starting_after) {
+      const old=observations.findLast(o=>(o.method??'GET')==='GET' && o.path===path && o.body?.has_more===false);
+      if(old) {
+        const data=old.body.data.map(l=>observations.findLast(o=>o.path===`${path}/${l.id}`)?.body??l);
+        if(data.every(l=>l.line_items?.data))found={...old,body:{...old.body,data}};
+      }
+    }
     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)) {
@@ -36,22 +66,24 @@ export async function shopMcpPlan(root, {observations = [], mode = 'test', url,
       }
     }
     if(!found)throw {next:{method,path,params,...(idempotency?{idempotency}:{})}};
-    const body=found.body;
+    let body=found.body;
+    if(method==='GET' && Array.isArray(body?.data) && !params.starting_after && !params.page && !body.has_more) {
+      const kind=path.split('/')[2], rows=new Map(body.data.map(o=>[o.id,o]));
+      for(const o of observations.slice(observations.indexOf(found)+1))if(o.method==='POST') {
+        if(o.path.split('/')[2]===kind && o.body?.id)rows.set(o.body.id,o.body);
+        if(kind==='prices' && o.body?.default_price?.id)rows.set(o.body.default_price.id,o.body.default_price);
+      }
+      body={...body,data:[...rows.values()]};
+    }
     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,scoped:true,knownLinks,knownPortal:saved?.result?.site===site&&saved.result.mode===mode?saved.result.config.portalId:undefined});
+    const catalog=await reconcilePaymentLinks({api,shop:checked.shop,slug,site,mode,bookingSlots,verifyObjects:true,scoped:true,knownPortal:saved?.result?.site===site&&saved.result.mode===mode&&(!account||saved.options?.account===account)?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})};
+    const result={...base,ok:true,verified:true,verifiedAt:observedAt,...catalog,local, fingerprint:hash({shop:checked.shop,bookingSlots,site,mode,catalog})};
     return result;
   } catch(e) {
     if(!e.next&&!e.operations)throw e;
@@ -69,7 +101,7 @@ export async function saveMcpVerification(root, options) {
     mkdirSync(join(root,'.studio'),{recursive:true});
     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));
+    writeFileSync(join(root,'.studio','stripe-mcp.json'),JSON.stringify({options:{account:options.account??JSON.parse(readFileSync(join(root,'.studio','stripe-mcp-observations.json'),'utf8')).account,mode:result.mode,slots,url:result.site},source:hash({shop:readShop(root).shop,slots}),sourceConfig:{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;
 }
@@ -78,8 +110,50 @@ export async function saveMcpVerification(root, options) {
 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.
+  if(!saved.result?.verified || 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.');
+  const shop=readShop(root).shop, source=hash({shop,slots}), site=new URL(siteUrl(root)).origin;
+  const legacyFingerprint=hash({shop,bookingSlots:slots,site,mode:saved.result.mode,catalog:{config:saved.result.config,retire:saved.result.retire??[]}});
+  if(!saved.source && saved.result.fingerprint===legacyFingerprint) {
+    saved.source=source;saved.sourceConfig={shop,slots};
+    writeFileSync(file,JSON.stringify(saved,null,2));
+  }
+  if(saved.source!==source || saved.result.site!==site) {
+    const changes=[];
+    if(saved.result.site!==site)changes.push('site URL');
+    const previous=saved.sourceConfig?.shop;
+    if(previous)for(const key of new Set([...Object.keys(previous),...Object.keys(shop??{})])) {
+      if(canonicalJson(previous[key]??null)!==canonicalJson(shop?.[key]??null))changes.push(`shop.${key}`);
+    }
+    else {
+      let before;try{before=JSON.parse(saved.result.config?.settings);}catch{}
+      const after=JSON.parse(linkSettings(shop));
+      if(before)for(const key of new Set([...Object.keys(before),...Object.keys(after)])) {
+        if(canonicalJson(before[key]??null)!==canonicalJson(after[key]??null))changes.push(`shop.${key}`);
+      }
+      else changes.push('shop settings');
+      const receipt=saved.options?.observations?.find(o=>o.body?.custom_text?.submit?.message)?.body.custom_text.submit.message;
+      if(receipt!==(shop.giving?.receiptText||undefined))changes.push('shop.giving.receiptText');
+    }
+    if(canonicalJson(saved.sourceConfig?.slots??saved.options?.slots??[])!==canonicalJson(slots))changes.push('booking slots');
+    throw new Error(`Shop configuration changed: ${changes.join(', ')||'shop settings (saved verification differs)'}. Run stripe_shop_plan with verify:true before deploying or installing its webhook.`);
+  }
   return saved;
 }
+
+/** Unfinished public plans also publish a closed setup, even before first verification. */
+export function publicMcpSetup(root) {
+  for(const name of ['stripe-mcp.json','stripe-mcp-observations.json']) {
+    const file=join(root,'.studio',name);
+    if(!existsSync(file))continue;
+    const saved=JSON.parse(readFileSync(file,'utf8'));
+    return !saved.result?.local && !(saved.site??saved.result?.site??saved.options?.url??'').startsWith('http:');
+  }
+  return false;
+}
+
+/** Record a batch from the official plugin and return the next dependency batch. */
+export async function recordShopObservations(root, options = {}) {
+  if(!Array.isArray(options.observations) || !options.observations.length)throw new Error('Supply observations: [{method,path,params,body}] from Stripe’s official plugin.');
+  return shopMcpPlan(root, options);
+}

package/lib/stripe-connect.mjs

@@ -37,11 +37,11 @@ const stripeReason = (result, call) => {
 };
 
 // This output stays private, including CLI config, completion, errors and API responses.
-export function stripeProcess(args, { cwd, env = process.env } = {}) {
+export function stripeProcess(args, { cwd, env = process.env, command = 'stripe' } = {}) {
   const childEnv = { ...env, CI: '1', NO_COLOR: '1' };
   for (const k of Object.keys(childEnv)) if (k.startsWith('STRIPE_')) delete childEnv[k];
   return new Promise((resolve) => {
-    const p = spawn('stripe', args, { cwd, env: childEnv, stdio: ['ignore', 'pipe', 'pipe'] });
+    const p = spawn(command, args, { cwd, env: childEnv, shell: process.platform==='win32' && command==='npm.cmd', stdio: ['ignore', 'pipe', 'pipe'] });
     let stdout = '', stderr = '', ended = false;
     const end = (r) => { if (!ended) { ended = true; clearTimeout(timer); resolve(r); } };
     const timer = setTimeout(() => { p.kill(); end({ code: 1 }); }, 10 * 60_000);
@@ -92,11 +92,11 @@ export async function shopConnect(root, options = {}) {
     try {
       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).');
+      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=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.');
+      if(mcpAccount && !/^acct_[A-Za-z0-9]+$/.test(mcpAccount))return fail('account','Invalid saved Stripe account ID.');
       catalog={config:verified.config,retire:[]};
     } catch { return fail('verify','Run shop verify with fresh Stripe MCP reads for this site first.'); }
   }
@@ -110,7 +110,12 @@ export async function shopConnect(root, options = {}) {
   try {
     const cli = (args) => exec(['--project-name', profile, ...args], { cwd: root });
     const installed = await cli(['--version']);
-    if (installed.code !== 0) return fail('stripe-cli', 'Install Stripe’s official CLI, then run shop connect again.', { next: ['npm install -g @stripe/cli@latest'] });
+    if (installed.code !== 0) {
+      log('Installing Stripe’s official CLI with npm…');
+      const install=options.installExec??((command,args)=>stripeProcess(args,{cwd:root,command}));
+      const result=await install(process.platform==='win32'?'npm.cmd':'npm',['install','--global','@stripe/cli@latest']);
+      if(result.code!==0 || (await cli(['--version'])).code!==0)return fail('stripe-cli','Automatic Stripe CLI installation failed. Check npm install permissions and PATH, then run shop connect again.',{next:['npm install --global @stripe/cli@latest']});
+    }
 
     // A read both checks existing credentials and lets Stripe refresh its OAuth session itself.
     let probe = renew ? { code: 1 } : await cli(['get', '/v1/products', '-d', 'limit=1', ...(live ? ['--live'] : [])]);
@@ -121,6 +126,7 @@ export async function shopConnect(root, options = {}) {
       if (start.code !== 0 || !stripeURL(login?.browser_url) || !complete || !/^[a-zA-Z0-9 -]{1,100}$/.test(login?.verification_code ?? '')) {
         return fail('stripe-login', 'Stripe could not start browser approval. Update the official Stripe CLI and try shop connect again. An account administrator may need to enable CLI access in Stripe’s MCP and CLI access settings.' + stripeReason(start, 'login'));
       }
+      options.onEvent?.({type:'stripe.pairing',code:login.verification_code,url:login.browser_url});
       log(`Approve your studio’s Stripe account in your browser. Pairing code: ${login.verification_code}. ${login.browser_url}`);
       open(login.browser_url);
       const finished = await cli(complete);
@@ -131,7 +137,23 @@ export async function shopConnect(root, options = {}) {
     }
     if (options.webhookOnly) {
       const accountResult=await cli(['get','/v1/account',...(live?['--live']:[])]);
-      if(accountResult.code!==0 || json(accountResult.stdout)?.id!==mcpAccount) return fail('account','Stripe CLI and MCP must select the same account. Verify with the MCP account ID first.');
+      const account=json(accountResult.stdout)?.id;
+      if(accountResult.code!==0 || !/^acct_[A-Za-z0-9]+$/.test(account??'') || mcpAccount && account!==mcpAccount) return fail('account','Stripe CLI and MCP must select the same account. Verify with the MCP account ID first.');
+      if(!mcpAccount) {
+        // Old verifications predate account IDs. Establish ownership before adopting
+        // the CLI account; never silently bind a different account's catalog.
+        const links=[...(catalog.config.items??[]),...(catalog.config.menus??[]),...(catalog.config.slots??[])];
+        for(const link of links) {
+          const read=await cli(['get',`/v1/payment_links/${link.id}`,...(live?['--live']:[])]);
+          const actual=json(read.stdout);
+          if(read.code!==0 || actual?.id!==link.id || actual.url!==link.url || actual.livemode!==(mode==='live'))return fail('account','The signed-in Stripe account does not own the verified links. Select their account and retry.');
+        }
+        const file=join(root,'.studio','stripe-mcp.json');
+        const saved=JSON.parse(readFileSync(file,'utf8'));
+        saved.options={...saved.options,account};
+        writeFileSync(file,JSON.stringify(saved,null,2));
+        mcpAccount=account;
+      }
     }
     const site = siteUrl(root);
     if (!site) return fail('deploy', 'Stripe is connected on this computer. Deploy the studio with studio_deploy (Cloudflare approval first if needed), then run shop connect again.', { mode, connected: true });
@@ -151,6 +173,24 @@ export async function shopConnect(root, options = {}) {
     const reason = fullerReason(checked.shop);
     if (reason) return fail('fuller-checkout', reason, { mode, connected: true });
     const studio = readStudio(root);
+    if(options.webhookOnly && catalog.config.portal && !catalog.config.portalId) {
+      // 0.51.6 saved the login URL alone. Discover its identity without creating
+      // a second portal or making webhook installation depend on this new field.
+      try {
+        let after;
+        for(let page=0;page<100;page++) {
+          const found=await api('GET','/v1/billing_portal/configurations',{limit:100,...(after?{starting_after:after}:{})});
+          const portal=found.data?.find(p=>p.login_page?.url===catalog.config.portal && p.metadata?.homie==='shop-links-v1' && p.metadata?.studio===studio.slug && p.metadata?.origin===target.origin);
+          if(portal) {
+            catalog.config.portalId=portal.id;
+            const file=join(root,'.studio','stripe-mcp.json'),saved=JSON.parse(readFileSync(file,'utf8'));
+            saved.result.config.portalId=portal.id;writeFileSync(file,JSON.stringify(saved,null,2));break;
+          }
+          if(!found.has_more||!found.data?.length)break;
+          after=found.data.at(-1).id;
+        }
+      } catch { log('The existing billing portal URL is retained. The next Stripe plugin observation can fill its portal ID.'); }
+    }
     const w = wrangler ?? runner(root, studio.cloudflare?.accountId ? { CLOUDFLARE_ACCOUNT_ID: studio.cloudflare.accountId } : {});
     const receiptFile = join(dir, `${mode}.json`);
     const receipt = existsSync(receiptFile) ? json(readFileSync(receiptFile, 'utf8')) : null;

package/lib/template-history.json

@@ -3879,6 +3879,90 @@
      }
     }
    }
+  },
+  "0.52.0": {
+   "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.53.0": {
+   "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/tools-cli.mjs

@@ -16,9 +16,10 @@ export async function connectToolClient(root,site,{publicOnly=false,open=default
   const {Client,StreamableHTTPClientTransport,auth}=await import('mcp-studio-client');
   const url=new URL('/mcp',site);if(url.protocol!=='https:'&&!['localhost','127.0.0.1','[::1]'].includes(url.hostname))throw new Error('Use HTTPS, or localhost for local development');
   const client=new Client({name:'Homie studio tool CLI',version:'1.0.0'});
-  if(publicOnly){await client.connect(new StreamableHTTPClientTransport(url));return client;}
+  const fetch=startupFetch({log});
+  if(publicOnly){await client.connect(new StreamableHTTPClientTransport(url,{fetch}));return client;}
   const secret=localCredential(root,url);
-  if(secret){await client.connect(new StreamableHTTPClientTransport(url,{requestInit:{headers:{authorization:`Bearer ${secret}`}}}));return client;}
+  if(secret){await client.connect(new StreamableHTTPClientTransport(url,{fetch,requestInit:{headers:{authorization:`Bearer ${secret}`}}}));return client;}
   const file=join(root,'.studio','mcp',Buffer.from(url.origin).toString('base64url')+'.json');
   let state={};try{state=JSON.parse(readFileSync(file,'utf8'));}catch{}
   // Credentials without an issuer predate the SDK's OAuth binding fix; reconnect safely.
@@ -46,7 +47,7 @@ export async function connectToolClient(root,site,{publicOnly=false,open=default
       if(back.searchParams.has('error'))throw new Error('Connection declined');
       await auth(provider,{serverUrl:url,authorizationCode:back.searchParams.get('code'),iss:back.searchParams.get('iss')??undefined});
     }
-    await client.connect(new StreamableHTTPClientTransport(url,{authProvider:provider}));return client;
+    await client.connect(new StreamableHTTPClientTransport(url,{fetch,authProvider:provider}));return client;
   }finally{server.close();}
 }
 function defaultOpen(url){const cmd=process.platform==='darwin'?'open':process.platform==='win32'?'explorer':'xdg-open';const child=spawn(cmd,[url],{stdio:'ignore',detached:true});child.unref();}
@@ -56,3 +57,24 @@ export async function toolCommand(root,sub,positional,flags,{log=()=>{}}={}) {
   const client=await connectToolClient(root,flags.get('url')??'http://localhost:8787',{publicOnly:flags.has('public'),log});
   try{const result=sub==='list'?await client.listTools():await client.callTool({name:positional[2],arguments:JSON.parse(flags.get('input')??'{}')});return {ok:result.isError!==true,command:'tool '+sub,result,...(result.isError?{why:'The tool refused or failed; see its result.'}:{})};}finally{await client.close();}
 }
+
+/** A new Worker can briefly return Cloudflare 1042 before MCP starts. */
+export function startupFetch({fetch: send=globalThis.fetch,log=()=>{},sleep=ms=>new Promise(resolve=>setTimeout(resolve,ms))}={}) {
+  return async(input,init)=>{
+    const request=new Request(input,init);
+    for(let attempt=0;;attempt++) {
+      const response=await send(request.clone());
+      if(response.status!==500 || attempt>=3)return response;
+      const reader=response.clone().body?.getReader();
+      let text='';
+      if(reader)try {
+        const decoder=new TextDecoder();
+        while(text.length<4096) {const {value,done}=await reader.read();if(done)break;text+=decoder.decode(value).slice(0,4096-text.length);}
+      }finally{void reader.cancel().catch(()=>{});}
+      if(!/error code:\s*1042\b/i.test(text))return response;
+      log(`Cloudflare 1042 during Worker startup; retrying MCP (${attempt+1}/3).`);
+      await response.body?.cancel();
+      await sleep(250*2**attempt);
+    }
+  };
+}

package/lib/upgrade-places.mjs

@@ -0,0 +1,49 @@
+import {createRequire} from 'node:module';
+import {existsSync,readdirSync,readFileSync} from 'node:fs';
+import {join} from 'node:path';
+/** Only a standalone, named refresh timer over known record clients is mechanical. */
+export function upgradePlaceView(source,root){
+ // Desktop ships no compiler; use the studio’s installed compiler when available.
+ let ts;try{ts=createRequire(root?join(root,'package.json'):import.meta.url)('typescript');}catch{return source;}
+ const file=ts.createSourceFile('view.ts',source,ts.ScriptTarget.Latest,true,ts.ScriptKind.TS);
+ const factories=new Set(),clients=[];
+ for(const statement of file.statements){
+  if(ts.isImportDeclaration(statement)&&statement.moduleSpecifier.text==='@homie-rocks/studio/apps'){
+   for(const name of statement.importClause?.namedBindings?.elements??[])if((name.propertyName?.text??name.name.text)==='createAppRecords')factories.add(name.name.text);
+  }
+  if(ts.isVariableStatement(statement))for(const d of statement.declarationList.declarations){
+   if(ts.isIdentifier(d.name)&&d.initializer&&ts.isCallExpression(d.initializer)&&ts.isIdentifier(d.initializer.expression)&&factories.has(d.initializer.expression.text))clients.push(d.name.text);
+  }
+ }
+ if(!clients.length)return source;
+ const edits=[];
+ for(const statement of file.statements){
+  if(!ts.isExpressionStatement(statement)||!ts.isCallExpression(statement.expression))continue;
+  const call=statement.expression;
+  if(!ts.isIdentifier(call.expression)||call.expression.text!=='setInterval'||call.arguments.length!==2)continue;
+  const [callback,delay]=call.arguments;
+  if(!ts.isIdentifier(callback)||!/^refresh/i.test(callback.text)||!ts.isNumericLiteral(delay)||+delay.text<2000||+delay.text>3000)continue;
+  edits.push({start:statement.getStart(file),end:statement.end,text:clients.map(name=>`${name}.subscribe(${callback.text});`).join('\n')});
+ }
+ for(const edit of edits.reverse())source=source.slice(0,edit.start)+edit.text+source.slice(edit.end);
+ return source;
+}
+/** Exact obsolete notes only. Never rewrite owner's words, evidence, dates or unresolved needs. */
+export function upgradePlaceCodex(source){
+ const replacements=new Map([
+  ['The runner has no staff surface or MCP step.','The toolkit supports staff surfaces and MCP needs. Rerun the needs; earlier manual evidence is not a passing proof.'],
+  ['Real Homie gap: no push for studio events, so the AI polls.','Declared studio event feeds support push subscriptions; reconnect from the last cursor.'],
+  ['Staff device runs the jobs Homie has no scheduler for.','Run these jobs in scheduled server functions; remove the duplicate staff-device job after proving its replacement.'],
+  ['ctx.database has only get/put (no atomic append).','Use versioned database writes and named event feeds; do not maintain an event log with sleep-and-retry.']
+ ]);
+ return source.split('\n').map(line=>replacements.get(line)??line).join('\n');
+}
+export function placeUpgradeChanges(root){
+ const dir=join(root,'apps');if(!existsSync(dir))return [];
+ const changes=[];
+ for(const app of readdirSync(dir,{withFileTypes:true}).filter(d=>d.isDirectory()))for(const [suffix,rewrite] of [['CODEX.md',upgradePlaceCodex],['src/view.ts',upgradePlaceView]]){
+  const file=`apps/${app.name}/${suffix}`,path=join(root,file);if(!existsSync(path))continue;
+  const from=readFileSync(path,'utf8'),text=rewrite(from,root);if(from!==text)changes.push({file,kind:'update-file',from,text,what:'replace a recognized obsolete place workaround with the supported toolkit contract; rerun needs'});
+ }
+ return changes;
+}

package/lib/upgrade.mjs

@@ -1,3 +1,4 @@
+import {placeUpgradeChanges} from './upgrade-places.mjs';
 import { upgradeMediaGuidance } from './upgrade-media.mjs';
 import {appPresetChanges} from './upgrade-app-presets.mjs';
 import {refreshWorkerConfig} from './worker-config.mjs';
@@ -176,7 +177,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 = appPresetChanges(root);
+  const changes = [...appPresetChanges(root),...placeUpgradeChanges(root)];
   const kept = [];
 
   // package.json: the pin, and the scripts the template's studios have.

package/lib/worker-config.mjs

@@ -1,4 +1,4 @@
-import {verifiedMcpConfig} from './shop-mcp.mjs';
+import {verifiedMcpConfig,publicMcpSetup} 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';
@@ -27,8 +27,12 @@ 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)};
+  next.vars={...next.vars,HOMIE_CONCEPT:readStudio(root).concept===true?'1':'0'};
+  verifiedMcpConfig(root);
+  if(publicMcpSetup(root)) {
+    next.vars={...next.vars,STRIPE_CHECKOUT_MODE:'links',STRIPE_SHOP_LINKS_ASSET:'/_site/stripe-shop-links.json'};
+    delete next.vars.STRIPE_SHOP_LINKS;
+  }
   // 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/links/links.d.mts

@@ -0,0 +1,5 @@
+export function randomId(): string;
+export function appLink(address: string, params?: Record<string, string | number | boolean | null | undefined>, base?: string): string;
+export function qrSvg(text: string, options?: { quiet?: number; dark?: string; light?: string; title?: string; minLevel?: 'L' | 'M' | 'Q' | 'H' }): string;
+/** Epoch milliseconds for local date/time in an IANA zone; gaps and repeats reject by default. */
+export function placeTime(date: string, time: string, timeZone: string, options?: {disambiguation?: 'reject' | 'earlier' | 'later'}): number;

package/links/links.d.ts

@@ -1,3 +1,5 @@
 export function randomId(): string;
 export function appLink(address: string, params?: Record<string, string | number | boolean | null | undefined>, base?: string): string;
 export function qrSvg(text: string, options?: { quiet?: number; dark?: string; light?: string; title?: string; minLevel?: 'L' | 'M' | 'Q' | 'H' }): string;
+/** Epoch milliseconds for local date/time in an IANA zone; gaps and repeats reject by default. */
+export function placeTime(date: string, time: string, timeZone: string, options?: {disambiguation?: 'reject' | 'earlier' | 'later'}): number;

package/links/links.mjs

@@ -14,3 +14,5 @@ export function appLink(address, params = {}, base = globalThis.location?.href)
   }
   return url.href;
 }
+
+export {placeTime} from './time.mjs';

package/links/time.mjs

@@ -0,0 +1,20 @@
+/** Interpret a place's calendar date and wall time using the runtime's IANA zone data. */
+export function placeTime(date,time,timeZone,{disambiguation='reject'}={}){
+ if(!/^\d{4}-\d{2}-\d{2}$/.test(date)||!/^([01]\d|2[0-3]):[0-5]\d$/.test(time))throw new Error('Use a calendar date YYYY-MM-DD and time HH:MM');
+ if(typeof timeZone!=='string'||/^[+-]/.test(timeZone))throw new Error('Use an IANA time zone');
+ if(!['reject','earlier','later'].includes(disambiguation))throw new Error('Unknown time disambiguation');
+ const naive=Date.parse(date+'T'+time+':00Z');
+ if(!Number.isFinite(naive)||new Date(naive).toISOString().slice(0,10)!==date)throw new Error('Invalid calendar date');
+ let format;try{format=new Intl.DateTimeFormat('en-CA',{timeZone,year:'numeric',month:'2-digit',day:'2-digit',hour:'2-digit',minute:'2-digit',second:'2-digit',hourCycle:'h23'});}catch{throw new Error('Use a valid IANA time zone');}
+ const wall=epoch=>{
+  const p=Object.fromEntries(format.formatToParts(epoch).map(p=>[p.type,p.value]));
+  return Date.parse(`${p.year}-${p.month}-${p.day}T${p.hour}:${p.minute}:${p.second}Z`);
+ };
+ const offsets=new Set();
+ // Sample both sides of even a whole-day civil transition; do not assume an hour-sized DST shift.
+ for(let h=-48;h<=48;h+=6){const sample=naive+h*3600000;offsets.add(wall(sample)-sample);}
+ const choices=[...offsets].map(offset=>naive-offset).filter(epoch=>wall(epoch)===naive).sort((a,b)=>a-b);
+ if(!choices.length)throw new Error('This local time does not exist in the place’s time zone');
+ if(choices.length>1&&disambiguation==='reject')throw new Error('This local time is ambiguous; choose earlier or later explicitly');
+ return disambiguation==='later'?choices.at(-1):choices[0];
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@homie-rocks/studio",
-  "version": "0.51.8",
+  "version": "0.53.0",
   "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/rules.ts

@@ -607,7 +607,7 @@ export function compileRules(def: RulesDef, env: CompileEnv = {}): Compiled {
       if (dims === 3 && b.height !== undefined && (!Number.isFinite(b.height) || b.height <= 0 || b.shape === 'capsule' && b.height < b.radius * 2)) throw new Error(`${at}.body.height must be finite, positive and at least twice the radius for a capsule`);
       body = { shape: b.shape, radius: b.radius, height: dims === 3 && b.shape === 'sphere' ? 2 * b.radius : typeof b.height === 'number' && b.height > 0 ? b.height : 0, maxSpeed: b.maxSpeed, sweep: b.sweep === true, owner: b.move === 'owner', ...(b.terrain === 'exact' ? {terrain: 'exact' as const} : {}) };
     }
-    if (player && !body) throw new Error(`${at}: a player's kind needs a body`);
+    // Turn-based participants may own fields and commands without physics.
     const moveFn = move && typeof move[name] === 'function' ? move[name] as MoveFn : null;
     if (body && player && !moveFn) throw new Error(`${at}: a player's body moves with move.${name}(body, input, ctx) in move.ts`);
     const scores = fields.filter(([, fd]) => fd.score);