@zintrust/core 0.1.23 → 0.1.25

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zintrust/core",
-  "version": "0.1.23",
+  "version": "0.1.25",
   "description": "Production-grade TypeScript backend framework for JavaScript",
   "homepage": "https://zintrust.com",
   "repository": {
@@ -36,13 +36,14 @@
     "bcrypt": "^6.0.0",
     "chalk": "^5.6.2",
     "commander": "^14.0.2",
-    "inquirer": "^13.2.0",
+    "inquirer": "^13.2.1",
     "jsonwebtoken": "^9.0.3"
   },
   "overrides": {
     "node-forge": "1.3.3",
     "cross-spawn": "^7.0.5",
-    "glob": "^11.1.0"
+    "glob": "^11.1.0",
+    "undici": "^6.23.0"
   },
   "bin": {
     "zintrust": "bin/zintrust.js",

package/src/auth/Auth.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"Auth.d.ts","sourceRoot":"","sources":["../../../src/auth/Auth.ts"],"names":[],"mappings":"AAEA,OAAY,EAAE,KAAK,MAAM,EAAE,KAAK,WAAW,EAAE,MAAM,cAAc,CAAC;AAIlE,eAAO,MAAM,IAAI;IACf;;OAEG;mBACkB,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAK7C;;OAEG;sBACqB,MAAM,QAAQ,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAI/D;;OAEG;2BAEQ,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,UACxB,MAAM,cACH,WAAW,CAAC,WAAW,CAAC,WAAW,CAAC,CAAC,GAC/C,MAAM;IAKT;;OAEG;gBACS,CAAC,SAAS,MAAM,UAAU,MAAM,GAAG,CAAC;EAGhD,CAAC"}

package/src/boot/Application.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Application.d.ts","sourceRoot":"","sources":["../../../src/boot/Application.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAGH,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,8BAA8B,CAAC;AAGtE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,8BAA8B,CAAC;AAErE,OAAO,EAAE,KAAK,OAAO,EAAU,MAAM,kBAAkB,CAAC;AAUxD,MAAM,WAAW,YAAY;IAC3B,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IACtB,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IAC1B,QAAQ,IAAI,OAAO,CAAC;IACpB,aAAa,IAAI,OAAO,CAAC;IACzB,YAAY,IAAI,OAAO,CAAC;IACxB,SAAS,IAAI,OAAO,CAAC;IACrB,cAAc,IAAI,MAAM,CAAC;IACzB,SAAS,IAAI,OAAO,CAAC;IACrB,YAAY,IAAI,iBAAiB,CAAC;IAClC,kBAAkB,IAAI,gBAAgB,CAAC;IACvC,WAAW,IAAI,MAAM,CAAC;CACvB;AA2YD;;GAEG;AACH,eAAO,MAAM,WAAW;IACtB;;OAEG;sBACe,MAAM,GAAG,YAAY;EA0CvC,CAAC;AAEH,eAAe,WAAW,CAAC"}
+{"version":3,"file":"Application.d.ts","sourceRoot":"","sources":["../../../src/boot/Application.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAGH,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,8BAA8B,CAAC;AAGtE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,8BAA8B,CAAC;AAErE,OAAO,EAAE,KAAK,OAAO,EAAU,MAAM,kBAAkB,CAAC;AAUxD,MAAM,WAAW,YAAY;IAC3B,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IACtB,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IAC1B,QAAQ,IAAI,OAAO,CAAC;IACpB,aAAa,IAAI,OAAO,CAAC;IACzB,YAAY,IAAI,OAAO,CAAC;IACxB,SAAS,IAAI,OAAO,CAAC;IACrB,cAAc,IAAI,MAAM,CAAC;IACzB,SAAS,IAAI,OAAO,CAAC;IACrB,YAAY,IAAI,iBAAiB,CAAC;IAClC,kBAAkB,IAAI,gBAAgB,CAAC;IACvC,WAAW,IAAI,MAAM,CAAC;CACvB;AAqZD;;GAEG;AACH,eAAO,MAAM,WAAW;IACtB;;OAEG;sBACe,MAAM,GAAG,YAAY;EA0CvC,CAAC;AAEH,eAAe,WAAW,CAAC"}

package/src/boot/Application.js

@@ -291,6 +291,14 @@ const createLifecycle = (params) => {
         catch (error) {
             Logger.error('Shutdown hook failed:', error);
         }
+        // Ensure FileLogWriter.flush is attempted even if dynamic registration failed.
+        try {
+            const fileLogWriter = await tryImportOptional('@config/FileLogWriter');
+            fileLogWriter?.FileLogWriter?.flush?.();
+        }
+        catch {
+            /* best-effort */
+        }
         params.setBooted(false);
         Logger.info('✅ Application shut down successfully');
     };

package/src/boot/bootstrap.js

@@ -87,8 +87,11 @@ const gracefulShutdown = async (signal) => {
     if (isShuttingDown)
         return;
     isShuttingDown = true;
-    const timeoutMs = Env.getInt('SHUTDOWN_TIMEOUT', 1500);
-    const forceExitMs = Env.getInt('SHUTDOWN_FORCE_EXIT_MS', 2500);
+    const shutdownBudgetMs = Env.getInt('SHUTDOWN_TIMEOUT', 1500);
+    const minForceExitMs = shutdownBudgetMs + 250;
+    const forceExitMs = Math.max(Env.getInt('SHUTDOWN_FORCE_EXIT_MS', 10000), minForceExitMs);
+    const deadlineMs = Date.now() + shutdownBudgetMs;
+    const remainingMs = () => Math.max(0, deadlineMs - Date.now());
     Logger.info(`${signal} received, shutting down gracefully...`);
     try {
         const forceExitTimer = globalThis.setTimeout(() => {
@@ -97,24 +100,30 @@ const gracefulShutdown = async (signal) => {
         // Best-effort: don't keep the process alive just for this timer
         forceExitTimer.unref?.();
         await withTimeout((async () => {
+            // Shutdown worker management system FIRST (before database closes)
+            if (appConfig.detectRuntime() === 'nodejs' || appConfig.detectRuntime() === 'lambda') {
+                try {
+                    const { WorkerShutdown } = await import('../../packages/workers/src/index.js');
+                    const workerBudgetMs = Math.min(15000, remainingMs());
+                    await withTimeout(WorkerShutdown.shutdown({ signal, timeout: workerBudgetMs, forceExit: false }), workerBudgetMs, 'Worker shutdown timed out');
+                }
+                catch (error) {
+                    Logger.warn('Worker shutdown failed (continuing with app shutdown)', error);
+                }
+            }
             if (serverInstance !== undefined) {
                 await serverInstance.close();
             }
             if (appInstance !== undefined) {
-                await appInstance.shutdown();
-            }
-        })(), timeoutMs, 'Graceful shutdown timed out');
-        // Shutdown worker management system first
-        if (appConfig.detectRuntime() === 'nodejs' || appConfig.detectRuntime() === 'lambda') {
-            try {
-                const { WorkerShutdown } = await import('../../packages/workers/src/index.js');
-                await withTimeout(WorkerShutdown.shutdown({ signal, timeout: 30000, forceExit: false }), timeoutMs, 'Worker shutdown timed out');
-                Logger.info('Worker management system shutdown complete');
-            }
-            catch (error) {
-                Logger.warn('Worker shutdown failed (continuing with app shutdown)', error);
+                try {
+                    const appBudgetMs = Math.min(5000, remainingMs());
+                    await withTimeout(appInstance.shutdown(), appBudgetMs, 'App shutdown timed out');
+                }
+                catch (error) {
+                    Logger.warn('App shutdown failed or timed out, forcing exit', error);
+                }
             }
-        }
+        })(), shutdownBudgetMs, 'Graceful shutdown timed out');
         globalThis.clearTimeout(forceExitTimer);
         process.exit(0);
     }
@@ -155,6 +164,16 @@ const BootstrapFunctions = Object.freeze({
      */
     async start() {
         try {
+            // Ensure project-installed adapters/drivers are registered for web server.
+            // (This is driven by src/zintrust.plugins.ts generated by `zin plugin install`.)
+            try {
+                const { PluginAutoImports } = await import('../runtime/PluginAutoImports.js');
+                await PluginAutoImports.tryImportProjectAutoImports();
+            }
+            catch (error) {
+                // best-effort; run without plugins if loader fails (e.g. non-Node runtime)
+                Logger.debug('Plugin auto-imports loader skipped:', error);
+            }
             // Create application instance
             // if (Env.ZINTRUST_PROJECT_ROOT) {
             // }

package/src/cache/drivers/RedisDriver.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"RedisDriver.d.ts","sourceRoot":"","sources":["../../../../src/cache/drivers/RedisDriver.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AA+EtD;;GAEG;AACH,eAAO,MAAM,WAAW;kBA1EL,WAAW;EA4E5B,CAAC"}
+{"version":3,"file":"RedisDriver.d.ts","sourceRoot":"","sources":["../../../../src/cache/drivers/RedisDriver.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAoFtD;;GAEG;AACH,eAAO,MAAM,WAAW;kBA9EL,WAAW;EAgF5B,CAAC"}

package/src/cache/drivers/RedisDriver.js

@@ -5,6 +5,7 @@
 import { Env } from '../../config/env.js';
 import { Logger } from '../../config/logger.js';
 import * as net from '../../node-singletons/net.js';
+import { createCacheKey } from '../../tools/redis/RedisKeyManager.js';
 /**
  * Create a new Redis driver instance
  */
@@ -38,7 +39,8 @@ const create = () => {
     return {
         async get(key) {
             try {
-                const response = await sendCommand(`GET ${key}\r\n`);
+                const prefixedKey = createCacheKey(key);
+                const response = await sendCommand(`GET ${prefixedKey}\r\n`);
                 if (response.startsWith('$-1'))
                     return null;
                 // Basic RESP parsing
@@ -52,21 +54,24 @@ const create = () => {
             }
         },
         async set(key, value, ttl) {
+            const prefixedKey = createCacheKey(key);
             const jsonValue = JSON.stringify(value);
-            let command = `SET ${key} ${jsonValue}\r\n`;
+            let command = `SET ${prefixedKey} ${jsonValue}\r\n`;
             if (ttl !== undefined) {
-                command = `SETEX ${key} ${ttl} ${jsonValue}\r\n`;
+                command = `SETEX ${prefixedKey} ${ttl} ${jsonValue}\r\n`;
             }
             await sendCommand(command);
         },
         async delete(key) {
-            await sendCommand(`DEL ${key}\r\n`);
+            const prefixedKey = createCacheKey(key);
+            await sendCommand(`DEL ${prefixedKey}\r\n`);
         },
         async clear() {
             await sendCommand(`FLUSHDB\r\n`);
         },
         async has(key) {
-            const response = await sendCommand(`EXISTS ${key}\r\n`);
+            const prefixedKey = createCacheKey(key);
+            const response = await sendCommand(`EXISTS ${prefixedKey}\r\n`);
             return response.includes(':1');
         },
     };

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

@@ -1 +1 @@
-{"version":3,"file":"CLI.d.ts","sourceRoot":"","sources":["../../../src/cli/CLI.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAyCH,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAIpC,MAAM,WAAW,IAAI;IACnB,GAAG,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IACnC,UAAU,IAAI,OAAO,CAAC;CACvB;AAqMD;;;;;;;GAOG;AACH,eAAO,MAAM,GAAG;cACJ,IAAI;EAed,CAAC"}
+{"version":3,"file":"CLI.d.ts","sourceRoot":"","sources":["../../../src/cli/CLI.ts"],"names":[],"mappings":"AAAA;;;GAGG;AA0CH,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAIpC,MAAM,WAAW,IAAI;IACnB,GAAG,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IACnC,UAAU,IAAI,OAAO,CAAC;CACvB;AA2MD;;;;;;;GAOG;AACH,eAAO,MAAM,GAAG;cACJ,IAAI;EAed,CAAC"}

package/src/cli/CLI.js

@@ -32,6 +32,7 @@ import { TemplatesCommand } from './commands/TemplatesCommand.js';
 import { UpgradeCommand } from './commands/UpgradeCommand.js';
 import { WorkerCommands } from './commands/WorkerCommands.js';
 import { ErrorHandler } from './ErrorHandler.js';
+import { VersionChecker } from './services/VersionChecker.js';
 import { esmDirname } from '../common/index.js';
 import { Logger } from '../config/logger.js';
 import { ErrorFactory } from '../exceptions/ZintrustError.js';
@@ -194,6 +195,11 @@ const runCLI = async (program, version, args) => {
         }
         // Always show banner for normal commands
         ErrorHandler.banner(version);
+        // Run version check in background (non-blocking)
+        VersionChecker.runVersionCheck().catch((error) => {
+            // Version check should never crash the CLI
+            Logger.debug('Version check encountered an error', error);
+        });
         // Show help if no arguments provided
         if (args.length === 0) {
             program.help();

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

@@ -1 +1 @@
-{"version":3,"file":"DbSeedCommand.d.ts","sourceRoot":"","sources":["../../../../src/cli/commands/DbSeedCommand.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAIH,OAAO,KAAK,EAAkB,YAAY,EAAE,MAAM,kBAAkB,CAAC;AA6MrE,eAAO,MAAM,aAAa;cACd,YAAY;EAUtB,CAAC"}
+{"version":3,"file":"DbSeedCommand.d.ts","sourceRoot":"","sources":["../../../../src/cli/commands/DbSeedCommand.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAIH,OAAO,KAAK,EAAkB,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAkKrE,eAAO,MAAM,aAAa;cACd,YAAY;EAUtB,CAAC"}

package/src/cli/commands/DbSeedCommand.js

@@ -5,7 +5,7 @@
 import { SeederDiscovery } from '../../seeders/SeederDiscovery.js';
 import { SeederLoader } from '../../seeders/SeederLoader.js';
 import { BaseCommand } from '../BaseCommand.js';
-import { PromptHelper } from '../PromptHelper.js';
+import { confirmProductionRun, mapConnectionToOrmConfig } from '../utils/DatabaseCliUtils.js';
 import { databaseConfig } from '../../config/database.js';
 import { Env } from '../../config/env.js';
 import { ErrorFactory } from '../../exceptions/ZintrustError.js';
@@ -23,42 +23,6 @@ const ensureNonD1Driver = (driver) => {
         throw ErrorFactory.createCliError('This project is configured for D1. Seeding via `zin db:seed` is not supported yet.');
     }
 };
-const mapConnectionToOrmConfig = (conn) => {
-    switch (conn.driver) {
-        case 'sqlite':
-            return { driver: 'sqlite', database: conn.database };
-        case 'postgresql':
-            return {
-                driver: 'postgresql',
-                host: conn.host,
-                port: conn.port,
-                database: conn.database,
-                username: conn.username,
-                password: conn.password,
-            };
-        case 'mysql':
-            return {
-                driver: 'mysql',
-                host: conn.host,
-                port: conn.port,
-                database: conn.database,
-                username: conn.username,
-                password: conn.password,
-            };
-        default:
-            return { driver: 'sqlite', database: ':memory:' };
-    }
-};
-const confirmProductionRun = async (cmd, interactive) => {
-    if (Env.NODE_ENV !== 'production')
-        return true;
-    const confirmed = await PromptHelper.confirm('NODE_ENV=production. Continue running seeders?', false, interactive);
-    if (!confirmed) {
-        cmd.warn('Cancelled.');
-        return false;
-    }
-    return true;
-};
 const getServiceArgs = (options) => {
     let serviceArg;
     if (typeof options['onlyService'] === 'string') {
@@ -105,7 +69,11 @@ const selectSeederFiles = (files, seederName) => {
 };
 const executeSeed = async (options, cmd) => {
     const interactive = getInteractive(options);
-    const okToProceed = await confirmProductionRun(cmd, interactive);
+    const okToProceed = await confirmProductionRun({
+        cmd,
+        interactive,
+        message: 'NODE_ENV=production. Continue running seeders?',
+    });
     if (!okToProceed)
         return;
     const conn = databaseConfig.getConnection();

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

@@ -1 +1 @@
-{"version":3,"file":"MigrateCommand.d.ts","sourceRoot":"","sources":["../../../../src/cli/commands/MigrateCommand.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,KAAK,EAAkB,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAkdrE;;GAEG;AACH,eAAO,MAAM,cAAc;IACzB;;OAEG;cACO,YAAY;EAUtB,CAAC"}
+{"version":3,"file":"MigrateCommand.d.ts","sourceRoot":"","sources":["../../../../src/cli/commands/MigrateCommand.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,KAAK,EAAkB,YAAY,EAAE,MAAM,kBAAkB,CAAC;AA4ZrE;;GAEG;AACH,eAAO,MAAM,cAAc;IACzB;;OAEG;cACO,YAAY;EAUtB,CAAC"}

package/src/cli/commands/MigrateCommand.js

@@ -7,8 +7,9 @@ import { D1SqlMigrations } from '../d1/D1SqlMigrations.js';
 import { WranglerConfig } from '../d1/WranglerConfig.js';
 import { WranglerD1 } from '../d1/WranglerD1.js';
 import { PromptHelper } from '../PromptHelper.js';
+import { confirmProductionRun, mapConnectionToOrmConfig, parseRollbackSteps, } from '../utils/DatabaseCliUtils.js';
+import { readEnvString } from '../../common/ExternalServiceUtils.js';
 import { databaseConfig } from '../../config/database.js';
-import { Env } from '../../config/env.js';
 import { ErrorFactory } from '../../exceptions/ZintrustError.js';
 import { Migrator } from '../../migrations/Migrator.js';
 import * as path from '../../node-singletons/path.js';
@@ -32,9 +33,10 @@ const addMigrateOptions = (command) => {
 };
 const getInteractive = (options) => options['interactive'] !== false;
 const getMigrationDirs = () => {
-    const globalDir = Env.get('MIGRATIONS_GLOBAL_DIR', databaseConfig.migrations.directory);
+    const globalDir = readEnvString('MIGRATIONS_GLOBAL_DIR', databaseConfig.migrations.directory);
     const extension = databaseConfig.migrations.extension;
-    const separateTracking = Env.getBool('MIGRATIONS_SEPARATE_TRACKING', false);
+    const separateTrackingRaw = readEnvString('MIGRATIONS_SEPARATE_TRACKING', '').trim();
+    const separateTracking = separateTrackingRaw === '1' || separateTrackingRaw.toLowerCase() === 'true';
     return { globalDir, extension, separateTracking };
 };
 const getServiceArgs = (options) => {
@@ -64,53 +66,6 @@ const describeTargetDatabase = (conn) => {
             return `${conn.driver}`;
     }
 };
-const mapConnectionToOrmConfig = (conn) => {
-    switch (conn.driver) {
-        case 'sqlite':
-            return { driver: 'sqlite', database: conn.database };
-        case 'postgresql':
-            return {
-                driver: 'postgresql',
-                host: conn.host,
-                port: conn.port,
-                database: conn.database,
-                username: conn.username,
-                password: conn.password,
-            };
-        case 'mysql':
-            return {
-                driver: 'mysql',
-                host: conn.host,
-                port: conn.port,
-                database: conn.database,
-                username: conn.username,
-                password: conn.password,
-            };
-        case 'sqlserver':
-            return {
-                driver: 'sqlserver',
-                host: conn.host,
-                port: conn.port,
-                database: conn.database,
-                username: conn.username,
-                password: conn.password,
-            };
-        default:
-            return { driver: 'sqlite', database: ':memory:' };
-    }
-};
-const confirmProductionRun = async (cmd, interactive, destructive, force) => {
-    if (Env.NODE_ENV !== 'production')
-        return true;
-    if (force)
-        return true;
-    const confirmed = await PromptHelper.confirm(`NODE_ENV=production. Continue running migrations${destructive ? ' (destructive)' : ''}?`, false, interactive);
-    if (!confirmed) {
-        cmd.warn('Cancelled.');
-        return false;
-    }
-    return true;
-};
 const printStatus = (cmd, rows) => {
     if (rows.length === 0) {
         cmd.info('No migrations found.');
@@ -133,10 +88,6 @@ const logAppliedMigrations = (cmd, appliedNames) => {
         cmd.info(`✓ ${name}`);
     }
 };
-const parseRollbackSteps = (options) => {
-    const stepRaw = typeof options['step'] === 'string' ? options['step'] : '1';
-    return Math.max(1, Number.parseInt(stepRaw, 10) || 1);
-};
 const handleStatusAction = async (migrator, cmd, driver) => {
     cmd.info(`Adapter: ${driver}`);
     const rows = await migrator.status();
@@ -267,7 +218,13 @@ const processConnection = async (conn, options, cmd, interactive) => {
     const ormConfig = mapConnectionToOrmConfig(conn);
     const destructive = isDestructiveAction(options);
     const force = options['force'] === true;
-    const okToProceed = await confirmProductionRun(cmd, interactive, destructive, force);
+    const okToProceed = await confirmProductionRun({
+        cmd,
+        interactive,
+        destructive,
+        force,
+        message: 'NODE_ENV=production. Continue running migrations?',
+    });
     if (!okToProceed)
         return;
     cmd.info(`[i] Target database: ${describeTargetDatabase(conn)}`);

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

@@ -1 +1 @@
-{"version":3,"file":"MigrateWorkerCommand.d.ts","sourceRoot":"","sources":["../../../../src/cli/commands/MigrateWorkerCommand.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,KAAK,EAAkB,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAkOrE,eAAO,MAAM,oBAAoB;cACrB,YAAY;EAUtB,CAAC"}
+{"version":3,"file":"MigrateWorkerCommand.d.ts","sourceRoot":"","sources":["../../../../src/cli/commands/MigrateWorkerCommand.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,KAAK,EAAkB,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAmKrE,eAAO,MAAM,oBAAoB;cACrB,YAAY;EAUtB,CAAC"}

package/src/cli/commands/MigrateWorkerCommand.js

@@ -3,9 +3,8 @@
  * Run worker package migrations
  */
 import { BaseCommand } from '../BaseCommand.js';
-import { PromptHelper } from '../PromptHelper.js';
+import { confirmProductionRun, mapConnectionToOrmConfig, parseRollbackSteps, } from '../utils/DatabaseCliUtils.js';
 import { databaseConfig } from '../../config/database.js';
-import { Env } from '../../config/env.js';
 import { Migrator } from '../../migrations/Migrator.js';
 import * as path from '../../node-singletons/path.js';
 import { Database } from '../../orm/Database.js';
@@ -22,58 +21,7 @@ const addOptions = (command) => {
         .option('--no-interactive', 'Disable interactive prompts (useful for CI/CD)');
 };
 const getInteractive = (options) => options['interactive'] !== false;
-const mapConnectionToOrmConfig = (conn) => {
-    switch (conn.driver) {
-        case 'sqlite':
-            return { driver: 'sqlite', database: conn.database };
-        case 'postgresql':
-            return {
-                driver: 'postgresql',
-                host: conn.host,
-                port: conn.port,
-                database: conn.database,
-                username: conn.username,
-                password: conn.password,
-            };
-        case 'mysql':
-            return {
-                driver: 'mysql',
-                host: conn.host,
-                port: conn.port,
-                database: conn.database,
-                username: conn.username,
-                password: conn.password,
-            };
-        case 'sqlserver':
-            return {
-                driver: 'sqlserver',
-                host: conn.host,
-                port: conn.port,
-                database: conn.database,
-                username: conn.username,
-                password: conn.password,
-            };
-        default:
-            return { driver: 'sqlite', database: ':memory:' };
-    }
-};
 const isDestructiveAction = (options) => options['fresh'] === true || options['reset'] === true || options['rollback'] === true;
-const parseRollbackSteps = (options) => {
-    const stepRaw = typeof options['step'] === 'string' ? options['step'] : '1';
-    return Math.max(1, Number.parseInt(stepRaw, 10) || 1);
-};
-const confirmProductionRun = async (cmd, interactive, destructive, force) => {
-    if (Env.NODE_ENV !== 'production')
-        return true;
-    if (force)
-        return true;
-    const confirmed = await PromptHelper.confirm(`NODE_ENV=production. Continue running worker migrations${destructive ? ' (destructive)' : ''}?`, false, interactive);
-    if (!confirmed) {
-        cmd.warn('Cancelled.');
-        return false;
-    }
-    return true;
-};
 const printStatus = async (migrator, cmd) => {
     const rows = await migrator.status();
     if (rows.length === 0) {
@@ -123,7 +71,13 @@ const runActions = async (migrator, options, cmd, driver) => {
 };
 const runForConnection = async (conn, options, cmd, interactive) => {
     const destructive = isDestructiveAction(options);
-    const proceed = await confirmProductionRun(cmd, interactive, destructive, options['force'] === true);
+    const proceed = await confirmProductionRun({
+        cmd,
+        interactive,
+        destructive,
+        force: options['force'] === true,
+        message: 'NODE_ENV=production. Continue running worker migrations?',
+    });
     if (!proceed)
         return;
     if (!DatabaseAdapterRegistry.has(conn.driver)) {

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;AAerE,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;AAmQhD,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;AAwOD;;;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;AAerE,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;AAwOD;;;GAGG;AACH,eAAO,MAAM,UAAU;IACrB;;OAEG;cACO,WAAW;EAGrB,CAAC"}

package/src/cli/commands/NewCommand.js

@@ -3,9 +3,9 @@ import { PromptHelper } from '../PromptHelper.js';
 import { GovernanceScaffolder } from '../scaffolding/GovernanceScaffolder.js';
 import { ProjectScaffolder } from '../scaffolding/ProjectScaffolder.js';
 import { SpawnUtil } from '../utils/spawn.js';
+import { readEnvString } from '../../common/ExternalServiceUtils.js';
 import { extractErrorMessage, resolvePackageManager } from '../../common/index.js';
 import { appConfig } from '../../config/app.js';
-import { Env } from '../../config/env.js';
 import { ErrorFactory } from '../../exceptions/ZintrustError.js';
 import { execFileSync } from '../../node-singletons/child-process.js';
 import * as path from '../../node-singletons/path.js';
@@ -193,18 +193,6 @@ const promptForPackageManager = async (defaultPm) => {
 };
 const installDependencies = async (projectPath, log, packageManager, force = false) => {
     // Respect CI by default — avoid network installs in CI unless explicitly allowed
-    const readEnvString = (key) => {
-        const anyEnv = Env;
-        const fromEnv = typeof anyEnv.get === 'function' ? anyEnv.get(key, '') : '';
-        if (typeof fromEnv === 'string' && fromEnv.trim() !== '')
-            return fromEnv;
-        if (typeof process !== 'undefined') {
-            const raw = process.env?.[key];
-            if (typeof raw === 'string')
-                return raw;
-        }
-        return fromEnv ?? '';
-    };
     const ciRaw = readEnvString('CI').trim().toLowerCase();
     const isCi = ciRaw !== '' && ciRaw !== '0' && ciRaw !== 'false';
     const allowAuto = readEnvString('ZINTRUST_ALLOW_AUTO_INSTALL') === '1' || force;

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

@@ -1 +1 @@
-{"version":3,"file":"QueueCommand.d.ts","sourceRoot":"","sources":["../../../../src/cli/commands/QueueCommand.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAoC,KAAK,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAYvF,eAAO,MAAM,YAAY;cACb,YAAY;EA0EtB,CAAC;AAEH,eAAe,YAAY,CAAC"}
+{"version":3,"file":"QueueCommand.d.ts","sourceRoot":"","sources":["../../../../src/cli/commands/QueueCommand.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAoC,KAAK,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAqHvF,eAAO,MAAM,YAAY;cACb,YAAY;EAmBtB,CAAC;AAEH,eAAe,YAAY,CAAC"}