uniweb 0.63.2 → 0.64.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "uniweb",
-  "version": "0.63.2",
+  "version": "0.64.0",
   "description": "Create structured Vite + React sites with content/code separation",
   "type": "module",
   "bin": {
@@ -41,17 +41,17 @@
     "js-yaml": "^4.1.0",
     "prompts": "^2.4.2",
     "tar": "^7.0.0",
-    "@uniweb/kit": "^0.19.4",
-    "@uniweb/semantic-parser": "^1.4.1",
-    "@uniweb/schemas": "^0.3.4",
     "@uniweb/content-writer": "^0.3.4",
     "@uniweb/core": "^0.29.8",
-    "@uniweb/runtime": "^0.27.4"
+    "@uniweb/schemas": "^0.4.0",
+    "@uniweb/semantic-parser": "^1.4.1",
+    "@uniweb/runtime": "^0.27.4",
+    "@uniweb/kit": "^0.19.4"
   },
   "peerDependencies": {
     "@uniweb/content-reader": "^1.2.5",
-    "@uniweb/semantic-parser": "^1.4.1",
-    "@uniweb/build": "^0.59.0"
+    "@uniweb/build": "^0.59.1",
+    "@uniweb/semantic-parser": "^1.4.1"
   },
   "peerDependenciesMeta": {
     "@uniweb/build": {

package/partials/agents.md

@@ -2455,15 +2455,19 @@ await writer.remove(itemId)
 
 ### ⛔ Permissions are the SERVER'S, and your UI is only a courtesy
 
-Gate your controls on what the viewer may do — `viewer.actingUnitId`, `viewer.roles` —
-but **never rely on that for safety**. A foundation runs with exactly the viewer's
-own authority, so hiding a button hides a button. The rule belongs in the data
-schema, where the store enforces it:
+Gate your controls on what the viewer may do — `viewer.roles` (the site's operator
+holds `system_admin`), or a record's own `can_edit` from a single-entity read — but
+**never rely on that for safety**. A foundation runs with exactly the viewer's own
+authority, so hiding a button hides a button.
 
-```yaml
-# foundation/schemas/session.yml
-creatable_by: unit_members     # only members of the owning unit may create these
+What protects content is the **entry**: a member writes their own entries and not
+another's, and the store enforces it. **Models are open** — anyone signed in may
+create entries of any Model, so a data schema does not restrict who creates
+(`creatable_by` is retired and refused). What a schema can protect is how an item
+changes:
 
+```yaml
+# foundation/schemas/attendance.yml
 sections:
   checkins:
     many: true
@@ -2489,8 +2493,8 @@ export default createMockBackend({ seed }).fetch
 ```
 
 `uniweb dev` mounts it at your `api:` address, same-origin, so cookies and your
-site's configuration behave exactly as they will in production. It **enforces**
-`creatable_by` and `append_only`, so a permission you are relying on fails on your
+site's configuration behave exactly as they will in production. It **enforces** who
+may edit an entry and `append_only`, so a permission you are relying on fails on your
 machine rather than in front of a user. State is in memory; restart to reset.
 
 `uniweb create my-event --template conference` is a worked example of all of this.
@@ -2515,9 +2519,9 @@ uniweb add ci --target foundation # Publish a foundation for free at permanent v
 uniweb push / pull / clone / status   # Git-style content sync with the Uniweb backend
 uniweb refresh / sync                 # Catch up (git + backend, never pushes) / catch up, then push
 uniweb push --org @acme               # First push/publish of a site: who owns it (see below)
-uniweb register [--scope @org]        # Register a foundation + its data schemas to the registry
+uniweb register [--scope @scope]      # Register a foundation + its data schemas to the registry
 uniweb login / logout                 # One backend at a time: log in (--backend <url>) or out
-uniweb org list / create <handle>     # Publish orgs you belong to — the @org in a scoped ref
+uniweb org list / create <handle>     # Your personal scope, and the orgs you belong to
 uniweb content export [dir]           # Package a site (or a built foundation's schema) as .uwx
 
 uniweb rename <foundation|site|extension> <old> <new>   # Rename across the whole workspace
@@ -2634,7 +2638,7 @@ Platform-specific configuration that doesn't belong in npm-standard fields. All
 |---|---|---|---|
 | `runtimePolicy` | `dist/runtime-pin.json` | unset | Declares how far past the recorded runtime version a host may move a site. |
 
-**The foundation's name is not here — it is `name` in `main.js`** (else `package.json`'s `name`), **and so is the org it registers under: the scope is part of the name**, `name: '@acme/marketing'`. A name with no scope has not been registered yet: the first `uniweb register` takes `--scope @org` (else one of your orgs) and writes it into the name, and a `--scope` naming another org than the name's is refused. The foundation's own data schemas register under the same scope (`@/article` → `@acme/article`). ⛔ `uniweb.id` and `uniweb.scope` are no longer read for a foundation: `uniweb register` refuses them and prints the `main.js` line to write instead. (A schemas-only package has no `main.js`, and still records its scope in `uniweb.scope`.)
+**The foundation's name is not here — it is `name` in `main.js`** (else `package.json`'s `name`), **and so is the scope it registers under: the scope is part of the name**, `name: '@acme/marketing'`. A scope is a namespace — your personal one, `@<your handle>`, which needs no org, or an org's. A name with no scope has not been registered yet: the first `uniweb register` takes `--scope`, else your personal scope (asking only if you belong to orgs), and writes it into the name; a `--scope` naming another scope than the name's is refused. The foundation's own data schemas register under the same scope (`@/article` → `@acme/article`). ⛔ `uniweb.id` and `uniweb.scope` are no longer read for a foundation: `uniweb register` refuses them and prints the `main.js` line to write instead. (A schemas-only package has no `main.js`, and still records its scope in `uniweb.scope`.)
 
 **Runtime updates — handled for you.** Your foundation's code links against the runtime: it externalizes `react`, `react-dom`, `react-dom/server`, both JSX runtimes and `@uniweb/core`, and the runtime supplies all of them at load time. So a build is bound to *that* React and *that* core API.
 

package/src/backend/client.js

@@ -569,7 +569,7 @@ export class BackendClient {
 
   // ── Orgs ──────────────────────────────────────────────────────────────────────
 
-  /** GET /dev/orgs → { account_handle, personal_org_exists, orgs[] }. */
+  /** GET /dev/orgs → { account_handle, orgs[] }. */
   async fetchOrgs() {
     return fetchOrgsImpl({ apiBase: this.origin, token: await this.token() })
   }

package/src/backend/site-sync.js

@@ -787,10 +787,10 @@ export const EXPLICIT_OWNER = new Set(['flag', 'personal', 'picked'])
  * they never named.
  *
  * `register` resolves a foundation's scope in the same order — recorded (the scope
- * in its name, `@acme/marketing` in main.js), else explicit (`--scope`), else asked
- * (`deriveScope`) — with one difference: non-interactive, it PICKS the one org you
- * belong to, else your personal org, else the primary, and says which. This refuses
- * instead, because a site's owner is the one-shot decision above. ⭐ And the two are
+ * in its name, `@acme/marketing` in main.js), else explicit (`--scope`), else derived
+ * (`deriveScope`) — with one difference: non-interactive, it takes your personal
+ * scope and says so. This refuses instead, because a site's owner is the one-shot
+ * decision above, and a scope is only a namespace (2026-09-23). ⭐ And the two are
  * separate decisions: a foundation may be registered under any org its author
  * belongs to, whoever owns the site (2026-09-22) — a site's `@/x` refs take the
  * FOUNDATION's scope, never this one. ⚠️ Until 2026-09-21 this said
@@ -861,10 +861,9 @@ export async function resolveSiteOrgForCreate({
     }
   }
 
-  // Interactive: offer the real choice. Deliberately NOT `deriveScope` — that one
-  // serves the foundation lane, where every answer is an org and 0-orgs means
-  // "claim your personal org". Here "personal" must stay reachable as *no org*,
-  // and reusing deriveScope would quietly turn it into an org creation.
+  // Interactive: offer the real choice. Deliberately NOT `deriveScope` — that one picks
+  // a NAMESPACE for a foundation, where `@<your handle>` is your personal scope. Here
+  // the answer is an OWNER: your personal workspace (named by naming none) or an org.
   const { fetchOrgs, createOrg, validateHandle, bareHandle } =
     await import('../utils/registry-orgs.js')
   let envelope

package/src/commands/org.js

@@ -1,11 +1,14 @@
 /**
- * uniweb org — manage publish orgs on the new backend.
+ * uniweb org — the orgs you belong to, on the backend you are logged in to.
  *
- *   uniweb org list                 List the orgs you're a member of.
+ *   uniweb org list                 Your personal scope, and the orgs you're a member of.
  *   uniweb org create <handle>      Create an org; you become a member.
  *
- * Auth: the new-backend session (`uniweb login`) / UNIWEB_TOKEN. Distinct from
- * the legacy platform (publish/deploy); this talks to the registry backend.
+ * ⭐ You need no org to register a foundation: `@<your handle>` is your personal scope
+ * (2026-09-23). An org is for a scope — and sites — you share, and it needs a handle
+ * of its own: a backend refuses one named after an account, yours included.
+ *
+ * Auth: the session of the backend you are logged in to (`uniweb login`) / UNIWEB_TOKEN.
  */
 
 import { BackendClient } from '../backend/client.js'
@@ -26,10 +29,17 @@ export async function org(args = []) {
 
   if (sub === 'list') {
     const client = new BackendClient({ args, command: 'Listing orgs' })
-    const { orgs } = await client.fetchOrgs()
+    const { account_handle: mine, orgs: all } = await client.fetchOrgs()
+    // An org named after you — made before 2026-09-23 — is your personal scope's `@`.
+    const orgs = all.filter((u) => u.handle !== mine)
+    if (mine) {
+      console.log(
+        `Your personal scope: ${colors.bright}@${mine}${colors.reset}${colors.dim} — register under it with no org${colors.reset}`
+      )
+    }
     if (!orgs.length) {
       console.log(
-        'You have no orgs yet. Create one: uniweb org create <handle>'
+        `You belong to no org. To share a scope and sites with others: uniweb org create <handle>`
       )
       return { exitCode: 0 }
     }
@@ -55,12 +65,20 @@ export async function org(args = []) {
     }
     const client = new BackendClient({ args, command: 'Creating an org' })
     try {
+      // Named after you, it is your personal scope already — and a backend refuses it.
+      const { account_handle: mine } = await client.fetchOrgs()
+      if (mine && handle === mine) {
+        error(
+          `@${handle} is your personal scope already — you can register under it with no org. An org needs a handle of its own.`
+        )
+        return { exitCode: 2 }
+      }
       const org = await client.createOrg(handle)
       success(
         `Created ${colors.bright}@${org.handle}${colors.reset} — you're a member${org.is_primary ? ' (primary)' : ''}.`
       )
       console.log(
-        `${colors.dim}Publish under it: uniweb register --scope @${org.handle}${colors.reset}`
+        `${colors.dim}Register under it: uniweb register --scope @${org.handle}${colors.reset}`
       )
       return { exitCode: 0 }
     } catch (err) {
@@ -70,7 +88,7 @@ export async function org(args = []) {
   }
 
   console.log('uniweb org <command>')
-  console.log('  list             List orgs you belong to')
+  console.log('  list             Your personal scope, and the orgs you belong to')
   console.log('  create <handle>  Create an org (you become a member)')
   return { exitCode: sub ? 2 : 0 }
 }

package/src/commands/register.js

@@ -376,8 +376,8 @@ export async function settleFoundationScope(targetDir, { args, isPreview, flagSc
 }
 
 /**
- * A publish scope derived from the login's org memberships (list → 1 use / 0 create /
- * N pick), as `@handle` — or null when none was chosen.
+ * A scope derived from the login (`deriveScope`): your personal scope when you belong
+ * to no org, else a pick — as `@handle`, or null when none was chosen.
  */
 async function deriveScopeFromLogin(client, args) {
   const token = await client.token()
@@ -692,8 +692,8 @@ async function runRegister(args = []) {
     }
   }
 
-  // A schemas-only package with no scope, on a real submit → derive it from login
-  // membership (list → 1 use / 0 create / N pick) and persist it to package.json.
+  // A schemas-only package with no scope, on a real submit → derive it from the login
+  // (your personal scope, or a pick among it and your orgs) and persist it to package.json.
   // (A foundation's was settled before its build — `settleFoundationScope`.)
   if (standalone && !scope && !isPreview) {
     const derived = await deriveScopeFromLogin(client, args)

package/src/framework-index.json

@@ -1,16 +1,16 @@
 {
   "schemaVersion": 1,
-  "generatedAt": "2026-09-23T15:39:38.377Z",
+  "generatedAt": "2026-09-23T16:32:05.892Z",
   "packages": {
     "@uniweb/api": {
-      "version": "0.5.1",
+      "version": "0.6.0",
       "path": "framework/api",
       "deps": [
         "@uniweb/core"
       ]
     },
     "@uniweb/build": {
-      "version": "0.59.0",
+      "version": "0.59.1",
       "path": "framework/build",
       "deps": [
         "@uniweb/content-reader",
@@ -96,7 +96,7 @@
       "deps": []
     },
     "@uniweb/schemas": {
-      "version": "0.3.4",
+      "version": "0.4.0",
       "path": "framework/schemas",
       "deps": []
     },
@@ -116,7 +116,7 @@
       "deps": []
     },
     "@uniweb/templates": {
-      "version": "0.16.1",
+      "version": "0.16.2",
       "path": "framework/templates",
       "deps": []
     },

package/src/index.js

@@ -1726,8 +1726,10 @@ Auto-detects what you run it in:
   • a schemas-only pkg   just its data schemas, no foundation — e.g. @uniweb/schemas,
                          any @org/schemas package, or a bare schemas/*.yml folder
 
-A foundation's scope is part of its name — name: '@org/<name>' in main.js. A bare
-name takes --scope (or one of your orgs), and register writes it into the name.
+A foundation's scope is part of its name — name: '@scope/<name>' in main.js. A scope
+is a namespace: your personal one (@<your handle>, no org needed) or an org's. A bare
+name takes --scope, else your personal scope (or a pick, if you belong to orgs), and
+register writes it into the name.
 
 Schema scopes:
   @/name     your own schema, in the foundation's scope   (@/x -> @org/x)
@@ -1735,9 +1737,10 @@ Schema scopes:
   @org/name  another org's published schema, referenced by name
 
 ${colors.bright}Options:${colors.reset}
-  --scope @org       A foundation with a bare name: register under @org, and write it into
-                     the name (refused when the name has another scope). A schemas-only
-                     package: publish under @org; default: package.json uniweb.scope
+  --scope @scope     A foundation with a bare name: register under @scope — yours or an
+                     org's — and write it into the name (refused when the name has another
+                     scope). A schemas-only package: publish under @scope; default:
+                     package.json uniweb.scope
   --dry-run          Print the .uwx; submit nothing
   -o, --output <f>   Write the .uwx to a file; submit nothing
   --non-interactive  Fail with usage info instead of prompting

package/src/utils/registry-orgs.js

@@ -26,17 +26,19 @@
  *
  *   GET  /dev/orgs → {
  *     account_handle: string|null,     // the caller's account handle
- *     personal_org_exists: bool,       // does @<account_handle> exist as an org
  *     orgs: [{ handle, is_primary }]   // memberships, primary first;
  *   }                                  // handle-less units filtered server-side
  *
  *   POST /dev/orgs { handle } → { handle, uuid, is_primary }
  *
- * The PERSONAL org needs no flag: handles live in ONE global namespace across
- * accounts + orgs and only the owner can create the org matching their account
- * handle — so `org.handle === account_handle` is a sound derivation, and the
- * lazy personal claim is just a create. Org creation requires NO second factor
- * on any lane (the 2FA gate lives at escalation points, not here).
+ * ⭐ A SCOPE IS A NAMESPACE, NOT AN ORG (2026-09-23). `@<account handle>` is the
+ * account's own scope and needs no org; an org's scope is published into by its
+ * members. Handles live in ONE global namespace across accounts and orgs, so an org
+ * needs a handle of its own — a backend refuses an org named after an account, its
+ * owner's included. ⛔ Until 2026-09-23 the CLI created a "personal org" `@jane` for
+ * account `jane` to have a scope at all; `personal_org_exists` served that and is no
+ * longer read. Org creation requires NO second factor on any lane (the 2FA gate lives
+ * at escalation points, not here).
  *
  * Failure shapes (branch on STATUS; details are human display, not contract):
  * 422 = handle grammar; 409 = taken / reserved / belongs to another account
@@ -95,7 +97,7 @@ export function validateHandle(handle) {
 /**
  * The picker read: memberships + the caller's account handle + whether the
  * personal org already exists.
- * @returns {Promise<{account_handle: string|null, personal_org_exists: boolean, orgs: Array<{handle: string, is_primary: boolean}>}>}
+ * @returns {Promise<{account_handle: string|null, orgs: Array<{handle: string, is_primary: boolean}>}>}
  */
 export async function fetchOrgs({ apiBase, token }) {
   const res = await fetch(`${apiBase.replace(/\/$/, '')}${ORGS_PATH}`, {
@@ -108,7 +110,6 @@ export async function fetchOrgs({ apiBase, token }) {
   const data = await res.json().catch(() => null)
   return {
     account_handle: data?.account_handle ?? null,
-    personal_org_exists: data?.personal_org_exists === true,
     orgs: Array.isArray(data?.orgs) ? data.orgs : []
   }
 }
@@ -119,8 +120,8 @@ export async function listOrgs(opts) {
 }
 
 /**
- * Create an org (the lazy personal claim is exactly this create — the
- * owner-exception admits `handle === account_handle` for the owner).
+ * Create an org. Its handle must be its own: a backend refuses an account's handle,
+ * your own included — your personal scope needs no org.
  * @returns {Promise<{handle: string, uuid?: string, is_primary?: boolean}>}
  */
 export async function createOrg({ apiBase, token, handle }) {
@@ -156,11 +157,23 @@ export async function createOrg({ apiBase, token, handle }) {
 }
 
 /**
- * Derive the publish scope from login membership when none was supplied:
- *   ≥1 org → confirm (1) or pick (N), personal org labeled + first
- *   0 orgs → the first-publish picker (personal default, lazily claimed)
- * Returns the chosen bare handle (no `@`), or null if cancelled. Persists
- * nothing — the caller records it. Bails in non-interactive mode.
+ * The scope to register under, from the login, when none was named — a bare handle,
+ * or null when none was chosen. Persists nothing; the caller records it (in the
+ * foundation's name, or a schemas-only package's `package.json`).
+ *
+ * ⭐ A SCOPE IS A NAMESPACE (2026-09-23): your account's own, `@<handle>`, needs no org.
+ *
+ *   no org              → your personal scope — said, never asked, in CI too
+ *   orgs                → pick: your personal scope first, then each org;
+ *                         non-interactive, your personal scope, said
+ *   no account handle   → (a service account) its one org, said; several are asked,
+ *                         or refused in CI; none is a pointer to `--scope`
+ *
+ * ⛔ Until 2026-09-23 a login with no org was offered a "personal org" `@jane`, created
+ * on the spot — a scope was taken to need an org — and refused in CI.
+ *
+ * An org named after the account — a personal org made before then — is the same
+ * `@jane`, and is listed once, as your personal scope.
  *
  * @param {Object} p
  * @param {string} p.apiBase
@@ -177,161 +190,56 @@ export async function deriveScope({
   args = []
 }) {
   const envelope = await fetchOrgs({ apiBase, token })
-  const { orgs } = envelope
-  const personal =
-    envelope.account_handle ||
-    (accountHandle ? bareHandle(accountHandle) : null)
-  const personalOrgExists = envelope.personal_org_exists
+  const handle = bareHandle(envelope.account_handle || accountHandle || '')
+  const personal = handle && !validateHandle(handle) ? handle : null
+  const orgs = envelope.orgs.filter((o) => o.handle !== personal)
   const { isNonInteractive } = await import('./interactive.js')
   const nonInteractive = isNonInteractive(args)
-  const isPersonal = (h) => personal && h === personal
+  const bold = (h) => `\x1b[1m@${h}\x1b[0m`
 
-  if (orgs.length === 1) {
-    const h = orgs[0].handle
-    const label = isPersonal(h) ? `your personal org @${h}` : `your org @${h}`
-    if (nonInteractive) {
-      console.error(
-        `Publishing under ${label.replace(`@${h}`, `\x1b[1m@${h}\x1b[0m`)}.`
-      )
-      return h
+  if (personal && !orgs.length) {
+    console.error(`Registering under your personal scope ${bold(personal)}.`)
+    return personal
+  }
+  if (!personal && orgs.length <= 1) {
+    if (orgs.length === 1) {
+      console.error(`Registering under your org ${bold(orgs[0].handle)}.`)
+      return orgs[0].handle
     }
-    const prompts = (await import('prompts')).default
-    const { ok } = await prompts(
-      {
-        type: 'confirm',
-        name: 'ok',
-        message: `Publish under ${label}?`,
-        initial: true
-      },
-      {
-        onCancel: () => {
-          console.error('\nCancelled.')
-          process.exit(0)
-        }
-      }
+    console.error(
+      "\x1b[31m✗\x1b[0m This account has no handle (service accounts don't get one), so it has no personal scope, and it belongs to no org.\n" +
+        '  Pass --scope @org, or create one with `uniweb org create <handle>`.'
     )
-    if (!ok) {
-      console.error(
-        'Pass --scope @org, or create another with `uniweb org create <handle>`.'
-      )
-      return null
-    }
-    return h
+    return null
   }
 
-  if (orgs.length > 1) {
-    // Personal org first; the rest in server order (primary-first).
-    const ordered = [...orgs].sort(
-      (a, b) => (isPersonal(b.handle) ? 1 : 0) - (isPersonal(a.handle) ? 1 : 0)
-    )
-    if (nonInteractive) {
-      const pick =
-        ordered.find((u) => isPersonal(u.handle)) ||
-        orgs.find((u) => u.is_primary) ||
-        orgs[0]
+  if (nonInteractive) {
+    if (!personal) {
       console.error(
-        `Multiple orgs; using \x1b[1m@${pick.handle}\x1b[0m (non-interactive).`
+        '\x1b[31m✗\x1b[0m This account belongs to several orgs and has no personal scope. Pass --scope @org.'
       )
-      return pick.handle
+      return null
     }
-    const prompts = (await import('prompts')).default
-    const { choice } = await prompts(
-      {
-        type: 'select',
-        name: 'choice',
-        message: 'Publish under which org?',
-        choices: ordered.map((u) => ({
-          title: `@${u.handle}${isPersonal(u.handle) ? ' — your personal org' : u.is_primary ? ' (primary)' : ''}`,
-          value: u.handle
-        })),
-        initial: 0
-      },
-      {
-        onCancel: () => {
-          console.error('\nCancelled.')
-          process.exit(0)
-        }
-      }
-    )
-    return choice || null
-  }
-
-  // 0 orgs → the first-publish picker.
-  if (nonInteractive) {
     console.error(
-      '\x1b[31m✗\x1b[0m You have no org to publish under. Create one with `uniweb org create <handle>`, or pass --scope @org.'
+      `Registering under your personal scope ${bold(personal)} (non-interactive). Pass --scope @org for an org.`
     )
-    process.exit(1)
+    return personal
   }
-  return offerCreateOrg({
-    apiBase,
-    token,
-    accountHandle: personal,
-    personalOrgExists
-  })
-}
-
-/**
- * Cold-start (0 orgs) — the first-publish org choice. Every account handle
- * is a reserved, ready-to-go org handle (globally unique across accounts +
- * orgs; only the owner can claim it), so the default is one keystroke:
- *
- *   ? Publish under which org?
- *   ❯ @jane — your personal org (created on first publish)
- *     A new organization…
- *
- * The personal org is materialized LAZILY here — at first publish, never at
- * signup. Two guards:
- *  - no account handle (Service/System accounts — real signups always mint
- *    one) → a crisp pointer instead of a prompt;
- *  - the personal org exists but the caller is no longer a member
- *    (created-then-left) → the lazy claim would 409; don't offer it.
- * Returns the chosen bare handle, or null if cancelled/failed.
- */
-export async function offerCreateOrg({
-  apiBase,
-  token,
-  accountHandle = null,
-  personalOrgExists = false
-}) {
   const prompts = (await import('prompts')).default
-  const personal =
-    accountHandle && !validateHandle(accountHandle)
-      ? bareHandle(accountHandle)
-      : null
-
-  if (!personal) {
-    console.error(
-      "\x1b[31m✗\x1b[0m This account has no handle (service accounts don't get one), so there is no ready-to-go org.\n" +
-        '  Log in with a personal account or set a handle in the app — or pass --scope @org / `uniweb org create <handle>`.'
-    )
-    return null
-  }
-
-  const canClaimPersonal = !personalOrgExists
-  const choices = [
-    ...(canClaimPersonal
-      ? [
-          {
-            title: `@${personal} — your personal org (created on first publish)`,
-            value: personal
-          }
-        ]
-      : []),
-    { title: 'A new organization…', value: ':new' }
-  ]
-  if (!canClaimPersonal) {
-    console.error(
-      `\x1b[2m@${personal} exists but you're not a member of it — ask its admin, or create another org.\x1b[0m`
-    )
-  }
-
   const { choice } = await prompts(
     {
       type: 'select',
       name: 'choice',
-      message: 'Publish under which org?',
-      choices,
+      message: 'Register under which scope?',
+      choices: [
+        ...(personal
+          ? [{ title: `@${personal} — your personal scope`, value: personal }]
+          : []),
+        ...orgs.map((o) => ({
+          title: `@${o.handle}${o.is_primary ? ' (primary org)' : ' (org)'}`,
+          value: o.handle
+        }))
+      ],
       initial: 0
     },
     {
@@ -341,36 +249,5 @@ export async function offerCreateOrg({
       }
     }
   )
-  if (!choice) return null
-
-  let handle = choice
-  if (choice === ':new') {
-    const answer = await prompts(
-      {
-        type: 'text',
-        name: 'handle',
-        message: 'Org handle (e.g. acme):',
-        validate: (v) => validateHandle(v) || true
-      },
-      {
-        onCancel: () => {
-          console.error('\nCancelled.')
-          process.exit(0)
-        }
-      }
-    )
-    if (!answer.handle) return null
-    handle = answer.handle
-  }
-
-  try {
-    const org = await createOrg({ apiBase, token, handle })
-    console.error(
-      `\x1b[32m✓\x1b[0m Created \x1b[1m@${org.handle}\x1b[0m — you're a member${org.is_primary ? ' (primary)' : ''}.`
-    )
-    return org.handle
-  } catch (err) {
-    console.error(`\x1b[31m✗\x1b[0m ${err.message}`)
-    return null
-  }
+  return choice || null
 }