znode-plugin 0.1.7 → 0.1.9

package/README.md

@@ -217,9 +217,124 @@ export default function setup(host: IBrowserHost): IBrowserPlugin {
 }
 ```
 
-**Slots:** `layout.header`, `layout.footer`, `header.search`, `product.card`, `product.image`, `product.variants`,
-`product.addToCart`, `product.layout`, `product.basicInfo`, `productList.layout`, `addToCart.notification`, `login.form`,
-`checkout.address`, `checkout.shippingOptions`. Server slots (in `server.tsx`): `layout.root`, `login.layout`, `login.page`.
+**Which slots are there?** Ask the store you are linked to; the list is read from its source, so it is always current:
+
+```bash
+npx znode slot list            # every slot
+npx znode slots product        # only the ones matching "product"
+```
+
+```
+  Slot                Side     Hands over  Store component   Eject             In this package
+  ------------------  -------  ----------  ----------------  ----------------  ---------------
+  product.basicInfo   browser  yes         ProductBasicInfo  ProductBasicInfo  yes
+  product.card        browser  yes         ProductCard       ProductCard
+  product.layout      browser  no          ProductBasicInfo  -
+  layout.root         server   yes         app/layout        -                 yes
+  ...
+```
+
+- **Side**: `browser` slots go in `src/browser.tsx` (`slots`), `server` slots in `src/server.tsx` (`serverSlots`).
+- **Hands over**: `yes` = your component gets the store's rendering as `children` (keep, wrap or replace it); `no` = it
+  adds or lays out (e.g. `product.layout` moves the store's parts into your structure).
+- **Eject**: the store component you can copy into your package (next section). **In this package**: you already fill it.
+
+### Take over a whole store component (eject)
+
+When a slot is not enough and you want to change the component itself (its markup, its logic), copy it into your
+package. The store then renders your copy in its place; everything else stays the store's.
+
+```bash
+npx znode eject ProductBasicInfo      # or by its slot: npx znode eject product.basicInfo
+```
+
+It copies the store's file to `src/components/ProductBasicInfo.tsx` (imports turned into the store's `@znode/...`
+aliases), registers it in `src/browser.tsx` under its slot, and prints any npm package the copy needs
+(`npm install zustand@4.5.5`). Edit the copy, then `npm run build` and `npm run dev`. The copy is yours: store fixes to
+the component no longer reach it, so compare it with the store's file after a store upgrade. `npx znode eject` with no
+name lists what can be ejected.
+
+**The component has no slot yet?** `eject` offers to create one in the **base store** (the store you linked), then ejects:
+
+```
+$ npx znode eject ProductDetailsPage
+ProductDetailsPage has no slot yet, so it cannot be ejected.
+Create a slot for ProductDetailsPage in the base store now? [y/N] y
+Slot name (area.name) [product.detailsPage]: product.details
+creating slot "product.details" around ProductDetailsPage (packages/base-components/src/...) ...
+ejected ProductDetailsPage -> src/components/ProductDetailsPage.tsx
+registered "product.details": EjectedProductDetailsPage in src/browser.tsx
+```
+
+Creating a slot edits the base store's **source** (a `Runtime<Component>` wrapper in
+`packages/extensions/src/slots/RuntimeCreatedSlots.tsx`, the component's export wrapped with `withRuntimeWrapper`, the
+slot added to the store's slot list and docs). It never touches `.next` and commits nothing. Before the store renders
+your copy: review the diff in the store repo (`git diff`), commit it there through the store's own flow (it changes base
+components, so it is reviewed like any base change), and rebuild / restart the webstore.
+
+- In a script or CI (no questions): `npx znode eject ProductDetailsPage --slot product.details`.
+- Only the slot, no copy: `npx znode create-slot ProductDetailsPage product.details`; add `--dry-run` first to see
+  exactly which store files and lines it would change, without writing anything.
+- A server **component** inside base-components cannot get a slot (a browser slot is filled in the browser): it refuses
+  an `async` component or one that imports `server-only` / `next/headers` / `fs`, and says to use a client component it
+  renders instead, e.g. `ProductDetails` is a server component, so take over `ProductBasicInfo` or `ProductDetailsPage`.
+
+### Take over a whole store page
+
+A store **page** (a route, `apps/webstore/src/app/**/page.tsx`) runs on the server, so it gets a **server slot** around
+the whole route, and `eject` gives you a **copy of the route**, as it does for a component. Use the page's name (its
+`export default function <Name>`):
+
+```
+$ npx znode eject ForgotPasswordPage
+ForgotPasswordPage has no slot yet, so it cannot be ejected.
+Create a slot for ForgotPasswordPage in the base store now? [y/N] y
+Slot name (area.name) [forgotPassword.page]: forgotPassword.page
+creating slot "forgotPassword.page" around ForgotPasswordPage (apps/webstore/src/app/[locale]/forgot-password/page.tsx) ...
+added "storeServer" to "permissions" in znode-package.json (its server part imports store modules)
+ejected ForgotPasswordPage (a copy of apps/webstore/src/app/[locale]/forgot-password/page.tsx, server slot "forgotPassword.page") -> src/server/pages/ForgotPasswordPage.tsx
+registered "forgotPassword.page": EjectedForgotPasswordPage in src/server.tsx (serverSlots)
+```
+
+In the store, the route's function becomes `<Name>Base` and its default export is wrapped (the server version of
+`withRuntimeWrapper`; with no package for the slot the store's page renders as it is):
+
+```tsx
+async function ForgotPasswordPageBase() { … unchanged … }
+export default withRuntimeServerPage("forgotPassword.page", ForgotPasswordPageBase);
+```
+
+In your package you get the route itself, to change as you like:
+
+```tsx
+// src/server/pages/ForgotPasswordPage.tsx (a copy of the store's route)
+import { ForgotPassword } from "@znode/base-components/components/forgot-password";
+import { NextIntlClientProvider } from "next-intl";
+import { getResourceMessages } from "@znode/utils/server";
+
+export async function ForgotPasswordPage() {
+  const userPasswordMessages = await getResourceMessages("UserPassword");
+  const commonMessages = await getResourceMessages("Common");
+  return (
+    <NextIntlClientProvider messages={{ ...userPasswordMessages, ...commonMessages }}>
+      <h1>Reset your password</h1>
+      <ForgotPassword />
+    </NextIntlClientProvider>
+  );
+}
+```
+
+- **props**: the route's own (`params`, `searchParams`) and `children` (the store's page, if you want to keep it);
+  **context** (second argument): `store`, `settings`. It runs on the server only (async, no hooks).
+- **Store imports in a server part** come from the store's **server registry**, an allow-list the store generates
+  (`packages/extensions/store-server-module-registry.json`): agents (`@znode/agents/*`), the texts and store context
+  (`getResourceMessages`, `fetchMessages`, `getPortalHeader`), the server logger, and client components and modules.
+  Session, cookie, token, cache and API-client internals are not in it: the build stops on them and says so.
+  The package needs the permission `"storeServer"` (eject adds it); a sandboxed package cannot have it.
+- The route's `generateMetadata` (page title) stays the store's.
+- To change only the form, eject the client component instead: `npx znode eject ForgotPassword`.
+- A page whose slot is **inside** the page (`login.page`, `layout.root`) gives a starter that renders `children`, not a copy.
+- Only the slot: `npx znode create-slot ForgotPasswordPage forgotPassword.page` (`--dry-run` to preview).
 
 ### Add a page-builder widget
 
@@ -293,8 +408,8 @@ Run them with `npm run <name>` inside a project (the scripts call `znode … .`)
 | | `npx znode create <theme\|plugin\|widget\|content> <name>` | a minimal starter of another kind |
 | | `npx znode slot list [<filter>] [--json]` | every slot the linked store renders, read from its source: browser or server side, whether it hands over what the store renders there (children: keep, wrap or replace it) or only adds / lays out, the store component it is around, what `eject` can copy into it, and whether this package already fills it. `npx znode slots` is the same; a filter matches slot or component names (`npx znode slots product`) |
 | | `npx znode eject` | list the store components a package can take over (each has a slot that hands the component over) |
-| | `npx znode create-slot <Component> <area.name> [--dry-run] [--file <store file>]` | create a slot around a store component that has none, in the **base store's source** (the linked store, not the theme, never `.next`): a `Runtime<Component>` wrapper in `packages/extensions/src/slots/RuntimeCreatedSlots.tsx`, the component's export wrapped with `withRuntimeWrapper`, the slot added to the store's slot list and docs, the module registry regenerated. Refuses server components (`async`, server-only imports): a slot is filled in the browser. Nothing is committed: review the diff in the store, commit it there, rebuild the webstore, then `npx znode eject <Component>`. `create slot` (with a space) works too; `add-slot` (0.1.6) still works |
-| | `npx znode eject <Name> [--force]` | `<Name>` is the component or its slot (`ProductBasicInfo` or `product.basicInfo`). Copy the store's component into `src/components/<Name>.tsx` (imports turned into store aliases, runtime wrapper removed) and register it in `src/browser.tsx` under its slot; prints any npm package the copy needs. The copy is yours: store fixes no longer reach it |
+| | `npx znode create-slot <Component> <area.name> [--dry-run] [--file <store file>]` | create a slot around a store component that has none, in the **base store's source** (the linked store, not the theme, never `.next`): a `Runtime<Component>` wrapper in `packages/extensions/src/slots/RuntimeCreatedSlots.tsx`, the component's export wrapped with `withRuntimeWrapper`, the slot added to the store's slot list and docs, the module registry regenerated. Refuses server components inside base-components (`async`, server-only imports): a browser slot is filled in the browser. For a **route page** (`<Component>` is its `export default function`, e.g. `ForgotPasswordPage`) it puts a **server slot** (`<RuntimeServerSlot>`) around the page's content instead, filled in `src/server.tsx` (`serverSlots`). Nothing is committed: review the diff in the store, commit it there, rebuild the webstore, then `npx znode eject <Component>`. `create slot` (with a space) works too; `add-slot` (0.1.6) still works |
+| | `npx znode eject <Name> [--force] [--slot <area.name>] [--yes]` | `<Name>` is the component or its slot (`ProductBasicInfo` or `product.basicInfo`). Copy the store's component into `src/components/<Name>.tsx` (imports turned into store aliases, runtime wrapper removed) and register it in `src/browser.tsx` under its slot; prints any npm package the copy needs. The copy is yours: store fixes no longer reach it. **No slot yet?** It asks whether to create one in the base store and for its name (suggested from the component, e.g. `ProductDetailsPage` → `product.detailsPage`), does what `create-slot` does, then ejects. `--slot <area.name>` creates it without asking (for scripts / CI); `--yes` skips the confirm only |
 
 The plugin folder is taken from: the command's argument, else the `RUNTIME_PLUGINS_DIR` environment variable, else
 `znode.local.json`.
@@ -372,6 +487,10 @@ folder after an upgrade; delete them by hand if you need the space.
 | `installed …` but still no change | the package went to another plugin folder than the running webstore reads: compare `znode.local.json` with the webstore's `RUNTIME_PLUGINS_DIR` (`apps/webstore/.env.local` or `.env`) |
 | `MISSING_MESSAGE` for your label | put browser labels under a namespace the page sends, e.g. `Common` |
 | Theme shows for you but not shoppers | expected: enable it in `plugins.json` (step 7) |
+| `<Name> cannot be ejected` | run it in a terminal and answer `y` to create the slot, or `npx znode eject <Name> --slot <area.name>`; `npx znode slot list` shows what exists |
+| `<Name> is an async server component` | a component inside base-components cannot get a slot: eject a client component it renders instead, or the route page it is on (`npx znode eject <Name>Page`) |
+| `no <Name> found` | use the component's name, or for a page its `export default function <Name>` (e.g. `ForgotPasswordPage`, not the URL); `npx znode slot list` shows what exists |
+| Ejected / new slot but the store still shows its own | the slot was created in the store's source: commit it there and rebuild / restart the webstore; check `npx znode slot list` shows it with **In this package** `yes` |
 
 ---
 

package/lib/next-imports.mjs

@@ -130,10 +130,12 @@ function splitStoreImports(code, store) {
 
 // the stand-in for a store module: the store's module itself (loaded before the bundle), its names as rollup's
 // synthetic named exports; a name missing on the module is read from its default (an npm CommonJS package)
-function storeStandIn(key) {
+// (a server part reads the store's server set, __znodeStoreServer: next-modules.server.ts loads it before the bundle)
+function storeStandIn(key, part) {
+  const global = part === "server" ? "__znodeStoreServer" : "__znodeNextClient";
   return [
-    `const loaded = (globalThis.__znodeNextClient || {})[${JSON.stringify(key)}];`,
-    `if (!loaded) throw new Error(${JSON.stringify(`"${key}" was not loaded by the store: the package needs a store with the Generated Store Module Registry`)});`,
+    `const loaded = (globalThis.${global} || {})[${JSON.stringify(key)}];`,
+    `if (!loaded) throw new Error(${JSON.stringify(`"${key}" was not loaded by the store: the package needs a store with the Generated Store Module Registry${part === "server" ? " (server registry)" : ""}`)});`,
     `export const __store = new Proxy(loaded, { get: (module, name) => (name in module ? module[name] : module.default?.[name]) });`,
     `export default loaded.default;`,
   ].join("\n");
@@ -325,14 +327,24 @@ export function znodeNext({ part, prefix, outDir, fonts, store, storeImports = [
     resolveId(source) {
       if (MODULES[source]) return VIRTUAL + source;
       if (SHARED_PACKAGES.has(source) || source.startsWith("@znode/") || source.startsWith(STORE_FILE)) {
-        if (part === "server") this.error(`"${source}" is a store module for browser parts (src/browser.tsx), not server parts`);
         if (!store) this.error(`"${source}" is a store module: connect the store first (npm run link-store -- <store repo>), which writes tsconfig.store.json`);
-        if (!store.registry) this.error(`"${source}": the store at ${store.root} has no packages/extensions/store-module-registry.json (run node scripts/gen-store-module-registry.mjs there, or update the store)`);
+        // a server part imports from the store's server registry (an allow-list: agents, texts and store context, logger,
+        // client modules), a browser part from the client registry
+        const registry = part === "server" ? store.serverRegistry : store.registry;
+        const registryFile = part === "server" ? "store-server-module-registry.json" : "store-module-registry.json";
+        if (!registry)
+          this.error(
+            `"${source}": the store at ${store.root} has no packages/extensions/${registryFile} (run node scripts/gen-store-module-registry.mjs there, or update the store)${part === "server" ? ": a server part can import store modules only from a store with the server registry" : ""}`
+          );
         // a named import was split to the file that defines it (transform); a default or namespace import is the module
         const key = source.startsWith(STORE_FILE) ? source.slice(STORE_FILE.length) : storeKey(source, store);
         if (!key) this.error(`"${source}" is not a store module (no file for it under the store's tsconfig paths)`);
-        if (!store.registry.has(key)) {
-          this.error(`"${source}" (${key}) is not in the store's module registry: it is server-only, or the store's registry is older than this file (regenerate it: node scripts/gen-store-module-registry.mjs in the store repo)`);
+        if (!registry.has(key)) {
+          this.error(
+            part === "server"
+              ? `${source.startsWith(STORE_FILE) ? `store module ${key} (a named import's defining file)` : `"${source}" (${key})`} is not available to a package's server part: the store's server registry allows agents, texts and store context (getResourceMessages, fetchMessages, getPortalHeader), the server logger and client modules, not session, cookie, token, cache or API-client internals (or the store's registry is older: node scripts/gen-store-module-registry.mjs in the store repo)`
+              : `"${source}" (${key}) is not in the store's module registry: it is server-only, or the store's registry is older than this file (regenerate it: node scripts/gen-store-module-registry.mjs in the store repo)`
+          );
         }
         if (!storeImports.includes(key)) storeImports.push(key);
         return VIRTUAL + STORE + key;
@@ -346,12 +358,12 @@ export function znodeNext({ part, prefix, outDir, fonts, store, storeImports = [
     load(id) {
       if (!id.startsWith(VIRTUAL)) return null;
       const name = id.slice(VIRTUAL.length);
-      if (name.startsWith(STORE)) return { code: storeStandIn(name.slice(STORE.length)), syntheticNamedExports: "__store" };
+      if (name.startsWith(STORE)) return { code: storeStandIn(name.slice(STORE.length), part), syntheticNamedExports: "__store" };
       return standIn(name, part);
     },
     async transform(code, id) {
       if (id.startsWith(VIRTUAL)) return null;
-      const split = part === "browser" && store && /from\s*["']@znode\//.test(code) ? splitStoreImports(code, store) : code;
+      const split = store && /from\s*["']@znode\//.test(code) ? splitStoreImports(code, store) : code;
       const output = await transformFonts(split, id, { prefix, outDir, fonts });
       if (output === null) return split === code ? null : { code: split, map: null };
       return { code: output, map: null };

package/lib/znode-package.mjs

@@ -17,7 +17,8 @@
 //   znode link-store <storeRepoDir> [dir]       the store's real types: writes tsconfig.store.json (see README)
 //   znode eject   [<Name>] [--force]            in a package folder: list the store components that can be ejected, or
 //                                                copy one into src/components/ and register it in its slot
-//                                                (<Name> is the component or its slot name)
+//                                                (<Name> is the component or its slot name); no slot yet: it asks
+//                                                to create one in the base store first (--slot <area.name> / --yes)
 //   znode create-slot <Component> <area.name> [--dry-run] [--file <f>]   a slot around a store component, written into
 //                                                the linked store's source (base developers; review and commit there)
 //   znode slot list [<filter>] [--json]          every slot the linked store renders, what it hands over, what can be
@@ -40,8 +41,9 @@
 //                       (attribute: the value comes from a Znode global attribute, "Code" for the store's, or
 //                        { "code": "...", "levels": ["store", "account", "user"] }; the most specific level wins)
 //   marketplace: "license", "keywords", "homepage", "compatibility": { "webstore": ">=10.0.0" },
-//   "permissions": ["routes", "cartHooks", "overrides", "znodeApi", "externalNetwork", "uploads"]   (what it does beyond UI;
-//                  "uploads": its routes take files, multipart/form-data up to RUNTIME_PLUGIN_UPLOAD_BYTES)
+//   "permissions": ["routes", "cartHooks", "overrides", "znodeApi", "externalNetwork", "uploads", "storeServer"]   (what it does beyond UI;
+//                  "uploads": its routes take files, multipart/form-data up to RUNTIME_PLUGIN_UPLOAD_BYTES;
+//                  "storeServer": its server part imports store modules from the store's server registry)
 //   "sandbox": true   (its server part runs in a separate, permission-limited Node process: routes and overrides only)
 // }
 import fs from "node:fs";
@@ -78,7 +80,9 @@ const MAX_BYTES = 10 * 1024 * 1024;
 const SETTING_TYPES = ["string", "number", "boolean", "list", "json", "object", "array"];
 const ATTRIBUTE_LEVELS = ["store", "account", "user"];
 const ATTRIBUTE_CODE = /^[A-Za-z][A-Za-z0-9_]{1,99}$/;
-const PERMISSIONS = ["routes", "cartHooks", "overrides", "znodeApi", "externalNetwork", "uploads"];
+// storeServer: its server part imports store modules (agents, texts and store context, logger, client components) from the
+// store's server registry, e.g. a page ejected with `znode eject <Page>`; not in a sandboxed package
+const PERMISSIONS = ["routes", "cartHooks", "overrides", "znodeApi", "externalNetwork", "uploads", "storeServer"];
 
 const fail = (message) => {
   console.error(`znode-package: ${message}`);
@@ -208,7 +212,10 @@ function linkedStore(dir) {
   const root = path.resolve(dir, compilerOptions.baseUrl);
   const registryFile = path.join(root, "packages/extensions/store-module-registry.json");
   const registry = fs.existsSync(registryFile) ? readJson(registryFile).modules : null;
-  return { root, paths: compilerOptions.paths || {}, registry };
+  // the store modules a package's server part may import (an allow-list, permission storeServer)
+  const serverRegistryFile = path.join(root, "packages/extensions/store-server-module-registry.json");
+  const serverRegistry = fs.existsSync(serverRegistryFile) ? readJson(serverRegistryFile).modules : null;
+  return { root, paths: compilerOptions.paths || {}, registry, serverRegistry };
 }
 
 function build(target) {
@@ -225,6 +232,8 @@ function build(target) {
   const fonts = [];
   // the store modules its browser part imports (Generated Store Module Registry keys), for the store to load first
   const storeImports = [];
+  // the store modules its server part imports (the store's server registry, permission storeServer)
+  const serverStoreImports = [];
   const store = linkedStore(dir);
   // A package with its own tsconfig.json (extending the store's tsconfig.base.json) is checked against the store's real
   // types (every @znode alias, no declarations to write), then compiled file by file without type information, JSX as
@@ -281,6 +290,7 @@ function build(target) {
         `const storeImports = [];`,
         `const store = ${JSON.stringify(store)};`,
         `if (store?.registry) store.registry = new Set(store.registry);`,
+        `if (store?.serverRegistry) store.serverRegistry = new Set(store.serverRegistry);`,
         `export default {`,
         `  input: ${JSON.stringify(compiled)},`,
         `  output: { file: ${JSON.stringify(path.join(out, target))}, format: "es", sourcemap: true },`,
@@ -293,7 +303,8 @@ function build(target) {
     );
     execFileSync(process.execPath, [ROLLUP(), "--config", config, "--silent"], { stdio: "inherit" });
     if (fs.existsSync(fontsFile)) fonts.push(...JSON.parse(fs.readFileSync(fontsFile, "utf8")));
-    if (fs.existsSync(storeImportsFile)) storeImports.push(...JSON.parse(fs.readFileSync(storeImportsFile, "utf8")));
+    // the server part's store imports (server registry) are loaded by the store's server, the browser part's by the browser
+    if (fs.existsSync(storeImportsFile)) (part === "server" ? serverStoreImports : storeImports).push(...JSON.parse(fs.readFileSync(storeImportsFile, "utf8")));
     files[part] = target;
   }
   fs.rmSync(tmp, { recursive: true, force: true });
@@ -335,7 +346,19 @@ function build(target) {
     );
   }
   const { build: _build, styles: _styles, assets: _assets, dedupeStyles: _dedupe, ...rest } = manifest;
-  fs.writeFileSync(path.join(out, MANIFEST), JSON.stringify({ ...rest, files, ...(storeImports.length ? { storeImports: [...new Set(storeImports)].sort() } : {}) }, null, 2) + "\n");
+  fs.writeFileSync(
+    path.join(out, MANIFEST),
+    JSON.stringify(
+      {
+        ...rest,
+        files,
+        ...(storeImports.length ? { storeImports: [...new Set(storeImports)].sort() } : {}),
+        ...(serverStoreImports.length ? { serverStoreImports: [...new Set(serverStoreImports)].sort() } : {}),
+      },
+      null,
+      2
+    ) + "\n"
+  );
   console.log(`built ${manifest.kind} ${manifest.name}@${manifest.version}: ${fs.readdirSync(out).length} files`);
   return { manifest, out };
 }
@@ -486,6 +509,8 @@ function install(source, storeDir) {
     ...(manifest.widgets?.length ? { widgets: manifest.widgets } : {}),
     // the store modules its browser bundle imports: the store loads them first (Generated Store Module Registry)
     ...(Array.isArray(manifest.storeImports) && manifest.storeImports.length ? { storeImports: manifest.storeImports.map(String) } : {}),
+    // and the store modules its server bundle imports (server registry): the store's server loads them first
+    ...(Array.isArray(manifest.serverStoreImports) && manifest.serverStoreImports.length ? { serverStoreImports: manifest.serverStoreImports.map(String) } : {}),
     ...(manifest.overrides ? { overrides: manifest.overrides } : {}),
     ...(manifest.serverPages?.length ? { serverPages: manifest.serverPages } : {}),
     ...(manifest.sandbox === true ? { sandbox: true } : {}),
@@ -592,6 +617,8 @@ function check(target) {
   if (/\bznode\s*\(/.test(server)) used.add("znodeApi");
   if (/\bfetch\s*\(|\bhttps?\.request\s*\(/.test(server)) used.add("externalNetwork");
   if (/\.files\b/.test(server)) used.add("uploads");
+  if (/^\s*import\s+(?!type\b)[^;]*?from\s*["']@znode\/(?!types\/)/m.test(server)) used.add("storeServer");
+  if (used.has("storeServer") && manifest.sandbox === true) errors.push(`its server part imports store modules ("storeServer"), which a sandboxed package cannot: its routes run in their own process`);
   const declared = new Set(manifest.permissions || []);
   for (const item of used) if (!declared.has(item)) errors.push(`uses "${item}" without declaring it in "permissions"`);
   for (const item of declared) if (!used.has(item)) warnings.push(`declares "${item}" but no code uses it (the review asks why)`);
@@ -771,7 +798,163 @@ function storeAlias(store, absolute) {
   return best ? best.alias + target.slice(best.prefix.length) : null;
 }
 
-function eject(name, force) {
+// a question on the terminal (only asked when stdin is a terminal); one line reader for the whole run, so answers
+// typed (or piped) ahead are kept for the next question
+let answers = null;
+async function ask(question) {
+  if (!answers) {
+    const { createInterface } = await import("node:readline");
+    answers = createInterface({ input: process.stdin })[Symbol.asyncIterator]();
+  }
+  process.stdout.write(question);
+  const { value, done } = await answers.next();
+  if (done) fail("no answer (input closed)");
+  return value.trim();
+}
+
+// a slot name suggested for a component: ForgotPasswordPage -> forgotPassword.page (a page), AddToCart -> add.toCart
+const suggestSlot = (name) => {
+  const words = name.match(/[A-Z][a-z0-9]*/g) || [name];
+  if (words.length > 1 && /^(Page|Layout)$/.test(words[words.length - 1]))
+    return `${words[0].toLowerCase()}${words.slice(1, -1).join("")}.${words[words.length - 1].toLowerCase()}`;
+  const [first, ...rest] = words;
+  return rest.length ? `${first.toLowerCase()}.${rest[0].toLowerCase()}${rest.slice(1).join("")}` : `${first.toLowerCase()}.main`;
+};
+
+// eject a store page (a server slot around a route's content): not a copy of the route (its server code, agents and
+// data stay the store's), a server component of the package's own in src/server/pages/<Page>.tsx, registered under the
+// slot in src/server.tsx, that renders the store's page content (children) to start with
+// A whole route (withRuntimeServerPage): a COPY of the route instead, as component eject copies a component: the route's
+// file with its function as `export async function <Page>(props, context)` (props: the route's params and searchParams,
+// children: the store's page), its imports as the store's aliases, which a server part imports from the store's server
+// registry (permission storeServer, added to znode-package.json).
+function ejectRouteCopy(project, s, store) {
+  const name = s.page;
+  const storeFile = path.join(store.root, s.files[0]);
+  let text = fs.readFileSync(storeFile, "utf8");
+  // the copy is the plain page: no wrapper (the slot is what puts it in place)
+  text = text.replace(/^import\s*\{\s*withRuntimeServerPage\s*\}\s*from\s*["'][^"']+["'];?[ \t]*\r?\n/m, "");
+  text = text.replace(/(?:^\/\/ runtime packages render the whole page instead[^\n]*\n(?:\/\/[^\n]*\n)*)?^export\s+default\s+withRuntimeServerPage\([^)]*\);?[ \t]*\r?\n?/m, "");
+  text = text.replace(new RegExp(`^(async\\s+)?function\\s+${s.base}\\s*\\(`, "m"), (whole, isAsync) => `export ${isAsync || ""}function ${name}(`);
+  // relative imports become the store's aliases (the package lives elsewhere)
+  const warnings = [];
+  text = text.replace(/((?:from|import)\s*\(?\s*["'])(\.{1,2}\/[^"']+)(["'])/g, (whole, before, spec, after) => {
+    const alias = storeAlias(store, path.resolve(path.dirname(storeFile), spec));
+    if (!alias) {
+      warnings.push(`import ${spec}: no store alias for it; change it by hand`);
+      return whole;
+    }
+    return `${before}${alias}${after}`;
+  });
+  const header =
+    `// Ejected from the store: ${s.files[0]} (${new Date().toISOString().slice(0, 10)}), with \`znode eject ${name}\`: a copy of the\n` +
+    `// whole route. The store renders it instead of its own page through the server slot "${s.name}" (src/server.tsx\n` +
+    `// serverSlots), on the server only. props: the route's params and searchParams, and children (the store's page);\n` +
+    `// context (second argument): store, settings. Its @znode imports come from the store's server registry (permission\n` +
+    `// storeServer): agents, texts and store context, the server logger, client components. It is yours now: the store's\n` +
+    `// later changes to this page do not reach it, so compare it with ${s.files[0]} after a store upgrade.\n`;
+  text = header + text;
+
+  // what the store's server registry does not allow: named now, the build stops on it too
+  if (store.serverRegistry) {
+    const allowed = new Set(store.serverRegistry);
+    for (const m of text.matchAll(/^\s*import\s+(?!type\b)[^;]*?from\s*["'](@znode\/[^"']+)["']/gm)) {
+      if (m[1].startsWith("@znode/types/")) continue;
+      const file = (() => {
+        for (const [alias, [target]] of Object.entries(store.paths)) {
+          if (alias.endsWith("/*") && m[1].startsWith(alias.slice(0, -1))) return target.replace("*", m[1].slice(alias.length - 1));
+          if (alias === m[1]) return target;
+        }
+        return null;
+      })();
+      const key = file && file.replace(/\.(tsx?|jsx?)$/, "").replace(/\/index$/, "");
+      // a barrel (utils/server's index, a component folder) is checked name by name at build time, each name from the file
+      // that defines it; only a module that is not a barrel and not allowed is named here
+      const barrel = /\/index\.tsx?$/.test(file || "") || [...allowed].some((allowedKey) => allowedKey.startsWith(`${key}/`));
+      if (key && !allowed.has(key) && !barrel) warnings.push(`${m[1]}: not in the store's server registry; the build will stop on it (use an agent or context.znode instead)`);
+    }
+  } else warnings.push("the linked store has no server registry (packages/extensions/store-server-module-registry.json): update the store, or the build stops on the copy's @znode imports");
+
+  // the permission it needs
+  const manifestFile = path.join(project, MANIFEST);
+  const manifest = readJson(manifestFile);
+  if (!(manifest.permissions || []).includes("storeServer")) {
+    manifest.permissions = [...(manifest.permissions || []), "storeServer"];
+    fs.writeFileSync(manifestFile, JSON.stringify(manifest, null, 2) + "\n");
+    console.log(`added "storeServer" to "permissions" in ${MANIFEST} (its server part imports store modules)`);
+  }
+  return { text, warnings };
+}
+
+function ejectServerSlot(project, s, force, store) {
+  const name = s.page;
+  const out = path.join(project, "src", "server", "pages", `${name}.tsx`);
+  if (fs.existsSync(out) && !force) fail(`${path.relative(project, out)} exists: delete it or run znode eject ${name} --force`);
+  if (s.route) {
+    const { text, warnings } = ejectRouteCopy(project, s, store);
+    fs.mkdirSync(path.dirname(out), { recursive: true });
+    fs.writeFileSync(out, text);
+    console.log(`ejected ${name} (a copy of ${s.files[0]}, server slot "${s.name}") -> ${path.relative(project, out)}`);
+    registerServerSlot(project, s, name);
+    for (const warning of warnings) console.log(`warning ${warning}`);
+    console.log(`\nNext: edit ${path.relative(project, out)}, then npm run build (it names any store import a server part cannot use) and npm run dev.`);
+    return;
+  }
+  const route = s.components[0] || name;
+  const text =
+    `import type { ReactNode } from "react";\n` +
+    `import type { IServerSlotContext } from "znode-plugin/types/extension-api";\n\n` +
+    `// Ejected with \`znode eject ${name}\` (${new Date().toISOString().slice(0, 10)}): the store's page ${route}, through its server slot\n` +
+    `// "${s.name}" (src/server.tsx serverSlots). It runs on the store's server only: it may be async and fetch data, its\n` +
+    `// output is in the page's HTML, and it has no hooks or browser code (put interactive parts in a browser slot).\n` +
+    `// children is the store's page content (${s.files[0]}): keep it, wrap it, or leave it out and render your own page.\n` +
+    `export async function ${name}(props: { children?: ReactNode }, context: IServerSlotContext) {\n` +
+    `  void context; // context.store.code, context.settings (this package's settings)\n` +
+    `  return (\n` +
+    `    <div data-page="${s.name}">\n` +
+    `      {props.children}\n` +
+    `    </div>\n` +
+    `  );\n` +
+    `}\n`;
+  fs.mkdirSync(path.dirname(out), { recursive: true });
+  fs.writeFileSync(out, text);
+  console.log(`ejected ${name} (server slot "${s.name}") -> ${path.relative(project, out)}`);
+
+  registerServerSlot(project, s, name);
+  console.log(`\nNext: edit ${path.relative(project, out)}, then npm run build and npm run dev and open the page.`);
+}
+
+// src/server.tsx: import { <Page> as Ejected<Page> } from "./server/pages/<Page>.js" and serverSlots: { "<slot>": … }
+function registerServerSlot(project, s, name) {
+  const server = path.join(project, "src", "server.tsx");
+  const local = `Ejected${name}`;
+  const importLine = `import { ${name} as ${local} } from "./server/pages/${name}.js";`;
+  const entry = `"${s.name}": ${local},`;
+  if (!fs.existsSync(server)) {
+    console.log(`warning src/server.tsx not found: register it yourself: ${importLine}  and  serverSlots: { ${entry} }`);
+    return;
+  }
+  let source = fs.readFileSync(server, "utf8");
+  if (new RegExp(`["']${s.name.replace(/\./g, "\\.")}["']\\s*:`).test(source)) {
+    console.log(`warning src/server.tsx already fills "${s.name}": point it at ${local} (${importLine}) yourself`);
+    return;
+  }
+  if (/serverSlots\s*:\s*\{/.test(source)) source = source.replace(/serverSlots\s*:\s*\{/, `serverSlots: {\n    // ejected (znode eject ${name}): the store renders this around / instead of its page\n    ${entry}`);
+  else if (/apiVersion\s*:\s*\d+\s*,/.test(source)) source = source.replace(/(apiVersion\s*:\s*\d+\s*,)/, `$1\n  serverSlots: {\n    ${entry}\n  },`);
+  else {
+    console.log(`warning no "serverSlots" in src/server.tsx: add ${importLine} and serverSlots: { ${entry} }`);
+    return;
+  }
+  if (!source.includes(importLine)) {
+    const imports = [...source.matchAll(/^import [^;]+;[ \t]*$/gm)];
+    const at = imports.length ? imports[imports.length - 1].index + imports[imports.length - 1][0].length : 0;
+    source = source.slice(0, at) + `\n${importLine}` + source.slice(at);
+  }
+  fs.writeFileSync(server, source);
+  console.log(`registered "${s.name}": ${local} in src/server.tsx (serverSlots)`);
+}
+
+async function eject(name, force, { slot: slotArg, yes } = {}) {
   const project = path.resolve(".");
   if (!fs.existsSync(path.join(project, MANIFEST))) fail(`run znode eject in a package folder (the one with ${MANIFEST})`);
   const store = linkedStore(project);
@@ -780,16 +963,61 @@ function eject(name, force) {
   if (!name || name === "--list") {
     console.log("Store components a package can eject (the slot that takes your copy):\n");
     for (const c of components) console.log(`  ${c.name.padEnd(34)} ${c.slot.padEnd(26)} ${path.relative(store.root, c.file).split(path.sep).join("/")}`);
-    console.log("\nznode eject <Name>   copies one into src/components/ and registers it in src/browser.tsx");
+    const pages = storeSlots(store.root).filter((s) => s.page);
+    if (pages.length) {
+      console.log("\nStore pages (server slot: a whole route is copied, a slot inside a page gives a starter; src/server/pages/):\n");
+      for (const s of pages) console.log(`  ${s.page.padEnd(34)} ${s.name.padEnd(26)} ${s.route ? "whole route, copy " : "inside the page    "} ${s.files[0]}`);
+    }
+    console.log("\nznode eject <Name>   copies one into src/components/ (a page into src/server/pages/) and registers it");
     return;
   }
-  const c = components.find((item) => item.name.toLowerCase() === name.toLowerCase() || item.slot.toLowerCase() === name.toLowerCase());
-  if (!c)
-    fail(
-      `${name} cannot be ejected: no store component with that name or slot hands itself over to a slot.\n` +
-        `  znode eject                      lists the ones that can (component name or slot name both work)\n` +
-        `  znode create-slot ${/^[A-Z]/.test(name) ? name : "<Component>"} <area.name>   creates a slot around a store component in the base (edits the linked store's source)`
-    );
+  const find = (list) => list.find((item) => item.name.toLowerCase() === name.toLowerCase() || item.slot.toLowerCase() === name.toLowerCase());
+  // a route page with a server slot: around the whole route (a copy of the route), else inside it (a starter)
+  const findServer = () => {
+    const pages = storeSlots(store.root).filter((s) => s.page && [s.page.toLowerCase(), s.name.toLowerCase()].includes(name.toLowerCase()));
+    return pages.find((s) => s.route) || pages[0];
+  };
+  let c = find(components);
+  if (!c) {
+    const server = findServer();
+    if (server) return ejectServerSlot(project, server, force, store);
+  }
+  if (!c) {
+    // no slot hands this component over yet: offer to create one in the base store (what znode create-slot does), then eject
+    const isComponent = /^[A-Z]\w*$/.test(name);
+    const interactive = Boolean(process.stdin.isTTY && process.stdout.isTTY);
+    const hint =
+      `  znode eject                                   lists the ones that can (component name or slot name both work)\n` +
+      `  znode eject ${isComponent ? name : "<Component>"} --slot <area.name>   creates the slot in the base store first, then ejects\n` +
+      `  znode create-slot ${isComponent ? name : "<Component>"} <area.name>     only creates the slot (edits the linked store's source)`;
+    if (!isComponent || (!interactive && !slotArg)) fail(`${name} cannot be ejected: no store component with that name or slot hands itself over to a slot.\n${hint}`);
+    console.log(`${name} has no slot yet, so it cannot be ejected.`);
+    console.log(`A slot can be created around it in the base store (${store.root}): it edits the store's source, nothing is committed.`);
+    if (!yes && !slotArg) {
+      const answer = await ask(`Create a slot for ${name} in the base store now? [y/N] `);
+      if (!/^y(es)?$/i.test(answer)) fail(`not created.\n${hint}`);
+    }
+    let slot = slotArg;
+    while (!slot) {
+      const suggested = suggestSlot(name);
+      slot = (await ask(`Slot name (area.name) [${suggested}]: `)) || suggested;
+      if (!SLOT_NAME.test(slot)) {
+        console.log(`  "${slot}" is not a slot name: area.name in camelCase, e.g. product.details`);
+        slot = "";
+      }
+    }
+    createSlot(name, slot, { fromEject: true });
+    c = find(ejectableComponents(store.root));
+    if (!c) {
+      const server = findServer();
+      if (server) {
+        console.log("");
+        return ejectServerSlot(project, server, force, store);
+      }
+      fail(`the slot "${slot}" was created, but ${name} is still not found as ejectable; check the store diff`);
+    }
+    console.log("");
+  }
 
   const out = path.join(project, "src", "components", `${c.name}.tsx`);
   if (fs.existsSync(out) && !force) fail(`${path.relative(project, out)} exists: delete it or run znode eject ${c.name} --force`);
@@ -814,6 +1042,8 @@ function eject(name, force) {
   // the copy is the plain component: no runtime wrapper (the slot is what puts it in place)
   text = text.replace(new RegExp(`^.*import\\s*\\{[^}]*\\b(?:withRuntimeWrapper|${c.wrapper})\\b[^}]*\\}\\s*from\\s*["'][^"']+["'];?\\s*\\n`, "gm"), "");
   text = text.replace(new RegExp(`withRuntimeWrapper\\(\\s*${c.wrapper}\\s*,\\s*${c.base}\\s*,\\s*"${c.name}"\\s*\\)`), c.base);
+  // and none of the store's comments about that wrapper
+  text = text.replace(/^\/\/ runtime packages render around it\b.*\n/gm, "");
   const storeFile = path.relative(store.root, c.file).split(path.sep).join("/");
   const header = `// Ejected from the store: ${storeFile} (${new Date().toISOString().slice(0, 10)}), with \`znode eject ${c.name}\`.\n// The store renders this copy instead of its own through the slot "${c.slot}" (src/browser.tsx). It is yours now: the\n// store's later changes to ${c.name} do not reach it, so compare it with the store's file after a store upgrade.\n`;
   text = text.startsWith('"use client"') || text.startsWith("'use client'") ? text.replace(/^(["']use client["'];?\s*\n)/, `$1${header}`) : header + text;
@@ -863,7 +1093,7 @@ function eject(name, force) {
       warnings.push(`src/browser.tsx already fills "${c.slot}": point it at ${local} (${importLine}) yourself`);
     } else if (/slots\s*:\s*\{/.test(source)) {
       if (!source.includes(importLine)) {
-        const imports = [...source.matchAll(/^import .*;\s*$/gm)];
+        const imports = [...source.matchAll(/^import [^;]+;[ \t]*$/gm)];
         const at = imports.length ? imports[imports.length - 1].index + imports[imports.length - 1][0].length : 0;
         source = source.slice(0, at) + `\n${importLine}` + source.slice(at);
       }
@@ -902,7 +1132,71 @@ function storeSourceFiles(root) {
   return files;
 }
 
-function createSlot(name, slot, { dryRun, file: chosen }) {
+// the store's route pages and layouts (apps/<app>/src/app/**/page.tsx, layout.tsx)
+function storeRoutePages(root) {
+  const files = [];
+  const walk = (dir) => {
+    for (const entry of fs.readdirSync(dir, { withFileTypes: true })) {
+      const file = path.join(dir, entry.name);
+      if (entry.isDirectory()) {
+        if (entry.name !== "node_modules") walk(file);
+      } else if (/^(page|layout)\.tsx$/.test(entry.name)) files.push(file);
+    }
+  };
+  const apps = path.join(root, "apps");
+  if (fs.existsSync(apps)) for (const app of fs.readdirSync(apps)) if (fs.existsSync(path.join(apps, app, "src/app"))) walk(path.join(apps, app, "src/app"));
+  return files;
+}
+
+// the ")" that closes the "(" at index open (parentheses in the JSX's text are expected to be balanced)
+function closingParen(text, open) {
+  let depth = 0;
+  for (let i = open; i < text.length; i++) {
+    if (text[i] === "(") depth++;
+    else if (text[i] === ")" && --depth === 0) return i;
+  }
+  return -1;
+}
+
+// the ">" that ends the JSX opening tag starting at index start (attributes in {…} may contain ">", e.g. "=>")
+function openTagEnd(text, start) {
+  let depth = 0;
+  for (let i = start; i < text.length; i++) {
+    if (text[i] === "{") depth++;
+    else if (text[i] === "}") depth--;
+    else if (text[i] === ">" && depth === 0) return i;
+  }
+  return -1;
+}
+
+// A route page gets a server slot around the WHOLE route: its function becomes <Name>Base and the default export is
+// withRuntimeServerPage("<slot>", <Name>Base) (packages/extensions/src/with-runtime-server-page.tsx), the server version of
+// withRuntimeWrapper. A package that fills the slot (src/server.tsx serverSlots) gets the route's props (params,
+// searchParams) and the store's page as children, and renders the page instead: `znode eject <Name>` gives it a copy of
+// the route to start from. The route's data loading, texts and metadata stay the store's when no package fills it.
+const SERVER_PAGE_WRAPPER = "@znode/extensions/with-runtime-server-page";
+function routeServerSlot(file, name, slot, rel) {
+  const before = fs.readFileSync(file, "utf8");
+  if (/^\s*["']use client["']/.test(before)) fail(`${rel(file)} is a client page ("use client"): a server slot cannot go there; add a <RuntimeSlot> by hand`);
+  const wrapped = before.match(/withRuntimeServerPage\(\s*["']([\w.]+)["']/);
+  if (wrapped) fail(`${name} (${rel(file)}) already has the server slot "${wrapped[1]}" around the whole route: fill or eject that one (npx znode eject ${name})`);
+  const definition = new RegExp(`export\\s+default\\s+(async\\s+)?function\\s+${name}\\s*\\(`);
+  const match = before.match(definition);
+  if (!match) fail(`${rel(file)}: no "export default function ${name}(" to wrap`);
+  const baseName = `${name}Base`;
+  if (new RegExp(`\\b${baseName}\\b`).test(before)) fail(`${rel(file)} already has a ${baseName}: wrap it by hand`);
+  let after = before.replace(definition, `${match[1] || ""}function ${baseName}(`);
+  after =
+    after.trimEnd() +
+    `\n\n// runtime packages render the whole page instead through the server slot "${slot}" (znode create-slot; src/server.tsx\n` +
+    `// serverSlots); with none, it renders as it is\nexport default withRuntimeServerPage("${slot}", ${baseName});\n`;
+  const imports = [...after.matchAll(/^import [^;]+;[ \t]*$/gm)];
+  const at = imports.length ? imports[imports.length - 1].index + imports[imports.length - 1][0].length : 0;
+  after = after.slice(0, at) + `${at ? "\n" : ""}import { withRuntimeServerPage } from "${SERVER_PAGE_WRAPPER}";${at ? "" : "\n"}` + after.slice(at);
+  return { file, before, after };
+}
+
+function createSlot(name, slot, { dryRun, file: chosen, fromEject } = {}) {
   const usage = "usage: znode create-slot <Component> <area.name> [--dry-run] [--file <store file>]   e.g. znode create-slot ProductBasicInfo product.basicInfo";
   if (!name || !slot) fail(usage);
   if (!/^[A-Z]\w*$/.test(name)) fail(`"${name}" is not a component name (PascalCase, e.g. ProductDetails)\n${usage}`);
@@ -918,6 +1212,7 @@ function createSlot(name, slot, { dryRun, file: chosen }) {
   const wrapperSlots = storeWrapperSlots(root);
   const taken = Object.entries(wrapperSlots).find(([, value]) => value === slot);
   if (taken) fail(`slot "${slot}" already exists (${taken[0]}); znode eject lists what it hands over`);
+  if (storeSlots(root).some((s) => s.name === slot)) fail(`slot "${slot}" already exists in the store (npx znode slot list)`);
   const wrapper = `Runtime${name}`;
   if (wrapperSlots[wrapper] || fs.readdirSync(slotsDir).some((f) => new RegExp(`export\\s+function\\s+${wrapper}\\b`).test(fs.readFileSync(path.join(slotsDir, f), "utf8"))))
     fail(`${wrapper} already exists in ${rel(slotsDir)}: ${name} already has a slot (znode eject lists it)`);
@@ -931,8 +1226,22 @@ function createSlot(name, slot, { dryRun, file: chosen }) {
     if (named.length === 1) candidates = named;
     else fail(`${name} is defined in more than one store file; pick one with --file:\n  ${candidates.map(rel).join("\n  ")}`);
   }
-  if (!candidates.length) fail(`no ${name} component found in packages/base-components/src or packages/page-builder/src (only .tsx components can get a slot)`);
+  if (!candidates.length) {
+    // not a component: a route page (apps/<app>/src/app/**/page.tsx or layout.tsx) whose default export is <name>
+    const pages = storeRoutePages(root).filter((f) => new RegExp(`export\\s+default\\s+(?:async\\s+)?function\\s+${name}\\s*\\(`).test(fs.readFileSync(f, "utf8")));
+    if (pages.length > 1) fail(`${name} is the default export of more than one route; pick one with --file:\n  ${pages.map(rel).join("\n  ")}`);
+    if (!pages.length)
+      fail(
+        `no ${name} found: not a component in packages/base-components/src or packages/page-builder/src, and not the default export of a route page (apps/*/src/app/**/page.tsx or layout.tsx).\n` +
+          `  npx znode slot list shows the slots there are; a page's component name is its "export default function <Name>"`
+      );
+    candidates = pages;
+  }
   const target = candidates[0];
+  const isRoute = /^apps\/[^/]+\/src\/app\//.test(rel(target));
+  let changes;
+  if (isRoute) changes = [routeServerSlot(target, name, slot, rel)];
+  else {
   let source = fs.readFileSync(target, "utf8");
   const def = source.match(DEFINES);
   if (!def) fail(`${rel(target)} does not define ${name} as a function or const component`);
@@ -986,11 +1295,13 @@ function createSlot(name, slot, { dryRun, file: chosen }) {
     `export function ${wrapper}({ children, ...props }: Readonly<Record<string, unknown> & { children?: ReactNode }>) {\n` +
     `  return (\n    <RuntimeSlot name="${slot}" props={props}>\n      {children}\n    </RuntimeSlot>\n  );\n}\n`;
 
-  const changes = [
+  changes = [
     { file: target, before: fs.readFileSync(target, "utf8"), after: source },
     { file: addedFile, before: addedBefore, after: added },
   ];
+  }
   const warnings = [];
+  const where = rel(target).replace(/^packages\/[\w-]+\/src\//, "").replace(/^apps\/[^/]+\/src\/app\/(\[locale\]\/)?/, "app/").replace(/\.tsx$/, "");
 
   // the slot list in the SDK types of the store (packages/extensions/src/types.ts), when it has one
   const typesFile = path.join(root, "packages/extensions/src/types.ts");
@@ -1001,7 +1312,13 @@ function createSlot(name, slot, { dryRun, file: chosen }) {
     if (start >= 0) {
       let end = start + 1;
       while (end < lines.length && /^\s*\/\/\s{3,}/.test(lines[end])) end++;
-      lines.splice(end, 0, `//   ${slot.padEnd(20)} the store's ${name} itself (children)  props: every prop ${name} gets (znode create-slot)`);
+      lines.splice(
+        end,
+        0,
+        isRoute
+          ? `//   ${slot.padEnd(20)} (server slot, src/server.tsx serverSlots) the whole ${where} route (withRuntimeServerPage)  props: params, searchParams; children = the store's page (znode create-slot)`
+          : `//   ${slot.padEnd(20)} the store's ${name} itself (children)  props: every prop ${name} gets (znode create-slot)`
+      );
       changes.push({ file: typesFile, before, after: lines.join("\n") });
     } else warnings.push(`${rel(typesFile)}: no "// Slots (" comment found; add "${slot}" to the slot list yourself`);
   }
@@ -1013,7 +1330,13 @@ function createSlot(name, slot, { dryRun, file: chosen }) {
     let row = lines.findIndex((line) => line.startsWith("| `product.card`"));
     if (row >= 0) {
       while (row + 1 < lines.length && lines[row + 1].startsWith("|")) row++;
-      lines.splice(row + 1, 0, `| \`${slot}\` | \`${wrapper}\` (\`${CREATED_SLOTS_FILE.replace("packages/extensions/src/", "")}\`) | \`${rel(target).replace(/^packages\/[\w-]+\/src\//, "").replace(/\.tsx$/, "")}\` (its children: the component itself) | every ${name} prop; keep \`children\`, wrap it, or render a copy instead (\`znode eject ${name}\`) |`);
+      lines.splice(
+        row + 1,
+        0,
+        isRoute
+          ? `| \`${slot}\` (server slot) | \`withRuntimeServerPage\` (\`with-runtime-server-page.tsx\`) on the route's default export in \`${rel(target)}\` (znode create-slot) | the whole ${where} route (\`${name}\`, its children: the store's page) | the route's props (params, searchParams); context: store, settings; keep \`children\`, wrap it, or render a copy of the page (\`znode eject ${name}\`, permission storeServer) |`
+          : `| \`${slot}\` | \`${wrapper}\` (\`${CREATED_SLOTS_FILE.replace("packages/extensions/src/", "")}\`) | \`${where}\` (its children: the component itself) | every ${name} prop; keep \`children\`, wrap it, or render a copy instead (\`znode eject ${name}\`) |`
+      );
       changes.push({ file: docsFile, before, after: lines.join("\n") });
     } else warnings.push(`${rel(docsFile)}: slot table not found; add a "${slot}" row yourself`);
   }
@@ -1035,11 +1358,18 @@ function createSlot(name, slot, { dryRun, file: chosen }) {
   const registry = path.join(root, "scripts/gen-store-module-registry.mjs");
   if (fs.existsSync(registry)) spawnSync(process.execPath, [registry], { cwd: root, stdio: "inherit" });
   for (const warning of warnings) console.log(`warning ${warning}`);
+  if (fromEject) {
+    console.log(
+      `\nSlot "${slot}" created in the base store's source (nothing committed, .next untouched). Before the store renders it:\n` +
+        `  review the diff in ${root} (git diff), commit it through the store's own flow, rebuild / restart the webstore.`
+    );
+    return;
+  }
   console.log(
     `\nDone (the store's source only: nothing committed, .next untouched). Next:\n` +
       `  1. review the diff in ${root} (git diff) and commit it through the store's own flow (hooks, review: it edits base components)\n` +
       `  2. rebuild / restart the webstore so it renders the slot\n` +
-      `  3. here: npx znode eject ${name}   (or fill "${slot}" in src/browser.tsx with a component of your own)`
+      `  3. here: npx znode eject ${name}   (or fill "${slot}" in ${isRoute ? "src/server.tsx serverSlots" : "src/browser.tsx slots"} with a component of your own)`
   );
 }
 
@@ -1074,10 +1404,9 @@ function storeSlots(root) {
     for (const m of text.matchAll(/<Runtime(Server)?Slot\s+name=["']([\w.]+)["']/g)) {
       const name = m[2];
       const tag = m[1] ? "RuntimeServerSlot" : "RuntimeSlot";
-      const rest = text.slice(m.index + m[0].length, m.index + 2000);
-      const close = rest.indexOf(`</${tag}>`);
-      const next = rest.search(/<Runtime(Server)?Slot\s/);
-      const wraps = close >= 0 && (next < 0 || close < next);
+      // it wraps something unless its tag closes itself (<RuntimeSlot name="…" … />)
+      const tagEnd = openTagEnd(text, m.index);
+      const wraps = tagEnd > 0 && text[tagEnd - 1] !== "/" && text.indexOf(`</${tag}>`, tagEnd) > 0;
       const wrapper = wrappers.filter((w) => w.index < m.index).pop()?.[1];
       const relFile = path.relative(root, file).split(path.sep).join("/");
       const existing = slots.get(name);
@@ -1090,16 +1419,29 @@ function storeSlots(root) {
         ? "app/" + relFile.replace(/^apps\/[^/]+\/src\/app\/(\[locale\]\/)?/, "").replace(/\.tsx$/, "")
         : path.basename(file, ".tsx");
       const around = wrapper ? [...new Set(components[wrapper] || [])] : [where];
+      // a server slot written in a route page wraps that page's content: eject gives the package a starter for it
+      const page = !wrapper && m[1] && wraps && /^apps\//.test(relFile) ? (text.match(/export\s+default\s+(?:async\s+)?function\s+(\w+)/) || [])[1] || null : null;
       slots.set(name, {
         name,
         side: m[1] ? "server" : "browser",
         handsOver: wraps,
         wrapper: wrapper || null,
-        components: around,
-        eject: wrapper && handover[wrapper] === name ? around[0] || null : null,
+        components: page ? [`${page} (${where})`] : around,
+        page,
+        eject: wrapper && handover[wrapper] === name ? around[0] || null : page,
         files: [relFile],
       });
     }
+    // a whole route with its server slot around it: export default withRuntimeServerPage("<slot>", <Page>Base) in a route
+    // file; `znode eject <Page>` copies the route into the package
+    const relFile = path.relative(root, file).split(path.sep).join("/");
+    if (/^apps\/[^/]+\/src\/app\//.test(relFile)) {
+      for (const m of text.matchAll(/export\s+default\s+withRuntimeServerPage\(\s*["']([\w.]+)["']\s*,\s*(\w+)\s*\)/g)) {
+        const page = m[2].replace(/Base$/, "");
+        const where = "app/" + relFile.replace(/^apps\/[^/]+\/src\/app\/(\[locale\]\/)?/, "").replace(/\.tsx$/, "");
+        slots.set(m[1], { name: m[1], side: "server", handsOver: true, wrapper: null, components: [`${page} (${where}, whole route)`], page, route: true, base: m[2], eject: page, files: [relFile] });
+      }
+    }
   }
   return [...slots.values()].sort((a, b) => a.name.localeCompare(b.name));
 }
@@ -1173,7 +1515,10 @@ if (command === "create") {
   process.exit(0);
 }
 if (command === "eject") {
-  eject(args.find((arg, index) => index > 0 && !arg.startsWith("--")), args.includes("--force"));
+  // eject <Name> [--force] [--slot <area.name>] [--yes]: --slot / --yes create a missing slot without asking
+  const slotAt = args.indexOf("--slot");
+  const name = args.find((arg, index) => index > 0 && !arg.startsWith("-") && !(slotAt >= 0 && index === slotAt + 1));
+  await eject(name, args.includes("--force"), { slot: slotAt >= 0 ? args[slotAt + 1] : undefined, yes: args.includes("--yes") || args.includes("-y") });
   process.exit(0);
 }
 if (command === "link-store") {

package/package.json

@@ -1,9 +1,14 @@
 {
   "name": "znode-plugin",
-  "version": "0.1.7",
+  "version": "0.1.9",
   "description": "Build, check, pack and deploy Znode runtime plugins and themes: the SDK behind every create-znode-plugin project.",
   "license": "UNLICENSED",
   "type": "module",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/azharuddin-mulla-amla/znode-plugin-npm-registry.git",
+    "directory": "packages/znode-plugin"
+  },
   "bin": {
     "znode": "lib/znode-package.mjs"
   },