@zintrust/core 0.4.12 → 0.4.14

package/package.json

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

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;AAiKF,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,23 +62,75 @@ const registerAppRoutes = async (resolvedBasePath, router) => {
         mod.registerRoutes(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;
+    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 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 ProjectRuntime.tryLoadNodeRuntime();
     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') {
             continue;
         }
+        if (activeService !== undefined && activeService.id !== entry.id) {
+            continue;
+        }
         try {
+            // eslint-disable-next-line no-await-in-loop
+            await ensureManifestServiceEnvLoaded(entry);
             // 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);
-                });
+                registerLoadedRoutes(router, entry, registerRoutes, activeService);
             }
         }
         catch (error) {
@@ -104,14 +155,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/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;AAgtBvF,eAAO,MAAM,YAAY;cACb,YAAY;EA6BtB,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,16 @@ 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 {
         return typeof Common.resolveNpmPath === 'function' ? Common.resolveNpmPath() : 'npm';
@@ -168,6 +173,26 @@ const resolveCacheEnabledPreference = (options) => {
         return options.cache;
     return undefined;
 };
+const resolveRootEnvPreference = (options) => {
+    const hasRootEnv = hasFlag('--root-env');
+    const hasNoRootEnv = hasFlag('--no-root-env');
+    if (hasRootEnv && hasNoRootEnv) {
+        throw ErrorFactory.createCliError('Error: Cannot use both --root-env and --no-root-env.');
+    }
+    if (hasRootEnv)
+        return true;
+    if (hasNoRootEnv)
+        return false;
+    if (typeof options.rootEnv === 'boolean')
+        return options.rootEnv;
+    return true;
+};
+const resolveEnvPath = (options, projectRoot) => {
+    const raw = typeof options.envPath === 'string' ? options.envPath.trim() : '';
+    if (raw === '')
+        return undefined;
+    return isAbsolutePath(raw) ? raw : path.join(projectRoot, raw);
+};
 const findNearestPackageJsonDir = (cwd) => {
     let current = path.resolve(cwd);
     while (true) {
@@ -210,9 +235,87 @@ const buildStartEnv = (projectRoot) => ({
     ...process.env,
     ZINTRUST_PROJECT_ROOT: projectRoot,
 });
-const ensureStartEnvLoaded = (context) => {
-    const extraCwds = context.cwd === context.projectRoot ? [] : [context.cwd];
-    EnvFileLoader.ensureLoaded({ cwd: context.projectRoot, extraCwds });
+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);
+    const extraCwds = envPath === undefined && context.cwd !== context.projectRoot ? [context.cwd] : [];
+    EnvFileLoader.ensureLoaded({
+        cwd: context.projectRoot,
+        includeCwd: rootEnv,
+        extraCwds,
+        ...(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);
+    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) => {
@@ -330,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);
 };
@@ -483,7 +588,9 @@ const executeSplitStart = async (cmd, context, _options) => {
 const executeStart = async (options, cmd) => {
     const cwd = process.cwd();
     const context = resolveStartContext(cwd);
-    ensureStartEnvLoaded(context);
+    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);
@@ -541,8 +648,11 @@ export const StartCommand = Object.freeze({
                 .option('--no-cache', 'Disable cache functionality')
                 .option('--watch', 'Force watch mode (Node only)')
                 .option('--no-watch', 'Disable watch mode (Node only)')
+                .option('--root-env', 'Load root project .env files for standalone service start')
+                .option('--no-root-env', 'Skip root project .env files for standalone service start')
                 .option('--mode <development|production|testing>', 'Override app mode')
                 .option('--env <name>', 'Wrangler environment name (Wrangler mode only)')
+                .option('--env-path <path>', 'Explicit env directory or .env file path for standalone service start')
                 .option('--wrangler-config <path>', 'Wrangler config path (Wrangler mode only)')
                 .option('--runtime <nodejs|cloudflare|lambda|deno|auto>', 'Set RUNTIME for spawned Node')
                 .option('-p, --port <number>', 'Override server port');

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;AAkcD,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,6 +108,7 @@ export const serviceManifest: ReadonlyArray<ServiceManifestEntry> = [
     id: '${serviceId}',
     domain: '${domain}',
     name: '${options.name}',
+    configRoot: '${getServiceConfigRoot(domain, options.name)}',
     prefix: '${serviceId}',
     port: ${options.port ?? 3001},
     monolithEnabled: true,
@@ -148,6 +150,7 @@ function updateServiceManifest(projectRoot, options) {
     id: '${serviceId}',
     domain: '${domain}',
     name: '${options.name}',
+    configRoot: '${getServiceConfigRoot(domain, options.name)}',
     prefix: '${serviceId}',
     port: ${options.port ?? 3001},
     monolithEnabled: true,
@@ -236,7 +239,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/cli/utils/EnvFileLoader.d.ts

@@ -1,7 +1,9 @@
 type node_env = 'development' | 'production' | 'testing';
 type LoadOptions = {
     cwd?: string;
+    includeCwd?: boolean;
     extraCwds?: string[];
+    envPaths?: string[];
     overrideExisting?: boolean;
 };
 type LoadState = {

package/src/cli/utils/EnvFileLoader.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"EnvFileLoader.d.ts","sourceRoot":"","sources":["../../../../src/cli/utils/EnvFileLoader.ts"],"names":[],"mappings":"AAQA,KAAK,QAAQ,GAAG,aAAa,GAAG,YAAY,GAAG,SAAS,CAAC;AAmIzD,KAAK,WAAW,GAAG;IACjB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,SAAS,CAAC,EAAE,MAAM,EAAE,CAAC;IACrB,gBAAgB,CAAC,EAAE,OAAO,CAAC;CAC5B,CAAC;AAEF,KAAK,SAAS,GAAG;IACf,WAAW,EAAE,MAAM,EAAE,CAAC;IACtB,IAAI,CAAC,EAAE,MAAM,CAAC;CACf,CAAC;AAEF,KAAK,YAAY,GAAG;IAClB,OAAO,CAAC,EAAE,QAAQ,CAAC;IACnB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,YAAY,CAAC,EAAE,OAAO,CAAC;CACxB,CAAC;AAkHF,eAAO,MAAM,aAAa;qBA7DH,WAAW,KAAQ,SAAS;6BAyBpB,IAAI,CAAC,WAAW,EAAE,kBAAkB,CAAC,KAAQ,SAAS;mCAG/C,YAAY,KAAG,IAAI;oBA+BpC,SAAS;EAO5B,CAAC"}
+{"version":3,"file":"EnvFileLoader.d.ts","sourceRoot":"","sources":["../../../../src/cli/utils/EnvFileLoader.ts"],"names":[],"mappings":"AASA,KAAK,QAAQ,GAAG,aAAa,GAAG,YAAY,GAAG,SAAS,CAAC;AAmIzD,KAAK,WAAW,GAAG;IACjB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,SAAS,CAAC,EAAE,MAAM,EAAE,CAAC;IACrB,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;IACpB,gBAAgB,CAAC,EAAE,OAAO,CAAC;CAC5B,CAAC;AAEF,KAAK,SAAS,GAAG;IACf,WAAW,EAAE,MAAM,EAAE,CAAC;IACtB,IAAI,CAAC,EAAE,MAAM,CAAC;CACf,CAAC;AAaF,KAAK,YAAY,GAAG;IAClB,OAAO,CAAC,EAAE,QAAQ,CAAC;IACnB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,YAAY,CAAC,EAAE,OAAO,CAAC;CACxB,CAAC;AAgMF,eAAO,MAAM,aAAa;qBAjDH,WAAW,KAAQ,SAAS;6BAapB,IAAI,CAAC,WAAW,EAAE,kBAAkB,CAAC,KAAQ,SAAS;mCAG/C,YAAY,KAAG,IAAI;oBA+BpC,SAAS;EAO5B,CAAC"}

package/src/cli/utils/EnvFileLoader.js

@@ -1,6 +1,7 @@
 import { Env } from '../../config/env.js';
+import { isArray, isNonEmptyString } from '../../helper/index.js';
 import { existsSync, readFileSync } from '../../node-singletons/fs.js';
-import { join } from '../../node-singletons/path.js';
+import * as path from '../../node-singletons/path.js';
 const safeEnvGet = (key, defaultValue = '') => {
     const envAny = Env;
     if (typeof envAny.get === 'function')
@@ -102,7 +103,7 @@ const applyToProcessEnv = (values, overrideExisting) => {
     }
 };
 const readEnvFileIfExists = (cwd, filename) => {
-    const fullPath = join(cwd, filename);
+    const fullPath = path.join(cwd, filename);
     if (!existsSync(fullPath))
         return undefined;
     const raw = readFileSync(fullPath, 'utf-8');
@@ -120,20 +121,20 @@ const resolveAppMode = (cwd) => {
 };
 const filesLoader = (cwd, mode) => {
     const files = [];
-    if (existsSync(join(cwd, '.env')))
+    if (existsSync(path.join(cwd, '.env')))
         files.push('.env');
     // Per your rule: production uses .env; dev uses .env.dev
     if (mode !== undefined && mode !== '' && mode !== 'production') {
         const modeFile = `.env.${mode}`;
-        if (existsSync(join(cwd, modeFile)))
+        if (existsSync(path.join(cwd, modeFile)))
             files.push(modeFile);
     }
     const local = '.env.local';
-    if (existsSync(join(cwd, local)))
+    if (existsSync(path.join(cwd, local)))
         files.push(local);
     if (mode !== undefined && mode !== '') {
         const modeLocal = `.env.${mode}.local`;
-        if (existsSync(join(cwd, modeLocal)))
+        if (existsSync(path.join(cwd, modeLocal)))
             files.push(modeLocal);
     }
     return files;
@@ -161,25 +162,85 @@ const loadFromCwd = (cwd, overrideExisting) => {
     }
     return { loadedFiles: files, mode };
 };
-const load = (options = {}) => {
-    if (cached !== undefined)
-        return cached;
-    const cwd = typeof options.cwd === 'string' && options.cwd !== '' ? options.cwd : process.cwd();
-    const extraCwds = Array.isArray(options.extraCwds)
-        ? options.extraCwds.filter((value) => typeof value === 'string' && value.trim() !== '')
-        : [];
+const loadFromFile = (filePath, overrideExisting) => {
+    if (!existsSync(filePath))
+        return { loadedFiles: [] };
+    const raw = readFileSync(filePath, 'utf-8');
+    const parsed = parseEnvFile(raw);
+    applyToProcessEnv(parsed, overrideExisting);
+    const rawMode = parsed['NODE_ENV'];
+    const mode = isNonEmptyString(rawMode) ? normalizeAppMode(rawMode) : undefined;
+    if (mode !== undefined) {
+        safeEnvSet('NODE_ENV', mode);
+    }
+    return { loadedFiles: [filePath], mode };
+};
+const normalizeCwdList = (value) => {
+    if (!isArray(value))
+        return [];
+    return value
+        .filter(isNonEmptyString)
+        .map((item) => item.trim())
+        .filter((item) => item !== '');
+};
+const normalizeEnvPathList = (value) => normalizeCwdList(value);
+const createLoadPlan = (options) => {
+    const cwd = isNonEmptyString(options.cwd) ? options.cwd : process.cwd();
+    const includeCwd = options.includeCwd !== false;
+    const extraCwds = normalizeCwdList(options.extraCwds);
+    const envPaths = normalizeEnvPathList(options.envPaths);
     const overrideExisting = options.overrideExisting ?? true;
-    const roots = [cwd, ...extraCwds].filter((value, index, items) => items.indexOf(value) === index);
-    let mergedMode;
-    const loadedFiles = [];
-    for (let index = 0; index < roots.length; index += 1) {
-        const root = roots[index];
-        const state = loadFromCwd(root, index === 0 ? overrideExisting : true);
-        if (mergedMode === undefined && state.mode !== undefined)
-            mergedMode = state.mode;
-        loadedFiles.push(...state.loadedFiles);
-    }
-    cached = { loadedFiles, mode: mergedMode };
+    const sources = [];
+    if (includeCwd) {
+        sources.push({
+            key: `cwd:${cwd}`,
+            path: cwd,
+            kind: 'cwd',
+            overrideExisting,
+        });
+    }
+    for (const extraCwd of extraCwds) {
+        sources.push({
+            key: `cwd:${extraCwd}`,
+            path: extraCwd,
+            kind: 'cwd',
+            overrideExisting: true,
+        });
+    }
+    for (const envPath of envPaths) {
+        const looksLikeFile = path.basename(envPath).startsWith('.env');
+        sources.push({
+            key: `${looksLikeFile ? 'file' : 'cwd'}:${envPath}`,
+            path: envPath,
+            kind: looksLikeFile ? 'file' : 'cwd',
+            overrideExisting: true,
+        });
+    }
+    return sources.filter((source, index, items) => items.findIndex((item) => item.key === source.key) === index);
+};
+const loadSource = (source) => {
+    if (source.kind === 'file')
+        return loadFromFile(source.path, source.overrideExisting);
+    return loadFromCwd(source.path, source.overrideExisting);
+};
+const mergeCachedState = (state, source, next) => {
+    state.loadedSourceKeys.push(source.key);
+    if (next.mode !== undefined && state.mode === undefined) {
+        state.mode = next.mode;
+    }
+    if (next.loadedFiles.length > 0) {
+        state.loadedFiles.push(...next.loadedFiles);
+    }
+    return state;
+};
+const load = (options = {}) => {
+    const plan = createLoadPlan(options);
+    cached ??= { loadedFiles: [], loadedSourceKeys: [] };
+    for (const source of plan) {
+        if (cached.loadedSourceKeys.includes(source.key))
+            continue;
+        mergeCachedState(cached, source, loadSource(source));
+    }
     return cached;
 };
 const ensureLoaded = (options = {}) => load({ ...options, overrideExisting: false });

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.12
+ * @zintrust/core v0.4.14
  *
  * ZinTrust Framework - Production-Grade TypeScript Backend
  * Built for performance, type safety, and exceptional developer experience
  *
  * Build Information:
- *   Built: 2026-03-23T13:57:31.438Z
+ *   Built: 2026-03-23T16:59:39.933Z
  *   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-23T13:57:31.366Z'; // Replaced during build
+export const ZINTRUST_BUILD_DATE = '2026-03-23T16:59:39.858Z'; // 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,7 @@ export interface ServiceManifestEntry {
     domain: string;
     name: string;
     prefix?: string;
+    configRoot?: string;
     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,10 @@ 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 loadRoutes = value['loadRoutes'];
     if (loadRoutes !== undefined && !isFunction(loadRoutes)) {
         return false;
@@ -59,6 +63,7 @@ export const normalizeServiceManifest = (value) => {
         ...entry,
         id: toCanonicalServiceId(entry),
         prefix: getServicePrefix(entry),
+        ...(isNonEmptyString(entry.configRoot) ? { configRoot: entry.configRoot } : {}),
         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;AA+ExC,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"}

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;
@@ -76,7 +79,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,7 +93,7 @@ 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) {

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.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"start.d.ts","sourceRoot":"","sources":["../../src/start.ts"],"names":[],"mappings":"AAEA,OAAO,EAEL,KAAK,oBAAoB,EAC1B,MAAM,gCAAgC,CAAC;AAexC,eAAO,MAAM,UAAU,GAAI,eAAe,MAAM,KAAG,OAYlD,CAAC;AAEF,eAAO,MAAM,0BAA0B,GAAI,eAAe,OAAO,KAAG,oBASnE,CAAC;AAEF,eAAO,MAAM,qBAAqB,GAChC,eAAe,MAAM,EACrB,eAAe,OAAO,KACrB,OAAO,CAAC,oBAAoB,CAQ9B,CAAC;AAEF;;;;GAIG;AACH,eAAO,MAAM,KAAK,QAAa,OAAO,CAAC,IAAI,CAO1C,CAAC;AAEF;;GAEG;AACH,OAAO,EAAE,OAAO,EAAE,MAAM,uBAAuB,CAAC;AAEhD,OAAO,EAAE,OAAO,IAAI,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAEpE;;GAEG;AACH,OAAO,EAAE,OAAO,IAAI,IAAI,EAAE,MAAM,iBAAiB,CAAC;AAElD;;GAEG;AACH,OAAO,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAC"}
+{"version":3,"file":"start.d.ts","sourceRoot":"","sources":["../../src/start.ts"],"names":[],"mappings":"AAGA,OAAO,EAEL,KAAK,oBAAoB,EAC1B,MAAM,gCAAgC,CAAC;AAuBxC,eAAO,MAAM,UAAU,GAAI,eAAe,MAAM,KAAG,OAYlD,CAAC;AAEF,eAAO,MAAM,0BAA0B,GAAI,eAAe,OAAO,KAAG,oBASnE,CAAC;AAqFF,eAAO,MAAM,qBAAqB,GAChC,eAAe,MAAM,EACrB,eAAe,OAAO,KACrB,OAAO,CAAC,oBAAoB,CAS9B,CAAC;AAEF;;;;GAIG;AACH,eAAO,MAAM,KAAK,QAAa,OAAO,CAAC,IAAI,CAO1C,CAAC;AAEF;;GAEG;AACH,OAAO,EAAE,OAAO,EAAE,MAAM,uBAAuB,CAAC;AAEhD,OAAO,EAAE,OAAO,IAAI,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAEpE;;GAEG;AACH,OAAO,EAAE,OAAO,IAAI,IAAI,EAAE,MAAM,iBAAiB,CAAC;AAElD;;GAEG;AACH,OAAO,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAC"}

package/src/start.js

@@ -1,8 +1,10 @@
 import { ErrorFactory } from './exceptions/ZintrustError.js';
+import { isArray, isNonEmptyString, isObject } from './helper/index.js';
 import { ZintrustLang } from './lang/lang.js';
 import { normalizeActiveServiceRuntime, } from './microservices/ServiceManifest.js';
 import { ProjectRuntime } from './runtime/ProjectRuntime.js';
 import { isNodeRuntime } from './runtime/detectRuntime.js';
+const isAbsolutePath = (value) => value.startsWith('/') || /^[A-Za-z]:[\\/]/.test(value);
 const fileUrlToPathLike = (value) => {
     if (!value.startsWith(ZintrustLang.FILE_PROTOCOL))
         return value;
@@ -34,7 +36,68 @@ export const configureStandaloneService = (activeService) => {
     }
     return ProjectRuntime.set({ activeService: normalized }).activeService ?? normalized;
 };
+const normalizeStandaloneEnvPaths = (value) => {
+    if (isNonEmptyString(value)) {
+        const trimmed = value.trim();
+        return trimmed === '' ? [] : [trimmed];
+    }
+    if (!isArray(value))
+        return [];
+    return value
+        .filter(isNonEmptyString)
+        .map((item) => item.trim())
+        .filter((item) => item !== '');
+};
+const resolveStandaloneProjectRoot = async () => {
+    const configuredRoot = process.env?.['ZINTRUST_PROJECT_ROOT'] ?? '';
+    if (isNonEmptyString(configuredRoot))
+        return configuredRoot;
+    const { existsSync } = await import('./node-singletons/fs.js');
+    const path = await import('./node-singletons/path.js');
+    let current = process.cwd();
+    while (true) {
+        if (existsSync(path.join(current, 'package.json')))
+            return current;
+        const parent = path.dirname(current);
+        if (parent === current)
+            return process.cwd();
+        current = parent;
+    }
+};
+const resolveServiceEnvPath = async (importMetaUrl, activeService, projectRoot) => {
+    const path = await import('./node-singletons/path.js');
+    if (isObject(activeService) && isNonEmptyString(activeService['configRoot'])) {
+        return path.dirname(path.join(projectRoot, activeService['configRoot']));
+    }
+    const entryFile = fileUrlToPathLike(importMetaUrl);
+    const entryDir = path.dirname(entryFile);
+    return path.basename(entryDir) === 'src' ? path.dirname(entryDir) : entryDir;
+};
+const resolveConfiguredEnvPaths = async (projectRoot, activeService, importMetaUrl) => {
+    const path = await import('./node-singletons/path.js');
+    const configured = isObject(activeService)
+        ? normalizeStandaloneEnvPaths(activeService['envPath'])
+        : [];
+    if (configured.length > 0) {
+        return configured.map((value) => isAbsolutePath(value) ? value : path.join(projectRoot, value));
+    }
+    return [await resolveServiceEnvPath(importMetaUrl, activeService, projectRoot)];
+};
+const ensureStandaloneServiceEnv = async (importMetaUrl, activeService) => {
+    if (!isNodeRuntime())
+        return;
+    const { EnvFileLoader } = await import('./cli/utils/EnvFileLoader.js');
+    const projectRoot = await resolveStandaloneProjectRoot();
+    const envPaths = await resolveConfiguredEnvPaths(projectRoot, activeService, importMetaUrl);
+    const rootEnv = !isObject(activeService) || activeService['rootEnv'] !== false;
+    EnvFileLoader.ensureLoaded({
+        cwd: projectRoot,
+        includeCwd: rootEnv,
+        envPaths,
+    });
+};
 export const bootStandaloneService = async (importMetaUrl, activeService) => {
+    await ensureStandaloneServiceEnv(importMetaUrl, activeService);
     const configuredService = configureStandaloneService(activeService);
     if (isNodeMain(importMetaUrl)) {
         await start();
@@ -49,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).