@fluojs/cli 1.0.0-beta.5 → 1.0.0-beta.6

package/dist/commands/scripts.js

@@ -5,12 +5,18 @@ import { fileURLToPath } from 'node:url';
 import { SUPPORTED_PACKAGE_MANAGERS } from './package-manager.js';
 const EMPTY_ENV = {};
 const FAILURE_STDOUT_BUFFER_LIMIT = 16_384;
+const PRETTY_TTY_COLOR_ENV = 'FLUO_DEV_PRETTY_TTY_COLOR';
+const PRETTY_CHILD_OUTPUT_PREFIX = 'app │ ';
+const SHOW_NODE_RESTART_NOTICE_ENV = 'FLUO_DEV_SHOW_RESTART_NOTICE';
 function getCliSourceRoot() {
   return dirname(dirname(fileURLToPath(import.meta.url)));
 }
 function getCliEntryPoint() {
   return join(getCliSourceRoot(), 'cli.js');
 }
+function getPreserveColorTtyImport() {
+  return join(getCliSourceRoot(), 'dev-runner', 'preserve-color-tty.js');
+}
 function isRecord(value) {
   return typeof value === 'object' && value !== null;
 }
@@ -87,6 +93,19 @@ function withProjectLocalBin(env, projectDirectory) {
     [pathKey]: existingPath ? `${localBin}${delimiter}${existingPath}` : localBin
   };
 }
+function withPipedReporterColorEnv(env, mode, stdout, stderr) {
+  if (!(mode === 'app' || mode === 'pretty') || env.NO_COLOR !== undefined) {
+    return env;
+  }
+  if (!stdout.isTTY || !stderr.isTTY) {
+    return env;
+  }
+  return {
+    ...env,
+    FORCE_COLOR: env.FORCE_COLOR ?? '1',
+    [PRETTY_TTY_COLOR_ENV]: '1'
+  };
+}
 function defaultSpawnCommand(command, args, options) {
   return new Promise((resolveExitCode, reject) => {
     const child = spawn(command, args, options);
@@ -105,6 +124,39 @@ function buildNativeNodeWatchStep(passThrough) {
     mode: 'native-watch'
   };
 }
+function buildFluoDevRunnerStep(runtime, passThrough) {
+  return {
+    command: 'node',
+    args: ['--import', 'tsx', getCliEntryPoint(), '__dev-runner', '--runtime', runtime, '--', ...passThrough],
+    mode: 'fluo-restart'
+  };
+}
+function buildNativeRuntimeDevStep(runtime, passThrough) {
+  switch (runtime) {
+    case 'node':
+      return buildNativeNodeWatchStep(passThrough);
+    case 'bun':
+      return {
+        command: 'bun',
+        args: ['--watch', 'src/main.ts', ...passThrough],
+        mode: 'runtime-native-watch'
+      };
+    case 'deno':
+      return {
+        command: 'deno',
+        args: ['run', '--watch', '--allow-env', '--allow-net', 'src/main.ts', ...passThrough],
+        mode: 'runtime-native-watch'
+      };
+    case 'cloudflare-workers':
+      return {
+        command: 'wrangler',
+        args: ['dev', '--show-interactive-dev-session=false', ...passThrough],
+        mode: 'runtime-native-watch'
+      };
+    default:
+      return undefined;
+  }
+}
 function buildProjectRunner(command, runtime, passThrough, options) {
   if (command === 'build') {
     switch (runtime) {
@@ -136,32 +188,24 @@ function buildProjectRunner(command, runtime, passThrough, options) {
     }
   }
   if (command === 'dev') {
+    if (options.devRunner === 'native') {
+      const nativeStep = buildNativeRuntimeDevStep(runtime, passThrough);
+      if (nativeStep) {
+        return [nativeStep];
+      }
+    }
     switch (runtime) {
       case 'bun':
-        return [{
-          command: 'bun',
-          args: ['--watch', 'src/main.ts', ...passThrough]
-        }];
+        return [buildFluoDevRunnerStep(runtime, passThrough)];
       case 'deno':
-        return [{
-          command: 'deno',
-          args: ['run', '--allow-env', '--allow-net', '--watch', 'src/main.ts', ...passThrough]
-        }];
+        return [buildFluoDevRunnerStep(runtime, passThrough)];
       case 'cloudflare-workers':
-        return [{
-          command: 'wrangler',
-          args: ['dev', ...passThrough],
-          mode: 'native-watch'
-        }];
+        return [buildFluoDevRunnerStep(runtime, passThrough)];
       default:
         if (options.rawWatch) {
           return [buildNativeNodeWatchStep(passThrough)];
         }
-        return [{
-          command: 'node',
-          args: ['--import', 'tsx', getCliEntryPoint(), '__node-dev-runner', '--', ...passThrough],
-          mode: 'fluo-node-restart'
-        }];
+        return [buildFluoDevRunnerStep(runtime, passThrough)];
     }
   }
   switch (runtime) {
@@ -178,7 +222,7 @@ function buildProjectRunner(command, runtime, passThrough, options) {
     case 'cloudflare-workers':
       return [{
         command: 'wrangler',
-        args: ['dev', '--remote', ...passThrough]
+        args: ['dev', '--remote', '--show-interactive-dev-session=false', ...passThrough]
       }];
     default:
       return [{
@@ -197,7 +241,29 @@ async function runProjectRunnerSteps(steps, runtime, options) {
   }
   return 0;
 }
+function withPipedAppColorTtyBootstrap(steps, env) {
+  if (env[PRETTY_TTY_COLOR_ENV] !== '1') {
+    return steps;
+  }
+  return steps.map(step => {
+    const preserveColorTtyImport = getPreserveColorTtyImport();
+    if (step.command === 'node' && step.mode !== 'fluo-restart') {
+      return {
+        ...step,
+        args: ['--import', preserveColorTtyImport, ...step.args]
+      };
+    }
+    if (step.command === 'bun' && (step.mode === 'runtime-native-watch' || step.args[0] === 'dist/main.js')) {
+      return {
+        ...step,
+        args: ['--preload', preserveColorTtyImport, ...step.args]
+      };
+    }
+    return step;
+  });
+}
 function parseScriptArgs(argv) {
+  let devRunner;
   let dryRun = false;
   let packageManager;
   let rawWatch = false;
@@ -218,13 +284,25 @@ function parseScriptArgs(argv) {
       rawWatch = true;
       continue;
     }
+    if (arg === '--runner') {
+      const value = argv[index + 1];
+      if (!value || value.startsWith('-')) {
+        throw new Error('Expected --runner to have a value.');
+      }
+      if (!(value === 'fluo' || value === 'native')) {
+        throw new Error(`Invalid --runner value "${value}". Use one of: fluo, native.`);
+      }
+      devRunner = value;
+      index += 1;
+      continue;
+    }
     if (arg === '--reporter') {
       const value = argv[index + 1];
       if (!value || value.startsWith('-')) {
         throw new Error('Expected --reporter to have a value.');
       }
-      if (!(value === 'auto' || value === 'stream' || value === 'silent')) {
-        throw new Error(`Invalid --reporter value "${value}". Use one of: auto, stream, silent.`);
+      if (!(value === 'auto' || value === 'pretty' || value === 'stream' || value === 'silent')) {
+        throw new Error(`Invalid --reporter value "${value}". Use one of: auto, pretty, stream, silent.`);
       }
       reporter = value;
       index += 1;
@@ -249,6 +327,7 @@ function parseScriptArgs(argv) {
     passThrough.push(arg);
   }
   return {
+    devRunner,
     dryRun,
     packageManager,
     passThrough,
@@ -260,20 +339,24 @@ function parseScriptArgs(argv) {
 function isEnabledEnvironmentFlag(value) {
   return value === '1' || value === 'true' || value === 'yes' || value === 'on';
 }
-function resolveReporterMode(command, parsed, runtime) {
+function resolveReporterMode(parsed, runtime) {
   if (parsed.reporter !== 'auto') {
     return parsed.reporter;
   }
   if (parsed.verbose || isEnabledEnvironmentFlag(runtime.env?.FLUO_VERBOSE)) {
     return 'stream';
   }
-  if (runtime.ci || isEnabledEnvironmentFlag(runtime.env?.CI) || isEnabledEnvironmentFlag(runtime.env?.GITHUB_ACTIONS)) {
-    return 'stream';
+  return 'app';
+}
+function resolveDevRunnerPreference(parsed, env, runtime) {
+  const configured = parsed.devRunner ?? env.FLUO_DEV_RUNNER;
+  if (configured === undefined || configured === '') {
+    return runtime === 'node' ? 'fluo' : 'native';
   }
-  if (command !== 'dev') {
-    return 'stream';
+  if (configured === 'fluo' || configured === 'native') {
+    return configured;
   }
-  return (runtime.stdout ?? process.stdout).isTTY ? 'pretty' : 'stream';
+  throw new Error(`Invalid FLUO_DEV_RUNNER value "${configured}". Use one of: fluo, native.`);
 }
 function renderStep(step) {
   return `${step.command} ${step.args.join(' ')}`.trim();
@@ -297,16 +380,73 @@ function createBoundedBufferStream(limit) {
     }
   };
 }
+function createLinePrefixedStream(target, prefix) {
+  let atLineStart = true;
+  return {
+    finalizeLine() {
+      if (!atLineStart) {
+        target.write('\n');
+        atLineStart = true;
+      }
+    },
+    write(message) {
+      for (const character of message) {
+        if (atLineStart && character !== '\n') {
+          target.write(prefix);
+          atLineStart = false;
+        }
+        target.write(character);
+        if (character === '\n') {
+          atLineStart = true;
+        }
+      }
+    }
+  };
+}
 function createReporterStreams(mode, verbose, stdout, stderr) {
   if (mode === 'stream') {
     return {
+      finalizeChildOutputBeforeStatus() {},
       flushBufferedStdoutOnFailure() {},
       stdio: 'inherit'
     };
   }
-  if (mode === 'silent' || mode === 'pretty') {
+  if (mode === 'app') {
+    return {
+      finalizeChildOutputBeforeStatus() {},
+      flushBufferedStdoutOnFailure() {},
+      stderr,
+      stdio: 'pipe',
+      stdout
+    };
+  }
+  if (mode === 'pretty') {
+    if (verbose) {
+      return {
+        finalizeChildOutputBeforeStatus() {},
+        flushBufferedStdoutOnFailure() {},
+        stderr,
+        stdio: 'pipe',
+        stdout
+      };
+    }
+    const prefixedStdout = createLinePrefixedStream(stdout, PRETTY_CHILD_OUTPUT_PREFIX);
+    const prefixedStderr = createLinePrefixedStream(stderr, PRETTY_CHILD_OUTPUT_PREFIX);
+    return {
+      finalizeChildOutputBeforeStatus() {
+        prefixedStdout.finalizeLine();
+        prefixedStderr.finalizeLine();
+      },
+      flushBufferedStdoutOnFailure() {},
+      stderr: prefixedStderr,
+      stdio: 'pipe',
+      stdout: prefixedStdout
+    };
+  }
+  if (mode === 'silent') {
     if (verbose) {
       return {
+        finalizeChildOutputBeforeStatus() {},
         flushBufferedStdoutOnFailure() {},
         stderr,
         stdio: 'pipe',
@@ -315,6 +455,7 @@ function createReporterStreams(mode, verbose, stdout, stderr) {
     }
     const bufferedStdout = createBoundedBufferStream(FAILURE_STDOUT_BUFFER_LIMIT);
     return {
+      finalizeChildOutputBeforeStatus() {},
       flushBufferedStdoutOnFailure() {
         if (bufferedStdout.hasContent()) {
           stderr.write('[fluo] child stdout before failure:\n');
@@ -328,6 +469,7 @@ function createReporterStreams(mode, verbose, stdout, stderr) {
     };
   }
   return {
+    finalizeChildOutputBeforeStatus() {},
     flushBufferedStdoutOnFailure() {},
     stdio: 'inherit'
   };
@@ -341,7 +483,7 @@ function createReporterStreams(mode, verbose, stdout, stderr) {
  */
 export function scriptUsage(command) {
   const nodeEnv = command === 'dev' ? 'development' : 'production';
-  return [`Usage: fluo ${command} [options] [-- <args>]`, '', `Run the generated fluo project ${command} lifecycle with NODE_ENV defaulting to ${nodeEnv} when unset.`, '', 'Options', '  --dry-run                              Print the command without running it.', command === 'dev' ? '  --raw-watch                            Use the runtime-native watcher instead of the fluo Node restart runner.' : undefined, '  --reporter <auto|stream|silent>        Choose lifecycle reporter output mode (default: auto).', '  --verbose                             Expose raw child process output; also honored by FLUO_VERBOSE=1.', `  --help                                 Show help for the ${command} command.`].filter(line => typeof line === 'string').join('\n');
+  return [`Usage: fluo ${command} [options] [-- <args>]`, '', `Run the generated fluo project ${command} lifecycle with NODE_ENV defaulting to ${nodeEnv} when unset.`, '', 'Default output forwards child stdout/stderr without fluo lifecycle UI.', 'Use --reporter pretty for fluo lifecycle status + app │ prefixes.', 'Use --verbose (or FLUO_VERBOSE=1) to expose raw runtime/tooling output.', '', 'Options', '  --dry-run                              Print the command without running it.', command === 'dev' ? '  --raw-watch                            Use the runtime-native Node watcher instead of the fluo restart runner.' : undefined, command === 'dev' ? '  --runner <fluo|native>                 Select fluo restart supervision or runtime-native watch (default: fluo for Node, native for non-Node runtimes).' : undefined, '  --reporter <auto|pretty|stream|silent> Choose lifecycle reporter output mode (default: auto).', '  --verbose                             Expose raw child process output; also honored by FLUO_VERBOSE=1.', `  --help                                 Show help for the ${command} command.`].filter(line => typeof line === 'string').join('\n');
 }
 
 /**
@@ -367,19 +509,28 @@ export async function runScriptCommand(command, argv, runtime = {}) {
   const parsed = parseScriptArgs(argv);
   const projectRuntime = detectProjectRuntime(project.manifest);
   const defaultNodeEnv = command === 'dev' ? 'development' : 'production';
-  const childEnv = withProjectLocalBin(withDefaultNodeEnv(env, defaultNodeEnv), project.directory);
   const rawWatch = parsed.rawWatch || isEnabledEnvironmentFlag(env.FLUO_DEV_RAW_WATCH);
+  if (command !== 'dev' && parsed.devRunner) {
+    throw new Error('--runner is only supported for fluo dev. Use -- to forward --runner to the child command.');
+  }
+  const devRunner = command === 'dev' ? resolveDevRunnerPreference(parsed, env, projectRuntime) : 'fluo';
   const runnerSteps = buildProjectRunner(command, projectRuntime, parsed.passThrough, {
+    devRunner,
     rawWatch
   });
-  const reporterMode = resolveReporterMode(command, parsed, {
+  const reporterMode = resolveReporterMode(parsed, {
     ...runtime,
     env,
     stdout
   });
   const verbose = parsed.verbose || isEnabledEnvironmentFlag(env.FLUO_VERBOSE);
+  const childEnv = withPipedReporterColorEnv(withProjectLocalBin(withDefaultNodeEnv(env, defaultNodeEnv), project.directory), reporterMode, stdout, stderr);
+  const colorAwareRunnerSteps = withPipedAppColorTtyBootstrap(runnerSteps, childEnv);
+  if (command === 'dev' && (reporterMode === 'pretty' || verbose)) {
+    childEnv[SHOW_NODE_RESTART_NOTICE_ENV] = '1';
+  }
   if (parsed.dryRun) {
-    for (const step of runnerSteps) {
+    for (const step of colorAwareRunnerSteps) {
       stdout.write(`Would run: ${step.command} ${step.args.join(' ')}\n`);
     }
     stdout.write(`Project: ${project.path}\n`);
@@ -387,16 +538,16 @@ export async function runScriptCommand(command, argv, runtime = {}) {
     stdout.write(`NODE_ENV: ${childEnv.NODE_ENV ?? ''}\n`);
     stdout.write(`Reporter: ${reporterMode}\n`);
     if (command === 'dev') {
-      stdout.write(`Watch mode: ${runnerSteps.map(step => step.mode ?? 'single-run').join(', ')}\n`);
+      stdout.write(`Watch mode: ${colorAwareRunnerSteps.map(step => step.mode ?? 'single-run').join(', ')}\n`);
     }
     return 0;
   }
   if (reporterMode === 'pretty') {
     stdout.write(`[fluo] ${command} ${projectRuntime} lifecycle starting\n`);
-    stdout.write(`[fluo] ${runnerSteps.map(renderStep).join(' && ')}\n`);
+    stdout.write(`[fluo] ${colorAwareRunnerSteps.map(renderStep).join(' && ')}\n`);
   }
   const reporterStreams = createReporterStreams(reporterMode, verbose, stdout, stderr);
-  const exitCode = await runProjectRunnerSteps(runnerSteps, {
+  const exitCode = await runProjectRunnerSteps(colorAwareRunnerSteps, {
     spawnCommand: runtime.spawnCommand ?? defaultSpawnCommand
   }, {
     cwd: project.directory,
@@ -404,6 +555,7 @@ export async function runScriptCommand(command, argv, runtime = {}) {
     ...reporterStreams
   });
   if (reporterMode === 'pretty') {
+    reporterStreams.finalizeChildOutputBeforeStatus();
     if (exitCode === 0) {
       stdout.write(`[fluo] ${command} lifecycle completed\n`);
     } else {

package/dist/dev-runner/node-restart-runner.d.ts

@@ -1,6 +1,7 @@
 import { type ChildProcess } from 'node:child_process';
 import { type FSWatcher } from 'node:fs';
 type RestartRunnerStream = {
+    isTTY?: boolean;
     write(message: string): unknown;
 };
 type RestartChildSpawner = (command: string, args: string[], options: {
@@ -8,6 +9,8 @@ type RestartChildSpawner = (command: string, args: string[], options: {
     env: NodeJS.ProcessEnv;
     stdio: 'inherit';
 }) => ChildProcess;
+/** Runtime target handled by the fluo-owned development restart runner. */
+export type DevRunnerRuntime = 'bun' | 'cloudflare-workers' | 'deno' | 'node';
 type RestartSignal = 'SIGINT' | 'SIGTERM';
 type RestartSignalTarget = {
     off(signal: RestartSignal, listener: () => void): unknown;
@@ -20,11 +23,13 @@ type ContentChangeGate = {
     commitBaseline(paths: Iterable<string>): void;
     hasMeaningfulChange(paths: Iterable<string>): boolean;
 };
+/** Options used to configure the fluo-owned Node restart-on-watch process boundary. */
 export type NodeRestartRunnerOptions = {
     appArgs?: string[];
     debounceMs?: number;
     env: NodeJS.ProcessEnv;
     projectDirectory?: string;
+    runtime?: DevRunnerRuntime;
     signalTarget?: RestartSignalTarget;
     spawnChild?: RestartChildSpawner;
     stderr?: RestartRunnerStream;

package/dist/dev-runner/node-restart-runner.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"node-restart-runner.d.ts","sourceRoot":"","sources":["../../src/dev-runner/node-restart-runner.ts"],"names":[],"mappings":"AAAA,OAAO,EAAS,KAAK,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAE9D,OAAO,EAA0D,KAAK,SAAS,EAAE,MAAM,SAAS,CAAC;AAGjG,KAAK,mBAAmB,GAAG;IACzB,KAAK,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC;CACjC,CAAC;AAEF,KAAK,mBAAmB,GAAG,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE,OAAO,EAAE;IAAE,GAAG,EAAE,MAAM,CAAC;IAAC,GAAG,EAAE,MAAM,CAAC,UAAU,CAAC;IAAC,KAAK,EAAE,SAAS,CAAA;CAAE,KAAK,YAAY,CAAC;AAEjJ,KAAK,aAAa,GAAG,QAAQ,GAAG,SAAS,CAAC;AAE1C,KAAK,mBAAmB,GAAG;IACzB,GAAG,CAAC,MAAM,EAAE,aAAa,EAAE,QAAQ,EAAE,MAAM,IAAI,GAAG,OAAO,CAAC;IAC1D,IAAI,CAAC,MAAM,EAAE,aAAa,EAAE,QAAQ,EAAE,MAAM,IAAI,GAAG,OAAO,CAAC;CAC5D,CAAC;AAEF,KAAK,qBAAqB,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,iBAAiB,EAAE;IAAE,SAAS,EAAE,OAAO,CAAA;CAAE,GAAG,CAAC,CAAC,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,KAAK,IAAI,CAAC,EAAE,QAAQ,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,KAAK,IAAI,KAAK,SAAS,CAAC;AAE1O,KAAK,iBAAiB,GAAG;IACvB,cAAc,CAAC,KAAK,EAAE,QAAQ,CAAC,MAAM,CAAC,GAAG,IAAI,CAAC;IAC9C,mBAAmB,CAAC,KAAK,EAAE,QAAQ,CAAC,MAAM,CAAC,GAAG,OAAO,CAAC;CACvD,CAAC;AAEF,MAAM,MAAM,wBAAwB,GAAG;IACrC,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IACnB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,GAAG,EAAE,MAAM,CAAC,UAAU,CAAC;IACvB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,YAAY,CAAC,EAAE,mBAAmB,CAAC;IACnC,UAAU,CAAC,EAAE,mBAAmB,CAAC;IACjC,MAAM,CAAC,EAAE,mBAAmB,CAAC;IAC7B,MAAM,CAAC,EAAE,mBAAmB,CAAC;IAC7B,WAAW,CAAC,EAAE,qBAAqB,CAAC;CACrC,CAAC;AA6FF;;;;;;GAMG;AACH,wBAAgB,uBAAuB,CAAC,gBAAgB,EAAE,MAAM,EAAE,cAAc,GAAE,MAAM,EAAoB,GAAG,iBAAiB,CAuB/H;AAYD;;;;;GAKG;AACH,wBAAsB,oBAAoB,CAAC,OAAO,EAAE,wBAAwB,GAAG,OAAO,CAAC,MAAM,CAAC,CAqJ7F"}
+{"version":3,"file":"node-restart-runner.d.ts","sourceRoot":"","sources":["../../src/dev-runner/node-restart-runner.ts"],"names":[],"mappings":"AAAA,OAAO,EAAS,KAAK,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAE9D,OAAO,EAA0D,KAAK,SAAS,EAAE,MAAM,SAAS,CAAC;AAIjG,KAAK,mBAAmB,GAAG;IACzB,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,KAAK,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC;CACjC,CAAC;AAEF,KAAK,mBAAmB,GAAG,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE,OAAO,EAAE;IAAE,GAAG,EAAE,MAAM,CAAC;IAAC,GAAG,EAAE,MAAM,CAAC,UAAU,CAAC;IAAC,KAAK,EAAE,SAAS,CAAA;CAAE,KAAK,YAAY,CAAC;AACjJ,2EAA2E;AAC3E,MAAM,MAAM,gBAAgB,GAAG,KAAK,GAAG,oBAAoB,GAAG,MAAM,GAAG,MAAM,CAAC;AAE9E,KAAK,aAAa,GAAG,QAAQ,GAAG,SAAS,CAAC;AAE1C,KAAK,mBAAmB,GAAG;IACzB,GAAG,CAAC,MAAM,EAAE,aAAa,EAAE,QAAQ,EAAE,MAAM,IAAI,GAAG,OAAO,CAAC;IAC1D,IAAI,CAAC,MAAM,EAAE,aAAa,EAAE,QAAQ,EAAE,MAAM,IAAI,GAAG,OAAO,CAAC;CAC5D,CAAC;AAEF,KAAK,qBAAqB,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,iBAAiB,EAAE;IAAE,SAAS,EAAE,OAAO,CAAA;CAAE,GAAG,CAAC,CAAC,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,KAAK,IAAI,CAAC,EAAE,QAAQ,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,KAAK,IAAI,KAAK,SAAS,CAAC;AAE1O,KAAK,iBAAiB,GAAG;IACvB,cAAc,CAAC,KAAK,EAAE,QAAQ,CAAC,MAAM,CAAC,GAAG,IAAI,CAAC;IAC9C,mBAAmB,CAAC,KAAK,EAAE,QAAQ,CAAC,MAAM,CAAC,GAAG,OAAO,CAAC;CACvD,CAAC;AAEF,uFAAuF;AACvF,MAAM,MAAM,wBAAwB,GAAG;IACrC,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IACnB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,GAAG,EAAE,MAAM,CAAC,UAAU,CAAC;IACvB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,OAAO,CAAC,EAAE,gBAAgB,CAAC;IAC3B,YAAY,CAAC,EAAE,mBAAmB,CAAC;IACnC,UAAU,CAAC,EAAE,mBAAmB,CAAC;IACjC,MAAM,CAAC,EAAE,mBAAmB,CAAC;IAC7B,MAAM,CAAC,EAAE,mBAAmB,CAAC;IAC7B,WAAW,CAAC,EAAE,qBAAqB,CAAC;CACrC,CAAC;AAgGF;;;;;;GAMG;AACH,wBAAgB,uBAAuB,CAAC,gBAAgB,EAAE,MAAM,EAAE,cAAc,GAAE,MAAM,EAAoB,GAAG,iBAAiB,CAuB/H;AAqED;;;;;GAKG;AACH,wBAAsB,oBAAoB,CAAC,OAAO,EAAE,wBAAwB,GAAG,OAAO,CAAC,MAAM,CAAC,CA2J7F"}

package/dist/dev-runner/node-restart-runner.js

@@ -1,10 +1,19 @@
 import { spawn } from 'node:child_process';
 import { createHash } from 'node:crypto';
 import { existsSync, readdirSync, readFileSync, statSync, watch } from 'node:fs';
-import { basename, join, relative, sep } from 'node:path';
+import { basename, dirname, join, relative, sep } from 'node:path';
+import { fileURLToPath } from 'node:url';
+
+/** Runtime target handled by the fluo-owned development restart runner. */
+
+/** Options used to configure the fluo-owned Node restart-on-watch process boundary. */
+
 const DEFAULT_DEBOUNCE_MS = 100;
+const PRETTY_TTY_COLOR_ENV = 'FLUO_DEV_PRETTY_TTY_COLOR';
 const DEFAULT_IGNORES = ['.cache', '.fluo', '.git', '.turbo', 'coverage', 'dist', 'node_modules', '*.swp', '*.swo', '*~', '.#*'];
 const WATCH_FILES = ['.env', 'package.json', 'tsconfig.json', 'tsconfig.build.json'];
+const SHOW_NODE_RESTART_NOTICE_ENV = 'FLUO_DEV_SHOW_RESTART_NOTICE';
+const CLEAR_SCREEN = '\u001B[2J\u001B[3J\u001B[H';
 function normalizeIgnorePatterns(patterns) {
   return patterns.map(pattern => pattern.trim()).filter(pattern => pattern.length > 0);
 }
@@ -103,6 +112,60 @@ function stopChild(child) {
     child.kill('SIGTERM');
   }
 }
+function getPreserveColorTtyImport() {
+  return join(dirname(dirname(fileURLToPath(import.meta.url))), 'dev-runner', 'preserve-color-tty.js');
+}
+function buildNodeAppArgs(env, appArgs) {
+  const colorTtyImport = env[PRETTY_TTY_COLOR_ENV] === '1' ? ['--import', getPreserveColorTtyImport()] : [];
+  return ['--env-file=.env', ...colorTtyImport, '--import', 'tsx', 'src/main.ts', ...appArgs];
+}
+function buildBunAppArgs(env, appArgs) {
+  const colorTtyPreload = env[PRETTY_TTY_COLOR_ENV] === '1' ? ['--preload', getPreserveColorTtyImport()] : [];
+  return [...colorTtyPreload, 'src/main.ts', ...appArgs];
+}
+function buildAppCommand(runtime, env, appArgs) {
+  switch (runtime) {
+    case 'bun':
+      return {
+        command: 'bun',
+        args: buildBunAppArgs(env, appArgs)
+      };
+    case 'cloudflare-workers':
+      return {
+        command: 'wrangler',
+        args: ['dev', '--show-interactive-dev-session=false', ...appArgs]
+      };
+    case 'deno':
+      return {
+        command: 'deno',
+        args: ['run', '--allow-env', '--allow-net', 'src/main.ts', ...appArgs]
+      };
+    default:
+      return {
+        command: process.execPath,
+        args: buildNodeAppArgs(env, appArgs)
+      };
+  }
+}
+function readDevScriptHeader(projectDirectory) {
+  const fallbackName = basename(projectDirectory);
+  try {
+    const manifest = JSON.parse(readFileSync(join(projectDirectory, 'package.json'), 'utf8'));
+    const name = typeof manifest.name === 'string' && manifest.name.length > 0 ? manifest.name : fallbackName;
+    const version = typeof manifest.version === 'string' && manifest.version.length > 0 ? `@${manifest.version}` : '';
+    const devScript = typeof manifest.scripts?.dev === 'string' && manifest.scripts.dev.length > 0 ? manifest.scripts.dev : 'fluo dev';
+    return `> ${name}${version} dev ${projectDirectory}\n> ${devScript}\n\n`;
+  } catch (_error) {
+    return `> ${fallbackName} dev ${projectDirectory}\n> fluo dev\n\n`;
+  }
+}
+function redrawDevScriptHeader(stdout, projectDirectory, env) {
+  if (env[SHOW_NODE_RESTART_NOTICE_ENV] !== '1') {
+    return;
+  }
+  stdout.write(CLEAR_SCREEN);
+  stdout.write(readDevScriptHeader(projectDirectory));
+}
 
 /**
  * Runs the Node.js development lifecycle through fluo-owned restart supervision.
@@ -113,6 +176,7 @@ function stopChild(child) {
 export async function runNodeRestartRunner(options) {
   const projectDirectory = options.projectDirectory ?? process.cwd();
   const env = options.env;
+  const runnerRuntime = options.runtime ?? 'node';
   const signalTarget = options.signalTarget ?? process;
   const spawnChild = options.spawnChild ?? spawn;
   const stdout = options.stdout ?? process.stdout;
@@ -129,7 +193,8 @@ export async function runNodeRestartRunner(options) {
   let restarting = false;
   let stopping = false;
   const startChild = (resolveExitCode, cleanup) => {
-    child = spawnChild(process.execPath, ['--env-file=.env', '--import', 'tsx', 'src/main.ts', ...appArgs], {
+    const appCommand = buildAppCommand(runnerRuntime, env, appArgs);
+    child = spawnChild(appCommand.command, appCommand.args, {
       cwd: projectDirectory,
       env,
       stdio: 'inherit'
@@ -159,9 +224,12 @@ export async function runNodeRestartRunner(options) {
       if (!gate.hasMeaningfulChange(restartPaths)) {
         return;
       }
-      stdout.write(`[fluo] restarting after content change: ${relative(projectDirectory, restartPaths[restartPaths.length - 1] ?? projectDirectory)}\n`);
+      if (env[SHOW_NODE_RESTART_NOTICE_ENV] === '1') {
+        stdout.write(`[fluo] restarting after content change: ${relative(projectDirectory, restartPaths[restartPaths.length - 1] ?? projectDirectory)}\n`);
+      }
       const previousChild = child;
       const startReplacementChild = () => {
+        redrawDevScriptHeader(stdout, projectDirectory, env);
         startChild(resolveExitCode, cleanup);
         gate.commitBaseline(restartPaths);
       };
@@ -180,6 +248,7 @@ export async function runNodeRestartRunner(options) {
           if (stopping) {
             return;
           }
+          redrawDevScriptHeader(stdout, projectDirectory, env);
           startChild(resolveExitCode, cleanup);
           gate.commitBaseline(committedRestartPaths);
         });

package/dist/dev-runner/preserve-color-tty.d.ts

@@ -0,0 +1,2 @@
+declare function preserveTtyColorDetection(stream: NodeJS.WriteStream): void;
+//# sourceMappingURL=preserve-color-tty.d.ts.map

package/dist/dev-runner/preserve-color-tty.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"preserve-color-tty.d.ts","sourceRoot":"","sources":["../../src/dev-runner/preserve-color-tty.ts"],"names":[],"mappings":"AAAA,iBAAS,yBAAyB,CAAC,MAAM,EAAE,MAAM,CAAC,WAAW,GAAG,IAAI,CASnE"}

package/dist/dev-runner/preserve-color-tty.js

@@ -0,0 +1,12 @@
+function preserveTtyColorDetection(stream) {
+  try {
+    Object.defineProperty(stream, 'isTTY', {
+      configurable: true,
+      value: true
+    });
+  } catch (_error) {
+    return;
+  }
+}
+preserveTtyColorDetection(process.stdout);
+preserveTtyColorDetection(process.stderr);

package/dist/new/scaffold.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"scaffold.d.ts","sourceRoot":"","sources":["../../src/new/scaffold.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAE,gBAAgB,EAAkB,MAAM,YAAY,CAAC;AAqnEnE;;;;;;GAMG;AACH,wBAAsB,oBAAoB,CACxC,OAAO,EAAE,gBAAgB,EACzB,aAAa,SAAkB,GAC9B,OAAO,CAAC,IAAI,CAAC,CA6Bf;AAED;;GAEG;AACH,eAAO,MAAM,eAAe,6BAAuB,CAAC"}
+{"version":3,"file":"scaffold.d.ts","sourceRoot":"","sources":["../../src/new/scaffold.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAE,gBAAgB,EAAkB,MAAM,YAAY,CAAC;AAkoEnE;;;;;;GAMG;AACH,wBAAsB,oBAAoB,CACxC,OAAO,EAAE,gBAAgB,EACzB,aAAa,SAAkB,GAC9B,OAAO,CAAC,IAAI,CAAC,CA6Bf;AAED;;GAEG;AACH,eAAO,MAAM,eAAe,6BAAuB,CAAC"}