@cparkerwebm/webmonterey 1.0.0 → 1.1.0

package/CHANGELOG.md

@@ -11,6 +11,34 @@ build. See `/webm:upgrade`.
 
 ---
 
+## 1.1.0 — 2026-09-02
+
+### Changed
+
+- **One name, everywhere.** `webm new` now derives a single name from the domain — `example.com`
+  becomes `example` — and uses it for the GitHub repo, the Worker, the D1 database, the R2 bucket
+  and any KV namespace. The `webm-` prefix and the `-db` / `-media` suffixes are gone from cloud
+  resources: Cloudflare scopes every one of those names to the account, so in an account that holds
+  nothing but client sites a prefix said nothing, and one-of-each needs no suffix. The TLD is still
+  dropped, for the same reason as before — it keeps a domain out of preview hostnames, which is
+  what trips Chrome's lookalike warning.
+
+  **Existing sites are untouched.** Every name is read from the site's own `webmonterey.json` and
+  `wrangler.jsonc`; nothing renames a resource that exists. A rebuild onto the new convention is a
+  new repo and new resources beside the old, tested in full, then a domain cutover — which is the
+  clean way to do it anyway.
+
+- **No agency defaults left in the package.** `webm new` reads the GitHub owner from
+  `git config webm.org` and the staging inbox from `git config webm.stagingEmail` (falling back
+  to `user.email`); `--org` and `--staging-email` override for one run. Without an owner it refuses
+  and says how to set one. Set it once per machine:
+
+  ```sh
+  git config --global webm.org <your-github-owner>
+  ```
+
+---
+
 ## 1.0.0 — 2026-09-02
 
 The first public release, on npmjs. This is the framework as it stands after two private

package/README.md

@@ -23,11 +23,16 @@ client's repo. Every default has a documented way to opt out of it.
 ## Creating a client site
 
 ```sh
+git config --global webm.org <your-github-owner>      # once per machine
 npx @cparkerwebm/webmonterey new example.com --client="Example Co"
-cd example_com
+cd example
 claude          # then /webm:start
 ```
 
+One name everywhere: `example.com` becomes `example` — the repo, the Worker, the D1 database and
+the R2 bucket. The domain minus its TLD is the one shape every resource accepts, and it keeps a
+domain out of preview hostnames, which is what trips Chrome's lookalike warning.
+
 `webm new` writes the identity and design files, a working contact form, a home page and the
 fleet skills, then runs `git init` and `npm install`. It touches nothing outside the directory.
 `/webm:start` takes it from there: the GitHub repo, Cloudflare resources, Workers Builds, the

package/dist/webm.mjs

@@ -67,9 +67,6 @@ function normalizeDomain(input) {
   }
   return cleaned;
 }
-function repoName(domain) {
-  return normalizeDomain(domain).replace(/\./g, "_");
-}
 function slugFor(domain) {
   const clean = normalizeDomain(domain);
   const parts = clean.split(".");
@@ -78,16 +75,12 @@ function slugFor(domain) {
   const kept = parts.slice(0, Math.max(1, parts.length - drop));
   return kept.join("-");
 }
+function repoName(domain) {
+  return slugFor(domain);
+}
 function resourceNames(domain) {
   const slug = slugFor(domain);
-  return {
-    slug,
-    repo: repoName(domain),
-    worker: `webm-${slug}`,
-    d1: `webm-${slug}-db`,
-    r2Media: `webm-${slug}-media`,
-    r2App: `webm-${slug}-app`
-  };
+  return { slug, repo: slug, worker: slug, d1: slug, r2: slug, kv: slug };
 }
 var TWO_PART_SUFFIXES, DomainError;
 var init_slug = __esm({
@@ -213,7 +206,7 @@ function scaffold(options) {
   const { domain, packageVersion: packageVersion2 } = options;
   const n = resourceNames(domain);
   const client = options.client ?? "CHANGEME";
-  const org = options.org ?? "webmonterey";
+  const { org } = options;
   const { today } = options;
   if (!/^\d{4}-\d{2}-\d{2}$/.test(today)) {
     throw new Error(`scaffold: today must be YYYY-MM-DD, got ${JSON.stringify(today)}`);
@@ -549,12 +542,11 @@ ${domain} \u2014 built on [@cparkerwebm/webmonterey](https://github.com/cparkerw
 
 | | |
 | --- | --- |
-| Worker | \`${n.worker}\` |
-| D1 | \`${n.d1}\` |
-| R2 media | \`${n.r2Media}\` |
+| Worker \xB7 D1 \xB7 R2 | \`${n.slug}\` |
 
-The repo is named for the domain; Cloudflare resources use the slug, with no TLD, so a
-preview hostname never embeds a domain Chrome could mistake for a lookalike.
+One name everywhere: the domain minus its TLD. A preview hostname then never embeds a
+domain Chrome could mistake for a lookalike. A second resource of one kind takes a purpose
+suffix - \`${n.slug}-portal\`.
 
 ## Deploying
 
@@ -818,26 +810,33 @@ function parseArgs(argv2) {
   return {
     domain: positional[0],
     client: flag("client"),
-    org: flag("org") ?? "webmonterey",
-    stagingEmail: flag("staging-email"),
+    org: flag("org") ?? gitConfig("webm.org"),
+    stagingEmail: flag("staging-email") ?? gitConfig("webm.stagingEmail") ?? gitConfig("user.email"),
     into: flag("into"),
     install: !argv2.includes("--no-install")
   };
 }
-function gitUserEmail() {
+function gitConfig(key) {
   try {
-    return execFileSync("git", ["config", "user.email"], { encoding: "utf8" }).trim();
+    const value = execFileSync("git", ["config", key], { encoding: "utf8" }).trim();
+    return value || void 0;
   } catch {
-    return "";
+    return void 0;
   }
 }
 function run2(argv2) {
   const args = parseArgs(argv2);
   if (!args.domain) {
     console.error(
-      'webm new <domain> [--client="Name"] [--org=webmonterey] [--staging-email=you@example.com] [--into=path] [--no-install]'
+      'webm new <domain> [--client="Name"] [--org=<github-owner>] [--staging-email=you@example.com] [--into=path] [--no-install]'
+    );
+    console.error('\n  webm new example.com --client="Example Co"');
+    return 1;
+  }
+  if (!args.org) {
+    console.error(
+      "webm new: no GitHub owner for the repo. Either pass --org=<owner> or set it once:\n\n  git config --global webm.org <owner>\n"
     );
-    console.error('\n  webm new autire.com --client="Autire Technologies"');
     return 1;
   }
   let domain;
@@ -857,7 +856,7 @@ function run2(argv2) {
     domain,
     client: args.client,
     org: args.org,
-    stagingEmail: args.stagingEmail ?? gitUserEmail(),
+    stagingEmail: args.stagingEmail,
     packageVersion: packageVersion(),
     /* Real today, not a constant - see ScaffoldOptions.today for what a stale one does. */
     today: (/* @__PURE__ */ new Date()).toISOString().slice(0, 10)
@@ -874,12 +873,14 @@ function run2(argv2) {
   console.log(`  + ${seeded.length} seeded (favicons, headers, CLAUDE.md, a contact form)`);
   console.log(`  + ${kept.length} .gitkeep, so the empty directories survive a clone
 `);
-  console.log(`  repo     ${args.org}/${names.repo}      (keeps the domain)`);
+  console.log(`  repo               ${args.org}/${names.repo}`);
   console.log(
-    `  worker   ${names.worker}                (slug - no TLD, so Chrome does not flag previews)`
+    `  worker \xB7 d1 \xB7 r2   ${names.slug}   (the domain minus its TLD, so Chrome does not flag previews)`
+  );
+  console.log(
+    `
+  One name everywhere. If ${names.slug} is already taken in the account - ${domain.replace(/^[^.]+/, names.slug)} and another TLD both want it - pick another with --into and edit webmonterey.json.`
   );
-  console.log(`  d1       ${names.d1}`);
-  console.log(`  r2       ${names.r2Media}`);
   try {
     execFileSync("git", ["init", "-q", "-b", "main"], { cwd: root });
   } catch {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cparkerwebm/webmonterey",
-  "version": "1.0.0",
+  "version": "1.1.0",
   "type": "module",
   "description": "The WebMonterey Astro framework: plumbing, design system, and Claude Code skills for client sites on Cloudflare Workers",
   "license": "MIT",

package/skills/launch/SKILL.md

@@ -124,8 +124,8 @@ Public values - the Turnstile site key, a GTM container id - are not secrets. Th
 ## 7. D1, if the site uses it
 
 ```sh
-npx wrangler d1 migrations list webm-<slug>-db --remote
-npx wrangler d1 migrations apply webm-<slug>-db --remote
+npx wrangler d1 migrations list <slug> --remote
+npx wrangler d1 migrations apply <slug> --remote
 ```
 
 `--remote` is the step people forget. Local migrations do nothing in production, and local and

package/skills/start/SKILL.md

@@ -35,19 +35,25 @@ cd <domain_with_underscores>
 ```
 
 It writes the identity files, a working contact form, a home page, the fleet skills, and runs
-`git init` and `npm install`. Nothing outside the directory is touched.
+`git init` and `npm install`. Nothing outside the directory is touched. The GitHub owner comes
+from `git config webm.org` (set once per machine) or `--org`; the staging inbox from
+`git config webm.stagingEmail`, falling back to `user.email`.
 
-**Three names, and they differ on purpose:**
+**One name, everywhere.** The domain minus its TLD is the GitHub repo, the Worker, the D1
+database, the R2 bucket and any KV namespace:
 
-|             | Example                                              |                              |
-| ----------- | ---------------------------------------------------- | ---------------------------- |
-| GitHub repo | `webmonterey/autire_com`                             | Full domain, **underscores** |
-| Slug        | `autire`                                             | Domain minus the TLD         |
-| Cloudflare  | `webm-autire`, `webm-autire-db`, `webm-autire-media` | The slug, prefixed           |
+| Domain             | Name           |
+| ------------------ | -------------- |
+| `example.com`      | `example`      |
+| `shop.example.com` | `shop-example` |
+| `example.co.uk`    | `example`      |
 
-The slug drops the TLD because a Worker named `webm-autire-com` puts `autire-com` into every
-preview hostname, and Chrome's lookalike check then warns the client the site looks fake.
-`autire.com` and `autire.org` both want `autire` - check the slug is free before committing.
+The TLD is dropped because a Worker named `example-com` puts `example-com` into every preview
+hostname, and Chrome's lookalike check then warns the client the site looks fake. A second
+resource of one kind for the same client takes a purpose suffix: `example-portal`.
+
+`example.com` and `example.org` both want `example`. Check the name is free in the account
+before committing; the second one gets a name chosen by you, not by the tool.
 
 ## 2. Create the GitHub repo
 
@@ -79,9 +85,9 @@ Create only what the site needs. A marketing site with a contact form needs D1;
 R2 until someone has a video.
 
 ```sh
-npx wrangler d1 create webm-<slug>-db --update-config     # writes the binding into wrangler.jsonc
-npx wrangler d1 migrations apply webm-<slug>-db --local
-npx wrangler r2 bucket create webm-<slug>-media           # only if media is going to R2
+npx wrangler d1 create <slug> --update-config     # writes the binding into wrangler.jsonc
+npx wrangler d1 migrations apply <slug> --local
+npx wrangler r2 bucket create <slug>              # only if media is going to R2
 ```
 
 Set `features.d1: true` once the binding exists. `features.turnstile` waits for `/webm:launch`,
@@ -94,8 +100,8 @@ forms.** Miss one and it returns 200 to curl and a 404 page to Chrome. `webm doc
 ## 5. Workers Builds
 
 Connect the repo in the Cloudflare dashboard: **Workers & Pages → Create → Import a repository**.
-The Worker name must be `webm-<slug>` exactly - Workers Builds fails on a mismatch with
-`wrangler.jsonc`.
+The Worker name must be the slug exactly as `wrangler.jsonc` has it - Workers Builds fails on a
+mismatch.
 
 No build variables are needed. **Push to deploy from then on** - a `wrangler deploy` from a
 laptop creates a version no build produced, so history stops describing what is live, and the

package/skills/traps/SKILL.md

@@ -122,8 +122,8 @@ wildcards, and the free tier allows 10 hostnames per widget.
 
 **Chrome's "This site looks fake" warning on preview links comes from the Worker's NAME.** Its
 lookalike-domain check flags "domains that embed other domain names within their own hostname",
-and a Worker called `webm-acme-com` puts `acme-com` into every preview hostname. That is why
-Workers are named `webm-<slug>` with the TLD dropped — `webm-acme` embeds nothing that reads as a
+and a Worker called `acme-com` puts `acme-com` into every preview hostname. That is why every
+resource is named by the slug with the TLD dropped — `acme` embeds nothing that reads as a
 domain. `webm new` does this; do not name a Worker after the full domain.
 
 If a warning still appears on a correctly named Worker it is a URL-shape false positive, not a

package/src/cli/new.ts

@@ -28,26 +28,33 @@ function parseArgs(argv: string[]) {
   return {
     domain: positional[0],
     client: flag('client'),
-    org: flag('org') ?? 'webmonterey',
-    stagingEmail: flag('staging-email'),
+    org: flag('org') ?? gitConfig('webm.org'),
+    stagingEmail:
+      flag('staging-email') ?? gitConfig('webm.stagingEmail') ?? gitConfig('user.email'),
     into: flag('into'),
     install: !argv.includes('--no-install'),
   };
 }
 
 /*
- * WHERE A STAGING SITE'S MAIL GOES, defaulting to whoever is scaffolding it.
+ * WHO IS SCAFFOLDING, read from the machine rather than baked into the package.
  *
- * The package carries no inbox of its own: a default address baked into a public package means
- * a stranger's staging site mails the package author. `git config user.email` is the person at
- * the keyboard, which is the right default for a site they are about to test. The flag overrides
- * it; doctor fails a staging site that ends up with none.
+ * A public package carries no agency defaults: not a GitHub org, not an inbox. A default org
+ * would only ever be wrong for anyone else, and a default address means a stranger's staging site
+ * mails the package author. So both come from git config, set once per machine -
+ *
+ *     git config --global webm.org webmonterey
+ *     git config --global webm.stagingEmail dev@example.com     # optional; user.email otherwise
+ *
+ * - and a flag overrides either for one run. `webm doctor` fails a staging site that ends up
+ * with no address.
  */
-function gitUserEmail(): string {
+function gitConfig(key: string): string | undefined {
   try {
-    return execFileSync('git', ['config', 'user.email'], { encoding: 'utf8' }).trim();
+    const value = execFileSync('git', ['config', key], { encoding: 'utf8' }).trim();
+    return value || undefined;
   } catch {
-    return '';
+    return undefined;
   }
 }
 
@@ -56,9 +63,17 @@ export function run(argv: string[]): number {
 
   if (!args.domain) {
     console.error(
-      'webm new <domain> [--client="Name"] [--org=webmonterey] [--staging-email=you@example.com] [--into=path] [--no-install]',
+      'webm new <domain> [--client="Name"] [--org=<github-owner>] [--staging-email=you@example.com] [--into=path] [--no-install]',
+    );
+    console.error('\n  webm new example.com --client="Example Co"');
+    return 1;
+  }
+
+  if (!args.org) {
+    console.error(
+      'webm new: no GitHub owner for the repo. Either pass --org=<owner> or set it once:\n\n' +
+        '  git config --global webm.org <owner>\n',
     );
-    console.error('\n  webm new autire.com --client="Autire Technologies"');
     return 1;
   }
 
@@ -86,7 +101,7 @@ export function run(argv: string[]): number {
     domain,
     client: args.client,
     org: args.org,
-    stagingEmail: args.stagingEmail ?? gitUserEmail(),
+    stagingEmail: args.stagingEmail,
     packageVersion: packageVersion(),
     /* Real today, not a constant - see ScaffoldOptions.today for what a stale one does. */
     today: new Date().toISOString().slice(0, 10),
@@ -114,12 +129,14 @@ export function run(argv: string[]): number {
   console.log(`Scaffolded ${Object.keys(files).length} files into ${root}`);
   console.log(`  + ${seeded.length} seeded (favicons, headers, CLAUDE.md, a contact form)`);
   console.log(`  + ${kept.length} .gitkeep, so the empty directories survive a clone\n`);
-  console.log(`  repo     ${args.org}/${names.repo}      (keeps the domain)`);
+  console.log(`  repo               ${args.org}/${names.repo}`);
+  console.log(
+    `  worker · d1 · r2   ${names.slug}   (the domain minus its TLD, so Chrome does not flag previews)`,
+  );
   console.log(
-    `  worker   ${names.worker}                (slug - no TLD, so Chrome does not flag previews)`,
+    `\n  One name everywhere. If ${names.slug} is already taken in the account - ${domain.replace(/^[^.]+/, names.slug)}` +
+      ` and another TLD both want it - pick another with --into and edit webmonterey.json.`,
   );
-  console.log(`  d1       ${names.d1}`);
-  console.log(`  r2       ${names.r2Media}`);
 
   try {
     execFileSync('git', ['init', '-q', '-b', 'main'], { cwd: root });

package/src/cli/scaffold.test.ts

@@ -7,6 +7,7 @@ const files = (over = {}) =>
   scaffold({
     domain: 'autire.com',
     client: 'Autire Technologies',
+    org: 'webmonterey',
     packageVersion: '1.0.0',
     today: '2026-08-26',
     ...over,
@@ -14,15 +15,15 @@ const files = (over = {}) =>
 
 const json = (f: Record<string, string>, path: string) => JSON.parse(f[path]!);
 
-test('three names, three jobs: repo, slug, Cloudflare', () => {
+test('one name everywhere: repo, Worker, D1 and R2 are all the slug', () => {
   const f = files();
   const site = json(f, 'webmonterey.json');
-  // Repo carries the full domain with UNDERSCORES; Cloudflare carries the slug, no TLD.
-  assert.equal(site.repo, 'webmonterey/autire_com');
-  assert.equal(site.worker, 'webm-autire');
+  assert.equal(site.repo, 'webmonterey/autire');
+  assert.equal(site.worker, 'autire');
   assert.equal(site.slug, 'autire');
-  assert.match(f['wrangler.jsonc']!, /"name": "webm-autire"/);
-  assert.match(f['README.md']!, /webm-autire-db/);
+  assert.match(f['wrangler.jsonc']!, /"name": "autire"/);
+  assert.match(f['README.md']!, /\| Worker · D1 · R2 \| `autire` \|/);
+  assert.equal(json(f, 'package.json').name, 'autire');
 });
 
 test('MCP is declared AND pre-approved - a declaration alone is inert', () => {
@@ -84,7 +85,7 @@ test('secrets are gitignored and the example names the password-manager habit',
   assert.match(f['.dev.vars.example']!, /password manager/);
 });
 
-test('an unnamed client gets CHANGEME, which go-live refuses to launch with', () => {
+test('an unnamed client gets CHANGEME, which launch refuses to launch with', () => {
   const site = json(files({ client: undefined }), 'webmonterey.json');
   assert.equal(site.client, 'CHANGEME');
 });
@@ -176,20 +177,26 @@ test('compatibility_date is the date passed in, never a constant baked into the
    * scaffold.ts, which exists because a date NEWER than the installed runtime does not build at
    * all. Both directions are traps and they pull in opposite ways.
    */
-  const config = scaffold({ domain: 'a.com', packageVersion: '1.0.0', today: '2026-08-26' })[
-    'wrangler.jsonc'
-  ]!;
+  const config = scaffold({
+    domain: 'a.com',
+    org: 'o',
+    packageVersion: '1.0.0',
+    today: '2026-08-26',
+  })['wrangler.jsonc']!;
   assert.match(config, /"compatibility_date":\s*"2026-08-12"/, 'derived from it, a fortnight back');
 
-  const other = scaffold({ domain: 'a.com', packageVersion: '1.0.0', today: '2027-03-04' })[
-    'wrangler.jsonc'
-  ]!;
+  const other = scaffold({
+    domain: 'a.com',
+    org: 'o',
+    packageVersion: '1.0.0',
+    today: '2027-03-04',
+  })['wrangler.jsonc']!;
   assert.match(other, /"compatibility_date":\s*"2027-02-18"/, 'and it still tracks the argument');
 });
 
 test('a malformed date is refused rather than written into wrangler.jsonc', () => {
   assert.throws(
-    () => scaffold({ domain: 'a.com', packageVersion: '1.0.0', today: 'today' }),
+    () => scaffold({ domain: 'a.com', org: 'o', packageVersion: '1.0.0', today: 'today' }),
     /YYYY-MM-DD/,
   );
 });
@@ -205,9 +212,9 @@ test('the scaffolded compatibility_date is never in the future of the installed
    * machine that just installed. The margin is for every machine that did not.
    */
   const written = (today: string) =>
-    scaffold({ domain: 'a.com', packageVersion: '1.0.0', today })['wrangler.jsonc']!.match(
-      /"compatibility_date":\s*"([\d-]+)"/,
-    )![1]!;
+    scaffold({ domain: 'a.com', org: 'o', packageVersion: '1.0.0', today })[
+      'wrangler.jsonc'
+    ]!.match(/"compatibility_date":\s*"([\d-]+)"/)![1]!;
 
   for (const today of ['2026-08-27', '2026-01-01', '2026-03-01', '2027-12-31']) {
     const gap = (Date.parse(today) - Date.parse(written(today))) / 86_400_000;
@@ -222,9 +229,9 @@ test('the scaffolded compatibility_date is never in the future of the installed
 test('the margin crosses a month and a year boundary correctly', () => {
   // Naive string arithmetic gets 2026-01-05 minus 14 days wrong; this is why it goes through Date.
   const at = (today: string) =>
-    scaffold({ domain: 'a.com', packageVersion: '1.0.0', today })['wrangler.jsonc']!.match(
-      /"compatibility_date":\s*"([\d-]+)"/,
-    )![1]!;
+    scaffold({ domain: 'a.com', org: 'o', packageVersion: '1.0.0', today })[
+      'wrangler.jsonc'
+    ]!.match(/"compatibility_date":\s*"([\d-]+)"/)![1]!;
   assert.equal(at('2026-01-05'), '2025-12-22');
   assert.equal(at('2026-03-05'), '2026-02-19', 'and February');
 });

package/src/cli/scaffold.ts

@@ -13,10 +13,10 @@ import { MCP_NAMES, mcpConfig } from './mcp.ts';
 
 export interface ScaffoldOptions {
   domain: string;
-  /** Display name. Falls back to CHANGEME, which `go-live` refuses to launch with. */
+  /** Display name. Falls back to CHANGEME, which `/webm:launch` refuses to launch with. */
   client?: string;
-  /** GitHub org for the repo. */
-  org?: string;
+  /** GitHub owner for the repo. Required - the package carries no agency default. */
+  org: string;
   /**
    * Where a staging deployment's mail goes. `webm new` fills it from `git config user.email`;
    * the package itself carries no inbox, because a default address in a public package means a
@@ -49,7 +49,7 @@ export function scaffold(options: ScaffoldOptions): Record<string, string> {
   const { domain, packageVersion } = options;
   const n = resourceNames(domain);
   const client = options.client ?? 'CHANGEME';
-  const org = options.org ?? 'webmonterey';
+  const { org } = options;
   const { today } = options;
 
   if (!/^\d{4}-\d{2}-\d{2}$/.test(today)) {
@@ -413,9 +413,10 @@ export function scaffold(options: ScaffoldOptions): Record<string, string> {
     `| \`npx webm doctor\` | the things that fail silently |\n\n` +
     `## Cloudflare\n\n` +
     `| | |\n| --- | --- |\n` +
-    `| Worker | \`${n.worker}\` |\n| D1 | \`${n.d1}\` |\n| R2 media | \`${n.r2Media}\` |\n\n` +
-    `The repo is named for the domain; Cloudflare resources use the slug, with no TLD, so a\n` +
-    `preview hostname never embeds a domain Chrome could mistake for a lookalike.\n\n` +
+    `| Worker · D1 · R2 | \`${n.slug}\` |\n\n` +
+    `One name everywhere: the domain minus its TLD. A preview hostname then never embeds a\n` +
+    `domain Chrome could mistake for a lookalike. A second resource of one kind takes a purpose\n` +
+    `suffix - \`${n.slug}-portal\`.\n\n` +
     `## Deploying\n\n` +
     `Push to deploy. A \`wrangler deploy\` from a laptop creates a version no build produced, so\n` +
     `history stops describing what is live and the next push reverts it.\n`;

package/src/cli/slug.test.ts

@@ -20,24 +20,11 @@ test('something that is not a domain is refused, naming what was expected', () =
   assert.throws(() => normalizeDomain('exa mple.com'), DomainError);
 });
 
-test('the repo keeps the full domain, dots to UNDERSCORES', () => {
-  assert.equal(repoName('autire.com'), 'autire_com');
-  assert.equal(repoName('friendsofthemarinalibrary.org'), 'friendsofthemarinalibrary_org');
-});
-
-test('the three names are all different, and each has a job', () => {
-  // repo is unambiguous about the site; slug drops the TLD so Chrome does not flag preview
-  // hostnames; worker is the slug prefixed.
-  const n = resourceNames('autire.com');
-  assert.equal(n.repo, 'autire_com');
-  assert.equal(n.slug, 'autire');
-  assert.equal(n.worker, 'webm-autire');
-});
-
 test('the slug drops the TLD - this is what stops Chrome flagging preview links', () => {
-  // webm-autire-com contains autire-com, which reads as a domain. webm-autire does not.
-  assert.equal(slugFor('autire.com'), 'autire');
-  assert.equal(slugFor('stevenglaze.com'), 'stevenglaze');
+  // A Worker named example-com puts example-com into every preview hostname, which Chrome reads
+  // as a registrable domain. `example` embeds nothing.
+  assert.equal(slugFor('example.com'), 'example');
+  assert.equal(slugFor('acme-widgets.org'), 'acme-widgets');
 });
 
 test('a two-part public suffix drops both labels', () => {
@@ -45,7 +32,7 @@ test('a two-part public suffix drops both labels', () => {
   assert.equal(slugFor('example.com.au'), 'example');
 });
 
-test('a subdomain is kept - two of ours could differ only by it', () => {
+test('a subdomain is kept - an indexable subdomain is its own site', () => {
   assert.equal(slugFor('shop.example.com'), 'shop-example');
 });
 
@@ -53,18 +40,28 @@ test('a single-label result never comes back empty', () => {
   assert.ok(slugFor('a.com').length > 0);
 });
 
-test('every Cloudflare name derives from one domain, and the repo differs on purpose', () => {
-  assert.deepEqual(resourceNames('autire.com'), {
-    slug: 'autire',
-    repo: 'autire_com',
-    worker: 'webm-autire',
-    d1: 'webm-autire-db',
-    r2Media: 'webm-autire-media',
-    r2App: 'webm-autire-app',
+test('one name, everywhere: repo, Worker, D1, R2 and KV are all the slug', () => {
+  assert.equal(repoName('example.com'), 'example');
+  assert.deepEqual(resourceNames('example.com'), {
+    slug: 'example',
+    repo: 'example',
+    worker: 'example',
+    d1: 'example',
+    r2: 'example',
+    kv: 'example',
   });
 });
 
+test('every name is valid for the strictest resource - lowercase, digits and dashes only', () => {
+  // R2 and Workers accept nothing else, and R2 also refuses a leading or trailing dash.
+  for (const domain of ['example.com', 'shop.example.com', 'acme-widgets.co.uk', 'a1.io']) {
+    for (const name of Object.values(resourceNames(domain))) {
+      assert.match(name, /^[a-z0-9][a-z0-9-]*[a-z0-9]$|^[a-z0-9]$/, `${domain} -> ${name}`);
+    }
+  }
+});
+
 test('two clients on the same name under different TLDs collide, which the caller must handle', () => {
-  // clients.slug carries a unique constraint; `webm new` picks the next free form and records it.
-  assert.equal(slugFor('autire.com'), slugFor('autire.org'));
+  // `webm new` says so; the second one gets a name chosen by a person.
+  assert.equal(slugFor('example.com'), slugFor('example.org'));
 });

package/src/cli/slug.ts

@@ -1,15 +1,21 @@
 /*
- * Turning a domain into the names everything else uses.
+ * Turning a domain into the ONE name everything else uses.
  *
- * TWO NAMES, DELIBERATELY DIFFERENT.
+ *   example.com        ->  example
+ *   shop.example.com   ->  shop-example
+ *   example.co.uk      ->  example
  *
- *   GitHub repo        <domain_underscored>   webmonterey/autire_com
- *   Cloudflare stuff   webm-<slug>            webm-autire, webm-autire-db, webm-autire-media
+ * The GitHub repo, the Worker, the D1 database, the R2 bucket and any KV namespace all carry
+ * that same name. It is the domain minus its public suffix, which is the one shape valid for
+ * every resource at once - Workers and R2 accept only `[a-z0-9-]`, and in an agency account that
+ * holds nothing but client sites a prefix says nothing.
  *
- * The repo keeps the full domain so it is unambiguous which site it serves. Cloudflare drops the
- * TLD token because `webm-autire-com` contains `autire-com`, which Chrome's lookalike check reads
- * as a registrable domain - and every preview link then warns the client the site looks fake.
- * `webm-autire` has nothing in it that looks like a domain. See ARCHITECTURE.md section 5.
+ * The TLD is dropped for a reason beyond brevity: a Worker named `example-com` puts `example-com`
+ * into every preview hostname, and Chrome's lookalike-domain check reads that as a registrable
+ * domain and warns the client their own preview looks fake. `example` embeds nothing.
+ *
+ * A second resource of the same kind for one client takes a purpose suffix - `example-portal` -
+ * and is the exception, not the pattern.
  */
 
 /** Public suffixes that take two labels, so `example.co.uk` slugs to `example`. */
@@ -63,28 +69,16 @@ export function normalizeDomain(input: string): string {
   return cleaned;
 }
 
-/**
- * The GitHub repo name. Dots become UNDERSCORES: `autire.com` -> `autire_com`.
- *
- * Underscores, not dashes, and not the slug. Three names, three jobs:
- *
- *   repo       autire_com     the full domain, unambiguous about which site this is
- *   slug       autire         no TLD, because a Cloudflare Worker named webm-autire-com
- *                             embeds autire-com and Chrome reads that as a domain
- *   worker     webm-autire    the slug, prefixed
- *
- * A rebuild creates a NEW repo under the underscore name beside the old dashed one, which is what
- * lets the old site keep serving until the cutover.
- */
-export function repoName(domain: string): string {
-  return normalizeDomain(domain).replace(/\./g, '_');
-}
-
 /**
  * The client slug - the domain with its public suffix removed.
  *
- * `autire.com` -> `autire`, `example.co.uk` -> `example`. Subdomains are kept, because
- * `shop.example.com` and `example.com` are different clients if they are ever both ours.
+ * `example.com` -> `example`, `example.co.uk` -> `example`. Subdomains are kept, joined with a
+ * dash, because `shop.example.com` and `example.com` are different sites if they are ever both
+ * ours - and an indexable subdomain is always its own site.
+ *
+ * `example.com` and `example.org` slug to the same thing. That is a real collision inside one
+ * account, and `webm new` says so rather than silently picking - the second one gets a name
+ * chosen by a person.
  */
 export function slugFor(domain: string): string {
   const clean = normalizeDomain(domain);
@@ -95,15 +89,16 @@ export function slugFor(domain: string): string {
   return kept.join('-');
 }
 
-/** Every Cloudflare resource name for a site, from one domain. */
+/** The GitHub repo name. The slug - one name, everywhere. */
+export function repoName(domain: string): string {
+  return slugFor(domain);
+}
+
+/**
+ * Every resource name for a site, from one domain. They are all the slug; the fields exist so a
+ * caller says which resource it means, and so a purpose suffix has an obvious place to go.
+ */
 export function resourceNames(domain: string) {
   const slug = slugFor(domain);
-  return {
-    slug,
-    repo: repoName(domain),
-    worker: `webm-${slug}`,
-    d1: `webm-${slug}-db`,
-    r2Media: `webm-${slug}-media`,
-    r2App: `webm-${slug}-app`,
-  };
+  return { slug, repo: slug, worker: slug, d1: slug, r2: slug, kv: slug };
 }

package/src/cli/sync.ts

@@ -51,7 +51,7 @@ import { PACKAGE_ROOT, packageVersion } from './package-root.ts';
 
 /**
  * The namespace. Rule 5's prefix: the CLI is `webm`, the tokens are --webm-*, the classes are
- * .webm-*, the Workers are webm-<slug>. `/webm:launch` rather than `/webmonterey:launch`.
+ * .webm-*, the cloud resources carry one name each - the domain minus its TLD. `/webm:launch` rather than `/webmonterey:launch`.
  */
 const NAMESPACE = 'webm';
 

package/src/includes/cloudflare/r2/README.md

@@ -13,7 +13,7 @@ domain on a bucket requires the zone to be on the same account as the bucket, so
 earlier fails for the same reason `preview.<client-domain>` does.
 
 ```sh
-npx wrangler r2 bucket create webm-<domain-dashed>-media
+npx wrangler r2 bucket create <slug>        # the domain minus its TLD, same as the Worker and D1
 ```
 
 Then in the dashboard: **R2 → the bucket → Settings → Custom Domains → Connect Domain**, and
@@ -49,8 +49,8 @@ no_check_bucket = true
 every transfer fails with an error naming an operation you never asked for.
 
 ```sh
-rclone copy ./uploads webm-media:webm-<domain-dashed>-media --transfers 2 --progress
-rclone check ./uploads webm-media:webm-<domain-dashed>-media
+rclone copy ./uploads webm-media:<slug> --transfers 2 --progress
+rclone check ./uploads webm-media:<slug>
 ```
 
 Two things learned the hard way:

package/src/includes/cloudflare/r2/media.ts

@@ -13,9 +13,9 @@
  * The deciding question is not file size, it is "should `git clone` carry this?" A 40MB
  * showreel makes every clone slower forever and can never be optimised by the build.
  *
- * NAMING (rule 5):
- *   bucket    webm-<domain-dashed>-media     e.g. webm-example-com-media
- *   hostname  media.<client-domain>          e.g. media.example.com
+ * NAMING:
+ *   bucket    <slug>                  e.g. example - one name for every resource, see cli/slug.ts
+ *   hostname  media.<client-domain>   e.g. media.example.com
  *
  * WHY A CUSTOM DOMAIN AND NOT r2.dev: Cloudflare's r2.dev subdomain is rate-limited and
  * documented as unsuitable for production. It is also a hostname the client does not own,

package/src/includes/webmonterey/config.test.ts

@@ -68,7 +68,7 @@ test('staging is decided by config OR by a workers.dev hostname, each covering t
   // A cron has no hostname, so config is the only signal it can read; a branch preview of a
   // launched site inherits `production` from main, so the hostname is the only signal there.
   assert.equal(isStagingDeployment('staging', null), true);
-  assert.equal(isStagingDeployment('production', 'x-webm-acme.acct.workers.dev'), true);
+  assert.equal(isStagingDeployment('production', 'x-acme.acct.workers.dev'), true);
   assert.equal(isStagingDeployment('production', 'acme.com'), false);
   assert.equal(isStagingDeployment(undefined, 'www.acme.com'), false, 'a www variant still sends');
   assert.equal(isStagingDeployment('production', 'notworkers.dev'), false, 'label, not substring');

package/template/migrations/README.md

@@ -35,7 +35,7 @@ Wrangler tracks applied migrations in a `d1_migrations` table inside the databas
 The database must exist and be bound in `wrangler.jsonc`:
 
 ```sh
-npx wrangler d1 create webm-<domain-dashed>-db --update-config
+npx wrangler d1 create <slug> --update-config
 ```
 
 `--update-config` writes the `d1_databases` binding into `wrangler.jsonc` for you.

package/template/site/CLAUDE.md

@@ -103,8 +103,12 @@ Private data — user logins, form submissions — goes to **Cloudflare D1**, ne
 
 ### 5. The prefix is `webm-`, never `wm-`
 
-Custom properties (`--webm-action`), class names (`.webm-section`), Cloudflare resource names
-(`webm-<slug>`), the CLI, the skills namespace. No exceptions.
+Custom properties (`--webm-action`), class names (`.webm-section`), the CLI, the skills
+namespace. No exceptions.
+
+Cloud resources are the other convention: the GitHub repo, Worker, D1, R2 and KV all carry **one
+name**, the domain minus its TLD (`example.com` → `example`). A second resource of one kind takes
+a purpose suffix (`example-portal`).
 
 ### 6. Cloudflare bindings come from `cloudflare:workers`