@zintrust/core 0.4.76 → 0.4.79

package/bin/zintrust-main.d.ts

@@ -4,6 +4,18 @@
  * This module contains the CLI implementation without a hashbang so that it can
  * be imported by other bin shortcuts (zin/z/zt) without parse errors.
  */
+type ProjectLocalCliTarget = {
+    binPath: string;
+    packageRoot: string;
+};
 export declare function run(): Promise<void>;
+export declare const CliLauncherInternal: Readonly<{
+    CLI_HANDOFF_ENV_KEY: "ZINTRUST_CLI_HANDOFF";
+    findProjectLocalCliTarget: (cwd: string) => ProjectLocalCliTarget | undefined;
+    getCurrentPackageRoot: () => string;
+    getRealPath: (targetPath: string) => string;
+    isWithinDirectory: (targetPath: string, possibleParentPath: string) => boolean;
+    resolveProjectLocalCliHandoff: (cwd: string, currentPackageRoot: string, env?: NodeJS.ProcessEnv) => ProjectLocalCliTarget | undefined;
+}>;
 export {};
 //# sourceMappingURL=zintrust-main.d.ts.map

package/bin/zintrust-main.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"zintrust-main.d.ts","sourceRoot":"","sources":["../../bin/zintrust-main.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAqIH,wBAAsB,GAAG,IAAI,OAAO,CAAC,IAAI,CAAC,CAgFzC;AAED,OAAO,EAAE,CAAC"}
+{"version":3,"file":"zintrust-main.d.ts","sourceRoot":"","sources":["../../bin/zintrust-main.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAQH,KAAK,qBAAqB,GAAG;IAC3B,OAAO,EAAE,MAAM,CAAC;IAChB,WAAW,EAAE,MAAM,CAAC;CACrB,CAAC;AAmTF,wBAAsB,GAAG,IAAI,OAAO,CAAC,IAAI,CAAC,CAMzC;AAED,eAAO,MAAM,mBAAmB;;qCAjSQ,MAAM,KAAG,qBAAqB,GAAG,SAAS;iCAtBhD,MAAM;8BAIP,MAAM,KAAG,MAAM;oCAQT,MAAM,sBAAsB,MAAM,KAAG,OAAO;yCAqC5E,MAAM,sBACS,MAAM,QACrB,MAAM,CAAC,UAAU,KACrB,qBAAqB,GAAG,SAAS;EA0QlC,CAAC;AAEH,OAAO,EAAE,CAAC"}

package/bin/zintrust-main.js

@@ -5,9 +5,86 @@
  * be imported by other bin shortcuts (zin/z/zt) without parse errors.
  */
 import { Logger } from '../src/config/logger.js';
+import { spawnSync } from 'node:child_process';
 import fs from 'node:fs';
 import path from 'node:path';
 import { fileURLToPath } from 'node:url';
+const CLI_HANDOFF_ENV_KEY = 'ZINTRUST_CLI_HANDOFF';
+const getCurrentPackageRoot = () => {
+    return path.resolve(path.dirname(fileURLToPath(import.meta.url)), '..');
+};
+const getRealPath = (targetPath) => {
+    try {
+        return fs.realpathSync(targetPath);
+    }
+    catch {
+        return path.resolve(targetPath);
+    }
+};
+const isWithinDirectory = (targetPath, possibleParentPath) => {
+    const normalizedTarget = getRealPath(targetPath);
+    const normalizedParent = getRealPath(possibleParentPath);
+    if (normalizedTarget === normalizedParent)
+        return true;
+    const relativePath = path.relative(normalizedParent, normalizedTarget);
+    return relativePath !== '' && !relativePath.startsWith('..') && !path.isAbsolute(relativePath);
+};
+const findProjectLocalCliTarget = (cwd) => {
+    let currentDir = path.resolve(cwd);
+    while (true) {
+        const packageRoot = path.join(currentDir, 'node_modules', '@zintrust', 'core');
+        const packageJsonPath = path.join(packageRoot, 'package.json');
+        const binCandidates = [
+            path.join(packageRoot, 'bin', 'zin.js'),
+            path.join(packageRoot, 'bin', 'zin.mjs'),
+            path.join(packageRoot, 'bin', 'zin.cjs'),
+            path.join(packageRoot, 'bin', 'zin.ts'),
+        ];
+        if (fs.existsSync(packageJsonPath)) {
+            const binPath = binCandidates.find((candidate) => fs.existsSync(candidate));
+            if (binPath !== undefined) {
+                return { binPath, packageRoot };
+            }
+        }
+        const parentDir = path.dirname(currentDir);
+        if (parentDir === currentDir)
+            return undefined;
+        currentDir = parentDir;
+    }
+};
+const resolveProjectLocalCliHandoff = (cwd, currentPackageRoot, env = process.env) => {
+    if (env[CLI_HANDOFF_ENV_KEY] === '1')
+        return undefined;
+    if (isWithinDirectory(cwd, currentPackageRoot))
+        return undefined;
+    const target = findProjectLocalCliTarget(cwd);
+    if (target === undefined)
+        return undefined;
+    if (getRealPath(target.packageRoot) === getRealPath(currentPackageRoot)) {
+        return undefined;
+    }
+    return target;
+};
+const handoffToProjectLocalCli = (target, rawArgs) => {
+    const result = spawnSync(process.execPath, [target.binPath, ...rawArgs], {
+        stdio: 'inherit',
+        env: {
+            ...process.env,
+            [CLI_HANDOFF_ENV_KEY]: '1',
+        },
+    });
+    if (result.error !== undefined) {
+        throw result.error;
+    }
+    process.exit(typeof result.status === 'number' ? result.status : 1);
+};
+const maybeHandoffToProjectLocalCli = (rawArgs) => {
+    const localCliTarget = resolveProjectLocalCliHandoff(process.cwd(), getCurrentPackageRoot());
+    if (localCliTarget === undefined)
+        return false;
+    handoffToProjectLocalCli(localCliTarget, rawArgs);
+    return true;
+};
 const loadPackageVersionFast = () => {
     try {
         const here = path.dirname(fileURLToPath(import.meta.url));
@@ -33,6 +110,12 @@ const getArgsFromProcess = () => {
 const isVersionRequest = (args) => {
     return args.includes('-v') || args.includes('--version');
 };
+const maybePrintVersionAndExit = (args) => {
+    if (!isVersionRequest(args))
+        return false;
+    printFancyVersion(loadPackageVersionFast());
+    return true;
+};
 const printFancyVersion = (version) => {
     const framework = 'ZinTrust Framework';
     const bannerWidth = 46;
@@ -110,69 +193,81 @@ const handleCliFatal = async (error, context) => {
     }
     process.exit(1);
 };
-export async function run() {
+const runCliInternal = async () => {
+    const { rawArgs: rawArgs0, args: args0 } = getArgsFromProcess();
+    if (maybeHandoffToProjectLocalCli(rawArgs0)) {
+        return;
+    }
+    // Fast path: print version and exit without bootstrapping the CLI.
+    // This keeps `zin -v` / `zin --version` snappy and avoids any debug output.
+    if (maybePrintVersionAndExit(args0)) {
+        return;
+    }
+    const { EnvFileLoader } = await import('../src/cli/utils/EnvFileLoader.js');
+    EnvFileLoader.ensureLoaded();
+    // Auto-load install-only CLI extension packages that self-register commands.
+    let optionalCliExtensions;
+    let optionalCliStatuses = [];
     try {
-        // Fast path: print version and exit without bootstrapping the CLI.
-        // This keeps `zin -v` / `zin --version` snappy and avoids any debug output.
-        const { rawArgs: _rawArgs0, args: args0 } = getArgsFromProcess();
-        if (isVersionRequest(args0)) {
-            printFancyVersion(loadPackageVersionFast());
-            return;
-        }
-        const { EnvFileLoader } = await import('../src/cli/utils/EnvFileLoader.js');
-        EnvFileLoader.ensureLoaded();
-        // Auto-load install-only CLI extension packages that self-register commands.
-        let optionalCliExtensions;
-        let optionalCliStatuses = [];
-        try {
-            ({ OptionalCliExtensions: optionalCliExtensions } =
-                await import('../src/cli/OptionalCliExtensions.js'));
-            optionalCliStatuses = await optionalCliExtensions.loadForArgs(args0);
-        }
-        catch {
-            // best-effort; missing optional extensions must not block the CLI
+        ({ OptionalCliExtensions: optionalCliExtensions } = await import('../src/cli/OptionalCliExtensions.js'));
+        optionalCliStatuses = await optionalCliExtensions.loadForArgs(args0);
+    }
+    catch {
+        // best-effort; missing optional extensions must not block the CLI
+    }
+    const missingOptionalExtension = optionalCliExtensions?.findMissingExtensionForArgs(args0, optionalCliStatuses);
+    if (missingOptionalExtension !== undefined) {
+        const { ErrorFactory } = await import('../src/exceptions/ZintrustError.js');
+        throw ErrorFactory.createCliError(optionalCliExtensions?.getMissingExtensionMessage(missingOptionalExtension) ??
+            `Missing optional CLI package: ${missingOptionalExtension.packageName}`);
+    }
+    // Ensure project-installed adapters/drivers are registered for CLI commands.
+    // (This is driven by src/zintrust.plugins.ts generated by `zin plugin install`.)
+    try {
+        const { PluginAutoImports } = await import('../src/runtime/PluginAutoImports.js');
+        const runtimeImportMode = process.env['DOCKER_WORKER'] === 'true' ? 'worker' : 'base';
+        const officialImports = await PluginAutoImports.tryImportRuntimeAutoImports(runtimeImportMode);
+        if (!officialImports.ok) {
+            logPluginAutoImportFailure(args0, 'Official', officialImports.errorMessage);
         }
-        const missingOptionalExtension = optionalCliExtensions?.findMissingExtensionForArgs(args0, optionalCliStatuses);
-        if (missingOptionalExtension !== undefined) {
-            const { ErrorFactory } = await import('../src/exceptions/ZintrustError.js');
-            throw ErrorFactory.createCliError(optionalCliExtensions?.getMissingExtensionMessage(missingOptionalExtension) ??
-                `Missing optional CLI package: ${missingOptionalExtension.packageName}`);
+        const projectImports = await PluginAutoImports.tryImportProjectAutoImports();
+        if (!projectImports.ok && projectImports.reason !== 'not-found') {
+            logPluginAutoImportFailure(args0, 'Project', projectImports.errorMessage);
         }
-        // Ensure project-installed adapters/drivers are registered for CLI commands.
-        // (This is driven by src/zintrust.plugins.ts generated by `zin plugin install`.)
+    }
+    catch {
+        // best-effort; CLI should still run even if plugins file is missing
+    }
+    const { CLI } = await import('../src/cli/CLI.js');
+    const cli = CLI.create();
+    // When executing via tsx (e.g. `npx tsx bin/zin.ts ...`), the script path can
+    // appear as the first element of `process.argv.slice(2)`. Commander expects
+    // args to start at the command name, so we strip a leading script path if present.
+    const { rawArgs, args } = getArgsFromProcess();
+    if (shouldDebugArgs(rawArgs)) {
         try {
-            const { PluginAutoImports } = await import('../src/runtime/PluginAutoImports.js');
-            const runtimeImportMode = process.env['DOCKER_WORKER'] === 'true' ? 'worker' : 'base';
-            const officialImports = await PluginAutoImports.tryImportRuntimeAutoImports(runtimeImportMode);
-            if (!officialImports.ok) {
-                logPluginAutoImportFailure(args0, 'Official', officialImports.errorMessage);
-            }
-            const projectImports = await PluginAutoImports.tryImportProjectAutoImports();
-            if (!projectImports.ok && projectImports.reason !== 'not-found') {
-                logPluginAutoImportFailure(args0, 'Project', projectImports.errorMessage);
-            }
+            process.stderr.write(`[zintrust-cli] process.argv=${JSON.stringify(process.argv)}\n`);
+            process.stderr.write(`[zintrust-cli] rawArgs=${JSON.stringify(rawArgs)}\n`);
         }
         catch {
-            // best-effort; CLI should still run even if plugins file is missing
-        }
-        const { CLI } = await import('../src/cli/CLI.js');
-        const cli = CLI.create();
-        // When executing via tsx (e.g. `npx tsx bin/zin.ts ...`), the script path can
-        // appear as the first element of `process.argv.slice(2)`. Commander expects
-        // args to start at the command name, so we strip a leading script path if present.
-        const { rawArgs, args } = getArgsFromProcess();
-        if (shouldDebugArgs(rawArgs)) {
-            try {
-                process.stderr.write(`[zintrust-cli] process.argv=${JSON.stringify(process.argv)}\n`);
-                process.stderr.write(`[zintrust-cli] rawArgs=${JSON.stringify(rawArgs)}\n`);
-            }
-            catch {
-                // ignore
-            }
+            // ignore
         }
-        await cli.run(normalizeProxyTargetArgs(args));
+    }
+    await cli.run(normalizeProxyTargetArgs(args));
+};
+export async function run() {
+    try {
+        await runCliInternal();
     }
     catch (error) {
         await handleCliFatal(error, 'CLI execution failed');
     }
 }
+export const CliLauncherInternal = Object.freeze({
+    CLI_HANDOFF_ENV_KEY,
+    findProjectLocalCliTarget,
+    getCurrentPackageRoot,
+    getRealPath,
+    isWithinDirectory,
+    resolveProjectLocalCliHandoff,
+});

package/package.json

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

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

@@ -1 +1 @@
-{"version":3,"file":"runtime.d.ts","sourceRoot":"","sources":["../../../../src/boot/registry/runtime.ts"],"names":[],"mappings":"AAmBA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AASvD,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,gBAAgB,CAAC;AAuO9C,eAAO,MAAM,8BAA8B,GAAI,iBAAiB,gBAAgB,KAAG,IA6BlF,CAAC;AAwRF,eAAO,MAAM,eAAe,GAAI,QAAQ;IACtC,WAAW,EAAE,MAAM,CAAC;IACpB,gBAAgB,EAAE,MAAM,CAAC;IACzB,MAAM,EAAE,OAAO,CAAC;IAChB,eAAe,EAAE,gBAAgB,CAAC;IAClC,SAAS,EAAE,MAAM,OAAO,CAAC;IACzB,SAAS,EAAE,CAAC,KAAK,EAAE,OAAO,KAAK,IAAI,CAAC;CACrC,KAAG;IAAE,IAAI,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;IAAC,QAAQ,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAA;CA0F7D,CAAC"}
+{"version":3,"file":"runtime.d.ts","sourceRoot":"","sources":["../../../../src/boot/registry/runtime.ts"],"names":[],"mappings":"AAmBA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AASvD,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,gBAAgB,CAAC;AA2O9C,eAAO,MAAM,8BAA8B,GAAI,iBAAiB,gBAAgB,KAAG,IA6BlF,CAAC;AAqUF,eAAO,MAAM,eAAe,GAAI,QAAQ;IACtC,WAAW,EAAE,MAAM,CAAC;IACpB,gBAAgB,EAAE,MAAM,CAAC;IACzB,MAAM,EAAE,OAAO,CAAC;IAChB,eAAe,EAAE,gBAAgB,CAAC;IAClC,SAAS,EAAE,MAAM,OAAO,CAAC;IACzB,SAAS,EAAE,CAAC,KAAK,EAAE,OAAO,KAAK,IAAI,CAAC;CACrC,KAAG;IAAE,IAAI,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;IAAC,QAAQ,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAA;CA0F7D,CAAC"}

package/src/boot/registry/runtime.js

@@ -384,11 +384,27 @@ const isTraceEnabled = () => {
     const raw = readEnvString('TRACE_ENABLED').trim().toLowerCase();
     return raw === '1' || raw === 'true';
 };
+const isTraceDashboardAutoMountEnabled = () => {
+    const raw = readEnvString('TRACE_AUTO_MOUNT').trim().toLowerCase();
+    return raw === '1' || raw === 'true';
+};
+const resolveTraceDashboardBasePath = () => {
+    const raw = readEnvString('TRACE_BASE_PATH').trim();
+    if (raw === '')
+        return '/trace';
+    return raw.startsWith('/') ? raw : `/${raw}`;
+};
+const resolveTraceDashboardMiddleware = () => {
+    return readEnvString('TRACE_MIDDLEWARE')
+        .split(',')
+        .map((value) => value.trim())
+        .filter(isNonEmptyString);
+};
 const isSystemTracePluginRequested = () => {
     const globalTracePluginState = globalThis;
     return globalTracePluginState.__zintrust_system_trace_plugin_requested__ === true;
 };
-const initializeSystemTrace = async () => {
+const initializeSystemTrace = async (router) => {
     if (!isSystemTracePluginRequested()) {
         Logger.debug('System Trace plugin is not enabled in zintrust.plugins.*. Skipping init.');
         return;
@@ -397,13 +413,31 @@ const initializeSystemTrace = async () => {
         return;
     const traceModule = (await tryImportOptional('@runtime/plugins/trace-runtime')) ??
         (await loadLocalSystemTraceModule());
-    if (traceModule === undefined || traceModule.isAvailable?.() === false) {
+    if (traceModule === undefined) {
         Logger.debug('System Trace is enabled but the optional package is unavailable.');
         return;
     }
     try {
         await traceModule.ensureSystemTraceRegistered();
-        Logger.info('System Trace runtime activated. Register dashboard routes manually if needed.');
+        if (traceModule.isAvailable?.() === false) {
+            Logger.debug('System Trace is enabled but the optional package is unavailable.');
+            return;
+        }
+        if (!isTraceDashboardAutoMountEnabled()) {
+            Logger.info('System Trace runtime activated. Set TRACE_AUTO_MOUNT=true or register dashboard routes manually if needed.');
+            return;
+        }
+        if (typeof traceModule.registerTraceDashboard !== 'function') {
+            Logger.warn('System Trace auto-mount requested but the optional package does not expose registerTraceDashboard.');
+            return;
+        }
+        const basePath = resolveTraceDashboardBasePath();
+        const middleware = resolveTraceDashboardMiddleware();
+        traceModule.registerTraceDashboard(router, {
+            basePath,
+            ...(middleware.length > 0 ? { middleware } : {}),
+        });
+        Logger.info(`System Trace dashboard auto-mounted at ${basePath}.`);
     }
     catch (error) {
         Logger.warn('Failed to initialize System Trace runtime', error);
@@ -474,7 +508,7 @@ export const createLifecycle = (params) => {
         await initializeArtifactDirectories(params.resolvedBasePath);
         await registerMasterRoutes(params.resolvedBasePath, params.router);
         initializeSockets(params.router);
-        await initializeSystemTrace();
+        await initializeSystemTrace(params.router);
         if (Cloudflare.getWorkersEnv() === null && appConfig.dockerWorker === false) {
             await initializeWorkers(params.router);
             await initializeQueueMonitor(params.router);

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

@@ -15,11 +15,13 @@ type EnsureWranglerConfigOptions<TValues, TOptions> = {
 type EnsureWranglerConfigResult<TValues> = {
     createdFile: boolean;
     insertedEnv: boolean;
+    content: string;
     values: TValues;
 };
 export declare const trimNonEmptyOption: (value: string | undefined) => string | undefined;
 export declare const resolveConfigPath: (raw: string | undefined, fallback?: string) => string;
 export declare const findQuotedValue: (content: string, key: string) => string | undefined;
+export declare const renderProxyWranglerDevConfig: (content: string, envName: string) => string | undefined;
 export declare const injectEnvBlock: (content: string, envName: string, block: string) => string;
 export declare const renderDefaultWranglerConfig: (envBlock: string, compatibilityDate: string) => string;
 export declare const ensureProxyEntrypoint: (options: EnsureProxyEntrypointOptions) => {

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

@@ -1 +1 @@
-{"version":3,"file":"ProxyScaffoldUtils.d.ts","sourceRoot":"","sources":["../../../../src/cli/commands/ProxyScaffoldUtils.ts"],"names":[],"mappings":"AAKA,KAAK,4BAA4B,GAAG;IAClC,GAAG,EAAE,MAAM,CAAC;IACZ,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,MAAM,CAAC;IACnB,eAAe,EAAE,MAAM,CAAC;CACzB,CAAC;AAEF,KAAK,2BAA2B,CAAC,OAAO,EAAE,QAAQ,IAAI;IACpD,UAAU,EAAE,MAAM,CAAC;IACnB,OAAO,EAAE,QAAQ,CAAC;IAClB,OAAO,EAAE,MAAM,CAAC;IAChB,aAAa,EAAE,CAAC,OAAO,EAAE,MAAM,GAAG,SAAS,EAAE,OAAO,EAAE,QAAQ,KAAK,OAAO,CAAC;IAC3E,cAAc,EAAE,CAAC,MAAM,EAAE,OAAO,KAAK,MAAM,CAAC;IAC5C,iBAAiB,EAAE,MAAM,CAAC;CAC3B,CAAC;AAEF,KAAK,0BAA0B,CAAC,OAAO,IAAI;IACzC,WAAW,EAAE,OAAO,CAAC;IACrB,WAAW,EAAE,OAAO,CAAC;IACrB,MAAM,EAAE,OAAO,CAAC;CACjB,CAAC;AAEF,eAAO,MAAM,kBAAkB,GAAI,OAAO,MAAM,GAAG,SAAS,KAAG,MAAM,GAAG,SAIvE,CAAC;AAEF,eAAO,MAAM,iBAAiB,GAAI,KAAK,MAAM,GAAG,SAAS,EAAE,iBAA2B,KAAG,MAExF,CAAC;AAmBF,eAAO,MAAM,eAAe,GAAI,SAAS,MAAM,EAAE,KAAK,MAAM,KAAG,MAAM,GAAG,SAQvE,CAAC;AAmBF,eAAO,MAAM,cAAc,GAAI,SAAS,MAAM,EAAE,SAAS,MAAM,EAAE,OAAO,MAAM,KAAG,MAuBhF,CAAC;AAEF,eAAO,MAAM,2BAA2B,GACtC,UAAU,MAAM,EAChB,mBAAmB,MAAM,KACxB,MAaF,CAAC;AAEF,eAAO,MAAM,qBAAqB,GAChC,SAAS,4BAA4B,KACpC;IAAE,OAAO,EAAE,OAAO,CAAC;IAAC,aAAa,EAAE,MAAM,CAAA;CAmB3C,CAAC;AAEF,eAAO,MAAM,oBAAoB,GAAI,OAAO,EAAE,QAAQ,EACpD,SAAS,2BAA2B,CAAC,OAAO,EAAE,QAAQ,CAAC,KACtD,0BAA0B,CAAC,OAAO,CAqBpC,CAAC"}
+{"version":3,"file":"ProxyScaffoldUtils.d.ts","sourceRoot":"","sources":["../../../../src/cli/commands/ProxyScaffoldUtils.ts"],"names":[],"mappings":"AAKA,KAAK,4BAA4B,GAAG;IAClC,GAAG,EAAE,MAAM,CAAC;IACZ,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,MAAM,CAAC;IACnB,eAAe,EAAE,MAAM,CAAC;CACzB,CAAC;AAEF,KAAK,2BAA2B,CAAC,OAAO,EAAE,QAAQ,IAAI;IACpD,UAAU,EAAE,MAAM,CAAC;IACnB,OAAO,EAAE,QAAQ,CAAC;IAClB,OAAO,EAAE,MAAM,CAAC;IAChB,aAAa,EAAE,CAAC,OAAO,EAAE,MAAM,GAAG,SAAS,EAAE,OAAO,EAAE,QAAQ,KAAK,OAAO,CAAC;IAC3E,cAAc,EAAE,CAAC,MAAM,EAAE,OAAO,KAAK,MAAM,CAAC;IAC5C,iBAAiB,EAAE,MAAM,CAAC;CAC3B,CAAC;AAEF,KAAK,0BAA0B,CAAC,OAAO,IAAI;IACzC,WAAW,EAAE,OAAO,CAAC;IACrB,WAAW,EAAE,OAAO,CAAC;IACrB,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,OAAO,CAAC;CACjB,CAAC;AAEF,eAAO,MAAM,kBAAkB,GAAI,OAAO,MAAM,GAAG,SAAS,KAAG,MAAM,GAAG,SAIvE,CAAC;AAEF,eAAO,MAAM,iBAAiB,GAAI,KAAK,MAAM,GAAG,SAAS,EAAE,iBAA2B,KAAG,MAExF,CAAC;AAmBF,eAAO,MAAM,eAAe,GAAI,SAAS,MAAM,EAAE,KAAK,MAAM,KAAG,MAAM,GAAG,SAQvE,CAAC;AAwKF,eAAO,MAAM,4BAA4B,GACvC,SAAS,MAAM,EACf,SAAS,MAAM,KACd,MAAM,GAAG,SAgBX,CAAC;AAQF,eAAO,MAAM,cAAc,GAAI,SAAS,MAAM,EAAE,SAAS,MAAM,EAAE,OAAO,MAAM,KAAG,MAuBhF,CAAC;AAEF,eAAO,MAAM,2BAA2B,GACtC,UAAU,MAAM,EAChB,mBAAmB,MAAM,KACxB,MAaF,CAAC;AAEF,eAAO,MAAM,qBAAqB,GAChC,SAAS,4BAA4B,KACpC;IAAE,OAAO,EAAE,OAAO,CAAC;IAAC,aAAa,EAAE,MAAM,CAAA;CAmB3C,CAAC;AAEF,eAAO,MAAM,oBAAoB,GAAI,OAAO,EAAE,QAAQ,EACpD,SAAS,2BAA2B,CAAC,OAAO,EAAE,QAAQ,CAAC,KACtD,0BAA0B,CAAC,OAAO,CAqBpC,CAAC"}

package/src/cli/commands/ProxyScaffoldUtils.js

@@ -47,6 +47,148 @@ const findEnvObjectStart = (content) => {
         return -1;
     return valueStart;
 };
+const createJsonScanState = () => ({
+    inString: false,
+    isEscaped: false,
+    inLineComment: false,
+    inBlockComment: false,
+});
+const advanceWithinLineComment = (state, current) => {
+    if (!state.inLineComment)
+        return 0;
+    if (current === '\n')
+        state.inLineComment = false;
+    return 1;
+};
+const advanceWithinBlockComment = (state, current, next) => {
+    if (!state.inBlockComment)
+        return 0;
+    if (current === '*' && next === '/') {
+        state.inBlockComment = false;
+        return 2;
+    }
+    return 1;
+};
+const advanceWithinString = (state, current) => {
+    if (!state.inString)
+        return 0;
+    if (state.isEscaped) {
+        state.isEscaped = false;
+    }
+    else if (current === '\\') {
+        state.isEscaped = true;
+    }
+    else if (current === '"') {
+        state.inString = false;
+    }
+    return 1;
+};
+const startJsonScanContext = (state, current, next) => {
+    if (current === '/' && next === '/') {
+        state.inLineComment = true;
+        return 2;
+    }
+    if (current === '/' && next === '*') {
+        state.inBlockComment = true;
+        return 2;
+    }
+    if (current === '"') {
+        state.inString = true;
+        return 1;
+    }
+    return 0;
+};
+const advanceJsonScanState = (state, current, next) => {
+    return (advanceWithinLineComment(state, current) ||
+        advanceWithinBlockComment(state, current, next) ||
+        advanceWithinString(state, current) ||
+        startJsonScanContext(state, current, next));
+};
+const rewriteRelativeWranglerPaths = (content) => {
+    return content.replaceAll('": "./', '": "../../');
+};
+const findQuotedKeyFrom = (content, key, startIndex) => {
+    let cursor = Math.max(0, startIndex);
+    const state = createJsonScanState();
+    const candidate = `"${key}"`;
+    while (cursor < content.length) {
+        const current = content[cursor];
+        const next = content[cursor + 1];
+        if (!state.inString && !state.inLineComment && !state.inBlockComment) {
+            if (content.startsWith(candidate, cursor))
+                return cursor;
+        }
+        const advanced = advanceJsonScanState(state, current, next);
+        cursor += advanced > 0 ? advanced : 1;
+    }
+    return -1;
+};
+const findJsonKeyValueStartFrom = (content, key, startIndex) => {
+    const keyPosition = findQuotedKeyFrom(content, key, startIndex);
+    if (keyPosition < 0)
+        return -1;
+    let cursor = keyPosition + key.length + 2;
+    while (isJsonWhitespace(content[cursor]))
+        cursor += 1;
+    if (content[cursor] !== ':')
+        return -1;
+    cursor += 1;
+    while (isJsonWhitespace(content[cursor]))
+        cursor += 1;
+    return cursor;
+};
+const findMatchingObjectBrace = (content, objectStart) => {
+    let depth = 0;
+    const state = createJsonScanState();
+    for (let index = objectStart; index < content.length; index += 1) {
+        const current = content[index];
+        const next = content[index + 1];
+        if (!state.inString && !state.inLineComment && !state.inBlockComment) {
+            if (current === '{') {
+                depth += 1;
+            }
+            else if (current === '}') {
+                depth -= 1;
+                if (depth === 0)
+                    return index;
+            }
+        }
+        const advanced = advanceJsonScanState(state, current, next);
+        if (advanced > 1)
+            index += advanced - 1;
+    }
+    return -1;
+};
+const extractObjectBlock = (content, key, startIndex = 0) => {
+    const valueStart = findJsonKeyValueStartFrom(content, key, startIndex);
+    if (valueStart < 0 || content[valueStart] !== '{')
+        return undefined;
+    const valueEnd = findMatchingObjectBrace(content, valueStart);
+    if (valueEnd < 0)
+        return undefined;
+    return content.slice(valueStart, valueEnd + 1);
+};
+const indentBlock = (content, spaces) => {
+    const prefix = ' '.repeat(spaces);
+    return content
+        .split('\n')
+        .map((line) => (line.trim().length === 0 ? line : `${prefix}${line}`))
+        .join('\n');
+};
+export const renderProxyWranglerDevConfig = (content, envName) => {
+    const envObjectStart = findEnvObjectStart(content);
+    if (envObjectStart < 0)
+        return undefined;
+    const envBlock = extractObjectBlock(content, envName, envObjectStart);
+    if (envBlock === undefined)
+        return undefined;
+    const aliasBlock = extractObjectBlock(content, 'alias');
+    const envBody = envBlock.slice(1, -1).trim();
+    if (envBody.length === 0)
+        return undefined;
+    const aliasLine = aliasBlock === undefined ? [] : [`  "alias": ${aliasBlock},`];
+    return rewriteRelativeWranglerPaths(['{', ...aliasLine, indentBlock(envBody, 2), '}', ''].join('\n'));
+};
 const isObjectEffectivelyEmpty = (content, objectStart) => {
     let cursor = objectStart + 1;
     while (isJsonWhitespace(content[cursor]))
@@ -105,15 +247,16 @@ export const ensureProxyEntrypoint = (options) => {
 export const ensureWranglerConfig = (options) => {
     if (!existsSync(options.configPath)) {
         const values = options.resolveValues(undefined, options.options);
-        writeFileSync(options.configPath, renderDefaultWranglerConfig(options.renderEnvBlock(values), options.compatibilityDate), 'utf-8');
-        return { createdFile: true, insertedEnv: true, values };
+        const content = renderDefaultWranglerConfig(options.renderEnvBlock(values), options.compatibilityDate);
+        writeFileSync(options.configPath, content, 'utf-8');
+        return { createdFile: true, insertedEnv: true, content, values };
     }
     const content = readFileSync(options.configPath, 'utf-8');
     const values = options.resolveValues(content, options.options);
     const next = injectEnvBlock(content, options.envName, options.renderEnvBlock(values));
     if (next !== content) {
         writeFileSync(options.configPath, next, 'utf-8');
-        return { createdFile: false, insertedEnv: true, values };
+        return { createdFile: false, insertedEnv: true, content: next, values };
     }
-    return { createdFile: false, insertedEnv: false, values };
+    return { createdFile: false, insertedEnv: false, content, values };
 };

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

@@ -1 +1 @@
-{"version":3,"file":"TraceCommands.d.ts","sourceRoot":"","sources":["../../../../src/cli/commands/TraceCommands.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAkB,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAsBrE,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAuoBzC,eAAO,MAAM,aAAa;mCACK,YAAY;mCAQZ,YAAY;oCAaX,YAAY;qCAgBX,YAAY;;cA7CzB,MAAM;oBAAc,MAAM,OAAO;;;cAAjC,MAAM;oBAAc,MAAM,OAAO;;;cAAjC,MAAM;oBAAc,MAAM,OAAO;;;cAAjC,MAAM;oBAAc,MAAM,OAAO;;EAmEnD,CAAC"}
+{"version":3,"file":"TraceCommands.d.ts","sourceRoot":"","sources":["../../../../src/cli/commands/TraceCommands.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAkB,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAsBrE,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAgqBzC,eAAO,MAAM,aAAa;mCACK,YAAY;mCAQZ,YAAY;oCAQX,YAAY;qCAQX,YAAY;;cAhCzB,MAAM;oBAAc,MAAM,OAAO;;;cAAjC,MAAM;oBAAc,MAAM,OAAO;;;cAAjC,MAAM;oBAAc,MAAM,OAAO;;;cAAjC,MAAM;oBAAc,MAAM,OAAO;;EAmDnD,CAAC"}