@objectstack/cli 4.0.4 → 4.0.5

package/dist/commands/serve.js

@@ -5,9 +5,11 @@ import fs from 'fs';
 import net from 'net';
 import chalk from 'chalk';
 import { bundleRequire } from 'bundle-require';
-import { isHostConfig } from '../utils/plugin-detection.js';
+import { shouldBootWithLibrary } from '../utils/plugin-detection.js';
 import { printError, printServerReady, } from '../utils/format.js';
 import { STUDIO_PATH, resolveStudioPath, hasStudioDist, createStudioStaticPlugin, } from '../utils/studio.js';
+import { ACCOUNT_PATH, resolveAccountPath, hasAccountDist, createAccountStaticPlugin, } from '../utils/account.js';
+import { CONSOLE_PATH, resolveConsolePath, hasConsoleDist, createConsoleStaticPlugin, } from '../utils/console.js';
 import dotenvFlow from 'dotenv-flow';
 // Helper to find available port
 const getAvailablePort = async (startPort) => {
@@ -38,10 +40,25 @@ export default class Serve extends Command {
         config: Args.string({ description: 'Configuration file path', required: false, default: 'objectstack.config.ts' }),
     };
     static flags = {
-        port: Flags.string({ char: 'p', description: 'Server port', default: '3000' }),
+        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 in dev mode)' }),
+        ui: Flags.boolean({ description: 'Enable Studio UI at /_studio/ (default: true)', 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({
+            description: 'Plugin tier preset: minimal | default | full (overridden by config.tiers if set)',
+            options: ['minimal', 'default', 'full'],
+        }),
+    };
+    /**
+     * Auto-registered plugin tiers. Plugins explicitly listed in
+     * `config.plugins` are always loaded — tiers only gate the optional
+     * auto-registration blocks below (AIService, I18n, Studio UI, etc.).
+     */
+    static TIER_PRESETS = {
+        minimal: ['core'],
+        default: ['core', 'i18n', 'ui', 'auth'],
+        full: ['core', 'i18n', 'ui', 'ai', 'auth'],
     };
     async run() {
         const { args, flags } = await this.parse(Serve);
@@ -86,6 +103,20 @@ export default class Serve extends Command {
             return raw;
         };
         const trackPlugin = (name) => { loadedPlugins.push(shortPluginName(name)); };
+        // Track resolved storage driver + redacted URL for the startup banner.
+        let resolvedDriverLabel;
+        let resolvedDatabaseUrl;
+        const redactDbUrl = (url) => {
+            if (!url)
+                return undefined;
+            try {
+                // Redact passwords inside connection URLs: protocol://user:****@host/db
+                return url.replace(/(\/\/[^/@:]+):[^/@]+@/, '$1:****@');
+            }
+            catch {
+                return url;
+            }
+        };
         // Save original console/stdout methods — we'll suppress noise during boot
         const originalConsoleLog = console.log;
         const originalConsoleDebug = console.debug;
@@ -116,13 +147,89 @@ export default class Serve extends Command {
             console.debug = (...args) => { if (!bootQuiet)
                 originalConsoleDebug(...args); };
             // Load configuration
-            const { mod } = await bundleRequire({
-                filepath: absolutePath,
-            });
-            const config = mod.default || mod;
+            // --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 });
+            let config = mod.default || mod;
             if (!config) {
                 throw new Error(`No default export found in ${args.config}`);
             }
+            // Preserve module-level named exports (e.g. `onEnable`, `onDisable`
+            // lifecycle hooks) that would otherwise be dropped when we unwrap
+            // `mod.default`. Without this AppPlugin can never invoke runtime hooks
+            // declared as `export const onEnable = ...` alongside the default
+            // `defineStack(...)` export.
+            if (mod.default != null && config !== mod) {
+                const merged = { ...config };
+                for (const key of Object.keys(mod)) {
+                    if (key === 'default' || key in merged)
+                        continue;
+                    merged[key] = mod[key];
+                }
+                config = merged;
+            }
+            // Boot-mode dispatch: standalone goes directly through
+            // `@objectstack/runtime` (no cloud dependencies). runtime/cloud
+            // modes go through `@objectstack/service-cloud`.
+            if (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') {
+                    const { createStandaloneStack } = await import('@objectstack/runtime');
+                    const bootResult = await createStandaloneStack(config.standalone);
+                    config = { ...originalConfig, ...bootResult };
+                }
+                else {
+                    const { createBootStack } = await import('@objectstack/service-cloud');
+                    const bootResult = await createBootStack({
+                        mode: config.bootMode,
+                        runtime: config.runtime ?? config.project,
+                        cloud: config.cloud,
+                    });
+                    config = { ...originalConfig, ...bootResult };
+                }
+            }
+            // ── Resolve plugin tiers ──────────────────────────────────────
+            // Precedence: config.requires (capability declarations) >
+            //             config.tiers > --preset > built-in default.
+            //
+            // `requires: ['ai', 'automation', ...]` is the recommended
+            // app-level way to declare platform dependencies. The CLI
+            // expands each capability name into the matching tier so the
+            // optional auto-registration blocks below light up without
+            // extra flags. Explicitly-listed `config.plugins` always load
+            // and shadow any capability resolution (i.e. an explicit
+            // instance wins over the auto-loader).
+            const presetName = flags.preset ?? (isDev ? 'default' : 'default');
+            const presetTiers = Serve.TIER_PRESETS[presetName] ?? Serve.TIER_PRESETS.default;
+            const requires = Array.isArray(config.requires)
+                ? config.requires.filter((c) => typeof c === 'string')
+                : [];
+            // 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`,
+            // `audit`) bypass tier gating and are loaded directly by the
+            // capability-resolver block further down.
+            const CAPABILITY_TO_TIER = {
+                ai: 'ai',
+                i18n: 'i18n',
+                ui: 'ui',
+                auth: 'auth',
+            };
+            const requiredTiers = requires
+                .map((c) => CAPABILITY_TO_TIER[c])
+                .filter((t) => typeof t === 'string');
+            const baseTiers = Array.isArray(config.tiers) && config.tiers.length > 0
+                ? config.tiers
+                : presetTiers;
+            const tiers = new Set([...baseTiers, ...requiredTiers]);
+            const tierEnabled = (t) => tiers.has(t);
+            const requiresCapability = (c) => requires.includes(c);
             // Import ObjectStack runtime
             const { Runtime } = await import('@objectstack/runtime');
             // Set kernel logger to 'silent' — the CLI manages its own output
@@ -151,24 +258,120 @@ export default class Serve extends Command {
                     // silent
                 }
             }
-            // 2. Auto-register Memory Driver if in Dev and no driver configured
+            // 2. Auto-register storage driver
+            // Priority:
+            //   1. OS_DATABASE_DRIVER env var (explicit override)
+            //   2. URL scheme inferred from OS_DATABASE_URL
+            //        mongodb://, mongodb+srv://       → mongodb
+            //        postgres://, postgresql://       → postgres
+            //        mysql://, mysql2://              → mysql
+            //        libsql://, http(s):// + .turso.  → turso
+            //        file:, sqlite:, *.db, :memory:   → sqlite
+            //   3. Default: InMemoryDriver in dev mode
             const hasDriver = plugins.some((p) => p.name?.includes('driver') || p.constructor?.name?.includes('Driver'));
-            if (isDev && !hasDriver && config.objects) {
+            if (!hasDriver && config.objects) {
+                const explicitDriver = (process.env.OS_DATABASE_DRIVER ?? '').toLowerCase().trim();
+                const databaseUrl = process.env.OS_DATABASE_URL;
+                const inferDriverFromUrl = (url) => {
+                    if (!url)
+                        return '';
+                    const u = url.trim();
+                    if (/^mongodb(\+srv)?:\/\//i.test(u))
+                        return 'mongodb';
+                    if (/^postgres(ql)?:\/\//i.test(u))
+                        return 'postgres';
+                    if (/^mysql2?:\/\//i.test(u))
+                        return 'mysql';
+                    if (/^libsql:\/\//i.test(u))
+                        return 'turso';
+                    if (/^https?:\/\//i.test(u) && /\.turso\./i.test(u))
+                        return 'turso';
+                    if (/^file:/i.test(u) || /^sqlite:/i.test(u) || u === ':memory:' || /\.(db|sqlite|sqlite3)$/i.test(u))
+                        return 'sqlite';
+                    return '';
+                };
+                const driverType = explicitDriver || inferDriverFromUrl(databaseUrl);
                 try {
                     const { DriverPlugin } = await import('@objectstack/runtime');
-                    const { InMemoryDriver } = await import('@objectstack/driver-memory');
-                    await kernel.use(new DriverPlugin(new InMemoryDriver()));
-                    trackPlugin('MemoryDriver');
+                    if (driverType === 'mongodb' || driverType === 'mongo') {
+                        const { MongoDBDriver } = await import('@objectstack/driver-mongodb');
+                        await kernel.use(new DriverPlugin(new MongoDBDriver({
+                            url: databaseUrl ?? 'mongodb://localhost:27017/objectstack',
+                        })));
+                        trackPlugin('MongoDBDriver');
+                        resolvedDriverLabel = 'MongoDBDriver';
+                        resolvedDatabaseUrl = databaseUrl ?? 'mongodb://localhost:27017/objectstack';
+                    }
+                    else if (driverType === 'sqlite' || driverType === 'sql') {
+                        const { SqlDriver } = await import('@objectstack/driver-sql');
+                        const filePath = (databaseUrl ?? ':memory:').replace(/^file:/, '').replace(/^sqlite:/, '').replace(/^sql:\/\//, '');
+                        await kernel.use(new DriverPlugin(new SqlDriver({
+                            client: 'better-sqlite3',
+                            connection: { filename: filePath },
+                            useNullAsDefault: true,
+                        })));
+                        trackPlugin('SqlDriver');
+                        resolvedDriverLabel = 'SqlDriver(sqlite)';
+                        resolvedDatabaseUrl = databaseUrl ?? ':memory:';
+                    }
+                    else if (driverType === 'postgres' || driverType === 'postgresql' || driverType === 'pg') {
+                        const { SqlDriver } = await import('@objectstack/driver-sql');
+                        await kernel.use(new DriverPlugin(new SqlDriver({
+                            client: 'pg',
+                            connection: databaseUrl,
+                            pool: { min: 0, max: 5 },
+                        })));
+                        trackPlugin('PostgresDriver');
+                        resolvedDriverLabel = 'SqlDriver(pg)';
+                        resolvedDatabaseUrl = databaseUrl;
+                    }
+                    else if (driverType === 'mysql' || driverType === 'mysql2') {
+                        const { SqlDriver } = await import('@objectstack/driver-sql');
+                        await kernel.use(new DriverPlugin(new SqlDriver({
+                            client: 'mysql2',
+                            connection: databaseUrl,
+                            pool: { min: 0, max: 5 },
+                        })));
+                        trackPlugin('MySQLDriver');
+                        resolvedDriverLabel = 'SqlDriver(mysql2)';
+                        resolvedDatabaseUrl = databaseUrl;
+                    }
+                    else if (driverType === 'turso' || driverType === 'libsql') {
+                        const { TursoDriver } = await import('@objectstack/driver-turso');
+                        await kernel.use(new DriverPlugin(new TursoDriver({
+                            url: databaseUrl ?? 'file:./local.db',
+                            authToken: process.env.OS_DATABASE_AUTH_TOKEN,
+                        })));
+                        trackPlugin('TursoDriver');
+                        resolvedDriverLabel = 'TursoDriver';
+                        resolvedDatabaseUrl = databaseUrl ?? 'file:./local.db';
+                    }
+                    else if (isDev) {
+                        // Default in dev: in-memory driver
+                        const { InMemoryDriver } = await import('@objectstack/driver-memory');
+                        await kernel.use(new DriverPlugin(new InMemoryDriver()));
+                        trackPlugin('MemoryDriver');
+                        resolvedDriverLabel = 'InMemoryDriver';
+                        resolvedDatabaseUrl = '(in-memory)';
+                    }
                 }
                 catch (e) {
                     // silent
                 }
             }
             // 3. Auto-register AppPlugin if config contains app definitions
-            // Skip if config is a host/aggregator config that already contains
-            // instantiated plugins — wrapping it would cause duplicate registration
-            // and startup failures (e.g. plugin.app.dev-workspace).
-            if (!isHostConfig(config) && (config.objects || config.manifest || config.apps)) {
+            // (objects / manifest / apps / flows / apis). Even host/aggregator
+            // configs (those whose `plugins` array contains instantiated plugins)
+            // need this wrap when they ALSO carry top-level metadata — otherwise
+            // top-level `flows`, `objects`, etc. never reach the ObjectQL registry
+            // and downstream services like AutomationServicePlugin start with 0 flows.
+            //
+            // To avoid double-registration when the host already wraps itself with
+            // an AppPlugin (e.g. apps/objectos's dev-workspace stack), we skip if
+            // any plugin in `plugins[]` is already an AppPlugin instance.
+            const hasAppPluginAlready = plugins.some((p) => p && (p.type === 'app' || p.constructor?.name === 'AppPlugin' || (p.name && typeof p.name === 'string' && p.name.startsWith('plugin.app.'))));
+            const configHasMetadata = !!(config.objects || config.manifest || config.apps || config.flows || config.apis);
+            if (!hasAppPluginAlready && configHasMetadata) {
                 try {
                     const { AppPlugin } = await import('@objectstack/runtime');
                     await kernel.use(new AppPlugin(config));
@@ -182,11 +385,33 @@ export default class Serve extends Command {
             // This ensures i18n REST routes work out of the box without manual plugin registration.
             const hasI18nPlugin = plugins.some((p) => p.name === 'com.objectstack.service.i18n'
                 || p.constructor?.name === 'I18nServicePlugin');
-            const configHasTranslations = ((Array.isArray(config.translations) && config.translations.length > 0)
-                || config.i18n
-                || (config.manifest && ((Array.isArray(config.manifest.translations) && config.manifest.translations.length > 0)
-                    || config.manifest.i18n)));
-            if (!hasI18nPlugin && configHasTranslations) {
+            // Check the top-level config AND any nested AppPlugin bundles in the
+            // `plugins` array — host/aggregator configs (e.g. apps/objectos) don't
+            // define translations themselves but compose multiple `new AppPlugin(...)`
+            // entries, each carrying its own translations.
+            const pluginBundleHasTranslations = (bundle) => {
+                if (!bundle || typeof bundle !== 'object')
+                    return false;
+                if (Array.isArray(bundle.translations) && bundle.translations.length > 0)
+                    return true;
+                if (bundle.i18n)
+                    return true;
+                if (bundle.manifest && ((Array.isArray(bundle.manifest.translations) && bundle.manifest.translations.length > 0)
+                    || bundle.manifest.i18n))
+                    return true;
+                return false;
+            };
+            const anyAppPluginHasTranslations = plugins.some((p) => {
+                if (!p)
+                    return false;
+                // AppPlugin instances expose their bundle on `.bundle`
+                if (p.bundle && pluginBundleHasTranslations(p.bundle))
+                    return true;
+                return false;
+            });
+            const configHasTranslations = (pluginBundleHasTranslations(config)
+                || anyAppPluginHasTranslations);
+            if (!hasI18nPlugin && configHasTranslations && tierEnabled('i18n')) {
                 try {
                     // Dynamic import with variable to prevent tsc from resolving the optional package
                     const i18nPkg = '@objectstack/service-i18n';
@@ -222,18 +447,108 @@ export default class Serve extends Command {
                     console.warn(chalk.yellow(`  ⚠ HTTP server plugin not available: ${e.message}`));
                 }
             }
-            // 5. Auto-register SetupPlugin BEFORE config plugins so that other
-            // plugins (e.g. AuthPlugin) can call setupNav.contribute() during init.
-            const hasSetupPlugin = plugins.some((p) => p.name === 'com.objectstack.setup' || p.constructor?.name === 'SetupPlugin');
-            if (!hasSetupPlugin) {
+            // 5. Auto-register Studio single-project signal in dev mode.
+            //
+            // `objectstack dev` runs a vanilla user stack (e.g. examples/app-crm)
+            // as a single project — there is no apps/cloud control plane and no
+            // org/project picker is meaningful. Without this plugin Studio would
+            // fall back to its multi-project default and ask the user to "Create
+            // organization" before showing any platform metadata.
+            //
+            // The plugin only registers `GET /api/v1/studio/runtime-config`
+            // (returning `{ singleProject: true, defaultOrgId, defaultProjectId }`)
+            // — no identity seed, since CLI dev mode has no sys_organization /
+            // sys_project tables to write into. Skipped when the user config
+            // already carries a single-project / multi-project plugin.
+            const hasProjectModePlugin = plugins.some((p) => {
+                const n = p?.name ?? p?.constructor?.name ?? '';
+                return n === 'com.objectstack.studio.single-project'
+                    || n === 'com.objectstack.multi-project'
+                    || n === 'com.objectstack.studio.runtime-config';
+            });
+            if (isDev && !hasProjectModePlugin) {
                 try {
-                    const setupPkg = '@objectstack/plugin-setup';
-                    const { SetupPlugin } = await import(/* webpackIgnore: true */ setupPkg);
-                    await kernel.use(new SetupPlugin());
-                    trackPlugin('Setup');
+                    const cloudPkg = '@objectstack/service-cloud';
+                    const { createSingleProjectPlugin } = await import(/* webpackIgnore: true */ cloudPkg);
+                    await kernel.use(createSingleProjectPlugin({
+                        projectId: process.env.OS_PROJECT_ID ?? 'proj_local',
+                        orgId: process.env.OS_ORG_ID ?? 'org_local',
+                        orgName: 'Local',
+                    }));
+                    trackPlugin('SingleProject');
                 }
                 catch {
-                    // @objectstack/plugin-setup not installed — setup app unavailable
+                    // @objectstack/service-cloud not installed — Studio falls back
+                    // to multi-project mode (org/project picker visible).
+                }
+            }
+            // 5b. Auto-register AuthPlugin (and paired Security/Audit) when the
+            // 'auth' tier is enabled and no auth plugin is already configured.
+            // The Studio + Account portals expect /api/v1/auth/* to be served by
+            // better-auth via @objectstack/plugin-auth. Without this block,
+            // running `objectstack dev` on a vanilla user stack would 404 on
+            // login/register flows.
+            const hasAuthPlugin = plugins.some((p) => p?.name === 'com.objectstack.auth' || p?.constructor?.name === 'AuthPlugin');
+            if (!hasAuthPlugin && tierEnabled('auth')) {
+                try {
+                    const authPkg = '@objectstack/plugin-auth';
+                    const { AuthPlugin } = await import(/* webpackIgnore: true */ authPkg);
+                    // In dev, fall back to a stable local secret so users don't have
+                    // to set AUTH_SECRET just to try the login/register flow.
+                    const secret = process.env.AUTH_SECRET
+                        ?? process.env.OS_AUTH_SECRET
+                        ?? (isDev ? 'dev-only-insecure-secret-change-me-in-production' : undefined);
+                    if (!secret) {
+                        console.warn(chalk.yellow('  ⚠ AuthPlugin skipped — set AUTH_SECRET to enable authentication in production'));
+                    }
+                    else {
+                        const baseUrl = process.env.AUTH_BASE_URL
+                            ?? process.env.OS_BASE_URL
+                            ?? `http://localhost:${port}`;
+                        const socialProviders = {};
+                        if (process.env.GOOGLE_CLIENT_ID && process.env.GOOGLE_CLIENT_SECRET)
+                            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 };
+                        await kernel.use(new AuthPlugin({
+                            secret,
+                            baseUrl,
+                            socialProviders: Object.keys(socialProviders).length > 0 ? socialProviders : undefined,
+                        }));
+                        trackPlugin('Auth');
+                        // Pair: SecurityPlugin (RBAC) — optional
+                        try {
+                            const securityPkg = '@objectstack/plugin-security';
+                            const { SecurityPlugin } = await import(/* webpackIgnore: true */ securityPkg);
+                            // `OS_MULTI_TENANT=false` disables wildcard tenant_isolation
+                            // RLS policies and the `organization_id` auto-injection on
+                            // insert. Keep multi-tenant on by default — most ObjectStack
+                            // deployments are multi-org.
+                            const multiTenant = String(process.env.OS_MULTI_TENANT ?? 'true').toLowerCase() !== 'false';
+                            await kernel.use(new SecurityPlugin({ multiTenant }));
+                            trackPlugin('Security');
+                        }
+                        catch {
+                            // optional
+                        }
+                        // Pair: AuditPlugin — optional
+                        try {
+                            const auditPkg = '@objectstack/plugin-audit';
+                            const { AuditPlugin } = await import(/* webpackIgnore: true */ auditPkg);
+                            await kernel.use(new AuditPlugin());
+                            trackPlugin('Audit');
+                        }
+                        catch {
+                            // optional
+                        }
+                    }
+                }
+                catch (err) {
+                    const msg = err instanceof Error ? err.message : String(err);
+                    if (!msg.includes('Cannot find module') && !msg.includes('ERR_MODULE_NOT_FOUND')) {
+                        console.warn(chalk.yellow(`  ⚠ AuthPlugin failed to load: ${msg}`));
+                    }
+                    // @objectstack/plugin-auth not installed — login/register endpoints unavailable
                 }
             }
             if (plugins.length > 0) {
@@ -272,9 +587,16 @@ export default class Serve extends Command {
             }
             // Register REST API and Dispatcher plugins (consume http.server + protocol services)
             if (flags.server) {
+                // Read project-scoping config from the stack's top-level `api` field
+                // (e.g. { api: { enableProjectScoping: true, projectResolution: 'auto' } }).
+                // Forwarded to both REST and Dispatcher plugins so they mount scoped
+                // routes consistently.
+                const apiConfig = config.api ?? {};
+                const enableProjectScoping = apiConfig.enableProjectScoping ?? false;
+                const projectResolution = apiConfig.projectResolution ?? 'auto';
                 try {
                     const { createRestApiPlugin } = await import('@objectstack/rest');
-                    await kernel.use(createRestApiPlugin());
+                    await kernel.use(createRestApiPlugin({ api: { api: { enableProjectScoping, projectResolution } } }));
                     trackPlugin('RestAPI');
                 }
                 catch (e) {
@@ -283,7 +605,7 @@ export default class Serve extends Command {
                 // Register Dispatcher plugin (auth, graphql, analytics, packages, hub, storage, automation)
                 try {
                     const { createDispatcherPlugin } = await import('@objectstack/runtime');
-                    await kernel.use(createDispatcherPlugin());
+                    await kernel.use(createDispatcherPlugin({ scoping: { enableProjectScoping, projectResolution } }));
                     trackPlugin('Dispatcher');
                 }
                 catch (e) {
@@ -295,7 +617,7 @@ export default class Serve extends Command {
             // already in place when AIServicePlugin.start() fires the hook.
             const hasAIPlugin = plugins.some((p) => p.name === 'com.objectstack.service-ai'
                 || p.constructor?.name === 'AIServicePlugin');
-            if (!hasAIPlugin) {
+            if (!hasAIPlugin && tierEnabled('ai')) {
                 try {
                     const aiPkg = '@objectstack/service-ai';
                     const { AIServicePlugin } = await import(/* webpackIgnore: true */ aiPkg);
@@ -305,33 +627,216 @@ export default class Serve extends Command {
                     await kernel.use(new AIServicePlugin());
                     trackPlugin('AIService');
                 }
-                catch {
+                catch (err) {
+                    const msg = err instanceof Error ? err.message : String(err);
+                    if (!msg.includes('Cannot find module') && !msg.includes('ERR_MODULE_NOT_FOUND')) {
+                        console.error('[AI] AIServicePlugin failed to start:', msg);
+                    }
                     // @objectstack/service-ai not installed — AI features unavailable
                 }
             }
+            const CAPABILITY_PROVIDERS = {
+                automation: {
+                    pkg: '@objectstack/service-automation',
+                    export: 'AutomationServicePlugin',
+                    nameMatch: ['service-automation', 'AutomationServicePlugin'],
+                    // The default node packs ship from the same package; auto-register them
+                    // so flows actually have executors. Users can opt out by listing
+                    // their own subset explicitly in `plugins: []` (which sets
+                    // `nameMatch` to skip these auto-loads).
+                    extras: [
+                        { pkg: '@objectstack/service-automation', export: 'CrudNodesPlugin', nameMatch: ['crud-nodes', 'CrudNodesPlugin'] },
+                        { pkg: '@objectstack/service-automation', export: 'LogicNodesPlugin', nameMatch: ['logic-nodes', 'LogicNodesPlugin'] },
+                        { pkg: '@objectstack/service-automation', export: 'HttpConnectorPlugin', nameMatch: ['http-connector', 'HttpConnectorPlugin'] },
+                        { pkg: '@objectstack/service-automation', export: 'ScreenNodesPlugin', nameMatch: ['screen-nodes', 'ScreenNodesPlugin'] },
+                    ],
+                },
+                analytics: {
+                    pkg: '@objectstack/service-analytics',
+                    export: 'AnalyticsServicePlugin',
+                    nameMatch: ['service-analytics', 'AnalyticsServicePlugin'],
+                    configKey: 'analyticsCubes',
+                },
+                audit: {
+                    pkg: '@objectstack/plugin-audit',
+                    export: 'AuditPlugin',
+                    nameMatch: ['audit', 'AuditPlugin'],
+                },
+                cache: {
+                    pkg: '@objectstack/service-cache',
+                    export: 'CacheServicePlugin',
+                    nameMatch: ['service-cache', 'CacheServicePlugin'],
+                },
+                storage: {
+                    pkg: '@objectstack/service-storage',
+                    export: 'StorageServicePlugin',
+                    nameMatch: ['service-storage', 'StorageServicePlugin'],
+                },
+                queue: {
+                    pkg: '@objectstack/service-queue',
+                    export: 'QueueServicePlugin',
+                    nameMatch: ['service-queue', 'QueueServicePlugin'],
+                },
+                job: {
+                    pkg: '@objectstack/service-job',
+                    export: 'JobServicePlugin',
+                    nameMatch: ['service-job', 'JobServicePlugin'],
+                },
+                realtime: {
+                    pkg: '@objectstack/service-realtime',
+                    export: 'RealtimeServicePlugin',
+                    nameMatch: ['service-realtime', 'RealtimeServicePlugin'],
+                },
+                feed: {
+                    pkg: '@objectstack/service-feed',
+                    export: 'FeedServicePlugin',
+                    nameMatch: ['service-feed', 'FeedServicePlugin'],
+                },
+                mcp: {
+                    pkg: '@objectstack/plugin-mcp-server',
+                    export: 'MCPServerPlugin',
+                    nameMatch: ['mcp-server', 'MCPServerPlugin'],
+                },
+                marketplace: {
+                    pkg: '@objectstack/service-package',
+                    export: 'PackageServicePlugin',
+                    nameMatch: ['service-package', 'PackageServicePlugin'],
+                },
+            };
+            const hasPluginMatching = (fragments) => plugins.some((p) => {
+                const n = String(p?.name ?? '');
+                const c = String(p?.constructor?.name ?? '');
+                return fragments.some((f) => n.includes(f) || c.includes(f));
+            });
+            for (const cap of requires) {
+                const spec = CAPABILITY_PROVIDERS[cap];
+                if (!spec)
+                    continue; // tier-gated capabilities (ai/i18n/ui/auth) handled above
+                if (hasPluginMatching(spec.nameMatch))
+                    continue;
+                try {
+                    const mod = await import(/* webpackIgnore: true */ spec.pkg);
+                    const Ctor = mod[spec.export];
+                    if (!Ctor) {
+                        console.warn(chalk.yellow(`  ⚠ Capability "${cap}": ${spec.pkg} did not export ${spec.export}`));
+                        continue;
+                    }
+                    // analytics needs cubes from config, others take no args
+                    let arg;
+                    if (spec.configKey === 'analyticsCubes') {
+                        const cubes = config.analyticsCubes ?? config.cubes ?? [];
+                        arg = { cubes };
+                    }
+                    await kernel.use(arg !== undefined ? new Ctor(arg) : new Ctor());
+                    trackPlugin(spec.export);
+                    if (spec.extras) {
+                        for (const ex of spec.extras) {
+                            if (hasPluginMatching(ex.nameMatch))
+                                continue;
+                            try {
+                                const exMod = await import(/* webpackIgnore: true */ ex.pkg);
+                                const ExCtor = exMod[ex.export];
+                                if (ExCtor) {
+                                    await kernel.use(new ExCtor());
+                                    trackPlugin(ex.export);
+                                }
+                            }
+                            catch {
+                                // optional extra — silently skip
+                            }
+                        }
+                    }
+                }
+                catch (err) {
+                    const msg = err instanceof Error ? err.message : String(err);
+                    if (!msg.includes('Cannot find module') && !msg.includes('ERR_MODULE_NOT_FOUND')) {
+                        console.error(`[Capability:${cap}] failed to load ${spec.pkg}: ${msg}`);
+                    }
+                    else {
+                        console.warn(chalk.yellow(`  ⚠ Capability "${cap}" required but ${spec.pkg} is not installed`));
+                    }
+                }
+            }
             // ── Studio UI ─────────────────────────────────────────────────
             // In dev mode, Studio UI is enabled by default (use --no-ui to disable).
             // Always serves the pre-built dist/ — no Vite dev server, no extra port.
-            const enableUI = flags.ui || isDev;
+            const enableUI = flags.ui && tierEnabled('ui');
             if (enableUI) {
+                // Pre-detect Console availability so we can demote Studio's root
+                // redirect when the Console is going to claim `/`.
+                const consolePath = resolveConsolePath();
+                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 }));
+                    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
+                // follows the same enable rules — it's a self-service surface
+                // for end-users (login, organizations, profile, sessions).
+                const accountPath = resolveAccountPath();
+                if (!accountPath) {
+                    console.warn(chalk.yellow(`  ⚠ @objectstack/account not found — skipping Account UI`));
+                }
+                else if (hasAccountDist(accountPath)) {
+                    const accountDistPath = path.join(accountPath, 'dist');
+                    await kernel.use(createAccountStaticPlugin(accountDistPath, { isDev }));
+                    trackPlugin('AccountUI');
+                }
+                else {
+                    console.warn(chalk.yellow(`  ⚠ Account dist not found — run "pnpm --filter @objectstack/account build" first`));
+                }
+                // ── Console portal ──────────────────────────────────────────
+                // The opinionated, fork-ready runtime console (`@objectstack/console`)
+                // mounts under `/_console/` exactly like Studio/Account. When
+                // present, it owns root `/` redirect (preferred default UI). It
+                // is optional — we only mount it when the package resolves and
+                // a pre-built `dist/` is present.
+                if (consolePath) {
+                    if (consoleWillMount) {
+                        const consoleDistPath = path.join(consolePath, 'dist');
+                        await kernel.use(createConsoleStaticPlugin(consoleDistPath, { isDev }));
+                        trackPlugin('ConsoleUI');
+                    }
+                    else {
+                        console.warn(chalk.yellow(`  ⚠ Console dist not found — run "pnpm --filter @objectstack/console build" first`));
+                    }
+                }
             }
             // Boot the runtime
             await runtime.start();
-            // Wait briefly for pino worker thread buffers to flush, then restore
+            // Brief delay to allow logger writes to flush before restoring stdout
             await new Promise(r => setTimeout(r, 100));
             restoreOutput();
+            // ── Driver introspection ──────────────────────────────────────
+            // When the driver was registered by an app preset / per-project
+            // factory (ProjectKernelFactory) instead of serve.ts's own
+            // OS_DATABASE_URL fallback, `resolvedDriverLabel` is still
+            // unset. Probe well-known service names so the banner can show
+            // *something* useful regardless of who wired the driver.
+            if (!resolvedDriverLabel) {
+                try {
+                    const probe = describeRegisteredDriver(kernel);
+                    if (probe) {
+                        resolvedDriverLabel = probe.label;
+                        resolvedDatabaseUrl = probe.url;
+                    }
+                }
+                catch {
+                    // best-effort only
+                }
+            }
             // ── Clean startup summary ──────────────────────────────────────
             printServerReady({
                 port,
@@ -341,14 +846,14 @@ export default class Serve extends Command {
                 pluginNames: loadedPlugins,
                 uiEnabled: enableUI,
                 studioPath: STUDIO_PATH,
+                accountPath: ACCOUNT_PATH,
+                consolePath: loadedPlugins.includes('ConsoleUI') ? CONSOLE_PATH : undefined,
+                driverLabel: resolvedDriverLabel,
+                databaseUrl: redactDbUrl(resolvedDatabaseUrl),
+                multiTenant: String(process.env.OS_MULTI_TENANT ?? 'true').toLowerCase() !== 'false',
             });
-            // Keep process alive
-            process.on('SIGINT', async () => {
-                console.warn(chalk.yellow(`\n\n⏹  Stopping server...`));
-                await runtime.getKernel().shutdown();
-                console.log(chalk.green(`✅ Server stopped`));
-                process.exit(0);
-            });
+            // Kernel already registers SIGINT/SIGTERM handlers during bootstrap.
+            // No duplicate handler needed here — just keep the process alive.
         }
         catch (error) {
             restoreOutput();
@@ -360,4 +865,61 @@ export default class Serve extends Command {
         }
     }
 }
+/**
+ * Best-effort driver introspection.
+ *
+ * Drivers register themselves under the kernel service name
+ * `driver.{driver.name}` (see `DriverPlugin.init`). We probe a list of
+ * well-known names and return a single-line label + redacted URL so the
+ * startup banner can show *something* even when the driver wasn't
+ * registered through this command's own `OS_DATABASE_URL` fallback
+ * (e.g. when the example app's preset or `ProjectKernelFactory` wired
+ * it). Returns `null` when nothing matches; the caller treats that as
+ * "no driver info available" and skips the line.
+ */
+function describeRegisteredDriver(kernel) {
+    const candidates = [
+        'driver.com.objectstack.driver.sql',
+        'driver.com.objectstack.driver.mongodb',
+        'driver.com.objectstack.driver.turso',
+        'driver.com.objectstack.driver.memory',
+        'driver.sql', 'driver.mongodb', 'driver.turso', 'driver.memory',
+    ];
+    for (const name of candidates) {
+        let driver;
+        try {
+            driver = kernel?.getService?.(name);
+        }
+        catch { /* not registered */ }
+        if (!driver)
+            continue;
+        // SqlDriver: `{ client, connection: string | { filename, host, ... } }`
+        const cfg = driver.config;
+        if (cfg) {
+            const client = cfg.client;
+            const conn = cfg.connection;
+            let url = '';
+            if (typeof conn === 'string') {
+                url = conn;
+            }
+            else if (conn && typeof conn === 'object') {
+                url = conn.filename
+                    ?? (conn.host ? `${conn.host}${conn.port ? `:${conn.port}` : ''}${conn.database ? `/${conn.database}` : ''}` : '');
+            }
+            const label = client ? `SqlDriver(${client})` : (driver.name ?? 'SqlDriver');
+            return { label, url: url || '(unknown)' };
+        }
+        // MongoDB / Turso drivers expose the URL on the instance itself.
+        if (driver.url) {
+            const label = driver.constructor?.name ?? driver.name ?? 'Driver';
+            return { label, url: String(driver.url) };
+        }
+        // InMemoryDriver — no URL.
+        return {
+            label: driver.constructor?.name ?? driver.name ?? 'Driver',
+            url: '(in-memory)',
+        };
+    }
+    return null;
+}
 //# sourceMappingURL=serve.js.map