@bongos/core 1.19.999 → 1.19.1000

package/tests/provision.mjs

@@ -108,7 +108,7 @@ t('serviceUnit binds the instance port + DB + per-instance env file, runs platfo
 });
 
 t('serviceUnit(standalone) runs the CORE PACKAGE server from the instance\'s OWN repo dir (ADR 0108)', () => {
-  const inst = { ...coTenant, hosting_shape: 'standalone' };
+  const inst = { ...coTenant, hosting_shape: 'cloud-host' };
   const u = P.serviceUnit(inst, { etcBase: '/etc' });
   const root = P.standaloneRoot(inst);
   assert.match(u, new RegExp('WorkingDirectory=' + reEsc(root)), 'runs from the instance\'s own repo dir');
@@ -118,7 +118,7 @@ t('serviceUnit(standalone) runs the CORE PACKAGE server from the instance\'s OWN
 });
 
 t('standalone step generators: root under standaloneBase + pull / npm-ci / instance-root migrate', () => {
-  const inst = { ...coTenant, hosting_shape: 'standalone' };
+  const inst = { ...coTenant, hosting_shape: 'cloud-host' };
   assert.match(P.standaloneRoot(inst), /\/mercury$/);
   assert.equal(P.standalonePullCmd(), 'git pull --ff-only origin main');
   assert.equal(P.standaloneInstallCmd(), 'npm ci --omit=dev');
@@ -220,7 +220,7 @@ t('backup units: per-instance names + the DB set on the unit (fixes the task-221
 
 t('backupScriptPath resolves the CONSUMER LAYOUT, never the old /home/lars/example monorepo path', () => {
   // standalone → the script inside the instance's OWN pinned @bongos/core
-  const standalone = { ...coTenant, hosting_shape: 'standalone' };
+  const standalone = { ...coTenant, hosting_shape: 'cloud-host' };
   const sPath = P.backupScriptPath(standalone);
   assert.ok(sPath.startsWith(P.standaloneRoot(standalone) + '/'), 'under the instance root');
   assert.match(sPath, /node_modules\/@bongos\/core\/scripts\/gds\/db-backup-nightly\.sh$/);
@@ -311,7 +311,7 @@ t('webEnvBody: the repo target_ref seats the founding owner via <prefix>_FIRST_A
   // seat an Archon on first sign-in and the owner can't claim their own instance. Derived
   // from the repo owner in target_ref — the SAME source instanceInitSpec uses for the
   // scaffold's branding.firstAdmin, so the env override and config/branding.json agree.
-  const b = P.webEnvBody({ ...coTenant, hosting_shape: 'standalone', domain: 'mercury.example.com', target_ref: 'octocat/mercury' });
+  const b = P.webEnvBody({ ...coTenant, hosting_shape: 'cloud-host', domain: 'mercury.example.com', target_ref: 'octocat/mercury' });
   assert.match(b, new RegExp(`${reEsc(NEUTRAL_PREFIX)}_FIRST_ADMIN=octocat`));
   // No target_ref ⇒ the line is omitted (org-owned or unknown owner sets it by hand).
   assert.doesNotMatch(P.webEnvBody(coTenant), /_FIRST_ADMIN=/);
@@ -320,7 +320,7 @@ t('webEnvBody: the repo target_ref seats the founding owner via <prefix>_FIRST_A
 t('webEnvBody: a resolved owner login wins over the repo owner — an org-owned repo seats the signed-in builder (task 1003240)', () => {
   // The org that owns an adopted repo is not a sign-in identity; seating it seats nobody.
   // Same preference instanceInitSpec already applies to the scaffold's branding.firstAdmin.
-  const inst = { ...coTenant, hosting_shape: 'standalone', domain: 'mercury.example.com', target_ref: 'acme-org/mercury' };
+  const inst = { ...coTenant, hosting_shape: 'cloud-host', domain: 'mercury.example.com', target_ref: 'acme-org/mercury' };
   const withLogin = P.webEnvBody(inst, { ownerLogin: 'octocat' });
   assert.match(withLogin, new RegExp(`${reEsc(NEUTRAL_PREFIX)}_FIRST_ADMIN=octocat`));
   assert.doesNotMatch(withLogin, /_FIRST_ADMIN=acme-org/);
@@ -491,7 +491,7 @@ await ta('provisionInstance(standalone): the backup unit ExecStart points at the
   // capture the unit BODIES, not just paths, so we can assert the ExecStart path
   const bodies = {};
   deps.writeFile = (p, body) => { writes.push(p); bodies[p] = body; return { ok: true }; };
-  const inst = { ...coTenant, hosting_shape: 'standalone', target_ref: 'example-owner/mercury' };
+  const inst = { ...coTenant, hosting_shape: 'cloud-host', target_ref: 'example-owner/mercury' };
   await P.provisionInstance(inst, deps);
   const svc = bodies[P.backupServicePath(inst)];
   assert.ok(svc, 'wrote the backup service unit');
@@ -506,7 +506,7 @@ await ta('provisionInstance(standalone): web.env seats the signed-in builder, no
   deps.writeFile = (p, body) => { bodies[p] = body; return { ok: true }; };
   // the builders lookup answers with the signed-in owner; every other query stays empty
   deps.db = { query: async (sql) => (/FROM builders/.test(String(sql)) ? { rows: [{ github_login: 'octocat' }] } : { rows: [] }) };
-  const inst = { ...coTenant, hosting_shape: 'standalone', target_ref: 'acme-org/mercury', owner_builder_id: 7 };
+  const inst = { ...coTenant, hosting_shape: 'cloud-host', target_ref: 'acme-org/mercury', owner_builder_id: 7 };
   const r = await P.provisionInstance(inst, deps);
   assert.equal(r.ok, true);
   const envPath = Object.keys(bodies).find((p) => p.endsWith('/web.env'));
@@ -517,7 +517,7 @@ await ta('provisionInstance(standalone): web.env seats the signed-in builder, no
 
 await ta('provisionInstance(standalone) SCAFFOLDS its repo, then syncs (pull + npm ci) + migrates from the instance root', async () => {
   const { deps, cmds, writes } = recorder();
-  const r = await P.provisionInstance({ ...coTenant, hosting_shape: 'standalone', target_ref: 'example-owner/mercury' }, deps);
+  const r = await P.provisionInstance({ ...coTenant, hosting_shape: 'cloud-host', target_ref: 'example-owner/mercury' }, deps);
   assert.equal(r.ok, true);
   const joined = cmds.join('\n');
   // scaffold leg (task 2055): git init → package-core → init --vendor-core → push
@@ -612,7 +612,7 @@ function recordIo({ sudoP = '' } = {}) {
     log: (m) => logs.push(m),
   };
 }
-const INST = { slug: 'demo', hosting_shape: 'standalone', port: 3003, db_name: 'demo' };
+const INST = { slug: 'demo', hosting_shape: 'cloud-host', port: 3003, db_name: 'demo' };
 
 t('resolveProcessManager: explicit knob wins, then the /run/systemd/system probe', () => {
   const booted = { existsSync: (p) => p === '/run/systemd/system' };
@@ -729,7 +729,7 @@ t('instanceInitSpec: falls back to the repo owner as firstAdmin when no owner lo
 await ta('scaffoldStandaloneRepo: refuses when target_ref is not owner/repo', async () => {
   const { deps } = recorder({ apply: true });
   await assert.rejects(
-    () => P.scaffoldStandaloneRepo({ slug: 'demo', hosting_shape: 'standalone', target_ref: null }, deps),
+    () => P.scaffoldStandaloneRepo({ slug: 'demo', hosting_shape: 'cloud-host', target_ref: null }, deps),
     /target_ref .* is not an owner\/repo/,
   );
 });
@@ -743,7 +743,7 @@ await ta('scaffoldStandaloneRepo: idempotent — a repo that already carries pac
     writeFileSync(join(tmp, 'demo', 'package.json'), '{}\n');   // sign of a completed scaffold
     const { deps, cmds } = recorder({ apply: true });
     deps.exec = (cmd) => { cmds.push(cmd); return { ok: true, stdout: /ls-remote/.test(cmd) ? 'abc123\trefs/heads/main\n' : '' }; };
-    const res = await P.scaffoldStandaloneRepo({ slug: 'demo', hosting_shape: 'standalone', target_ref: 'example-owner/demo' }, deps);
+    const res = await P.scaffoldStandaloneRepo({ slug: 'demo', hosting_shape: 'cloud-host', target_ref: 'example-owner/demo' }, deps);
     assert.equal(res.already, true);
     assert.deepEqual(cmds.filter((c) => !/ls-remote/.test(c)), [], 'no init/build/push when already scaffolded AND the remote carries main');
   } finally {
@@ -770,7 +770,7 @@ async function rerunScaffold({ apply = true, lsRemote, token = null, credWriteTh
       writes.push({ p, body, opts }); return { ok: true };
     };
     if (token) deps.getGithubToken = async () => ({ token, scope: 'repo' });
-    const res = await P.scaffoldStandaloneRepo({ slug: 'demo', hosting_shape: 'standalone', target_ref: 'example-owner/demo', owner_builder_id: 7 }, deps);
+    const res = await P.scaffoldStandaloneRepo({ slug: 'demo', hosting_shape: 'cloud-host', target_ref: 'example-owner/demo', owner_builder_id: 7 }, deps);
     return { res, cmds, writes };
   } finally {
     P.CONFIG.standaloneBase = origBase;
@@ -829,7 +829,7 @@ async function scaffoldWithEnv(env) {
     // the scaffold rebuilds via package-core.js (task 1002275). A consumer-instance root
     // (a real pin) takes the reuse path — covered by its own test below.
     await P.scaffoldStandaloneRepo(
-      { slug: 'demo', hosting_shape: 'standalone', target_ref: 'example-owner/demo' },
+      { slug: 'demo', hosting_shape: 'cloud-host', target_ref: 'example-owner/demo' },
       { ...deps, env, instanceRoot: tmp },
     );
     return cmds.join('\n');
@@ -933,7 +933,7 @@ await ta('scaffoldStandaloneRepo: on a consumer control plane it REUSES the pinn
   try {
     const { deps, cmds } = recorder({ apply: true });
     await P.scaffoldStandaloneRepo(
-      { slug: 'demo', hosting_shape: 'standalone', target_ref: 'example-owner/demo' },
+      { slug: 'demo', hosting_shape: 'cloud-host', target_ref: 'example-owner/demo' },
       { ...deps, instanceRoot: cp },
     );
     const joined = cmds.join('\n');
@@ -1073,7 +1073,7 @@ await ta('scaffoldStandaloneRepo: a REGISTRY-pinned consumer control plane PACKS
   try {
     const { deps, cmds } = recorder({ apply: true });
     await P.scaffoldStandaloneRepo(
-      { slug: 'demo', hosting_shape: 'standalone', target_ref: 'example-owner/demo' },
+      { slug: 'demo', hosting_shape: 'cloud-host', target_ref: 'example-owner/demo' },
       { ...deps, instanceRoot: cp },
     );
     const joined = cmds.join('\n');
@@ -1106,7 +1106,7 @@ await ta('scaffoldStandaloneRepo: pushes via the owner OAuth token (not SSH), to
     deps.writeFile = (p, body, opts) => { writes.push({ p, body, opts }); return { ok: true }; };
     deps.getGithubToken = async () => ({ token: 'gho_SECRET_TOKEN_XYZ', scope: 'public_repo' });
     await P.scaffoldStandaloneRepo(
-      { slug: 'demo', hosting_shape: 'standalone', target_ref: 'example-owner/demo', owner_builder_id: 7 },
+      { slug: 'demo', hosting_shape: 'cloud-host', target_ref: 'example-owner/demo', owner_builder_id: 7 },
       { ...deps, instanceRoot: base },
     );
     const joined = cmds.join('\n');
@@ -1134,7 +1134,7 @@ await ta('scaffoldStandaloneRepo: no owner token → falls back to the SSH origi
   try {
     const { deps, cmds } = recorder({ apply: true });   // default getGithubToken → null
     await P.scaffoldStandaloneRepo(
-      { slug: 'demo', hosting_shape: 'standalone', target_ref: 'example-owner/demo', owner_builder_id: 7 },
+      { slug: 'demo', hosting_shape: 'cloud-host', target_ref: 'example-owner/demo', owner_builder_id: 7 },
       { ...deps, instanceRoot: base },
     );
     const joined = cmds.join('\n');
@@ -1204,7 +1204,7 @@ async function scaffoldInMode(mode, { token = null, seedRoot = null } = {}) {
     deps.writeFile = (p, body, opts) => { writes.push({ p, body, opts }); return { ok: true }; };
     if (token) deps.getGithubToken = async () => ({ token, scope: 'read:user,repo' });
     await P.scaffoldStandaloneRepo(
-      { slug: 'demo', hosting_shape: 'standalone', target_ref: 'example-owner/demo', owner_builder_id: 7, onboard_mode: mode },
+      { slug: 'demo', hosting_shape: 'cloud-host', target_ref: 'example-owner/demo', owner_builder_id: 7, onboard_mode: mode },
       { ...deps, instanceRoot: base },
     );
     return { joined: cmds.join('\n'), cmds, writes, root: join(base, 'demo') };
@@ -1279,7 +1279,7 @@ await ta('scaffoldStandaloneRepo(adopt): a default branch that is not `main` fai
     deps.exec = (cmd) => ({ ok: true, stdout: /rev-parse --abbrev-ref HEAD/.test(cmd) ? 'master\n' : '' });
     await assert.rejects(
       () => P.scaffoldStandaloneRepo(
-        { slug: 'demo', hosting_shape: 'standalone', target_ref: 'example-owner/demo', owner_builder_id: 7, onboard_mode: 'adopt' },
+        { slug: 'demo', hosting_shape: 'cloud-host', target_ref: 'example-owner/demo', owner_builder_id: 7, onboard_mode: 'adopt' },
         { ...deps, instanceRoot: base },
       ),
       /default branch is "master", not "main"/,
@@ -1304,7 +1304,7 @@ await ta('scaffoldStandaloneRepo(adopt): the credential file is removed even whe
     };
     await assert.rejects(
       () => P.scaffoldStandaloneRepo(
-        { slug: 'demo', hosting_shape: 'standalone', target_ref: 'example-owner/demo', owner_builder_id: 7, onboard_mode: 'adopt' },
+        { slug: 'demo', hosting_shape: 'cloud-host', target_ref: 'example-owner/demo', owner_builder_id: 7, onboard_mode: 'adopt' },
         { ...deps, instanceRoot: base },
       ),
       /non-fast-forward/,
@@ -1720,7 +1720,7 @@ t('migrateCmd: privileged runs migrate as postgres via env+bash (survives sudo e
 });
 
 t('standaloneMigrateCmd: privileged runs the instance-root migrate as postgres; default unchanged', () => {
-  const inst = { ...coTenant, hosting_shape: 'standalone' };
+  const inst = { ...coTenant, hosting_shape: 'cloud-host' };
   assert.equal(P.standaloneMigrateCmd(inst), 'PGDATABASE=mercury MEDUSA_GDS_ONLY=1 bash node_modules/@bongos/core/scripts/migrate.sh');
   assert.equal(P.standaloneMigrateCmd(inst, { privileged: true }), 'sudo -u postgres env PGDATABASE=mercury MEDUSA_GDS_ONLY=1 bash node_modules/@bongos/core/scripts/migrate.sh');
 });
@@ -1950,7 +1950,7 @@ await ta('provisionInstance(standalone, remote): EVERY box step runs control-pla
       checkDnsTokenScope: async () => ({ reachable: true, zone: 'cloudbongos.com' }),
       checkCaddyWiring: () => null,
     };
-    await P.provisionInstance({ ...coTenant, hosting_shape: 'standalone', target_ref: 'example-owner/mercury', domain: 'mercury.cloudbongos.com' }, deps);
+    await P.provisionInstance({ ...coTenant, hosting_shape: 'cloud-host', target_ref: 'example-owner/mercury', domain: 'mercury.cloudbongos.com' }, deps);
     // The bug (task 2074): these landed on the REMOTE box, which never had the scaffolded
     // dir. They must ALL be on the control-plane executor now.
     for (const re of [/git pull --ff-only/, /npm ci/, /createdb mercury/, /migrate\.sh/, /systemctl enable --now/, /systemctl reload caddy/, /healthz/]) {
@@ -1991,7 +1991,7 @@ await ta('provisionInstance(standalone, remote, --apply): FAILS LOUD when the co
       checkCaddyWiring: () => null,
     };
     await assert.rejects(
-      () => P.provisionInstance({ ...coTenant, hosting_shape: 'standalone', target_ref: 'example-owner/mercury', domain: 'mercury.cloudbongos.com' }, deps),
+      () => P.provisionInstance({ ...coTenant, hosting_shape: 'cloud-host', target_ref: 'example-owner/mercury', domain: 'mercury.cloudbongos.com' }, deps),
       /PROVISION_CONTROL_PLANE_IP/,
       'must demand the control-plane IP, not fall back to the co-hosting box',
     );
@@ -2008,7 +2008,7 @@ await ta('teardownInstance(standalone, remote): tears down on the CONTROL PLANE
     controlExec: (cmd) => { control.push(cmd); return { ok: true }; },
     writeFile: () => ({ ok: true }), controlWriteFile: () => ({ ok: true }), doApi: null,
   };
-  await P.teardownInstance({ ...coTenant, hosting_shape: 'standalone' }, deps);
+  await P.teardownInstance({ ...coTenant, hosting_shape: 'cloud-host' }, deps);
   assert.ok(control.some((c) => /systemctl disable --now mercury/.test(c)), 'disable runs on the control plane');
   assert.ok(control.some((c) => /rm -f .*mercury\.service/.test(c)), 'unit removed on the control plane');
   assert.equal(box.length, 0, 'nothing crosses to the co-hosting box for a standalone teardown');
@@ -2058,7 +2058,7 @@ t('shouldFederate: dormant unless hub-configured AND co-tenant AND a domain is s
     assert.equal(P.shouldFederate(coTenantWithDomain, { platformIdentity: fakePI(), hubKeys: hubKeysOff }).federate, false, 'no signing key → skip');
     assert.equal(P.shouldFederate({ ...coTenantWithDomain, domain: null }, { platformIdentity: fakePI(), hubKeys: hubKeysOn }).federate, false, 'no domain → skip');
     // a standalone (owner-hosted) keeps its own GitHub app; a dedicated droplet has no local web.env bake yet
-    assert.equal(P.shouldFederate({ ...coTenantWithDomain, hosting_shape: 'standalone' }, { platformIdentity: fakePI(), hubKeys: hubKeysOn }).federate, false, 'standalone = self-hosted → skip');
+    assert.equal(P.shouldFederate({ ...coTenantWithDomain, hosting_shape: 'cloud-host' }, { platformIdentity: fakePI(), hubKeys: hubKeysOn }).federate, false, 'standalone = self-hosted → skip');
     assert.equal(P.shouldFederate({ ...coTenantWithDomain, hosting_shape: 'dedicated' }, { platformIdentity: fakePI(), hubKeys: hubKeysOn }).federate, false, 'dedicated → skip (no local web.env yet)');
   });
   // no hub origin resolvable (even with a signing key) → skip
@@ -2183,8 +2183,8 @@ await ta('provisionInstance(standalone, hub-configured): still NOT federated —
     deps.controlWriteFile = (p, body) => { bodies[p] = body; return { ok: true }; };
     deps.writeFile = (p, body) => { bodies[p] = body; return { ok: true }; };
     deps.platformIdentity = pi; deps.hubKeys = hubKeysOn;
-    await P.provisionInstance({ ...coTenantWithDomain, hosting_shape: 'standalone', target_ref: 'example-owner/mercury' }, deps);
-    const env = bodies[P.webEnvPath({ ...coTenantWithDomain, hosting_shape: 'standalone' })];
+    await P.provisionInstance({ ...coTenantWithDomain, hosting_shape: 'cloud-host', target_ref: 'example-owner/mercury' }, deps);
+    const env = bodies[P.webEnvPath({ ...coTenantWithDomain, hosting_shape: 'cloud-host' })];
     assert.ok(env, 'wrote web.env');
     assert.doesNotMatch(env, /_AUTH_IDP=/, 'standalone is the self-hosted path — no federation');
     assert.equal(pi.calls.length, 0, 'no hub registration for a standalone');
@@ -2239,7 +2239,7 @@ function attachRecorder({ apply = false, envBody = WEB_ENV_ON_BOX } = {}) {
 }
 
 const activeStandalone = {
-  id: 18, slug: 'spike', hosting_shape: 'standalone', status: 'active', owner_builder_id: 7,
+  id: 18, slug: 'spike', hosting_shape: 'cloud-host', status: 'active', owner_builder_id: 7,
   port: 3010, db_name: 'spike', domain: 'spike.cloudbongos.com', target_ref: 'jaxri/spike-harbor',
 };
 
@@ -2728,7 +2728,7 @@ function repoAuthDeps({ apply = true, priv = true, token = 'gho_TOK', keys = [],
   deps.fsImpl = { existsSync: () => existing, readFileSync: () => `${pub}\n` };
   return { deps, cmds, apiCalls };
 }
-const privInst = { id: 9, slug: 'demo', hosting_shape: 'standalone', status: 'requested', owner_builder_id: 7, target_ref: 'example-owner/demo' };
+const privInst = { id: 9, slug: 'demo', hosting_shape: 'cloud-host', status: 'requested', owner_builder_id: 7, target_ref: 'example-owner/demo' };
 
 await ta('ensurePrivateRepoAccess(private): registers a READ-ONLY key and wires origin + core.sshCommand into the checkout', async () => {
   const { deps, cmds, apiCalls } = repoAuthDeps({ existing: false });
@@ -2965,7 +2965,7 @@ await ta('intendedPrivate(dry-run): names the pre-flip intent in the plan line,
 
 await ta('provisionInstance(standalone): the private-repo wiring lands BETWEEN the scaffold and the step-2 pull', async () => {
   const { deps, cmds } = repoAuthDeps({ existing: false });
-  const r = await P.provisionInstance({ ...coTenant, hosting_shape: 'standalone', target_ref: 'example-owner/mercury' }, deps);
+  const r = await P.provisionInstance({ ...coTenant, hosting_shape: 'cloud-host', target_ref: 'example-owner/mercury' }, deps);
   assert.equal(r.ok, true);
   const idx = (re) => cmds.findIndex((c) => re.test(c));
   assert.ok(idx(/remote set-url origin git@github\.com:example-owner\/mercury\.git/) >= 0, 'wired the private origin');
@@ -3147,7 +3147,7 @@ t('serviceUnit: carries the hardening block, with HOME + ReadWritePaths pointing
 });
 
 t('serviceUnit: ReadWritePaths does NOT make the checkout the service runs writable by it', () => {
-  const inst = { ...coTenant, hosting_shape: 'standalone' };
+  const inst = { ...coTenant, hosting_shape: 'cloud-host' };
   const u = P.serviceUnit(inst, { etcBase: '/etc' });
   const root = P.standaloneRoot(inst);
   const rw = u.split('\n').find((l) => l.startsWith('ReadWritePaths='));
@@ -3171,7 +3171,7 @@ t('webEnvBody: NO password ⇒ no PG credential lines — an instance provisione
 
 // ── the Postgres pool cap (task 1003928, ADR 0285 §3) ─────────────────────────
 t('webEnvBody: a CO-LOCATED instance (co-tenant or standalone) carries PGPOOL_MAX at the runner\'s cap, beside PGDATABASE', () => {
-  for (const shape of ['co-tenant', 'standalone']) {
+  for (const shape of ['co-tenant', 'cloud-host']) {
     const b = P.webEnvBody({ ...coTenant, hosting_shape: shape });
     assert.match(b, new RegExp(`^PGPOOL_MAX=${P.CONFIG.instancePoolMax}$`, 'm'), `${shape} carries the cap`);
     const lines = b.split('\n');

package/tests/provision_byo_host.mjs

@@ -115,7 +115,7 @@ test('the shape is absent from the runner shapes that DO get stood up', () => {
   // Any other shape still reaches the first executor — that is the control.
   const h = harness();
   return assert.rejects(
-    P.provisionInstance({ ...byoHost, hosting_shape: 'standalone', domain: null }, h.deps),
+    P.provisionInstance({ ...byoHost, hosting_shape: 'cloud-host', domain: null }, h.deps),
     /byo-host must not/,
     'a non-byo-host shape still reaches the box steps — the branch is shape-scoped, not a global off switch',
   );

package/tests/provision_caddy_wiring.mjs

@@ -58,7 +58,7 @@ test('output that is not Caddy JSON, or a failed adapt, is a gap rather than a p
 // -- the runner legs --------------------------------------------------------
 
 const coTenant = { id: 1, slug: 'mercury', hosting_shape: 'co-tenant', status: 'requested', owner_builder_id: 7, port: 3003, db_name: 'mercury', domain: DOMAIN };
-const activeStandalone = { id: 18, slug: 'spike', hosting_shape: 'standalone', status: 'active', owner_builder_id: 7, port: 3010, db_name: 'spike', domain: 'spike.example.com' };
+const activeStandalone = { id: 18, slug: 'spike', hosting_shape: 'cloud-host', status: 'active', owner_builder_id: 7, port: 3010, db_name: 'spike', domain: 'spike.example.com' };
 const WEB_ENV = 'PORT=3010\nBONGOS_PUBLIC_ORIGIN=https://old.example.com\n';
 
 // `served` = the hosts Caddy's resolved config carries once a snippet is written — the

package/tests/provision_disconnect.mjs

@@ -13,7 +13,7 @@
 //   • ORDER: nothing is erased until the teardown ran; the row is deleted only after every
 //     erase and the catalog forget succeeded, so a failure leaves a row the runner can retry
 //   • the dump erase matches the nightly filename EXACTLY, so `test` never erases `test-nk`
-//   • each shape erases where its data lives (standalone: control plane; co-tenant: the
+//   • each shape erases where its data lives (cloud-host: control plane; co-tenant: the
 //     co-hosting box; dedicated: nothing — its droplet went whole)
 //   • a dry run erases nothing and deletes nothing; an invalid slug is refused before any command
 //
@@ -45,7 +45,7 @@ async function ta(name, fn) {
   catch (e) { failed++; console.log(`  FAIL  ${name}\n        ${e.message}`); }
 }
 
-const lantern = { id: 40, slug: 'lantern', hosting_shape: 'standalone', status: 'torn_down', owner_builder_id: 7, port: 3021, db_name: 'lantern', domain: 'lantern.cloudbongos.com', target_ref: null };
+const lantern = { id: 40, slug: 'lantern', hosting_shape: 'cloud-host', status: 'torn_down', owner_builder_id: 7, port: 3021, db_name: 'lantern', domain: 'lantern.cloudbongos.com', target_ref: null };
 
 function rig({ apply = true, privileged = false, failOn = null, catalogThrows = false, catalog = true } = {}) {
   const events = [], logs = [];
@@ -88,7 +88,7 @@ P.CONFIG.dnsHook = '/opt/infra/box-dns-cloudflare.sh';
 
 console.log('the erase, in order:');
 
-await ta('standalone: teardown legs, then the database, its role, the dumps, env + state, checkout, account — then forget, then the row', async () => {
+await ta('cloud-host: teardown legs, then the database, its role, the dumps, env + state, checkout, account — then forget, then the row', async () => {
   const r = rig();
   const res = await D.disconnectInstance(lantern, r.deps);
   assert.equal(res.ok, true, JSON.stringify(res));

package/tests/provision_repo_private.mjs

@@ -37,7 +37,7 @@ async function ta(name, fn) {
   catch (e) { failed++; console.log(`  FAIL  ${name}\n        ${e.message}`); }
 }
 
-const liveStandalone = { id: 18, slug: 'demo', hosting_shape: 'standalone', status: 'active', owner_builder_id: 7, target_ref: 'example-owner/demo' };
+const liveStandalone = { id: 18, slug: 'demo', hosting_shape: 'cloud-host', status: 'active', owner_builder_id: 7, target_ref: 'example-owner/demo' };
 
 // One ordered timeline across the shell AND GitHub, so the wire-before-flip order is
 // observable as positions in a single list rather than inferred from two.

package/tests/provision_restart.mjs

@@ -70,13 +70,13 @@ function recorder({ apply = true, healthzFails = false, privileged = false, rest
 }
 
 const activeStandalone = {
-  id: 18, slug: 'spike', hosting_shape: 'standalone', status: 'active', owner_builder_id: 7,
+  id: 18, slug: 'spike', hosting_shape: 'cloud-host', status: 'active', owner_builder_id: 7,
   port: 3010, db_name: 'spike', domain: 'spike.cloudbongos.com', target_ref: 'jaxri/spike-harbor',
 };
 
 console.log('restartInstance — the leg:');
 
-await ta('--apply, active standalone: ONE systemctl restart, then healthz — and web.env is never read or written', async () => {
+await ta('--apply, active cloud-host: ONE systemctl restart, then healthz — and web.env is never read or written', async () => {
   const { deps, cmds, writes } = recorder();
   const r = await P.restartInstance(activeStandalone, deps);
   assert.equal(r.ok, true, JSON.stringify(r));
@@ -176,9 +176,9 @@ await ta('dry-run runs no real work and observes nothing', async () => {
   assert.equal(writes.length, 0);
 });
 
-await ta('a co-tenant restarts on the co-hosting box; a standalone on the control plane', async () => {
+await ta('a co-tenant restarts on the co-hosting box; a cloud-host on the control plane', async () => {
   const seen = {};
-  for (const shape of ['co-tenant', 'standalone']) {
+  for (const shape of ['co-tenant', 'cloud-host']) {
     const box = [], control = [];
     const { deps } = recorder();
     deps.exec = (cmd) => { box.push(cmd); return /healthz/.test(cmd) ? { ok: true, stdout: '{}' } : { ok: true, stdout: '' }; };
@@ -187,7 +187,7 @@ await ta('a co-tenant restarts on the co-hosting box; a standalone on the contro
     seen[shape] = { box: box.length, control: control.length };
   }
   assert.ok(seen['co-tenant'].box > 0 && seen['co-tenant'].control === 0, 'a co-tenant runs on the box');
-  assert.ok(seen.standalone.control > 0 && seen.standalone.box === 0, 'a standalone ran control-plane-local (task 2074) — restart it THERE');
+  assert.ok(seen['cloud-host'].control > 0 && seen['cloud-host'].box === 0, 'a cloud-host runs control-plane-local (task 2074) — restart it THERE');
 });
 
 await ta('privileged mode escalates the restart', async () => {

package/tests/provision_settings_apply.mjs

@@ -121,7 +121,7 @@ t('is PURE: same input, same output; empty body yields just the lines', () => {
 });
 
 t('settingsEnvVarsFor: the runner pushes the SAME pair webEnvBody writes at standup, under the pack prefix', () => {
-  const inst = { slug: 'spike', port: 3010, db_name: 'spike', hosting_shape: 'standalone', target_ref: 'jaxri/spike', settings: { platform_visibility: 'gated' } };
+  const inst = { slug: 'spike', port: 3010, db_name: 'spike', hosting_shape: 'cloud-host', target_ref: 'jaxri/spike', settings: { platform_visibility: 'gated' } };
   const vars = P.settingsEnvVarsFor(inst);
   assert.deepEqual(vars, {
     [`${NEUTRAL_PREFIX}_PLATFORM_VISIBILITY`]: 'gated', [`${NEUTRAL_PREFIX}_JOINABILITY`]: 'apply',
@@ -199,14 +199,14 @@ function recorder({ apply = false, envBody = LIVE_ENV, readFails = false, health
 }
 
 const activeStandalone = {
-  id: 18, slug: 'spike', hosting_shape: 'standalone', status: 'active', owner_builder_id: 7,
+  id: 18, slug: 'spike', hosting_shape: 'cloud-host', status: 'active', owner_builder_id: 7,
   port: 3010, db_name: 'spike', domain: 'spike.cloudbongos.com', target_ref: 'jaxri/spike-harbor',
   settings: { platform_visibility: 'gated', joinability: 'invite_only' },
 };
 
 console.log('\nsettingsApplyInstance — the leg:');
 
-await ta('--apply, active standalone: read web.env → patch ONLY the settings lines (control-plane writer) → restart → healthz → manifest; creds survive', async () => {
+await ta('--apply, active cloud-host: read web.env → patch ONLY the settings lines (control-plane writer) → restart → healthz → manifest; creds survive', async () => {
   const { deps, cmds, writes } = recorder({ apply: true });
   const r = await P.settingsApplyInstance(activeStandalone, deps);
   assert.equal(r.ok, true, JSON.stringify(r));
@@ -251,7 +251,7 @@ await ta('privileged: the read and the restart escalate via sudo (the /etc file
 await ta('co-tenant rides the BOX executor + writer; standalone rides the control-plane pair (task 2074 routing)', async () => {
   const seen = { box: [], control: [] };
   const mk = (bucket) => (cmd) => { seen[bucket].push(cmd); return /\bcat /.test(cmd) ? { ok: true, stdout: LIVE_ENV } : { ok: true, stdout: '' }; };
-  for (const [shape, want] of [['co-tenant', 'box'], ['standalone', 'control']]) {
+  for (const [shape, want] of [['co-tenant', 'box'], ['cloud-host', 'control']]) {
     seen.box = []; seen.control = [];
     const { deps, writes } = recorder({ apply: true });
     deps.exec = mk('box'); deps.controlExec = mk('control');

package/tests/provision_teardown_address.mjs

@@ -32,7 +32,7 @@ async function ta(name, fn) {
 }
 
 const HOOK = '/opt/infra/box-dns-cloudflare.sh';
-const lantern = { id: 5, slug: 'lantern', hosting_shape: 'standalone', status: 'active', owner_builder_id: 7, port: 3021, db_name: 'lantern', domain: 'lantern.cloudbongos.com', target_ref: null };
+const lantern = { id: 5, slug: 'lantern', hosting_shape: 'cloud-host', status: 'active', owner_builder_id: 7, port: 3021, db_name: 'lantern', domain: 'lantern.cloudbongos.com', target_ref: null };
 
 // One ordered ledger across both executors and the status writes, so ordering is assertable.
 function rig({ apply = true, privileged = false, hookThrows = false } = {}) {
@@ -67,7 +67,7 @@ async function withHook(hook, fn) {
 
 console.log('the Caddy leg:');
 
-await ta('standalone: the <slug>.caddy snippet is removed, THEN Caddy reloads — on the control plane, where it ran', async () => {
+await ta('cloud-host: the <slug>.caddy snippet is removed, THEN Caddy reloads — on the control plane, where it ran', async () => {
   await withHook(HOOK, async () => {
     const r = rig();
     await P.teardownInstance(lantern, r.deps);