@objectstack/cli 4.0.5 → 4.1.0

package/dist/commands/serve.js

@@ -35,7 +35,7 @@ const getAvailablePort = async (startPort) => {
     return port;
 };
 export default class Serve extends Command {
-    static description = 'Start ObjectStack server with plugins from configuration';
+    static description = 'Start ObjectStack server. Reads `objectstack.config.ts` if present; otherwise falls back to `dist/objectstack.json` (or OS_ARTIFACT_PATH, including http(s):// URLs) as a portable artifact.';
     static args = {
         config: Args.string({ description: 'Configuration file path', required: false, default: 'objectstack.config.ts' }),
     };
@@ -43,6 +43,11 @@ export default class Serve extends Command {
         port: Flags.string({ char: 'p', description: 'Server port', default: process.env.PORT ?? '3000' }),
         dev: Flags.boolean({ description: 'Run in development mode (load devPlugins)' }),
         ui: Flags.boolean({ description: 'Enable Studio UI at /_studio/ (default: true)', default: true, allowNo: true }),
+        console: Flags.boolean({
+            description: 'Mount the Console UI at /_console/ when the package is installed (default: true). When disabled, Studio claims the root redirect.',
+            default: true,
+            allowNo: true,
+        }),
         server: Flags.boolean({ description: 'Start HTTP server plugin', default: true, allowNo: true }),
         prebuilt: Flags.boolean({ description: 'Skip esbuild/bundle-require — load config as native ESM (production mode)', default: false }),
         preset: Flags.string({
@@ -50,6 +55,21 @@ export default class Serve extends Command {
             options: ['minimal', 'default', 'full'],
         }),
     };
+    /**
+     * Capabilities auto-added to every app's `requires` for every preset
+     * EXCEPT `minimal`. These form the foundation that every server-side
+     * runtime expects to exist (background work, settings persistence,
+     * transactional mail, file uploads). Apps may still list these in
+     * `requires:` explicitly — duplicates are de-duped.
+     *
+     * Opt out: `objectstack serve --preset minimal`.
+     *
+     * Mirrored on hosted objectos per-project kernels by
+     * `mountDefaultProjectPlugins()` in `@objectstack/service-cloud`.
+     */
+    static ALWAYS_ON_CAPABILITIES = Object.freeze([
+        'queue', 'job', 'cache', 'settings', 'email', 'storage',
+    ]);
     /**
      * Auto-registered plugin tiers. Plugins explicitly listed in
      * `config.plugins` are always loaded — tiers only gate the optional
@@ -62,6 +82,14 @@ export default class Serve extends Command {
     };
     async run() {
         const { args, flags } = await this.parse(Serve);
+        // When --dev is passed, set NODE_ENV early so any runtime modules
+        // imported below (and any deps that branch on NODE_ENV at import
+        // time) see development mode. We deliberately do NOT inherit
+        // NODE_ENV from the parent `os dev` spawn — see the note in
+        // commands/dev.ts for why.
+        if (flags.dev && !process.env.NODE_ENV) {
+            process.env.NODE_ENV = 'development';
+        }
         let port = parseInt(flags.port);
         try {
             const availablePort = await getAvailablePort(port);
@@ -80,14 +108,36 @@ export default class Serve extends Command {
         const isDev = flags.dev || process.env.NODE_ENV === 'development';
         const absolutePath = path.resolve(process.cwd(), args.config);
         const relativeConfig = path.relative(process.cwd(), absolutePath);
-        if (!fs.existsSync(absolutePath)) {
-            printError(`Configuration file not found: ${absolutePath}`);
-            console.log(chalk.dim('  Hint: Run `objectstack init` to create a new project'));
-            this.exit(1);
+        // ── Artifact-first fallback ──────────────────────────────────────
+        // If the user did not author an `objectstack.config.ts`, but a
+        // compiled artifact is reachable (explicit OS_ARTIFACT_PATH —
+        // including http(s):// URLs — or the canonical
+        // `<cwd>/dist/objectstack.json`), boot from that artifact alone.
+        // This is the same capability previously hard-coded in
+        // `apps/objectos/objectstack.config.ts`, lifted into the framework
+        // so any project can `objectstack start` against just a
+        // `dist/objectstack.json`.
+        const configMissing = !fs.existsSync(absolutePath);
+        let useArtifactFallback = false;
+        if (configMissing) {
+            const { resolveDefaultArtifactPath } = await import('@objectstack/runtime');
+            const artifactSource = resolveDefaultArtifactPath();
+            if (!artifactSource) {
+                printError(`Configuration file not found: ${absolutePath}`);
+                console.log(chalk.dim('  Hint: Run `objectstack init` to create a new project,'));
+                console.log(chalk.dim('        or run `objectstack build` first, or set OS_ARTIFACT_PATH.'));
+                this.exit(1);
+            }
+            useArtifactFallback = true;
         }
         // Quiet loading — only show a single spinner line
         console.log('');
-        console.log(chalk.dim(`  Loading ${relativeConfig}...`));
+        if (useArtifactFallback) {
+            console.log(chalk.dim('  No objectstack.config.ts found — booting from artifact (default host)...'));
+        }
+        else {
+            console.log(chalk.dim(`  Loading ${relativeConfig}...`));
+        }
         // Track loaded plugins for summary
         const loadedPlugins = [];
         const shortPluginName = (raw) => {
@@ -149,11 +199,15 @@ export default class Serve extends Command {
             // Load configuration
             // --prebuilt: load as native ESM (no esbuild, no bundle-require) —
             // intended for production where the config has been compiled to dist/.
-            const { mod } = flags.prebuilt
-                ? { mod: await import(absolutePath.startsWith('/') ? `file://${absolutePath}` : absolutePath) }
-                : await bundleRequire({ filepath: absolutePath });
+            // --artifact-fallback: skip config loading entirely; the default-host
+            // helper will synthesize a stack from the artifact JSON below.
+            const { mod } = useArtifactFallback
+                ? { mod: { default: {} } }
+                : flags.prebuilt
+                    ? { mod: await import(absolutePath.startsWith('/') ? `file://${absolutePath}` : absolutePath) }
+                    : await bundleRequire({ filepath: absolutePath });
             let config = mod.default || mod;
-            if (!config) {
+            if (!useArtifactFallback && !config) {
                 throw new Error(`No default export found in ${args.config}`);
             }
             // Preserve module-level named exports (e.g. `onEnable`, `onDisable`
@@ -173,19 +227,39 @@ export default class Serve extends Command {
             // Boot-mode dispatch: standalone goes directly through
             // `@objectstack/runtime` (no cloud dependencies). runtime/cloud
             // modes go through `@objectstack/service-cloud`.
-            if (shouldBootWithLibrary(config)) {
+            if (useArtifactFallback || shouldBootWithLibrary(config)) {
                 // The boot stack returns only `{plugins, api}` — preserve the
                 // original stack metadata (notably `requires`, `analyticsCubes`,
                 // `tiers`) so the capability resolver further down can read it.
                 const originalConfig = config;
                 const resolvedMode = config.bootMode ?? process.env.OS_MODE ?? 'standalone';
-                if (resolvedMode === 'standalone') {
+                if (useArtifactFallback) {
+                    // Artifact-only boot — no objectstack.config.ts authored.
+                    // Always use the default-host helper which is standalone-only
+                    // and never depends on @objectstack/service-cloud.
+                    const { createDefaultHostConfig } = await import('@objectstack/runtime');
+                    const bootResult = await createDefaultHostConfig();
+                    config = { ...originalConfig, ...bootResult };
+                }
+                else if (resolvedMode === 'standalone') {
                     const { createStandaloneStack } = await import('@objectstack/runtime');
                     const bootResult = await createStandaloneStack(config.standalone);
                     config = { ...originalConfig, ...bootResult };
                 }
                 else {
-                    const { createBootStack } = await import('@objectstack/service-cloud');
+                    // Cloud / multi-project boot modes require @objectstack/service-cloud.
+                    // When the package is unavailable (e.g. someone vendored only the
+                    // public framework), fail with a clear, actionable error instead of
+                    // an opaque module-not-found stack trace.
+                    let createBootStack;
+                    try {
+                        ({ createBootStack } = await import('@objectstack/service-cloud'));
+                    }
+                    catch (err) {
+                        throw new Error(`Boot mode '${resolvedMode}' requires @objectstack/service-cloud, which is not installed.\n`
+                            + `Either install it (\`pnpm add @objectstack/service-cloud\`) or switch to bootMode='standalone'.\n`
+                            + `Underlying error: ${err?.message ?? String(err)}`);
+                    }
                     const bootResult = await createBootStack({
                         mode: config.bootMode,
                         runtime: config.runtime ?? config.project,
@@ -210,6 +284,38 @@ export default class Serve extends Command {
             const requires = Array.isArray(config.requires)
                 ? config.requires.filter((c) => typeof c === 'string')
                 : [];
+            // Auth callbacks (password-reset, email-verification, magic-link,
+            // invitation) depend on the email service. Auto-pull `email` when
+            // `auth` is required so transactional mail works out of the box
+            // (LogTransport fallback when no provider is configured).
+            if (requires.includes('auth') && !requires.includes('email')) {
+                requires.push('email');
+            }
+            // Default capability slate — every preset except `minimal` gets the
+            // foundational services (queue + job + cache + settings + email +
+            // storage). Opt out with `objectstack serve --preset minimal`.
+            // Keeping `auth → email` above as a defensive rule for users who
+            // explicitly opt into `minimal` but still enable auth.
+            const ALWAYS_CAPS = Serve.ALWAYS_ON_CAPABILITIES;
+            if (presetName !== 'minimal') {
+                for (const cap of ALWAYS_CAPS) {
+                    if (!requires.includes(cap))
+                        requires.push(cap);
+                }
+            }
+            // The email + approvals + reports services schedule background work
+            // (durable retries, SLA escalation, scheduled digests). Auto-pull
+            // 'job' and 'queue' so plugins can opt into durable scheduling.
+            // IMPORTANT: prepend, so their plugins load (and their kernel:ready
+            // hooks fire) BEFORE consumers like email/approvals that subscribe
+            // to queues during their own kernel:ready phase.
+            const NEEDS_JOB_OR_QUEUE = ['email', 'approvals', 'reports', 'auth'];
+            if (NEEDS_JOB_OR_QUEUE.some((c) => requires.includes(c))) {
+                if (!requires.includes('queue'))
+                    requires.unshift('queue');
+                if (!requires.includes('job'))
+                    requires.unshift('job');
+            }
             // Capability → tier: any capability that is gated by a tier
             // here automatically opens that tier when listed in `requires`.
             // Capabilities NOT in this map (e.g. `automation`, `analytics`,
@@ -447,6 +553,193 @@ export default class Serve extends Command {
                     console.warn(chalk.yellow(`  ⚠ HTTP server plugin not available: ${e.message}`));
                 }
             }
+            // Unknown-environment hostname guard.
+            //
+            // In multi-tenant cloud deployments (e.g. *.objectos.app), every
+            // public hostname is expected to map to a `sys_environment` row
+            // whose `hostname` column matches the request `Host`. Without this
+            // guard, an unknown subdomain like `demo-xxx.objectos.app` happily
+            // renders the control-plane Console SPA (served statically by
+            // createConsoleStaticPlugin), making the deployment look like an
+            // empty env rather than a missing one. We respond with a clear
+            // 404 instead.
+            //
+            // Activation: only when OS_ROOT_DOMAIN is set (e.g. "objectos.app").
+            // Reserved subdomains (cloud/www/api/docs/admin/app and the apex)
+            // bypass the check so platform surfaces keep working. Non-root
+            // hostnames (custom domains, localhost, *.workers.dev) pass through
+            // unchanged. Infra paths under /_admin or /.well-known are always
+            // allowed so health checks / cert flows aren't broken.
+            //
+            // Implemented as a Plugin so the middleware is wired during init
+            // (when http.server is available) and BEFORE start() runs on the
+            // Console static plugin / route-registering plugins. Hono's
+            // `app.use('*')` is order-independent for matching, so as long as
+            // the middleware is added before kernel:listening fires, it
+            // intercepts every request regardless of which plugin registered
+            // its handler.
+            const __rootDomain = (process.env.OS_ROOT_DOMAIN || '').trim().toLowerCase();
+            if (__rootDomain) {
+                const RESERVED = new Set(['', 'cloud', 'www', 'api', 'docs', 'admin', 'app']);
+                const guardPlugin = {
+                    name: 'com.objectstack.cli.unknown-hostname-guard',
+                    version: '1.0.0',
+                    init: async (ctx) => {
+                        try {
+                            const httpServer = ctx.getService?.('http.server') ?? ctx.getService?.('http-server');
+                            const rawApp = httpServer?.getRawApp?.();
+                            if (!rawApp || typeof rawApp.use !== 'function') {
+                                ctx.logger?.warn?.('[unknown-hostname-guard] http.server unavailable; guard not installed');
+                                return;
+                            }
+                            const getEnvRegistry = () => {
+                                try {
+                                    return ctx.getService?.('env-registry') ?? null;
+                                }
+                                catch {
+                                    return null;
+                                }
+                            };
+                            rawApp.use('*', async (c, next) => {
+                                const rawHost = c.req.header('host') || '';
+                                const host = rawHost.split(':')[0].toLowerCase();
+                                if (!host)
+                                    return next();
+                                const isPlatformHost = host === __rootDomain || host.endsWith('.' + __rootDomain);
+                                if (!isPlatformHost)
+                                    return next();
+                                const sub = host === __rootDomain ? '' : host.slice(0, -(__rootDomain.length + 1));
+                                const head = sub.split('.').pop() || '';
+                                if (RESERVED.has(sub) || RESERVED.has(head))
+                                    return next();
+                                const p = c.req.path;
+                                if (p.startsWith('/_admin/') || p === '/_admin' || p.startsWith('/.well-known/')) {
+                                    return next();
+                                }
+                                // Health and readiness endpoints must always answer 200
+                                // regardless of whether the requested hostname maps to
+                                // an env — Cloudflare's container probe (and any
+                                // upstream load balancer) hits whatever Host header is
+                                // currently bound to the worker. Returning 404 here on
+                                // an unmapped hostname would kill the container.
+                                if (p === '/api/v1/health' || p === '/api/v1/ready' || p === '/health') {
+                                    return next();
+                                }
+                                // Resolve env-registry lazily on each request — it may
+                                // not be registered yet at init() time (registered by
+                                // ObjectOSProjectPlugin's init which runs in plugin
+                                // dependency order; we don't want to rely on ordering).
+                                const registry = getEnvRegistry();
+                                if (!registry || typeof registry.resolveByHostname !== 'function') {
+                                    return next();
+                                }
+                                try {
+                                    const hit = await registry.resolveByHostname(host);
+                                    if (hit)
+                                        return next();
+                                }
+                                catch {
+                                    return next();
+                                }
+                                // Content negotiation: browsers (Accept: text/html) get
+                                // a clean 404 page; API clients (curl/fetch with JSON
+                                // accept) get a structured error body.
+                                const accept = (c.req.header('accept') || '').toLowerCase();
+                                const wantsHtml = accept.includes('text/html');
+                                if (wantsHtml) {
+                                    const safeHost = host.replace(/[<>&"']/g, (ch) => (({
+                                        '<': '&lt;', '>': '&gt;', '&': '&amp;', '"': '&quot;', "'": '&#39;',
+                                    }[ch]) ?? ch));
+                                    const html = `<!doctype html>
+<html lang="en">
+<head>
+<meta charset="utf-8" />
+<meta name="viewport" content="width=device-width,initial-scale=1" />
+<title>404 — Environment not found</title>
+<style>
+  :root { color-scheme: light dark; }
+  * { box-sizing: border-box; }
+  html, body { height: 100%; margin: 0; }
+  body {
+    font: 16px/1.5 -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Helvetica, Arial, sans-serif;
+    background: #fafafa;
+    color: #111;
+    display: grid;
+    place-items: center;
+    padding: 24px;
+  }
+  @media (prefers-color-scheme: dark) {
+    body { background: #0b0b0c; color: #e8e8e8; }
+    .card { background: #141417; border-color: #26262b; }
+    .host { background: #1c1c20; border-color: #2d2d33; color: #d0d0d0; }
+    .muted { color: #8b8b94; }
+    a { color: #6ea8fe; }
+  }
+  .card {
+    max-width: 520px;
+    width: 100%;
+    background: #fff;
+    border: 1px solid #e6e6e6;
+    border-radius: 12px;
+    padding: 32px;
+    box-shadow: 0 1px 2px rgba(0,0,0,.04);
+    text-align: center;
+  }
+  .code { font: 600 64px/1 ui-monospace, SFMono-Regular, Menlo, Consolas, monospace; margin: 0; letter-spacing: -2px; }
+  h1 { font-size: 20px; margin: 16px 0 8px; font-weight: 600; }
+  p { margin: 8px 0; }
+  .muted { color: #666; font-size: 14px; }
+  .host {
+    display: inline-block;
+    margin-top: 16px;
+    padding: 6px 12px;
+    background: #f4f4f5;
+    border: 1px solid #e4e4e7;
+    border-radius: 6px;
+    font: 13px ui-monospace, SFMono-Regular, Menlo, Consolas, monospace;
+    color: #444;
+    word-break: break-all;
+  }
+  a { color: #2563eb; text-decoration: none; }
+  a:hover { text-decoration: underline; }
+</style>
+</head>
+<body>
+  <main class="card">
+    <p class="code">404</p>
+    <h1>Environment not found</h1>
+    <p class="muted">No ObjectStack environment is bound to this hostname.</p>
+    <div class="host">${safeHost}</div>
+    <p class="muted" style="margin-top:24px">
+      If you own this domain, bind it to an environment in the
+      <a href="https://cloud.objectos.app/">ObjectStack Cloud console</a>.
+    </p>
+  </main>
+</body>
+</html>`;
+                                    return c.html(html, 404);
+                                }
+                                return c.json({
+                                    error: 'environment_not_found',
+                                    message: `No environment is bound to hostname '${host}'.`,
+                                    hostname: host,
+                                }, 404);
+                            });
+                            ctx.logger?.info?.('[unknown-hostname-guard] installed', { rootDomain: __rootDomain });
+                        }
+                        catch (err) {
+                            ctx.logger?.warn?.('[unknown-hostname-guard] install failed', { error: err?.message ?? err });
+                        }
+                    },
+                };
+                try {
+                    await kernel.use(guardPlugin);
+                    trackPlugin('UnknownHostnameGuard');
+                }
+                catch {
+                    // Best-effort.
+                }
+            }
             // 5. Auto-register Studio single-project signal in dev mode.
             //
             // `objectstack dev` runs a vanilla user stack (e.g. examples/app-crm)
@@ -498,7 +791,21 @@ export default class Serve extends Command {
                     const secret = process.env.AUTH_SECRET
                         ?? process.env.OS_AUTH_SECRET
                         ?? (isDev ? 'dev-only-insecure-secret-change-me-in-production' : undefined);
-                    if (!secret) {
+                    // Guard: in cloud-connected runtime mode (e.g. objectos worker)
+                    // the host kernel is a pure routing shell. Auth is owned by each
+                    // per-project kernel (`ArtifactKernelFactory` injects an
+                    // `AuthPlugin` per project against the project's own DB so users
+                    // persist and stay isolated per subdomain). Injecting a host-level
+                    // AuthPlugin here would compete with the per-project one — its
+                    // shared OS_AUTH_SECRET would erroneously validate cookies across
+                    // unrelated projects. Refuse to inject in runtime mode.
+                    const cloudUrl = process.env.OS_CLOUD_URL?.trim();
+                    const isRuntimeMode = !!cloudUrl && cloudUrl.toLowerCase() !== 'local' && cloudUrl.toLowerCase() !== 'off';
+                    if (isRuntimeMode) {
+                        console.warn(chalk.yellow('  ⚠ AuthPlugin skipped on host kernel — runtime mode (OS_CLOUD_URL set).\n' +
+                            '    Auth is owned per-project by ArtifactKernelFactory (see service-cloud).'));
+                    }
+                    else if (!secret) {
                         console.warn(chalk.yellow('  ⚠ AuthPlugin skipped — set AUTH_SECRET to enable authentication in production'));
                     }
                     else {
@@ -510,10 +817,127 @@ export default class Serve extends Command {
                             socialProviders.google = { clientId: process.env.GOOGLE_CLIENT_ID, clientSecret: process.env.GOOGLE_CLIENT_SECRET };
                         if (process.env.GITHUB_CLIENT_ID && process.env.GITHUB_CLIENT_SECRET)
                             socialProviders.github = { clientId: process.env.GITHUB_CLIENT_ID, clientSecret: process.env.GITHUB_CLIENT_SECRET };
+                        // Trusted origins (CSRF). better-auth uses a `*` glob that
+                        // does NOT cross dot-separators, so `http://localhost:*` does
+                        // not cover `http://<sub>.localhost:*`. Build the allow-list
+                        // explicitly:
+                        //   - explicit `OS_TRUSTED_ORIGINS` (comma-separated) wins
+                        //   - else dev / preview defaults below
+                        const trustedOrigins = [];
+                        const explicitTrusted = process.env.OS_TRUSTED_ORIGINS?.trim();
+                        if (explicitTrusted) {
+                            explicitTrusted.split(',').map(s => s.trim()).filter(Boolean).forEach(o => {
+                                if (!trustedOrigins.includes(o))
+                                    trustedOrigins.push(o);
+                            });
+                        }
+                        // Always add the configured baseUrl so first-party redirects work.
+                        try {
+                            const u = new URL(baseUrl);
+                            const baseOrigin = `${u.protocol}//${u.host}`;
+                            if (!trustedOrigins.includes(baseOrigin))
+                                trustedOrigins.push(baseOrigin);
+                        }
+                        catch { /* ignore malformed baseUrl */ }
+                        // Preview-mode subdomain wildcards (`<commit>--<pid>.<base>`).
+                        // Honour `OS_PREVIEW_BASE_DOMAINS` (used by service-cloud's
+                        // preview routing) and add `http://*.<base>:*` patterns.
+                        const previewMode = (process.env.OS_PREVIEW_MODE ?? '').trim().toLowerCase();
+                        const isPreviewMode = previewMode === '1' || previewMode === 'true' || previewMode === 'yes';
+                        if (isPreviewMode) {
+                            const baseDomains = (process.env.OS_PREVIEW_BASE_DOMAINS
+                                ?? 'preview.objectstack.ai,localhost')
+                                .split(',').map(s => s.trim()).filter(Boolean);
+                            for (const dom of baseDomains) {
+                                const isLoopback = dom === 'localhost' || dom.endsWith('.localhost');
+                                const scheme = isLoopback ? 'http' : 'https';
+                                const portSuffix = isLoopback ? ':*' : '';
+                                const wildcard = `${scheme}://*.${dom}${portSuffix}`;
+                                if (!trustedOrigins.includes(wildcard))
+                                    trustedOrigins.push(wildcard);
+                            }
+                        }
+                        // Dev convenience: keep `http://localhost:*` so plain
+                        // `localhost:<port>` still works for non-preview Studio/Console.
+                        if (isDev && !trustedOrigins.includes('http://localhost:*')) {
+                            trustedOrigins.push('http://localhost:*');
+                        }
+                        // Per-project subdomains: when OS_ROOT_DOMAIN is set (multi-
+                        // project hosting under `*.<root>`), every project hostname
+                        // must be trusted by better-auth or sign-up/sign-in is
+                        // rejected with "Invalid origin". Mirrors the OS_COOKIE_DOMAIN
+                        // wildcard semantics — they are always set together.
+                        const rootDomain = (process.env.OS_ROOT_DOMAIN ?? process.env.ROOT_DOMAIN)?.trim();
+                        if (rootDomain) {
+                            const wildcard = `https://*.${rootDomain}`;
+                            if (!trustedOrigins.includes(wildcard))
+                                trustedOrigins.push(wildcard);
+                        }
+                        // Collect application-defined org roles from the stack so
+                        // Better-Auth's organization plugin accepts invitations to
+                        // those roles (otherwise it 400s with `ROLE_NOT_FOUND`).
+                        // Sources:
+                        //   - top-level `roles[]` (role hierarchy entries)
+                        //   - `permissions[]` PermissionSets where `isProfile === true`
+                        //     (these double as role identifiers; e.g. CRM Profiles)
+                        // Real RBAC enforcement is still owned by SecurityPlugin, which
+                        // matches these names against `permission` metadata entries.
+                        const additionalOrgRoles = new Set();
+                        try {
+                            const stackAny = config ?? {};
+                            const collect = (arr) => {
+                                if (!Array.isArray(arr))
+                                    return;
+                                for (const r of arr) {
+                                    const n = typeof r === 'string' ? r : (r && typeof r.name === 'string' ? r.name : null);
+                                    if (n && n !== 'owner' && n !== 'admin' && n !== 'member')
+                                        additionalOrgRoles.add(n);
+                                }
+                            };
+                            collect(stackAny.roles);
+                            if (Array.isArray(stackAny.permissions)) {
+                                for (const p of stackAny.permissions) {
+                                    if (p && typeof p.name === 'string' && p.isProfile !== false) {
+                                        if (p.name !== 'owner' && p.name !== 'admin' && p.name !== 'member')
+                                            additionalOrgRoles.add(p.name);
+                                    }
+                                }
+                            }
+                        }
+                        catch {
+                            // best-effort
+                        }
                         await kernel.use(new AuthPlugin({
                             secret,
                             baseUrl,
                             socialProviders: Object.keys(socialProviders).length > 0 ? socialProviders : undefined,
+                            trustedOrigins: trustedOrigins.length ? trustedOrigins : undefined,
+                            ...(additionalOrgRoles.size > 0 ? { additionalOrgRoles: Array.from(additionalOrgRoles) } : {}),
+                            // Enable the admin plugin by default so the Setup app's
+                            // ban/unban/set-password/impersonate/set-role row actions
+                            // resolve to real endpoints. The plugin self-gates by role
+                            // (only users whose `role` column is `admin` can hit
+                            // /admin/* endpoints), so leaving it on for everyone is
+                            // safe. Opt-out via OS_AUTH_ADMIN=false.
+                            //
+                            // Similarly enable twoFactor by default — it powers the
+                            // Setup app's `sys_two_factor` toolbar actions (Enable 2FA,
+                            // Disable 2FA). Opt-out via OS_AUTH_TWO_FACTOR=false.
+                            //
+                            // (api-key plugin: not yet shipped by better-auth — generic
+                            // CRUD on `sys_api_key` handles row creation in the meantime.)
+                            plugins: {
+                                admin: String(process.env.OS_AUTH_ADMIN ?? 'true').toLowerCase() !== 'false',
+                                twoFactor: String(process.env.OS_AUTH_TWO_FACTOR ?? 'true').toLowerCase() !== 'false',
+                            },
+                            advanced: process.env.OS_COOKIE_DOMAIN
+                                ? {
+                                    crossSubDomainCookies: {
+                                        enabled: true,
+                                        domain: process.env.OS_COOKIE_DOMAIN,
+                                    },
+                                }
+                                : undefined,
                         }));
                         trackPlugin('Auth');
                         // Pair: SecurityPlugin (RBAC) — optional
@@ -594,9 +1018,15 @@ export default class Serve extends Command {
                 const apiConfig = config.api ?? {};
                 const enableProjectScoping = apiConfig.enableProjectScoping ?? false;
                 const projectResolution = apiConfig.projectResolution ?? 'auto';
+                // `requireAuth: true` rejects anonymous requests on `/api/v1/data/*`
+                // with HTTP 401 before they reach ObjectQL. Default-on when the
+                // stack opts in OR when the resolved tier set includes `auth`
+                // (because anonymous data access is almost never desirable when
+                // auth is enabled). Apps can override via stack `api.requireAuth`.
+                const requireAuth = apiConfig.requireAuth ?? (tierEnabled('auth') ? true : false);
                 try {
                     const { createRestApiPlugin } = await import('@objectstack/rest');
-                    await kernel.use(createRestApiPlugin({ api: { api: { enableProjectScoping, projectResolution } } }));
+                    await kernel.use(createRestApiPlugin({ api: { api: { enableProjectScoping, projectResolution, requireAuth } } }));
                     trackPlugin('RestAPI');
                 }
                 catch (e) {
@@ -702,6 +1132,31 @@ export default class Serve extends Command {
                     export: 'PackageServicePlugin',
                     nameMatch: ['service-package', 'PackageServicePlugin'],
                 },
+                email: {
+                    pkg: '@objectstack/plugin-email',
+                    export: 'EmailServicePlugin',
+                    nameMatch: ['plugin-email', 'EmailServicePlugin'],
+                },
+                sharing: {
+                    pkg: '@objectstack/plugin-sharing',
+                    export: 'SharingServicePlugin',
+                    nameMatch: ['plugin-sharing', 'SharingServicePlugin', 'SharingPlugin'],
+                },
+                reports: {
+                    pkg: '@objectstack/plugin-reports',
+                    export: 'ReportsServicePlugin',
+                    nameMatch: ['plugin-reports', 'ReportsServicePlugin'],
+                },
+                approvals: {
+                    pkg: '@objectstack/plugin-approvals',
+                    export: 'ApprovalsServicePlugin',
+                    nameMatch: ['plugin-approvals', 'ApprovalsServicePlugin'],
+                },
+                settings: {
+                    pkg: '@objectstack/service-settings',
+                    export: 'SettingsServicePlugin',
+                    nameMatch: ['service-settings', 'SettingsServicePlugin'],
+                },
             };
             const hasPluginMatching = (fragments) => plugins.some((p) => {
                 const n = String(p?.name ?? '');
@@ -727,6 +1182,74 @@ export default class Serve extends Command {
                         const cubes = config.analyticsCubes ?? config.cubes ?? [];
                         arg = { cubes };
                     }
+                    else if (cap === 'email') {
+                        // Compose EmailServicePlugin options from config.email + OS_EMAIL_* env.
+                        // Env precedence: env beats config so operators can override per-environment.
+                        const cfgEmail = config.email ?? {};
+                        const envProvider = process.env.OS_EMAIL_PROVIDER;
+                        const provider = (envProvider || cfgEmail.provider || 'log').toLowerCase();
+                        const apiKey = process.env.OS_EMAIL_API_KEY || cfgEmail.apiKey;
+                        const envFrom = process.env.OS_EMAIL_FROM;
+                        // OS_EMAIL_FROM supports either "addr@x" or "Name <addr@x>".
+                        let defaultFrom = cfgEmail.defaultFrom;
+                        if (envFrom) {
+                            const m = envFrom.match(/^\s*(?:"?([^"<]*?)"?\s*<\s*([^>]+)\s*>|(\S+))\s*$/);
+                            if (m) {
+                                const name = (m[1] ?? '').trim();
+                                const address = (m[2] ?? m[3] ?? '').trim();
+                                if (address)
+                                    defaultFrom = name ? { name, address } : { address };
+                            }
+                        }
+                        const retries = process.env.OS_EMAIL_RETRIES
+                            ? Number(process.env.OS_EMAIL_RETRIES)
+                            : cfgEmail.retries;
+                        const defaultTemplateContext = {
+                            appName: process.env.OS_APP_NAME || cfgEmail.appName || config.appName || 'ObjectStack',
+                            ...(cfgEmail.defaultTemplateContext || {}),
+                        };
+                        // Provide a sensible fallback `from` so templates can render
+                        // even before operators configure SMTP/SaaS. The log transport
+                        // simply prints to stdout; the address never leaves the box.
+                        if (!defaultFrom) {
+                            const slug = String(defaultTemplateContext.appName || 'objectstack')
+                                .toLowerCase()
+                                .replace(/[^a-z0-9]+/g, '-')
+                                .replace(/^-+|-+$/g, '') || 'objectstack';
+                            defaultFrom = { name: defaultTemplateContext.appName, address: `no-reply@${slug}.local` };
+                        }
+                        arg = {
+                            provider,
+                            ...(apiKey ? { apiKey } : {}),
+                            defaultFrom,
+                            ...(retries != null && !Number.isNaN(retries) ? { retries } : {}),
+                            defaultTemplateContext,
+                        };
+                        if (provider !== 'log' && !apiKey) {
+                            console.warn(chalk.yellow(`  ⚠ Capability "email": provider='${provider}' but no apiKey found (set OS_EMAIL_API_KEY or config.email.apiKey). Falling back to LogTransport.`));
+                            arg.provider = 'log';
+                        }
+                    }
+                    else if (cap === 'storage') {
+                        // Storage is now in the default capability slate. If the host
+                        // hasn't configured a backend explicitly we fall back to the
+                        // local-disk driver under `.objectstack/data/uploads/` so
+                        // avatars / attachments / report files work out of the box.
+                        // In production mode we emit a single loud warning so the
+                        // operator knows to point storage at S3 / GCS / Azure before
+                        // shipping (data on a single pod is volatile / non-replicated).
+                        const cfgStorage = config.storage;
+                        if (cfgStorage && (cfgStorage.driver || cfgStorage.adapter)) {
+                            arg = cfgStorage;
+                        }
+                        else {
+                            const root = process.env.OS_STORAGE_ROOT || '.objectstack/data/uploads';
+                            arg = { driver: 'local', root };
+                            if (!isDev) {
+                                console.warn(chalk.yellow(`  ⚠ StorageServicePlugin using local driver (${root}) — switch to S3/GCS/Azure for production (set config.storage or OS_STORAGE_*).`));
+                            }
+                        }
+                    }
                     await kernel.use(arg !== undefined ? new Ctor(arg) : new Ctor());
                     trackPlugin(spec.export);
                     if (spec.extras) {
@@ -764,22 +1287,34 @@ export default class Serve extends Command {
             if (enableUI) {
                 // Pre-detect Console availability so we can demote Studio's root
                 // redirect when the Console is going to claim `/`.
-                const consolePath = resolveConsolePath();
+                // The `--no-console` flag (or OS_DISABLE_CONSOLE=1 env var) lets a
+                // host (e.g. apps/cloud) opt out of the Console entirely so Studio
+                // owns `/` — useful for control-plane deployments where the
+                // runtime Console is meaningless.
+                const consoleEnabled = flags.console && process.env.OS_DISABLE_CONSOLE !== '1';
+                const consolePath = consoleEnabled ? resolveConsolePath() : null;
                 const consoleWillMount = !!(consolePath && hasConsoleDist(consolePath));
-                const studioPath = resolveStudioPath();
-                if (!studioPath) {
-                    console.warn(chalk.yellow(`  ⚠ @objectstack/studio not found — skipping UI`));
-                }
-                else if (hasStudioDist(studioPath)) {
-                    const distPath = path.join(studioPath, 'dist');
-                    await kernel.use(createStudioStaticPlugin(distPath, {
-                        isDev,
-                        rootRedirect: !consoleWillMount,
-                    }));
-                    trackPlugin('StudioUI');
-                }
-                else {
-                    console.warn(chalk.yellow(`  ⚠ Studio dist not found — run "pnpm --filter @objectstack/studio build" first`));
+                // The `OS_DISABLE_STUDIO=1` env var lets a host (e.g. apps/cloud,
+                // which is a pure control plane) opt out of the Studio designer
+                // entirely while keeping Account/Console. Studio is meaningless
+                // when there are no per-project kernels in the same process.
+                const studioEnabled = process.env.OS_DISABLE_STUDIO !== '1';
+                if (studioEnabled) {
+                    const studioPath = resolveStudioPath();
+                    if (!studioPath) {
+                        console.warn(chalk.yellow(`  ⚠ @objectstack/studio not found — skipping UI`));
+                    }
+                    else if (hasStudioDist(studioPath)) {
+                        const distPath = path.join(studioPath, 'dist');
+                        await kernel.use(createStudioStaticPlugin(distPath, {
+                            isDev,
+                            rootRedirect: !consoleWillMount,
+                        }));
+                        trackPlugin('StudioUI');
+                    }
+                    else {
+                        console.warn(chalk.yellow(`  ⚠ Studio dist not found — run "pnpm --filter @objectstack/studio build" first`));
+                    }
                 }
                 // ── Account portal ─────────────────────────────────────────
                 // The account portal sits next to Studio under `/_account/` and
@@ -819,6 +1354,24 @@ export default class Serve extends Command {
             // Brief delay to allow logger writes to flush before restoring stdout
             await new Promise(r => setTimeout(r, 100));
             restoreOutput();
+            // ── Migrate-and-exit short-circuit ─────────────────────────────
+            // Out-of-band migration mode: the caller (e.g.
+            // `apps/cloud/scripts/migrate.ts`) just wants the kernel
+            // bootstrap (ObjectQLPlugin → schema sync → metadata hydration)
+            // to run once against the configured database, then exit. The
+            // HTTP server has already bound `port` at this point but we
+            // never accept a request — shutdown immediately so the deploy
+            // pipeline can move on.
+            if (process.env.OS_MIGRATE_AND_EXIT === '1') {
+                console.log(chalk.green(`✓ Migration complete (${loadedPlugins.length} plugins started against ${redactDbUrl(resolvedDatabaseUrl) || 'configured DB'})`));
+                try {
+                    await kernel.shutdown();
+                }
+                catch (err) {
+                    console.warn(chalk.yellow(`  ⚠ shutdown warning: ${err?.message ?? err}`));
+                }
+                process.exit(0);
+            }
             // ── Driver introspection ──────────────────────────────────────
             // When the driver was registered by an app preset / per-project
             // factory (ProjectKernelFactory) instead of serve.ts's own