alchemy 2.0.0-beta.84 → 2.0.0-beta.85

package/lib/Cli/GlobalLog.d.ts

@@ -1,41 +1,87 @@
+import * as GlobalFlag from "effect/cli/GlobalFlag";
+import * as Context from "effect/Context";
 import * as Effect from "effect/Effect";
 import * as FileSystem from "effect/FileSystem";
 import * as Layer from "effect/Layer";
 import * as Logger from "effect/Logger";
 import * as LogLevel from "effect/LogLevel";
+import * as Option from "effect/Option";
 import { Path } from "effect/Path";
 /**
- * The console keeps its usual Info+ noise floor by default; everything below
- * it exists only for the run log, so support requests can start with "attach
- * the file from ~/.alchemy/logs". An explicit `--log-level` lowers the floor
- * for that run so `--log-level debug` actually puts debug records on the
- * terminal (#1231) — the run log captures Debug regardless.
- *
- * Read from argv rather than `GlobalFlag.LogLevel` because the console logger
- * is installed while the service layers are built, before the parser has
- * produced flag values (same reason `--no-input` is an argv scan). Only the
- * segment before a `--` separator is inspected; an unrecognised value falls
- * back to Info and is left for the parser to reject.
+ * `--log-level`: the lowest level printed on the console. Registered on the
+ * CLI root in place of Effect's built-in flag, which also lowers the
+ * minimum log level and so would drop records from the run log; the run
+ * log records Debug whatever the console shows.
+ */
+export declare const LogLevelFlag: GlobalFlag.Setting<"log-level", Option.Option<LogLevel.LogLevel>>;
+/** How the terminal shows log records. */
+export type LogFormat = "pretty" | "json";
+/**
+ * `--log-format pretty|json`: `json` prints one {@link LogRecord} per line
+ * on stderr and leaves rendering to the reader. Registered on the CLI root;
+ * the console logger reads the parsed value (see {@link consoleSettings}).
+ */
+export declare const LogFormatFlag: GlobalFlag.Setting<"log-format", Option.Option<"json" | "pretty">>;
+/** What the console shows, and how. */
+export interface ConsoleSettings {
+    /** Records below this level stay in the run log only. */
+    readonly floor: LogLevel.LogLevel;
+    readonly format: LogFormat;
+}
+/**
+ * The console settings in `context`: the parsed `--log-level` and
+ * `--log-format` flags inside a command, and otherwise (before the command
+ * line is parsed, or in a child process that never sees it) the `ALCHEMY_LOG_*` environment variables. The console keeps its
+ * usual Info+ noise floor by default; the run log captures Debug regardless
+ * (#1231).
+ */
+export declare const consoleSettings: (context: Context.Context<never>) => ConsoleSettings;
+/** The current fiber's {@link consoleSettings}. */
+export declare const currentConsoleSettings: Effect.Effect<ConsoleSettings>;
+/** {@link ConsoleSettings} as environment, for a child process that renders the run's logs. */
+export declare const consoleSettingsEnv: (settings: ConsoleSettings) => Record<string, string>;
+/**
+ * Terminal sink: forwards records at or above the logging fiber's
+ * {@link consoleSettings} floor to `sink`, or to the sink its settings
+ * select.
  */
-export declare const consoleLogFloor: (argv: ReadonlyArray<string>) => LogLevel.LogLevel;
-/** Terminal sink: forwards records at or above `floor` to `sink`. */
-export declare const makeConsoleLogger: (floor: LogLevel.LogLevel, sink?: Logger.Logger<unknown, void>) => Logger.Logger<unknown, void>;
+export declare const makeConsoleLogger: (sink?: Logger.Logger<unknown, void>) => Logger.Logger<unknown, void>;
 /** Shared terminal logger for CLI entrypoints that do not need a run file. */
 export declare const ConsoleLogLive: Layer.Layer<never, never, never>;
 /**
- * Debug run log for the whole CLI under `~/.alchemy/logs` (relocated by
- * `ALCHEMY_HOME` together with the rest of the auth state). Every run writes
- * `{timestamp}-pid{pid}.log` in logfmt at Debug level — profile/auth flows
- * and command failures record their full causes there even though the
- * terminal only shows the friendly message. Console output stays at Info+
- * unless `--log-level` lowers the floor (see {@link consoleLogFloor}).
+ * The run log's file logger alone. The run log is the only log file: the
+ * top-level CLI process writes it, and records its children already showed
+ * on the terminal (the `alchemy dev` exec child's) go here without being
+ * printed again.
+ */
+export declare const RunLog: Context.Reference<Logger.Logger<unknown, void>>;
+/**
+ * A run log file that is created on its first record, so a run that sends
+ * nothing to it leaves nothing behind (and a `profile` command run outside
+ * a project never creates a `.alchemy` there). The file starts with a `run`
+ * record describing the run, so it reads standalone.
+ *
+ * A logger is called synchronously but the file is written asynchronously,
+ * so the logger only queues each record as a JSON line, and one writer fiber
+ * creates the file on the first line and appends the rest. Closing the log
+ * ends the queue and waits for the writer, so no queued record is lost.
+ *
+ * @internal exported for tests.
+ */
+export declare const lazyRunLog: (dir: string, name: string, scope: "global" | "project") => Effect.Effect<Logger.Logger<unknown, void>, never, FileSystem.FileSystem | Path | import("effect/Scope").Scope>;
+/**
+ * The two run logs: records scoped `global` (the state store, auth,
+ * profiles; see `globalLogs`) go to `~/.alchemy/logs` (relocated by
+ * `ALCHEMY_HOME`), everything else to the project's `.alchemy/log`. Every
+ * run writes `{timestamp}-pid{pid}.ndjson` (NDJSON log records) at Debug
+ * level — failures record their full causes there even though the terminal
+ * only shows the friendly message. Console output stays at Info+ unless
+ * `--log-level` lowers the floor (see {@link consoleSettings}).
  *
- * Commands that install their own loggers with `mergeWithExisting: true`
- * compose with this one; a replacing `Logger.layer` scopes it out for that
- * subtree only. Best-effort throughout: an unwritable `~/.alchemy` must
- * never take the CLI down with it.
+ * Only the top-level CLI process writes them; its children's records reach
+ * them through it. Commands that install their own loggers with
+ * `mergeWithExisting: true` compose with these; a replacing `Logger.layer`
+ * scopes them out for that subtree only.
  */
 export declare const GlobalLogLive: Layer.Layer<never, never, FileSystem.FileSystem | Path>;
-/** First line of every run log: enough context to read it standalone. */
-export declare const logRunHeader: Effect.Effect<void>;
 //# sourceMappingURL=GlobalLog.d.ts.map

package/lib/Cli/GlobalLog.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"GlobalLog.d.ts","sourceRoot":"","sources":["../../src/Cli/GlobalLog.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AACxC,OAAO,KAAK,UAAU,MAAM,mBAAmB,CAAC;AAChD,OAAO,KAAK,KAAK,MAAM,cAAc,CAAC;AACtC,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AACxC,OAAO,KAAK,QAAQ,MAAM,iBAAiB,CAAC;AAE5C,OAAO,EAAE,IAAI,EAAE,MAAM,aAAa,CAAC;AAsBnC;;;;;;;;;;;;GAYG;AACH,eAAO,MAAM,eAAe,SAAU,aAAa,CAAC,MAAM,CAAC,KAAG,QAAQ,CAAC,QAgBtE,CAAC;AAEF,qEAAqE;AACrE,eAAO,MAAM,iBAAiB,UACrB,QAAQ,CAAC,QAAQ,SAClB,MAAM,CAAC,MAAM,CAAC,OAAO,EAAE,IAAI,CAAC,iCAMhC,CAAC;AAEL,8EAA8E;AAC9E,eAAO,MAAM,cAAc,kCAG1B,CAAC;AAKF;;;;;;;;;;;;GAYG;AACH,eAAO,MAAM,aAAa,yDAwCzB,CAAC;AAEF,yEAAyE;AACzE,eAAO,MAAM,YAAY,EAAE,MAAM,CAAC,MAAM,CAAC,IAAI,CAE5C,CAAC"}
+{"version":3,"file":"GlobalLog.d.ts","sourceRoot":"","sources":["../../src/Cli/GlobalLog.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,UAAU,MAAM,uBAAuB,CAAC;AAEpD,OAAO,KAAK,OAAO,MAAM,gBAAgB,CAAC;AAE1C,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AAExC,OAAO,KAAK,UAAU,MAAM,mBAAmB,CAAC;AAChD,OAAO,KAAK,KAAK,MAAM,cAAc,CAAC;AACtC,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AACxC,OAAO,KAAK,QAAQ,MAAM,iBAAiB,CAAC;AAC5C,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AACxC,OAAO,EAAE,IAAI,EAAE,MAAM,aAAa,CAAC;AAkCnC;;;;;GAKG;AACH,eAAO,MAAM,YAAY,mEAMvB,CAAC;AAEH,0CAA0C;AAC1C,MAAM,MAAM,SAAS,GAAG,QAAQ,GAAG,MAAM,CAAC;AAE1C;;;;GAIG;AACH,eAAO,MAAM,aAAa,oEAKxB,CAAC;AAEH,uCAAuC;AACvC,MAAM,WAAW,eAAe;IAC9B,yDAAyD;IACzD,QAAQ,CAAC,KAAK,EAAE,QAAQ,CAAC,QAAQ,CAAC;IAClC,QAAQ,CAAC,MAAM,EAAE,SAAS,CAAC;CAC5B;AAKD;;;;;;GAMG;AACH,eAAO,MAAM,eAAe,YAAa,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,KAAG,eAShE,CAAC;AAEH,mDAAmD;AACnD,eAAO,MAAM,sBAAsB,EAAE,MAAM,CAAC,MAAM,CAAC,eAAe,CAGjE,CAAC;AAEF,+FAA+F;AAC/F,eAAO,MAAM,kBAAkB,aAAc,eAAe,KAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CAGlF,CAAC;AAKH;;;;GAIG;AACH,eAAO,MAAM,iBAAiB,UAAW,MAAM,CAAC,MAAM,CAAC,OAAO,EAAE,IAAI,CAAC,iCAMjE,CAAC;AAEL,8EAA8E;AAC9E,eAAO,MAAM,cAAc,kCAG1B,CAAC;AAKF;;;;;GAKG;AACH,eAAO,MAAM,MAAM,iDAEjB,CAAC;AAyBH;;;;;;;;;;;;GAYG;AACH,eAAO,MAAM,UAAU,6KA6BrB,CAAC;AAEH;;;;;;;;;;;;;GAaG;AACH,eAAO,MAAM,aAAa,yDA2BzB,CAAC"}

package/lib/Cli/GlobalLog.js

@@ -1,19 +1,28 @@
+import * as Flag from "effect/cli/Flag";
+import * as GlobalFlag from "effect/cli/GlobalFlag";
 import * as Clock from "effect/Clock";
+import * as Context from "effect/Context";
 import * as Duration from "effect/Duration";
 import * as Effect from "effect/Effect";
+import * as Fiber from "effect/Fiber";
 import * as FileSystem from "effect/FileSystem";
 import * as Layer from "effect/Layer";
 import * as Logger from "effect/Logger";
 import * as LogLevel from "effect/LogLevel";
 import * as Option from "effect/Option";
 import { Path } from "effect/Path";
-import { MinimumLogLevel } from "effect/References";
+import * as Queue from "effect/Queue";
+import { CurrentLogAnnotations, MinimumLogLevel } from "effect/References";
 import packageJson from "../../package.json" with { type: "json" };
+import { dotAlchemyDirectory } from "../AlchemyContext.js";
 import { rootDir } from "../Auth/Paths.js";
 import { makePlainConsoleSink } from "../Util/ConsoleSink.js";
+import { LogAnnotation } from "../Util/LogAnnotation.js";
+import { formatJsonRecord, jsonLogger, LOG_FORMAT_ENV, LOG_LEVEL_ENV, safeStringify, } from "../Util/LogRecord.js";
+import { processTrace } from "../Util/TraceParent.js";
 /** Logs older than this are pruned (by mtime) on CLI start. */
 const MAX_LOG_AGE = Duration.days(7);
-/** Same spellings `GlobalFlag.LogLevel` accepts, so the two never disagree. */
+/** The `--log-level` / `ALCHEMY_LOG_LEVEL` spellings. */
 const logLevelChoices = {
     all: "All",
     trace: "Trace",
@@ -26,84 +35,167 @@ const logLevelChoices = {
     none: "None",
 };
 /**
- * The console keeps its usual Info+ noise floor by default; everything below
- * it exists only for the run log, so support requests can start with "attach
- * the file from ~/.alchemy/logs". An explicit `--log-level` lowers the floor
- * for that run so `--log-level debug` actually puts debug records on the
- * terminal (#1231) — the run log captures Debug regardless.
- *
- * Read from argv rather than `GlobalFlag.LogLevel` because the console logger
- * is installed while the service layers are built, before the parser has
- * produced flag values (same reason `--no-input` is an argv scan). Only the
- * segment before a `--` separator is inspected; an unrecognised value falls
- * back to Info and is left for the parser to reject.
+ * `--log-level`: the lowest level printed on the console. Registered on the
+ * CLI root in place of Effect's built-in flag, which also lowers the
+ * minimum log level and so would drop records from the run log; the run
+ * log records Debug whatever the console shows.
  */
-export const consoleLogFloor = (argv) => {
-    const separator = argv.indexOf("--");
-    const flagArgs = separator === -1 ? argv : argv.slice(0, separator);
-    let floor = "Info";
-    for (let i = 0; i < flagArgs.length; i++) {
-        const arg = flagArgs[i];
-        const value = arg === "--log-level"
-            ? flagArgs[i + 1]
-            : arg.startsWith("--log-level=")
-                ? arg.slice("--log-level=".length)
-                : undefined;
-        if (value === undefined)
-            continue;
-        floor = logLevelChoices[value.toLowerCase()] ?? floor;
-    }
-    return floor;
-};
-/** Terminal sink: forwards records at or above `floor` to `sink`. */
-export const makeConsoleLogger = (floor, sink = makePlainConsoleSink()) => Logger.make((options) => {
-    if (LogLevel.isGreaterThanOrEqualTo(options.logLevel, floor)) {
-        sink.log(options);
+export const LogLevelFlag = GlobalFlag.Setting("log-level")({
+    flag: Flag.ChoiceWithValue("log-level", Object.entries(logLevelChoices)).pipe(Flag.optional, Flag.withDescription("Lowest level printed on the console"), Flag.withMetavar("<all|trace|debug|info|warn|error|fatal|none>")),
+});
+/**
+ * `--log-format pretty|json`: `json` prints one {@link LogRecord} per line
+ * on stderr and leaves rendering to the reader. Registered on the CLI root;
+ * the console logger reads the parsed value (see {@link consoleSettings}).
+ */
+export const LogFormatFlag = GlobalFlag.Setting("log-format")({
+    flag: Flag.Literals("log-format", ["pretty", "json"]).pipe(Flag.withDescription("Print log records as text or as JSON lines on stderr"), Flag.optional),
+});
+const flagValue = (context, flag) => Context.getOption(context, flag).pipe(Option.flatten, Option.getOrUndefined);
+/**
+ * The console settings in `context`: the parsed `--log-level` and
+ * `--log-format` flags inside a command, and otherwise (before the command
+ * line is parsed, or in a child process that never sees it) the `ALCHEMY_LOG_*` environment variables. The console keeps its
+ * usual Info+ noise floor by default; the run log captures Debug regardless
+ * (#1231).
+ */
+export const consoleSettings = (context) => ({
+    floor: flagValue(context, LogLevelFlag) ??
+        logLevelChoices[process.env[LOG_LEVEL_ENV]?.toLowerCase() ?? ""] ??
+        "Info",
+    format: (flagValue(context, LogFormatFlag) ?? process.env[LOG_FORMAT_ENV]) === "json"
+        ? "json"
+        : "pretty",
+});
+/** The current fiber's {@link consoleSettings}. */
+export const currentConsoleSettings = Effect.map(Effect.context(), consoleSettings);
+/** {@link ConsoleSettings} as environment, for a child process that renders the run's logs. */
+export const consoleSettingsEnv = (settings) => ({
+    [LOG_LEVEL_ENV]: settings.floor,
+    [LOG_FORMAT_ENV]: settings.format,
+});
+const jsonSink = jsonLogger((line) => process.stderr.write(`${line}\n`));
+const prettySink = makePlainConsoleSink();
+/**
+ * Terminal sink: forwards records at or above the logging fiber's
+ * {@link consoleSettings} floor to `sink`, or to the sink its settings
+ * select.
+ */
+export const makeConsoleLogger = (sink) => Logger.make((options) => {
+    const settings = consoleSettings(options.fiber.context);
+    if (LogLevel.isGreaterThanOrEqualTo(options.logLevel, settings.floor)) {
+        (sink ?? (settings.format === "json" ? jsonSink : prettySink)).log(options);
     }
 });
 /** Shared terminal logger for CLI entrypoints that do not need a run file. */
-export const ConsoleLogLive = Layer.mergeAll(Logger.layer([makeConsoleLogger(consoleLogFloor(process.argv.slice(2)))]), Layer.succeed(MinimumLogLevel, "Debug"));
+export const ConsoleLogLive = Layer.mergeAll(Logger.layer([makeConsoleLogger()]), Layer.succeed(MinimumLogLevel, "Debug"));
 /** Drops everything — the fallback when the log file cannot be opened. */
 const noopLogger = Logger.make(() => { });
 /**
- * Debug run log for the whole CLI under `~/.alchemy/logs` (relocated by
- * `ALCHEMY_HOME` together with the rest of the auth state). Every run writes
- * `{timestamp}-pid{pid}.log` in logfmt at Debug level — profile/auth flows
- * and command failures record their full causes there even though the
- * terminal only shows the friendly message. Console output stays at Info+
- * unless `--log-level` lowers the floor (see {@link consoleLogFloor}).
- *
- * Commands that install their own loggers with `mergeWithExisting: true`
- * compose with this one; a replacing `Logger.layer` scopes it out for that
- * subtree only. Best-effort throughout: an unwritable `~/.alchemy` must
- * never take the CLI down with it.
+ * The run log's file logger alone. The run log is the only log file: the
+ * top-level CLI process writes it, and records its children already showed
+ * on the terminal (the `alchemy dev` exec child's) go here without being
+ * printed again.
  */
-export const GlobalLogLive = Layer.unwrap(Effect.gen(function* () {
+export const RunLog = Context.Reference("alchemy/Cli/RunLog", {
+    defaultValue: () => noopLogger,
+});
+/** Delete run logs in `dir` older than {@link MAX_LOG_AGE}. Best-effort. */
+const pruneRunLogs = (dir) => Effect.gen(function* () {
     const fs = yield* FileSystem.FileSystem;
     const path = yield* Path;
-    const dir = path.join(rootDir(), "logs");
-    yield* fs.makeDirectory(dir, { recursive: true });
-    // Prune stale run logs so the directory stays bounded.
     const now = yield* Clock.currentTimeMillis;
     const entries = yield* fs.readDirectory(dir).pipe(Effect.orElseSucceed(() => []));
-    yield* Effect.forEach(entries, (entry) => Effect.gen(function* () {
+    // Only run logs: the directory may hold other tools' logs (the test
+    // runner's `test/`).
+    yield* Effect.forEach(entries.filter((entry) => entry.endsWith(".ndjson")), (entry) => Effect.gen(function* () {
         const file = path.join(dir, entry);
-        const info = yield* fs.stat(file);
-        const mtime = Option.getOrUndefined(info.mtime)?.getTime();
+        const mtime = Option.getOrUndefined((yield* fs.stat(file)).mtime)?.getTime();
         if (mtime !== undefined && now - mtime > Duration.toMillis(MAX_LOG_AGE)) {
             yield* fs.remove(file);
         }
     }).pipe(Effect.ignore), { discard: true });
+});
+/**
+ * A run log file that is created on its first record, so a run that sends
+ * nothing to it leaves nothing behind (and a `profile` command run outside
+ * a project never creates a `.alchemy` there). The file starts with a `run`
+ * record describing the run, so it reads standalone.
+ *
+ * A logger is called synchronously but the file is written asynchronously,
+ * so the logger only queues each record as a JSON line, and one writer fiber
+ * creates the file on the first line and appends the rest. Closing the log
+ * ends the queue and waits for the writer, so no queued record is lost.
+ *
+ * @internal exported for tests.
+ */
+export const lazyRunLog = Effect.fn(function* (dir, name, scope) {
+    const fs = yield* FileSystem.FileSystem;
+    const path = yield* Path;
+    const file = path.join(dir, name);
+    const lines = yield* Queue.unbounded();
+    const append = (batch) => fs.writeFileString(file, batch.map((line) => `${line}\n`).join(""), { flag: "a" });
+    const writer = yield* Effect.gen(function* () {
+        const first = yield* Queue.take(lines);
+        yield* fs.makeDirectory(dir, { recursive: true });
+        yield* pruneRunLogs(dir);
+        yield* append([safeStringify(yield* runRecord(scope)), first]);
+        return yield* Effect.forever(Effect.flatMap(Queue.takeAll(lines), append));
+    }).pipe(
+    // The queue ending stops the writer. Any other failure (an unwritable
+    // directory) drops the log, never the command: a shut-down queue
+    // ignores further records.
+    Effect.catchCause(() => Queue.shutdown(lines)), Effect.forkDetach);
+    yield* Effect.addFinalizer(() => Effect.andThen(Queue.end(lines), Fiber.await(writer)));
+    // Formatted now, so a record keeps the annotations it was logged with.
+    return Logger.make((logged) => {
+        Queue.offerUnsafe(lines, formatJsonRecord.log(logged));
+    });
+});
+/**
+ * The two run logs: records scoped `global` (the state store, auth,
+ * profiles; see `globalLogs`) go to `~/.alchemy/logs` (relocated by
+ * `ALCHEMY_HOME`), everything else to the project's `.alchemy/log`. Every
+ * run writes `{timestamp}-pid{pid}.ndjson` (NDJSON log records) at Debug
+ * level — failures record their full causes there even though the terminal
+ * only shows the friendly message. Console output stays at Info+ unless
+ * `--log-level` lowers the floor (see {@link consoleSettings}).
+ *
+ * Only the top-level CLI process writes them; its children's records reach
+ * them through it. Commands that install their own loggers with
+ * `mergeWithExisting: true` compose with these; a replacing `Logger.layer`
+ * scopes them out for that subtree only.
+ */
+export const GlobalLogLive = Layer.unwrap(Effect.gen(function* () {
+    const path = yield* Path;
     const stamp = new Date(yield* Clock.currentTimeMillis)
         .toISOString()
         .slice(0, 19)
         .replaceAll(":", "-");
-    const file = path.join(dir, `${stamp}-pid${process.pid}.log`);
-    return Layer.mergeAll(Logger.layer([
-        makeConsoleLogger(consoleLogFloor(process.argv.slice(2))),
-        Logger.formatLogFmt.pipe(Logger.toFile(file, { flag: "a" }), Effect.orElseSucceed(() => noopLogger)),
-    ]), Layer.succeed(MinimumLogLevel, "Debug"));
+    const name = `${stamp}-pid${process.pid}.ndjson`;
+    const global = yield* lazyRunLog(path.join(rootDir(), "logs"), name, "global");
+    const project = yield* lazyRunLog(path.resolve(yield* dotAlchemyDirectory, "log"), name, "project");
+    const runLog = Logger.make((options) => (options.fiber.getRef(CurrentLogAnnotations)[LogAnnotation.scope] === "global"
+        ? global
+        : project).log(options));
+    return Layer.mergeAll(
+    // Logs stay on this machine: telemetry exports spans and metrics only.
+    Logger.layer([makeConsoleLogger(), runLog]), Layer.succeed(RunLog, runLog), Layer.succeed(MinimumLogLevel, "Debug"));
 }).pipe(Effect.orElseSucceed(() => Layer.empty)));
 /** First line of every run log: enough context to read it standalone. */
-export const logRunHeader = Effect.logDebug(`alchemy ${packageJson.version} pid=${process.pid} cwd=${process.cwd()} argv=${JSON.stringify(process.argv.slice(2))}`);
+const runRecord = (scope) => Effect.map(Clock.currentTimeMillis, (time) => ({
+    time,
+    level: "info",
+    kind: "run",
+    process: "cli",
+    scope,
+    trace: processTrace,
+    attributes: {},
+    data: {
+        version: packageJson.version,
+        pid: process.pid,
+        cwd: process.cwd(),
+        argv: process.argv.slice(2),
+    },
+}));
 //# sourceMappingURL=GlobalLog.js.map

package/lib/Cli/GlobalLog.js.map

@@ -1 +1 @@
-{"version":3,"file":"GlobalLog.js","sourceRoot":"","sources":["../../src/Cli/GlobalLog.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,cAAc,CAAC;AACtC,OAAO,KAAK,QAAQ,MAAM,iBAAiB,CAAC;AAC5C,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AACxC,OAAO,KAAK,UAAU,MAAM,mBAAmB,CAAC;AAChD,OAAO,KAAK,KAAK,MAAM,cAAc,CAAC;AACtC,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AACxC,OAAO,KAAK,QAAQ,MAAM,iBAAiB,CAAC;AAC5C,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AACxC,OAAO,EAAE,IAAI,EAAE,MAAM,aAAa,CAAC;AACnC,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,WAAW,MAAM,oBAAoB,CAAC,OAAO,IAAI,EAAE,MAAM,EAAE,CAAC;AACnE,OAAO,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAC3C,OAAO,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAC;AAE9D,+DAA+D;AAC/D,MAAM,WAAW,GAAG,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;AAErC,+EAA+E;AAC/E,MAAM,eAAe,GAAsC;IACzD,GAAG,EAAE,KAAK;IACV,KAAK,EAAE,OAAO;IACd,KAAK,EAAE,OAAO;IACd,IAAI,EAAE,MAAM;IACZ,IAAI,EAAE,MAAM;IACZ,OAAO,EAAE,MAAM;IACf,KAAK,EAAE,OAAO;IACd,KAAK,EAAE,OAAO;IACd,IAAI,EAAE,MAAM;CACb,CAAC;AAEF;;;;;;;;;;;;GAYG;AACH,MAAM,CAAC,MAAM,eAAe,GAAG,CAAC,IAA2B,EAAqB,EAAE;IAChF,MAAM,SAAS,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;IACrC,MAAM,QAAQ,GAAG,SAAS,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,SAAS,CAAC,CAAC;IACpE,IAAI,KAAK,GAAsB,MAAM,CAAC;IACtC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,QAAQ,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;QACzC,MAAM,GAAG,GAAG,QAAQ,CAAC,CAAC,CAAE,CAAC;QACzB,MAAM,KAAK,GACT,GAAG,KAAK,aAAa;YACnB,CAAC,CAAC,QAAQ,CAAC,CAAC,GAAG,CAAC,CAAC;YACjB,CAAC,CAAC,GAAG,CAAC,UAAU,CAAC,cAAc,CAAC;gBAC9B,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,cAAc,CAAC,MAAM,CAAC;gBAClC,CAAC,CAAC,SAAS,CAAC;QAClB,IAAI,KAAK,KAAK,SAAS;YAAE,SAAS;QAClC,KAAK,GAAG,eAAe,CAAC,KAAK,CAAC,WAAW,EAAE,CAAC,IAAI,KAAK,CAAC;IACxD,CAAC;IACD,OAAO,KAAK,CAAC;AACf,CAAC,CAAC;AAEF,qEAAqE;AACrE,MAAM,CAAC,MAAM,iBAAiB,GAAG,CAC/B,KAAwB,EACxB,IAAI,GAAiC,oBAAoB,EAAE,EAC3D,EAAE,CACF,MAAM,CAAC,IAAI,CAAgB,CAAC,OAAO,EAAE,EAAE;IACrC,IAAI,QAAQ,CAAC,sBAAsB,CAAC,OAAO,CAAC,QAAQ,EAAE,KAAK,CAAC,EAAE,CAAC;QAC7D,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;IACpB,CAAC;AACH,CAAC,CAAC,CAAC;AAEL,8EAA8E;AAC9E,MAAM,CAAC,MAAM,cAAc,GAAG,KAAK,CAAC,QAAQ,CAC1C,MAAM,CAAC,KAAK,CAAC,CAAC,iBAAiB,CAAC,eAAe,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EACzE,KAAK,CAAC,OAAO,CAAC,eAAe,EAAE,OAAO,CAAC,CACxC,CAAC;AAEF,0EAA0E;AAC1E,MAAM,UAAU,GAAG,MAAM,CAAC,IAAI,CAAgB,GAAG,EAAE,GAAE,CAAC,CAAC,CAAC;AAExD;;;;;;;;;;;;GAYG;AACH,MAAM,CAAC,MAAM,aAAa,GAAG,KAAK,CAAC,MAAM,CACvC,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;IAClB,MAAM,EAAE,GAAG,KAAK,CAAC,CAAC,UAAU,CAAC,UAAU,CAAC;IACxC,MAAM,IAAI,GAAG,KAAK,CAAC,CAAC,IAAI,CAAC;IACzB,MAAM,GAAG,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,EAAE,MAAM,CAAC,CAAC;IACzC,KAAK,CAAC,CAAC,EAAE,CAAC,aAAa,CAAC,GAAG,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;IAElD,uDAAuD;IACvD,MAAM,GAAG,GAAG,KAAK,CAAC,CAAC,KAAK,CAAC,iBAAiB,CAAC;IAC3C,MAAM,OAAO,GAAG,KAAK,CAAC,CAAC,EAAE,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,GAAG,EAAE,CAAC,EAAc,CAAC,CAAC,CAAC;IAC9F,KAAK,CAAC,CAAC,MAAM,CAAC,OAAO,CACnB,OAAO,EACP,CAAC,KAAK,EAAE,EAAE,CACR,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;QAClB,MAAM,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;QACnC,MAAM,IAAI,GAAG,KAAK,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAClC,MAAM,KAAK,GAAG,MAAM,CAAC,cAAc,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,OAAO,EAAE,CAAC;QAC3D,IAAI,KAAK,KAAK,SAAS,IAAI,GAAG,GAAG,KAAK,GAAG,QAAQ,CAAC,QAAQ,CAAC,WAAW,CAAC,EAAE,CAAC;YACxE,KAAK,CAAC,CAAC,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QACzB,CAAC;IACH,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,EACxB,EAAE,OAAO,EAAE,IAAI,EAAE,CAClB,CAAC;IAEF,MAAM,KAAK,GAAG,IAAI,IAAI,CAAC,KAAK,CAAC,CAAC,KAAK,CAAC,iBAAiB,CAAC;SACnD,WAAW,EAAE;SACb,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC;SACZ,UAAU,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;IACxB,MAAM,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,KAAK,OAAO,OAAO,CAAC,GAAG,MAAM,CAAC,CAAC;IAC9D,OAAO,KAAK,CAAC,QAAQ,CACnB,MAAM,CAAC,KAAK,CAAC;QACX,iBAAiB,CAAC,eAAe,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;QACzD,MAAM,CAAC,YAAY,CAAC,IAAI,CACtB,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,EAAE,IAAI,EAAE,GAAG,EAAE,CAAC,EAClC,MAAM,CAAC,aAAa,CAAC,GAAG,EAAE,CAAC,UAAU,CAAC,CACvC;KACF,CAAC,EACF,KAAK,CAAC,OAAO,CAAC,eAAe,EAAE,OAAO,CAAC,CACxC,CAAC;AACJ,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,GAAG,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CACjD,CAAC;AAEF,yEAAyE;AACzE,MAAM,CAAC,MAAM,YAAY,GAAwB,MAAM,CAAC,QAAQ,CAC9D,WAAW,WAAW,CAAC,OAAO,QAAQ,OAAO,CAAC,GAAG,QAAQ,OAAO,CAAC,GAAG,EAAE,SAAS,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,CACvH,CAAC"}
+{"version":3,"file":"GlobalLog.js","sourceRoot":"","sources":["../../src/Cli/GlobalLog.ts"],"names":[],"mappings":"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"}

package/lib/Cli/LoggingCli.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"LoggingCli.d.ts","sourceRoot":"","sources":["../../src/Cli/LoggingCli.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,MAAM,MAAM,mBAAmB,CAAC;AAG5C,OAAO,KAAK,KAAK,MAAM,cAAc,CAAC;AAEtC,OAAO,KAAK,EAAmC,IAAI,EAAE,MAAM,YAAY,CAAC;AACxE,OAAO,EAAE,GAAG,EAAE,KAAK,kBAAkB,EAAE,MAAM,cAAc,CAAC;AA6E5D,6DAA6D;AAC7D,eAAO,MAAM,eAAe,SAAU,IAAI,YAAW,kBAAkB,KAAQ,MAAM,EA0EpF,CAAC;AAcF,eAAO,MAAM,UAAU,6CAsJtB,CAAC"}
+{"version":3,"file":"LoggingCli.d.ts","sourceRoot":"","sources":["../../src/Cli/LoggingCli.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,MAAM,MAAM,mBAAmB,CAAC;AAG5C,OAAO,KAAK,KAAK,MAAM,cAAc,CAAC;AAItC,OAAO,KAAK,EAAmC,IAAI,EAAE,MAAM,YAAY,CAAC;AACxE,OAAO,EAAE,GAAG,EAAE,KAAK,kBAAkB,EAAE,MAAM,cAAc,CAAC;AAkF5D,6DAA6D;AAC7D,eAAO,MAAM,eAAe,SAAU,IAAI,YAAW,kBAAkB,KAAQ,MAAM,EA0EpF,CAAC;AAcF,eAAO,MAAM,UAAU,6CA4JtB,CAAC"}

package/lib/Cli/LoggingCli.js

@@ -7,11 +7,13 @@ import { NonInteractiveTerminal } from "../Interaction.js";
 import { Cli } from "../Report.js";
 import { canPromptOnStdin } from "../Util/interactive.js";
 import { formatResourceTag } from "../Util/ResourceOutput.js";
-import { ansiFg, colorsEnabled, theme } from "./CliKit/index.js";
+import { ansiFg, colorsEnabled } from "../Util/Terminal.js";
+import { theme } from "../Util/Theme.js";
 import { actionStyle, applyStatusColor, isTerminalStatus as isTerminal, } from "./components/view/statusStyle.js";
 import { formatElapsed } from "./Format.js";
 import { formatModeNote } from "./ModeTag.js";
 import { actionHasPlannedWork, buildPlanSummary } from "./NamespaceTree.js";
+import { present } from "./Present.js";
 import { formatDeclaredPropertyYaml, matchYamlChange, matchYamlKey } from "./PropertyDiff.js";
 const ESC = "\x1b[";
 const RESET = `${ESC}0m`;
@@ -44,6 +46,8 @@ const statusColor = (status) => {
     return hex(color);
 };
 const tag = formatResourceTag;
+/** A progress line about one resource. */
+const logFor = (fqn, message, level) => present(message, { resource: fqn, level });
 /**
  * In-progress statuses that represent real cloud work. Plain output has no
  * spinner, so these lines are the liveness signal in CI logs
@@ -159,8 +163,8 @@ export const LoggingCli = Layer.effect(Cli, Effect.gen(function* () {
             // planning time (the spinner's implicit "how long did that take").
             const startedAt = yield* Clock.currentTimeMillis;
             if (title !== undefined)
-                yield* Effect.logInfo(bold(title));
-            yield* Effect.logInfo(dim(label));
+                yield* present(bold(title));
+            yield* present(dim(label));
             let closed = false;
             let lastLabel = label;
             const write = (nextLabel, _nextDetail) => Effect.suspend(() => {
@@ -169,13 +173,13 @@ export const LoggingCli = Layer.effect(Cli, Effect.gen(function* () {
                 if (closed || nextLabel === lastLabel)
                     return Effect.void;
                 lastLabel = nextLabel;
-                return Effect.logInfo(dim(nextLabel));
+                return present(dim(nextLabel));
             });
             const finish = (message, paint) => Effect.suspend(() => {
                 if (closed)
                     return Effect.void;
                 closed = true;
-                return Clock.currentTimeMillis.pipe(Effect.flatMap((now) => Effect.logInfo(`${paint(message)} ${dim(`(${formatElapsed(now - startedAt)})`)}`)));
+                return Clock.currentTimeMillis.pipe(Effect.flatMap((now) => present(`${paint(message)} ${dim(`(${formatElapsed(now - startedAt)})`)}`)));
             });
             return {
                 update: write,
@@ -188,7 +192,7 @@ export const LoggingCli = Layer.effect(Cli, Effect.gen(function* () {
         }),
         approvePlan: (plan, options) => Effect.gen(function* () {
             for (const line of formatPlanLines(plan, options))
-                yield* Effect.logInfo(line);
+                yield* present(line);
             if (canPromptOnStdin()) {
                 return yield* confirm(plan.destroy === true
                     ? { message: "Destroy these resources?", initial: false }
@@ -201,24 +205,24 @@ export const LoggingCli = Layer.effect(Cli, Effect.gen(function* () {
         }),
         displayPlan: (plan, options) => Effect.gen(function* () {
             for (const line of formatPlanLines(plan, options))
-                yield* Effect.logInfo(line);
+                yield* present(line);
         }),
         startApplySession: (plan, options) => Effect.gen(function* () {
             for (const line of formatPlanLines(plan, options))
-                yield* Effect.logInfo(line);
-            yield* Effect.logInfo("");
+                yield* present(line);
+            yield* present("");
             const startedAt = yield* Clock.currentTimeMillis;
             const started = new Map();
             const terminal = new Map();
             const notes = new Map();
             const statusNotes = new Map();
             return {
-                setOutput: (value) => Effect.logInfo(inspect(value, { colors: false })),
-                // Progress is an Effect log record, just like provider and build
-                // diagnostics, so the append-only renderer gives every line the
-                // same timestamp / level / fiber prefix.
+                setOutput: (value) => present(inspect(value, { colors: false })),
+                // Presents the apply events (which are already log records) as
+                // lines shaped like log lines, so the plain output reads as one
+                // stream.
                 emit: (event) => Clock.currentTimeMillis.pipe(Effect.flatMap((now) => Effect.suspend(() => {
-                    if (event._tag === "apply.resource.note") {
+                    if (event.type === "apply.resource.note") {
                         // `status` notes only surface as the settle line's suffix;
                         // everything else streams, deduping consecutive repeats.
                         if (event.kind === "status") {
@@ -228,7 +232,7 @@ export const LoggingCli = Layer.effect(Cli, Effect.gen(function* () {
                         if (notes.get(event.fqn) === event.message)
                             return Effect.void;
                         notes.set(event.fqn, event.message);
-                        return Effect.logInfo(`${tag(event.fqn)} ${blue(event.message)}`);
+                        return logFor(event.fqn, blue(event.message));
                     }
                     const id = event.fqn;
                     const mode = modeSuffix({
@@ -241,7 +245,7 @@ export const LoggingCli = Layer.effect(Cli, Effect.gen(function* () {
                             return Effect.void;
                         if (!started.has(id))
                             started.set(id, now);
-                        return Effect.logInfo(`${tag(id)} ${dim(event.status)}${mode}`);
+                        return logFor(id, `${dim(event.status)}${mode}`);
                     }
                     terminal.set(id, event.status);
                     const status = statusColor(event.status)(event.status);
@@ -254,7 +258,9 @@ export const LoggingCli = Layer.effect(Cli, Effect.gen(function* () {
                     const msg = message
                         ? ` ${dim("—")} ${event.status === "fail" ? red(message) : message}`
                         : "";
-                    return Effect.logInfo(`${tag(id)} ${status}${mode}${msg}${took}`);
+                    // At the level `emit` gives the event, so `--log-level error`
+                    // still shows a failed resource.
+                    return logFor(id, `${status}${mode}${msg}${took}`, event.status === "fail" ? "Error" : undefined);
                 }))),
                 done: (outcome) => Clock.currentTimeMillis.pipe(Effect.flatMap((now) => {
                     const statuses = [...terminal.values()];
@@ -266,7 +272,7 @@ export const LoggingCli = Layer.effect(Cli, Effect.gen(function* () {
                         parts.push(red(`${failed} failed`));
                     if (skipped)
                         parts.push(dim(`${skipped} skipped`));
-                    return Effect.logInfo("").pipe(Effect.andThen(Effect.logInfo(`${bold(outcome === "success" ? "Done:" : "Failed:")} ${parts.join(dim(", "))} ${dim(`(${formatElapsed(now - startedAt)})`)}`)));
+                    return present("").pipe(Effect.andThen(present(`${bold(outcome === "success" ? "Done:" : "Failed:")} ${parts.join(dim(", "))} ${dim(`(${formatElapsed(now - startedAt)})`)}`)));
                 })),
             };
         }),