@effect-app/cli 1.23.4 → 1.23.5

package/CHANGELOG.md

@@ -1,5 +1,12 @@
 # @effect-app/cli
 
+## 1.23.5
+
+### Patch Changes
+
+- de35a0f: add monitors for packagejson
+- 8e1543e: add wrapping of child commands
+
 ## 1.23.4
 
 ### Patch Changes

package/dist/index.js

@@ -4,7 +4,7 @@
 import { Args, Command, Options, Prompt } from "@effect/cli";
 import { Command as NodeCommand, FileSystem, Path } from "@effect/platform";
 import { NodeContext, NodeRuntime } from "@effect/platform-node";
-import { Effect, identity, Stream } from "effect";
+import { Effect, identity, Option, Stream } from "effect";
 import { ExtractExportMappingsService } from "./extract.js";
 import { packages } from "./shared.js";
 Effect
@@ -86,7 +86,7 @@ Effect
      * @returns An Effect that succeeds when linking is complete
      */
     const linkPackages = Effect.fnUntraced(function* (effectAppLibsPath) {
-        yield* Effect.log("Linking local effect-app packages...");
+        yield* Effect.logInfo("Linking local effect-app packages...");
         const packageJsonPath = "./package.json";
         const packageJsonContent = yield* fs.readFileString(packageJsonPath);
         const pj = JSON.parse(packageJsonContent);
@@ -101,9 +101,9 @@ Effect
         };
         pj.resolutions = resolutions;
         yield* fs.writeFileString(packageJsonPath, JSON.stringify(pj, null, 2));
-        yield* Effect.log("Updated package.json with local file resolutions");
+        yield* Effect.logInfo("Updated package.json with local file resolutions");
         yield* runNodeCommand("pnpm i");
-        yield* Effect.log("Successfully linked local packages");
+        yield* Effect.logInfo("Successfully linked local packages");
     });
     /**
      * Unlinks local effect-app packages by removing file resolutions from package.json.
@@ -113,7 +113,7 @@ Effect
      * @returns An Effect that succeeds when unlinking is complete
      */
     const unlinkPackages = Effect.fnUntraced(function* () {
-        yield* Effect.log("Unlinking local effect-app packages...");
+        yield* Effect.logInfo("Unlinking local effect-app packages...");
         const packageJsonPath = "./package.json";
         const packageJsonContent = yield* fs.readFileString(packageJsonPath);
         const pj = JSON.parse(packageJsonContent);
@@ -125,9 +125,9 @@ Effect
         }, {});
         pj.resolutions = filteredResolutions;
         yield* fs.writeFileString(packageJsonPath, JSON.stringify(pj, null, 2));
-        yield* Effect.log("Removed effect-app file resolutions from package.json");
+        yield* Effect.logInfo("Removed effect-app file resolutions from package.json");
         yield* runNodeCommand("pnpm i");
-        yield* Effect.log("Successfully unlinked local packages");
+        yield* Effect.logInfo("Successfully unlinked local packages");
     })();
     /**
      * Monitors controller files for changes and runs eslint on related controllers.ts/routes.ts files.
@@ -137,12 +137,9 @@ Effect
      * @param debug - Whether to enable debug logging
      * @returns An Effect that sets up controller file monitoring
      */
-    const monitorChildIndexes = Effect.fn("effa-cli.index-multi.monitorChildIndexes")(function* (watchPath, debug) {
-        const fileSystem = yield* FileSystem.FileSystem;
-        if (debug) {
-            yield* Effect.logInfo(`Starting controller monitoring for: ${watchPath}`);
-        }
-        const watchStream = fileSystem.watch(watchPath, { recursive: true });
+    const monitorChildIndexes = Effect.fn("effa-cli.index-multi.monitorChildIndexes")(function* (watchPath) {
+        yield* Effect.logInfo(`Starting controller monitoring for: ${watchPath}`);
+        const watchStream = fs.watch(watchPath, { recursive: true });
         yield* watchStream
             .pipe(Stream.runForEach(Effect.fn("effa-cli.monitorChildIndexes.handleEvent")(function* (event) {
             const pathParts = event.path.split("/");
@@ -157,14 +154,12 @@ Effect
                     .map((f) => [...pathParts.slice(0, pathParts.length - i), f].join("/"));
                 const existingFiles = [];
                 for (const file of candidateFiles) {
-                    const exists = yield* fileSystem.exists(file);
+                    const exists = yield* fs.exists(file);
                     if (exists)
                         existingFiles.push(file);
                 }
                 if (existingFiles.length > 0) {
-                    if (debug) {
-                        yield* Effect.logInfo(`Controller change detected: ${event.path}, fixing files: ${existingFiles.join(", ")}`);
-                    }
+                    yield* Effect.logInfo(`Controller change detected: ${event.path}, fixing files: ${existingFiles.join(", ")}`);
                     const eslintArgs = existingFiles.map((f) => `"../${f}"`).join(" ");
                     yield* runNodeCommand(`cd api && pnpm eslint --fix ${eslintArgs}`);
                     break;
@@ -183,19 +178,14 @@ Effect
      * @param debug - Whether to enable debug logging
      * @returns An Effect that sets up root index monitoring
      */
-    const monitorRootIndexes = Effect.fn("effa-cli.index-multi.monitorRootIndexes")(function* (watchPath, indexFile, debug) {
-        const fileSystem = yield* FileSystem.FileSystem;
-        if (debug) {
-            yield* Effect.logInfo(`Starting root index monitoring for: ${watchPath} -> ${indexFile}`);
-        }
-        const watchStream = fileSystem.watch(watchPath);
+    const monitorRootIndexes = Effect.fn("effa-cli.index-multi.monitorRootIndexes")(function* (watchPath, indexFile) {
+        yield* Effect.logInfo(`Starting root index monitoring for: ${watchPath} -> ${indexFile}`);
+        const watchStream = fs.watch(watchPath);
         yield* watchStream
             .pipe(Stream.runForEach(Effect.fn("effa-cli.index-multi.monitorRootIndexes.handleEvent")(function* (event) {
             if (event.path.endsWith(indexFile))
                 return;
-            if (debug) {
-                yield* Effect.logInfo(`Root change detected: ${event.path}, fixing: ${indexFile}`);
-            }
+            yield* Effect.logInfo(`Root change detected: ${event.path}, fixing: ${indexFile}`);
             yield* runNodeCommand(`pnpm eslint --fix "${indexFile}"`);
         })))
             .pipe(Effect.andThen(Effect.addFinalizer(() => Effect.logInfo(`Stopped monitoring root indexes in: ${watchPath} -> ${indexFile}`))), Effect.forkScoped);
@@ -208,22 +198,17 @@ Effect
      * @param debug - Whether to enable debug logging
      * @returns An Effect that sets up all index monitoring for the path
      */
-    const monitorIndexes = Effect.fn("effa-cli.index-multi.monitorIndexes")(function* (watchPath, debug) {
-        const fileSystem = yield* FileSystem.FileSystem;
-        if (debug) {
-            yield* Effect.logInfo(`Setting up index monitoring for path: ${watchPath}`);
-        }
+    const monitorIndexes = Effect.fn("effa-cli.index-multi.monitorIndexes")(function* (watchPath) {
+        yield* Effect.logInfo(`Setting up index monitoring for path: ${watchPath}`);
         const indexFile = watchPath + "/index.ts";
-        const monitors = [monitorChildIndexes(watchPath, debug)];
-        if (yield* fileSystem.exists(indexFile)) {
-            monitors.push(monitorRootIndexes(watchPath, indexFile, debug));
+        const monitors = [monitorChildIndexes(watchPath)];
+        if (yield* fs.exists(indexFile)) {
+            monitors.push(monitorRootIndexes(watchPath, indexFile));
         }
         else {
             yield* Effect.logInfo(`Index file ${indexFile} does not exist`);
         }
-        if (debug) {
-            yield* Effect.logInfo(`Starting ${monitors.length} monitor(s) for ${watchPath}`);
-        }
+        yield* Effect.logInfo(`Starting ${monitors.length} monitor(s) for ${watchPath}`);
         yield* Effect.all(monitors, { concurrency: monitors.length });
     });
     /**
@@ -232,19 +217,16 @@ Effect
      *
      * @returns An Effect that sets up file watching streams
      */
-    const watcher = Effect.fn("watch")(function* (debug) {
-        yield* Effect.log("Watch API resources and models for changes");
+    const watcher = Effect.fn("watch")(function* () {
+        yield* Effect.logInfo("Watch API resources and models for changes");
         const dirs = ["../api/src/resources", "../api/src/models"];
         const viteConfigFile = "./vite.config.ts";
-        const fileSystem = yield* FileSystem.FileSystem;
-        const viteConfigExists = yield* fileSystem.exists(viteConfigFile);
-        if (debug) {
-            yield* Effect.logInfo("watcher debug mode is enabled");
-        }
+        const viteConfigExists = yield* fs.exists(viteConfigFile);
+        yield* Effect.logInfo("watcher debug mode is enabled");
         // validate directories and filter out non-existing ones
         const existingDirs = [];
         for (const dir of dirs) {
-            const dirExists = yield* fileSystem.exists(dir);
+            const dirExists = yield* fs.exists(dir);
             if (dirExists) {
                 existingDirs.push(dir);
             }
@@ -252,40 +234,29 @@ Effect
                 yield* Effect.logWarning(`Directory ${dir} does not exist - skipping`);
             }
         }
-        if (existingDirs.length === 0) {
-            return yield* Effect.logWarning("No directories to watch - exiting");
-        }
         // start watching all existing directories concurrently
         const watchStreams = existingDirs.map((dir) => Effect.gen(function* () {
-            if (debug) {
-                yield* Effect.logInfo(`Starting to watch directory: ${dir}`);
-            }
+            yield* Effect.logInfo(`Starting to watch directory: ${dir}`);
             const files = [];
-            const watchStream = fileSystem.watch(dir, { recursive: true });
+            const watchStream = fs.watch(dir, { recursive: true });
             yield* watchStream
                 .pipe(Stream.runForEach(Effect.fn("effa-cli.watch.handleEvent")(function* (event) {
-                if (debug) {
-                    yield* Effect.logInfo(`File ${event._tag.toLowerCase()}: ${event.path}`);
-                }
+                yield* Effect.logInfo(`File ${event._tag.toLowerCase()}: ${event.path}`);
                 // touch tsconfig.json on any file change
                 yield* touch("./tsconfig.json");
-                if (debug) {
-                    yield* Effect.logInfo("Updated tsconfig.json");
-                }
+                yield* Effect.logInfo("Updated tsconfig.json");
                 // touch vite config only on file updates (not creates/deletes)
                 if (viteConfigExists
                     && event._tag === "Update"
                     && !files.includes(event.path)) {
                     yield* touch(viteConfigFile);
-                    if (debug) {
-                        yield* Effect.logInfo("Updated vite.config.ts");
-                    }
+                    yield* Effect.logInfo("Updated vite.config.ts");
                     files.push(event.path);
                 }
             })))
                 .pipe(Effect.andThen(Effect.addFinalizer(() => Effect.logInfo(`Stopped watching directory: ${dir}`))), Effect.forkScoped);
             // also start monitoring indexes in the watched directory
-            yield* monitorIndexes(dir, debug);
+            yield* monitorIndexes(dir);
         }));
         // run all watch streams concurrently
         yield* Effect.all(watchStreams, { concurrency: existingDirs.length });
@@ -301,11 +272,11 @@ Effect
      * @returns An Effect that succeeds when the package.json is updated
      */
     const packagejsonUpdater = Effect.fn("effa-cli.packagejsonUpdater")(function* (startDir, p, levels = 0) {
-        yield* Effect.log(`Generating exports for ${p}`);
+        yield* Effect.logInfo(`Generating exports for ${p}`);
         const exportMappings = yield* extractExportMappings(path.resolve(startDir, p));
         // if exportMappings is empty skip export generation
         if (exportMappings === "") {
-            yield* Effect.log(`No src directory found for ${p}, skipping export generation`);
+            yield* Effect.logInfo(`No src directory found for ${p}, skipping export generation`);
             return;
         }
         const sortedExportEntries = JSON.parse(`{ ${exportMappings} }`);
@@ -336,12 +307,66 @@ Effect
         };
         const pkgJson = JSON.parse(yield* fs.readFileString(p + "/package.json", "utf-8"));
         pkgJson.exports = packageExports;
-        yield* Effect.log(`Writing updated package.json for ${p}`);
+        yield* Effect.logInfo(`Writing updated package.json for ${p}`);
         return yield* fs.writeFileString(p + "/package.json", JSON.stringify(pkgJson, null, 2));
     });
+    /**
+     * Monitors a directory for TypeScript file changes and automatically updates package.json exports.
+     * Generates initial package.json exports, then watches the src directory for changes to regenerate exports.
+     *
+     * @param watchPath - The directory path containing the package.json and src to monitor
+     * @param levels - Optional depth limit for export filtering (0 = no limit)
+     * @returns An Effect that sets up package.json monitoring
+     */
+    const monitorPackageJson = Effect.fn("effa-cli.monitorPackageJson")(function* (startDir, watchPath, levels = 0) {
+        yield* packagejsonUpdater(startDir, watchPath, levels);
+        const srcPath = watchPath === "." ? "./src" : `${watchPath}/src`;
+        if (!(yield* fs.exists(srcPath))) {
+            yield* Effect.logWarning(`Source directory ${srcPath} does not exist - skipping monitoring`);
+            return;
+        }
+        const watchStream = fs.watch(srcPath, { recursive: true });
+        yield* watchStream.pipe(Stream.runForEach(Effect.fn("effa-cli.monitorPackageJson.handleEvent")(function* (_) {
+            yield* packagejsonUpdater(startDir, watchPath, levels);
+        })), Effect.andThen(Effect.addFinalizer(() => Effect.logInfo(`Stopped monitoring package.json for: ${watchPath}`))), Effect.forkScoped);
+    });
     /*
      * CLI
      */
+    const WrapAsOption = Options.text("wrap").pipe(Options.withAlias("w"), Options.optional, Options.withDescription("Wrap child bash command: the lifetime of the CLI command will be tied to the child process"));
+    // has prio over WrapAsOption
+    const WrapAsArg = Args
+        .text({
+        name: "wrap"
+    })
+        .pipe(Args.atLeast(1), Args.optional, Args.withDescription("Wrap child bash command: the lifetime of the CLI command will be tied to the child process"));
+    /**
+     * Creates a command that automatically includes wrap functionality for executing child bash commands.
+     * Combines both option-based (--wrap) and argument-based wrap parameters, giving priority to arguments.
+     * If a wrap command is provided, it will be executed **after** the main command handler.
+     *
+     * @param name - The command name
+     * @param config - The command configuration (options, args, etc.)
+     * @param handler - The main command handler function
+     * @param completionMessage - Optional message to log when the command completes
+     * @returns A Command with integrated wrap functionality
+     */
+    const makeCommandWithWrap = (name, config, handler, completionMessage) => Command.make(name, { ...config, wo: WrapAsOption, wa: WrapAsArg }, Effect.fn("effa-cli.withWrapHandler")(function* (_) {
+        const { wa, wo, ...cfg } = _;
+        if (completionMessage) {
+            yield* Effect.addFinalizer(() => Effect.logInfo(completionMessage));
+        }
+        const wrapOption = Option.orElse(wa, () => wo);
+        yield* handler(cfg);
+        if (Option.isSome(wrapOption)) {
+            const val = Array.isArray(wrapOption.value)
+                ? wrapOption.value.join(" ")
+                : wrapOption.value;
+            yield* Effect.logInfo(`Spawning child command: ${val}`);
+            yield* runNodeCommand(val);
+        }
+        return;
+    }, (_) => Effect.scoped(_)));
     const EffectAppLibsPath = Args
         .directory({
         exists: "yes",
@@ -360,7 +385,7 @@ Effect
         .pipe(Command.withDescription("Remove effect-app file resolutions and restore npm registry packages"));
     const ue = Command
         .make("ue", {}, Effect.fn("effa-cli.ue")(function* ({}) {
-        yield* Effect.log("Update effect-app and/or effect packages");
+        yield* Effect.logInfo("Update effect-app and/or effect packages");
         const prompted = yield* Prompt.select({
             choices: [
                 {
@@ -391,20 +416,16 @@ Effect
         }
     }))
         .pipe(Command.withDescription("Update effect-app and/or effect packages"));
-    const DebugOption = Options.boolean("debug").pipe(Options.withAlias("d"), Options.withDescription("Enable debug logging"));
-    const watch = Command
-        .make("watch", { debug: DebugOption }, Effect.fn("effa-cli.watch")(function* ({ debug }) {
-        return yield* watcher(debug);
-    }))
+    const watch = makeCommandWithWrap("watch", {}, Effect.fn("effa-cli.watch")(function* ({}) {
+        return yield* watcher();
+    }), "Stopped watching API resources and models")
         .pipe(Command.withDescription("Watch API resources and models for changes and update tsconfig.json and vite.config.ts accordingly"));
-    const indexMulti = Command
-        .make("index-multi", { debug: DebugOption }, Effect.fn("effa-cli.index-multi")(function* ({ debug }) {
-        yield* Effect.log("Starting multi-index monitoring");
+    const indexMulti = makeCommandWithWrap("index-multi", {}, Effect.fn("effa-cli.index-multi")(function* ({}) {
+        yield* Effect.logInfo("Starting multi-index monitoring");
         const dirs = ["./api/src"];
-        const fileSystem = yield* FileSystem.FileSystem;
         const existingDirs = [];
         for (const dir of dirs) {
-            const dirExists = yield* fileSystem.exists(dir);
+            const dirExists = yield* fs.exists(dir);
             if (dirExists) {
                 existingDirs.push(dir);
             }
@@ -412,22 +433,17 @@ Effect
                 yield* Effect.logWarning(`Directory ${dir} does not exist - skipping`);
             }
         }
-        if (existingDirs.length === 0) {
-            return yield* Effect.logWarning("No directories to monitor - exiting");
-        }
-        const monitors = existingDirs.map((dir) => monitorIndexes(dir, debug));
+        const monitors = existingDirs.map((dir) => monitorIndexes(dir));
         yield* Effect.all(monitors, { concurrency: monitors.length });
-    }))
+    }), "Stopped multi-index monitoring")
         .pipe(Command.withDescription("Monitor multiple directories for index and controller file changes"));
-    const packagejson = Command
-        .make("packagejson", {}, Effect.fn("effa-cli.packagejson")(function* ({}) {
+    const packagejson = makeCommandWithWrap("packagejson", {}, Effect.fn("effa-cli.packagejson")(function* ({}) {
         // https://nodejs.org/api/path.html#pathresolvepaths
         const startDir = path.resolve();
-        return yield* packagejsonUpdater(startDir, ".");
-    }))
+        return yield* monitorPackageJson(startDir, ".");
+    }), "Stopped monitoring root package.json exports")
         .pipe(Command.withDescription("Generate and update root-level package.json exports mappings for TypeScript modules"));
-    const packagejsonPackages = Command
-        .make("packagejson-packages", {}, Effect.fn("effa-cli.packagejson-packages")(function* ({}) {
+    const packagejsonPackages = makeCommandWithWrap("packagejson-packages", {}, Effect.fn("effa-cli.packagejson-packages")(function* ({}) {
         // https://nodejs.org/api/path.html#pathresolvepaths
         const startDir = path.resolve();
         const packagesDir = path.join(startDir, "packages");
@@ -450,18 +466,15 @@ Effect
                 validPackages.push(packagePath);
             }
         }
-        if (validPackages.length === 0) {
-            return yield* Effect.logWarning("No valid packages found to update");
-        }
-        yield* Effect.log(`Found ${validPackages.length} packages to update`);
+        yield* Effect.logInfo(`Found ${validPackages.length} packages to update`);
         // update each package sequentially
-        yield* Effect.all(validPackages.map((packagePath) => Effect.gen(function* () {
+        yield* Effect.all(validPackages.map(Effect.fnUntraced(function* (packagePath) {
             const relativePackagePath = path.relative(startDir, packagePath);
-            yield* Effect.log(`Updating ${relativePackagePath}`);
-            return yield* packagejsonUpdater(startDir, relativePackagePath);
+            yield* Effect.logInfo(`Updating ${relativePackagePath}`);
+            return yield* monitorPackageJson(startDir, relativePackagePath);
         })));
-        yield* Effect.log("All packages updated successfully");
-    }))
+        yield* Effect.logInfo("All packages updated successfully");
+    }), "Stopped monitoring package.json exports for all packages")
         .pipe(Command.withDescription("Generate and update package.json exports mappings for all packages in monorepo"));
     // configure CLI
     const cli = Command.run(Command
@@ -481,4 +494,4 @@ Effect
     return yield* cli(process.argv);
 })()
     .pipe(Effect.scoped, Effect.provide(NodeContext.layer), NodeRuntime.runMain);
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@effect-app/cli",
-  "version": "1.23.4",
+  "version": "1.23.5",
   "license": "MIT",
   "type": "module",
   "bin": {

package/src/index.ts

@@ -4,7 +4,10 @@
 import { Args, Command, Options, Prompt } from "@effect/cli"
 import { Command as NodeCommand, FileSystem, Path } from "@effect/platform"
 import { NodeContext, NodeRuntime } from "@effect/platform-node"
-import { Effect, identity, Stream } from "effect"
+
+import { type CommandExecutor } from "@effect/platform/CommandExecutor"
+import { type PlatformError } from "@effect/platform/Error"
+import { Effect, identity, Option, Stream, type Types } from "effect"
 import { ExtractExportMappingsService } from "./extract.js"
 import { packages } from "./shared.js"
 
@@ -104,7 +107,7 @@ Effect
      * @returns An Effect that succeeds when linking is complete
      */
     const linkPackages = Effect.fnUntraced(function*(effectAppLibsPath: string) {
-      yield* Effect.log("Linking local effect-app packages...")
+      yield* Effect.logInfo("Linking local effect-app packages...")
 
       const packageJsonPath = "./package.json"
       const packageJsonContent = yield* fs.readFileString(packageJsonPath)
@@ -123,11 +126,11 @@ Effect
       pj.resolutions = resolutions
 
       yield* fs.writeFileString(packageJsonPath, JSON.stringify(pj, null, 2))
-      yield* Effect.log("Updated package.json with local file resolutions")
+      yield* Effect.logInfo("Updated package.json with local file resolutions")
 
       yield* runNodeCommand("pnpm i")
 
-      yield* Effect.log("Successfully linked local packages")
+      yield* Effect.logInfo("Successfully linked local packages")
     })
 
     /**
@@ -138,7 +141,7 @@ Effect
      * @returns An Effect that succeeds when unlinking is complete
      */
     const unlinkPackages = Effect.fnUntraced(function*() {
-      yield* Effect.log("Unlinking local effect-app packages...")
+      yield* Effect.logInfo("Unlinking local effect-app packages...")
 
       const packageJsonPath = "./package.json"
       const packageJsonContent = yield* fs.readFileString(packageJsonPath)
@@ -156,10 +159,10 @@ Effect
       pj.resolutions = filteredResolutions
 
       yield* fs.writeFileString(packageJsonPath, JSON.stringify(pj, null, 2))
-      yield* Effect.log("Removed effect-app file resolutions from package.json")
+      yield* Effect.logInfo("Removed effect-app file resolutions from package.json")
 
       yield* runNodeCommand("pnpm i")
-      yield* Effect.log("Successfully unlinked local packages")
+      yield* Effect.logInfo("Successfully unlinked local packages")
     })()
 
     /**
@@ -171,14 +174,10 @@ Effect
      * @returns An Effect that sets up controller file monitoring
      */
     const monitorChildIndexes = Effect.fn("effa-cli.index-multi.monitorChildIndexes")(
-      function*(watchPath: string, debug: boolean) {
-        const fileSystem = yield* FileSystem.FileSystem
-
-        if (debug) {
-          yield* Effect.logInfo(`Starting controller monitoring for: ${watchPath}`)
-        }
+      function*(watchPath: string) {
+        yield* Effect.logInfo(`Starting controller monitoring for: ${watchPath}`)
 
-        const watchStream = fileSystem.watch(watchPath, { recursive: true })
+        const watchStream = fs.watch(watchPath, { recursive: true })
 
         yield* watchStream
           .pipe(
@@ -199,16 +198,14 @@ Effect
 
                   const existingFiles: string[] = []
                   for (const file of candidateFiles) {
-                    const exists = yield* fileSystem.exists(file)
+                    const exists = yield* fs.exists(file)
                     if (exists) existingFiles.push(file)
                   }
 
                   if (existingFiles.length > 0) {
-                    if (debug) {
-                      yield* Effect.logInfo(
-                        `Controller change detected: ${event.path}, fixing files: ${existingFiles.join(", ")}`
-                      )
-                    }
+                    yield* Effect.logInfo(
+                      `Controller change detected: ${event.path}, fixing files: ${existingFiles.join(", ")}`
+                    )
 
                     const eslintArgs = existingFiles.map((f) => `"../${f}"`).join(" ")
                     yield* runNodeCommand(`cd api && pnpm eslint --fix ${eslintArgs}`)
@@ -238,14 +235,10 @@ Effect
      * @returns An Effect that sets up root index monitoring
      */
     const monitorRootIndexes = Effect.fn("effa-cli.index-multi.monitorRootIndexes")(
-      function*(watchPath: string, indexFile: string, debug: boolean) {
-        const fileSystem = yield* FileSystem.FileSystem
+      function*(watchPath: string, indexFile: string) {
+        yield* Effect.logInfo(`Starting root index monitoring for: ${watchPath} -> ${indexFile}`)
 
-        if (debug) {
-          yield* Effect.logInfo(`Starting root index monitoring for: ${watchPath} -> ${indexFile}`)
-        }
-
-        const watchStream = fileSystem.watch(watchPath)
+        const watchStream = fs.watch(watchPath)
 
         yield* watchStream
           .pipe(
@@ -253,9 +246,7 @@ Effect
               Effect.fn("effa-cli.index-multi.monitorRootIndexes.handleEvent")(function*(event) {
                 if (event.path.endsWith(indexFile)) return
 
-                if (debug) {
-                  yield* Effect.logInfo(`Root change detected: ${event.path}, fixing: ${indexFile}`)
-                }
+                yield* Effect.logInfo(`Root change detected: ${event.path}, fixing: ${indexFile}`)
 
                 yield* runNodeCommand(`pnpm eslint --fix "${indexFile}"`)
               })
@@ -281,26 +272,20 @@ Effect
      * @returns An Effect that sets up all index monitoring for the path
      */
     const monitorIndexes = Effect.fn("effa-cli.index-multi.monitorIndexes")(
-      function*(watchPath: string, debug: boolean) {
-        const fileSystem = yield* FileSystem.FileSystem
-
-        if (debug) {
-          yield* Effect.logInfo(`Setting up index monitoring for path: ${watchPath}`)
-        }
+      function*(watchPath: string) {
+        yield* Effect.logInfo(`Setting up index monitoring for path: ${watchPath}`)
 
         const indexFile = watchPath + "/index.ts"
 
-        const monitors = [monitorChildIndexes(watchPath, debug)]
+        const monitors = [monitorChildIndexes(watchPath)]
 
-        if (yield* fileSystem.exists(indexFile)) {
-          monitors.push(monitorRootIndexes(watchPath, indexFile, debug))
+        if (yield* fs.exists(indexFile)) {
+          monitors.push(monitorRootIndexes(watchPath, indexFile))
         } else {
           yield* Effect.logInfo(`Index file ${indexFile} does not exist`)
         }
 
-        if (debug) {
-          yield* Effect.logInfo(`Starting ${monitors.length} monitor(s) for ${watchPath}`)
-        }
+        yield* Effect.logInfo(`Starting ${monitors.length} monitor(s) for ${watchPath}`)
 
         yield* Effect.all(monitors, { concurrency: monitors.length })
       }
@@ -312,23 +297,20 @@ Effect
      *
      * @returns An Effect that sets up file watching streams
      */
-    const watcher = Effect.fn("watch")(function*(debug: boolean) {
-      yield* Effect.log("Watch API resources and models for changes")
+    const watcher = Effect.fn("watch")(function*() {
+      yield* Effect.logInfo("Watch API resources and models for changes")
 
       const dirs = ["../api/src/resources", "../api/src/models"]
       const viteConfigFile = "./vite.config.ts"
-      const fileSystem = yield* FileSystem.FileSystem
 
-      const viteConfigExists = yield* fileSystem.exists(viteConfigFile)
+      const viteConfigExists = yield* fs.exists(viteConfigFile)
 
-      if (debug) {
-        yield* Effect.logInfo("watcher debug mode is enabled")
-      }
+      yield* Effect.logInfo("watcher debug mode is enabled")
 
       // validate directories and filter out non-existing ones
       const existingDirs: string[] = []
       for (const dir of dirs) {
-        const dirExists = yield* fileSystem.exists(dir)
+        const dirExists = yield* fs.exists(dir)
         if (dirExists) {
           existingDirs.push(dir)
         } else {
@@ -336,33 +318,24 @@ Effect
         }
       }
 
-      if (existingDirs.length === 0) {
-        return yield* Effect.logWarning("No directories to watch - exiting")
-      }
-
       // start watching all existing directories concurrently
       const watchStreams = existingDirs.map((dir) =>
         Effect.gen(function*() {
-          if (debug) {
-            yield* Effect.logInfo(`Starting to watch directory: ${dir}`)
-          }
+          yield* Effect.logInfo(`Starting to watch directory: ${dir}`)
 
           const files: string[] = []
-          const watchStream = fileSystem.watch(dir, { recursive: true })
+          const watchStream = fs.watch(dir, { recursive: true })
 
           yield* watchStream
             .pipe(
               Stream.runForEach(
                 Effect.fn("effa-cli.watch.handleEvent")(function*(event) {
-                  if (debug) {
-                    yield* Effect.logInfo(`File ${event._tag.toLowerCase()}: ${event.path}`)
-                  }
+                  yield* Effect.logInfo(`File ${event._tag.toLowerCase()}: ${event.path}`)
 
                   // touch tsconfig.json on any file change
                   yield* touch("./tsconfig.json")
-                  if (debug) {
-                    yield* Effect.logInfo("Updated tsconfig.json")
-                  }
+
+                  yield* Effect.logInfo("Updated tsconfig.json")
 
                   // touch vite config only on file updates (not creates/deletes)
                   if (
@@ -371,9 +344,9 @@ Effect
                     && !files.includes(event.path)
                   ) {
                     yield* touch(viteConfigFile)
-                    if (debug) {
-                      yield* Effect.logInfo("Updated vite.config.ts")
-                    }
+
+                    yield* Effect.logInfo("Updated vite.config.ts")
+
                     files.push(event.path)
                   }
                 })
@@ -387,7 +360,7 @@ Effect
             )
 
           // also start monitoring indexes in the watched directory
-          yield* monitorIndexes(dir, debug)
+          yield* monitorIndexes(dir)
         })
       )
 
@@ -407,13 +380,13 @@ Effect
      */
     const packagejsonUpdater = Effect.fn("effa-cli.packagejsonUpdater")(
       function*(startDir: string, p: string, levels = 0) {
-        yield* Effect.log(`Generating exports for ${p}`)
+        yield* Effect.logInfo(`Generating exports for ${p}`)
 
         const exportMappings = yield* extractExportMappings(path.resolve(startDir, p))
 
         // if exportMappings is empty skip export generation
         if (exportMappings === "") {
-          yield* Effect.log(`No src directory found for ${p}, skipping export generation`)
+          yield* Effect.logInfo(`No src directory found for ${p}, skipping export generation`)
           return
         }
 
@@ -460,7 +433,7 @@ Effect
         const pkgJson = JSON.parse(yield* fs.readFileString(p + "/package.json", "utf-8"))
         pkgJson.exports = packageExports
 
-        yield* Effect.log(`Writing updated package.json for ${p}`)
+        yield* Effect.logInfo(`Writing updated package.json for ${p}`)
 
         return yield* fs.writeFileString(
           p + "/package.json",
@@ -469,10 +442,118 @@ Effect
       }
     )
 
+    /**
+     * Monitors a directory for TypeScript file changes and automatically updates package.json exports.
+     * Generates initial package.json exports, then watches the src directory for changes to regenerate exports.
+     *
+     * @param watchPath - The directory path containing the package.json and src to monitor
+     * @param levels - Optional depth limit for export filtering (0 = no limit)
+     * @returns An Effect that sets up package.json monitoring
+     */
+    const monitorPackageJson = Effect.fn("effa-cli.monitorPackageJson")(
+      function*(startDir: string, watchPath: string, levels = 0) {
+        yield* packagejsonUpdater(startDir, watchPath, levels)
+
+        const srcPath = watchPath === "." ? "./src" : `${watchPath}/src`
+
+        if (!(yield* fs.exists(srcPath))) {
+          yield* Effect.logWarning(`Source directory ${srcPath} does not exist - skipping monitoring`)
+          return
+        }
+
+        const watchStream = fs.watch(srcPath, { recursive: true })
+
+        yield* watchStream.pipe(
+          Stream.runForEach(
+            Effect.fn("effa-cli.monitorPackageJson.handleEvent")(function*(_) {
+              yield* packagejsonUpdater(startDir, watchPath, levels)
+            })
+          ),
+          Effect.andThen(
+            Effect.addFinalizer(() => Effect.logInfo(`Stopped monitoring package.json for: ${watchPath}`))
+          ),
+          Effect.forkScoped
+        )
+      }
+    )
+
     /*
      * CLI
      */
 
+    const WrapAsOption = Options.text("wrap").pipe(
+      Options.withAlias("w"),
+      Options.optional,
+      Options.withDescription(
+        "Wrap child bash command: the lifetime of the CLI command will be tied to the child process"
+      )
+    )
+
+    // has prio over WrapAsOption
+    const WrapAsArg = Args
+      .text({
+        name: "wrap"
+      })
+      .pipe(
+        Args.atLeast(1),
+        Args.optional,
+        Args.withDescription(
+          "Wrap child bash command: the lifetime of the CLI command will be tied to the child process"
+        )
+      )
+
+    /**
+     * Creates a command that automatically includes wrap functionality for executing child bash commands.
+     * Combines both option-based (--wrap) and argument-based wrap parameters, giving priority to arguments.
+     * If a wrap command is provided, it will be executed **after** the main command handler.
+     *
+     * @param name - The command name
+     * @param config - The command configuration (options, args, etc.)
+     * @param handler - The main command handler function
+     * @param completionMessage - Optional message to log when the command completes
+     * @returns A Command with integrated wrap functionality
+     */
+    const makeCommandWithWrap = <Name extends string, const Config extends Command.Command.Config, R, E>(
+      name: Name,
+      config: Config,
+      handler: (_: Types.Simplify<Command.Command.ParseConfig<Config>>) => Effect.Effect<void, E, R>,
+      completionMessage?: string
+    ): Command.Command<
+      Name,
+      CommandExecutor | R,
+      PlatformError | E,
+      Types.Simplify<Command.Command.ParseConfig<Config>>
+    > =>
+      Command.make(
+        name,
+        { ...config, wo: WrapAsOption, wa: WrapAsArg },
+        Effect.fn("effa-cli.withWrapHandler")(function*(_) {
+          const { wa, wo, ...cfg } = _ as unknown as {
+            wo: Option.Option<string>
+            wa: Option.Option<[string, ...string[]]>
+          } & Types.Simplify<Command.Command.ParseConfig<Config>>
+
+          if (completionMessage) {
+            yield* Effect.addFinalizer(() => Effect.logInfo(completionMessage))
+          }
+
+          const wrapOption = Option.orElse(wa, () => wo)
+
+          yield* handler(cfg as any)
+
+          if (Option.isSome(wrapOption)) {
+            const val = Array.isArray(wrapOption.value)
+              ? wrapOption.value.join(" ")
+              : wrapOption.value
+
+            yield* Effect.logInfo(`Spawning child command: ${val}`)
+            yield* runNodeCommand(val)
+          }
+
+          return
+        }, (_) => Effect.scoped(_))
+      )
+
     const EffectAppLibsPath = Args
       .directory({
         exists: "yes",
@@ -508,7 +589,7 @@ Effect
         "ue",
         {},
         Effect.fn("effa-cli.ue")(function*({}) {
-          yield* Effect.log("Update effect-app and/or effect packages")
+          yield* Effect.logInfo("Update effect-app and/or effect packages")
 
           const prompted = yield* Prompt.select({
             choices: [
@@ -551,130 +632,118 @@ Effect
       )
       .pipe(Command.withDescription("Update effect-app and/or effect packages"))
 
-    const DebugOption = Options.boolean("debug").pipe(
-      Options.withAlias("d"),
-      Options.withDescription("Enable debug logging")
+    const watch = makeCommandWithWrap(
+      "watch",
+      {},
+      Effect.fn("effa-cli.watch")(function*({}) {
+        return yield* watcher()
+      }),
+      "Stopped watching API resources and models"
     )
-
-    const watch = Command
-      .make(
-        "watch",
-        { debug: DebugOption },
-        Effect.fn("effa-cli.watch")(function*({ debug }) {
-          return yield* watcher(debug)
-        })
-      )
       .pipe(
         Command.withDescription(
           "Watch API resources and models for changes and update tsconfig.json and vite.config.ts accordingly"
         )
       )
 
-    const indexMulti = Command
-      .make(
-        "index-multi",
-        { debug: DebugOption },
-        Effect.fn("effa-cli.index-multi")(function*({ debug }) {
-          yield* Effect.log("Starting multi-index monitoring")
-
-          const dirs = ["./api/src"]
-          const fileSystem = yield* FileSystem.FileSystem
-
-          const existingDirs: string[] = []
-          for (const dir of dirs) {
-            const dirExists = yield* fileSystem.exists(dir)
-            if (dirExists) {
-              existingDirs.push(dir)
-            } else {
-              yield* Effect.logWarning(`Directory ${dir} does not exist - skipping`)
-            }
-          }
-
-          if (existingDirs.length === 0) {
-            return yield* Effect.logWarning("No directories to monitor - exiting")
+    const indexMulti = makeCommandWithWrap(
+      "index-multi",
+      {},
+      Effect.fn("effa-cli.index-multi")(function*({}) {
+        yield* Effect.logInfo("Starting multi-index monitoring")
+
+        const dirs = ["./api/src"]
+
+        const existingDirs: string[] = []
+        for (const dir of dirs) {
+          const dirExists = yield* fs.exists(dir)
+          if (dirExists) {
+            existingDirs.push(dir)
+          } else {
+            yield* Effect.logWarning(`Directory ${dir} does not exist - skipping`)
           }
+        }
 
-          const monitors = existingDirs.map((dir) => monitorIndexes(dir, debug))
-          yield* Effect.all(monitors, { concurrency: monitors.length })
-        })
-      )
+        const monitors = existingDirs.map((dir) => monitorIndexes(dir))
+        yield* Effect.all(monitors, { concurrency: monitors.length })
+      }),
+      "Stopped multi-index monitoring"
+    )
       .pipe(
         Command.withDescription(
           "Monitor multiple directories for index and controller file changes"
         )
       )
 
-    const packagejson = Command
-      .make(
-        "packagejson",
-        {},
-        Effect.fn("effa-cli.packagejson")(function*({}) {
-          // https://nodejs.org/api/path.html#pathresolvepaths
-          const startDir = path.resolve()
+    const packagejson = makeCommandWithWrap(
+      "packagejson",
+      {},
+      Effect.fn("effa-cli.packagejson")(function*({}) {
+        // https://nodejs.org/api/path.html#pathresolvepaths
+        const startDir = path.resolve()
 
-          return yield* packagejsonUpdater(startDir, ".")
-        })
-      )
+        return yield* monitorPackageJson(startDir, ".")
+      }),
+      "Stopped monitoring root package.json exports"
+    )
       .pipe(
         Command.withDescription("Generate and update root-level package.json exports mappings for TypeScript modules")
       )
 
-    const packagejsonPackages = Command
-      .make(
-        "packagejson-packages",
-        {},
-        Effect.fn("effa-cli.packagejson-packages")(function*({}) {
-          // https://nodejs.org/api/path.html#pathresolvepaths
-          const startDir = path.resolve()
-
-          const packagesDir = path.join(startDir, "packages")
+    const packagejsonPackages = makeCommandWithWrap(
+      "packagejson-packages",
+      {},
+      Effect.fn("effa-cli.packagejson-packages")(function*({}) {
+        // https://nodejs.org/api/path.html#pathresolvepaths
+        const startDir = path.resolve()
 
-          const packagesExists = yield* fs.exists(packagesDir)
-          if (!packagesExists) {
-            return yield* Effect.logWarning("No packages directory found")
-          }
+        const packagesDir = path.join(startDir, "packages")
 
-          // get all package directories
-          const packageDirs = yield* fs.readDirectory(packagesDir)
+        const packagesExists = yield* fs.exists(packagesDir)
+        if (!packagesExists) {
+          return yield* Effect.logWarning("No packages directory found")
+        }
 
-          const validPackages: string[] = []
+        // get all package directories
+        const packageDirs = yield* fs.readDirectory(packagesDir)
 
-          // filter packages that have package.json and src directory
-          for (const packageName of packageDirs) {
-            const packagePath = path.join(packagesDir, packageName)
-            const packageJsonExists = yield* fs.exists(path.join(packagePath, "package.json"))
-            const srcExists = yield* fs.exists(path.join(packagePath, "src"))
+        const validPackages: string[] = []
 
-            const shouldExclude = false
-              || packageName.endsWith("eslint-codegen-model")
-              || packageName.endsWith("vue-components")
+        // filter packages that have package.json and src directory
+        for (const packageName of packageDirs) {
+          const packagePath = path.join(packagesDir, packageName)
+          const packageJsonExists = yield* fs.exists(path.join(packagePath, "package.json"))
+          const srcExists = yield* fs.exists(path.join(packagePath, "src"))
 
-            if (packageJsonExists && srcExists && !shouldExclude) {
-              validPackages.push(packagePath)
-            }
-          }
+          const shouldExclude = false
+            || packageName.endsWith("eslint-codegen-model")
+            || packageName.endsWith("vue-components")
 
-          if (validPackages.length === 0) {
-            return yield* Effect.logWarning("No valid packages found to update")
+          if (packageJsonExists && srcExists && !shouldExclude) {
+            validPackages.push(packagePath)
           }
+        }
 
-          yield* Effect.log(`Found ${validPackages.length} packages to update`)
+        yield* Effect.logInfo(`Found ${validPackages.length} packages to update`)
 
-          // update each package sequentially
-          yield* Effect.all(
-            validPackages.map((packagePath) =>
-              Effect.gen(function*() {
-                const relativePackagePath = path.relative(startDir, packagePath)
-                yield* Effect.log(`Updating ${relativePackagePath}`)
-                return yield* packagejsonUpdater(startDir, relativePackagePath)
-              })
-            )
+        // update each package sequentially
+        yield* Effect.all(
+          validPackages.map(
+            Effect.fnUntraced(function*(packagePath) {
+              const relativePackagePath = path.relative(startDir, packagePath)
+              yield* Effect.logInfo(`Updating ${relativePackagePath}`)
+              return yield* monitorPackageJson(startDir, relativePackagePath)
+            })
           )
+        )
 
-          yield* Effect.log("All packages updated successfully")
-        })
+        yield* Effect.logInfo("All packages updated successfully")
+      }),
+      "Stopped monitoring package.json exports for all packages"
+    )
+      .pipe(
+        Command.withDescription("Generate and update package.json exports mappings for all packages in monorepo")
       )
-      .pipe(Command.withDescription("Generate and update package.json exports mappings for all packages in monorepo"))
 
     // configure CLI
     const cli = Command.run(