fix(deps): pin smartexit to ^2.0.1 and smartshell to ^3.3.4 for PID tracking

The direct bash child may already be dead from terminal SIGINT while
grandchildren (tsrun, devserver) are still running. Removing the .killed
guard ensures tree-kill always runs to clean up the entire process tree.

changelog.md

@@ -1,5 +1,21 @@
 # Changelog
 
+## 2026-03-03 - 3.2.1 - fix(watcher)
+ensure child processes are killed and awaited during shutdown; improve cleanup handlers; bump smartshell dependency to ^3.3.2
+
+- Await child process kill() calls in restart and stop to avoid race conditions and ensure proper termination.
+- Add last-resort synchronous SIGKILL in process 'exit' handler to terminate orphaned child processes.
+- Make SIGINT and timeout handlers async and await stop() to perform a clean shutdown before exiting.
+- Bump @push.rocks/smartshell from ^3.3.0 to ^3.3.2 in package.json.
+
+## 2026-02-24 - 3.2.0 - feat(bundle)
+add configurable bundle output modes and bundler options (support base64ts, production builds, includeFiles, maxLineLength) and route non-default outputs to a CustomBundleHandler
+
+- Added new ITswatchConfig fields: outputMode, bundler, production, includeFiles, maxLineLength
+- tswatch now creates a CustomBundleHandler and uses it when outputMode is not 'bundle' (e.g. base64ts)
+- Default bundling path now reads bundler and production from bundleConfig (defaults to 'esbuild' and false)
+- Bumped dependency @git.zone/tsbundle to ^2.9.0
+
 ## 2026-02-05 - 3.1.0 - feat(dev-server)
 add no-cache headers to built-in development server; update docs and bump dependencies
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@git.zone/tswatch",
-  "version": "3.1.0",
+  "version": "3.2.4",
   "private": false,
   "description": "A development tool for automatically watching and re-compiling TypeScript projects upon detecting file changes, enhancing developer workflows.",
   "exports": {
@@ -24,18 +24,19 @@
   },
   "dependencies": {
     "@api.global/typedserver": "^8.3.0",
-    "@git.zone/tsbundle": "^2.8.3",
+    "@git.zone/tsbundle": "^2.9.0",
     "@git.zone/tsrun": "^2.0.1",
     "@push.rocks/early": "^4.0.4",
     "@push.rocks/lik": "^6.2.2",
     "@push.rocks/npmextra": "^5.3.3",
     "@push.rocks/smartcli": "^4.0.20",
     "@push.rocks/smartdelay": "^3.0.5",
+    "@push.rocks/smartexit": "^2.0.1",
     "@push.rocks/smartfs": "^1.3.1",
     "@push.rocks/smartinteract": "^2.0.16",
     "@push.rocks/smartlog": "^3.1.10",
     "@push.rocks/smartlog-destination-local": "^9.0.2",
-    "@push.rocks/smartshell": "^3.3.0",
+    "@push.rocks/smartshell": "^3.3.4",
     "@push.rocks/smartwatch": "^6.3.0",
     "@push.rocks/taskbuffer": "^4.2.0"
   },

ts/00_commitinfo_data.ts

@@ -3,6 +3,6 @@
  */
 export const commitinfo = {
   name: '@git.zone/tswatch',
-  version: '3.1.0',
+  version: '3.2.1',
   description: 'A development tool for automatically watching and re-compiling TypeScript projects upon detecting file changes, enhancing developer workflows.'
 }

ts/interfaces/interfaces.config.ts

@@ -44,6 +44,16 @@ export interface IBundleConfig {
   watchPatterns?: string[];
   /** If true, trigger server reload after bundling (default: true) */
   triggerReload?: boolean;
+  /** Output mode: 'bundle' writes JS, 'base64ts' writes base64-encoded TS (default: 'bundle') */
+  outputMode?: 'bundle' | 'base64ts';
+  /** Bundler to use (default: 'esbuild') */
+  bundler?: 'esbuild' | 'rolldown' | 'rspack';
+  /** Whether to produce a production build (default: false) */
+  production?: boolean;
+  /** Files to include alongside the bundle */
+  includeFiles?: (string | { from: string; to: string })[];
+  /** Max chars per line for base64ts output. 0 or undefined = unlimited */
+  maxLineLength?: number;
 }
 
 /**

ts/tswatch.classes.tswatch.ts

@@ -18,6 +18,7 @@ export class TsWatch {
   public typedserver: plugins.typedserver.TypedServer | null = null;
 
   private tsbundle = new plugins.tsbundle.TsBundle();
+  private customBundleHandler = new plugins.tsbundle.CustomBundleHandler();
   private htmlHandler = new plugins.tsbundle.HtmlHandler();
   private assetsHandler = new plugins.tsbundle.AssetsHandler();
 
@@ -45,6 +46,14 @@ export class TsWatch {
   public async start() {
     logger.log('info', 'Starting tswatch with config-driven mode');
 
+    // Install global process lifecycle handlers (SIGINT, SIGTERM, etc.)
+    // This is the single authority for signal handling — no per-watcher handlers.
+    plugins.smartexit.ProcessLifecycle.install();
+    const exitInstance = new plugins.smartexit.SmartExit({ silent: true });
+    exitInstance.addCleanupFunction(async () => {
+      await this.stop();
+    });
+
     // Start server if configured
     if (this.config.server?.enabled) {
       await this.startServer();
@@ -128,10 +137,22 @@ export class TsWatch {
         } else if (fromPath.endsWith('/') || !fromPath.includes('.')) {
           // Assets directory copy
           await this.assetsHandler.processAssets();
+        } else if (bundleConfig.outputMode && bundleConfig.outputMode !== 'bundle') {
+          // Non-default outputMode (e.g. base64ts) — use CustomBundleHandler
+          await this.customBundleHandler.processSingleBundle({
+            from: bundleConfig.from,
+            to: bundleConfig.to,
+            outputMode: bundleConfig.outputMode,
+            bundler: bundleConfig.bundler || 'esbuild',
+            production: bundleConfig.production || false,
+            includeFiles: bundleConfig.includeFiles,
+            maxLineLength: bundleConfig.maxLineLength,
+          });
         } else {
-          // TypeScript bundling
+          // Standard TypeScript bundling (default)
           await this.tsbundle.build(paths.cwd, fromPath, toPath, {
-            bundler: 'esbuild',
+            bundler: bundleConfig.bundler || 'esbuild',
+            production: bundleConfig.production || false,
           });
         }
 

ts/tswatch.classes.watcher.ts

@@ -154,7 +154,7 @@ export class Watcher {
     if (this.options.commandToExecute) {
       if (this.currentExecution && this.options.restart) {
         logger.log('ok', `[${name}] restarting: ${this.options.commandToExecute}`);
-        this.currentExecution.kill();
+        await this.currentExecution.kill();
       } else if (!this.currentExecution) {
         logger.log('ok', `[${name}] executing: ${this.options.commandToExecute}`);
       }
@@ -181,27 +181,14 @@ export class Watcher {
   }
 
   /**
-   * this method sets up a clean exit strategy
+   * Sets up timeout-based cleanup if configured.
+   * Signal handling (SIGINT/SIGTERM) is managed globally by ProcessLifecycle in TsWatch.
    */
   private async setupCleanup() {
-    process.on('exit', () => {
-      console.log('');
-      console.log('now exiting!');
-      this.stop();
-      process.exit(0);
-    });
-    process.on('SIGINT', () => {
-      console.log('');
-      console.log('ok! got SIGINT We are exiting! Just cleaning up to exit neatly :)');
-      this.stop();
-      process.exit(0);
-    });
-
-    // handle timeout
     if (this.options.timeout) {
-      plugins.smartdelay.delayFor(this.options.timeout).then(() => {
-        console.log(`timed out afer ${this.options.timeout} milliseconds! exiting!`);
-        this.stop();
+      plugins.smartdelay.delayFor(this.options.timeout).then(async () => {
+        console.log(`timed out after ${this.options.timeout} milliseconds! exiting!`);
+        await this.stop();
         process.exit(0);
       });
     }
@@ -215,8 +202,10 @@ export class Watcher {
       clearTimeout(this.debounceTimer);
     }
     await this.smartwatchInstance.stop();
-    if (this.currentExecution && !this.currentExecution.childProcess.killed) {
-      this.currentExecution.kill();
+    if (this.currentExecution) {
+      // Always tree-kill — even if the direct child is dead (.killed === true),
+      // grandchildren (e.g. tsrun, devserver) may still be running.
+      await this.currentExecution.kill();
     }
   }
 }

ts/tswatch.plugins.ts

@@ -16,6 +16,7 @@ import * as lik from '@push.rocks/lik';
 import * as npmextra from '@push.rocks/npmextra';
 import * as smartcli from '@push.rocks/smartcli';
 import * as smartdelay from '@push.rocks/smartdelay';
+import * as smartexit from '@push.rocks/smartexit';
 import * as smartfs from '@push.rocks/smartfs';
 import * as smartinteract from '@push.rocks/smartinteract';
 import * as smartlog from '@push.rocks/smartlog';
@@ -29,6 +30,7 @@ export {
   npmextra,
   smartcli,
   smartdelay,
+  smartexit,
   smartfs,
   smartinteract,
   smartlog,