@zintrust/core 0.4.8 → 0.4.10

package/package.json

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

package/src/boot/bootstrap.js

@@ -9,6 +9,7 @@ import { appConfig } from '../config/app.js';
 import { Env } from '../config/env.js';
 import { Logger } from '../config/logger.js';
 import { ErrorFactory } from '../exceptions/ZintrustError.js';
+import { ProjectRuntime } from '../runtime/ProjectRuntime.js';
 import { loadWorkersModule } from '../runtime/WorkersModule.js';
 let appInstance;
 let serverInstance;
@@ -211,6 +212,12 @@ const BootstrapFunctions = Object.freeze({
                 // best-effort; run without plugins if loader fails (e.g. non-Node runtime)
                 Logger.warn('Plugin auto-imports loader skipped:', error);
             }
+            try {
+                await ProjectRuntime.tryLoadNodeRuntime();
+            }
+            catch (error) {
+                Logger.warn('Project runtime hook loader skipped:', error);
+            }
             // Create application instance
             // if (Env.ZINTRUST_PROJECT_ROOT) {
             // }

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,KAAK,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAQnD,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;AAkEF,eAAO,MAAM,oBAAoB,GAC/B,kBAAkB,MAAM,EACxB,QAAQ,OAAO,KACd,OAAO,CAAC,IAAI,CAmBd,CAAC"}
+{"version":3,"file":"registerRoute.d.ts","sourceRoot":"","sources":["../../../../src/boot/registry/registerRoute.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAUnD,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;AAuFF,eAAO,MAAM,oBAAoB,GAC/B,kBAAkB,MAAM,EACxB,QAAQ,OAAO,KACd,OAAO,CAAC,IAAI,CAoBd,CAAC"}

package/src/boot/registry/registerRoute.js

@@ -1,8 +1,10 @@
 import { appConfig } from '../../config/index.js';
 import Logger from '../../config/logger.js';
+import { 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';
+import { ProjectRuntime } from '../../runtime/ProjectRuntime.js';
 const isCloudflare = detectRuntime().isCloudflare;
 export const isCompiledJsModule = () => {
     // When running from dist, this module is compiled to .js and Node ESM resolution
@@ -59,6 +61,26 @@ const registerAppRoutes = async (resolvedBasePath, router) => {
         mod.registerRoutes(router);
     }
 };
+const registerManifestRoutes = async (router) => {
+    const serviceManifest = ProjectRuntime.getServiceManifest();
+    if (serviceManifest.length === 0)
+        return;
+    for (const entry of serviceManifest) {
+        if (entry.monolithEnabled === false || typeof entry.loadRoutes !== 'function') {
+            continue;
+        }
+        try {
+            // eslint-disable-next-line no-await-in-loop
+            const mod = await entry.loadRoutes();
+            if (isObject(mod) && typeof mod.registerRoutes === 'function') {
+                mod.registerRoutes(router);
+            }
+        }
+        catch (error) {
+            Logger.warn(`Failed to register manifest routes for ${entry.id}`, error);
+        }
+    }
+};
 const registerFrameworkRoutes = async (resolvedBasePath, router) => {
     const frameworkRoutes = await tryImportRoutesFromAppBase(resolvedBasePath);
     if (frameworkRoutes && typeof frameworkRoutes.registerRoutes === 'function') {
@@ -82,6 +104,7 @@ export const registerMasterRoutes = async (resolvedBasePath, router) => {
         if (!isCloudflare) {
             await registerAppRoutes(resolvedBasePath, router);
         }
+        await registerManifestRoutes(router);
         if (router.routes.length === 0) {
             await registerFrameworkRoutes(resolvedBasePath, router);
         }

package/src/bootstrap/service-manifest.d.ts

@@ -0,0 +1,4 @@
+import type { ServiceManifestEntry } from '../microservices/ServiceManifest';
+export declare const serviceManifest: ReadonlyArray<ServiceManifestEntry>;
+export default serviceManifest;
+//# sourceMappingURL=service-manifest.d.ts.map

package/src/bootstrap/service-manifest.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"service-manifest.d.ts","sourceRoot":"","sources":["../../../src/bootstrap/service-manifest.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,gCAAgC,CAAC;AAE3E,eAAO,MAAM,eAAe,EAAE,aAAa,CAAC,oBAAoB,CAAM,CAAC;AAEvE,eAAe,eAAe,CAAC"}

package/src/bootstrap/service-manifest.js

@@ -0,0 +1,2 @@
+export const serviceManifest = [];
+export default serviceManifest;

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

@@ -1 +1 @@
-{"version":3,"file":"InitContainerCommand.d.ts","sourceRoot":"","sources":["../../../../src/cli/commands/InitContainerCommand.ts"],"names":[],"mappings":"AAAA,OAAO,EAAe,KAAK,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAoOlE,eAAO,MAAM,oBAAoB;cACrB,YAAY;EAkBtB,CAAC"}
+{"version":3,"file":"InitContainerCommand.d.ts","sourceRoot":"","sources":["../../../../src/cli/commands/InitContainerCommand.ts"],"names":[],"mappings":"AAAA,OAAO,EAAe,KAAK,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAyKlE,eAAO,MAAM,oBAAoB;cACrB,YAAY;EAkBtB,CAAC"}

package/src/cli/commands/InitContainerCommand.js

@@ -97,80 +97,21 @@ services:
       - '7772:7772'
 
 `;
-const DOCKERFILE_TEMPLATE = String.raw `# syntax=docker/dockerfile:1.6
-# Build Stage - Compile TypeScript
-FROM node:20-bookworm-slim AS builder
+const DOCKERFILE_TEMPLATE = String.raw `FROM zintrust/zintrust:latest AS runtime
 
 WORKDIR /app
 
-# Reuse npm cache across builds (requires BuildKit)
-ENV NPM_CONFIG_CACHE=/root/.npm
-ENV NPM_CONFIG_PREFER_OFFLINE=true
-
-# Install build dependencies for native modules (better-sqlite3, bcrypt)
-RUN apt-get update \
-  && apt-get install -y --no-install-recommends python3 make g++ \
-  && rm -rf /var/lib/apt/lists/*
-
-# Copy package files
-COPY package.json package-lock.json ./
-
-# Install dependencies (including dev dependencies needed for build)
-RUN --mount=type=cache,target=/root/.npm,id=zintrust-npm-cache,sharing=locked \
-  npm config set fetch-retries 5 \
-    && npm config set fetch-retry-mintimeout 20000 \
-    && npm config set fetch-retry-maxtimeout 120000 \
-   && npm ci
-
-# Copy source code using COPY . . to handle optional folders automatically
-COPY . .
-
-# Build TypeScript to JavaScript
-ARG BUILD_VARIANT=full
-RUN --mount=type=cache,target=/root/.npm,id=zintrust-npm-cache,sharing=locked npm run build:dk
-
-# Runtime Stage - Production image
-FROM node:20-bookworm-slim AS runtime
-
-WORKDIR /app
-
-# Set environment variables
 ENV NODE_ENV=production
 ENV PORT=7772
 ENV HOST=0.0.0.0
 
-# Create non-root user for security
-RUN groupadd -g 1001 nodejs && useradd -u 1001 -g 1001 -m -s /usr/sbin/nologin nodejs
-
-# Copy package files for production dependencies
-COPY package.json package-lock.json ./
-
-# Install only production dependencies (requires build tools for native modules)
-RUN --mount=type=cache,target=/root/.npm,id=zintrust-npm-cache,sharing=locked \
-  apt-get update \
-  && apt-get install -y --no-install-recommends python3 make g++ \
-  && npm ci --omit=dev \
-  && apt-get purge -y --auto-remove python3 make g++ \
-  && rm -rf /var/lib/apt/lists/*
-
-# Copy compiled code from builder stage
-COPY --from=builder /app/dist ./dist
-
-
-# Change ownership to nodejs user
-RUN chown -R nodejs:nodejs /app
-
-# Switch to non-root user
 USER nodejs
 
-# Health check
 HEALTHCHECK --interval=30s --timeout=10s --start-period=5s --retries=3 \
   CMD node -e "require('node:http').get('http://localhost:7772/health', (r) => {if (r.statusCode !== 200) throw new Error(r.statusCode)})"
 
-# Expose port
 EXPOSE 7772
 
-# Start application (compiled JS; no tsx needed in runtime)
 CMD ["node", "dist/src/boot/bootstrap.js"]
 `;
 const backupSuffix = () => new Date().toISOString().replaceAll(/[:.]/g, '-');

package/src/cli/commands/MigrateCommand.js

@@ -215,7 +215,7 @@ const warnIfAdapterMissing = (cmd, conn) => {
     if (conn.driver === 'mysql' && DatabaseAdapterRegistry.get('mysql') === undefined) {
         cmd.warn('MySQL adapter is not installed/registered; migrations may not hit a real MySQL DB.');
         cmd.warn('Install via `zin plugin install adapter:mysql` (or `zin add db:mysql`).');
-        cmd.debug('[debug] Expected a side-effect import in src/zintrust.plugins.ts like: import "@zintrust/db-mysql/register";');
+        cmd.debug('[debug] Expected a side-effect import in src/zintrust.plugins.ts like: import "../../../packages/db-mysql/src/register";');
     }
     if (conn.driver === 'postgresql' && DatabaseAdapterRegistry.get('postgresql') === undefined) {
         cmd.warn('PostgreSQL adapter is not installed/registered; migrations may not hit a real PostgreSQL DB.');

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

@@ -1 +1 @@
-{"version":3,"file":"RoutesCommand.d.ts","sourceRoot":"","sources":["../../../../src/cli/commands/RoutesCommand.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAoC,KAAK,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAsSvF,eAAO,MAAM,aAAa;cACd,YAAY;EAatB,CAAC;AAEH,eAAe,aAAa,CAAC"}
+{"version":3,"file":"RoutesCommand.d.ts","sourceRoot":"","sources":["../../../../src/cli/commands/RoutesCommand.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAoC,KAAK,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAuVvF,eAAO,MAAM,aAAa;cACd,YAAY;EAatB,CAAC;AAEH,eAAe,aAAa,CAAC"}

package/src/cli/commands/RoutesCommand.js

@@ -6,6 +6,8 @@ import { BaseCommand } from '../BaseCommand.js';
 import { Env } from '../../config/env.js';
 import { Router } from '../../routes/Router.js';
 import { ErrorFactory } from '../../exceptions/ZintrustError.js';
+import { isObject } from '../../helper/index.js';
+import { ProjectRuntime } from '../../runtime/ProjectRuntime.js';
 const parseGroupBy = (value) => {
     const raw = typeof value === 'string' ? value.trim().toLowerCase() : '';
     if (raw === '' || raw === 'group')
@@ -157,6 +159,37 @@ const renderTable = (rows) => {
     console.log(bottom);
     /* eslint-enable no-console */
 };
+const annotateManifestRoutes = (router, beforeCount, serviceId) => {
+    const routes = Router.getRoutes(router);
+    for (const route of routes.slice(beforeCount)) {
+        route.__zintrustServiceId = serviceId;
+    }
+};
+const getRouteServiceId = (route) => {
+    return route.__zintrustServiceId ?? '';
+};
+const registerManifestRoutes = async (router) => {
+    await ProjectRuntime.tryLoadNodeRuntime();
+    const serviceManifest = ProjectRuntime.getServiceManifest();
+    if (serviceManifest.length === 0)
+        return;
+    for (const entry of serviceManifest) {
+        if (entry.monolithEnabled === false || typeof entry.loadRoutes !== 'function')
+            continue;
+        try {
+            const beforeCount = Router.getRoutes(router).length;
+            // eslint-disable-next-line no-await-in-loop
+            const mod = await entry.loadRoutes();
+            if (isObject(mod) && typeof mod.registerRoutes === 'function') {
+                mod.registerRoutes(router);
+                annotateManifestRoutes(router, beforeCount, entry.id);
+            }
+        }
+        catch {
+            // Ignore broken optional service routes and keep listing what is available.
+        }
+    }
+};
 const buildRows = async (options) => {
     const groupBy = parseGroupBy(options.groupBy);
     const filterText = typeof options.filter === 'string' ? options.filter.trim().toLowerCase() : '';
@@ -174,12 +207,14 @@ const buildRows = async (options) => {
     catch {
         // routes/api.ts not found, continue with just core routes
     }
+    await registerManifestRoutes(router);
     const routes = Router.getRoutes(router);
     const rows = routes.map((route) => {
         const path = normalizePath(route.path);
+        const serviceId = getRouteServiceId(route);
         let group = '';
         if (groupBy === 'service') {
-            group = deriveService(path);
+            group = serviceId === '' ? deriveService(path) : serviceId;
         }
         else if (groupBy === 'group') {
             group = deriveGroup(path);

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;AAspBvF,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;AA2sBvF,eAAO,MAAM,YAAY;cACb,YAAY;EA6BtB,CAAC"}

package/src/cli/commands/StartCommand.js

@@ -168,8 +168,19 @@ const resolveCacheEnabledPreference = (options) => {
         return options.cache;
     return undefined;
 };
-const readPackageJson = (cwd) => {
-    const packagePath = path.join(cwd, 'package.json');
+const findNearestPackageJsonDir = (cwd) => {
+    let current = path.resolve(cwd);
+    while (true) {
+        if (existsSync(path.join(current, 'package.json')))
+            return current;
+        const parent = path.dirname(current);
+        if (parent === current)
+            return undefined;
+        current = parent;
+    }
+};
+const readPackageJsonFromDir = (dir) => {
+    const packagePath = path.join(dir, 'package.json');
     if (!existsSync(packagePath)) {
         throw ErrorFactory.createCliError("Error: No ZinTrust app found. Run 'zin new <project>' or ensure package.json exists.");
     }
@@ -181,6 +192,24 @@ const readPackageJson = (cwd) => {
         throw ErrorFactory.createTryCatchError('Failed to read package.json', error);
     }
 };
+const resolveStartContext = (cwd) => {
+    const projectRoot = findNearestPackageJsonDir(cwd) ?? cwd;
+    const packageDir = findNearestPackageJsonDir(cwd);
+    return {
+        cwd,
+        projectRoot,
+        ...(packageDir === undefined ? {} : { packageJson: readPackageJsonFromDir(packageDir) }),
+    };
+};
+const requirePackageJson = (context) => {
+    if (context.packageJson !== undefined)
+        return context.packageJson;
+    throw ErrorFactory.createCliError("Error: No ZinTrust app found. Run 'zin new <project>' or ensure package.json exists.");
+};
+const buildStartEnv = (projectRoot) => ({
+    ...process.env,
+    ZINTRUST_PROJECT_ROOT: projectRoot,
+});
 const isFrameworkRepo = (packageJson) => packageJson.name === '@zintrust/core';
 const hasDevScript = (packageJson) => {
     const scripts = packageJson.scripts;
@@ -263,14 +292,14 @@ const resolveNodeProdCommand = (cwd) => {
     }
     return { command: 'node', args: [compiled] };
 };
-const executeWranglerStart = async (cmd, cwd, port, runtime, envName, wranglerConfig) => {
+const executeWranglerStart = async (cmd, context, port, runtime, envName, wranglerConfig) => {
     if (runtime !== undefined) {
         throw ErrorFactory.createCliError('Error: --runtime is not supported with --wrangler (Wrangler controls Workers runtime).');
     }
     const normalizedConfig = typeof wranglerConfig === 'string' ? wranglerConfig.trim() : '';
-    const explicitConfigFullPath = normalizedConfig.length > 0 ? path.join(cwd, normalizedConfig) : undefined;
-    const configPath = explicitConfigFullPath ?? findWranglerConfig(cwd);
-    const entry = resolveWranglerEntry(cwd);
+    const explicitConfigFullPath = normalizedConfig.length > 0 ? path.join(context.cwd, normalizedConfig) : undefined;
+    const configPath = explicitConfigFullPath ?? findWranglerConfig(context.cwd);
+    const entry = resolveWranglerEntry(context.cwd);
     if (explicitConfigFullPath !== undefined) {
         if (existsSync(explicitConfigFullPath)) {
             // ok
@@ -300,7 +329,7 @@ const executeWranglerStart = async (cmd, cwd, port, runtime, envName, wranglerCo
     const exitCode = await SpawnUtil.spawnAndWait({
         command: 'wrangler',
         args: wranglerArgs,
-        env: process.env,
+        env: buildStartEnv(context.projectRoot),
     });
     process.exit(exitCode);
 };
@@ -321,92 +350,98 @@ const ensureTmpRunnerFile = (cwd, filename, content) => {
     }
     return fullPath;
 };
-const executeDenoStart = async (cmd, cwd, mode, watchEnabled, _port, runtime) => {
+const executeDenoStart = async (cmd, context, mode, watchEnabled, _port, runtime) => {
     if (runtime !== undefined) {
         throw ErrorFactory.createCliError('Error: --runtime cannot be used with --deno.');
     }
     if (mode === 'testing') {
         throw ErrorFactory.createCliError('Error: Cannot start server in testing mode. Use development or production.');
     }
-    const startModuleSpecifier = resolveRuntimeStartModuleSpecifier(cwd);
-    const denoRunner = ensureTmpRunnerFile(cwd, 'zin-start-deno.ts', createDenoRunnerSource(startModuleSpecifier));
+    const startModuleSpecifier = resolveRuntimeStartModuleSpecifier(context.cwd);
+    const denoRunner = ensureTmpRunnerFile(context.cwd, 'zin-start-deno.ts', createDenoRunnerSource(startModuleSpecifier));
     const args = [];
     if (mode === 'development' && watchEnabled)
         args.push('watch');
     args.push(denoRunner);
     cmd.info('Starting in Deno adapter mode...');
-    const exitCode = await SpawnUtil.spawnAndWait({ command: 'tsx', args, env: process.env });
+    const exitCode = await SpawnUtil.spawnAndWait({
+        command: 'tsx',
+        args,
+        env: buildStartEnv(context.projectRoot),
+    });
     process.exit(exitCode);
 };
-const executeLambdaStart = async (cmd, cwd, mode, watchEnabled, _port, runtime) => {
+const executeLambdaStart = async (cmd, context, mode, watchEnabled, _port, runtime) => {
     if (runtime !== undefined) {
         throw ErrorFactory.createCliError('Error: --runtime cannot be used with --lambda.');
     }
     if (mode === 'testing') {
         throw ErrorFactory.createCliError('Error: Cannot start server in testing mode. Use development or production.');
     }
-    const startModuleSpecifier = resolveRuntimeStartModuleSpecifier(cwd);
-    const lambdaRunner = ensureTmpRunnerFile(cwd, 'zin-start-lambda.ts', createLambdaRunnerSource(startModuleSpecifier));
+    const startModuleSpecifier = resolveRuntimeStartModuleSpecifier(context.cwd);
+    const lambdaRunner = ensureTmpRunnerFile(context.cwd, 'zin-start-lambda.ts', createLambdaRunnerSource(startModuleSpecifier));
     const args = [];
     if (mode === 'development' && watchEnabled)
         args.push('watch');
     args.push(lambdaRunner);
     cmd.info('Starting in Lambda adapter mode...');
-    const exitCode = await SpawnUtil.spawnAndWait({ command: 'tsx', args, env: process.env });
+    const exitCode = await SpawnUtil.spawnAndWait({
+        command: 'tsx',
+        args,
+        env: buildStartEnv(context.projectRoot),
+    });
     process.exit(exitCode);
 };
-const executeNodeStart = async (cmd, cwd, mode, watchEnabled, _port) => {
+const executeNodeStart = async (cmd, context, mode, watchEnabled, _port) => {
     if (mode === 'testing') {
         throw ErrorFactory.createCliError('Error: Cannot start server in testing mode. Use --force to override (not supported).');
     }
     if (mode === 'development') {
         if (!watchEnabled) {
             cmd.warn('Watch mode disabled; starting once.');
-            const bootstrap = resolveBootstrapEntryTs(cwd);
+            const bootstrap = resolveBootstrapEntryTs(context.cwd);
             const args = bootstrap === undefined ? ['src/index.ts'] : [bootstrap];
             const exitCode = await SpawnUtil.spawnAndWait({
                 command: 'tsx',
                 args,
                 forwardSignals: false,
-                env: process.env,
+                env: buildStartEnv(context.projectRoot),
             });
             process.exit(exitCode);
         }
-        const packageJson = readPackageJson(cwd);
-        const dev = resolveNodeDevCommand(cwd, packageJson);
+        const dev = resolveNodeDevCommand(context.cwd, requirePackageJson(context));
         cmd.info('Starting in development mode (watch enabled)...');
         const exitCode = await SpawnUtil.spawnAndWait({
             command: dev.command,
             args: dev.args,
             forwardSignals: false,
-            env: process.env,
+            env: buildStartEnv(context.projectRoot),
         });
         process.exit(exitCode);
     }
-    const prod = resolveNodeProdCommand(cwd);
+    const prod = resolveNodeProdCommand(context.cwd);
     cmd.info('Starting in production mode...');
     const exitCode = await SpawnUtil.spawnAndWait({
         command: prod.command,
         args: prod.args,
         forwardSignals: false,
-        env: process.env,
+        env: buildStartEnv(context.projectRoot),
     });
     process.exit(exitCode);
 };
-const executeSplitStart = async (cmd, cwd, _options) => {
+const executeSplitStart = async (cmd, context, _options) => {
     cmd.info('🚀 Starting in split mode (Producer + Consumer)...');
-    const packageJson = readPackageJson(cwd);
-    const webDev = resolveNodeDevCommand(cwd, packageJson);
+    const webDev = resolveNodeDevCommand(context.cwd, requirePackageJson(context));
     // Producer Environment
     const producerEnv = {
-        ...process.env,
+        ...buildStartEnv(context.projectRoot),
         WORKER_ENABLED: 'false',
         QUEUE_ENABLED: 'true',
         RUNTIME_MODE: 'node-server',
     };
     // Consumer Environment
     const consumerEnv = {
-        ...process.env,
+        ...buildStartEnv(context.projectRoot),
         WORKER_ENABLED: 'true',
         QUEUE_ENABLED: 'true',
         RUNTIME_MODE: 'containers',
@@ -417,10 +452,10 @@ const executeSplitStart = async (cmd, cwd, _options) => {
     };
     // Resolve Consumer Command (zintrust worker:start-all)
     // We try to use tsx against the source bin if possible
-    const workerArgs = existsSync(path.join(cwd, 'bin/zin.ts'))
+    const workerArgs = existsSync(path.join(context.projectRoot, 'bin/zin.ts'))
         ? ['bin/zin.ts', 'worker:start-all']
         : ['dist/bin/zin.js', 'worker:start-all'];
-    const workerCommand = existsSync(path.join(cwd, 'bin/zin.ts')) ? 'tsx' : 'node';
+    const workerCommand = existsSync(path.join(context.projectRoot, 'bin/zin.ts')) ? 'tsx' : 'node';
     cmd.info('-------------------------------------------');
     cmd.info('🔹 [Producer] Web Server starting...');
     cmd.info('🔸 [Consumer] Worker Process starting...');
@@ -428,12 +463,14 @@ const executeSplitStart = async (cmd, cwd, _options) => {
     const pProducer = SpawnUtil.spawnAndWait({
         command: webDev.command,
         args: webDev.args,
+        cwd: context.cwd,
         env: producerEnv,
         forwardSignals: true,
     });
     const pConsumer = SpawnUtil.spawnAndWait({
         command: workerCommand,
         args: workerArgs,
+        cwd: context.projectRoot,
         env: consumerEnv,
         forwardSignals: true,
     });
@@ -441,6 +478,7 @@ const executeSplitStart = async (cmd, cwd, _options) => {
 };
 const executeStart = async (options, cmd) => {
     const cwd = process.cwd();
+    const context = resolveStartContext(cwd);
     EnvFileLoader.ensureLoaded();
     const mode = resolveMode(options);
     const port = resolvePort(options);
@@ -454,7 +492,7 @@ const executeStart = async (options, cmd) => {
     if (variant === 'lambda')
         effectiveRuntime = 'lambda';
     if (mode === 'split') {
-        await executeSplitStart(cmd, cwd, options);
+        await executeSplitStart(cmd, context, options);
         return;
     }
     assertCompatibleStartVariant(variant, configuredRuntime);
@@ -469,7 +507,7 @@ const executeStart = async (options, cmd) => {
         const wranglerConfig = typeof options.wranglerConfig === 'string' && options.wranglerConfig.trim() !== ''
             ? options.wranglerConfig.trim()
             : undefined;
-        await executeWranglerStart(cmd, cwd, port, runtime, envName === '' ? undefined : envName, wranglerConfig);
+        await executeWranglerStart(cmd, context, port, runtime, envName === '' ? undefined : envName, wranglerConfig);
         return;
     }
     if (envName !== '') {
@@ -477,14 +515,14 @@ const executeStart = async (options, cmd) => {
     }
     const watchEnabled = resolveWatchPreference(options, mode);
     if (variant === 'deno') {
-        await executeDenoStart(cmd, cwd, mode, watchEnabled, port, runtime);
+        await executeDenoStart(cmd, context, mode, watchEnabled, port, runtime);
         return;
     }
     if (variant === 'lambda') {
-        await executeLambdaStart(cmd, cwd, mode, watchEnabled, port, runtime);
+        await executeLambdaStart(cmd, context, mode, watchEnabled, port, runtime);
         return;
     }
-    await executeNodeStart(cmd, cwd, mode, watchEnabled, port);
+    await executeNodeStart(cmd, context, mode, watchEnabled, port);
 };
 export const StartCommand = Object.freeze({
     create() {

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

@@ -1 +1 @@
-{"version":3,"file":"RouteGenerator.d.ts","sourceRoot":"","sources":["../../../../src/cli/scaffolding/RouteGenerator.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAMH,MAAM,MAAM,WAAW,GAAG,KAAK,GAAG,MAAM,GAAG,KAAK,GAAG,OAAO,GAAG,QAAQ,GAAG,UAAU,CAAC;AAEnF,MAAM,WAAW,eAAe;IAC9B,MAAM,EAAE,WAAW,CAAC;IACpB,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,EAAE,MAAM,CAAC;IACnB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,UAAU,CAAC,EAAE,MAAM,EAAE,CAAC;IACtB,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;CACnB;AAuBD,MAAM,WAAW,YAAY;IAC3B,UAAU,EAAE,MAAM,CAAC;IACnB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,UAAU,CAAC,EAAE,MAAM,EAAE,CAAC;IACtB,MAAM,EAAE,eAAe,EAAE,CAAC;IAC1B,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAED,MAAM,WAAW,oBAAoB;IACnC,OAAO,EAAE,OAAO,CAAC;IACjB,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,MAAM,CAAC;IACnB,OAAO,EAAE,MAAM,CAAC;CACjB;AAED;;GAEG;AACH,wBAAgB,eAAe,CAAC,OAAO,EAAE,YAAY,GAAG;IAAE,KAAK,EAAE,OAAO,CAAC;IAAC,MAAM,EAAE,MAAM,EAAE,CAAA;CAAE,CAqB3F;AAED;;GAEG;AAEH,wBAAgB,cAAc,CAAC,OAAO,EAAE,YAAY,GAAG,OAAO,CAAC,oBAAoB,CAAC,CA4CnF;AA4LD;;GAEG;AACH,wBAAgB,gBAAgB,IAAI,eAAe,EAAE,CAsCpD;AAED;;GAEG;AACH,wBAAgB,aAAa,IAAI,eAAe,EAAE,CA6BjD;AAED;;GAEG;AACH,wBAAgB,cAAc,IAAI,eAAe,EAAE,CA+BlD;AAED;;GAEG;AACH,wBAAgB,gBAAgB,IAAI,WAAW,EAAE,CAEhD;AAED;;GAEG;AACH,eAAO,MAAM,cAAc;;;;;;;EAOzB,CAAC"}
+{"version":3,"file":"RouteGenerator.d.ts","sourceRoot":"","sources":["../../../../src/cli/scaffolding/RouteGenerator.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAMH,MAAM,MAAM,WAAW,GAAG,KAAK,GAAG,MAAM,GAAG,KAAK,GAAG,OAAO,GAAG,QAAQ,GAAG,UAAU,CAAC;AAEnF,MAAM,WAAW,eAAe;IAC9B,MAAM,EAAE,WAAW,CAAC;IACpB,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,EAAE,MAAM,CAAC;IACnB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,UAAU,CAAC,EAAE,MAAM,EAAE,CAAC;IACtB,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;CACnB;AAuBD,MAAM,WAAW,YAAY;IAC3B,UAAU,EAAE,MAAM,CAAC;IACnB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,UAAU,CAAC,EAAE,MAAM,EAAE,CAAC;IACtB,MAAM,EAAE,eAAe,EAAE,CAAC;IAC1B,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAED,MAAM,WAAW,oBAAoB;IACnC,OAAO,EAAE,OAAO,CAAC;IACjB,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,MAAM,CAAC;IACnB,OAAO,EAAE,MAAM,CAAC;CACjB;AAED;;GAEG;AACH,wBAAgB,eAAe,CAAC,OAAO,EAAE,YAAY,GAAG;IAAE,KAAK,EAAE,OAAO,CAAC;IAAC,MAAM,EAAE,MAAM,EAAE,CAAA;CAAE,CAqB3F;AAED;;GAEG;AAEH,wBAAgB,cAAc,CAAC,OAAO,EAAE,YAAY,GAAG,OAAO,CAAC,oBAAoB,CAAC,CA4CnF;AA8LD;;GAEG;AACH,wBAAgB,gBAAgB,IAAI,eAAe,EAAE,CAsCpD;AAED;;GAEG;AACH,wBAAgB,aAAa,IAAI,eAAe,EAAE,CA6BjD;AAED;;GAEG;AACH,wBAAgB,cAAc,IAAI,eAAe,EAAE,CA+BlD;AAED;;GAEG;AACH,wBAAgB,gBAAgB,IAAI,WAAW,EAAE,CAEhD;AAED;;GAEG;AACH,eAAO,MAAM,cAAc;;;;;;;EAOzB,CAAC"}

package/src/cli/scaffolding/RouteGenerator.js

@@ -115,7 +115,9 @@ ${routeRegistration}
  * Build import statements
  */
 function buildImports(options) {
-    const imports = ["import { Router, type IRouter } from '../../index.js';"];
+    const imports = [
+        "import { Router, type IRequest, type IResponse, type IRouter } from '../../index.js';",
+    ];
     // Collect unique controllers
     const controllers = new Set();
     for (const route of options.routes) {
@@ -208,7 +210,7 @@ function buildMethodRoute(route, router, groupMiddlewareList) {
     const middlewareProp = buildMiddlewareProp(route, groupMiddlewareList);
     const metaProp = `meta: { summary: ${escapeUnsafeChars(JSON.stringify(summary))}, tags: [${escapeUnsafeChars(JSON.stringify(tag))}] }`;
     const options = `{ ${[middlewareProp, metaProp].filter((v) => v !== '').join(', ')} }`;
-    return `  Router.${method}(${router}, '${routePath}', (req, res) => ${controllerVar}.${action}(req, res), ${options});\n`;
+    return `  Router.${method}(${router}, '${routePath}', (req: IRequest, res: IResponse) => ${controllerVar}.${action}(req, res), ${options});\n`;
 }
 /**
  * Build resource route (RESTful CRUD)

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;AAED;;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,CA+ChC;AAmUD,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;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;AA8bD,eAAO,MAAM,iBAAiB;;;;EAI5B,CAAC"}