@livestore/utils-dev 0.4.0-dev.9 → 0.5.0-dev.0

package/dist/node/cmd-log.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"cmd-log.d.ts","sourceRoot":"","sources":["../../src/node/cmd-log.ts"],"names":[],"mappings":"AAGA,OAAO,EAAS,MAAM,EAAa,MAAM,yBAAyB,CAAA;AAElE,MAAM,MAAM,kBAAkB,GAAG;IAC/B,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,CAAA;IACxB,QAAQ,CAAC,WAAW,CAAC,EAAE,MAAM,CAAA;IAC7B,QAAQ,CAAC,YAAY,CAAC,EAAE,MAAM,CAAA;CAC/B,CAAA;AAED;;;GAGG;AACH,eAAO,MAAM,iBAAiB,EAAE,CAAC,OAAO,EAAE,kBAAkB,KAAK,MAAM,CAAC,MAAM,CAAC,MAAM,GAAG,SAAS,CAyD/F,CAAA;AAEF;;;GAGG;AACH,eAAO,MAAM,qBAAqB,EAAE,CAClC,YAAY,EAAE,MAAM,GAAG,CAAC,MAAM,GAAG,SAAS,CAAC,EAAE,EAC7C,OAAO,EAAE,kBAAkB,KACxB,MAAM,CAAC,MAAM,CAAC;IAAE,KAAK,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;IAAC,QAAQ,EAAE,OAAO,CAAC;IAAC,OAAO,CAAC,EAAE,MAAM,CAAA;CAAE,CAanF,CAAA"}

package/dist/node/cmd-log.js

@@ -0,0 +1,58 @@
+import fs from 'node:fs';
+import path from 'node:path';
+import { Cause, Effect, Predicate } from '@livestore/utils/effect';
+/**
+ * Prepares logging directories, archives previous canonical log and prunes archives.
+ * Returns the canonical current log path if logging is enabled, otherwise undefined.
+ */
+export const prepareCmdLogging = Effect.fn('cmd.logging.prepare')(function* ({ logDir, logFileName = 'dev.log', logRetention = 50 }) {
+    if (logDir == null || logDir === '')
+        return undefined;
+    const logsDir = logDir;
+    const archiveDir = path.join(logsDir, 'archive');
+    const currentLogPath = path.join(logsDir, logFileName);
+    // Ensure directories exist
+    yield* Effect.sync(() => fs.mkdirSync(archiveDir, { recursive: true }));
+    // Archive previous log if present
+    if (fs.existsSync(currentLogPath) === true) {
+        const safeIso = new Date().toISOString().replaceAll(':', '-');
+        const archivedBase = `${path.parse(logFileName).name}-${safeIso}.log`;
+        const archivedLog = path.join(archiveDir, archivedBase);
+        yield* Effect.try({
+            try: () => fs.renameSync(currentLogPath, archivedLog),
+            catch: (cause) => new Cause.UnknownError(cause),
+        }).pipe(Effect.catch(() => Effect.try({
+            try: () => {
+                fs.copyFileSync(currentLogPath, archivedLog);
+                fs.truncateSync(currentLogPath, 0);
+            },
+            catch: (cause) => new Cause.UnknownError(cause),
+        })), Effect.ignore);
+        // Prune archives to retain only the newest N
+        yield* Effect.try({
+            try: () => fs.readdirSync(archiveDir),
+            catch: (cause) => new Cause.UnknownError(cause),
+        }).pipe(Effect.map((names) => names.filter((n) => n.endsWith('.log'))), Effect.map((names) => names
+            .map((name) => ({ name, mtimeMs: fs.statSync(path.join(archiveDir, name)).mtimeMs }))
+            .sort((a, b) => b.mtimeMs - a.mtimeMs)), Effect.flatMap((entries) => Effect.forEach(entries.slice(logRetention), (e) => Effect.try({
+            try: () => fs.unlinkSync(path.join(archiveDir, e.name)),
+            catch: (cause) => new Cause.UnknownError(cause),
+        }).pipe(Effect.ignore))), Effect.ignore);
+    }
+    return currentLogPath;
+});
+/**
+ * Given a command input, applies logging by piping output through `tee` to the
+ * canonical log file. Returns the transformed input and whether a shell is required.
+ */
+export const applyLoggingToCommand = Effect.fn('cmd.logging.apply')(function* (commandInput, options) {
+    const asArray = Array.isArray(commandInput);
+    const parts = asArray === true ? commandInput.filter(Predicate.isNotUndefined) : undefined;
+    const logPath = yield* prepareCmdLogging(options);
+    return {
+        input: asArray === true ? (parts ?? []) : commandInput,
+        subshell: false,
+        ...(logPath !== undefined ? { logPath } : {}),
+    };
+});
+//# sourceMappingURL=cmd-log.js.map

package/dist/node/cmd-log.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"cmd-log.js","sourceRoot":"","sources":["../../src/node/cmd-log.ts"],"names":[],"mappings":"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"}

package/dist/node/cmd.d.ts

@@ -1,26 +1,32 @@
-import { type CommandExecutor, Effect, type PlatformError, Schema } from '@livestore/utils/effect';
+import { Cause, ChildProcessSpawner, Effect, type PlatformError, Schema } from '@livestore/utils/effect';
+import { CurrentWorkingDirectory } from './workspace.ts';
 export declare const cmd: (commandInput: string | (string | undefined)[], options?: {
-    cwd?: string;
     stderr?: 'inherit' | 'pipe';
     stdout?: 'inherit' | 'pipe';
     shell?: boolean;
     env?: Record<string, string | undefined>;
-} | undefined) => Effect.Effect<CommandExecutor.ExitCode, PlatformError.PlatformError | CmdError, CommandExecutor.CommandExecutor>;
+    /**
+     * When provided, streams command output to terminal AND to a canonical log file (`${logDir}/dev.log`) in this directory.
+     * Also archives the previous run to `${logDir}/archive/dev-<ISO>.log` and keeps only the latest 50 archives.
+     */
+    logDir?: string;
+    /** Optional basename for the canonical log file; defaults to 'dev.log' */
+    logFileName?: string;
+    /** Optional number of archived logs to retain; defaults to 50 */
+    logRetention?: number;
+}) => Effect.Effect<ChildProcessSpawner.ExitCode, PlatformError.PlatformError | CmdError, ChildProcessSpawner.ChildProcessSpawner | CurrentWorkingDirectory>;
 export declare const cmdText: (commandInput: string | (string | undefined)[], options?: {
-    cwd?: string;
     stderr?: 'inherit' | 'pipe';
     runInShell?: boolean;
     env?: Record<string, string | undefined>;
-}) => Effect.Effect<string, PlatformError.PlatformError, CommandExecutor.CommandExecutor>;
-declare const CmdError_base: Schema.TaggedErrorClass<CmdError, "CmdError", {
-    readonly _tag: Schema.tag<"CmdError">;
-} & {
-    command: typeof Schema.String;
-    args: Schema.Array$<typeof Schema.String>;
-    cwd: typeof Schema.String;
-    env: Schema.Record$<typeof Schema.String, Schema.UndefinedOr<typeof Schema.String>>;
-    stderr: Schema.Literal<["inherit", "pipe"]>;
-}>;
+}) => Effect.Effect<string, PlatformError.PlatformError, ChildProcessSpawner.ChildProcessSpawner | CurrentWorkingDirectory>;
+declare const CmdError_base: Schema.Class<CmdError, Schema.TaggedStruct<"CmdError", {
+    readonly command: Schema.String;
+    readonly args: Schema.$Array<Schema.String>;
+    readonly cwd: Schema.String;
+    readonly env: Schema.$Record<Schema.String, Schema.UndefinedOr<Schema.String>>;
+    readonly stderr: Schema.Literals<readonly ["inherit", "pipe"]>;
+}>, Cause.YieldableError>;
 export declare class CmdError extends CmdError_base {
 }
 export {};

package/dist/node/cmd.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"cmd.d.ts","sourceRoot":"","sources":["../../src/node/cmd.ts"],"names":[],"mappings":"AACA,OAAO,EAAW,KAAK,eAAe,EAAE,MAAM,EAAY,KAAK,aAAa,EAAE,MAAM,EAAE,MAAM,yBAAyB,CAAA;AAErH,eAAO,MAAM,GAAG,EAAE,CAChB,YAAY,EAAE,MAAM,GAAG,CAAC,MAAM,GAAG,SAAS,CAAC,EAAE,EAC7C,OAAO,CAAC,EACJ;IACE,GAAG,CAAC,EAAE,MAAM,CAAA;IACZ,MAAM,CAAC,EAAE,SAAS,GAAG,MAAM,CAAA;IAC3B,MAAM,CAAC,EAAE,SAAS,GAAG,MAAM,CAAA;IAC3B,KAAK,CAAC,EAAE,OAAO,CAAA;IACf,GAAG,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC,CAAA;CACzC,GACD,SAAS,KACV,MAAM,CAAC,MAAM,CAAC,eAAe,CAAC,QAAQ,EAAE,aAAa,CAAC,aAAa,GAAG,QAAQ,EAAE,eAAe,CAAC,eAAe,CAyChH,CAAA;AAEJ,eAAO,MAAM,OAAO,EAAE,CACpB,YAAY,EAAE,MAAM,GAAG,CAAC,MAAM,GAAG,SAAS,CAAC,EAAE,EAC7C,OAAO,CAAC,EAAE;IACR,GAAG,CAAC,EAAE,MAAM,CAAA;IACZ,MAAM,CAAC,EAAE,SAAS,GAAG,MAAM,CAAA;IAC3B,UAAU,CAAC,EAAE,OAAO,CAAA;IACpB,GAAG,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC,CAAA;CACzC,KACE,MAAM,CAAC,MAAM,CAAC,MAAM,EAAE,aAAa,CAAC,aAAa,EAAE,eAAe,CAAC,eAAe,CAyBtF,CAAA;;;;;;;;;;AAED,qBAAa,QAAS,SAAQ,aAM5B;CAAG"}
+{"version":3,"file":"cmd.d.ts","sourceRoot":"","sources":["../../src/node/cmd.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,EAEL,mBAAmB,EACnB,MAAM,EAGN,KAAK,aAAa,EAGlB,MAAM,EAEP,MAAM,yBAAyB,CAAA;AAKhC,OAAO,EAAE,uBAAuB,EAAE,MAAM,gBAAgB,CAAA;AAKxD,eAAO,MAAM,GAAG,EAAE,CAChB,YAAY,EAAE,MAAM,GAAG,CAAC,MAAM,GAAG,SAAS,CAAC,EAAE,EAC7C,OAAO,CAAC,EAAE;IACR,MAAM,CAAC,EAAE,SAAS,GAAG,MAAM,CAAA;IAC3B,MAAM,CAAC,EAAE,SAAS,GAAG,MAAM,CAAA;IAC3B,KAAK,CAAC,EAAE,OAAO,CAAA;IACf,GAAG,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC,CAAA;IACxC;;;OAGG;IACH,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,0EAA0E;IAC1E,WAAW,CAAC,EAAE,MAAM,CAAA;IACpB,iEAAiE;IACjE,YAAY,CAAC,EAAE,MAAM,CAAA;CACtB,KACE,MAAM,CAAC,MAAM,CAChB,mBAAmB,CAAC,QAAQ,EAC5B,aAAa,CAAC,aAAa,GAAG,QAAQ,EACtC,mBAAmB,CAAC,mBAAmB,GAAG,uBAAuB,CA8DjE,CAAA;AAEF,eAAO,MAAM,OAAO,EAAE,CACpB,YAAY,EAAE,MAAM,GAAG,CAAC,MAAM,GAAG,SAAS,CAAC,EAAE,EAC7C,OAAO,CAAC,EAAE;IACR,MAAM,CAAC,EAAE,SAAS,GAAG,MAAM,CAAA;IAC3B,UAAU,CAAC,EAAE,OAAO,CAAA;IACpB,GAAG,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC,CAAA;CACzC,KACE,MAAM,CAAC,MAAM,CAChB,MAAM,EACN,aAAa,CAAC,aAAa,EAC3B,mBAAmB,CAAC,mBAAmB,GAAG,uBAAuB,CAyBjE,CAAA;;;;;;;;AAEF,qBAAa,QAAS,SAAQ,aAM5B;CAAG"}

package/dist/node/cmd.js

@@ -1,55 +1,270 @@
-import { isNotUndefined, shouldNeverHappen } from '@livestore/utils';
-import { Command, Effect, identity, Schema } from '@livestore/utils/effect';
+import { Cause, ChildProcess, ChildProcessSpawner, Effect, Fiber, Logger, Predicate, References, Schema, Stream, } from '@livestore/utils/effect';
+import { NodeFileSystem } from '@livestore/utils/node';
+import { applyLoggingToCommand } from "./cmd-log.js";
+import * as FileLogger from "./FileLogger.js";
+import { CurrentWorkingDirectory } from "./workspace.js";
+// Branded zero value so we can compare exit codes without touching internals.
+const SUCCESS_EXIT_CODE = ChildProcessSpawner.ExitCode(0);
 export const cmd = Effect.fn('cmd')(function* (commandInput, options) {
-    const cwd = options?.cwd ?? process.env.WORKSPACE_ROOT ?? shouldNeverHappen('WORKSPACE_ROOT is not set');
-    const [command, ...args] = Array.isArray(commandInput)
-        ? commandInput.filter(isNotUndefined)
-        : commandInput.split(' ');
+    const cwd = yield* CurrentWorkingDirectory;
+    const asArray = Array.isArray(commandInput);
+    const parts = asArray === true ? commandInput.filter(Predicate.isNotUndefined) : undefined;
+    const [command, ...args] = asArray === true ? parts : commandInput.split(' ');
     const debugEnvStr = Object.entries(options?.env ?? {})
-        .map(([key, value]) => `${key}='${value}' `)
+        .map(([key, value]) => `${key}='${String(value)}' `)
         .join('');
-    const subshellStr = options?.shell ? ' (in subshell)' : '';
-    const commandDebugStr = debugEnvStr + [command, ...args].join(' ');
+    const loggingOpts = {
+        ...(options?.logDir !== undefined ? { logDir: options.logDir } : {}),
+        ...(options?.logFileName !== undefined ? { logFileName: options.logFileName } : {}),
+        ...(options?.logRetention !== undefined ? { logRetention: options.logRetention } : {}),
+    };
+    const { input: finalInput, subshell: needsShell, logPath } = yield* applyLoggingToCommand(commandInput, loggingOpts);
+    const stdoutMode = options?.stdout ?? 'inherit';
+    const stderrMode = options?.stderr ?? 'inherit';
+    const useShell = (options?.shell === true ? true : false) || needsShell;
+    const commandDebugStr = debugEnvStr + (Array.isArray(finalInput) === true ? finalInput.join(' ') : finalInput);
+    const subshellStr = useShell === true ? ' (in subshell)' : '';
     yield* Effect.logDebug(`Running '${commandDebugStr}' in '${cwd}'${subshellStr}`);
-    yield* Effect.annotateCurrentSpan({ 'span.label': commandDebugStr, cwd, command, args });
-    return yield* Command.make(command, ...args).pipe(
-    // TODO don't forward abort signal to the command
-    Command.stdin('inherit'), // Forward stdin to the command
-    // inherit = Stream stdout to process.stdout, pipe = Stream stdout to process.stderr
-    Command.stdout(options?.stdout ?? 'inherit'), 
-    // inherit = Stream stderr to process.stderr, pipe = Stream stderr to process.stdout
-    Command.stderr(options?.stderr ?? 'inherit'), Command.workingDirectory(cwd), options?.shell ? Command.runInShell(true) : identity, Command.env(options?.env ?? {}), Command.exitCode, Effect.tap((exitCode) => exitCode === 0
-        ? Effect.void
-        : Effect.fail(CmdError.make({
+    yield* Effect.annotateCurrentSpan({
+        'span.label': commandDebugStr,
+        cwd,
+        command,
+        args,
+        logDir: options?.logDir,
+    });
+    const baseArgs = {
+        commandInput: finalInput,
+        cwd,
+        env: options?.env ?? {},
+        stdoutMode,
+        stderrMode,
+        useShell,
+    };
+    const exitCode = yield* Predicate.isNotUndefined(logPath) === true
+        ? Effect.gen(function* () {
+            yield* Effect.sync(() => console.log(`Logging output to ${logPath}`));
+            return yield* runWithLogging({ ...baseArgs, logPath, threadName: commandDebugStr });
+        })
+        : runWithoutLogging(baseArgs);
+    if (exitCode !== SUCCESS_EXIT_CODE) {
+        return yield* CmdError.make({
             command: command,
             args,
             cwd,
             env: options?.env ?? {},
-            stderr: options?.stderr ?? 'inherit',
-        }))));
+            stderr: stderrMode,
+        });
+    }
+    return exitCode;
 });
 export const cmdText = Effect.fn('cmdText')(function* (commandInput, options) {
-    const cwd = options?.cwd ?? process.env.WORKSPACE_ROOT ?? shouldNeverHappen('WORKSPACE_ROOT is not set');
-    const [command, ...args] = Array.isArray(commandInput)
-        ? commandInput.filter(isNotUndefined)
-        : commandInput.split(' ');
+    const cwd = yield* CurrentWorkingDirectory;
+    const commandParts = Array.isArray(commandInput) === true ? commandInput.filter(Predicate.isNotUndefined) : commandInput.split(' ');
+    const [command, ...args] = commandParts;
     const debugEnvStr = Object.entries(options?.env ?? {})
-        .map(([key, value]) => `${key}='${value}' `)
+        .map(([key, value]) => `${key}='${String(value)}' `)
         .join('');
     const commandDebugStr = debugEnvStr + [command, ...args].join(' ');
-    const subshellStr = options?.runInShell ? ' (in subshell)' : '';
+    const subshellStr = options?.runInShell === true ? ' (in subshell)' : '';
     yield* Effect.logDebug(`Running '${commandDebugStr}' in '${cwd}'${subshellStr}`);
     yield* Effect.annotateCurrentSpan({ 'span.label': commandDebugStr, command, cwd });
-    return yield* Command.make(command, ...args).pipe(
-    // inherit = Stream stderr to process.stderr, pipe = Stream stderr to process.stdout
-    Command.stderr(options?.stderr ?? 'inherit'), Command.workingDirectory(cwd), options?.runInShell ? Command.runInShell(true) : identity, Command.env(options?.env ?? {}), Command.string);
+    const spawner = yield* ChildProcessSpawner.ChildProcessSpawner;
+    return yield* spawner.string(buildCommand(commandParts, {
+        cwd,
+        env: options?.env ?? {},
+        stderr: options?.stderr ?? 'inherit',
+        shell: options?.runInShell === true,
+    }));
 });
-export class CmdError extends Schema.TaggedError()('CmdError', {
+export class CmdError extends Schema.TaggedError('~@livestore/utils-dev/CmdError')('CmdError', {
     command: Schema.String,
     args: Schema.Array(Schema.String),
     cwd: Schema.String,
-    env: Schema.Record({ key: Schema.String, value: Schema.String.pipe(Schema.UndefinedOr) }),
-    stderr: Schema.Literal('inherit', 'pipe'),
+    env: Schema.Record(Schema.String, Schema.String.pipe(Schema.UndefinedOr)),
+    stderr: Schema.Literals(['inherit', 'pipe']),
 }) {
 }
+const runWithoutLogging = ({ commandInput, cwd, env, stdoutMode, stderrMode, useShell }) => Effect.gen(function* () {
+    const spawner = yield* ChildProcessSpawner.ChildProcessSpawner;
+    return yield* spawner.exitCode(buildCommand(commandInput, {
+        cwd,
+        env,
+        stdin: 'inherit',
+        stdout: stdoutMode,
+        stderr: stderrMode,
+        shell: useShell,
+    }));
+});
+const runWithLogging = ({ commandInput, cwd, env, stdoutMode, stderrMode, useShell, logPath, threadName, }) => 
+// When logging is enabled we have to replace the `2>&1 | tee` pipeline the
+// shell used to give us. We now pipe both streams through Effect so we can
+// mirror to the terminal (only when requested) and append formatted entries
+// into the canonical log ourselves.
+Effect.scoped(Effect.gen(function* () {
+    const envWithColor = env.FORCE_COLOR === undefined ? { ...env, FORCE_COLOR: '1' } : env;
+    const prettyLoggerOptions = {
+        colors: true,
+        stderr: false,
+        formatDate: FileLogger.formatLogTime,
+    };
+    const logStringToFile = yield* Logger.make(({ message }) => {
+        if (typeof message === 'string')
+            return message;
+        return String(message);
+    }).pipe(Logger.toFile(logPath, { flag: 'a' }), Effect.provide(NodeFileSystem.layer));
+    const FileLoggerLive = Logger.layer([logStringToFile]);
+    const appendLog = ({ channel, content }) => Effect.gen(function* () {
+        const date = new Date();
+        const formatted = FileLogger.formatPrettyLog({
+            logLevel: channel === 'stdout' ? 'Info' : 'Warn',
+            message: [`[${channel}]${content.length > 0 ? ` ${content}` : ''}`],
+            cause: Cause.empty,
+            date,
+            fiberId: 0,
+            spans: [[threadName, date.getTime()]],
+            annotations: { thread: threadName },
+            options: prettyLoggerOptions,
+        });
+        yield* Effect.log(formatted.endsWith('\n') === true ? formatted.slice(0, -1) : formatted).pipe(Effect.provideService(References.MinimumLogLevel, 'All'), Effect.provide(FileLoggerLive));
+    });
+    const command = buildCommand(commandInput, {
+        cwd,
+        env: envWithColor,
+        stdin: 'inherit',
+        stdout: 'pipe',
+        stderr: 'pipe',
+        shell: useShell,
+    });
+    // Acquire/start the command and make sure we kill it on interruption.
+    const spawner = yield* ChildProcessSpawner.ChildProcessSpawner;
+    const runningProcess = yield* Effect.acquireRelease(spawner.spawn(command), (proc) => proc.isRunning.pipe(Effect.flatMap((running) => running === true ? proc.kill().pipe(Effect.catch(() => Effect.void)) : Effect.void), Effect.ignore));
+    const stdoutHandler = makeStreamHandler({
+        channel: 'stdout',
+        ...(stdoutMode === 'inherit' ? { mirrorTarget: process.stdout } : {}),
+        appendLog,
+    });
+    const stderrHandler = makeStreamHandler({
+        channel: 'stderr',
+        ...(stderrMode === 'inherit' ? { mirrorTarget: process.stderr } : {}),
+        appendLog,
+    });
+    const stdoutFiber = yield* runningProcess.stdout.pipe(Stream.decodeText({ encoding: 'utf8' }), Stream.runForEach((chunk) => stdoutHandler.onChunk(chunk)), Effect.forkScoped);
+    const stderrFiber = yield* runningProcess.stderr.pipe(Stream.decodeText({ encoding: 'utf8' }), Stream.runForEach((chunk) => stderrHandler.onChunk(chunk)), Effect.forkScoped);
+    // Dump any buffered data and finish both stream fibers before we return.
+    const flushOutputs = Effect.gen(function* () {
+        const stillRunning = yield* runningProcess.isRunning.pipe(Effect.orElseSucceed(() => false));
+        if (stillRunning === true) {
+            yield* Effect.ignore(runningProcess.kill());
+        }
+        yield* Effect.ignore(Fiber.join(stdoutFiber));
+        yield* Effect.ignore(Fiber.join(stderrFiber));
+        yield* stdoutHandler.flush();
+        yield* stderrHandler.flush();
+    });
+    const exitCode = yield* runningProcess.exitCode.pipe(Effect.ensuring(flushOutputs));
+    return exitCode;
+}));
+const buildCommand = (input, options) => {
+    const commandOptions = {
+        cwd: options.cwd,
+        env: options.env,
+        extendEnv: true,
+        shell: options.shell,
+        ...(options.stdin !== undefined ? { stdin: options.stdin } : {}),
+        ...(options.stdout !== undefined ? { stdout: options.stdout } : {}),
+        ...(options.stderr !== undefined ? { stderr: options.stderr } : {}),
+    };
+    if (Array.isArray(input) === true) {
+        const [c, ...a] = input;
+        return ChildProcess.make(c ?? '', a, commandOptions);
+    }
+    if (options.shell === true) {
+        return ChildProcess.make(input, commandOptions);
+    }
+    const [c, ...a] = input.split(' ');
+    return ChildProcess.make(c ?? '', a, commandOptions);
+};
+const makeStreamHandler = ({ channel, mirrorTarget, appendLog, }) => {
+    let buffer = '';
+    // Effect's FileLogger expects line-oriented messages, but the subprocess
+    // gives us arbitrary UTF-8 chunks. We keep a tiny line splitter here so the
+    // log and console stay readable (and consistent with the previous `tee`
+    // behaviour).
+    const emit = (content, terminator) => emitSegment({
+        channel,
+        content,
+        terminator,
+        ...(mirrorTarget !== undefined ? { mirrorTarget } : {}),
+        appendLog,
+    });
+    const consumeBuffer = () => {
+        if (buffer.length === 0)
+            return Effect.void;
+        const lastChar = buffer[buffer.length - 1];
+        if (lastChar === '\r') {
+            const line = buffer.slice(0, -1);
+            buffer = '';
+            return emit(line, 'carriage-return');
+        }
+        const line = buffer;
+        buffer = '';
+        return line.length === 0 ? Effect.void : emit(line, 'none');
+    };
+    return {
+        onChunk: (chunk) => Effect.gen(function* () {
+            buffer += chunk;
+            while (buffer.length > 0) {
+                const newlineIndex = buffer.indexOf('\n');
+                const carriageIndex = buffer.indexOf('\r');
+                if (newlineIndex === -1 && carriageIndex === -1) {
+                    break;
+                }
+                let index;
+                let terminator;
+                let skip = 1;
+                if (carriageIndex !== -1 && (newlineIndex === -1 || carriageIndex < newlineIndex)) {
+                    index = carriageIndex;
+                    if (carriageIndex + 1 < buffer.length && buffer[carriageIndex + 1] === '\n') {
+                        skip = 2;
+                        terminator = 'newline';
+                    }
+                    else {
+                        terminator = 'carriage-return';
+                    }
+                }
+                else {
+                    index = newlineIndex;
+                    terminator = 'newline';
+                }
+                const line = buffer.slice(0, index);
+                buffer = buffer.slice(index + skip);
+                yield* emit(line, terminator);
+            }
+        }),
+        flush: () => consumeBuffer(),
+    };
+};
+const emitSegment = ({ channel, content, terminator, mirrorTarget, appendLog, }) => Effect.gen(function* () {
+    if (mirrorTarget !== undefined) {
+        yield* Effect.sync(() => mirrorSegment(mirrorTarget, content, terminator));
+    }
+    const contentForLog = terminator === 'carriage-return' ? `${content}\r` : content;
+    yield* appendLog({ channel, content: contentForLog });
+});
+const mirrorSegment = (target, content, terminator) => {
+    switch (terminator) {
+        case 'newline': {
+            target.write(`${content}\n`);
+            break;
+        }
+        case 'carriage-return': {
+            target.write(`${content}\r`);
+            break;
+        }
+        case 'none': {
+            target.write(content);
+            break;
+        }
+    }
+};
 //# sourceMappingURL=cmd.js.map

package/dist/node/cmd.js.map

@@ -1 +1 @@
-{"version":3,"file":"cmd.js","sourceRoot":"","sources":["../../src/node/cmd.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"cmd.js","sourceRoot":"","sources":["../../src/node/cmd.ts"],"names":[],"mappings":"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"}

package/dist/node/cmd.test.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=cmd.test.d.ts.map

package/dist/node/cmd.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"cmd.test.d.ts","sourceRoot":"","sources":["../../src/node/cmd.test.ts"],"names":[],"mappings":""}

package/dist/node/cmd.test.js

@@ -0,0 +1,103 @@
+import fs from 'node:fs';
+import path from 'node:path';
+import { expect } from 'vitest';
+import { Vitest } from '@livestore/utils-dev/node-vitest';
+import { ChildProcessSpawner, Duration, Effect, Layer } from '@livestore/utils/effect';
+import { PlatformNode } from '@livestore/utils/node';
+import { cmd } from "./cmd.js";
+import { CurrentWorkingDirectory } from "./workspace.js";
+const withNode = Vitest.makeWithTestCtx({
+    makeLayer: () => Layer.mergeAll(PlatformNode.NodeServices.layer, CurrentWorkingDirectory.live),
+    timeout: 20_000,
+});
+Vitest.describe('cmd helper', () => {
+    const ansiRegex = new RegExp(`${String.fromCharCode(27)}\\[[0-9;]*m`, 'g');
+    Vitest.live('runs tokenized string without shell', (test) => Effect.gen(function* () {
+        const exit = yield* cmd('printf ok');
+        expect(exit).toBe(ChildProcessSpawner.ExitCode(0));
+    }).pipe(withNode(test)));
+    Vitest.live('runs array input', (test) => Effect.gen(function* () {
+        const exit = yield* cmd(['printf', 'ok']);
+        expect(exit).toBe(ChildProcessSpawner.ExitCode(0));
+    }).pipe(withNode(test)));
+    /** TODO(#1020): Investigate CI timeout flakiness for cmd tests that spawn many child processes */
+    Vitest.live('supports logging with archive + retention', (test) => Effect.gen(function* () {
+        const workspace = process.env.WORKSPACE_ROOT;
+        const logsDir = path.join(workspace, 'tmp', 'cmd-tests', String(Date.now()));
+        // first run
+        const exit1 = yield* cmd('printf first', { logDir: logsDir });
+        expect(exit1).toBe(ChildProcessSpawner.ExitCode(0));
+        const current = path.join(logsDir, 'dev.log');
+        expect(fs.existsSync(current)).toBe(true);
+        const firstLog = fs.readFileSync(current, 'utf8');
+        const firstStdoutLines = firstLog.split('\n').filter((line) => line.includes('[stdout]'));
+        expect(firstStdoutLines.length).toBeGreaterThan(0);
+        for (const line of firstStdoutLines) {
+            expect(line).toContain('[stdout] first');
+            expect(line).toMatch(/Info/i);
+            expect(line).toContain('printf first');
+        }
+        // second run — archives previous
+        const exit2 = yield* cmd('printf second', { logDir: logsDir });
+        expect(exit2).toBe(ChildProcessSpawner.ExitCode(0));
+        const archiveDir = path.join(logsDir, 'archive');
+        const archives = fs.readdirSync(archiveDir).filter((f) => f.endsWith('.log'));
+        expect(archives.length).toBe(1);
+        const archivedPath = path.join(archiveDir, archives[0]);
+        const archivedLog = fs.readFileSync(archivedPath, 'utf8');
+        const archivedStdoutLines = archivedLog.split('\n').filter((line) => line.includes('[stdout]'));
+        expect(archivedStdoutLines.length).toBeGreaterThan(0);
+        for (const line of archivedStdoutLines) {
+            expect(line).toContain('[stdout] first');
+        }
+        const secondLog = fs.readFileSync(current, 'utf8');
+        const secondStdoutLines = secondLog.split('\n').filter((line) => line.includes('[stdout]'));
+        expect(secondStdoutLines.length).toBeGreaterThan(0);
+        for (const line of secondStdoutLines) {
+            expect(line).toContain('[stdout] second');
+            expect(line).toMatch(/Info/i);
+        }
+        // generate many archives to exercise retention (keep 50)
+        for (let i = 0; i < 60; i++) {
+            // Use small unique payloads
+            yield* cmd(['printf', String(i)], { logDir: logsDir });
+        }
+        const archivesAfter = fs.readdirSync(archiveDir).filter((f) => f.endsWith('.log'));
+        expect(archivesAfter.length).toBeLessThanOrEqual(50);
+    }).pipe(withNode(test)), { timeout: 30_000, retry: 3 });
+    Vitest.live('streams stdout and stderr with logger formatting', (test) => Effect.gen(function* () {
+        const workspace = process.env.WORKSPACE_ROOT;
+        const logsDir = path.join(workspace, 'tmp', 'cmd-tests', `format-${Date.now()}`);
+        const exit = yield* cmd(['node', '-e', "console.log('out'); console.error('err')"], {
+            logDir: logsDir,
+        });
+        expect(exit).toBe(ChildProcessSpawner.ExitCode(0));
+        const current = path.join(logsDir, 'dev.log');
+        const logContent = fs.readFileSync(current, 'utf8');
+        expect(logContent).toMatch(/\[stdout] out/);
+        expect(logContent).toMatch(/\[stderr] err/);
+        const relevantLines = logContent
+            .split('\n')
+            .map((line) => line.trim())
+            .filter((line) => line.includes('[stdout]') || line.includes('[stderr]'));
+        expect(relevantLines.length).toBeGreaterThanOrEqual(2);
+        for (const line of relevantLines) {
+            const stripped = line.replace(ansiRegex, '');
+            expect(stripped.startsWith('[')).toBe(true);
+            expect(stripped).toMatch(/(Info|Warn)/i);
+            expect(stripped).toMatch(/\[(stdout|stderr)]/);
+        }
+    }).pipe(withNode(test)));
+    Vitest.live('cleans up logged child process when interrupted', (test) => Effect.gen(function* () {
+        const workspace = process.env.WORKSPACE_ROOT;
+        const logsDir = path.join(workspace, 'tmp', 'cmd-tests', `timeout-${Date.now()}`);
+        const result = yield* cmd(['node', '-e', 'setTimeout(() => {}, 5000)'], {
+            logDir: logsDir,
+            stdout: 'pipe',
+            stderr: 'pipe',
+        }).pipe(Effect.timeoutOption(Duration.millis(200)));
+        expect(result._tag).toBe('None');
+        expect(fs.existsSync(path.join(logsDir, 'dev.log'))).toBe(true);
+    }).pipe(withNode(test)));
+});
+//# sourceMappingURL=cmd.test.js.map

package/dist/node/cmd.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"cmd.test.js","sourceRoot":"","sources":["../../src/node/cmd.test.ts"],"names":[],"mappings":"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"}

package/dist/node/mod.d.ts

@@ -1,11 +1,11 @@
-import type { Tracer } from '@livestore/utils/effect';
-import { Effect, Layer, OtelTracer } from '@livestore/utils/effect';
 import * as otel from '@opentelemetry/api';
+import { type Tracer, Effect, Layer, OtelTracer } from '@livestore/utils/effect';
 export { OTLPMetricExporter } from '@opentelemetry/exporter-metrics-otlp-http';
 export { OTLPTraceExporter } from '@opentelemetry/exporter-trace-otlp-http';
 export * from './cmd.ts';
-export { type DockerComposeArgs, DockerComposeError, type DockerComposeOperations, DockerComposeService, type LogsOptions, type StartOptions, startDockerComposeServicesScoped, } from './DockerComposeService/DockerComposeService.ts';
+export * from './DockerCompose/mod.ts';
 export * as FileLogger from './FileLogger.ts';
+export * from './workspace.ts';
 export declare const OtelLiveHttp: ({ serviceName, rootSpanName, rootSpanAttributes, parentSpan, skipLogUrl, traceNodeBootstrap, }?: {
     serviceName?: string;
     rootSpanName?: string;
@@ -13,7 +13,7 @@ export declare const OtelLiveHttp: ({ serviceName, rootSpanName, rootSpanAttribu
     rootSpanAttributes?: Record<string, unknown>;
     skipLogUrl?: boolean;
     traceNodeBootstrap?: boolean;
-}) => Layer.Layer<OtelTracer.OtelTracer | Tracer.ParentSpan, never, never>;
+}) => Layer.Layer<OtelTracer.OtelTracer | Tracer.Tracer | Tracer.ParentSpan>;
 export declare const logTraceUiUrlForSpan: (printMsg?: (url: string) => string) => (span: otel.Span) => Effect.Effect<string | undefined, never, never>;
-export declare const getTracingBackendUrl: (span: otel.Span) => Effect.Effect<string | undefined, never, never>;
+export declare const getTracingBackendUrl: (traceIdOrSpan: string | otel.Span) => Effect.Effect<string | undefined, never, never>;
 //# sourceMappingURL=mod.d.ts.map

package/dist/node/mod.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"mod.d.ts","sourceRoot":"","sources":["../../src/node/mod.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,yBAAyB,CAAA;AACrD,OAAO,EAAU,MAAM,EAAY,KAAK,EAAY,UAAU,EAAE,MAAM,yBAAyB,CAAA;AAE/F,OAAO,KAAK,IAAI,MAAM,oBAAoB,CAAA;AAM1C,OAAO,EAAE,kBAAkB,EAAE,MAAM,2CAA2C,CAAA;AAC9E,OAAO,EAAE,iBAAiB,EAAE,MAAM,yCAAyC,CAAA;AAC3E,cAAc,UAAU,CAAA;AACxB,OAAO,EACL,KAAK,iBAAiB,EACtB,kBAAkB,EAClB,KAAK,uBAAuB,EAC5B,oBAAoB,EACpB,KAAK,WAAW,EAChB,KAAK,YAAY,EACjB,gCAAgC,GACjC,MAAM,gDAAgD,CAAA;AACvD,OAAO,KAAK,UAAU,MAAM,iBAAiB,CAAA;AAE7C,eAAO,MAAM,YAAY,GAAI,iGAO1B;IACD,WAAW,CAAC,EAAE,MAAM,CAAA;IACpB,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB,UAAU,CAAC,EAAE,MAAM,CAAC,OAAO,CAAA;IAC3B,kBAAkB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;IAC5C,UAAU,CAAC,EAAE,OAAO,CAAA;IACpB,kBAAkB,CAAC,EAAE,OAAO,CAAA;CACxB,KAAG,KAAK,CAAC,KAAK,CAAC,UAAU,CAAC,UAAU,GAAG,MAAM,CAAC,UAAU,EAAE,KAAK,EAAE,KAAK,CA0FxC,CAAA;AAEpC,eAAO,MAAM,oBAAoB,GAAI,WAAW,CAAC,GAAG,EAAE,MAAM,KAAK,MAAM,MAAM,MAAM,IAAI,CAAC,IAAI,oDAazF,CAAA;AAEH,eAAO,MAAM,oBAAoB,GAAI,MAAM,IAAI,CAAC,IAAI,oDAqBhD,CAAA"}
+{"version":3,"file":"mod.d.ts","sourceRoot":"","sources":["../../src/node/mod.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,IAAI,MAAM,oBAAoB,CAAA;AAG1C,OAAO,EACL,KAAK,MAAM,EAGX,MAAM,EAGN,KAAK,EAEL,UAAU,EAGX,MAAM,yBAAyB,CAAA;AAGhC,OAAO,EAAE,kBAAkB,EAAE,MAAM,2CAA2C,CAAA;AAC9E,OAAO,EAAE,iBAAiB,EAAE,MAAM,yCAAyC,CAAA;AAC3E,cAAc,UAAU,CAAA;AACxB,cAAc,wBAAwB,CAAA;AACtC,OAAO,KAAK,UAAU,MAAM,iBAAiB,CAAA;AAC7C,cAAc,gBAAgB,CAAA;AAE9B,eAAO,MAAM,YAAY,GAAI,iGAO1B;IACD,WAAW,CAAC,EAAE,MAAM,CAAA;IACpB,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB,UAAU,CAAC,EAAE,MAAM,CAAC,OAAO,CAAA;IAC3B,kBAAkB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;IAC5C,UAAU,CAAC,EAAE,OAAO,CAAA;IACpB,kBAAkB,CAAC,EAAE,OAAO,CAAA;CACxB,KAAG,KAAK,CAAC,KAAK,CAAC,UAAU,CAAC,UAAU,GAAG,MAAM,CAAC,MAAM,GAAG,MAAM,CAAC,UAAU,CAiFvD,CAAA;AAEvB,eAAO,MAAM,oBAAoB,GAAI,WAAW,CAAC,GAAG,EAAE,MAAM,KAAK,MAAM,MAAM,MAAM,IAAI,CAAC,IAAI,oDAC7B,CAAA;AAiB/D,eAAO,MAAM,oBAAoB,GAAI,eAAe,MAAM,GAAG,IAAI,CAAC,IAAI,oDAsB/C,CAAA"}