@zintrust/core 0.4.13 → 0.4.15

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zintrust/core",
-  "version": "0.4.13",
+  "version": "0.4.15",
   "description": "Production-grade TypeScript backend framework for JavaScript",
   "homepage": "https://zintrust.com",
   "repository": {

package/src/boot/bootstrap.js

@@ -199,9 +199,11 @@ const BootstrapFunctions = Object.freeze({
             // (This is driven by src/zintrust.plugins.ts generated by `zin plugin install`.)
             try {
                 const { PluginAutoImports } = await import('../runtime/PluginAutoImports.js');
-                const officialImports = await PluginAutoImports.tryImportRuntimeAutoImports('base');
-                if (!officialImports.ok) {
-                    Logger.warn('Official plugin auto-imports failed:', ErrorFactory.createGeneralError('officialImports', officialImports.errorMessage));
+                if (appConfig.dockerWorker === true) {
+                    const officialImports = await PluginAutoImports.tryImportRuntimeAutoImports('base');
+                    if (!officialImports.ok) {
+                        Logger.warn('Official plugin auto-imports failed:', ErrorFactory.createGeneralError('officialImports', officialImports.errorMessage));
+                    }
                 }
                 const projectImports = await PluginAutoImports.tryImportProjectAutoImports();
                 if (!projectImports.ok && projectImports.reason !== 'not-found') {

package/src/boot/registry/registerRoute.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"registerRoute.d.ts","sourceRoot":"","sources":["../../../../src/boot/registry/registerRoute.ts"],"names":[],"mappings":"AAEA,OAAO,EAAU,KAAK,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAW3D,eAAO,MAAM,kBAAkB,QAAO,OAKrC,CAAC;AAEF,eAAO,MAAM,iBAAiB,GAAU,CAAC,EAAE,YAAY,MAAM,KAAG,OAAO,CAAC,CAAC,GAAG,SAAS,CAMpF,CAAC;AAEF,eAAO,MAAM,kBAAkB,GAAU,CAAC,EAAE,YAAY,MAAM,KAAG,OAAO,CAAC,CAAC,GAAG,SAAS,CAOrF,CAAC;AA4FF,eAAO,MAAM,oBAAoB,GAC/B,kBAAkB,MAAM,EACxB,QAAQ,OAAO,KACd,OAAO,CAAC,IAAI,CAoBd,CAAC"}
+{"version":3,"file":"registerRoute.d.ts","sourceRoot":"","sources":["../../../../src/boot/registry/registerRoute.ts"],"names":[],"mappings":"AAEA,OAAO,EAAU,KAAK,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAc3D,eAAO,MAAM,kBAAkB,QAAO,OAKrC,CAAC;AAEF,eAAO,MAAM,iBAAiB,GAAU,CAAC,EAAE,YAAY,MAAM,KAAG,OAAO,CAAC,CAAC,GAAG,SAAS,CAMpF,CAAC;AAEF,eAAO,MAAM,kBAAkB,GAAU,CAAC,EAAE,YAAY,MAAM,KAAG,OAAO,CAAC,CAAC,GAAG,SAAS,CAOrF,CAAC;AA2LF,eAAO,MAAM,oBAAoB,GAC/B,kBAAkB,MAAM,EACxB,QAAQ,OAAO,KACd,OAAO,CAAC,IAAI,CAqBd,CAAC"}

package/src/boot/registry/registerRoute.js

@@ -1,8 +1,7 @@
 import { appConfig } from '../../config/index.js';
 import Logger from '../../config/logger.js';
 import { Router } from '../../routes/Router.js';
-import { isObject } from '../../helper/index.js';
-import { getServicePrefix } from '../../microservices/ServiceManifest.js';
+import { isNonEmptyString, isObject } from '../../helper/index.js';
 import * as path from '../../node-singletons/path.js';
 import { pathToFileURL } from '../../node-singletons/url.js';
 import { detectRuntime } from '../../runtime/detectRuntime.js';
@@ -63,28 +62,96 @@ const registerAppRoutes = async (resolvedBasePath, router) => {
         mod.registerRoutes(router);
     }
 };
-const registerManifestRoutes = async (router) => {
+const getProjectRoot = () => {
+    const fromEnv = process.env?.['ZINTRUST_PROJECT_ROOT'] ?? '';
+    if (fromEnv.trim() !== '')
+        return fromEnv.trim();
+    return process.cwd();
+};
+const resolveManifestServiceEnvDir = (projectRoot, entry) => {
+    const configRoot = entry.configRoot;
+    if (isNonEmptyString(configRoot)) {
+        return path.dirname(path.join(projectRoot, configRoot));
+    }
+    return path.join(projectRoot, 'src', 'services', entry.domain, entry.name);
+};
+const resolveServicePrefix = (entry) => {
+    const prefix = entry.prefix;
+    if (isNonEmptyString(prefix)) {
+        const segments = prefix
+            .split('/')
+            .map((segment) => segment.trim())
+            .filter((segment) => segment !== '');
+        return segments.length === 0 ? '/' : `/${segments.join('/')}`;
+    }
+    return `/${entry.domain}/${entry.name}`;
+};
+const ensureManifestServiceEnvLoaded = async (entry) => {
+    if (isCloudflare)
+        return;
+    if (entry.loadEnv === false)
+        return;
+    const { EnvFileLoader } = await import('../../cli/utils/EnvFileLoader.js');
+    const projectRoot = getProjectRoot();
+    const envPath = resolveManifestServiceEnvDir(projectRoot, entry);
+    EnvFileLoader.ensureLoaded({
+        cwd: projectRoot,
+        includeCwd: true,
+        envPaths: [envPath],
+    });
+};
+const shouldRegisterManifestEntry = (entry, activeService) => {
+    if (entry.monolithEnabled === false || typeof entry.loadRoutes !== 'function') {
+        return false;
+    }
+    if (activeService !== undefined && activeService.id !== entry.id) {
+        return false;
+    }
+    return true;
+};
+const loadRuntimeManifest = async () => {
+    if (isCloudflare) {
+        await ProjectRuntime.tryLoadWorkerRuntime();
+        return;
+    }
     await ProjectRuntime.tryLoadNodeRuntime();
+};
+const registerManifestEntryRoutes = async (router, entry, activeService) => {
+    try {
+        await ensureManifestServiceEnvLoaded(entry);
+        const mod = await entry.loadRoutes?.();
+        const registerRoutes = isObject(mod) ? mod.registerRoutes : undefined;
+        if (typeof registerRoutes === 'function') {
+            registerLoadedRoutes(router, entry, registerRoutes, activeService);
+        }
+    }
+    catch (error) {
+        Logger.warn(`Failed to register manifest routes for ${entry.id}`, error);
+    }
+};
+const registerLoadedRoutes = (router, entry, registerRoutes, activeService) => {
+    const servicePrefix = resolveServicePrefix(entry);
+    if (activeService?.id === entry.id) {
+        registerRoutes(router);
+        return;
+    }
+    Router.group(router, servicePrefix, (scopedRouter) => {
+        registerRoutes(scopedRouter);
+    });
+};
+const registerManifestRoutes = async (router) => {
+    await loadRuntimeManifest();
     const serviceManifest = ProjectRuntime.getServiceManifest();
     if (serviceManifest.length === 0)
         return;
+    const activeService = ProjectRuntime.getActiveService();
+    if (activeService !== undefined && isCloudflare)
+        return;
     for (const entry of serviceManifest) {
-        if (entry.monolithEnabled === false || typeof entry.loadRoutes !== 'function') {
+        if (!shouldRegisterManifestEntry(entry, activeService))
             continue;
-        }
-        try {
-            // eslint-disable-next-line no-await-in-loop
-            const mod = await entry.loadRoutes();
-            const registerRoutes = isObject(mod) ? mod.registerRoutes : undefined;
-            if (typeof registerRoutes === 'function') {
-                Router.group(router, getServicePrefix(entry), (scopedRouter) => {
-                    registerRoutes(scopedRouter);
-                });
-            }
-        }
-        catch (error) {
-            Logger.warn(`Failed to register manifest routes for ${entry.id}`, error);
-        }
+        // eslint-disable-next-line no-await-in-loop
+        await registerManifestEntryRoutes(router, entry, activeService);
     }
 };
 const registerFrameworkRoutes = async (resolvedBasePath, router) => {
@@ -104,14 +171,15 @@ const registerGlobalRoutes = (router) => {
 };
 export const registerMasterRoutes = async (resolvedBasePath, router) => {
     try {
+        const activeService = ProjectRuntime.getActiveService();
         if (isCloudflare) {
             registerGlobalRoutes(router);
         }
-        if (!isCloudflare) {
+        if (!isCloudflare && activeService === undefined) {
             await registerAppRoutes(resolvedBasePath, router);
         }
         await registerManifestRoutes(router);
-        if (router.routes.length === 0) {
+        if (router.routes.length === 0 && activeService === undefined) {
             await registerFrameworkRoutes(resolvedBasePath, router);
         }
         // Always register core framework routes (health, metrics, doc) after app routes

package/src/cli/PromptHelper.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"PromptHelper.d.ts","sourceRoot":"","sources":["../../../src/cli/PromptHelper.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAIH,MAAM,WAAW,aAAa;IAC5B,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CACpC;AAED;;;GAGG;AACH,eAAO,MAAM,YAAY;IACvB;;OAEG;sBACqB,OAAO,GAAG,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAMlE;;OAEG;8BAC6B,MAAM,gBAAe,OAAO,GAAU,OAAO,CAAC,MAAM,CAAC;IAuBrF;;OAEG;6BAEU,MAAM,gBACJ,OAAO,GACnB,OAAO,CAAC,MAAM,CAAC;IAuBlB;;OAEG;uBACqB,MAAM,gBAAsB,OAAO,GAAU,OAAO,CAAC,MAAM,CAAC;IAqBpF;;OAEG;uCAEkB,MAAM,EAAE,gBACd,OAAO,GACnB,OAAO,CAAC,MAAM,EAAE,CAAC;IAkBpB;;OAEG;qBAEQ,MAAM,mBACC,OAAO,gBACV,OAAO,GACnB,OAAO,CAAC,OAAO,CAAC;IAiBnB;;OAEG;wBAEQ,MAAM,WACN,MAAM,EAAE,kBACF,MAAM,gBACR,OAAO,GACnB,OAAO,CAAC,MAAM,CAAC;IAkBlB;;OAEG;uBAEQ,MAAM,iBACD,MAAM,gBACP,OAAO,GACnB,OAAO,CAAC,MAAM,CAAC;EAgBlB,CAAC"}
+{"version":3,"file":"PromptHelper.d.ts","sourceRoot":"","sources":["../../../src/cli/PromptHelper.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAIH,MAAM,WAAW,aAAa;IAC5B,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CACpC;AAED;;;GAGG;AACH,eAAO,MAAM,YAAY;IACvB;;OAEG;sBACqB,OAAO,GAAG,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAMlE;;OAEG;8BAC6B,MAAM,gBAAe,OAAO,GAAU,OAAO,CAAC,MAAM,CAAC;IAuBrF;;OAEG;6BAEU,MAAM,gBACJ,OAAO,GACnB,OAAO,CAAC,MAAM,CAAC;IAwBlB;;OAEG;uBACqB,MAAM,gBAAsB,OAAO,GAAU,OAAO,CAAC,MAAM,CAAC;IAqBpF;;OAEG;uCAEkB,MAAM,EAAE,gBACd,OAAO,GACnB,OAAO,CAAC,MAAM,EAAE,CAAC;IAkBpB;;OAEG;qBAEQ,MAAM,mBACC,OAAO,gBACV,OAAO,GACnB,OAAO,CAAC,OAAO,CAAC;IAiBnB;;OAEG;wBAEQ,MAAM,WACN,MAAM,EAAE,kBACF,MAAM,gBACR,OAAO,GACnB,OAAO,CAAC,MAAM,CAAC;IAkBlB;;OAEG;uBAEQ,MAAM,iBACD,MAAM,gBACP,OAAO,GACnB,OAAO,CAAC,MAAM,CAAC;EAgBlB,CAAC"}

package/src/cli/PromptHelper.js

@@ -54,6 +54,7 @@ export const PromptHelper = Object.freeze({
                     { name: 'PostgreSQL — Production-ready relational DB', value: 'postgresql' },
                     { name: 'MySQL — Production-ready relational DB', value: 'mysql' },
                     { name: 'SQLite — Local dev (file-based)', value: 'sqlite' },
+                    { name: 'd1 — Cloudflare D1 database', value: 'd1' },
                     { name: 'd1-proxy — Cloudflare D1 via HTTPS proxy', value: 'd1-remote' },
                 ],
                 default: defaultDb,

package/src/cli/commands/NewCommand.d.ts

@@ -4,7 +4,7 @@
  */
 import type { CommandOptions, IBaseCommand } from '../BaseCommand';
 type TemplateType = 'basic' | 'api' | 'microservice' | 'fullstack';
-type DatabaseType = 'sqlite' | 'mysql' | 'postgresql' | 'mongodb' | 'd1-remote';
+type DatabaseType = 'sqlite' | 'mysql' | 'postgresql' | 'mongodb' | 'd1' | 'd1-remote';
 interface NewProjectConfigResult {
     template: TemplateType;
     database: DatabaseType;

package/src/cli/commands/NewCommand.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"NewCommand.d.ts","sourceRoot":"","sources":["../../../../src/cli/commands/NewCommand.ts"],"names":[],"mappings":"AAAA;;;GAGG;AACH,OAAO,KAAK,EAAE,cAAc,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAgBrE,KAAK,YAAY,GAAG,OAAO,GAAG,KAAK,GAAG,cAAc,GAAG,WAAW,CAAC;AACnE,KAAK,YAAY,GAAG,QAAQ,GAAG,OAAO,GAAG,YAAY,GAAG,SAAS,GAAG,WAAW,CAAC;AAYhF,UAAU,sBAAsB;IAC9B,QAAQ,EAAE,YAAY,CAAC;IACvB,QAAQ,EAAE,YAAY,CAAC;IACvB,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;IACf,WAAW,EAAE,MAAM,CAAC;CACrB;AAED,KAAK,gBAAgB,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;AAwPhD,UAAU,WAAY,SAAQ,YAAY;IACxC,eAAe,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,cAAc,GAAG,OAAO,CAAC,sBAAsB,CAAC,CAAC;IACxF,gBAAgB,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,cAAc,GAAG,OAAO,CAAC,sBAAsB,CAAC,CAAC;IACzF,YAAY,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,sBAAsB,GAAG,gBAAgB,EAAE,CAAC;IACjF,UAAU,IAAI,MAAM,CAAC,UAAU,CAAC;IAChC,YAAY,IAAI,MAAM,CAAC;IACvB,cAAc,CACZ,QAAQ,EAAE,MAAM,EAChB,IAAI,EAAE,MAAM,EACZ,MAAM,EAAE,sBAAsB,EAC9B,SAAS,CAAC,EAAE,OAAO,GAClB,OAAO,CAAC,OAAO,CAAC,CAAC;IACpB,aAAa,CAAC,WAAW,EAAE,MAAM,GAAG,IAAI,CAAC;IACzC,uBAAuB,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAAC;CACpE;AA0RD;;;GAGG;AACH,eAAO,MAAM,UAAU;IACrB;;OAEG;cACO,WAAW;EAGrB,CAAC"}
+{"version":3,"file":"NewCommand.d.ts","sourceRoot":"","sources":["../../../../src/cli/commands/NewCommand.ts"],"names":[],"mappings":"AAAA;;;GAGG;AACH,OAAO,KAAK,EAAE,cAAc,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAgBrE,KAAK,YAAY,GAAG,OAAO,GAAG,KAAK,GAAG,cAAc,GAAG,WAAW,CAAC;AACnE,KAAK,YAAY,GAAG,QAAQ,GAAG,OAAO,GAAG,YAAY,GAAG,SAAS,GAAG,IAAI,GAAG,WAAW,CAAC;AAYvF,UAAU,sBAAsB;IAC9B,QAAQ,EAAE,YAAY,CAAC;IACvB,QAAQ,EAAE,YAAY,CAAC;IACvB,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;IACf,WAAW,EAAE,MAAM,CAAC;CACrB;AAED,KAAK,gBAAgB,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;AA0PhD,UAAU,WAAY,SAAQ,YAAY;IACxC,eAAe,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,cAAc,GAAG,OAAO,CAAC,sBAAsB,CAAC,CAAC;IACxF,gBAAgB,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,cAAc,GAAG,OAAO,CAAC,sBAAsB,CAAC,CAAC;IACzF,YAAY,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,sBAAsB,GAAG,gBAAgB,EAAE,CAAC;IACjF,UAAU,IAAI,MAAM,CAAC,UAAU,CAAC;IAChC,YAAY,IAAI,MAAM,CAAC;IACvB,cAAc,CACZ,QAAQ,EAAE,MAAM,EAChB,IAAI,EAAE,MAAM,EACZ,MAAM,EAAE,sBAAsB,EAC9B,SAAS,CAAC,EAAE,OAAO,GAClB,OAAO,CAAC,OAAO,CAAC,CAAC;IACpB,aAAa,CAAC,WAAW,EAAE,MAAM,GAAG,IAAI,CAAC;IACzC,uBAAuB,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAAC;CACpE;AA8RD;;;GAGG;AACH,eAAO,MAAM,UAAU;IACrB;;OAEG;cACO,WAAW;EAGrB,CAAC"}

package/src/cli/commands/NewCommand.js

@@ -54,6 +54,8 @@ const getProjectDefaults = (name, options) => {
         const v = value.trim();
         if (v === 'd1-proxy')
             return 'd1-remote';
+        if (v === 'd1')
+            return 'd1';
         if (v === 'd1-remote')
             return 'd1-remote';
         if (v === 'sqlite')
@@ -99,6 +101,7 @@ const getQuestions = (name, defaults) => {
                 { name: 'sqlite — Local dev (file-based)', value: 'sqlite' },
                 { name: 'postgresql — Production-ready relational DB', value: 'postgresql' },
                 { name: 'mysql — Production-ready relational DB', value: 'mysql' },
+                { name: 'd1 — Cloudflare D1 database', value: 'd1' },
                 { name: 'd1-proxy — Cloudflare D1 via HTTPS proxy', value: 'd1-remote' },
                 { name: 'mongodb — Document DB (may require additional setup)', value: 'mongodb' },
             ],
@@ -223,7 +226,7 @@ const installDependencies = async (projectPath, log, packageManager, force = fal
 const addOptions = (command) => {
     command.argument('<name>', 'Project name');
     command.option('--template <type>', 'Project template (basic, api, microservice, fullstack)', 'basic');
-    command.option('--database <type>', 'Database driver (sqlite, mysql, postgresql)', 'sqlite');
+    command.option('--database <type>', 'Database driver (sqlite, mysql, postgresql, d1, d1-remote, mongodb)', 'sqlite');
     command.option('--port <number>', 'Default port number', '7777');
     command.option('--author <name>', 'Project author');
     command.option('--description <text>', 'Project description');

package/src/cli/commands/StartCommand.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"StartCommand.d.ts","sourceRoot":"","sources":["../../../../src/cli/commands/StartCommand.ts"],"names":[],"mappings":"AAAA,OAAO,EAAoC,KAAK,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAmvBvF,eAAO,MAAM,YAAY;cACb,YAAY;EAmCtB,CAAC"}
+{"version":3,"file":"StartCommand.d.ts","sourceRoot":"","sources":["../../../../src/cli/commands/StartCommand.ts"],"names":[],"mappings":"AAAA,OAAO,EAAoC,KAAK,YAAY,EAAE,MAAM,kBAAkB,CAAC;AA21BvF,eAAO,MAAM,YAAY;cACb,YAAY;EAmCtB,CAAC"}

package/src/cli/commands/StartCommand.js

@@ -2,11 +2,15 @@ import { BaseCommand } from '../BaseCommand.js';
 import { createDenoRunnerSource, createLambdaRunnerSource } from '../commands/runner/index.js';
 import { EnvFileLoader } from '../utils/EnvFileLoader.js';
 import { SpawnUtil } from '../utils/spawn.js';
+import { generateUuid } from '../../common/utility.js';
 import { readEnvString } from '../../common/ExternalServiceUtils.js';
 import * as Common from '../../common/index.js';
 import { ErrorFactory } from '../../exceptions/ZintrustError.js';
-import { existsSync, mkdirSync, readFileSync, writeFileSync } from '../../node-singletons/fs.js';
+import { isNonEmptyString } from '../../helper/index.js';
+import { existsSync, mkdirSync, readFileSync, renameSync, unlinkSync, writeFileSync, } from '../../node-singletons/fs.js';
 import * as path from '../../node-singletons/path.js';
+import { ProjectRuntime } from '../../runtime/ProjectRuntime.js';
+const isWranglerVarName = (value) => /^[A-Za-z_]\w*$/.test(value);
 const isAbsolutePath = (value) => value.startsWith('/') || /^[A-Za-z]:[\\/]/.test(value);
 const resolveNpmPath = () => {
     try {
@@ -231,6 +235,55 @@ const buildStartEnv = (projectRoot) => ({
     ...process.env,
     ZINTRUST_PROJECT_ROOT: projectRoot,
 });
+const buildWorkerDevVarsContent = () => {
+    return (Object.entries(process.env)
+        .filter((entry) => {
+        const [key, value] = entry;
+        return isWranglerVarName(key) && typeof value === 'string';
+    })
+        .map(([key, value]) => `${key}=${JSON.stringify(value)}`)
+        .join('\n') + '\n');
+};
+async function withWranglerEnvSnapshot(cwd, envName, fn) {
+    const normalizedEnv = typeof envName === 'string' ? envName.trim() : '';
+    const targetName = normalizedEnv === '' ? '.dev.vars' : `.dev.vars.${normalizedEnv}`;
+    const targetPath = path.join(cwd, targetName);
+    const backupPath = existsSync(targetPath)
+        ? `${targetPath}.disabled-by-zin-${generateUuid()}`
+        : undefined;
+    if (backupPath !== undefined) {
+        renameSync(targetPath, backupPath);
+    }
+    try {
+        writeFileSync(targetPath, buildWorkerDevVarsContent(), 'utf-8');
+        return await fn();
+    }
+    finally {
+        try {
+            if (existsSync(targetPath))
+                unlinkSync(targetPath);
+        }
+        catch {
+            // noop
+        }
+        if (backupPath !== undefined) {
+            try {
+                if (existsSync(backupPath))
+                    renameSync(backupPath, targetPath);
+            }
+            catch {
+                // noop
+            }
+        }
+    }
+}
+const resolveManifestServiceEnvDir = (projectRoot, entry) => {
+    const configRoot = entry.configRoot;
+    if (isNonEmptyString(configRoot)) {
+        return path.dirname(path.join(projectRoot, configRoot));
+    }
+    return path.join(projectRoot, 'src', 'services', entry.domain, entry.name);
+};
 const ensureStartEnvLoaded = (context, options) => {
     const envPath = resolveEnvPath(options, context.projectRoot);
     const rootEnv = resolveRootEnvPreference(options);
@@ -242,6 +295,28 @@ const ensureStartEnvLoaded = (context, options) => {
         ...(envPath === undefined ? {} : { envPaths: [envPath] }),
     });
 };
+const preloadManifestServiceEnv = async (context, options) => {
+    if (context.cwd !== context.projectRoot)
+        return;
+    if (resolveEnvPath(options, context.projectRoot) !== undefined)
+        return;
+    process.env['ZINTRUST_PROJECT_ROOT'] = context.projectRoot;
+    ProjectRuntime.clear();
+    await ProjectRuntime.tryLoadNodeRuntime();
+    const manifest = ProjectRuntime.getServiceManifest().filter((entry) => entry.monolithEnabled !== false && entry.loadEnv !== false);
+    if (manifest.length === 0)
+        return;
+    const envPaths = manifest
+        .map((entry) => resolveManifestServiceEnvDir(context.projectRoot, entry))
+        .filter((value, index, items) => items.indexOf(value) === index);
+    if (envPaths.length === 0)
+        return;
+    EnvFileLoader.ensureLoaded({
+        cwd: context.projectRoot,
+        includeCwd: resolveRootEnvPreference(options),
+        envPaths,
+    });
+};
 const isFrameworkRepo = (packageJson) => packageJson.name === '@zintrust/core';
 const hasDevScript = (packageJson) => {
     const scripts = packageJson.scripts;
@@ -358,10 +433,12 @@ const executeWranglerStart = async (cmd, context, port, runtime, envName, wrangl
     }
     logMySqlProxyHint(cmd);
     cmd.info('Starting in Wrangler dev mode...');
-    const exitCode = await SpawnUtil.spawnAndWait({
-        command: 'wrangler',
-        args: wranglerArgs,
-        env: buildStartEnv(context.projectRoot),
+    const exitCode = await withWranglerEnvSnapshot(context.cwd, envName, async () => {
+        return SpawnUtil.spawnAndWait({
+            command: 'wrangler',
+            args: wranglerArgs,
+            env: buildStartEnv(context.projectRoot),
+        });
     });
     process.exit(exitCode);
 };
@@ -511,7 +588,9 @@ const executeSplitStart = async (cmd, context, _options) => {
 const executeStart = async (options, cmd) => {
     const cwd = process.cwd();
     const context = resolveStartContext(cwd);
+    process.env['ZINTRUST_PROJECT_ROOT'] = context.projectRoot;
     ensureStartEnvLoaded(context, options);
+    await preloadManifestServiceEnv(context, options);
     const mode = resolveMode(options);
     const port = resolvePort(options);
     const runtime = resolveRuntime(options);

package/src/cli/scaffolding/ProjectScaffolder.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ProjectScaffolder.d.ts","sourceRoot":"","sources":["../../../../src/cli/scaffolding/ProjectScaffolder.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAWH,MAAM,WAAW,sBAAsB;IACrC,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,GAAG,CAAC,EAAE,OAAO,CAAC;IACd,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAED,MAAM,MAAM,cAAc,GAAG,sBAAsB,CAAC;AAEpD,MAAM,WAAW,eAAe;IAC9B,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;IACpB,WAAW,EAAE,MAAM,EAAE,CAAC;IACtB,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CAC/B;AAED,MAAM,WAAW,qBAAqB;IACpC,OAAO,EAAE,OAAO,CAAC;IACjB,WAAW,EAAE,MAAM,CAAC;IACpB,YAAY,EAAE,MAAM,CAAC;IACrB,kBAAkB,EAAE,MAAM,CAAC;IAC3B,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,CAAC,EAAE,KAAK,CAAC;CACf;AAED,MAAM,WAAW,kBAAkB;IACjC,cAAc,CAAC,OAAO,EAAE,sBAAsB,GAAG,IAAI,CAAC;IACtD,YAAY,IAAI,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACxC,eAAe,CAAC,YAAY,CAAC,EAAE,MAAM,GAAG,eAAe,GAAG,SAAS,CAAC;IACpE,cAAc,IAAI,MAAM,CAAC;IACzB,sBAAsB,IAAI,OAAO,CAAC;IAClC,iBAAiB,IAAI,MAAM,CAAC;IAC5B,WAAW,CAAC,OAAO,CAAC,EAAE,sBAAsB,GAAG,MAAM,CAAC;IACtD,gBAAgB,IAAI,OAAO,CAAC;IAC5B,aAAa,IAAI,OAAO,CAAC;IACzB,QAAQ,CAAC,OAAO,EAAE,sBAAsB,GAAG,OAAO,CAAC,qBAAqB,CAAC,CAAC;CAC3E;AAodD,wBAAgB,qBAAqB,IAAI,MAAM,EAAE,CAEhD;AAED,wBAAgB,WAAW,CAAC,IAAI,EAAE,MAAM,GAAG,eAAe,GAAG,SAAS,CAsBrE;AAED,wBAAgB,eAAe,CAAC,OAAO,EAAE,sBAAsB,GAAG;IAChE,KAAK,EAAE,OAAO,CAAC;IACf,MAAM,EAAE,MAAM,EAAE,CAAC;CAClB,CAsBA;AA4ID;;GAEG;AACH,wBAAgB,uBAAuB,CAAC,WAAW,GAAE,MAAsB,GAAG,kBAAkB,CAsB/F;AAED,wBAAsB,eAAe,CACnC,WAAW,EAAE,MAAM,EACnB,OAAO,EAAE,sBAAsB,GAC9B,OAAO,CAAC,qBAAqB,CAAC,CAEhC;AAED;;GAEG;AACH,eAAO,MAAM,iBAAiB;;;;;;EAM5B,CAAC"}
+{"version":3,"file":"ProjectScaffolder.d.ts","sourceRoot":"","sources":["../../../../src/cli/scaffolding/ProjectScaffolder.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAWH,MAAM,WAAW,sBAAsB;IACrC,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,GAAG,CAAC,EAAE,OAAO,CAAC;IACd,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAED,MAAM,MAAM,cAAc,GAAG,sBAAsB,CAAC;AAEpD,MAAM,WAAW,eAAe;IAC9B,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;IACpB,WAAW,EAAE,MAAM,EAAE,CAAC;IACtB,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CAC/B;AAED,MAAM,WAAW,qBAAqB;IACpC,OAAO,EAAE,OAAO,CAAC;IACjB,WAAW,EAAE,MAAM,CAAC;IACpB,YAAY,EAAE,MAAM,CAAC;IACrB,kBAAkB,EAAE,MAAM,CAAC;IAC3B,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,CAAC,EAAE,KAAK,CAAC;CACf;AAED,MAAM,WAAW,kBAAkB;IACjC,cAAc,CAAC,OAAO,EAAE,sBAAsB,GAAG,IAAI,CAAC;IACtD,YAAY,IAAI,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACxC,eAAe,CAAC,YAAY,CAAC,EAAE,MAAM,GAAG,eAAe,GAAG,SAAS,CAAC;IACpE,cAAc,IAAI,MAAM,CAAC;IACzB,sBAAsB,IAAI,OAAO,CAAC;IAClC,iBAAiB,IAAI,MAAM,CAAC;IAC5B,WAAW,CAAC,OAAO,CAAC,EAAE,sBAAsB,GAAG,MAAM,CAAC;IACtD,gBAAgB,IAAI,OAAO,CAAC;IAC5B,aAAa,IAAI,OAAO,CAAC;IACzB,QAAQ,CAAC,OAAO,EAAE,sBAAsB,GAAG,OAAO,CAAC,qBAAqB,CAAC,CAAC;CAC3E;AAodD,wBAAgB,qBAAqB,IAAI,MAAM,EAAE,CAEhD;AAED,wBAAgB,WAAW,CAAC,IAAI,EAAE,MAAM,GAAG,eAAe,GAAG,SAAS,CAsBrE;AAED,wBAAgB,eAAe,CAAC,OAAO,EAAE,sBAAsB,GAAG;IAChE,KAAK,EAAE,OAAO,CAAC;IACf,MAAM,EAAE,MAAM,EAAE,CAAC;CAClB,CAsBA;AA6ID;;GAEG;AACH,wBAAgB,uBAAuB,CAAC,WAAW,GAAE,MAAsB,GAAG,kBAAkB,CAsB/F;AAED,wBAAsB,eAAe,CACnC,WAAW,EAAE,MAAM,EACnB,OAAO,EAAE,sBAAsB,GAC9B,OAAO,CAAC,qBAAqB,CAAC,CAEhC;AAED;;GAEG;AACH,eAAO,MAAM,iBAAiB;;;;;;EAM5B,CAAC"}

package/src/cli/scaffolding/ProjectScaffolder.js

@@ -480,6 +480,7 @@ dist/
 .env
 .env.*
 .env.local
+.dev*
 .DS_Store
 coverage/
 logs/

package/src/cli/scaffolding/ServiceScaffolder.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ServiceScaffolder.d.ts","sourceRoot":"","sources":["../../../../src/cli/scaffolding/ServiceScaffolder.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAMH,MAAM,WAAW,cAAc;IAC7B,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,QAAQ,CAAC,EAAE,QAAQ,GAAG,UAAU,CAAC;IACjC,IAAI,CAAC,EAAE,SAAS,GAAG,KAAK,GAAG,MAAM,GAAG,QAAQ,CAAC;IAC7C,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,UAAU,CAAC,EAAE,OAAO,CAAC;CACtB;AAED,MAAM,WAAW,qBAAqB;IACpC,OAAO,EAAE,OAAO,CAAC;IACjB,WAAW,EAAE,MAAM,CAAC;IACpB,WAAW,EAAE,MAAM,CAAC;IACpB,YAAY,EAAE,MAAM,EAAE,CAAC;IACvB,OAAO,EAAE,MAAM,CAAC;CACjB;AAUD;;GAEG;AAEH;;GAEG;AACH,wBAAgB,eAAe,CAAC,OAAO,EAAE,cAAc,GAAG;IAAE,KAAK,EAAE,OAAO,CAAC;IAAC,MAAM,EAAE,MAAM,EAAE,CAAA;CAAE,CAuB7F;AAED;;GAEG;AACH,wBAAgB,cAAc,CAAC,WAAW,EAAE,MAAM,EAAE,OAAO,EAAE,cAAc,GAAG,MAAM,CAGnF;AAED;;GAEG;AAEH,wBAAgB,QAAQ,CACtB,WAAW,EAAE,MAAM,EACnB,OAAO,EAAE,cAAc,GACtB,OAAO,CAAC,qBAAqB,CAAC,CAiDhC;AAgcD,eAAO,MAAM,iBAAiB;;;;EAI5B,CAAC"}
+{"version":3,"file":"ServiceScaffolder.d.ts","sourceRoot":"","sources":["../../../../src/cli/scaffolding/ServiceScaffolder.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAMH,MAAM,WAAW,cAAc;IAC7B,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,QAAQ,CAAC,EAAE,QAAQ,GAAG,UAAU,CAAC;IACjC,IAAI,CAAC,EAAE,SAAS,GAAG,KAAK,GAAG,MAAM,GAAG,QAAQ,CAAC;IAC7C,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,UAAU,CAAC,EAAE,OAAO,CAAC;CACtB;AAED,MAAM,WAAW,qBAAqB;IACpC,OAAO,EAAE,OAAO,CAAC;IACjB,WAAW,EAAE,MAAM,CAAC;IACpB,WAAW,EAAE,MAAM,CAAC;IACpB,YAAY,EAAE,MAAM,EAAE,CAAC;IACvB,OAAO,EAAE,MAAM,CAAC;CACjB;AAaD;;GAEG;AAEH;;GAEG;AACH,wBAAgB,eAAe,CAAC,OAAO,EAAE,cAAc,GAAG;IAAE,KAAK,EAAE,OAAO,CAAC;IAAC,MAAM,EAAE,MAAM,EAAE,CAAA;CAAE,CAuB7F;AAED;;GAEG;AACH,wBAAgB,cAAc,CAAC,WAAW,EAAE,MAAM,EAAE,OAAO,EAAE,cAAc,GAAG,MAAM,CAGnF;AAED;;GAEG;AAEH,wBAAgB,QAAQ,CACtB,WAAW,EAAE,MAAM,EACnB,OAAO,EAAE,cAAc,GACtB,OAAO,CAAC,qBAAqB,CAAC,CAiDhC;AAocD,eAAO,MAAM,iBAAiB;;;;EAI5B,CAAC"}

package/src/cli/scaffolding/ServiceScaffolder.js

@@ -9,6 +9,7 @@ const coreModuleSpecifier = ['@zintrust', 'core'].join('/');
 const coreStartModuleSpecifier = `${coreModuleSpecifier}/start`;
 const serviceManifestImportExpression = "import('./bootstrap/service-manifest.ts').catch(() => import('./bootstrap/service-manifest.js'))";
 const buildRouteImportExpression = (domain, serviceName) => `import('../services/${domain}/${serviceName}/routes/api.ts').catch(() => import('../services/${domain}/${serviceName}/routes/api.js'))`;
+const getServiceConfigRoot = (domain, serviceName) => `src/services/${domain}/${serviceName}/config`;
 /**
  * ServiceScaffolder generates microservices with all necessary files
  */
@@ -107,7 +108,9 @@ export const serviceManifest: ReadonlyArray<ServiceManifestEntry> = [
     id: '${serviceId}',
     domain: '${domain}',
     name: '${options.name}',
+    configRoot: '${getServiceConfigRoot(domain, options.name)}',
     prefix: '${serviceId}',
+    loadEnv: false,
     port: ${options.port ?? 3001},
     monolithEnabled: true,
     loadRoutes: async () => ${routeImportExpression},
@@ -148,7 +151,9 @@ function updateServiceManifest(projectRoot, options) {
     id: '${serviceId}',
     domain: '${domain}',
     name: '${options.name}',
+    configRoot: '${getServiceConfigRoot(domain, options.name)}',
     prefix: '${serviceId}',
+    loadEnv: false,
     port: ${options.port ?? 3001},
     monolithEnabled: true,
     loadRoutes: async () => ${routeImportExpression},
@@ -236,7 +241,7 @@ function generateServiceConfig(options) {
 function generateServiceIndex(options) {
     const domain = options.domain ?? 'default';
     const serviceId = `${domain}/${options.name}`;
-    const configRoot = `src/services/${domain}/${options.name}/config`;
+    const configRoot = getServiceConfigRoot(domain, options.name);
     return `/**
  * ${options.name} Service - Entry Point
  * Port: ${options.port ?? 3001}

package/src/config/env.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"env.d.ts","sourceRoot":"","sources":["../../../src/config/env.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAEhD,MAAM,MAAM,SAAS,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,CAAC,MAAM,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC;AAuBlF,eAAO,MAAM,cAAc,QAAO,WAAW,GAAG,SAAwB,CAAC;AAEzE,eAAO,MAAM,mBAAmB,GAAI,UAAU,MAAM,EAAE,WAAW,MAAM,KAAG,MAKzE,CAAC;AAGF,eAAO,MAAM,GAAG,GAAI,KAAK,MAAM,EAAE,eAAe,MAAM,KAAG,MAIxD,CAAC;AAEF,eAAO,MAAM,MAAM,GAAI,KAAK,MAAM,EAAE,cAAc,MAAM,KAAG,MAI1D,CAAC;AAEF,eAAO,MAAM,QAAQ,GAAI,KAAK,MAAM,EAAE,eAAe,MAAM,KAAG,MAI7D,CAAC;AAEF,eAAO,MAAM,OAAO,GAAI,KAAK,MAAM,EAAE,eAAe,OAAO,KAAG,OAI7D,CAAC;AAEF,eAAO,MAAM,GAAG,GAAI,KAAK,MAAM,EAAE,OAAO,MAAM,KAAG,IAGhD,CAAC;AAEF,eAAO,MAAM,KAAK,GAAI,KAAK,MAAM,KAAG,IAInC,CAAC;AAEF,eAAO,MAAM,SAAS,GAAI,QAAQ,SAAS,GAAG,IAAI,KAAG,IAEpD,CAAC;AAEF,eAAO,MAAM,QAAQ,QAAO,MAAM,CAAC,MAAM,EAAE,MAAM,CAOhD,CAAC;AAEF,eAAO,MAAM,kBAAkB,QAAO,OAAO,GAAG,MAAM,GAAG,MAAM,GAAG,OAKjE,CAAC;AACF,eAAO,MAAM,mBAAmB,QAAuC,CAAC;AAKxE,eAAO,MAAM,GAAG;eA3DS,MAAM,iBAAiB,MAAM,KAAG,MAAM;kBAMnC,MAAM,gBAAgB,MAAM,KAAG,MAAM;mBAYpC,MAAM,iBAAiB,OAAO,KAAG,OAAO;oBANvC,MAAM,iBAAiB,MAAM,KAAG,MAAM;eAY3C,MAAM,SAAS,MAAM,KAAG,IAAI;iBAK1B,MAAM,KAAG,IAAI;wBAMN,SAAS,GAAG,IAAI,KAAG,IAAI;oBAI7B,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC;cAgCJ,MAAM,CAAC,UAAU,CAAC,UAAU,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;eAgOpB,OAAO,GAAG,MAAM,GAAG,MAAM,GAAG,OAAO;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAoFxF,CAAC;AAEH,eAAO,MAAM,aAAa,QAAO,MAchC,CAAC"}
+{"version":3,"file":"env.d.ts","sourceRoot":"","sources":["../../../src/config/env.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAEhD,MAAM,MAAM,SAAS,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,CAAC,MAAM,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC;AAsClF,eAAO,MAAM,cAAc,QAAO,WAAW,GAAG,SAAwB,CAAC;AAEzE,eAAO,MAAM,mBAAmB,GAAI,UAAU,MAAM,EAAE,WAAW,MAAM,KAAG,MAKzE,CAAC;AAGF,eAAO,MAAM,GAAG,GAAI,KAAK,MAAM,EAAE,eAAe,MAAM,KAAG,MAIxD,CAAC;AAEF,eAAO,MAAM,MAAM,GAAI,KAAK,MAAM,EAAE,cAAc,MAAM,KAAG,MAI1D,CAAC;AAEF,eAAO,MAAM,QAAQ,GAAI,KAAK,MAAM,EAAE,eAAe,MAAM,KAAG,MAI7D,CAAC;AAEF,eAAO,MAAM,OAAO,GAAI,KAAK,MAAM,EAAE,eAAe,OAAO,KAAG,OAI7D,CAAC;AAEF,eAAO,MAAM,GAAG,GAAI,KAAK,MAAM,EAAE,OAAO,MAAM,KAAG,IAGhD,CAAC;AAEF,eAAO,MAAM,KAAK,GAAI,KAAK,MAAM,KAAG,IAInC,CAAC;AAEF,eAAO,MAAM,SAAS,GAAI,QAAQ,SAAS,GAAG,IAAI,KAAG,IAEpD,CAAC;AAEF,eAAO,MAAM,QAAQ,QAAO,MAAM,CAAC,MAAM,EAAE,MAAM,CAOhD,CAAC;AAEF,eAAO,MAAM,kBAAkB,QAAO,OAAO,GAAG,MAAM,GAAG,MAAM,GAAG,OAKjE,CAAC;AACF,eAAO,MAAM,mBAAmB,QAAuC,CAAC;AAKxE,eAAO,MAAM,GAAG;eA3DS,MAAM,iBAAiB,MAAM,KAAG,MAAM;kBAMnC,MAAM,gBAAgB,MAAM,KAAG,MAAM;mBAYpC,MAAM,iBAAiB,OAAO,KAAG,OAAO;oBANvC,MAAM,iBAAiB,MAAM,KAAG,MAAM;eAY3C,MAAM,SAAS,MAAM,KAAG,IAAI;iBAK1B,MAAM,KAAG,IAAI;wBAMN,SAAS,GAAG,IAAI,KAAG,IAAI;oBAI7B,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC;cAgCJ,MAAM,CAAC,UAAU,CAAC,UAAU,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;eAgOpB,OAAO,GAAG,MAAM,GAAG,MAAM,GAAG,OAAO;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAoFxF,CAAC;AAEH,eAAO,MAAM,aAAa,QAAO,MAchC,CAAC"}

package/src/config/env.js

@@ -8,11 +8,24 @@
 // Cache process check once at module load time
 const processLike = typeof process === 'undefined' ? undefined : process;
 let externalEnvSource = null;
+const getGlobalEnv = () => {
+    const env = globalThis.env;
+    if (env === undefined || env === null || typeof env !== 'object')
+        return undefined;
+    return env;
+};
 const getEnvSource = () => {
     if (typeof externalEnvSource === 'function')
         return externalEnvSource();
     if (externalEnvSource !== null)
         return externalEnvSource;
+    const globalEnv = getGlobalEnv();
+    if (globalEnv !== undefined) {
+        return {
+            ...processLike?.env,
+            ...globalEnv,
+        };
+    }
     return processLike?.env ?? {};
 };
 const normalizeEnvValue = (value) => {

package/src/functions/cloudflare.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"cloudflare.d.ts","sourceRoot":"","sources":["../../../src/functions/cloudflare.ts"],"names":[],"mappings":";mBAmIuB,OAAO,QAAQ,OAAO,QAAQ,OAAO,GAAG,OAAO,CAAC,QAAQ,CAAC;;AADhF,wBAmCE"}
+{"version":3,"file":"cloudflare.d.ts","sourceRoot":"","sources":["../../../src/functions/cloudflare.ts"],"names":[],"mappings":";mBA0JuB,OAAO,QAAQ,OAAO,QAAQ,OAAO,GAAG,OAAO,CAAC,QAAQ,CAAC;;AADhF,wBAoCE"}

package/src/functions/cloudflare.js

@@ -101,6 +101,25 @@ const injectIoredisModule = async () => {
     }
 };
 let startupConfigOverridesPromise;
+const WORKER_ENV_SNAPSHOT_KEY = 'ZINTRUST_WORKER_ENV_SNAPSHOT';
+const resolveWorkersEnv = (env) => {
+    const bindings = typeof env === 'object' && env !== null ? { ...env } : {};
+    const rawSnapshot = bindings[WORKER_ENV_SNAPSHOT_KEY];
+    if (typeof rawSnapshot !== 'string' || rawSnapshot.trim() === '') {
+        return bindings;
+    }
+    try {
+        const parsed = JSON.parse(rawSnapshot);
+        Reflect.deleteProperty(bindings, WORKER_ENV_SNAPSHOT_KEY);
+        return {
+            ...parsed,
+            ...bindings,
+        };
+    }
+    catch {
+        return bindings;
+    }
+};
 const ensureStartupConfigOverridesLoaded = async () => {
     startupConfigOverridesPromise ??= applyStartupConfigOverrides();
     await startupConfigOverridesPromise;
@@ -108,8 +127,9 @@ const ensureStartupConfigOverridesLoaded = async () => {
 export default {
     async fetch(request, _env, _ctx) {
         try {
+            const workersEnv = resolveWorkersEnv(_env);
             // Make bindings available to framework code in Workers
-            globalThis.env = _env;
+            globalThis.env = workersEnv;
             const AppRoutes = (await import('@routes/' + 'api.ts'));
             if (AppRoutes !== undefined) {
                 globalThis.__zintrustRoutes = AppRoutes;

package/src/index.js

@@ -1,11 +1,11 @@
 /**
- * @zintrust/core v0.4.13
+ * @zintrust/core v0.4.15
  *
  * ZinTrust Framework - Production-Grade TypeScript Backend
  * Built for performance, type safety, and exceptional developer experience
  *
  * Build Information:
- *   Built: 2026-03-23T14:57:40.299Z
+ *   Built: 2026-03-24T09:07:10.631Z
  *   Node: >=20.0.0
  *   License: MIT
  *
@@ -21,7 +21,7 @@
  * Available at runtime for debugging and health checks
  */
 export const ZINTRUST_VERSION = '0.1.41';
-export const ZINTRUST_BUILD_DATE = '2026-03-23T14:57:40.266Z'; // Replaced during build
+export const ZINTRUST_BUILD_DATE = '2026-03-24T09:07:10.598Z'; // Replaced during build
 export { Application } from './boot/Application.js';
 export { AwsSigV4 } from './common/index.js';
 export { SignedRequest } from './security/SignedRequest.js';

package/src/microservices/ServiceManifest.d.ts

@@ -4,6 +4,8 @@ export interface ServiceManifestEntry {
     domain: string;
     name: string;
     prefix?: string;
+    configRoot?: string;
+    loadEnv?: boolean;
     version?: string;
     description?: string;
     port?: number;

package/src/microservices/ServiceManifest.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ServiceManifest.d.ts","sourceRoot":"","sources":["../../../src/microservices/ServiceManifest.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"ServiceManifest.d.ts","sourceRoot":"","sources":["../../../src/microservices/ServiceManifest.ts"],"names":[],"mappings":"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"}

package/src/microservices/ServiceManifest.js

@@ -46,6 +46,14 @@ export const isServiceManifestEntry = (value) => {
     if (prefix !== undefined && typeof prefix !== 'string') {
         return false;
     }
+    const configRoot = value['configRoot'];
+    if (configRoot !== undefined && typeof configRoot !== 'string') {
+        return false;
+    }
+    const loadEnv = value['loadEnv'];
+    if (loadEnv !== undefined && typeof loadEnv !== 'boolean') {
+        return false;
+    }
     const loadRoutes = value['loadRoutes'];
     if (loadRoutes !== undefined && !isFunction(loadRoutes)) {
         return false;
@@ -59,6 +67,8 @@ export const normalizeServiceManifest = (value) => {
         ...entry,
         id: toCanonicalServiceId(entry),
         prefix: getServicePrefix(entry),
+        ...(isNonEmptyString(entry.configRoot) ? { configRoot: entry.configRoot } : {}),
+        loadEnv: entry.loadEnv !== false,
         monolithEnabled: entry.monolithEnabled !== false,
     }));
 };

package/src/orm/Database.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Database.d.ts","sourceRoot":"","sources":["../../../src/orm/Database.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAOH,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AAWxD,OAAO,KAAK,EAAE,cAAc,EAAE,gBAAgB,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAE1F,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAGvD,MAAM,MAAM,QAAQ,GAAG;IAAE,KAAK,EAAE,MAAM,CAAA;CAAE,CAAC;AAEzC,MAAM,WAAW,SAAS;IACxB,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IACzB,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IAC5B,WAAW,IAAI,OAAO,CAAC;IACvB,KAAK,CAAC,GAAG,EAAE,MAAM,EAAE,UAAU,CAAC,EAAE,OAAO,EAAE,EAAE,MAAM,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC,CAAC;IACjF,QAAQ,CAAC,GAAG,EAAE,MAAM,EAAE,UAAU,CAAC,EAAE,OAAO,EAAE,EAAE,MAAM,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;IAClF,OAAO,CAAC,GAAG,EAAE,MAAM,EAAE,UAAU,CAAC,EAAE,OAAO,EAAE,EAAE,MAAM,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,WAAW,CAAC,CAAC;IACrF,GAAG,CAAC,KAAK,EAAE,MAAM,GAAG,QAAQ,CAAC;IAC7B,WAAW,CAAC,CAAC,EAAE,QAAQ,EAAE,CAAC,EAAE,EAAE,SAAS,KAAK,OAAO,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;IACpE,KAAK,CAAC,IAAI,EAAE,MAAM,GAAG,aAAa,CAAC;IACnC,aAAa,CAAC,OAAO,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,KAAK,IAAI,GAAG,IAAI,CAAC;IACzE,YAAY,CAAC,OAAO,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,EAAE,QAAQ,EAAE,MAAM,KAAK,IAAI,GAAG,IAAI,CAAC;IAC1F,cAAc,CAAC,OAAO,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,KAAK,IAAI,GAAG,IAAI,CAAC;IAC1E,aAAa,CAAC,OAAO,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,EAAE,QAAQ,EAAE,MAAM,KAAK,IAAI,GAAG,IAAI,CAAC;IAC3F,kBAAkB,CAAC,MAAM,CAAC,EAAE,OAAO,GAAG,gBAAgB,CAAC;IACvD,OAAO,IAAI,eAAe,CAAC;IAC3B,SAAS,IAAI,cAAc,CAAC;IAC5B,OAAO,IAAI,IAAI,CAAC;CACjB;AAqhBD,eAAO,MAAM,QAAQ;IACnB;;OAEG;oBACa,cAAc,GAAG,SAAS;EAI1C,CAAC;AAIH,eAAO,MAAM,oBAAoB,GAC/B,SAAQ,cAAc,GAAG,SAAqB,EAC9C,uBAA0B,KACzB,OAAO,CAAC,UAAU,CAAC,OAAO,WAAW,CAAC,CAMxC,CAAC;AAEF,wBAAgB,WAAW,CAAC,MAAM,CAAC,EAAE,cAAc,EAAE,UAAU,SAAY,GAAG,SAAS,CAoBtF;AAED,wBAAsB,aAAa,IAAI,OAAO,CAAC,IAAI,CAAC,CAWnD"}
+{"version":3,"file":"Database.d.ts","sourceRoot":"","sources":["../../../src/orm/Database.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAOH,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AAYxD,OAAO,KAAK,EAAE,cAAc,EAAE,gBAAgB,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAE1F,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAGvD,MAAM,MAAM,QAAQ,GAAG;IAAE,KAAK,EAAE,MAAM,CAAA;CAAE,CAAC;AAEzC,MAAM,WAAW,SAAS;IACxB,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IACzB,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IAC5B,WAAW,IAAI,OAAO,CAAC;IACvB,KAAK,CAAC,GAAG,EAAE,MAAM,EAAE,UAAU,CAAC,EAAE,OAAO,EAAE,EAAE,MAAM,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC,CAAC;IACjF,QAAQ,CAAC,GAAG,EAAE,MAAM,EAAE,UAAU,CAAC,EAAE,OAAO,EAAE,EAAE,MAAM,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;IAClF,OAAO,CAAC,GAAG,EAAE,MAAM,EAAE,UAAU,CAAC,EAAE,OAAO,EAAE,EAAE,MAAM,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,WAAW,CAAC,CAAC;IACrF,GAAG,CAAC,KAAK,EAAE,MAAM,GAAG,QAAQ,CAAC;IAC7B,WAAW,CAAC,CAAC,EAAE,QAAQ,EAAE,CAAC,EAAE,EAAE,SAAS,KAAK,OAAO,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;IACpE,KAAK,CAAC,IAAI,EAAE,MAAM,GAAG,aAAa,CAAC;IACnC,aAAa,CAAC,OAAO,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,KAAK,IAAI,GAAG,IAAI,CAAC;IACzE,YAAY,CAAC,OAAO,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,EAAE,QAAQ,EAAE,MAAM,KAAK,IAAI,GAAG,IAAI,CAAC;IAC1F,cAAc,CAAC,OAAO,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,KAAK,IAAI,GAAG,IAAI,CAAC;IAC1E,aAAa,CAAC,OAAO,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,EAAE,QAAQ,EAAE,MAAM,KAAK,IAAI,GAAG,IAAI,CAAC;IAC3F,kBAAkB,CAAC,MAAM,CAAC,EAAE,OAAO,GAAG,gBAAgB,CAAC;IACvD,OAAO,IAAI,eAAe,CAAC;IAC3B,SAAS,IAAI,cAAc,CAAC;IAC5B,OAAO,IAAI,IAAI,CAAC;CACjB;AAqhBD,eAAO,MAAM,QAAQ;IACnB;;OAEG;oBACa,cAAc,GAAG,SAAS;EAI1C,CAAC;AAIH,eAAO,MAAM,oBAAoB,GAC/B,SAAQ,cAAc,GAAG,SAAqB,EAC9C,uBAA0B,KACzB,OAAO,CAAC,UAAU,CAAC,OAAO,WAAW,CAAC,CAMxC,CAAC;AAEF,wBAAgB,WAAW,CAAC,MAAM,CAAC,EAAE,cAAc,EAAE,UAAU,SAAY,GAAG,SAAS,CAsBtF;AAED,wBAAsB,aAAa,IAAI,OAAO,CAAC,IAAI,CAAC,CAYnD"}

package/src/orm/Database.js

@@ -12,6 +12,7 @@ import { D1Adapter } from './adapters/D1Adapter.js';
 import { D1RemoteAdapter } from './adapters/D1RemoteAdapter.js';
 import { MySQLAdapter } from './adapters/MySQLAdapter.js';
 import { MySQLProxyAdapter } from './adapters/MySQLProxyAdapter.js';
+import { DatabaseConnectionRegistry } from './DatabaseConnectionRegistry.js';
 import { PostgreSQLAdapter } from './adapters/PostgreSQLAdapter.js';
 import { PostgreSQLProxyAdapter } from './adapters/PostgreSQLProxyAdapter.js';
 import { SQLiteAdapter } from './adapters/SQLiteAdapter.js';
@@ -432,14 +433,15 @@ export const useEnsureDbConnected = async (config = undefined, connectionName =
 };
 export function useDatabase(config, connection = 'default') {
     if (databaseInstances.has(connection) === false) {
-        if (config === undefined) {
+        const resolvedConfig = config ?? DatabaseConnectionRegistry.get(connection);
+        if (resolvedConfig === undefined) {
             // Diagnostic logging
             Logger.error('[DEBUG] Database instances keys:', Array.from(databaseInstances.keys()));
             Logger.error('[DEBUG] Requesting connection:', connection);
             throw ErrorFactory.createConfigError(`Database connection '${connection}' is not registered. ` +
                 `Call useDatabase(config, '${connection}') during startup to register it.`);
         }
-        databaseInstances.set(connection, Database.create(config));
+        databaseInstances.set(connection, Database.create(resolvedConfig));
     }
     const instance = databaseInstances.get(connection);
     if (instance === undefined) {
@@ -459,4 +461,5 @@ export async function resetDatabase() {
     });
     await Promise.all(promises);
     databaseInstances.clear();
+    DatabaseConnectionRegistry.clear();
 }

package/src/orm/DatabaseConnectionRegistry.d.ts

@@ -0,0 +1,8 @@
+import type { DatabaseConfig } from './DatabaseAdapter';
+export declare const DatabaseConnectionRegistry: Readonly<{
+    clear(): void;
+    set(name: string, config: DatabaseConfig): void;
+    get(name: string): DatabaseConfig | undefined;
+}>;
+export default DatabaseConnectionRegistry;
+//# sourceMappingURL=DatabaseConnectionRegistry.d.ts.map

package/src/orm/DatabaseConnectionRegistry.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"DatabaseConnectionRegistry.d.ts","sourceRoot":"","sources":["../../../src/orm/DatabaseConnectionRegistry.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAI3D,eAAO,MAAM,0BAA0B;aAC5B,IAAI;cAIH,MAAM,UAAU,cAAc,GAAG,IAAI;cAIrC,MAAM,GAAG,cAAc,GAAG,SAAS;EAG7C,CAAC;AAEH,eAAe,0BAA0B,CAAC"}

package/src/orm/DatabaseConnectionRegistry.js

@@ -0,0 +1,13 @@
+const state = new Map();
+export const DatabaseConnectionRegistry = Object.freeze({
+    clear() {
+        state.clear();
+    },
+    set(name, config) {
+        state.set(name, config);
+    },
+    get(name) {
+        return state.get(name);
+    },
+});
+export default DatabaseConnectionRegistry;

package/src/orm/DatabaseRuntimeRegistration.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"DatabaseRuntimeRegistration.d.ts","sourceRoot":"","sources":["../../../src/orm/DatabaseRuntimeRegistration.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,KAAK,EACV,mBAAmB,EAGpB,MAAM,cAAc,CAAC;AA0DtB;;;;;;;GAOG;AACH,wBAAgB,kCAAkC,CAAC,MAAM,EAAE,mBAAmB,GAAG,IAAI,CAYpF"}
+{"version":3,"file":"DatabaseRuntimeRegistration.d.ts","sourceRoot":"","sources":["../../../src/orm/DatabaseRuntimeRegistration.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,KAAK,EACV,mBAAmB,EAGpB,MAAM,cAAc,CAAC;AA4DtB;;;;;;;GAOG;AACH,wBAAgB,kCAAkC,CAAC,MAAM,EAAE,mBAAmB,GAAG,IAAI,CAapF"}

package/src/orm/DatabaseRuntimeRegistration.js

@@ -5,6 +5,7 @@
  * instances that can be selected via `useDatabase(undefined, name)`.
  */
 import { ErrorFactory } from '../exceptions/ZintrustError.js';
+import { DatabaseConnectionRegistry } from './DatabaseConnectionRegistry.js';
 import { useDatabase } from './Database.js';
 const toOrmConfig = (cfg) => {
     switch (cfg.driver) {
@@ -50,9 +51,9 @@ const toOrmConfig = (cfg) => {
     }
 };
 const registerConnections = (connections) => {
+    DatabaseConnectionRegistry.clear();
     for (const [name, runtimeCfg] of Object.entries(connections)) {
-        // Register instance by name; a later call without config may now resolve.
-        useDatabase(toOrmConfig(runtimeCfg), name);
+        DatabaseConnectionRegistry.set(name, toOrmConfig(runtimeCfg));
     }
 };
 import { Logger } from '../config/logger.js';
@@ -71,5 +72,6 @@ export function registerDatabasesFromRuntimeConfig(config) {
         throw ErrorFactory.createConfigError(`Database default connection not configured: ${String(config.default ?? '')}`);
     }
     Logger.info(`✓ Registering default database connection: ${config.default}`);
+    useDatabase(toOrmConfig(defaultCfg), config.default);
     useDatabase(toOrmConfig(defaultCfg), 'default');
 }

package/src/runtime/ProjectBootstrap.d.ts

@@ -0,0 +1,6 @@
+export declare function loadProjectBootstrap(): Promise<void>;
+declare const _default: Readonly<{
+    loadProjectBootstrap: typeof loadProjectBootstrap;
+}>;
+export default _default;
+//# sourceMappingURL=ProjectBootstrap.d.ts.map

package/src/runtime/ProjectBootstrap.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"ProjectBootstrap.d.ts","sourceRoot":"","sources":["../../../src/runtime/ProjectBootstrap.ts"],"names":[],"mappings":"AAgCA,wBAAsB,oBAAoB,IAAI,OAAO,CAAC,IAAI,CAAC,CAU1D;;;;AAED,wBAEG"}

package/src/runtime/ProjectBootstrap.js

@@ -0,0 +1,43 @@
+import { Logger } from '../config/logger.js';
+import { existsSync } from '../node-singletons/fs.js';
+import * as path from '../node-singletons/path.js';
+import { pathToFileURL } from '../node-singletons/url.js';
+const getProjectRoot = () => {
+    const fromEnv = process.env?.['ZINTRUST_PROJECT_ROOT'] ?? '';
+    if (fromEnv.trim() !== '')
+        return fromEnv.trim();
+    return process.cwd();
+};
+const getBootstrapCandidates = (projectRoot) => [
+    path.join(projectRoot, 'src', 'boot', 'bootstrap.ts'),
+    path.join(projectRoot, 'dist', 'src', 'boot', 'bootstrap.js'),
+    path.join(projectRoot, 'src', 'boot', 'bootstrap.js'),
+];
+const tryImportBootstrapCandidate = async (candidate) => {
+    if (!existsSync(candidate))
+        return false;
+    try {
+        await import(pathToFileURL(candidate).href);
+        return true;
+    }
+    catch (error) {
+        Logger.warn('Failed to import project bootstrap candidate', {
+            candidate,
+            error: error instanceof Error ? error.message : String(error),
+        });
+        return false;
+    }
+};
+export async function loadProjectBootstrap() {
+    const projectRoot = getProjectRoot();
+    for (const candidate of getBootstrapCandidates(projectRoot)) {
+        // eslint-disable-next-line no-await-in-loop
+        const loaded = await tryImportBootstrapCandidate(candidate);
+        if (loaded)
+            return;
+    }
+    await import('../boot/bootstrap.js');
+}
+export default Object.freeze({
+    loadProjectBootstrap,
+});

package/src/runtime/ProjectRuntime.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ProjectRuntime.d.ts","sourceRoot":"","sources":["../../../src/runtime/ProjectRuntime.ts"],"names":[],"mappings":"AAEA,OAAO,EAGL,KAAK,oBAAoB,EACzB,KAAK,oBAAoB,EACzB,KAAK,oBAAoB,EAC1B,MAAM,gCAAgC,CAAC;AA2ExC,eAAO,MAAM,cAAc;aAChB,IAAI;iBAIA,oBAAoB,GAAG,SAAS;gBAIjC,OAAO,GAAG,oBAAoB;oCAIV,OAAO,GAAG,oBAAoB,GAAG,SAAS;0BAM9C,OAAO,CAAC,oBAAoB,GAAG,SAAS,CAAC;4BAgBvC,OAAO,CAAC,oBAAoB,GAAG,SAAS,CAAC;0BAejD,aAAa,CAAC,oBAAoB,CAAC;wBAIrC,oBAAoB,GAAG,SAAS;EAGpD,CAAC;AAEH,eAAe,cAAc,CAAC"}
+{"version":3,"file":"ProjectRuntime.d.ts","sourceRoot":"","sources":["../../../src/runtime/ProjectRuntime.ts"],"names":[],"mappings":"AAEA,OAAO,EAGL,KAAK,oBAAoB,EACzB,KAAK,oBAAoB,EACzB,KAAK,oBAAoB,EAC1B,MAAM,gCAAgC,CAAC;AAoGxC,eAAO,MAAM,cAAc;aAChB,IAAI;iBAIA,oBAAoB,GAAG,SAAS;gBAIjC,OAAO,GAAG,oBAAoB;oCAIV,OAAO,GAAG,oBAAoB,GAAG,SAAS;0BAM9C,OAAO,CAAC,oBAAoB,GAAG,SAAS,CAAC;4BAgBvC,OAAO,CAAC,oBAAoB,GAAG,SAAS,CAAC;0BAOjD,aAAa,CAAC,oBAAoB,CAAC;wBAIrC,oBAAoB,GAAG,SAAS;EAGpD,CAAC;AAEH,eAAe,cAAc,CAAC"}

package/src/runtime/ProjectRuntime.js

@@ -33,6 +33,9 @@ const cacheProjectRuntime = (module) => {
 const getCachedProjectRuntime = () => {
     return getRuntimeGlobal().__zintrustProjectRuntime;
 };
+const hasLoadedServiceManifest = (runtime) => {
+    return Array.isArray(runtime?.serviceManifest);
+};
 const tryImportNodeRuntimeCandidate = async (candidate) => {
     if (!existsSync(candidate))
         return undefined;
@@ -49,10 +52,27 @@ const tryImportNodeRuntimeCandidate = async (candidate) => {
         return undefined;
     }
 };
-const tryImportWorkerRuntimeCandidate = async (moduleId) => {
+const tryImportWorkerRuntimeLiteralCandidates = async () => {
     try {
-        const runtimeModule = (await import(moduleId));
-        return cacheProjectRuntime(runtimeModule);
+        return cacheProjectRuntime((await import('../zintrust.runtime.wg.js')));
+    }
+    catch {
+        // continue
+    }
+    try {
+        return cacheProjectRuntime((await import('../zintrust.runtime.js')));
+    }
+    catch {
+        // continue
+    }
+    try {
+        return cacheProjectRuntime((await import('../index.js' + 'zintrust.runtime.wg.js')));
+    }
+    catch {
+        // continue
+    }
+    try {
+        return cacheProjectRuntime((await import('../index.js' + 'zintrust.runtime.js')));
     }
     catch {
         return undefined;
@@ -76,7 +96,7 @@ export const ProjectRuntime = Object.freeze({
     },
     async tryLoadNodeRuntime() {
         const cached = getCachedProjectRuntime();
-        if (cached !== undefined)
+        if (hasLoadedServiceManifest(cached))
             return cached;
         const projectRoot = getProjectRoot();
         const candidates = getNodeRuntimeCandidates(projectRoot);
@@ -90,16 +110,9 @@ export const ProjectRuntime = Object.freeze({
     },
     async tryLoadWorkerRuntime() {
         const cached = getCachedProjectRuntime();
-        if (cached !== undefined)
+        if (hasLoadedServiceManifest(cached))
             return cached;
-        const workerModuleIds = ['../' + 'zintrust.runtime.wg.js', '../' + 'zintrust.runtime.js'];
-        for (const moduleId of workerModuleIds) {
-            // eslint-disable-next-line no-await-in-loop
-            const loaded = await tryImportWorkerRuntimeCandidate(moduleId);
-            if (loaded !== undefined)
-                return loaded;
-        }
-        return undefined;
+        return tryImportWorkerRuntimeLiteralCandidates();
     },
     getServiceManifest() {
         return getCachedProjectRuntime()?.serviceManifest ?? [];

package/src/runtime/WorkerAdapterImports.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"WorkerAdapterImports.d.ts","sourceRoot":"","sources":["../../../src/runtime/WorkerAdapterImports.ts"],"names":[],"mappings":"AAeA,eAAO,MAAM,oBAAoB;;;EAG/B,CAAC"}
+{"version":3,"file":"WorkerAdapterImports.d.ts","sourceRoot":"","sources":["../../../src/runtime/WorkerAdapterImports.ts"],"names":[],"mappings":"AAkCA,eAAO,MAAM,oBAAoB;;;EAG/B,CAAC"}

package/src/runtime/WorkerAdapterImports.js

@@ -1,8 +1,25 @@
 // Worker-only adapter auto-imports for bundler-based runtimes (e.g. Cloudflare Workers).
 // Keep this list limited to database adapters needed by runtime config.
+import { ProjectRuntime } from './ProjectRuntime.js';
+const tryImportProjectRuntime = async () => {
+    try {
+        ProjectRuntime.set(await import('../zintrust.runtime.wg.js'));
+        return;
+    }
+    catch {
+        // continue
+    }
+    try {
+        ProjectRuntime.set(await import('../zintrust.runtime.js'));
+    }
+    catch {
+        // Ignore missing runtime modules. Worker startup can still proceed without them.
+    }
+};
 // These imports resolve against the host project (developer working directory)
 // via the @/ alias configured by the ZinTrust app templates.
 const tryImportOptional = async () => {
+    await tryImportProjectRuntime();
     try {
         await import('../zintrust.plugins.wg.js');
     }

package/src/runtime/WorkersModule.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"WorkersModule.d.ts","sourceRoot":"","sources":["../../../src/runtime/WorkersModule.ts"],"names":[],"mappings":"AAOA,KAAK,aAAa,GAAG,cAAc,mBAAmB,CAAC,CAAC;AACxD,KAAK,kBAAkB,GAAG,cAAc,yBAAyB,CAAC,CAAC;AA+TnE,eAAO,MAAM,iBAAiB,QAAa,OAAO,CAAC,aAAa,CAwB/D,CAAC;AA2CF,eAAO,MAAM,sBAAsB,QAAa,OAAO,CAAC,kBAAkB,CAiBzE,CAAC"}
+{"version":3,"file":"WorkersModule.d.ts","sourceRoot":"","sources":["../../../src/runtime/WorkersModule.ts"],"names":[],"mappings":"AAOA,KAAK,aAAa,GAAG,cAAc,mBAAmB,CAAC,CAAC;AACxD,KAAK,kBAAkB,GAAG,cAAc,yBAAyB,CAAC,CAAC;AAmUnE,eAAO,MAAM,iBAAiB,QAAa,OAAO,CAAC,aAAa,CAwB/D,CAAC;AA4CF,eAAO,MAAM,sBAAsB,QAAa,OAAO,CAAC,kBAAkB,CAkBzE,CAAC"}

package/src/runtime/WorkersModule.js

@@ -194,6 +194,9 @@ const importLocalModule = async (packageDir, packageName) => {
 };
 const importLocalWorkersModule = async () => importLocalModule('workers', '@zintrust/workers');
 const importLocalQueueMonitorModule = async () => importLocalModule('queue-monitor', '@zintrust/queue-monitor');
+const importOptionalPackage = async (specifier) => {
+    return (await import(specifier));
+};
 let workersModulePromise;
 let patchAttempted = false;
 let patchAfterFailureAttempted = false;
@@ -250,7 +253,7 @@ const handleImportFailure = async (error) => {
                 filesChanged,
                 replacements,
             });
-            workersModulePromise = import('@zintrust/workers');
+            workersModulePromise = importOptionalPackage('@zintrust/workers');
             return workersModulePromise;
         }
     }
@@ -283,7 +286,7 @@ export const loadWorkersModule = async () => {
         }
     }
     logWorkersResolverDiagnostics();
-    workersModulePromise ??= import('@zintrust/workers');
+    workersModulePromise ??= importOptionalPackage('@zintrust/workers');
     try {
         return await workersModulePromise;
     }
@@ -307,7 +310,8 @@ const handleQueueMonitorImportFailure = async (error) => {
                 filesChanged,
                 replacements,
             });
-            queueMonitorModulePromise = import('@zintrust/queue-monitor');
+            queueMonitorModulePromise =
+                importOptionalPackage('@zintrust/queue-monitor');
             return queueMonitorModulePromise;
         }
     }
@@ -334,7 +338,8 @@ export const loadQueueMonitorModule = async () => {
             return localFallback;
         }
     }
-    queueMonitorModulePromise ??= import('@zintrust/queue-monitor');
+    queueMonitorModulePromise ??=
+        importOptionalPackage('@zintrust/queue-monitor');
     try {
         return await queueMonitorModulePromise;
     }

package/src/runtime/adapters/CloudflareAdapter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"CloudflareAdapter.d.ts","sourceRoot":"","sources":["../../../../src/runtime/adapters/CloudflareAdapter.ts"],"names":[],"mappings":"AASA,OAAO,KAAK,EACV,aAAa,EAGb,cAAc,EACf,MAAM,yBAAyB,CAAC;AAGjC;;;;GAIG;AACH,eAAO,MAAM,iBAAiB;IAC5B;;OAEG;mBACY,aAAa,GAAG,cAAc;IAwD7C;;;OAGG;qBACc,OAAO;IAKxB;;;OAGG;qBACc,MAAM,GAAG,OAAO;EAIjC,CAAC;AAiKH;;;;GAIG;AACH,MAAM,WAAW,iBAAkB,SAAQ,OAAO;IAChD,GAAG,EAAE,MAAM,CAAC;IACZ,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,OAAO,CAAC;IACjB,IAAI,EAAE,cAAc,CAAC,UAAU,CAAC,CAAC;IACjC,EAAE,CAAC,EAAE;QACH,IAAI,CAAC,EAAE,MAAM,CAAC;QACd,OAAO,CAAC,EAAE,MAAM,CAAC;QACjB,YAAY,CAAC,EAAE,MAAM,CAAC;QACtB,QAAQ,CAAC,EAAE,MAAM,CAAC;QAClB,SAAS,CAAC,EAAE,MAAM,CAAC;QACnB,UAAU,CAAC,EAAE,MAAM,CAAC;QACpB,eAAe,CAAC,EAAE,MAAM,CAAC;KAC1B,CAAC;CACH"}
+{"version":3,"file":"CloudflareAdapter.d.ts","sourceRoot":"","sources":["../../../../src/runtime/adapters/CloudflareAdapter.ts"],"names":[],"mappings":"AASA,OAAO,KAAK,EACV,aAAa,EAGb,cAAc,EACf,MAAM,yBAAyB,CAAC;AAGjC;;;;GAIG;AACH,eAAO,MAAM,iBAAiB;IAC5B;;OAEG;mBACY,aAAa,GAAG,cAAc;IA8D7C;;;OAGG;qBACc,OAAO;IAKxB;;;OAGG;qBACc,MAAM,GAAG,OAAO;EAIjC,CAAC;AAiKH;;;;GAIG;AACH,MAAM,WAAW,iBAAkB,SAAQ,OAAO;IAChD,GAAG,EAAE,MAAM,CAAC;IACZ,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,OAAO,CAAC;IACjB,IAAI,EAAE,cAAc,CAAC,UAAU,CAAC,CAAC;IACjC,EAAE,CAAC,EAAE;QACH,IAAI,CAAC,EAAE,MAAM,CAAC;QACd,OAAO,CAAC,EAAE,MAAM,CAAC;QACjB,YAAY,CAAC,EAAE,MAAM,CAAC;QACtB,QAAQ,CAAC,EAAE,MAAM,CAAC;QAClB,SAAS,CAAC,EAAE,MAAM,CAAC;QACnB,UAAU,CAAC,EAAE,MAAM,CAAC;QACpB,eAAe,CAAC,EAAE,MAAM,CAAC;KAC1B,CAAC;CACH"}

package/src/runtime/adapters/CloudflareAdapter.js

@@ -4,7 +4,7 @@
 import { appConfig } from '../../config/index.js';
 import { isUndefinedOrNull } from '../../helper/index.js';
 import { Cloudflare } from '../../config/cloudflare.js';
-import { Env } from '../../config/env.js';
+import { Env, getProcessLike } from '../../config/env.js';
 import { Logger } from '../../config/logger.js';
 import { createMockHttpObjects, ErrorResponse, HttpResponse } from '../RuntimeAdapter.js';
 /**
@@ -19,7 +19,13 @@ export const CloudflareAdapter = Object.freeze({
     create(config) {
         const workersEnv = Cloudflare.getWorkersEnv();
         if (workersEnv !== null) {
-            Env.setSource(() => workersEnv);
+            const processEnv = getProcessLike()?.env;
+            const resolveEnvSource = () => {
+                if (processEnv === undefined)
+                    return workersEnv;
+                return { ...processEnv, ...workersEnv };
+            };
+            Env.setSource(resolveEnvSource);
         }
         const logger = config.logger ?? createDefaultLogger();
         return {

package/src/start.js

@@ -112,10 +112,8 @@ export const bootStandaloneService = async (importMetaUrl, activeService) => {
 export const start = async () => {
     if (!isNodeRuntime())
         return;
-    // Compiled output places bootstrap at `dist/src/boot/bootstrap.js`.
-    // This file compiles to `dist/src/start.js`, so relative import is stable.
-    // In unit tests, importing bootstrap has heavy side effects (starts server + exits).
-    await import('./boot/bootstrap.js');
+    const projectBootstrapModule = (await import('./runtime/ProjectBootstrap.js'));
+    await projectBootstrapModule.loadProjectBootstrap();
 };
 /**
  * Cloudflare Workers entry (module worker style).

package/src/templates/project/basic/src/zintrust.plugins.wg.ts.tpl

@@ -6,3 +6,8 @@
  */
 
 // Intentionally empty by default.
+
+import { ProjectRuntime } from '@zintrust/core';
+import serviceManifest from './bootstrap/service-manifest';
+
+ProjectRuntime.set({ serviceManifest });