alchemy 2.0.0-beta.75 → 2.0.0-beta.77

package/lib/Cli/exec.js

@@ -1,31 +1,185 @@
+import * as Cause from "effect/Cause";
+import * as Config from "effect/Config";
 import * as ConfigProvider from "effect/ConfigProvider";
+import * as Console from "effect/Console";
 import * as Effect from "effect/Effect";
+import * as FileSystem from "effect/FileSystem";
 import * as Layer from "effect/Layer";
+import * as Option from "effect/Option";
+import * as Path from "effect/Path";
 import * as Schema from "effect/Schema";
 import * as FetchHttpClient from "effect/unstable/http/FetchHttpClient";
+import { watchImport } from "@alchemy.run/node-utils/watch-import";
+import { trackBunImports } from "@alchemy.run/node-utils/watch-import-bun";
+import { fileURLToPath } from "node:url";
 import { AlchemyContextLive } from "../AlchemyContext.js";
+import { StackModuleLoader } from "../Alchemist/Session.js";
+import { ArtifactStore, createArtifactStore } from "../Artifacts.js";
 import { CredentialsStoreLive } from "../Auth/Credentials.js";
-import { ProfileLive } from "../Auth/Profile.js";
+import { ProfileStoreLive } from "../Auth/Profile.js";
+import { makeDevLogOpener } from "../Local/DevLog.js";
 import * as RpcProviderProxy from "../Local/RpcProviderProxy.js";
 import { forwardSidecarLogs } from "../Local/RpcSpawner.js";
+import { TelemetryLive } from "../Telemetry/Layer.js";
+import { initialCwd } from "../Util/Node.js";
 import { PlatformServices } from "../Util/PlatformServices.js";
-import { execStack, ExecStackOptions } from "./commands/deploy.js";
-import { LoggingCli } from "./LoggingCli.js";
-import { selectCli } from "./selectCli.js";
-// `alchemy dev` is a long-running session whose primary output is the log
-// stream (worker starts, cron fires, request logs) interleaved with
-// re-applies on file change. Ink's insertion model stacks inserted lines
-// ABOVE the animated region, so runtime logs end up above the plan/apply
-// output in scrollback. Append-only chronological rendering is the correct
-// model for a dev server (plan → status → logs, strictly in order), so dev
-// always takes the line renderer; deploy/destroy keep the interactive TUI.
-const makeServices = (dev) => Layer.merge(dev ? LoggingCli : selectCli(), RpcProviderProxy.fromEnv()).pipe(Layer.provideMerge(Layer.mergeAll(AlchemyContextLive, ProfileLive, CredentialsStoreLive)), Layer.provideMerge(Layer.mergeAll(PlatformServices, FetchHttpClient.layer, ConfigProvider.layer(ConfigProvider.fromEnv()))));
-export const exec = () => {
-    const options = Schema.decodeSync(ExecStackOptions)(JSON.parse(process.env.ALCHEMY_EXEC_OPTIONS));
-    // Subscribe to the spawner's sidecar log stream BEFORE the stack runs:
-    // this process owns the terminal renderer, so sidecar output printed here
-    // lands in chronological order with the run's own lines instead of racing
-    // the shared tty. No-op outside dev.
-    return forwardSidecarLogs.pipe(Effect.andThen(execStack(options)), Effect.provide(makeServices(options.dev)), Effect.scoped);
+import * as Stacks from "../Alchemist/routes/stack.js";
+import { DEV_RELOAD_EXIT_CODE, DevOptions } from "./DevOptions.js";
+import { ConsoleLogLive } from "./GlobalLog.js";
+import { handleCliErrors, installShutdownFeedback } from "./commands/errors.js";
+import { renderApply, renderPlanning } from "./commands/render.js";
+import * as CliKit from "./CliKit/index.js";
+import { stackOutputsView } from "./components/view/StackOutputs.js";
+import { selectCliServices } from "./selectCli.js";
+// Interactive dev/deploy runs use the Sigil progress UI; CI, redirected output,
+// and other non-interactive terminals still select the append-only renderer.
+// `ALCHEMY_TUI` remains the explicit override in either direction.
+const services = Layer.mergeAll(Layer.provideMerge(Layer.mergeAll(selectCliServices(), CliKit.CliKitInteraction), CliKit.layer()), RpcProviderProxy.fromEnv(), Layer.succeed(ArtifactStore, createArtifactStore()), 
+// Dev runs live in this exec child, not the `alchemy` CLI process, so
+// without this layer they'd export no telemetry at all. No root
+// `cli.dev` span though: dev remains alive across reloads, so a wrapping
+// span would not end (and export) until shutdown — plan/apply spans are the
+// trace roots instead.
+//
+// Telemetry is layered *on top of* the console logger so the OTLP logger
+// merges with it. As `mergeAll` siblings the last `CurrentLoggers` wins,
+// and telemetry would replace the console logger — every `Effect.log*`
+// (plan, apply progress, stack outputs) silently vanished from the
+// terminal whenever telemetry was enabled.
+Layer.provideMerge(TelemetryLive, ConsoleLogLive)).pipe(Layer.provideMerge(Layer.mergeAll(AlchemyContextLive, ProfileStoreLive, CredentialsStoreLive)), Layer.provideMerge(Layer.mergeAll(PlatformServices, FetchHttpClient.layer, ConfigProvider.layer(ConfigProvider.fromEnv()))));
+/** `alchemy dev` normally parks forever; set for single-pass runs (tests). */
+const devOnce = Config.string("ALCHEMY_DEV_ONCE").pipe(Config.withDefault(""), Effect.map((value) => value === "1" || value === "true"));
+const runDev = Effect.fn(function* (options) {
+    const target = {
+        entrypoint: options.main,
+        stage: options.stage,
+        profile: options.profile,
+        envFile: Option.getOrUndefined(options.envFile),
+    };
+    const snapshot = yield* Stacks.plan({
+        target,
+        operation: "deploy",
+        force: options.force,
+        updateStateStore: true,
+        dev: true,
+    }).pipe(renderPlanning({ operation: "Dev", stage: options.stage }));
+    const once = yield* devOnce;
+    const applyPlan = Stacks.apply(snapshot).pipe(renderApply(snapshot.native, {
+        stage: options.stage,
+        dev: !once,
+    }));
+    const result = yield* once
+        ? applyPlan
+        : applyPlan.pipe(Effect.catchCause((cause) => Console.error(describeFailure("apply", cause, "keeping dev alive so healthy resources keep serving")).pipe(Effect.as(undefined))));
+    if (result !== undefined && once) {
+        const kit = yield* CliKit.CliKit;
+        yield* kit.output.print(stackOutputsView(result));
+    }
+    return once ? undefined : yield* Effect.never;
+});
+/**
+ * Resolves with the files behind the next debounced change batch. The
+ * listener detaches itself on delivery — `Effect.callback` only runs its
+ * cleanup on interruption, so a listener left behind would fire once per
+ * past generation on every later change.
+ */
+const nextChange = (watcher) => Effect.callback((resume) => {
+    const unsubscribe = watcher.subscribe(({ paths }) => {
+        unsubscribe();
+        resume(Effect.succeed(paths));
+    });
+    return Effect.sync(unsubscribe);
+});
+const logReload = Effect.fn(function* (paths) {
+    const path = yield* Path.Path;
+    yield* Effect.logInfo(`Reloading stack: changed ${[...paths]
+        .map((file) => path.relative(initialCwd, file))
+        .join(", ")}`);
+});
+/**
+ * Node: one process, many generations. The Oxc loader imports the stack graph
+ * under a fresh namespace each time; a change to any file it loaded
+ * interrupts the parked run (whose scope tears down the dev widget) and the
+ * loop imports the next generation.
+ */
+const runNodeDevWatcher = Effect.fn(function* (options) {
+    const fs = yield* FileSystem.FileSystem;
+    const path = yield* Path.Path;
+    // Node reports real paths for loaded files (symlinked checkouts, macOS
+    // `/tmp`), so the project root the graph is scoped to must be real too.
+    // Scope to the invocation directory, not the entrypoint's directory: a
+    // config under `infra/` commonly imports application code from `src/`.
+    const entrypoint = yield* fs.realPath(path.resolve(options.main));
+    const root = yield* fs.realPath(initialCwd);
+    const nodeModules = `${path.sep}node_modules${path.sep}`;
+    return yield* Effect.acquireRelease(Effect.sync(() => watchImport(entrypoint, {
+        parentURL: import.meta.url,
+        shouldInvalidate: (url) => {
+            if (!url.startsWith("file:"))
+                return false;
+            const file = fileURLToPath(url);
+            const relative = path.relative(root, file);
+            return (!file.includes(nodeModules) &&
+                (relative === "" ||
+                    (relative !== ".." &&
+                        !relative.startsWith(`..${path.sep}`) &&
+                        !path.isAbsolute(relative))));
+        },
+    })), (watcher) => Effect.promise(() => watcher.close())).pipe(Effect.flatMap((watcher) => {
+        const generation = devKeepAlive(runDev(options)).pipe(Effect.provideService(StackModuleLoader, {
+            import: () => watcher.import().then(({ value }) => value),
+        }), Effect.scoped);
+        return Effect.forever(Effect.raceFirst(generation, nextChange(watcher)).pipe(Effect.flatMap((paths) => paths === undefined ? Effect.void : logReload(paths))));
+    }));
+});
+/**
+ * Bun: one process per generation. Bun cannot evict evaluated modules, so the
+ * tracker only records which project files the stack graph loads; the first
+ * change to one of them logs, lets the generation scope tear down the dev
+ * widget, and exits with DEV_RELOAD_EXIT_CODE for the supervisor to respawn.
+ */
+const runBunDevWatcher = (options) => Effect.acquireRelease(Effect.sync(() => 
+// Match Node's project-wide graph: the stack entrypoint may live in a
+// subdirectory while importing sibling source trees.
+trackBunImports({ root: initialCwd })), (tracker) => Effect.promise(() => tracker.close())).pipe(Effect.flatMap((tracker) => Effect.raceFirst(devKeepAlive(runDev(options)).pipe(Effect.scoped), nextChange(tracker))), Effect.flatMap((paths) => paths === undefined
+    ? Effect.void
+    : logReload(paths).pipe(Effect.andThen(Effect.sync(() => {
+        process.exitCode = DEV_RELOAD_EXIT_CODE;
+    })))));
+/**
+ * A run that ended by itself with nothing but interruptions in its cause was
+ * cancelled from the inside — a provider or engine race, never the user —
+ * so it must be reported like any other failure. Ctrl+C is different: it
+ * interrupts the fiber running this code, so `catchCause` never gets to
+ * park it (a parked `Effect.never` is interrupted straight away too).
+ */
+const describeFailure = (what, cause, next) => Cause.hasInterruptsOnly(cause)
+    ? `alchemy dev: ${what} was interrupted internally (a bug in a provider or the engine — please report it with the trace below); ${next}.\n${Cause.pretty(cause)}`
+    : `alchemy dev: ${what} failed; ${next}.\n${Cause.pretty(cause)}`;
+// A mid-edit import or planning failure must keep the watch process alive so
+// the next save can restart it. Ctrl+C still tears the run down.
+export const devKeepAlive = (effect) => effect.pipe(Effect.catchCause((cause) => Console.error(describeFailure("run", cause, "waiting for the next file change to retry")).pipe(Effect.andThen(Effect.never))));
+const makeExec = () => {
+    const options = Schema.decodeSync(DevOptions)(JSON.parse(process.env.ALCHEMY_EXEC_OPTIONS));
+    return Effect.gen(function* () {
+        yield* installShutdownFeedback;
+        // Subscribe to the spawner's sidecar log stream BEFORE the stack runs:
+        // this process owns the terminal renderer, so sidecar output printed
+        // here lands in chronological order with the run's own lines instead of
+        // racing the shared tty. No-op outside dev. The mixed tail is also teed
+        // to log/{stage}/{timestamp}.log; per-resource output lands in
+        // log/{stage}/{fqn…}/ via the local providers.
+        const devLog = yield* (yield* makeDevLogOpener)(options.stage);
+        yield* forwardSidecarLogs((entry) => devLog.writeLine(`[${entry.channel}] ${entry.line}`));
+        // Single-pass runs park nothing. Otherwise Node reloads the stack graph in
+        // this process; Bun exits for the supervisor to respawn (see above).
+        return yield* (yield* devOnce)
+            ? devKeepAlive(runDev(options))
+            : process.versions.bun !== undefined
+                ? runBunDevWatcher(options)
+                : runNodeDevWatcher(options);
+    }).pipe(Effect.provide(services), Effect.scoped, handleCliErrors);
 };
+/** Fully wired sidecar CLI program. */
+export const exec = makeExec;
 //# sourceMappingURL=exec.js.map

package/lib/Cli/exec.js.map

@@ -1 +1 @@
-{"version":3,"file":"exec.js","sourceRoot":"","sources":["../../src/Cli/exec.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,cAAc,MAAM,uBAAuB,CAAC;AACxD,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AACxC,OAAO,KAAK,KAAK,MAAM,cAAc,CAAC;AACtC,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AACxC,OAAO,KAAK,eAAe,MAAM,sCAAsC,CAAC;AAExE,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAC1D,OAAO,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAC;AAC9D,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AACjD,OAAO,KAAK,gBAAgB,MAAM,8BAA8B,CAAC;AACjE,OAAO,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;AAC5D,OAAO,EAAE,gBAAgB,EAAE,MAAM,6BAA6B,CAAC;AAC/D,OAAO,EAAE,SAAS,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AACnE,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAC7C,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAE3C,0EAA0E;AAC1E,oEAAoE;AACpE,yEAAyE;AACzE,yEAAyE;AACzE,2EAA2E;AAC3E,2EAA2E;AAC3E,2EAA2E;AAC3E,MAAM,YAAY,GAAG,CAAC,GAAwB,EAAE,EAAE,CAChD,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,SAAS,EAAE,EAAE,gBAAgB,CAAC,OAAO,EAAE,CAAC,CAAC,IAAI,CAC1E,KAAK,CAAC,YAAY,CAChB,KAAK,CAAC,QAAQ,CAAC,kBAAkB,EAAE,WAAW,EAAE,oBAAoB,CAAC,CACtE,EACD,KAAK,CAAC,YAAY,CAChB,KAAK,CAAC,QAAQ,CACZ,gBAAgB,EAChB,eAAe,CAAC,KAAK,EACrB,cAAc,CAAC,KAAK,CAAC,cAAc,CAAC,OAAO,EAAE,CAAC,CAC/C,CACF,CACF,CAAC;AAEJ,MAAM,CAAC,MAAM,IAAI,GAAG,GAAG,EAAE;IACvB,MAAM,OAAO,GAAG,MAAM,CAAC,UAAU,CAAC,gBAAgB,CAAC,CACjD,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,oBAAqB,CAAC,CAC9C,CAAC;IACF,uEAAuE;IACvE,0EAA0E;IAC1E,0EAA0E;IAC1E,qCAAqC;IACrC,OAAO,kBAAkB,CAAC,IAAI,CAC5B,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,EAClC,MAAM,CAAC,OAAO,CAAC,YAAY,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,EACzC,MAAM,CAAC,MAAM,CACd,CAAC;AACJ,CAAC,CAAC"}
+{"version":3,"file":"exec.js","sourceRoot":"","sources":["../../src/Cli/exec.ts"],"names":[],"mappings":"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"}

package/lib/Cli/main.d.ts

@@ -1,3 +1,6 @@
 import * as Effect from "effect/Effect";
-export declare const main: Effect.Effect<void, any, never>;
+declare const mainEffect: Effect.Effect<void, any, never>;
+/** Fully wired CLI program. */
+export declare const main: Effect.Effect<void, Effect.Error<typeof mainEffect>>;
+export {};
 //# sourceMappingURL=main.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"main.d.ts","sourceRoot":"","sources":["../../src/Cli/main.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AA8ExC,eAAO,MAAM,IAAI,iCAKhB,CAAC"}
+{"version":3,"file":"main.d.ts","sourceRoot":"","sources":["../../src/Cli/main.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AA0NxC,QAAA,MAAM,UAAU,iCAKf,CAAC;AAEF,+BAA+B;AAC/B,eAAO,MAAM,IAAI,EAAE,MAAM,CAAC,MAAM,CAC9B,IAAI,EACJ,MAAM,CAAC,KAAK,CAAC,OAAO,UAAU,CAAC,CACnB,CAAC"}

package/lib/Cli/main.js

@@ -1,62 +1,153 @@
+import * as Cause from "effect/Cause";
 import * as ConfigProvider from "effect/ConfigProvider";
 import * as Effect from "effect/Effect";
 import * as Layer from "effect/Layer";
 import * as Command from "effect/unstable/cli/Command";
+import * as CliConfig from "effect/unstable/cli/CliConfig";
+import * as CliError from "effect/unstable/cli/CliError";
+import * as Flag from "effect/unstable/cli/Flag";
+import * as GlobalFlag from "effect/unstable/cli/GlobalFlag";
 import * as FetchHttpClient from "effect/unstable/http/FetchHttpClient";
 import { AlchemyContextLive } from "alchemy/AlchemyContext";
 import { ArtifactStore, createArtifactStore } from "alchemy/Artifacts";
 import { CredentialsStoreLive } from "alchemy/Auth/Credentials";
-import { ProfileLive } from "alchemy/Auth/Profile";
+import { ProfileStoreLive } from "alchemy/Auth/Profile";
+import { routeCacheLayer } from "alchemy/Alchemist/Session";
 import { TelemetryLive } from "alchemy/Telemetry/Layer";
 import { PlatformServices } from "alchemy/Util/PlatformServices";
 import packageJson from "../../package.json" with { type: "json" };
+import * as CliKit from "./CliKit/index.js";
 import { checkLatestVersion } from "./checkVersion.js";
-import { handleCancellation } from "./commands/_shared.js";
-import { awsCommand } from "./commands/aws.js";
-import { cloudflareCommand } from "./commands/cloudflare.js";
-import { deployCommand, destroyCommand, planCommand, } from "./commands/deploy.js";
-import { devCommand } from "./commands/dev.js";
-import { loginCommand } from "./commands/login.js";
-import { logsCommand } from "./commands/logs.js";
-import { unsafeCommand } from "./commands/nuke.js";
-import { profileCommand } from "./commands/profile.js";
-import { stateCommand } from "./commands/state.js";
-import { syncCommand } from "./commands/sync.js";
-import { tailCommand } from "./commands/tail.js";
-import { selectCli } from "./selectCli.js";
-const root = Command.make("alchemy", {}).pipe(Command.withSubcommands([
-    awsCommand,
-    cloudflareCommand,
-    deployCommand,
-    devCommand,
-    destroyCommand,
-    planCommand,
-    tailCommand,
-    logsCommand,
-    loginCommand,
-    profileCommand,
-    stateCommand,
-    syncCommand,
-    unsafeCommand,
-]));
+import { GlobalLogLive, logRunHeader } from "./GlobalLog.js";
+import { handleCliErrors } from "./commands/errors.js";
+import { compatibilityCommand, compatibilityCommands, } from "./commands/compat.js";
+import { selectCliServices } from "./selectCli.js";
+const commandMetadata = [
+    ["provider", "Manage cloud provider prerequisites and utilities"],
+    ["deploy", "Deploy a stack"],
+    ["dev", "Develop a stack with live reload"],
+    ["destroy", "Destroy a deployed stack"],
+    ["plan", "Preview changes to a stack"],
+    ["logs", "Fetch or tail logs from stack resources"],
+    ["profile", "Manage authentication profiles and accounts"],
+    ["state", "Inspect and manage deployment state"],
+    ["drift", "Detect infrastructure drift"],
+    ["unsafe", "Unsafe maintenance commands"],
+];
+const placeholderCommand = (name, description) => Command.make(name, {}, () => Effect.void).pipe(Command.withDescription(description), name === "unsafe" ? Command.unlisted : (command) => command);
+const loadCommand = async (name) => {
+    switch (name) {
+        case "provider":
+            return (await import("./commands/provider.js")).providerCommand;
+        case "deploy":
+            return (await import("./commands/deploy.js")).deployCommand;
+        case "dev":
+            return (await import("./commands/dev.js")).devCommand;
+        case "destroy":
+            return (await import("./commands/deploy.js")).destroyCommand;
+        case "plan":
+            return (await import("./commands/deploy.js")).planCommand;
+        case "logs":
+            return (await import("./commands/logs.js")).logsCommand;
+        case "profile":
+            return (await import("./commands/profile/index.js")).profileCommand;
+        case "state":
+            return (await import("./commands/state.js")).stateCommand;
+        case "drift":
+            return (await import("./commands/drift.js")).driftCommand;
+        case "unsafe":
+            return (await import("./commands/nuke.js")).unsafeCommand;
+    }
+};
+const argv = process.argv.slice(2);
+const compatibilityName = Object.hasOwn(compatibilityCommands, argv[0] ?? "")
+    ? argv[0]
+    : undefined;
+// Compatibility commands only print their replacement. Discard everything
+// after the old command name so historical positional arguments and flags are
+// accepted without teaching the retired parser surface about every old form.
+if (compatibilityName !== undefined) {
+    const index = process.argv.indexOf(compatibilityName, 2);
+    process.argv.splice(index + 1);
+}
+const commandNames = new Set(commandMetadata.map(([name]) => name));
+const requestedCommand = argv.find((value) => commandNames.has(value));
+const loadEveryCommand = argv.includes("--completions");
+const commands = await Promise.all(commandMetadata.map(([name, description]) => loadEveryCommand || name === requestedCommand
+    ? loadCommand(name)
+    : placeholderCommand(name, description)));
+/**
+ * `--no-input` forces plain, prompt-free output regardless of TTY or env
+ * detection. The value is read via an argv scan in `Util/interactive.ts`
+ * (capability detection runs while the service layers are built, before flag
+ * parsing); this registration exists so the parser accepts the flag.
+ */
+const NoInput = GlobalFlag.setting("no-input")({
+    flag: Flag.boolean("no-input").pipe(Flag.withDescription("Disable prompts and the interactive TUI (plain output; commands needing input fail)"), Flag.withDefault(false)),
+});
+const root = Command.make("alchemy", {}, () => Effect.fail(new CliError.ShowHelp({ commandPath: ["alchemy"], errors: [] }))).pipe(Command.withDescription("Define, deploy, and operate cloud infrastructure with type-safe Effect programs."), Command.withExamples([
+    { command: "alchemy deploy" },
+    { command: "alchemy plan --stage prod" },
+    { command: "alchemy dev" },
+    { command: "alchemy logs --tail" },
+]), Command.withSubcommands([
+    ...commands,
+    ...Object.keys(compatibilityCommands).map((name) => compatibilityCommand(name)),
+]), Command.withGlobalFlags([NoInput]));
+/**
+ * How this CLI process is running, appended to `--version` in a checkout
+ * for debugging the launcher's implicit mode selection (`bin/cli.js`): the
+ * runtime, and whether we're executing `.ts` source (bun, or node with type
+ * stripping + the Oxc register hook) or built output — `node <x>, lib` is
+ * the tell for the old-node fallback that still needs a build. Published
+ * installs print the plain version string.
+ */
+const devRunMode = import.meta.url.includes("/node_modules/")
+    ? undefined
+    : `${typeof globalThis.Bun !== "undefined"
+        ? `bun ${globalThis.Bun.version}`
+        : `node ${process.versions.node}`}, ${import.meta.url.endsWith(".ts") ? "src" : "lib"}`;
 const cli = Command.run(root, {
-    // name: "Alchemy Effect CLI",
-    version: packageJson.version,
+    version: devRunMode === undefined
+        ? packageJson.version
+        : `${packageJson.version} (${devRunMode})`,
 });
-const services = Layer.mergeAll(Layer.provideMerge(AlchemyContextLive, PlatformServices), Layer.provide(ProfileLive, PlatformServices), Layer.provide(CredentialsStoreLive, PlatformServices), 
+const services = Layer.mergeAll(CliConfig.layer({
+    builtIns: [
+        GlobalFlag.Help,
+        GlobalFlag.Version,
+        GlobalFlag.Completions,
+        GlobalFlag.LogLevel,
+    ],
+}), Layer.provideMerge(AlchemyContextLive, PlatformServices), Layer.provide(ProfileStoreLive, PlatformServices), Layer.provide(CredentialsStoreLive, PlatformServices), 
 // Ambient per-CLI-run artifact root. Commands that define their own run
-// boundary (deploy, sync) provide a fresh store closer to the work, which
+// boundary (deploy, drift) provide a fresh store closer to the work, which
 // wins over this one.
-Layer.succeed(ArtifactStore, createArtifactStore()), FetchHttpClient.layer, ConfigProvider.layer(ConfigProvider.fromEnv()), TelemetryLive, selectCli());
+Layer.succeed(ArtifactStore, createArtifactStore()), FetchHttpClient.layer, ConfigProvider.layer(ConfigProvider.fromEnv()), routeCacheLayer, Layer.provide(Layer.provideMerge(Layer.mergeAll(selectCliServices(), CliKit.CliKitInteraction), CliKit.layer()), PlatformServices), 
+// Debug run log under ~/.alchemy/logs — the console noise floor stays at
+// Info, but full causes and auth-flow breadcrumbs land in the file so
+// support can ask users for it.
+//
+// Telemetry sits on top of the console/file loggers so its OTLP logger
+// merges with them. Listed as `mergeAll` siblings, whichever came last
+// would win the `CurrentLoggers` slot and silently drop the other.
+Layer.provideMerge(TelemetryLive, Layer.provide(GlobalLogLive, PlatformServices)));
 const program = Effect.gen(function* () {
+    yield* logRunHeader;
     // Best-effort check for a newer published version. Runs to completion
     // before the command so the warning prints before any interactive
     // prompts; the registry response is cached for a day and the fetch is
     // bounded by a short timeout, so this stays fast.
     yield* checkLatestVersion;
     return yield* cli;
-});
-export const main = program.pipe(
-// $USER and $STAGE are set by the environment
-Effect.provide(services), Effect.scoped, handleCancellation);
+}).pipe(
+// The terminal shows the friendly message; the run log keeps the full
+// cause chain. Must sit inside the service provision so the file logger
+// is still installed.
+Effect.tapCause((cause) => Effect.logDebug(`command failed:\n${Cause.pretty(cause)}`)));
+const mainEffect = program.pipe(
+// $USER and $ALCHEMY_STAGE are set by the environment
+Effect.provide(services), Effect.scoped, handleCliErrors);
+/** Fully wired CLI program. */
+export const main = mainEffect;
 //# sourceMappingURL=main.js.map

package/lib/Cli/main.js.map

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

package/lib/Cli/selectCli.d.ts

@@ -1,5 +1,7 @@
 import * as Layer from "effect/Layer";
-import type { Cli } from "./Cli.ts";
-export { isNonInteractive } from "../Util/interactive.ts";
-export declare const selectCli: () => Layer.Layer<Cli>;
+import type * as Prompt from "effect/unstable/cli/Prompt";
+import type { Cli } from "../Report.ts";
+import { CliKit } from "./CliKit/CliKit.ts";
+/** Select the interactive or append-only root renderer. */
+export declare const selectCliServices: () => Layer.Layer<Cli, never, CliKit | Prompt.Environment>;
 //# sourceMappingURL=selectCli.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"selectCli.d.ts","sourceRoot":"","sources":["../../src/Cli/selectCli.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,KAAK,MAAM,cAAc,CAAC;AAEtC,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,UAAU,CAAC;AAGpC,OAAO,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAE1D,eAAO,MAAM,SAAS,QAAO,KAAK,CAAC,KAAK,CAAC,GAAG,CAWrC,CAAC"}
+{"version":3,"file":"selectCli.d.ts","sourceRoot":"","sources":["../../src/Cli/selectCli.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,KAAK,MAAM,cAAc,CAAC;AAEtC,OAAO,KAAK,KAAK,MAAM,MAAM,4BAA4B,CAAC;AAC1D,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,cAAc,CAAC;AACxC,OAAO,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AAM5C,2DAA2D;AAC3D,eAAO,MAAM,iBAAiB,4DAsB3B,CAAC"}

package/lib/Cli/selectCli.js

@@ -1,13 +1,20 @@
 import * as Effect from "effect/Effect";
 import * as Layer from "effect/Layer";
-import { isNonInteractive } from "../Util/interactive.js";
+import * as CliOutput from "effect/unstable/cli/CliOutput";
+import { CliKit } from "./CliKit/CliKit.js";
 import { LoggingCli } from "./LoggingCli.js";
-export { isNonInteractive } from "../Util/interactive.js";
-export const selectCli = () => isNonInteractive()
-    ? LoggingCli
-    : // Defer importing the Ink/React TUI (`./tui/InkCLI.tsx` pulls in `ink`)
-        // until we actually need the interactive renderer. Non-interactive runs
-        // (agents, CI, piped output) take the cheap `LoggingCli` branch and never
-        // pay the TUI import cost.
-        Layer.unwrap(Effect.promise(() => import("./tui/InkCLI.js").then((m) => m.inkCLI())));
+import { plainCliFormatter } from "./PlainCliFormatter.js";
+/** Select the interactive or append-only root renderer. */
+export const selectCliServices = () => Layer.unwrap(Effect.gen(function* () {
+    const cli = yield* CliKit;
+    if (!cli.terminal.input) {
+        const plain = Layer.mergeAll(LoggingCli, CliOutput.layer(plainCliFormatter({ columns: cli.terminal.columns })));
+        return plain;
+    }
+    return yield* Effect.promise(async () => {
+        const { sigilCli } = await import("./components/view/SigilCli.js");
+        const { brandedCliFormatter } = await import("./components/view/Help.js");
+        return Layer.mergeAll(sigilCli(), CliOutput.layer(brandedCliFormatter(cli)));
+    });
+}));
 //# sourceMappingURL=selectCli.js.map

package/lib/Cli/selectCli.js.map

@@ -1 +1 @@
-{"version":3,"file":"selectCli.js","sourceRoot":"","sources":["../../src/Cli/selectCli.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AACxC,OAAO,KAAK,KAAK,MAAM,cAAc,CAAC;AACtC,OAAO,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAE1D,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAE7C,OAAO,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAE1D,MAAM,CAAC,MAAM,SAAS,GAAG,GAAqB,EAAE,CAC9C,gBAAgB,EAAE;IAChB,CAAC,CAAC,UAAU;IACZ,CAAC,CAAC,wEAAwE;QACxE,wEAAwE;QACxE,0EAA0E;QAC1E,2BAA2B;QAC3B,KAAK,CAAC,MAAM,CACV,MAAM,CAAC,OAAO,CAAC,GAAG,EAAE,CAClB,MAAM,CAAC,iBAAkB,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC,CACnD,CACF,CAAC"}
+{"version":3,"file":"selectCli.js","sourceRoot":"","sources":["../../src/Cli/selectCli.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AACxC,OAAO,KAAK,KAAK,MAAM,cAAc,CAAC;AACtC,OAAO,KAAK,SAAS,MAAM,+BAA+B,CAAC;AAG3D,OAAO,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AAC5C,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAC7C,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAI3D,2DAA2D;AAC3D,MAAM,CAAC,MAAM,iBAAiB,GAAG,GAAG,EAAE,CACpC,KAAK,CAAC,MAAM,CACV,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;IAClB,MAAM,GAAG,GAAG,KAAK,CAAC,CAAC,MAAM,CAAC;IAC1B,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,KAAK,EAAE,CAAC;QACxB,MAAM,KAAK,GAAgB,KAAK,CAAC,QAAQ,CACvC,UAAU,EACV,SAAS,CAAC,KAAK,CAAC,iBAAiB,CAAC,EAAE,OAAO,EAAE,GAAG,CAAC,QAAQ,CAAC,OAAO,EAAE,CAAC,CAAC,CACtE,CAAC;QACF,OAAO,KAAK,CAAC;IACf,CAAC;IAED,OAAO,KAAK,CAAC,CAAC,MAAM,CAAC,OAAO,CAAc,KAAK,IAAI,EAAE;QACnD,MAAM,EAAE,QAAQ,EAAE,GAAG,MAAM,MAAM,CAAC,+BAAgC,CAAC,CAAC;QACpE,MAAM,EAAE,mBAAmB,EAAE,GAC3B,MAAM,MAAM,CAAC,2BAA4B,CAAC,CAAC;QAC7C,OAAO,KAAK,CAAC,QAAQ,CACnB,QAAQ,EAAE,EACV,SAAS,CAAC,KAAK,CAAC,mBAAmB,CAAC,GAAG,CAAC,CAAC,CAC1C,CAAC;IACJ,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CACH,CAAC"}

package/lib/Cloudflare/ApiToken/UserApiToken.d.ts

@@ -19,7 +19,7 @@ export type UserApiToken = Resource<"Cloudflare.ApiToken.UserApiToken", Props, {
  *
  * User-owned tokens are tied to the authenticated user's identity. They can
  * be created by any authenticated user (including OAuth-derived sessions
- * from `alchemy login`) without needing the account-level
+ * from `alchemy profile edit`) without needing the account-level
  * `API Tokens > Write` permission, but they are also revoked if the user
  * leaves the account.
  *

package/lib/Cloudflare/ApiToken/UserApiToken.js

@@ -12,7 +12,7 @@ import { buildConditionPayload, collectPolicies, conditionFingerprint, policyFin
  *
  * User-owned tokens are tied to the authenticated user's identity. They can
  * be created by any authenticated user (including OAuth-derived sessions
- * from `alchemy login`) without needing the account-level
+ * from `alchemy profile edit`) without needing the account-level
  * `API Tokens > Write` permission, but they are also revoked if the user
  * leaves the account.
  *

package/lib/Cloudflare/Auth/AuthConfig.d.ts

@@ -0,0 +1,60 @@
+import * as Effect from "effect/Effect";
+import * as Redacted from "effect/Redacted";
+import * as Schema from "effect/Schema";
+import { AuthError } from "../../Auth/AuthProvider.ts";
+/** Typed values stored in a Cloudflare provider profile document. */
+export declare const CloudflareAuthConfigSchema: Schema.Union<readonly [Schema.Struct<{
+    readonly method: Schema.Literal<"stored">;
+    readonly credentialType: Schema.Literal<"apiToken">;
+    readonly apiToken: Schema.String;
+    readonly accountId: Schema.String;
+}>, Schema.Struct<{
+    readonly method: Schema.Literal<"stored">;
+    readonly credentialType: Schema.Literal<"apiKey">;
+    readonly apiKey: Schema.String;
+    readonly email: Schema.String;
+    readonly accountId: Schema.String;
+}>, Schema.Struct<{
+    readonly method: Schema.Literal<"oauth">;
+    readonly scopes: Schema.mutable<Schema.$Array<Schema.String>>;
+    readonly accountId: Schema.String;
+    readonly clientId: Schema.optional<Schema.String>;
+    readonly access: Schema.String;
+    readonly refresh: Schema.String;
+    readonly expires: Schema.Number;
+}>, Schema.Struct<{
+    readonly method: Schema.Literal<"oauth">;
+}>]>;
+export type CloudflareAuthConfig = typeof CloudflareAuthConfigSchema.Type;
+export type CloudflareResolvedCredentials = {
+    type: "apiToken";
+    apiToken: Redacted.Redacted<string>;
+    accountId: string;
+    source: {
+        type: CloudflareAuthConfig["method"] | "env";
+        details?: string;
+    };
+} | {
+    type: "apiKey";
+    apiKey: Redacted.Redacted<string>;
+    email: Redacted.Redacted<string>;
+    accountId: string;
+    source: {
+        type: CloudflareAuthConfig["method"] | "env";
+        details?: string;
+    };
+} | {
+    type: "oauth";
+    accessToken: Redacted.Redacted<string>;
+    expires: number;
+    accountId: string;
+    source: {
+        type: CloudflareAuthConfig["method"] | "env";
+        details?: string;
+    };
+};
+export declare const CLOUDFLARE_AUTH_PROVIDER_NAME = "Cloudflare";
+export declare const validateAccountId: (accountId: string | undefined, source: string) => Effect.Effect<string, AuthError>;
+/** Field-level validator reusing {@link ACCOUNT_ID_PATTERN}. */
+export declare const validateAccountIdField: (v: string) => string | undefined;
+//# sourceMappingURL=AuthConfig.d.ts.map

package/lib/Cloudflare/Auth/AuthConfig.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"AuthConfig.d.ts","sourceRoot":"","sources":["../../../src/Cloudflare/Auth/AuthConfig.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AACxC,OAAO,KAAK,QAAQ,MAAM,iBAAiB,CAAC;AAC5C,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AACxC,OAAO,EAAE,SAAS,EAAE,MAAM,4BAA4B,CAAC;AAGvD,qEAAqE;AACrE,eAAO,MAAM,0BAA0B;;;;;;;;;;;;;;;;;;;;;IA4BrC,CAAC;AACH,MAAM,MAAM,oBAAoB,GAAG,OAAO,0BAA0B,CAAC,IAAI,CAAC;AAE1E,MAAM,MAAM,6BAA6B,GACrC;IACE,IAAI,EAAE,UAAU,CAAC;IACjB,QAAQ,EAAE,QAAQ,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;IACpC,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE;QACN,IAAI,EAAE,oBAAoB,CAAC,QAAQ,CAAC,GAAG,KAAK,CAAC;QAC7C,OAAO,CAAC,EAAE,MAAM,CAAC;KAClB,CAAC;CACH,GACD;IACE,IAAI,EAAE,QAAQ,CAAC;IACf,MAAM,EAAE,QAAQ,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;IAClC,KAAK,EAAE,QAAQ,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;IACjC,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE;QACN,IAAI,EAAE,oBAAoB,CAAC,QAAQ,CAAC,GAAG,KAAK,CAAC;QAC7C,OAAO,CAAC,EAAE,MAAM,CAAC;KAClB,CAAC;CACH,GACD;IACE,IAAI,EAAE,OAAO,CAAC;IACd,WAAW,EAAE,QAAQ,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;IACvC,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE;QACN,IAAI,EAAE,oBAAoB,CAAC,QAAQ,CAAC,GAAG,KAAK,CAAC;QAC7C,OAAO,CAAC,EAAE,MAAM,CAAC;KAClB,CAAC;CACH,CAAC;AAEN,eAAO,MAAM,6BAA6B,eAAe,CAAC;AAW1D,eAAO,MAAM,iBAAiB,cACjB,MAAM,GAAG,SAAS,UACrB,MAAM,KACb,MAAM,CAAC,MAAM,CAAC,MAAM,EAAE,SAAS,CA2B9B,CAAC;AAEL,gEAAgE;AAChE,eAAO,MAAM,sBAAsB,MAAO,MAAM,KAAG,MAAM,GAAG,SAGsB,CAAC"}