@zintrust/core 0.4.39 → 0.4.41

package/src/cli/commands/PutCommand.js

@@ -1,11 +1,6 @@
 import { BaseCommand } from '../BaseCommand.js';
-import { resolveNpmPath } from '../../common/index.js';
-import { appConfig } from '../../config/app.js';
+import { reportCloudflareSecretSync, syncCloudflareSecrets, } from '../cloudflare/CloudflareSecretSync.js';
 import { ErrorFactory } from '../../exceptions/ZintrustError.js';
-import { execFileSync } from '../../node-singletons/child-process.js';
-import { existsSync, readFileSync } from '../../node-singletons/fs.js';
-import * as path from '../../node-singletons/path.js';
-import { EnvFile } from '../../toolkit/Secrets/EnvFile.js';
 const toStringArray = (value) => {
     if (typeof value === 'string')
         return [value];
@@ -25,26 +20,6 @@ const uniq = (items) => {
     }
     return out;
 };
-const readZintrustConfig = (cwd) => {
-    const filePath = path.join(cwd, '.zintrust.json');
-    if (!existsSync(filePath)) {
-        return {};
-    }
-    try {
-        const raw = readFileSync(filePath, 'utf8');
-        const parsed = JSON.parse(raw);
-        return typeof parsed === 'object' && parsed !== null ? parsed : {};
-    }
-    catch (error) {
-        throw ErrorFactory.createCliError('Failed to parse .zintrust.json', error);
-    }
-};
-const getConfigArray = (config, key) => {
-    const raw = config[key];
-    if (!Array.isArray(raw))
-        return [];
-    return uniq(raw.filter((item) => typeof item === 'string'));
-};
 const resolveConfigGroups = (options) => {
     return uniq(toStringArray(options.var));
 };
@@ -60,41 +35,12 @@ const parseEnvPath = (options) => {
         return direct;
     return '.env';
 };
-const resolveValue = (key, envMap) => {
-    const fromFile = envMap[key];
-    const fromProcess = process.env[key];
-    return fromFile ?? fromProcess ?? '';
-};
-const getPutTimeoutMs = () => {
-    const raw = process.env['ZT_PUT_TIMEOUT_MS'];
-    if (typeof raw !== 'string')
-        return 120000;
-    const parsed = Number.parseInt(raw, 10);
-    if (!Number.isFinite(parsed) || parsed <= 0)
-        return 120000;
-    return parsed;
-};
-const putSecret = (wranglerEnv, key, value, configPath) => {
-    const npmPath = resolveNpmPath();
-    const args = ['exec', '--yes', '--', 'wrangler'];
-    if (typeof configPath === 'string' && configPath.trim().length > 0) {
-        args.push('--config', configPath.trim());
-    }
-    args.push('secret', 'put', key, '--env', wranglerEnv);
-    execFileSync(npmPath, args, {
-        stdio: ['pipe', 'inherit', 'inherit'],
-        input: value,
-        encoding: 'utf8',
-        timeout: getPutTimeoutMs(),
-        killSignal: 'SIGTERM',
-        env: appConfig.getSafeEnv(),
-    });
-};
 const addOptions = (command) => {
     command
         .argument('[provider]', 'Secret provider (cloudflare)', 'cloudflare')
         .option('--wg <env...>', 'Wrangler environment target(s), e.g. d1-proxy kv-proxy')
         .option('--var <configKey...>', 'Config array key(s) from .zintrust.json (e.g. d1_env kv_env)')
+        .option('--target <id>', 'Cloudflare worker target key from .zintrust.json cloudflare.targets')
         .option('--env_path <path>', 'Path to env file used as source values', '.env')
         .option('-c, --config <path>', 'Wrangler config file to target (optional)')
         .option('--dry-run', 'Show what would be uploaded without calling wrangler');
@@ -104,70 +50,21 @@ const ensureCloudflareProvider = (providerRaw) => {
         return;
     throw ErrorFactory.createCliError('Only cloudflare provider is supported for `zin put`');
 };
-const resolveSelectedKeys = (cmd, config, options) => {
-    const configGroups = resolveConfigGroups(options);
-    if (configGroups.length === 0) {
-        throw ErrorFactory.createCliError('No config groups selected. Use --var <group>.');
-    }
-    const selectedKeys = uniq(configGroups.flatMap((groupKey) => {
-        const keys = getConfigArray(config, groupKey);
-        if (keys.length === 0) {
-            cmd.warn(`Group \`${groupKey}\` is missing or empty in .zintrust.json`);
-        }
-        return keys;
-    }));
-    if (selectedKeys.length === 0) {
-        throw ErrorFactory.createCliError('No secret keys resolved from selected groups.');
-    }
-    return selectedKeys;
-};
-const getFailureReason = (error) => error instanceof Error ? error.message : String(error);
-const reportResult = (cmd, pushed, failures) => {
-    cmd.success(`Cloudflare secrets report: pushed=${pushed}, failed=${failures.length}`);
-    for (const item of failures) {
-        cmd.warn(`${item.key} -> ${item.wranglerEnv}: ${item.reason}`);
-    }
-};
-const processPut = (cmd, wranglerEnvs, selectedKeys, envMap, dryRun, configPath) => {
-    let pushed = 0;
-    const failures = [];
-    for (const wranglerEnv of wranglerEnvs) {
-        for (const key of selectedKeys) {
-            const value = resolveValue(key, envMap);
-            if (value.trim() === '') {
-                failures.push({ wranglerEnv, key, reason: 'empty value' });
-                continue;
-            }
-            try {
-                if (!dryRun) {
-                    cmd.info(`putting ${key} -> ${wranglerEnv}...`);
-                    putSecret(wranglerEnv, key, value, configPath);
-                }
-                pushed += 1;
-                cmd.info(`${dryRun ? '[dry-run] ' : ''}put ${key} -> ${wranglerEnv}`);
-            }
-            catch (error) {
-                failures.push({ wranglerEnv, key, reason: getFailureReason(error) });
-            }
-        }
-    }
-    return { pushed, failures };
-};
 const execute = async (cmd, options) => {
     ensureCloudflareProvider(String(options.args?.[0] ?? 'cloudflare'));
     const cwd = process.cwd();
-    const config = readZintrustConfig(cwd);
-    const selectedKeys = resolveSelectedKeys(cmd, config, options);
-    const envFilePath = parseEnvPath(options);
-    const envMap = await EnvFile.read({ cwd, path: envFilePath });
-    const wranglerEnvs = resolveWranglerEnvs(options);
-    const dryRun = options.dryRun === true;
-    const configPath = typeof options.config === 'string' ? options.config.trim() : '';
-    if (configPath !== '' && !existsSync(path.join(cwd, configPath))) {
-        throw ErrorFactory.createCliError(`Wrangler config not found: ${configPath}`);
-    }
-    const result = processPut(cmd, wranglerEnvs, selectedKeys, envMap, dryRun, configPath === '' ? undefined : configPath);
-    reportResult(cmd, result.pushed, result.failures);
+    const result = await syncCloudflareSecrets({
+        log: cmd,
+        cwd,
+        wranglerEnvs: resolveWranglerEnvs(options),
+        envPath: parseEnvPath(options),
+        dryRun: options.dryRun === true,
+        configGroups: resolveConfigGroups(options),
+        configPath: typeof options.config === 'string' ? options.config.trim() : undefined,
+        target: typeof options.target === 'string' ? options.target : undefined,
+        requireSelection: true,
+    });
+    reportCloudflareSecretSync(cmd, result);
 };
 export const PutCommand = Object.freeze({
     create() {

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;AAmhCvF,eAAO,MAAM,YAAY;cACb,YAAY;;mCAr9BU,MAAM,KAAG,OAAO;4CAaP,MAAM,KAAG,MAAM;4CA4Bf,MAAM,KAAG,OAAO;sCAetB,MAAM,WAAW,MAAM,KAAG,OAAO;oCAmBnC,MAAM,KAAG,OAAO;;EAq7BjD,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;AA6lCvF,eAAO,MAAM,YAAY;cACb,YAAY;;mCA3hCU,MAAM,KAAG,OAAO;4CAaP,MAAM,KAAG,MAAM;4CA4Bf,MAAM,KAAG,OAAO;sCAetB,MAAM,WAAW,MAAM,KAAG,OAAO;oCAmBnC,MAAM,KAAG,OAAO;;EA2/BjD,CAAC"}

package/src/cli/commands/StartCommand.js

@@ -1,4 +1,5 @@
 import { BaseCommand } from '../BaseCommand.js';
+import { readZintrustConfig, resolveCloudflareEnvKeys, } from '../cloudflare/CloudflareEnvTargetConfig.js';
 import { createDenoRunnerSource, createLambdaRunnerSource } from '../commands/runner/index.js';
 import { EnvFileLoader } from '../utils/EnvFileLoader.js';
 import { SpawnUtil } from '../utils/spawn.js';
@@ -336,11 +337,31 @@ const buildStartEnv = (projectRoot) => ({
     ...process.env,
     ZINTRUST_PROJECT_ROOT: projectRoot,
 });
-const buildWorkerDevVarsContent = () => {
+const WRANGLER_RUNTIME_ENV_KEYS = Object.freeze([
+    'APP_PORT',
+    'CLOUDFLARE_WORKER',
+    'DOCKER_WORKER',
+    'ENVIRONMENT',
+    'HOST',
+    'NODE_ENV',
+    'PORT',
+    'RUNTIME',
+    'SERVICE_DOMAIN',
+    'SERVICE_NAME',
+    'SERVICE_PORT',
+    'WORKER_ENABLED',
+    'ZINTRUST_PROJECT_ROOT',
+]);
+const buildWorkerDevVarsContent = (selectedKeys) => {
+    const allowedKeys = selectedKeys === undefined || selectedKeys.length === 0
+        ? undefined
+        : new Set([...WRANGLER_RUNTIME_ENV_KEYS, ...selectedKeys]);
     return (Object.entries(process.env)
         .filter((entry) => {
         const [key, value] = entry;
-        return isWranglerVarName(key) && typeof value === 'string';
+        return (isWranglerVarName(key) &&
+            typeof value === 'string' &&
+            (allowedKeys === undefined || allowedKeys.has(key)));
     })
         .map(([key, value]) => `${key}=${JSON.stringify(value)}`)
         .join('\n') + '\n');
@@ -357,7 +378,7 @@ const reconcileWranglerEnvBackup = (targetPath, backupPath) => {
     }
     unlinkSync(backupPath);
 };
-async function withWranglerEnvSnapshot(cwd, envName, fn) {
+async function withWranglerEnvSnapshot(cwd, envName, selectedKeys, fn) {
     const normalizedEnv = typeof envName === 'string' ? envName.trim() : '';
     const targetName = normalizedEnv === '' ? '.dev.vars' : `.dev.vars.${normalizedEnv}`;
     const targetPath = path.join(cwd, targetName);
@@ -372,7 +393,7 @@ async function withWranglerEnvSnapshot(cwd, envName, fn) {
         renameSync(targetPath, backupPath);
     }
     try {
-        writeFileSync(targetPath, buildWorkerDevVarsContent(), 'utf-8');
+        writeFileSync(targetPath, buildWorkerDevVarsContent(selectedKeys), 'utf-8');
         return await fn();
     }
     finally {
@@ -514,42 +535,64 @@ const resolveNodeProdCommand = (cwd) => {
     }
     return { command: 'node', args: [compiled] };
 };
-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 resolveWranglerDevConfig = (context, wranglerConfig) => {
     const normalizedConfig = typeof wranglerConfig === 'string' ? wranglerConfig.trim() : '';
     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
-        }
-        else {
-            throw ErrorFactory.createCliError(`Error: Wrangler config not found: ${normalizedConfig}`);
-        }
+    if (explicitConfigFullPath !== undefined && !existsSync(explicitConfigFullPath)) {
+        throw ErrorFactory.createCliError(`Error: Wrangler config not found: ${normalizedConfig}`);
     }
     if (configPath === undefined && entry === undefined) {
         throw ErrorFactory.createCliError("Error: wrangler config not found (wrangler.toml/json). Run 'wrangler init' first.");
     }
-    warnOnUnsafeWranglerBootstrap(cmd, context.cwd, entry);
+    return { normalizedConfig, configPath, entry };
+};
+const buildWranglerDevArgs = (args) => {
     const wranglerArgs = ['dev'];
-    if (normalizedConfig !== '') {
-        wranglerArgs.push('--config', normalizedConfig);
+    if (args.normalizedConfig !== '') {
+        wranglerArgs.push('--config', args.normalizedConfig);
     }
-    if (configPath === undefined && entry !== undefined) {
-        wranglerArgs.push(entry);
+    if (args.configPath === undefined && args.entry !== undefined) {
+        wranglerArgs.push(args.entry);
     }
-    if (typeof port === 'number') {
-        wranglerArgs.push('--port', String(port));
+    if (typeof args.port === 'number') {
+        wranglerArgs.push('--port', String(args.port));
     }
-    if (envName !== undefined && envName.trim() !== '') {
-        wranglerArgs.push('--env', envName.trim());
+    if (args.envName !== undefined && args.envName.trim() !== '') {
+        wranglerArgs.push('--env', args.envName.trim());
+    }
+    return wranglerArgs;
+};
+const resolveWranglerSelectedEnvKeys = (context, configPath, envName) => {
+    const zintrustConfigPath = path.join(context.projectRoot, '.zintrust.json');
+    if (!existsSync(zintrustConfigPath))
+        return undefined;
+    return resolveCloudflareEnvKeys({
+        config: readZintrustConfig(context.projectRoot),
+        projectRoot: context.projectRoot,
+        cwd: context.cwd,
+        ...(configPath === undefined ? {} : { configPath }),
+        ...(envName === undefined ? {} : { wranglerEnv: envName }),
+    });
+};
+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, configPath, entry } = resolveWranglerDevConfig(context, wranglerConfig);
+    warnOnUnsafeWranglerBootstrap(cmd, context.cwd, entry);
+    const wranglerArgs = buildWranglerDevArgs({
+        normalizedConfig,
+        configPath,
+        entry,
+        port,
+        envName,
+    });
     logMySqlProxyHint(cmd);
     cmd.info('Starting in Wrangler dev mode...');
-    const exitCode = await withWranglerEnvSnapshot(context.cwd, envName, async () => {
+    const selectedEnvKeys = resolveWranglerSelectedEnvKeys(context, configPath, envName);
+    const exitCode = await withWranglerEnvSnapshot(context.cwd, envName, selectedEnvKeys, async () => {
         const startEnv = {
             ...buildStartEnv(context.projectRoot),
             WORKER_ENABLED: 'false',

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

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

package/src/cli/scaffolding/ProjectScaffolder.js

@@ -93,6 +93,30 @@ const createProjectConfigFile = (projectPath, variables) => {
             server: {
                 port: variables['port'] ?? 7777,
             },
+            cloudflare: {
+                shared_env: ['APP_KEY', 'JWT_SECRET', 'SESSION_SECRET'],
+                targets: {
+                    worker: [],
+                    'containers-proxy': [
+                        'MYSQL_PROXY_KEY_ID',
+                        'MYSQL_PROXY_SECRET',
+                        'POSTGRES_PROXY_KEY_ID',
+                        'POSTGRES_PROXY_SECRET',
+                        'REDIS_PROXY_KEY_ID',
+                        'REDIS_PROXY_SECRET',
+                        'MONGODB_PROXY_KEY_ID',
+                        'MONGODB_PROXY_SECRET',
+                        'SQLSERVER_PROXY_KEY_ID',
+                        'SQLSERVER_PROXY_SECRET',
+                        'SMTP_PROXY_KEY_ID',
+                        'SMTP_PROXY_SECRET',
+                    ],
+                },
+                wrangler_envs: {
+                    'd1-proxy': ['D1_REMOTE_KEY_ID', 'D1_REMOTE_SECRET'],
+                    'kv-proxy': ['KV_REMOTE_KEY_ID', 'KV_REMOTE_SECRET'],
+                },
+            },
         };
         fs.writeFileSync(fullPath, JSON.stringify(config, null, 2));
         return true;

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;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;AA+cD,eAAO,MAAM,iBAAiB;;;;EAI5B,CAAC"}
+{"version":3,"file":"ServiceScaffolder.d.ts","sourceRoot":"","sources":["../../../../src/cli/scaffolding/ServiceScaffolder.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAOH,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,CAkDhC;AA8eD,eAAO,MAAM,iBAAiB;;;;EAI5B,CAAC"}

package/src/cli/scaffolding/ServiceScaffolder.js

@@ -4,12 +4,14 @@
  */
 import { FileGenerator } from '../scaffolding/FileGenerator.js';
 import { Logger } from '../../config/logger.js';
+import { isArray, isObject } from '../../helper/index.js';
 import * as path from '../../node-singletons/path.js';
 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`;
+const getServiceId = (domain, serviceName) => `${domain}/${serviceName}`;
 /**
  * ServiceScaffolder generates microservices with all necessary files
  */
@@ -74,6 +76,7 @@ export function scaffold(projectRoot, options) {
         ensureProjectRuntimeFiles(projectRoot, options);
         const filesCreated = createServiceFiles(servicePath, options);
         updateServiceManifest(projectRoot, options);
+        ensureCloudflareServiceTarget(projectRoot, options);
         return Promise.resolve({
             success: true,
             serviceName: options.name,
@@ -95,7 +98,7 @@ export function scaffold(projectRoot, options) {
 }
 function ensureProjectRuntimeFiles(projectRoot, options) {
     const domain = options.domain ?? 'default';
-    const serviceId = `${domain}/${options.name}`;
+    const serviceId = getServiceId(domain, options.name);
     const routeImportExpression = buildRouteImportExpression(domain, options.name);
     const bootstrapDir = path.join(projectRoot, 'src', 'bootstrap');
     FileGenerator.createDirectory(bootstrapDir);
@@ -138,7 +141,7 @@ export default Object.freeze({ serviceManifest });
 }
 function updateServiceManifest(projectRoot, options) {
     const domain = options.domain ?? 'default';
-    const serviceId = `${domain}/${options.name}`;
+    const serviceId = getServiceId(domain, options.name);
     const routeImportExpression = buildRouteImportExpression(domain, options.name);
     const manifestPath = path.join(projectRoot, 'src', 'bootstrap', 'service-manifest.ts');
     if (!FileGenerator.fileExists(manifestPath))
@@ -168,6 +171,33 @@ function updateServiceManifest(projectRoot, options) {
     const next = `${current.slice(0, markerIndex)}${entry}${current.slice(markerIndex)}`;
     FileGenerator.writeFile(manifestPath, next, { overwrite: true });
 }
+function ensureCloudflareServiceTarget(projectRoot, options) {
+    const configPath = path.join(projectRoot, '.zintrust.json');
+    if (!FileGenerator.fileExists(configPath))
+        return;
+    try {
+        const raw = FileGenerator.readFile(configPath);
+        const parsed = JSON.parse(raw);
+        if (!isObject(parsed))
+            return;
+        const config = { ...parsed };
+        const cloudflare = isObject(config['cloudflare']) ? { ...config['cloudflare'] } : {};
+        const targets = isObject(cloudflare['targets']) ? { ...cloudflare['targets'] } : {};
+        const domain = options.domain ?? 'default';
+        const serviceId = getServiceId(domain, options.name);
+        if (isArray(targets[serviceId]))
+            return;
+        targets[serviceId] = [];
+        cloudflare['targets'] = targets;
+        config['cloudflare'] = cloudflare;
+        FileGenerator.writeFile(`${configPath}`, `${JSON.stringify(config, null, 2)}\n`, {
+            overwrite: true,
+        });
+    }
+    catch (error) {
+        Logger.warn(`Unable to update .zintrust.json Cloudflare targets for ${options.domain ?? 'default'}/${options.name}: ${error instanceof Error ? error.message : String(error)}`);
+    }
+}
 /**
  * Create service directory structure
  */

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":"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"}
+{"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;AA8IzD,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;AAwMF,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

@@ -2,10 +2,8 @@ import { Env } from '../../config/env.js';
 import { isArray, isNonEmptyString } from '../../helper/index.js';
 import { existsSync, readFileSync } from '../../node-singletons/fs.js';
 import * as path from '../../node-singletons/path.js';
+const PACK_CONTROL_KEYS = new Set(['USE_PACK', 'PACK_KEYS']);
 const safeEnvGet = (key, defaultValue = '') => {
-    const envAny = Env;
-    if (typeof envAny.get === 'function')
-        return envAny.get(key, defaultValue);
     const fromProcess = typeof process === 'undefined' ? undefined : process.env?.[key];
     if (typeof fromProcess === 'string' && fromProcess !== '')
         return fromProcess;
@@ -109,6 +107,18 @@ const readEnvFileIfExists = (cwd, filename) => {
     const raw = readFileSync(fullPath, 'utf-8');
     return parseEnvFile(raw);
 };
+const readPackEnvFileIfExists = (cwd) => {
+    const parsed = readEnvFileIfExists(cwd, '.env.pack');
+    if (parsed === undefined)
+        return undefined;
+    const filtered = {};
+    for (const [key, value] of Object.entries(parsed)) {
+        if (PACK_CONTROL_KEYS.has(key))
+            continue;
+        filtered[key] = value;
+    }
+    return filtered;
+};
 const resolveAppMode = (cwd) => {
     const existing = safeEnvGet('NODE_ENV', '');
     if (existing.trim() !== '')
@@ -143,11 +153,13 @@ let cached;
 const loadFromCwd = (cwd, overrideExisting) => {
     const mode = resolveAppMode(cwd);
     const files = filesLoader(cwd, mode);
+    const loadedFiles = [];
     let baseApplied = false;
     for (const file of files) {
         const parsed = readEnvFileIfExists(cwd, file);
         if (!parsed)
             continue;
+        loadedFiles.push(file);
         if (file === '.env') {
             applyToProcessEnv(parsed, overrideExisting);
             baseApplied = true;
@@ -156,11 +168,16 @@ const loadFromCwd = (cwd, overrideExisting) => {
         // .env is primary: overlays only fill missing values and never override base.
         applyToProcessEnv(parsed, baseApplied ? false : overrideExisting);
     }
+    const packedEnv = readPackEnvFileIfExists(cwd);
+    if (packedEnv !== undefined) {
+        applyToProcessEnv(packedEnv, false);
+        loadedFiles.push('.env.pack');
+    }
     // Set NODE_ENV to the normalized mode if we have one (after applying files)
     if (mode !== undefined) {
         safeEnvSet('NODE_ENV', mode);
     }
-    return { loadedFiles: files, mode };
+    return { loadedFiles, mode };
 };
 const loadFromFile = (filePath, overrideExisting) => {
     if (!existsSync(filePath))

package/src/config/env.d.ts

@@ -7,8 +7,19 @@
  */
 import type { ProcessLike } from './type';
 export type EnvSource = Record<string, unknown> | (() => Record<string, unknown>);
+export type ResolvedEnvState = {
+    values: Record<string, string>;
+    sources: Record<string, string>;
+    packedEnabled: boolean;
+    packedKeys: string[];
+};
 export declare const getProcessLike: () => ProcessLike | undefined;
 export declare const dirnameFromExecPath: (execPath: string, platform?: string) => string;
+export declare const getOptional: (key: string) => string | undefined;
+export declare const has: (key: string) => boolean;
+export declare const getSourceOf: (key: string) => string | undefined;
+export declare const snapshotSources: () => Record<string, string>;
+export declare const getResolvedState: () => ResolvedEnvState;
 export declare const get: (key: string, defaultValue?: string) => string;
 export declare const getInt: (key: string, defaultValue: number) => number;
 export declare const getFloat: (key: string, defaultValue?: number) => number;
@@ -21,13 +32,18 @@ export declare const getDefaultLogLevel: () => "debug" | "info" | "warn" | "erro
 export declare const ZT_PROXY_TIMEOUT_MS: number;
 export declare const Env: Readonly<{
     get: (key: string, defaultValue?: string) => string;
+    getOptional: (key: string) => string | undefined;
     getInt: (key: string, defaultValue: number) => number;
     getBool: (key: string, defaultValue?: boolean) => boolean;
     getFloat: (key: string, defaultValue?: number) => number;
+    has: (key: string) => boolean;
     set: (key: string, value: string) => void;
     unset: (key: string) => void;
     setSource: (source: EnvSource | null) => void;
     snapshot: () => Record<string, string>;
+    getSourceOf: (key: string) => string | undefined;
+    snapshotSources: () => Record<string, string>;
+    getResolvedState: () => ResolvedEnvState;
     NODE_ENV: NodeJS.ProcessEnv["NODE_ENV"];
     PORT: number;
     HOST: string;

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