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

package/src/Cli/GlobalLog.ts

@@ -1,21 +1,38 @@
+import type * as Cause from "effect/Cause";
+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.ts";
 import { rootDir } from "../Auth/Paths.ts";
 import { makePlainConsoleSink } from "../Util/ConsoleSink.ts";
+import { LogAnnotation } from "../Util/LogAnnotation.ts";
+import {
+  formatJsonRecord,
+  jsonLogger,
+  LOG_FORMAT_ENV,
+  LOG_LEVEL_ENV,
+  type LogRecord,
+  safeStringify,
+} from "../Util/LogRecord.ts";
+import { processTrace } from "../Util/TraceParent.ts";
 
 /** 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: Record<string, LogLevel.LogLevel> = {
   all: "All",
   trace: "Trace",
@@ -29,50 +46,93 @@ const logLevelChoices: Record<string, LogLevel.LogLevel> = {
 };
 
 /**
- * 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: ReadonlyArray<string>): LogLevel.LogLevel => {
-  const separator = argv.indexOf("--");
-  const flagArgs = separator === -1 ? argv : argv.slice(0, separator);
-  let floor: LogLevel.LogLevel = "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;
-};
+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>"),
+  ),
+});
+
+/** 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 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,
+  ),
+});
+
+/** 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;
+}
+
+const flagValue = <A>(context: Context.Context<never>, flag: Context.Key<any, Option.Option<A>>) =>
+  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: Context.Context<never>): ConsoleSettings => ({
+  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.Effect<ConsoleSettings> = Effect.map(
+  Effect.context<never>(),
+  consoleSettings,
+);
+
+/** {@link ConsoleSettings} as environment, for a child process that renders the run's logs. */
+export const consoleSettingsEnv = (settings: ConsoleSettings): Record<string, string> => ({
+  [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 `floor` to `sink`. */
-export const makeConsoleLogger = (
-  floor: LogLevel.LogLevel,
-  sink: Logger.Logger<unknown, void> = 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.Logger<unknown, void>) =>
   Logger.make<unknown, void>((options) => {
-    if (LogLevel.isGreaterThanOrEqualTo(options.logLevel, floor)) {
-      sink.log(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)))]),
+  Logger.layer([makeConsoleLogger()]),
   Layer.succeed(MinimumLogLevel, "Debug"),
 );
 
@@ -80,61 +140,139 @@ export const ConsoleLogLive = Layer.mergeAll(
 const noopLogger = Logger.make<unknown, void>(() => {});
 
 /**
- * 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(
+export const RunLog = Context.Reference<Logger.Logger<unknown, void>>("alchemy/Cli/RunLog", {
+  defaultValue: () => noopLogger,
+});
+
+/** Delete run logs in `dir` older than {@link MAX_LOG_AGE}. Best-effort. */
+const pruneRunLogs = (dir: string) =>
   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(() => [] as string[]));
+    // Only run logs: the directory may hold other tools' logs (the test
+    // runner's `test/`).
     yield* Effect.forEach(
-      entries,
+      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: string,
+  name: string,
+  scope: LogRecord["scope"],
+) {
+  const fs = yield* FileSystem.FileSystem;
+  const path = yield* Path;
+  const file = path.join(dir, name);
+  const lines = yield* Queue.unbounded<string, Cause.Done>();
+  const append = (batch: ReadonlyArray<string>) =>
+    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<unknown, void>((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`);
+    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<unknown, void>((options) =>
+      (options.fiber.getRef(CurrentLogAnnotations)[LogAnnotation.scope] === "global"
+        ? global
+        : project
+      ).log(options),
+    );
     return Layer.mergeAll(
-      Logger.layer([
-        makeConsoleLogger(consoleLogFloor(process.argv.slice(2))),
-        Logger.formatLogFmt.pipe(
-          Logger.toFile(file, { flag: "a" }),
-          Effect.orElseSucceed(() => noopLogger),
-        ),
-      ]),
+      // 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.Effect<void> = Effect.logDebug(
-  `alchemy ${packageJson.version} pid=${process.pid} cwd=${process.cwd()} argv=${JSON.stringify(process.argv.slice(2))}`,
-);
+const runRecord = (scope: LogRecord["scope"]) =>
+  Effect.map(Clock.currentTimeMillis, (time): LogRecord => ({
+    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),
+    },
+  }));

package/src/Cli/LoggingCli.ts

@@ -3,13 +3,15 @@ import * as Prompt from "effect/cli/Prompt";
 import * as Clock from "effect/Clock";
 import * as Effect from "effect/Effect";
 import * as Layer from "effect/Layer";
+import type * as LogLevel from "effect/LogLevel";
+import type { ApplyEvent, ApplyStatus } from "../Events.ts";
 import { NonInteractiveTerminal } from "../Interaction.ts";
 import type { ActionApply, ActionDelete, CRUD, Plan } from "../Plan.ts";
 import { Cli, type PlanDisplayOptions } from "../Report.ts";
-import type { ApplyEvent, ApplyStatus } from "../Report.ts";
 import { canPromptOnStdin } from "../Util/interactive.ts";
 import { formatResourceTag } from "../Util/ResourceOutput.ts";
-import { ansiFg, colorsEnabled, theme } from "./CliKit/index.ts";
+import { ansiFg, colorsEnabled } from "../Util/Terminal.ts";
+import { theme } from "../Util/Theme.ts";
 import {
   actionStyle,
   applyStatusColor,
@@ -18,6 +20,7 @@ import {
 import { formatElapsed } from "./Format.ts";
 import { formatModeNote } from "./ModeTag.ts";
 import { actionHasPlannedWork, buildPlanSummary } from "./NamespaceTree.ts";
+import { present } from "./Present.ts";
 import { formatDeclaredPropertyYaml, matchYamlChange, matchYamlKey } from "./PropertyDiff.ts";
 
 const ESC = "\x1b[";
@@ -54,6 +57,10 @@ const statusColor = (status: ApplyStatus): ((s: string) => string) => {
 
 const tag = formatResourceTag;
 
+/** A progress line about one resource. */
+const logFor = (fqn: string, message: string, level?: LogLevel.Severity) =>
+  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
@@ -190,8 +197,8 @@ export const LoggingCli = Layer.effect(
           // phase prints as it starts, and the settle line carries the total
           // 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));
+          if (title !== undefined) yield* present(bold(title));
+          yield* present(dim(label));
           let closed = false;
           let lastLabel = label;
           const write = (nextLabel: string, _nextDetail?: string) =>
@@ -200,7 +207,7 @@ export const LoggingCli = Layer.effect(
               // carry nothing new for a line-per-change log.
               if (closed || nextLabel === lastLabel) return Effect.void;
               lastLabel = nextLabel;
-              return Effect.logInfo(dim(nextLabel));
+              return present(dim(nextLabel));
             });
           const finish = (message: string, paint: (s: string) => string) =>
             Effect.suspend(() => {
@@ -208,7 +215,7 @@ export const LoggingCli = Layer.effect(
               closed = true;
               return Clock.currentTimeMillis.pipe(
                 Effect.flatMap((now) =>
-                  Effect.logInfo(`${paint(message)} ${dim(`(${formatElapsed(now - startedAt)})`)}`),
+                  present(`${paint(message)} ${dim(`(${formatElapsed(now - startedAt)})`)}`),
                 ),
               );
             });
@@ -223,7 +230,7 @@ export const LoggingCli = Layer.effect(
         }),
       approvePlan: (plan, options) =>
         Effect.gen(function* () {
-          for (const line of formatPlanLines(plan, options)) yield* Effect.logInfo(line);
+          for (const line of formatPlanLines(plan, options)) yield* present(line);
           if (canPromptOnStdin()) {
             return yield* confirm(
               plan.destroy === true
@@ -239,12 +246,12 @@ export const LoggingCli = Layer.effect(
         }),
       displayPlan: (plan, options) =>
         Effect.gen(function* () {
-          for (const line of formatPlanLines(plan, options)) yield* Effect.logInfo(line);
+          for (const line of formatPlanLines(plan, options)) yield* present(line);
         }),
       startApplySession: (plan, options) =>
         Effect.gen(function* () {
-          for (const line of formatPlanLines(plan, options)) yield* Effect.logInfo(line);
-          yield* Effect.logInfo("");
+          for (const line of formatPlanLines(plan, options)) yield* present(line);
+          yield* present("");
 
           const startedAt = yield* Clock.currentTimeMillis;
           const started = new Map<string, number>();
@@ -252,15 +259,15 @@ export const LoggingCli = Layer.effect(
           const notes = new Map<string, string>();
           const statusNotes = new Map<string, string>();
           return {
-            setOutput: (value: unknown) => 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: unknown) => 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: ApplyEvent) =>
               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") {
@@ -269,7 +276,7 @@ export const LoggingCli = Layer.effect(
                       }
                       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({
@@ -280,7 +287,7 @@ export const LoggingCli = Layer.effect(
                     if (!isTerminal(event.status)) {
                       if (!isActive(event.status)) 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);
@@ -294,7 +301,13 @@ export const LoggingCli = Layer.effect(
                     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,
+                    );
                   }),
                 ),
               ),
@@ -308,9 +321,9 @@ export const LoggingCli = Layer.effect(
                   const parts = [green(`${succeeded} succeeded`)];
                   if (failed) parts.push(red(`${failed} failed`));
                   if (skipped) parts.push(dim(`${skipped} skipped`));
-                  return Effect.logInfo("").pipe(
+                  return present("").pipe(
                     Effect.andThen(
-                      Effect.logInfo(
+                      present(
                         `${bold(outcome === "success" ? "Done:" : "Failed:")} ${parts.join(dim(", "))} ${dim(`(${formatElapsed(now - startedAt)})`)}`,
                       ),
                     ),

package/src/Cli/PlainCliFormatter.ts

@@ -64,7 +64,10 @@ export const plainCliFormatter = (options: { columns: number }): CliOutput.Forma
   const columns = Math.max(60, Math.min(options.columns, 120));
   const fallback = CliOutput.defaultFormatter({ colors: false });
   return {
-    ...fallback,
+    formatCliError: fallback.formatCliError,
+    formatError: fallback.formatError,
+    formatErrors: fallback.formatErrors,
+    formatVersion: fallback.formatVersion,
     formatHelpDoc: (doc) => wrapLines(fallback.formatHelpDoc(compactDoc(doc)), columns),
   };
 };

package/src/Cli/Present.ts

@@ -0,0 +1,34 @@
+import * as Clock from "effect/Clock";
+import * as Console from "effect/Console";
+import * as Effect from "effect/Effect";
+import * as LogLevel from "effect/LogLevel";
+import { prettyLine } from "../Util/ConsoleSink.ts";
+import { currentConsoleSettings } from "./GlobalLog.ts";
+
+/**
+ * Print one line of plain renderer output: what the TUI would draw, for a
+ * terminal without it. Renderers present events, they don't log them —
+ * the events are already log records — so this writes to the console only,
+ * prints nothing under `--log-format json`, where the records are the
+ * output, and honors the console's `--log-level` floor like log lines do.
+ */
+export const present = (
+  text: string,
+  options: { readonly resource?: string; readonly level?: LogLevel.Severity } = {},
+): Effect.Effect<void> =>
+  Effect.flatMap(currentConsoleSettings, ({ format, floor }) =>
+    format === "json" || !LogLevel.isGreaterThanOrEqualTo(options.level ?? "Info", floor)
+      ? Effect.void
+      : Clock.currentTimeMillis.pipe(
+          Effect.flatMap((now) =>
+            Console.log(
+              prettyLine({
+                date: new Date(now),
+                level: options.level ?? "Info",
+                text,
+                resource: options.resource,
+              }),
+            ),
+          ),
+        ),
+  );

package/src/Cli/SigilRenderer.ts

@@ -0,0 +1,75 @@
+import * as Effect from "effect/Effect";
+import * as Layer from "effect/Layer";
+import * as Interaction from "../Interaction.ts";
+import type { Plan } from "../Plan.ts";
+import { Cli, type PlanDisplayOptions } from "../Report.ts";
+import { renderApply } from "../Report.ts";
+import { PlatformServices } from "../Util/PlatformServices.ts";
+import { renderPlanning } from "./commands/render.ts";
+import { renderNukeDelete, renderNukeScan, reviewNuke } from "./components/view/Nuke.tsx";
+import { stackOutputsView } from "./components/view/StackOutputs.tsx";
+import { selectCliServices } from "./selectCli.ts";
+
+/**
+ * The CLI's terminal UI for scripts that drive `alchemy/Alchemist`
+ * themselves: the Sigil UI on an interactive terminal, plain log lines
+ * otherwise, exactly like the CLI.
+ *
+ * ```ts
+ * const plan = yield* Alchemist.plan({ stack, operation: "deploy", stage }).pipe(
+ *   SigilRenderer.planning({ operation: "Deploy", stage }),
+ * );
+ * if (!(yield* SigilRenderer.approve(plan, { stage }))) return;
+ * const output = yield* Alchemist.apply(plan).pipe(SigilRenderer.apply(plan, { stage }));
+ * yield* SigilRenderer.outputs(output);
+ * ```
+ */
+
+/** A deploy or destroy plan, or a drift scan, from `alchemy/Alchemist`. */
+export interface RenderablePlan {
+  readonly native: Plan;
+}
+
+/**
+ * The CLI's terminal and renderer services, in place of `Alchemist.layer()`'s
+ * non-interactive terminal. Provide it after `Alchemist.layer()`:
+ * `Effect.provide([Alchemist.layer(), SigilRenderer.layer()])`.
+ */
+export const layer = () =>
+  Layer.provideMerge(selectCliServices(), Interaction.layer()).pipe(
+    Layer.provide(PlatformServices),
+  );
+
+/** Planning progress (import, services, state, per-resource diffing) around a `plan` call. */
+export const planning = renderPlanning;
+
+/**
+ * Show the plan and ask to apply it; `true` when approved. Fails with
+ * `NonInteractiveTerminal` when there is no terminal to ask on.
+ */
+export const approve = (plan: RenderablePlan, options?: PlanDisplayOptions) =>
+  Effect.flatMap(Cli, (cli) => cli.approvePlan(plan.native, options));
+
+/** Show the plan without asking, as `alchemy plan` does. */
+export const display = (plan: RenderablePlan, options?: PlanDisplayOptions) =>
+  Effect.flatMap(Cli, (cli) => cli.displayPlan(plan.native, options));
+
+/** Per-resource apply rows around an `apply` call. */
+export const apply = (plan: RenderablePlan, options?: PlanDisplayOptions) =>
+  renderApply(plan.native, options);
+
+/** Print a deployed stack's outputs. */
+export const outputs = (output: unknown) =>
+  Effect.flatMap(Interaction.Interaction, (terminal) =>
+    terminal.output.print(stackOutputsView(output)),
+  );
+
+/** `alchemy unsafe nuke`'s scan progress, review prompt and deletion view. */
+export const Nuke = {
+  /** Live scan progress around `Alchemist.Nuke.scan`. */
+  scan: renderNukeScan,
+  /** Show the inventory and ask to delete it; `true` when approved (or `yes`/`dryRun`). */
+  review: reviewNuke,
+  /** Per-resource deletion rows around `Alchemist.Nuke.execute`. */
+  delete: renderNukeDelete,
+};