@git.zone/tsbundle 2.10.4 → 2.11.1

package/.smartconfig.json

@@ -1,5 +1,6 @@
 {
   "@git.zone/cli": {
+    "schemaVersion": 2,
     "projectType": "npm",
     "module": {
       "githost": "gitlab.com",
@@ -11,11 +12,23 @@
       "projectDomain": "git.zone"
     },
     "release": {
-      "registries": [
-        "https://verdaccio.lossless.digital",
-        "https://registry.npmjs.org"
-      ],
-      "accessLevel": "public"
+      "targets": {
+        "git": {
+          "enabled": true,
+          "remote": "origin",
+          "pushBranch": true,
+          "pushTags": true
+        },
+        "npm": {
+          "enabled": true,
+          "registries": [
+            "https://verdaccio.lossless.digital",
+            "https://registry.npmjs.org"
+          ],
+          "accessLevel": "public",
+          "alreadyPublished": "success"
+        }
+      }
     }
   },
   "@ship.zone/szci": {

package/dist_ts/00_commitinfo_data.js

@@ -3,7 +3,7 @@
  */
 export const commitinfo = {
     name: '@git.zone/tsbundle',
-    version: '2.10.4',
+    version: '2.11.1',
     description: 'a multi-bundler tool supporting esbuild, rolldown, and rspack for painless bundling of web projects'
 };
 //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiMDBfY29tbWl0aW5mb19kYXRhLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHMvMDBfY29tbWl0aW5mb19kYXRhLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBOztHQUVHO0FBQ0gsTUFBTSxDQUFDLE1BQU0sVUFBVSxHQUFHO0lBQ3hCLElBQUksRUFBRSxvQkFBb0I7SUFDMUIsT0FBTyxFQUFFLFFBQVE7SUFDakIsV0FBVyxFQUFFLHFHQUFxRztDQUNuSCxDQUFBIn0=

package/dist_ts/interfaces/index.d.ts

@@ -2,8 +2,13 @@ export interface ICliOptions {
     commonjs?: boolean;
     skiplibcheck?: boolean;
     production?: boolean;
+    keepTemp?: boolean;
     bundler: 'esbuild' | 'rolldown' | 'rspack';
 }
+export interface ICustomBundleCliOptions {
+    keepTemp?: boolean;
+    'keep-temp'?: boolean;
+}
 export interface IEnvTransportOptions {
     cwd: string;
     from: string;
@@ -25,9 +30,11 @@ export interface IBundleConfig {
     production?: boolean;
     includeFiles?: TIncludeFile[];
     maxLineLength?: number;
+    keepTemp?: boolean;
 }
 export interface ITsbundleConfig {
     bundles: IBundleConfig[];
+    keepTemp?: boolean;
 }
 export interface IBase64File {
     path: string;

package/dist_ts/mod_custom/index.d.ts

@@ -2,7 +2,9 @@ import * as interfaces from '../interfaces/index.js';
 export declare class CustomBundleHandler {
     private cwd;
     private config;
-    constructor(cwd?: string);
+    private cliOptions;
+    private didRunStartupCleanup;
+    constructor(cwd?: string, cliOptions?: interfaces.ICustomBundleCliOptions);
     /**
      * Load configuration from .smartconfig.json
      */
@@ -15,6 +17,19 @@ export declare class CustomBundleHandler {
      * Process a single bundle configuration
      */
     processSingleBundle(bundleConfig: interfaces.IBundleConfig): Promise<void>;
+    cleanupStaleTempWorkspace(thresholdMsArg?: number): Promise<boolean>;
+    private getTempDir;
+    private assertExpectedTempDir;
+    private assertManagedTempDir;
+    private isTruthy;
+    private shouldKeepTemp;
+    private prepareTempWorkspace;
+    private createIsolatedTempWorkspace;
+    private writeTempMarker;
+    private readTempMarker;
+    private getDirectorySize;
+    private formatBytes;
+    private cleanupTempWorkspace;
     /**
      * Handle base64ts output mode
      */
@@ -31,4 +46,4 @@ export declare class CustomBundleHandler {
 /**
  * Run the custom bundle command
  */
-export declare function runCustomBundles(): Promise<void>;
+export declare function runCustomBundles(cliOptionsArg?: interfaces.ICustomBundleCliOptions): Promise<void>;

package/dist_ts/mod_custom/index.js

@@ -5,11 +5,18 @@ import { TsBundle } from '../tsbundle.class.tsbundle.js';
 import { HtmlHandler } from '../mod_html/index.js';
 import { Base64TsOutput } from '../mod_output/index.js';
 const TEMP_DIR = '.nogit/tsbundle-temp';
+const toolCacheMarkerFile = '.gitzone-tool-cache.json';
+const toolCacheOwner = '@git.zone/tsbundle';
+const tempCacheKind = 'bundle-temp-workspace';
+const staleTempThresholdMs = 24 * 60 * 60 * 1000;
 export class CustomBundleHandler {
     cwd;
     config;
-    constructor(cwd = paths.cwd) {
+    cliOptions;
+    didRunStartupCleanup = false;
+    constructor(cwd = paths.cwd, cliOptions = {}) {
         this.cwd = cwd;
+        this.cliOptions = cliOptions;
     }
     /**
      * Load configuration from .smartconfig.json
@@ -31,6 +38,7 @@ export class CustomBundleHandler {
      * Process all configured bundles
      */
     async processAllBundles() {
+        await this.cleanupStaleTempWorkspace();
         for (let i = 0; i < this.config.bundles.length; i++) {
             const bundleConfig = this.config.bundles[i];
             console.log(`\nProcessing bundle ${i + 1}/${this.config.bundles.length}: ${bundleConfig.from} -> ${bundleConfig.to}`);
@@ -41,42 +49,204 @@ export class CustomBundleHandler {
      * Process a single bundle configuration
      */
     async processSingleBundle(bundleConfig) {
+        await this.cleanupStaleTempWorkspace();
         const outputMode = bundleConfig.outputMode || 'bundle';
         const bundler = bundleConfig.bundler || 'esbuild';
-        // Determine temp output path
-        const tempDir = plugins.path.join(this.cwd, TEMP_DIR);
+        const tempWorkspace = await this.prepareTempWorkspace();
+        const tempDir = tempWorkspace.tempDir;
         const tempBundlePath = plugins.path.join(tempDir, 'bundle.js');
-        // Ensure temp directory exists
-        await plugins.fs.directory(tempDir).create();
         // Build the bundle to temp location
         const tsbundle = new TsBundle();
+        let completedSuccessfully = false;
         try {
             await tsbundle.build(this.cwd, bundleConfig.from, tempBundlePath, {
                 bundler,
                 production: bundleConfig.production || false,
             });
+            if (outputMode === 'base64ts') {
+                await this.handleBase64TsOutput(bundleConfig, tempBundlePath);
+            }
+            else {
+                await this.handleBundleOutput(bundleConfig, tempBundlePath);
+            }
+            completedSuccessfully = true;
         }
         catch (error) {
             console.error(`\n\x1b[31m❌ Bundle failed: ${bundleConfig.from} -> ${bundleConfig.to}\x1b[0m`);
             // Don't re-print error details - they were already shown by the child process
             return; // Skip output handling since build failed
         }
-        if (outputMode === 'base64ts') {
-            await this.handleBase64TsOutput(bundleConfig, tempBundlePath);
+        finally {
+            if (completedSuccessfully && tempWorkspace.canCleanupWorkspace && !this.shouldKeepTemp(bundleConfig)) {
+                await this.cleanupTempWorkspace('successful bundle', tempDir);
+            }
+            else if (completedSuccessfully) {
+                console.log(`Keeping tsbundle temp workspace: ${tempDir}`);
+            }
+            else if (tempWorkspace.cleanupOnFailure && !this.shouldKeepTemp(bundleConfig)) {
+                await this.cleanupTempWorkspace('failed bundle', tempDir);
+            }
         }
-        else {
-            await this.handleBundleOutput(bundleConfig, tempBundlePath);
+    }
+    async cleanupStaleTempWorkspace(thresholdMsArg = staleTempThresholdMs) {
+        if (this.didRunStartupCleanup) {
+            return false;
+        }
+        this.didRunStartupCleanup = true;
+        if (this.shouldKeepTemp()) {
+            return false;
+        }
+        const tempDir = this.getTempDir();
+        const marker = await this.readTempMarker(tempDir);
+        if (!marker) {
+            return false;
+        }
+        const createdAt = Date.parse(marker.createdAt);
+        if (Number.isFinite(createdAt) && Date.now() - createdAt < thresholdMsArg) {
+            return false;
+        }
+        await this.cleanupTempWorkspace('stale marked temp workspace');
+        return true;
+    }
+    getTempDir() {
+        return plugins.path.join(this.cwd, TEMP_DIR);
+    }
+    assertExpectedTempDir(tempDirArg) {
+        const expected = plugins.path.resolve(this.cwd, TEMP_DIR);
+        const actual = plugins.path.resolve(tempDirArg);
+        if (actual !== expected) {
+            throw new Error(`Refusing to clean unexpected tsbundle temp path: ${tempDirArg}`);
+        }
+    }
+    assertManagedTempDir(tempDirArg) {
+        const expected = plugins.path.resolve(this.cwd, TEMP_DIR);
+        const actual = plugins.path.resolve(tempDirArg);
+        const osTempRoot = plugins.path.resolve(plugins.os.tmpdir());
+        const isIsolatedTemp = plugins.path.dirname(actual) === osTempRoot
+            && plugins.path.basename(actual).startsWith('tsbundle-temp-');
+        if (actual !== expected && !isIsolatedTemp) {
+            throw new Error(`Refusing to clean unexpected tsbundle temp path: ${tempDirArg}`);
+        }
+    }
+    isTruthy(valueArg) {
+        if (typeof valueArg === 'boolean') {
+            return valueArg;
+        }
+        if (typeof valueArg !== 'string') {
+            return false;
         }
-        // Clean up temp file
-        const tempFileExists = await plugins.fs.file(tempBundlePath).exists();
-        if (tempFileExists) {
-            await plugins.fs.file(tempBundlePath).delete();
+        const normalized = valueArg.toLowerCase();
+        return normalized === '1' || normalized === 'true' || normalized === 'yes' || normalized === 'y';
+    }
+    shouldKeepTemp(bundleConfigArg) {
+        return this.isTruthy(process.env.TSBUNDLE_KEEP_TEMP)
+            || this.cliOptions.keepTemp === true
+            || this.cliOptions['keep-temp'] === true
+            || this.config?.keepTemp === true
+            || bundleConfigArg?.keepTemp === true;
+    }
+    async prepareTempWorkspace() {
+        const tempDirArg = this.getTempDir();
+        this.assertExpectedTempDir(tempDirArg);
+        const marker = await this.readTempMarker(tempDirArg);
+        if (marker) {
+            return { tempDir: tempDirArg, canCleanupWorkspace: true, cleanupOnFailure: false };
+        }
+        let entries = [];
+        try {
+            entries = await plugins.fsPromises.readdir(tempDirArg);
+        }
+        catch {
+            await plugins.fsPromises.mkdir(tempDirArg, { recursive: true });
+        }
+        if (entries.length > 0) {
+            const isolatedTempDir = await this.createIsolatedTempWorkspace();
+            console.log(`tsbundle: leaving existing unmarked temp workspace untouched: ${tempDirArg}`);
+            console.log(`tsbundle: using isolated marked temp workspace: ${isolatedTempDir}`);
+            return { tempDir: isolatedTempDir, canCleanupWorkspace: true, cleanupOnFailure: true };
+        }
+        await this.writeTempMarker(tempDirArg);
+        return { tempDir: tempDirArg, canCleanupWorkspace: true, cleanupOnFailure: false };
+    }
+    async createIsolatedTempWorkspace() {
+        const tempDir = await plugins.fsPromises.mkdtemp(plugins.path.join(plugins.os.tmpdir(), 'tsbundle-temp-'));
+        await this.writeTempMarker(tempDir);
+        return tempDir;
+    }
+    async writeTempMarker(tempDirArg) {
+        this.assertManagedTempDir(tempDirArg);
+        const marker = {
+            owner: toolCacheOwner,
+            kind: tempCacheKind,
+            safeToPrune: true,
+            createdAt: new Date().toISOString(),
+            schemaVersion: 1,
+        };
+        await plugins.fsPromises.mkdir(tempDirArg, { recursive: true });
+        await plugins.fsPromises.writeFile(plugins.path.join(tempDirArg, toolCacheMarkerFile), `${JSON.stringify(marker, null, 2)}\n`);
+    }
+    async readTempMarker(tempDirArg) {
+        this.assertManagedTempDir(tempDirArg);
+        try {
+            const markerRaw = await plugins.fsPromises.readFile(plugins.path.join(tempDirArg, toolCacheMarkerFile), 'utf8');
+            const marker = JSON.parse(markerRaw);
+            if (marker.owner === toolCacheOwner &&
+                marker.kind === tempCacheKind &&
+                marker.safeToPrune === true &&
+                marker.schemaVersion === 1) {
+                return marker;
+            }
+        }
+        catch {
+            return undefined;
         }
-        const tempSourceMapPath = `${tempBundlePath}.map`;
-        const tempSourceMapExists = await plugins.fs.file(tempSourceMapPath).exists();
-        if (tempSourceMapExists) {
-            await plugins.fs.file(tempSourceMapPath).delete();
+        return undefined;
+    }
+    async getDirectorySize(pathArg) {
+        let total = 0;
+        let entries;
+        try {
+            entries = await plugins.fsPromises.readdir(pathArg, { withFileTypes: true });
+        }
+        catch {
+            return 0;
+        }
+        for (const entry of entries) {
+            const entryPath = plugins.path.join(pathArg, entry.name);
+            if (entry.isDirectory()) {
+                total += await this.getDirectorySize(entryPath);
+            }
+            else if (entry.isFile()) {
+                try {
+                    total += (await plugins.fsPromises.stat(entryPath)).size;
+                }
+                catch {
+                    // Ignore files that disappear while cleanup is inspecting the tree.
+                }
+            }
+        }
+        return total;
+    }
+    formatBytes(bytesArg) {
+        const units = ['B', 'KiB', 'MiB', 'GiB', 'TiB'];
+        let value = bytesArg;
+        let unitIndex = 0;
+        while (value >= 1024 && unitIndex < units.length - 1) {
+            value = value / 1024;
+            unitIndex++;
+        }
+        const decimals = unitIndex === 0 || value >= 100 ? 0 : value >= 10 ? 1 : 2;
+        return `${value.toFixed(decimals)} ${units[unitIndex]}`;
+    }
+    async cleanupTempWorkspace(reasonArg, tempDir = this.getTempDir()) {
+        this.assertManagedTempDir(tempDir);
+        const marker = await this.readTempMarker(tempDir);
+        if (!marker) {
+            return;
         }
+        const reclaimedBytes = await this.getDirectorySize(tempDir);
+        await plugins.fsPromises.rm(tempDir, { recursive: true, force: true });
+        console.log(`Cleaned tsbundle temp workspace after ${reasonArg}, reclaimed ${this.formatBytes(reclaimedBytes)}`);
     }
     /**
      * Handle base64ts output mode
@@ -174,8 +344,8 @@ export class CustomBundleHandler {
 /**
  * Run the custom bundle command
  */
-export async function runCustomBundles() {
-    const handler = new CustomBundleHandler();
+export async function runCustomBundles(cliOptionsArg = {}) {
+    const handler = new CustomBundleHandler(paths.cwd, cliOptionsArg);
     const hasConfig = await handler.loadConfig();
     if (!hasConfig) {
         return;
@@ -183,4 +353,4 @@ export async function runCustomBundles() {
     await handler.processAllBundles();
     console.log('\nCustom bundle processing complete!');
 }
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.js","sourceRoot":"","sources":["../../ts/mod_custom/index.ts"],"names":[],"mappings":"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"}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.js","sourceRoot":"","sources":["../../ts/mod_custom/index.ts"],"names":[],"mappings":"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"}

package/dist_ts/mod_html/index.js

@@ -24,11 +24,12 @@ export class HtmlHandler {
             .encoding('utf8')
             .read());
         if (options.minify) {
-            fileString = plugins.htmlMinifier.minify(fileString, {
+            fileString = await plugins.htmlMinifier.minify(fileString, {
                 minifyCSS: true,
                 minifyJS: true,
                 sortAttributes: true,
-                sortClassName: true,
+                sortClassNames: true,
+                includeAutoGeneratedTags: true,
                 removeAttributeQuotes: true,
                 collapseWhitespace: true,
                 collapseInlineTagWhitespace: true,
@@ -41,4 +42,4 @@ export class HtmlHandler {
         console.log(`html processing succeeded!`);
     }
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi90cy9tb2RfaHRtbC9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEtBQUssT0FBTyxNQUFNLGNBQWMsQ0FBQztBQUN4QyxPQUFPLEtBQUssS0FBSyxNQUFNLGFBQWEsQ0FBQztBQUVyQyxNQUFNLE9BQU8sV0FBVztJQUNmLGVBQWUsR0FBVyxPQUFPLENBQUMsSUFBSSxDQUFDLElBQUksQ0FDaEQsS0FBSyxDQUFDLE9BQU8sRUFDYixZQUFZLENBQ2IsQ0FBQztJQUNLLGFBQWEsR0FBVyxPQUFPLENBQUMsSUFBSSxDQUFDLElBQUksQ0FDOUMsS0FBSyxDQUFDLFlBQVksRUFDbEIsWUFBWSxDQUNiLENBQUM7SUFFSyxLQUFLLENBQUMsYUFBYTtRQUN4QixPQUFPLE1BQU0sT0FBTyxDQUFDLEVBQUUsQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLGVBQWUsQ0FBQyxDQUFDLE1BQU0sRUFBRSxDQUFDO0lBQzlELENBQUM7SUFFRCxrQkFBa0I7SUFDWCxLQUFLLENBQUMsV0FBVyxDQUFDLFVBSXhCO1FBQ0MsTUFBTSxPQUFPLEdBQUc7WUFDZCxJQUFJLEVBQUUsSUFBSSxDQUFDLGVBQWU7WUFDMUIsRUFBRSxFQUFFLElBQUksQ0FBQyxhQUFhO1lBQ3RCLE1BQU0sRUFBRSxLQUFLO1lBQ2IsR0FBRyxVQUFVO1NBQ2QsQ0FBQztRQUNGLElBQUksTUFBTSxJQUFJLENBQUMsYUFBYSxFQUFFLEVBQUUsQ0FBQztZQUMvQixPQUFPLENBQUMsR0FBRyxDQUFDLEdBQUcsT0FBTyxDQUFDLElBQUkscUJBQXFCLE9BQU8sQ0FBQyxFQUFFLEVBQUUsQ0FBQyxDQUFDO1FBQ2hFLENBQUM7UUFDRCxPQUFPLENBQUMsSUFBSSxHQUFHLE9BQU8sQ0FBQyxTQUFTLENBQUMsU0FBUyxDQUFDLFVBQVUsQ0FDbkQsT0FBTyxDQUFDLElBQUksRUFDWixLQUFLLENBQUMsR0FBRyxDQUNBLENBQUM7UUFDWixPQUFPLENBQUMsRUFBRSxHQUFHLE9BQU8sQ0FBQyxTQUFTLENBQUMsU0FBUyxDQUFDLFVBQVUsQ0FDakQsT0FBTyxDQUFDLEVBQUUsRUFDVixLQUFLLENBQUMsR0FBRyxDQUNBLENBQUM7UUFDWixJQUFJLFVBQVUsR0FBRyxDQUFDLE1BQU0sT0FBTyxDQUFDLEVBQUU7YUFDL0IsSUFBSSxDQUFDLE9BQU8sQ0FBQyxJQUFJLENBQUM7YUFDbEIsUUFBUSxDQUFDLE1BQU0sQ0FBQzthQUNoQixJQUFJLEVBQUUsQ0FBVyxDQUFDO1FBQ3JCLElBQUksT0FBTyxDQUFDLE1BQU0sRUFBRSxDQUFDO1lBQ25CLFVBQVUsR0FBRyxPQUFPLENBQUMsWUFBWSxDQUFDLE1BQU0sQ0FBQyxVQUFVLEVBQUU7Z0JBQ25ELFNBQVMsRUFBRSxJQUFJO2dCQUNmLFFBQVEsRUFBRSxJQUFJO2dCQUNkLGNBQWMsRUFBRSxJQUFJO2dCQUNwQixhQUFhLEVBQUUsSUFBSTtnQkFDbkIscUJBQXFCLEVBQUUsSUFBSTtnQkFDM0Isa0JBQWtCLEVBQUUsSUFBSTtnQkFDeEIsMkJBQTJCLEVBQUUsSUFBSTtnQkFDakMsY0FBYyxFQUFFLElBQUk7YUFDckIsQ0FBQyxDQUFDO1FBQ0wsQ0FBQztRQUNELE1BQU0sS0FBSyxHQUFHLE9BQU8sQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFDLE9BQU8sQ0FBQyxFQUFFLENBQUMsQ0FBQztRQUMvQyxNQUFNLE9BQU8sQ0FBQyxFQUFFLENBQUMsU0FBUyxDQUFDLEtBQUssQ0FBQyxDQUFDLE1BQU0sRUFBRSxDQUFDO1FBQzNDLE1BQU0sT0FBTyxDQUFDLEVBQUUsQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFDLEVBQUUsQ0FBQyxDQUFDLFFBQVEsQ0FBQyxNQUFNLENBQUMsQ0FBQyxLQUFLLENBQUMsVUFBVSxDQUFDLENBQUM7UUFDckUsT0FBTyxDQUFDLEdBQUcsQ0FBQyw0QkFBNEIsQ0FBQyxDQUFDO0lBQzVDLENBQUM7Q0FDRiJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi90cy9tb2RfaHRtbC9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEtBQUssT0FBTyxNQUFNLGNBQWMsQ0FBQztBQUN4QyxPQUFPLEtBQUssS0FBSyxNQUFNLGFBQWEsQ0FBQztBQUVyQyxNQUFNLE9BQU8sV0FBVztJQUNmLGVBQWUsR0FBVyxPQUFPLENBQUMsSUFBSSxDQUFDLElBQUksQ0FDaEQsS0FBSyxDQUFDLE9BQU8sRUFDYixZQUFZLENBQ2IsQ0FBQztJQUNLLGFBQWEsR0FBVyxPQUFPLENBQUMsSUFBSSxDQUFDLElBQUksQ0FDOUMsS0FBSyxDQUFDLFlBQVksRUFDbEIsWUFBWSxDQUNiLENBQUM7SUFFSyxLQUFLLENBQUMsYUFBYTtRQUN4QixPQUFPLE1BQU0sT0FBTyxDQUFDLEVBQUUsQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLGVBQWUsQ0FBQyxDQUFDLE1BQU0sRUFBRSxDQUFDO0lBQzlELENBQUM7SUFFRCxrQkFBa0I7SUFDWCxLQUFLLENBQUMsV0FBVyxDQUFDLFVBSXhCO1FBQ0MsTUFBTSxPQUFPLEdBQUc7WUFDZCxJQUFJLEVBQUUsSUFBSSxDQUFDLGVBQWU7WUFDMUIsRUFBRSxFQUFFLElBQUksQ0FBQyxhQUFhO1lBQ3RCLE1BQU0sRUFBRSxLQUFLO1lBQ2IsR0FBRyxVQUFVO1NBQ2QsQ0FBQztRQUNGLElBQUksTUFBTSxJQUFJLENBQUMsYUFBYSxFQUFFLEVBQUUsQ0FBQztZQUMvQixPQUFPLENBQUMsR0FBRyxDQUFDLEdBQUcsT0FBTyxDQUFDLElBQUkscUJBQXFCLE9BQU8sQ0FBQyxFQUFFLEVBQUUsQ0FBQyxDQUFDO1FBQ2hFLENBQUM7UUFDRCxPQUFPLENBQUMsSUFBSSxHQUFHLE9BQU8sQ0FBQyxTQUFTLENBQUMsU0FBUyxDQUFDLFVBQVUsQ0FDbkQsT0FBTyxDQUFDLElBQUksRUFDWixLQUFLLENBQUMsR0FBRyxDQUNBLENBQUM7UUFDWixPQUFPLENBQUMsRUFBRSxHQUFHLE9BQU8sQ0FBQyxTQUFTLENBQUMsU0FBUyxDQUFDLFVBQVUsQ0FDakQsT0FBTyxDQUFDLEVBQUUsRUFDVixLQUFLLENBQUMsR0FBRyxDQUNBLENBQUM7UUFDWixJQUFJLFVBQVUsR0FBRyxDQUFDLE1BQU0sT0FBTyxDQUFDLEVBQUU7YUFDL0IsSUFBSSxDQUFDLE9BQU8sQ0FBQyxJQUFJLENBQUM7YUFDbEIsUUFBUSxDQUFDLE1BQU0sQ0FBQzthQUNoQixJQUFJLEVBQUUsQ0FBVyxDQUFDO1FBQ3JCLElBQUksT0FBTyxDQUFDLE1BQU0sRUFBRSxDQUFDO1lBQ25CLFVBQVUsR0FBRyxNQUFNLE9BQU8sQ0FBQyxZQUFZLENBQUMsTUFBTSxDQUFDLFVBQVUsRUFBRTtnQkFDekQsU0FBUyxFQUFFLElBQUk7Z0JBQ2YsUUFBUSxFQUFFLElBQUk7Z0JBQ2QsY0FBYyxFQUFFLElBQUk7Z0JBQ3BCLGNBQWMsRUFBRSxJQUFJO2dCQUNwQix3QkFBd0IsRUFBRSxJQUFJO2dCQUM5QixxQkFBcUIsRUFBRSxJQUFJO2dCQUMzQixrQkFBa0IsRUFBRSxJQUFJO2dCQUN4QiwyQkFBMkIsRUFBRSxJQUFJO2dCQUNqQyxjQUFjLEVBQUUsSUFBSTthQUNyQixDQUFDLENBQUM7UUFDTCxDQUFDO1FBQ0QsTUFBTSxLQUFLLEdBQUcsT0FBTyxDQUFDLElBQUksQ0FBQyxPQUFPLENBQUMsT0FBTyxDQUFDLEVBQUUsQ0FBQyxDQUFDO1FBQy9DLE1BQU0sT0FBTyxDQUFDLEVBQUUsQ0FBQyxTQUFTLENBQUMsS0FBSyxDQUFDLENBQUMsTUFBTSxFQUFFLENBQUM7UUFDM0MsTUFBTSxPQUFPLENBQUMsRUFBRSxDQUFDLElBQUksQ0FBQyxPQUFPLENBQUMsRUFBRSxDQUFDLENBQUMsUUFBUSxDQUFDLE1BQU0sQ0FBQyxDQUFDLEtBQUssQ0FBQyxVQUFVLENBQUMsQ0FBQztRQUNyRSxPQUFPLENBQUMsR0FBRyxDQUFDLDRCQUE0QixDQUFDLENBQUM7SUFDNUMsQ0FBQztDQUNGIn0=

package/dist_ts/mod_html/plugins.d.ts

@@ -1,3 +1,3 @@
 export * from '../plugins.js';
-import * as htmlMinifier from 'html-minifier';
+import * as htmlMinifier from 'html-minifier-next';
 export { htmlMinifier };

package/dist_ts/mod_html/plugins.js

@@ -1,4 +1,4 @@
 export * from '../plugins.js';
-import * as htmlMinifier from 'html-minifier';
+import * as htmlMinifier from 'html-minifier-next';
 export { htmlMinifier };
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicGx1Z2lucy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3RzL21vZF9odG1sL3BsdWdpbnMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsY0FBYyxlQUFlLENBQUM7QUFFOUIsT0FBTyxLQUFLLFlBQVksTUFBTSxlQUFlLENBQUM7QUFFOUMsT0FBTyxFQUFFLFlBQVksRUFBRSxDQUFDIn0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicGx1Z2lucy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3RzL21vZF9odG1sL3BsdWdpbnMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsY0FBYyxlQUFlLENBQUM7QUFFOUIsT0FBTyxLQUFLLFlBQVksTUFBTSxvQkFBb0IsQ0FBQztBQUVuRCxPQUFPLEVBQUUsWUFBWSxFQUFFLENBQUMifQ==

package/dist_ts/plugins.d.ts

@@ -1,5 +1,8 @@
 import * as path from 'path';
-export { path };
+import * as fsSync from 'node:fs';
+import * as fsPromises from 'node:fs/promises';
+import * as os from 'node:os';
+export { fsPromises, fsSync, os, path };
 import * as smartconfig from '@push.rocks/smartconfig';
 import * as smartcli from '@push.rocks/smartcli';
 import * as smartfs from '@push.rocks/smartfs';

package/dist_ts/plugins.js

@@ -1,6 +1,9 @@
 // node native
 import * as path from 'path';
-export { path };
+import * as fsSync from 'node:fs';
+import * as fsPromises from 'node:fs/promises';
+import * as os from 'node:os';
+export { fsPromises, fsSync, os, path };
 // pushrocks scope
 import * as smartconfig from '@push.rocks/smartconfig';
 import * as smartcli from '@push.rocks/smartcli';
@@ -14,4 +17,4 @@ import * as smartspawn from '@push.rocks/smartspawn';
 export { smartconfig, smartcli, smartfs, smartinteract, smartlog, smartlogDestinationLocal, smartpath, smartpromise, smartspawn, };
 // Create a shared SmartFs instance using Node provider
 export const fs = new smartfs.SmartFs(new smartfs.SmartFsProviderNode());
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicGx1Z2lucy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3RzL3BsdWdpbnMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsY0FBYztBQUNkLE9BQU8sS0FBSyxJQUFJLE1BQU0sTUFBTSxDQUFDO0FBRTdCLE9BQU8sRUFBRSxJQUFJLEVBQUUsQ0FBQztBQUVoQixrQkFBa0I7QUFDbEIsT0FBTyxLQUFLLFdBQVcsTUFBTSx5QkFBeUIsQ0FBQztBQUN2RCxPQUFPLEtBQUssUUFBUSxNQUFNLHNCQUFzQixDQUFDO0FBQ2pELE9BQU8sS0FBSyxPQUFPLE1BQU0scUJBQXFCLENBQUM7QUFDL0MsT0FBTyxLQUFLLGFBQWEsTUFBTSwyQkFBMkIsQ0FBQztBQUMzRCxPQUFPLEtBQUssUUFBUSxNQUFNLHNCQUFzQixDQUFDO0FBQ2pELE9BQU8sS0FBSyx3QkFBd0IsTUFBTSx3Q0FBd0MsQ0FBQztBQUNuRixPQUFPLEtBQUssU0FBUyxNQUFNLHVCQUF1QixDQUFDO0FBQ25ELE9BQU8sS0FBSyxZQUFZLE1BQU0sMEJBQTBCLENBQUM7QUFDekQsT0FBTyxLQUFLLFVBQVUsTUFBTSx3QkFBd0IsQ0FBQztBQUVyRCxPQUFPLEVBQ0wsV0FBVyxFQUNYLFFBQVEsRUFDUixPQUFPLEVBQ1AsYUFBYSxFQUNiLFFBQVEsRUFDUix3QkFBd0IsRUFDeEIsU0FBUyxFQUNULFlBQVksRUFDWixVQUFVLEdBQ1gsQ0FBQztBQUVGLHVEQUF1RDtBQUN2RCxNQUFNLENBQUMsTUFBTSxFQUFFLEdBQUcsSUFBSSxPQUFPLENBQUMsT0FBTyxDQUFDLElBQUksT0FBTyxDQUFDLG1CQUFtQixFQUFFLENBQUMsQ0FBQyJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicGx1Z2lucy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3RzL3BsdWdpbnMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsY0FBYztBQUNkLE9BQU8sS0FBSyxJQUFJLE1BQU0sTUFBTSxDQUFDO0FBQzdCLE9BQU8sS0FBSyxNQUFNLE1BQU0sU0FBUyxDQUFDO0FBQ2xDLE9BQU8sS0FBSyxVQUFVLE1BQU0sa0JBQWtCLENBQUM7QUFDL0MsT0FBTyxLQUFLLEVBQUUsTUFBTSxTQUFTLENBQUM7QUFFOUIsT0FBTyxFQUFFLFVBQVUsRUFBRSxNQUFNLEVBQUUsRUFBRSxFQUFFLElBQUksRUFBRSxDQUFDO0FBRXhDLGtCQUFrQjtBQUNsQixPQUFPLEtBQUssV0FBVyxNQUFNLHlCQUF5QixDQUFDO0FBQ3ZELE9BQU8sS0FBSyxRQUFRLE1BQU0sc0JBQXNCLENBQUM7QUFDakQsT0FBTyxLQUFLLE9BQU8sTUFBTSxxQkFBcUIsQ0FBQztBQUMvQyxPQUFPLEtBQUssYUFBYSxNQUFNLDJCQUEyQixDQUFDO0FBQzNELE9BQU8sS0FBSyxRQUFRLE1BQU0sc0JBQXNCLENBQUM7QUFDakQsT0FBTyxLQUFLLHdCQUF3QixNQUFNLHdDQUF3QyxDQUFDO0FBQ25GLE9BQU8sS0FBSyxTQUFTLE1BQU0sdUJBQXVCLENBQUM7QUFDbkQsT0FBTyxLQUFLLFlBQVksTUFBTSwwQkFBMEIsQ0FBQztBQUN6RCxPQUFPLEtBQUssVUFBVSxNQUFNLHdCQUF3QixDQUFDO0FBRXJELE9BQU8sRUFDTCxXQUFXLEVBQ1gsUUFBUSxFQUNSLE9BQU8sRUFDUCxhQUFhLEVBQ2IsUUFBUSxFQUNSLHdCQUF3QixFQUN4QixTQUFTLEVBQ1QsWUFBWSxFQUNaLFVBQVUsR0FDWCxDQUFDO0FBRUYsdURBQXVEO0FBQ3ZELE1BQU0sQ0FBQyxNQUFNLEVBQUUsR0FBRyxJQUFJLE9BQU8sQ0FBQyxPQUFPLENBQUMsSUFBSSxPQUFPLENBQUMsbUJBQW1CLEVBQUUsQ0FBQyxDQUFDIn0=

package/dist_ts/tsbundle.class.tsbundle.js

@@ -15,6 +15,15 @@ export class TsBundle {
                     return './mod_esbuild/index.child.js';
             }
         };
+        const moduleDir = plugins.smartpath.get.dirnameFromImportMetaUrl(import.meta.url);
+        const childRelativePath = getBundlerPath();
+        let childPath = plugins.path.join(moduleDir, childRelativePath);
+        if (!plugins.fsSync.existsSync(childPath)) {
+            const distChildPath = plugins.path.join(moduleDir, '..', 'dist_ts', childRelativePath);
+            if (plugins.fsSync.existsSync(distChildPath)) {
+                childPath = distChildPath;
+            }
+        }
         const transportOptions = {
             cwd: cwdArg,
             from: fromArg,
@@ -24,7 +33,7 @@ export class TsBundle {
                 ...argvArg,
             },
         };
-        const threadsimple = new plugins.smartspawn.ThreadSimple(plugins.path.join(plugins.smartpath.get.dirnameFromImportMetaUrl(import.meta.url), getBundlerPath()), [], {
+        const threadsimple = new plugins.smartspawn.ThreadSimple(childPath, [], {
             env: {
                 ...process.env,
                 transportOptions: JSON.stringify(transportOptions),
@@ -42,4 +51,4 @@ export class TsBundle {
         await done.promise;
     }
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHNidW5kbGUuY2xhc3MudHNidW5kbGUuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi90cy90c2J1bmRsZS5jbGFzcy50c2J1bmRsZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEtBQUssT0FBTyxNQUFNLGNBQWMsQ0FBQztBQUN4QyxPQUFPLEtBQUssVUFBVSxNQUFNLHVCQUF1QixDQUFDO0FBQ3BELE9BQU8sRUFBRSxNQUFNLEVBQUUsTUFBTSx1QkFBdUIsQ0FBQztBQUUvQyxNQUFNLE9BQU8sUUFBUTtJQUNaLEtBQUssQ0FBQyxLQUFLLENBQ2hCLE1BQWMsRUFDZCxVQUFrQixtQkFBbUIsRUFDckMsUUFBZ0IseUJBQXlCLEVBQ3pDLE9BQStCO1FBRS9CLE1BQU0sSUFBSSxHQUFHLE9BQU8sQ0FBQyxZQUFZLENBQUMsS0FBSyxFQUFFLENBQUM7UUFDMUMsTUFBTSxjQUFjLEdBQUcsR0FBRyxFQUFFO1lBQzFCLFFBQVEsT0FBTyxDQUFDLE9BQU8sRUFBRSxDQUFDO2dCQUN4QixLQUFLLFVBQVU7b0JBQ2IsT0FBTywrQkFBK0IsQ0FBQztnQkFDekMsS0FBSyxRQUFRO29CQUNYLE9BQU8sNkJBQTZCLENBQUM7Z0JBQ3ZDLEtBQUssU0FBUyxDQUFDO2dCQUNmO29CQUNFLE9BQU8sOEJBQThCLENBQUM7WUFDMUMsQ0FBQztRQUNILENBQUMsQ0FBQztRQUNGLE1BQU0sZ0JBQWdCLEdBQW9DO1lBQ3hELEdBQUcsRUFBRSxNQUFNO1lBQ1gsSUFBSSxFQUFFLE9BQU87WUFDYixFQUFFLEVBQUUsS0FBSztZQUNULElBQUksRUFBRSxPQUFPLElBQUksT0FBTyxDQUFDLFVBQVUsQ0FBQyxDQUFDLENBQUMsWUFBWSxDQUFDLENBQUMsQ0FBQyxNQUFNO1lBQzNELElBQUksRUFBRTtnQkFDSixHQUFHLE9BQU87YUFDWDtTQUNGLENBQUM7UUFDRixNQUFNLFlBQVksR0FBRyxJQUFJLE9BQU8sQ0FBQyxVQUFVLENBQUMsWUFBWSxDQUN0RCxPQUFPLENBQUMsSUFBSSxDQUFDLElBQUksQ0FDZixPQUFPLENBQUMsU0FBUyxDQUFDLEdBQUcsQ0FBQyx3QkFBd0IsQ0FBQyxNQUFNLENBQUMsSUFBSSxDQUFDLEdBQUcsQ0FBQyxFQUMvRCxjQUFjLEVBQUUsQ0FDakIsRUFDRCxFQUFFLEVBQ0Y7WUFDRSxHQUFHLEVBQUU7Z0JBQ0gsR0FBRyxPQUFPLENBQUMsR0FBRztnQkFDZCxnQkFBZ0IsRUFBRSxJQUFJLENBQUMsU0FBUyxDQUFDLGdCQUFnQixDQUFDO2FBQ25EO1NBQ0YsQ0FDRixDQUFDO1FBQ0YsTUFBTSxZQUFZLEdBQUcsTUFBTSxZQUFZLENBQUMsS0FBSyxFQUFFLENBQUM7UUFDaEQsWUFBWSxDQUFDLEVBQUUsQ0FBQyxNQUFNLEVBQUUsQ0FBQyxNQUFNLEVBQUUsRUFBRTtZQUNqQyxJQUFJLE1BQU0sS0FBSyxDQUFDLEVBQUUsQ0FBQztnQkFDakIsSUFBSSxDQUFDLE1BQU0sQ0FBQyxJQUFJLEtBQUssQ0FBQyxzQ0FBc0MsTUFBTSxFQUFFLENBQUMsQ0FBQyxDQUFDO1lBQ3pFLENBQUM7aUJBQU0sQ0FBQztnQkFDTixJQUFJLENBQUMsT0FBTyxFQUFFLENBQUM7WUFDakIsQ0FBQztRQUNILENBQUMsQ0FBQyxDQUFDO1FBQ0gsTUFBTSxJQUFJLENBQUMsT0FBTyxDQUFDO0lBQ3JCLENBQUM7Q0FDRiJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHNidW5kbGUuY2xhc3MudHNidW5kbGUuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi90cy90c2J1bmRsZS5jbGFzcy50c2J1bmRsZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEtBQUssT0FBTyxNQUFNLGNBQWMsQ0FBQztBQUN4QyxPQUFPLEtBQUssVUFBVSxNQUFNLHVCQUF1QixDQUFDO0FBQ3BELE9BQU8sRUFBRSxNQUFNLEVBQUUsTUFBTSx1QkFBdUIsQ0FBQztBQUUvQyxNQUFNLE9BQU8sUUFBUTtJQUNaLEtBQUssQ0FBQyxLQUFLLENBQ2hCLE1BQWMsRUFDZCxVQUFrQixtQkFBbUIsRUFDckMsUUFBZ0IseUJBQXlCLEVBQ3pDLE9BQStCO1FBRS9CLE1BQU0sSUFBSSxHQUFHLE9BQU8sQ0FBQyxZQUFZLENBQUMsS0FBSyxFQUFFLENBQUM7UUFDMUMsTUFBTSxjQUFjLEdBQUcsR0FBRyxFQUFFO1lBQzFCLFFBQVEsT0FBTyxDQUFDLE9BQU8sRUFBRSxDQUFDO2dCQUN4QixLQUFLLFVBQVU7b0JBQ2IsT0FBTywrQkFBK0IsQ0FBQztnQkFDekMsS0FBSyxRQUFRO29CQUNYLE9BQU8sNkJBQTZCLENBQUM7Z0JBQ3ZDLEtBQUssU0FBUyxDQUFDO2dCQUNmO29CQUNFLE9BQU8sOEJBQThCLENBQUM7WUFDMUMsQ0FBQztRQUNILENBQUMsQ0FBQztRQUNGLE1BQU0sU0FBUyxHQUFHLE9BQU8sQ0FBQyxTQUFTLENBQUMsR0FBRyxDQUFDLHdCQUF3QixDQUFDLE1BQU0sQ0FBQyxJQUFJLENBQUMsR0FBRyxDQUFDLENBQUM7UUFDbEYsTUFBTSxpQkFBaUIsR0FBRyxjQUFjLEVBQUUsQ0FBQztRQUMzQyxJQUFJLFNBQVMsR0FBRyxPQUFPLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxTQUFTLEVBQUUsaUJBQWlCLENBQUMsQ0FBQztRQUNoRSxJQUFJLENBQUMsT0FBTyxDQUFDLE1BQU0sQ0FBQyxVQUFVLENBQUMsU0FBUyxDQUFDLEVBQUUsQ0FBQztZQUMxQyxNQUFNLGFBQWEsR0FBRyxPQUFPLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxTQUFTLEVBQUUsSUFBSSxFQUFFLFNBQVMsRUFBRSxpQkFBaUIsQ0FBQyxDQUFDO1lBQ3ZGLElBQUksT0FBTyxDQUFDLE1BQU0sQ0FBQyxVQUFVLENBQUMsYUFBYSxDQUFDLEVBQUUsQ0FBQztnQkFDN0MsU0FBUyxHQUFHLGFBQWEsQ0FBQztZQUM1QixDQUFDO1FBQ0gsQ0FBQztRQUNELE1BQU0sZ0JBQWdCLEdBQW9DO1lBQ3hELEdBQUcsRUFBRSxNQUFNO1lBQ1gsSUFBSSxFQUFFLE9BQU87WUFDYixFQUFFLEVBQUUsS0FBSztZQUNULElBQUksRUFBRSxPQUFPLElBQUksT0FBTyxDQUFDLFVBQVUsQ0FBQyxDQUFDLENBQUMsWUFBWSxDQUFDLENBQUMsQ0FBQyxNQUFNO1lBQzNELElBQUksRUFBRTtnQkFDSixHQUFHLE9BQU87YUFDWDtTQUNGLENBQUM7UUFDRixNQUFNLFlBQVksR0FBRyxJQUFJLE9BQU8sQ0FBQyxVQUFVLENBQUMsWUFBWSxDQUN0RCxTQUFTLEVBQ1QsRUFBRSxFQUNGO1lBQ0UsR0FBRyxFQUFFO2dCQUNILEdBQUcsT0FBTyxDQUFDLEdBQUc7Z0JBQ2QsZ0JBQWdCLEVBQUUsSUFBSSxDQUFDLFNBQVMsQ0FBQyxnQkFBZ0IsQ0FBQzthQUNuRDtTQUNGLENBQ0YsQ0FBQztRQUNGLE1BQU0sWUFBWSxHQUFHLE1BQU0sWUFBWSxDQUFDLEtBQUssRUFBRSxDQUFDO1FBQ2hELFlBQVksQ0FBQyxFQUFFLENBQUMsTUFBTSxFQUFFLENBQUMsTUFBTSxFQUFFLEVBQUU7WUFDakMsSUFBSSxNQUFNLEtBQUssQ0FBQyxFQUFFLENBQUM7Z0JBQ2pCLElBQUksQ0FBQyxNQUFNLENBQUMsSUFBSSxLQUFLLENBQUMsc0NBQXNDLE1BQU0sRUFBRSxDQUFDLENBQUMsQ0FBQztZQUN6RSxDQUFDO2lCQUFNLENBQUM7Z0JBQ04sSUFBSSxDQUFDLE9BQU8sRUFBRSxDQUFDO1lBQ2pCLENBQUM7UUFDSCxDQUFDLENBQUMsQ0FBQztRQUNILE1BQU0sSUFBSSxDQUFDLE9BQU8sQ0FBQztJQUNyQixDQUFDO0NBQ0YifQ==

package/dist_ts/tsbundle.cli.js

@@ -5,11 +5,11 @@ export const runCli = async () => {
     const tsBundleCli = new plugins.smartcli.Smartcli();
     // Default command: run custom bundles from .smartconfig.json
     tsBundleCli.standardCommand().subscribe(async (argvArg) => {
-        await runCustomBundles();
+        await runCustomBundles(argvArg);
     });
     // Explicit custom command (same as default)
     tsBundleCli.addCommand('custom').subscribe(async (argvArg) => {
-        await runCustomBundles();
+        await runCustomBundles(argvArg);
     });
     // Interactive init wizard
     tsBundleCli.addCommand('init').subscribe(async (argvArg) => {
@@ -17,4 +17,4 @@ export const runCli = async () => {
     });
     tsBundleCli.startParse();
 };
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHNidW5kbGUuY2xpLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHMvdHNidW5kbGUuY2xpLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sS0FBSyxPQUFPLE1BQU0sY0FBYyxDQUFDO0FBQ3hDLE9BQU8sRUFBRSxnQkFBZ0IsRUFBRSxNQUFNLHVCQUF1QixDQUFDO0FBQ3pELE9BQU8sRUFBRSxPQUFPLEVBQUUsTUFBTSxxQkFBcUIsQ0FBQztBQUU5QyxNQUFNLENBQUMsTUFBTSxNQUFNLEdBQUcsS0FBSyxJQUFJLEVBQUU7SUFDL0IsTUFBTSxXQUFXLEdBQUcsSUFBSSxPQUFPLENBQUMsUUFBUSxDQUFDLFFBQVEsRUFBRSxDQUFDO0lBRXBELDZEQUE2RDtJQUM3RCxXQUFXLENBQUMsZUFBZSxFQUFFLENBQUMsU0FBUyxDQUFDLEtBQUssRUFBRSxPQUFPLEVBQUUsRUFBRTtRQUN4RCxNQUFNLGdCQUFnQixFQUFFLENBQUM7SUFDM0IsQ0FBQyxDQUFDLENBQUM7SUFFSCw0Q0FBNEM7SUFDNUMsV0FBVyxDQUFDLFVBQVUsQ0FBQyxRQUFRLENBQUMsQ0FBQyxTQUFTLENBQUMsS0FBSyxFQUFFLE9BQU8sRUFBRSxFQUFFO1FBQzNELE1BQU0sZ0JBQWdCLEVBQUUsQ0FBQztJQUMzQixDQUFDLENBQUMsQ0FBQztJQUVILDBCQUEwQjtJQUMxQixXQUFXLENBQUMsVUFBVSxDQUFDLE1BQU0sQ0FBQyxDQUFDLFNBQVMsQ0FBQyxLQUFLLEVBQUUsT0FBTyxFQUFFLEVBQUU7UUFDekQsTUFBTSxPQUFPLEVBQUUsQ0FBQztJQUNsQixDQUFDLENBQUMsQ0FBQztJQUVILFdBQVcsQ0FBQyxVQUFVLEVBQUUsQ0FBQztBQUMzQixDQUFDLENBQUMifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHNidW5kbGUuY2xpLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHMvdHNidW5kbGUuY2xpLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sS0FBSyxPQUFPLE1BQU0sY0FBYyxDQUFDO0FBQ3hDLE9BQU8sRUFBRSxnQkFBZ0IsRUFBRSxNQUFNLHVCQUF1QixDQUFDO0FBQ3pELE9BQU8sRUFBRSxPQUFPLEVBQUUsTUFBTSxxQkFBcUIsQ0FBQztBQUU5QyxNQUFNLENBQUMsTUFBTSxNQUFNLEdBQUcsS0FBSyxJQUFJLEVBQUU7SUFDL0IsTUFBTSxXQUFXLEdBQUcsSUFBSSxPQUFPLENBQUMsUUFBUSxDQUFDLFFBQVEsRUFBRSxDQUFDO0lBRXBELDZEQUE2RDtJQUM3RCxXQUFXLENBQUMsZUFBZSxFQUFFLENBQUMsU0FBUyxDQUFDLEtBQUssRUFBRSxPQUFPLEVBQUUsRUFBRTtRQUN4RCxNQUFNLGdCQUFnQixDQUFDLE9BQU8sQ0FBQyxDQUFDO0lBQ2xDLENBQUMsQ0FBQyxDQUFDO0lBRUgsNENBQTRDO0lBQzVDLFdBQVcsQ0FBQyxVQUFVLENBQUMsUUFBUSxDQUFDLENBQUMsU0FBUyxDQUFDLEtBQUssRUFBRSxPQUFPLEVBQUUsRUFBRTtRQUMzRCxNQUFNLGdCQUFnQixDQUFDLE9BQU8sQ0FBQyxDQUFDO0lBQ2xDLENBQUMsQ0FBQyxDQUFDO0lBRUgsMEJBQTBCO0lBQzFCLFdBQVcsQ0FBQyxVQUFVLENBQUMsTUFBTSxDQUFDLENBQUMsU0FBUyxDQUFDLEtBQUssRUFBRSxPQUFPLEVBQUUsRUFBRTtRQUN6RCxNQUFNLE9BQU8sRUFBRSxDQUFDO0lBQ2xCLENBQUMsQ0FBQyxDQUFDO0lBRUgsV0FBVyxDQUFDLFVBQVUsRUFBRSxDQUFDO0FBQzNCLENBQUMsQ0FBQyJ9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@git.zone/tsbundle",
-  "version": "2.10.4",
+  "version": "2.11.1",
   "private": false,
   "description": "a multi-bundler tool supporting esbuild, rolldown, and rspack for painless bundling of web projects",
   "main": "dist_ts/index.js",
@@ -8,36 +8,31 @@
   "type": "module",
   "author": "Task Venture Capital GmbH",
   "license": "MIT",
-  "scripts": {
-    "test": "pnpm run build && (tstest test/ --verbose)",
-    "build": "(tsbuild --web)",
-    "buildDocs": "tsdoc"
-  },
   "bin": {
     "tsbundle": "./cli.js"
   },
   "devDependencies": {
-    "@git.zone/tsbuild": "^4.4.0",
-    "@git.zone/tsrun": "^2.0.3",
-    "@git.zone/tstest": "^3.6.5",
-    "@types/node": "^25.6.2"
+    "@git.zone/tsbuild": "^4.4.2",
+    "@git.zone/tsrun": "^2.0.5",
+    "@git.zone/tstest": "^3.6.6",
+    "@types/node": "^26.1.0",
+    "lit": "^3.3.3"
   },
   "dependencies": {
     "@push.rocks/early": "^4.0.4",
-    "@push.rocks/smartcli": "^4.0.21",
-    "@push.rocks/smartconfig": "^6.1.1",
+    "@push.rocks/smartcli": "^4.3.0",
+    "@push.rocks/smartconfig": "^6.2.0",
     "@push.rocks/smartdelay": "^3.1.0",
-    "@push.rocks/smartfs": "^1.5.1",
-    "@push.rocks/smartinteract": "^2.0.16",
+    "@push.rocks/smartfs": "^1.6.0",
+    "@push.rocks/smartinteract": "^2.0.17",
     "@push.rocks/smartlog": "^3.2.2",
     "@push.rocks/smartlog-destination-local": "^9.0.2",
     "@push.rocks/smartpath": "^6.0.0",
     "@push.rocks/smartpromise": "^4.2.4",
     "@push.rocks/smartspawn": "^3.0.4",
-    "@rspack/core": "^2.0.2",
-    "@types/html-minifier": "^4.0.6",
-    "esbuild": "^0.28.0",
-    "html-minifier": "^4.0.0",
+    "@rspack/core": "^2.1.2",
+    "esbuild": "^0.28.1",
+    "html-minifier-next": "^5.2.2",
     "rolldown": "1.0.0",
     "typescript": "6.0.3"
   },
@@ -56,7 +51,6 @@
   "browserslist": [
     "last 1 chrome versions"
   ],
-  "packageManager": "pnpm@10.11.0+sha512.6540583f41cc5f628eb3d9773ecee802f4f9ef9923cc45b69890fb47991d4b092964694ec3a4f738a420c918a333062c8b925d312f42e4f0c263eb603551f977",
   "repository": {
     "type": "git",
     "url": "https://code.foss.global/git.zone/tsbundle.git"
@@ -64,5 +58,10 @@
   "bugs": {
     "url": "https://gitlab.com/gitzone/tsbundle/issues"
   },
-  "homepage": "https://gitlab.com/gitzone/tsbundle#readme"
-}
+  "homepage": "https://gitlab.com/gitzone/tsbundle#readme",
+  "scripts": {
+    "test": "pnpm run build && (tstest test/ --verbose)",
+    "build": "(tsbuild --web)",
+    "buildDocs": "tsdoc"
+  }
+}

package/readme.md

@@ -48,6 +48,7 @@ Your bundles will be built according to your `.smartconfig.json` configuration.
 | Command | Description |
 |---------|-------------|
 | `tsbundle` | Build all bundles from `.smartconfig.json` configuration |
+| `tsbundle --keep-temp` | Build all bundles and keep `.nogit/tsbundle-temp` for debugging |
 | `tsbundle custom` | Same as above (explicit) |
 | `tsbundle init` | Interactive wizard to create/update bundle configuration |
 
@@ -58,6 +59,7 @@ tsbundle uses `.smartconfig.json` for configuration. Here's an example:
 ```json
 {
   "@git.zone/tsbundle": {
+    "keepTemp": false,
     "bundles": [
       {
         "from": "./ts_web/index.ts",
@@ -89,6 +91,15 @@ tsbundle uses `.smartconfig.json` for configuration. Here's an example:
 | `production` | `boolean` | `false` | Enable minification |
 | `includeFiles` | `string[]` | `[]` | Glob patterns for additional files (HTML, assets) |
 | `maxLineLength` | `number` | `0` (unlimited) | For `base64ts` mode: max chars per line in output |
+| `keepTemp` | `boolean` | `false` | Keep `.nogit/tsbundle-temp` after this bundle for debugging |
+
+Top-level `keepTemp: true` keeps the temp workspace for all bundles. Per-bundle `keepTemp` only affects that bundle. `TSBUNDLE_KEEP_TEMP=true` and `--keep-temp` are supported for one-off debugging.
+
+### Temporary Workspace Cleanup
+
+Custom bundle builds use `.nogit/tsbundle-temp` as an intermediate workspace. tsbundle writes `.gitzone-tool-cache.json` into tool-owned temp workspaces and removes marked temp data after successful output handling. On startup, stale marked temp workspaces are pruned so interrupted builds do not accumulate indefinitely.
+
+If `.nogit/tsbundle-temp` already exists and is non-empty without a valid marker, tsbundle does not claim or delete the directory. It only removes the temp files created by the current build.
 
 ### Output Modes
 
@@ -193,7 +204,7 @@ Process multiple bundle configurations from `.smartconfig.json`:
 ```typescript
 import { CustomBundleHandler } from '@git.zone/tsbundle';
 
-const handler = new CustomBundleHandler(process.cwd());
+const handler = new CustomBundleHandler(process.cwd(), { keepTemp: false });
 const hasConfig = await handler.loadConfig();
 if (hasConfig) {
   await handler.processAllBundles();

package/readme.plan.md

@@ -1,7 +1,5 @@
 # tsbundle Rolldown Integration Plan
 
-**Command to reread CLAUDE.md**: `cat ~/.claude/CLAUDE.md`
-
 ## Objective
 
 Add Rolldown as an optional bundler to tsbundle while keeping esbuild as the default bundler. This allows users to experiment with Rolldown using `--bundler=rolldown` flag.

package/ts/00_commitinfo_data.ts

@@ -3,6 +3,6 @@
  */
 export const commitinfo = {
   name: '@git.zone/tsbundle',
-  version: '2.10.4',
+  version: '2.11.1',
   description: 'a multi-bundler tool supporting esbuild, rolldown, and rspack for painless bundling of web projects'
 }

package/ts/interfaces/index.ts

@@ -2,9 +2,15 @@ export interface ICliOptions {
   commonjs?: boolean;
   skiplibcheck?: boolean;
   production?: boolean;
+  keepTemp?: boolean;
   bundler: 'esbuild' | 'rolldown' | 'rspack';
 }
 
+export interface ICustomBundleCliOptions {
+  keepTemp?: boolean;
+  'keep-temp'?: boolean;
+}
+
 export interface IEnvTransportOptions {
   cwd: string;
   from: string;
@@ -27,10 +33,12 @@ export interface IBundleConfig {
   production?: boolean;
   includeFiles?: TIncludeFile[];
   maxLineLength?: number; // For base64ts output: max chars per line. 0 or undefined = unlimited (default)
+  keepTemp?: boolean;
 }
 
 export interface ITsbundleConfig {
   bundles: IBundleConfig[];
+  keepTemp?: boolean;
 }
 
 export interface IBase64File {

package/ts/mod_custom/index.ts

@@ -6,13 +6,34 @@ import { HtmlHandler } from '../mod_html/index.js';
 import { Base64TsOutput } from '../mod_output/index.js';
 
 const TEMP_DIR = '.nogit/tsbundle-temp';
+const toolCacheMarkerFile = '.gitzone-tool-cache.json';
+const toolCacheOwner = '@git.zone/tsbundle';
+const tempCacheKind = 'bundle-temp-workspace';
+const staleTempThresholdMs = 24 * 60 * 60 * 1000;
+
+interface IToolCacheMarker {
+  owner: string;
+  kind: string;
+  safeToPrune: boolean;
+  createdAt: string;
+  schemaVersion: 1;
+}
+
+interface ITempWorkspace {
+  tempDir: string;
+  canCleanupWorkspace: boolean;
+  cleanupOnFailure: boolean;
+}
 
 export class CustomBundleHandler {
   private cwd: string;
   private config!: interfaces.ITsbundleConfig;
+  private cliOptions: interfaces.ICustomBundleCliOptions;
+  private didRunStartupCleanup = false;
 
-  constructor(cwd: string = paths.cwd) {
+  constructor(cwd: string = paths.cwd, cliOptions: interfaces.ICustomBundleCliOptions = {}) {
     this.cwd = cwd;
+    this.cliOptions = cliOptions;
   }
 
   /**
@@ -38,6 +59,7 @@ export class CustomBundleHandler {
    * Process all configured bundles
    */
   public async processAllBundles(): Promise<void> {
+    await this.cleanupStaleTempWorkspace();
     for (let i = 0; i < this.config.bundles.length; i++) {
       const bundleConfig = this.config.bundles[i];
       console.log(`\nProcessing bundle ${i + 1}/${this.config.bundles.length}: ${bundleConfig.from} -> ${bundleConfig.to}`);
@@ -49,18 +71,17 @@ export class CustomBundleHandler {
    * Process a single bundle configuration
    */
   public async processSingleBundle(bundleConfig: interfaces.IBundleConfig): Promise<void> {
+    await this.cleanupStaleTempWorkspace();
     const outputMode = bundleConfig.outputMode || 'bundle';
     const bundler = bundleConfig.bundler || 'esbuild';
 
-    // Determine temp output path
-    const tempDir = plugins.path.join(this.cwd, TEMP_DIR);
+    const tempWorkspace = await this.prepareTempWorkspace();
+    const tempDir = tempWorkspace.tempDir;
     const tempBundlePath = plugins.path.join(tempDir, 'bundle.js');
 
-    // Ensure temp directory exists
-    await plugins.fs.directory(tempDir).create();
-
     // Build the bundle to temp location
     const tsbundle = new TsBundle();
+    let completedSuccessfully = false;
     try {
       await tsbundle.build(
         this.cwd,
@@ -71,28 +92,210 @@ export class CustomBundleHandler {
           production: bundleConfig.production || false,
         }
       );
+
+      if (outputMode === 'base64ts') {
+        await this.handleBase64TsOutput(bundleConfig, tempBundlePath);
+      } else {
+        await this.handleBundleOutput(bundleConfig, tempBundlePath);
+      }
+
+      completedSuccessfully = true;
     } catch (error: any) {
       console.error(`\n\x1b[31m❌ Bundle failed: ${bundleConfig.from} -> ${bundleConfig.to}\x1b[0m`);
       // Don't re-print error details - they were already shown by the child process
       return; // Skip output handling since build failed
+    } finally {
+      if (completedSuccessfully && tempWorkspace.canCleanupWorkspace && !this.shouldKeepTemp(bundleConfig)) {
+        await this.cleanupTempWorkspace('successful bundle', tempDir);
+      } else if (completedSuccessfully) {
+        console.log(`Keeping tsbundle temp workspace: ${tempDir}`);
+      } else if (tempWorkspace.cleanupOnFailure && !this.shouldKeepTemp(bundleConfig)) {
+        await this.cleanupTempWorkspace('failed bundle', tempDir);
+      }
     }
+  }
 
-    if (outputMode === 'base64ts') {
-      await this.handleBase64TsOutput(bundleConfig, tempBundlePath);
-    } else {
-      await this.handleBundleOutput(bundleConfig, tempBundlePath);
+  public async cleanupStaleTempWorkspace(thresholdMsArg = staleTempThresholdMs): Promise<boolean> {
+    if (this.didRunStartupCleanup) {
+      return false;
+    }
+    this.didRunStartupCleanup = true;
+
+    if (this.shouldKeepTemp()) {
+      return false;
+    }
+
+    const tempDir = this.getTempDir();
+    const marker = await this.readTempMarker(tempDir);
+    if (!marker) {
+      return false;
+    }
+
+    const createdAt = Date.parse(marker.createdAt);
+    if (Number.isFinite(createdAt) && Date.now() - createdAt < thresholdMsArg) {
+      return false;
+    }
+
+    await this.cleanupTempWorkspace('stale marked temp workspace');
+    return true;
+  }
+
+  private getTempDir(): string {
+    return plugins.path.join(this.cwd, TEMP_DIR);
+  }
+
+  private assertExpectedTempDir(tempDirArg: string): void {
+    const expected = plugins.path.resolve(this.cwd, TEMP_DIR);
+    const actual = plugins.path.resolve(tempDirArg);
+    if (actual !== expected) {
+      throw new Error(`Refusing to clean unexpected tsbundle temp path: ${tempDirArg}`);
+    }
+  }
+
+  private assertManagedTempDir(tempDirArg: string): void {
+    const expected = plugins.path.resolve(this.cwd, TEMP_DIR);
+    const actual = plugins.path.resolve(tempDirArg);
+    const osTempRoot = plugins.path.resolve(plugins.os.tmpdir());
+    const isIsolatedTemp = plugins.path.dirname(actual) === osTempRoot
+      && plugins.path.basename(actual).startsWith('tsbundle-temp-');
+    if (actual !== expected && !isIsolatedTemp) {
+      throw new Error(`Refusing to clean unexpected tsbundle temp path: ${tempDirArg}`);
+    }
+  }
+
+  private isTruthy(valueArg: unknown): boolean {
+    if (typeof valueArg === 'boolean') {
+      return valueArg;
+    }
+    if (typeof valueArg !== 'string') {
+      return false;
+    }
+    const normalized = valueArg.toLowerCase();
+    return normalized === '1' || normalized === 'true' || normalized === 'yes' || normalized === 'y';
+  }
+
+  private shouldKeepTemp(bundleConfigArg?: interfaces.IBundleConfig): boolean {
+    return this.isTruthy(process.env.TSBUNDLE_KEEP_TEMP)
+      || this.cliOptions.keepTemp === true
+      || this.cliOptions['keep-temp'] === true
+      || this.config?.keepTemp === true
+      || bundleConfigArg?.keepTemp === true;
+  }
+
+  private async prepareTempWorkspace(): Promise<ITempWorkspace> {
+    const tempDirArg = this.getTempDir();
+    this.assertExpectedTempDir(tempDirArg);
+    const marker = await this.readTempMarker(tempDirArg);
+    if (marker) {
+      return { tempDir: tempDirArg, canCleanupWorkspace: true, cleanupOnFailure: false };
+    }
+
+    let entries: string[] = [];
+    try {
+      entries = await plugins.fsPromises.readdir(tempDirArg);
+    } catch {
+      await plugins.fsPromises.mkdir(tempDirArg, { recursive: true });
     }
 
-    // Clean up temp file
-    const tempFileExists = await plugins.fs.file(tempBundlePath).exists();
-    if (tempFileExists) {
-      await plugins.fs.file(tempBundlePath).delete();
+    if (entries.length > 0) {
+      const isolatedTempDir = await this.createIsolatedTempWorkspace();
+      console.log(`tsbundle: leaving existing unmarked temp workspace untouched: ${tempDirArg}`);
+      console.log(`tsbundle: using isolated marked temp workspace: ${isolatedTempDir}`);
+      return { tempDir: isolatedTempDir, canCleanupWorkspace: true, cleanupOnFailure: true };
     }
-    const tempSourceMapPath = `${tempBundlePath}.map`;
-    const tempSourceMapExists = await plugins.fs.file(tempSourceMapPath).exists();
-    if (tempSourceMapExists) {
-      await plugins.fs.file(tempSourceMapPath).delete();
+
+    await this.writeTempMarker(tempDirArg);
+    return { tempDir: tempDirArg, canCleanupWorkspace: true, cleanupOnFailure: false };
+  }
+
+  private async createIsolatedTempWorkspace(): Promise<string> {
+    const tempDir = await plugins.fsPromises.mkdtemp(plugins.path.join(plugins.os.tmpdir(), 'tsbundle-temp-'));
+    await this.writeTempMarker(tempDir);
+    return tempDir;
+  }
+
+  private async writeTempMarker(tempDirArg: string): Promise<void> {
+    this.assertManagedTempDir(tempDirArg);
+    const marker: IToolCacheMarker = {
+      owner: toolCacheOwner,
+      kind: tempCacheKind,
+      safeToPrune: true,
+      createdAt: new Date().toISOString(),
+      schemaVersion: 1,
+    };
+    await plugins.fsPromises.mkdir(tempDirArg, { recursive: true });
+    await plugins.fsPromises.writeFile(
+      plugins.path.join(tempDirArg, toolCacheMarkerFile),
+      `${JSON.stringify(marker, null, 2)}\n`,
+    );
+  }
+
+  private async readTempMarker(tempDirArg: string): Promise<IToolCacheMarker | undefined> {
+    this.assertManagedTempDir(tempDirArg);
+    try {
+      const markerRaw = await plugins.fsPromises.readFile(plugins.path.join(tempDirArg, toolCacheMarkerFile), 'utf8');
+      const marker = JSON.parse(markerRaw) as Partial<IToolCacheMarker>;
+      if (
+        marker.owner === toolCacheOwner &&
+        marker.kind === tempCacheKind &&
+        marker.safeToPrune === true &&
+        marker.schemaVersion === 1
+      ) {
+        return marker as IToolCacheMarker;
+      }
+    } catch {
+      return undefined;
+    }
+
+    return undefined;
+  }
+
+  private async getDirectorySize(pathArg: string): Promise<number> {
+    let total = 0;
+    let entries;
+    try {
+      entries = await plugins.fsPromises.readdir(pathArg, { withFileTypes: true });
+    } catch {
+      return 0;
+    }
+
+    for (const entry of entries) {
+      const entryPath = plugins.path.join(pathArg, entry.name);
+      if (entry.isDirectory()) {
+        total += await this.getDirectorySize(entryPath);
+      } else if (entry.isFile()) {
+        try {
+          total += (await plugins.fsPromises.stat(entryPath)).size;
+        } catch {
+          // Ignore files that disappear while cleanup is inspecting the tree.
+        }
+      }
+    }
+
+    return total;
+  }
+
+  private formatBytes(bytesArg: number): string {
+    const units = ['B', 'KiB', 'MiB', 'GiB', 'TiB'];
+    let value = bytesArg;
+    let unitIndex = 0;
+    while (value >= 1024 && unitIndex < units.length - 1) {
+      value = value / 1024;
+      unitIndex++;
+    }
+    const decimals = unitIndex === 0 || value >= 100 ? 0 : value >= 10 ? 1 : 2;
+    return `${value.toFixed(decimals)} ${units[unitIndex]}`;
+  }
+
+  private async cleanupTempWorkspace(reasonArg: string, tempDir = this.getTempDir()): Promise<void> {
+    this.assertManagedTempDir(tempDir);
+    const marker = await this.readTempMarker(tempDir);
+    if (!marker) {
+      return;
     }
+    const reclaimedBytes = await this.getDirectorySize(tempDir);
+    await plugins.fsPromises.rm(tempDir, { recursive: true, force: true });
+    console.log(`Cleaned tsbundle temp workspace after ${reasonArg}, reclaimed ${this.formatBytes(reclaimedBytes)}`);
   }
 
   /**
@@ -207,8 +410,8 @@ export class CustomBundleHandler {
 /**
  * Run the custom bundle command
  */
-export async function runCustomBundles(): Promise<void> {
-  const handler = new CustomBundleHandler();
+export async function runCustomBundles(cliOptionsArg: interfaces.ICustomBundleCliOptions = {}): Promise<void> {
+  const handler = new CustomBundleHandler(paths.cwd, cliOptionsArg);
   const hasConfig = await handler.loadConfig();
 
   if (!hasConfig) {

package/ts/mod_html/index.ts

@@ -43,11 +43,12 @@ export class HtmlHandler {
       .encoding('utf8')
       .read()) as string;
     if (options.minify) {
-      fileString = plugins.htmlMinifier.minify(fileString, {
+      fileString = await plugins.htmlMinifier.minify(fileString, {
         minifyCSS: true,
         minifyJS: true,
         sortAttributes: true,
-        sortClassName: true,
+        sortClassNames: true,
+        includeAutoGeneratedTags: true,
         removeAttributeQuotes: true,
         collapseWhitespace: true,
         collapseInlineTagWhitespace: true,

package/ts/mod_html/plugins.ts

@@ -1,5 +1,5 @@
 export * from '../plugins.js';
 
-import * as htmlMinifier from 'html-minifier';
+import * as htmlMinifier from 'html-minifier-next';
 
 export { htmlMinifier };

package/ts/plugins.ts

@@ -1,7 +1,10 @@
 // node native
 import * as path from 'path';
+import * as fsSync from 'node:fs';
+import * as fsPromises from 'node:fs/promises';
+import * as os from 'node:os';
 
-export { path };
+export { fsPromises, fsSync, os, path };
 
 // pushrocks scope
 import * as smartconfig from '@push.rocks/smartconfig';

package/ts/tsbundle.class.tsbundle.ts

@@ -21,6 +21,15 @@ export class TsBundle {
           return './mod_esbuild/index.child.js';
       }
     };
+    const moduleDir = plugins.smartpath.get.dirnameFromImportMetaUrl(import.meta.url);
+    const childRelativePath = getBundlerPath();
+    let childPath = plugins.path.join(moduleDir, childRelativePath);
+    if (!plugins.fsSync.existsSync(childPath)) {
+      const distChildPath = plugins.path.join(moduleDir, '..', 'dist_ts', childRelativePath);
+      if (plugins.fsSync.existsSync(distChildPath)) {
+        childPath = distChildPath;
+      }
+    }
     const transportOptions: interfaces.IEnvTransportOptions = {
       cwd: cwdArg,
       from: fromArg,
@@ -31,10 +40,7 @@ export class TsBundle {
       },
     };
     const threadsimple = new plugins.smartspawn.ThreadSimple(
-      plugins.path.join(
-        plugins.smartpath.get.dirnameFromImportMetaUrl(import.meta.url),
-        getBundlerPath(),
-      ),
+      childPath,
       [],
       {
         env: {

package/ts/tsbundle.cli.ts

@@ -7,12 +7,12 @@ export const runCli = async () => {
 
   // Default command: run custom bundles from .smartconfig.json
   tsBundleCli.standardCommand().subscribe(async (argvArg) => {
-    await runCustomBundles();
+    await runCustomBundles(argvArg);
   });
 
   // Explicit custom command (same as default)
   tsBundleCli.addCommand('custom').subscribe(async (argvArg) => {
-    await runCustomBundles();
+    await runCustomBundles(argvArg);
   });
 
   // Interactive init wizard