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

package/lib/Cli/commands/deploy.js

@@ -2,16 +2,16 @@ import * as Command from "effect/cli/Command";
 import * as Flag from "effect/cli/Flag";
 import * as Effect from "effect/Effect";
 import * as Option from "effect/Option";
-import * as Drift from "../../Alchemist/routes/drift.js";
-import * as Stacks from "../../Alchemist/routes/stack.js";
+import * as Alchemist from "../../Alchemist/index.js";
+import * as Interaction from "../../Interaction.js";
 import { Cli } from "../../Report.js";
-import * as CliKit from "../CliKit/index.js";
+import { renderApply } from "../../Report.js";
 import { planDecisionScreen } from "../components/view/PlanDecision.js";
 import { stackOutputsView } from "../components/view/StackOutputs.js";
 import { exitDeclined } from "./errors.js";
 import { configPath, dryRun as dryRunFlag, envFile, force, include, exclude, validateSelectionOptions, optionalConfig, profile, resolveStackArgs, stage, yes, } from "./flags.js";
 import { instrumentCommand } from "./instrument.js";
-import { renderApply, renderPlanning } from "./render.js";
+import { renderPlanning } from "./render.js";
 const stackSpanAttrs = (args) => ({
     "alchemy.stage": args.stage,
     "alchemy.profile": args.profile,
@@ -27,30 +27,30 @@ const adopt = Flag.Boolean("adopt").pipe(Flag.withDescription("Adopt pre-existin
     "Useful for re-importing infrastructure into a fresh state store."), Flag.withDefault(false));
 const detailed = Flag.Boolean("detailed").pipe(Flag.withDescription("Show declared resource properties as YAML"), Flag.withDefault(false));
 const detectDrift = Flag.Boolean("detect-drift").pipe(Flag.withDescription("Detect infrastructure drift and offer to repair it before deploying"), Flag.withDefault(false));
-const detectAndMaybeRepairDrift = Effect.fn(function* (target, options) {
+const detectAndMaybeRepairDrift = Effect.fn(function* (scanDrift, options) {
     const cli = yield* Cli;
-    const snapshot = yield* Drift.inspect(target).pipe(renderPlanning({
+    const snapshot = yield* scanDrift.pipe(renderPlanning({
         operation: "Drift",
-        stage: target.stage,
+        stage: options.stage,
         computingLabel: "Checking drift",
         readyLabel: "Drift check complete",
     }));
-    if (!Drift.hasDrift(snapshot))
+    if (!Alchemist.Drift.hasDrift(snapshot))
         return true;
     if (options.dryRun) {
-        yield* cli.displayPlan(snapshot.repairPlan.native, {
+        yield* cli.displayPlan(snapshot.native, {
             detailed: options.detailed,
-            stage: target.stage,
+            stage: options.stage,
         });
         return true;
     }
     let decision = options.yes ? "repair" : "cancel";
     if (!options.yes) {
-        const terminal = yield* CliKit.CliKit;
+        const terminal = yield* Interaction.Interaction;
         if (terminal.terminal.input) {
             decision = yield* terminal.prompt
-                .custom(planDecisionScreen({
-                plan: snapshot.repairPlan.native,
+                .screen(planDecisionScreen({
+                plan: snapshot.native,
                 message: "Drift detected",
                 choices: [
                     {
@@ -71,17 +71,17 @@ const detectAndMaybeRepairDrift = Effect.fn(function* (target, options) {
                 .pipe(Effect.catchTag("TerminalCancelled", () => Effect.succeed("cancel")));
         }
         else {
-            yield* cli.displayPlan(snapshot.repairPlan.native, {
+            yield* cli.displayPlan(snapshot.native, {
                 detailed: options.detailed,
-                stage: target.stage,
+                stage: options.stage,
             });
-            yield* CliKit.accessors.output.warning("Drift detected in a non-interactive terminal. Re-run with --yes to repair and deploy.");
+            yield* Interaction.warning("Drift detected in a non-interactive terminal. Re-run with --yes to repair and deploy.");
         }
     }
     if (decision === "repair") {
-        yield* Drift.repair(snapshot).pipe(renderApply(snapshot.repairPlan.native, {
+        yield* Alchemist.Drift.execute(snapshot).pipe(renderApply(snapshot.native, {
             detailed: options.detailed,
-            stage: target.stage,
+            stage: options.stage,
         }));
     }
     return decision !== "cancel";
@@ -90,48 +90,49 @@ const runStack = Effect.fn(function* (options) {
     yield* validateSelectionOptions(options);
     const cli = yield* Cli;
     const display = { detailed: options.detailed, stage: options.stage };
-    const target = {
-        entrypoint: options.main,
+    const buildOptions = {
         stage: options.stage,
         profile: options.profile,
         envFile: Option.getOrUndefined(options.envFile),
+        adopt: options.adopt,
+        updateStateStore: options.yes,
     };
+    const stack = Alchemist.importStack(options.main);
     const operation = options.destroy ? "Destroy" : options.dryRun ? "Plan" : "Deploy";
     const withPlanningProgress = renderPlanning({
         operation,
         stage: options.stage,
     });
     if (options.detectDrift && !options.destroy) {
-        const proceed = yield* detectAndMaybeRepairDrift(target, options);
+        // The drift check closes its build before the deploy builds again: a
+        // remote state store holds one lease per stage per build.
+        const proceed = yield* detectAndMaybeRepairDrift(Effect.flatMap(stack, (stack) => Alchemist.Drift.scan({ ...buildOptions, stack })), options).pipe(Effect.scoped);
         if (!proceed) {
-            yield* CliKit.accessors.output.info("Deploy aborted: drift was detected and not approved.");
+            yield* Interaction.info("Deploy aborted: drift was detected and not approved.");
             return yield* exitDeclined;
         }
     }
-    const snapshot = yield* Stacks.plan({
-        target,
-        operation: options.destroy ? "destroy" : "deploy",
-        force: options.force,
-        include: options.include,
-        exclude: options.exclude,
-        adopt: options.adopt,
-        updateStateStore: options.yes,
-    }).pipe(withPlanningProgress);
+    const snapshot = yield* Effect.flatMap(stack, (stack) => Alchemist.plan(options.destroy
+        ? { ...buildOptions, stack, operation: "destroy" }
+        : {
+            ...buildOptions,
+            stack,
+            operation: "deploy",
+            force: options.force,
+            include: options.include,
+            exclude: options.exclude,
+        })).pipe(withPlanningProgress);
     if (options.dryRun) {
         return yield* cli.displayPlan(snapshot.native, display);
     }
-    if (!options.yes && Stacks.hasChanges(snapshot.summary)) {
-        const approved = yield* cli.approvePlan(snapshot.native, display).pipe(Effect.tap((approved) => approved
-            ? Effect.void
-            : CliKit.accessors.output.info(`${operation} aborted: plan declined.`)), Effect.catchTag("NonInteractiveTerminal", () => CliKit.accessors.output
-            .warning(`Cannot prompt for approval in a non-interactive terminal. Nothing was changed — re-run with --yes to ${operation.toLowerCase()}.`)
-            .pipe(Effect.as(false))));
+    if (!options.yes && Alchemist.hasChanges(snapshot)) {
+        const approved = yield* cli.approvePlan(snapshot.native, display).pipe(Effect.tap((approved) => approved ? Effect.void : Interaction.info(`${operation} aborted: plan declined.`)), Effect.catchTag("NonInteractiveTerminal", () => Interaction.warning(`Cannot prompt for approval in a non-interactive terminal. Nothing was changed — re-run with --yes to ${operation.toLowerCase()}.`).pipe(Effect.as(false))));
         if (!approved)
             return yield* exitDeclined;
     }
-    const result = yield* Stacks.apply(snapshot).pipe(renderApply(snapshot.native, display));
+    const result = yield* Alchemist.apply(snapshot).pipe(renderApply(snapshot.native, display));
     if (result !== undefined) {
-        const kit = yield* CliKit.CliKit;
+        const kit = yield* Interaction.Interaction;
         yield* kit.output.print(stackOutputsView(result));
     }
 });

package/lib/Cli/commands/deploy.js.map

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

package/lib/Cli/commands/dev.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"dev.d.ts","sourceRoot":"","sources":["../../../src/Cli/commands/dev.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,OAAO,MAAM,oBAAoB,CAAC;AAE9C,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AAExC,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AAoBxC;;;;;;;;;;GAUG;AAEH,eAAO,MAAM,UAAU;;;;;;;;;0WAgG4C,CAAC"}
+{"version":3,"file":"dev.d.ts","sourceRoot":"","sources":["../../../src/Cli/commands/dev.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,OAAO,MAAM,oBAAoB,CAAC;AAI9C,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AAExC,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AA0BxC;;;;;;;;;;GAUG;AAEH,eAAO,MAAM,UAAU;;;;;;;;;0WAkJ4C,CAAC"}

package/lib/Cli/commands/dev.js

@@ -1,17 +1,25 @@
 import { fileURLToPath } from "node:url";
 import * as Command from "effect/cli/Command";
 import * as Effect from "effect/Effect";
+import * as Fiber from "effect/Fiber";
+import * as Logger from "effect/Logger";
 import * as Option from "effect/Option";
 import * as ChildProcess from "effect/process/ChildProcess";
 import * as Schema from "effect/Schema";
+import * as Stream from "effect/Stream";
 import { resolveStackEntrypoint } from "../../Alchemist/Entrypoint.js";
 import * as Contributions from "../../Contributions.js";
 import { SPAWNER_URL_ENV_KEY } from "../../Local/RpcProviderProxy.js";
 import * as RpcSpawner from "../../Local/RpcSpawner.js";
+import { LOG_FD_ENV, parseRecord, replayRecord } from "../../Util/LogRecord.js";
 import { nodeLoaderArgs } from "../../Util/Node.js";
+import { timedShutdownStep } from "../../Util/Shutdown.js";
+import { traceParentEnv } from "../../Util/TraceParent.js";
 import { DEV_RELOAD_EXIT_CODE, DevOptions } from "../DevOptions.js";
+import { consoleSettingsEnv, currentConsoleSettings, RunLog } from "../GlobalLog.js";
 import { suppressInterruptMessages } from "./errors.js";
 import { configPath, envFile, force, include, exclude, devStage, optionalConfig, profile, resolveStackArgs, } from "./flags.js";
+import { logCommandFailure, VersionCheck } from "./instrument.js";
 /**
  * Trust the Floci emulator CA in `alchemy dev` so cross-cloud data planes
  * terminated by the emulator's self-signed cert (e.g. an AWS Lambda MicroVM
@@ -77,6 +85,10 @@ export const devCommand = Command.make("dev", {
             entry,
         ];
     }
+    const runLog = yield* RunLog;
+    const consoleSettings = yield* currentConsoleSettings;
+    // The child's records and spans join this command's trace.
+    const traceEnv = yield* traceParentEnv;
     const runChild = ChildProcess.make(command[0], command.slice(1), {
         stdin: "inherit",
         stdout: "inherit",
@@ -84,24 +96,50 @@ export const devCommand = Command.make("dev", {
         env: {
             ALCHEMY_EXEC_OPTIONS: JSON.stringify(options),
             ALCHEMY_DEV: "true",
+            [LOG_FD_ENV]: "3",
+            // The exec child renders the run's logs but never sees this argv.
+            ...consoleSettingsEnv(consoleSettings),
             ...(process.env.NODE_EXTRA_CA_CERTS
                 ? { NODE_EXTRA_CA_CERTS: process.env.NODE_EXTRA_CA_CERTS }
                 : {}),
             [SPAWNER_URL_ENV_KEY]: spawner.url,
+            ...traceEnv,
         },
         extendEnv: true,
         // Same process group as this supervisor: the exec child owns the
         // terminal (TUI stdin), so the tty's Ctrl+C must reach it directly.
         detached: false,
-    }).pipe(Effect.flatMap((child) => child.exitCode), Effect.scoped);
+        // The child's log records, for the run log this process writes.
+        additionalFds: { fd3: { type: "output" } },
+    }).pipe(Effect.flatMap((child) => Effect.gen(function* () {
+        const records = yield* child.getOutputFd(3).pipe(Stream.decodeText(), Stream.splitLines, 
+        // Already rendered by the child: into the run log only. A line
+        // that doesn't decode is skipped, never ends the reader.
+        Stream.runForEach((line) => {
+            const record = parseRecord(line);
+            return record === undefined
+                ? Effect.void
+                : replayRecord(record).pipe(Effect.provideService(Logger.CurrentLoggers, new Set([runLog])));
+        }), Effect.ignore, Effect.forkScoped);
+        // The pipe closes with the child: take its last records before
+        // this scope (and the reader with it) closes.
+        const drain = Fiber.join(records).pipe(Effect.timeout("2 seconds"), Effect.ignore);
+        const code = yield* child.exitCode.pipe(
+        // Ctrl+C reaches the child too (same process group): let it
+        // finish its own shutdown and report it before this scope
+        // kills whatever is left.
+        Effect.onInterrupt(() => child.exitCode.pipe(Effect.timeout("5 seconds"), Effect.ignore, Effect.andThen(drain), timedShutdownStep("stopped exec child"))));
+        yield* drain;
+        return code;
+    })), Effect.scoped);
     // Each child gets its own scope so a reload exit releases the old
     // handle before the replacement starts; the sidecar spawner lives in
     // the command scope and survives every restart.
     yield* Effect.repeat(runChild, {
         until: (code) => code !== DEV_RELOAD_EXIT_CODE,
     });
-}, (effect, args) => Effect.provide(RpcSpawner.layerServer({
+}, (effect, args) => Effect.andThen(Effect.flatten(VersionCheck), Effect.provide(RpcSpawner.layerServer({
     profile: args.profile,
     envFile: Option.getOrUndefined(args.envFile),
-}))(effect))).pipe(Command.withDescription("Develop a stack with live reload"));
+}))(effect)).pipe(logCommandFailure))).pipe(Command.withDescription("Develop a stack with live reload"));
 //# sourceMappingURL=dev.js.map

package/lib/Cli/commands/dev.js.map

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

package/lib/Cli/commands/drift.d.ts

@@ -1,12 +1,12 @@
 import * as Command from "effect/cli/Command";
 import * as Option from "effect/Option";
+import * as Interaction from "../../Interaction.ts";
 import { Cli } from "../../Report.ts";
-import * as CliKit from "../CliKit/index.ts";
 export declare const driftCommand: Command.Command<"drift", {
     readonly repair: boolean;
     readonly main: string;
     readonly envFile: Option.Option<string>;
     readonly stage: string | undefined;
     readonly profile: string | undefined;
-}, {}, any, import("../../AlchemyContext.ts").AlchemyContext | import("effect/process/ChildProcessSpawner").ChildProcessSpawner | Cli | CliKit.CliKit | import("../../Auth/Credentials.ts").CredentialsStore | import("effect/Crypto").Crypto | import("effect/FileSystem").FileSystem | import("effect/http/HttpClient").HttpClient | import("../../Interaction.ts").Interaction | import("effect/Path").Path | import("../../Auth/Profile.ts").ProfileStore | import("effect/Scope").Scope>;
+}, {}, any, import("../../AlchemyContext.ts").AlchemyContext | import("effect/process/ChildProcessSpawner").ChildProcessSpawner | Cli | import("../../Auth/Credentials.ts").CredentialsStore | import("effect/crypto/Digest").Digest | import("effect/FileSystem").FileSystem | import("effect/http/HttpClient").HttpClient | Interaction.Interaction | import("effect/Path").Path | import("../../Auth/Profile.ts").ProfileStore | import("effect/Scope").Scope | import("effect/crypto/SecureRandom").SecureRandom>;
 //# sourceMappingURL=drift.d.ts.map

package/lib/Cli/commands/drift.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"drift.d.ts","sourceRoot":"","sources":["../../../src/Cli/commands/drift.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,OAAO,MAAM,oBAAoB,CAAC;AAG9C,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AAExC,OAAO,EAAE,GAAG,EAAE,MAAM,iBAAiB,CAAC;AACtC,OAAO,KAAK,MAAM,MAAM,oBAAoB,CAAC;AA0E7C,eAAO,MAAM,YAAY;;;;;;6dAoBqC,CAAC"}
+{"version":3,"file":"drift.d.ts","sourceRoot":"","sources":["../../../src/Cli/commands/drift.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,OAAO,MAAM,oBAAoB,CAAC;AAG9C,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AAExC,OAAO,KAAK,WAAW,MAAM,sBAAsB,CAAC;AACpD,OAAO,EAAE,GAAG,EAAE,MAAM,iBAAiB,CAAC;AA8EtC,eAAO,MAAM,YAAY;;;;;;qfAoBqC,CAAC"}

package/lib/Cli/commands/drift.js

@@ -2,38 +2,39 @@ import * as Command from "effect/cli/Command";
 import * as Flag from "effect/cli/Flag";
 import * as Effect from "effect/Effect";
 import * as Option from "effect/Option";
-import * as Drift from "../../Alchemist/routes/drift.js";
+import * as Alchemist from "../../Alchemist/index.js";
+import * as Interaction from "../../Interaction.js";
 import { Cli } from "../../Report.js";
-import * as CliKit from "../CliKit/index.js";
+import { renderApply } from "../../Report.js";
 import { planDecisionScreen } from "../components/view/PlanDecision.js";
 import { config, envFile, profile, resolveStage, stage } from "./flags.js";
 import { instrumentCommand } from "./instrument.js";
-import { renderApply, renderPlanning } from "./render.js";
+import { renderPlanning } from "./render.js";
 const repairFlag = Flag.Boolean("repair").pipe(Flag.withDescription("Repair detected drift without prompting"), Flag.withDefault(false));
 const routeDrift = Effect.fn(function* ({ main, stage, envFile, profile, repair = false, }) {
     const cli = yield* Cli;
-    const snapshot = yield* Drift.inspect({
-        entrypoint: main,
+    const snapshot = yield* Alchemist.importStack(main).pipe(Effect.flatMap((stack) => Alchemist.Drift.scan({
+        stack,
         stage,
         profile,
         envFile: Option.getOrUndefined(envFile),
-    }).pipe(renderPlanning({
+    })), renderPlanning({
         operation: "Drift",
         stage,
         computingLabel: "Checking drift",
         readyLabel: "Drift check complete",
     }));
-    if (!Drift.hasDrift(snapshot)) {
-        return yield* cli.displayPlan(snapshot.repairPlan.native);
+    if (!Alchemist.Drift.hasDrift(snapshot)) {
+        return yield* cli.displayPlan(snapshot.native);
     }
     if (!repair) {
-        const terminal = yield* CliKit.CliKit;
+        const terminal = yield* Interaction.Interaction;
         if (!terminal.terminal.input) {
-            return yield* cli.displayPlan(snapshot.repairPlan.native);
+            return yield* cli.displayPlan(snapshot.native);
         }
         const decision = yield* terminal.prompt
-            .custom(planDecisionScreen({
-            plan: snapshot.repairPlan.native,
+            .screen(planDecisionScreen({
+            plan: snapshot.native,
             message: "Drift detected",
             choices: [
                 {
@@ -51,7 +52,7 @@ const routeDrift = Effect.fn(function* ({ main, stage, envFile, profile, repair
         if (decision === "cancel")
             return;
     }
-    yield* Drift.repair(snapshot).pipe(renderApply(snapshot.repairPlan.native));
+    yield* Alchemist.Drift.execute(snapshot).pipe(renderApply(snapshot.native));
 });
 export const driftCommand = Command.make("drift", {
     repair: repairFlag,

package/lib/Cli/commands/drift.js.map

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

package/lib/Cli/commands/errors.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"errors.d.ts","sourceRoot":"","sources":["../../../src/Cli/commands/errors.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,cAAc,CAAC;AACtC,OAAO,KAAK,QAAQ,MAAM,qBAAqB,CAAC;AAGhD,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AACxC,OAAO,KAAK,OAAO,MAAM,gBAAgB,CAAC;AAE1C,OAAO,EAAgB,eAAe,EAAE,MAAM,0BAA0B,CAAC;AAqBzE,eAAO,MAAM,oBAAoB,UAAW,OAAO,KAAG,OAOrD,CAAC;AAEF,eAAO,MAAM,cAAc,MAAM,CAAC;AAElC,eAAO,MAAM,WAAW,SAAU,MAAM,sCAGpC,CAAC;AAEL,eAAO,MAAM,YAAY,mCAAiB,CAAC;AAG3C,eAAO,MAAM,yBAAyB,mCAEpC,CAAC;AAIH;;;;GAIG;AACH,eAAO,MAAM,uBAAuB,mCAclC,CAAC;AAEH,eAAO,MAAM,kBAAkB,GAAI,CAAC,EAAE,CAAC,EAAE,CAAC,QAAQ,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,kCAmBrE,CAAC;AAEJ,cAAM,gBAAgB;IAER,QAAQ,CAAC,KAAK,EAAE,OAAO;IADnC,QAAQ,CAAC,CAAC,OAAO,CAAC,aAAa,CAAC,SAAS;IACzC,YAAqB,KAAK,EAAE,OAAO,EAAI;CACxC;;;;AAeD,qBAAa,cAAe,SAAQ,oBAAmC;IACrE,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;CAC1B,CAAC;IACA,QAAQ,CAAC,CAAC,eAAe,CAAC,QAAQ;CACnC;AAED,eAAO,MAAM,gBAAgB,GAAI,CAAC,EAAE,CAAC,EAAE,CAAC,QAAQ,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,8CAsBnE,CAAC;AAEJ,eAAO,MAAM,eAAe,GAAI,CAAC,EAAE,CAAC,EAAE,CAAC,QAAQ,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,qDACpB,CAAC;AAElD,eAAO,MAAM,YAAY,gBAAiB,aAAa,CAAC,MAAM,CAAC,mDAK5D,CAAC"}
+{"version":3,"file":"errors.d.ts","sourceRoot":"","sources":["../../../src/Cli/commands/errors.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,cAAc,CAAC;AACtC,OAAO,KAAK,QAAQ,MAAM,qBAAqB,CAAC;AAGhD,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AACxC,OAAO,KAAK,OAAO,MAAM,gBAAgB,CAAC;AAE1C,OAAO,EAAgB,eAAe,EAAE,MAAM,0BAA0B,CAAC;AAoBzE,eAAO,MAAM,oBAAoB,UAAW,OAAO,KAAG,OAOrD,CAAC;AAEF,eAAO,MAAM,cAAc,MAAM,CAAC;AAElC,eAAO,MAAM,WAAW,SAAU,MAAM,sCAGpC,CAAC;AAEL,eAAO,MAAM,YAAY,mCAAiB,CAAC;AAG3C,eAAO,MAAM,yBAAyB,mCAEpC,CAAC;AAIH;;;;GAIG;AACH,eAAO,MAAM,uBAAuB,mCAclC,CAAC;AAEH,eAAO,MAAM,kBAAkB,GAAI,CAAC,EAAE,CAAC,EAAE,CAAC,QAAQ,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,kCAmBrE,CAAC;AAEJ,cAAM,gBAAgB;IAER,QAAQ,CAAC,KAAK,EAAE,OAAO;IADnC,QAAQ,CAAC,CAAC,OAAO,CAAC,aAAa,CAAC,SAAS;IACzC,YAAqB,KAAK,EAAE,OAAO,EAAI;CACxC;;;;AAeD,qBAAa,cAAe,SAAQ,oBAAmC;IACrE,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;CAC1B,CAAC;IACA,QAAQ,CAAC,CAAC,eAAe,CAAC,QAAQ;CACnC;AAED,eAAO,MAAM,gBAAgB,GAAI,CAAC,EAAE,CAAC,EAAE,CAAC,QAAQ,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,8CAsBnE,CAAC;AAEJ,eAAO,MAAM,eAAe,GAAI,CAAC,EAAE,CAAC,EAAE,CAAC,QAAQ,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,qDACpB,CAAC;AAElD,eAAO,MAAM,YAAY,gBAAiB,aAAa,CAAC,MAAM,CAAC,mDAK5D,CAAC"}

package/lib/Cli/commands/errors.js

@@ -6,7 +6,8 @@ import * as Effect from "effect/Effect";
 import * as Runtime from "effect/Runtime";
 import * as Schema from "effect/Schema";
 import { isUserFacing, UserFacingError } from "../../UserFacingError.js";
-import { ANSI_DIM, ANSI_RESET, ansiFg, colorsEnabled, glyphsFor, theme, unicodeEnabled, } from "../CliKit/index.js";
+import { ANSI_DIM, ANSI_RESET, ansiFg, colorsEnabled, unicodeEnabled, } from "../../Util/Terminal.js";
+import { glyphsFor, theme } from "../../Util/Theme.js";
 const isTerminalCancelled = Schema.is(Schema.Struct({ _tag: Schema.Literals(["TerminalCancelled"]) }));
 const isAuthErrorLike = Schema.is(Schema.Struct({
     _tag: Schema.Literals(["AuthError"]),

package/lib/Cli/commands/errors.js.map

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

package/lib/Cli/commands/instrument.d.ts

@@ -1,10 +1,20 @@
+import * as Context from "effect/Context";
 import * as Effect from "effect/Effect";
 /**
- * Wraps a command handler as one traced, metered unit that is also one
- * route-cache scope: the stack sessions and auth registries its routes open
- * are memoized for the command's duration (`routeCacheLayer`). Commands that
- * never open a session (`dev`, which only supervises the exec child) stay
- * off this wrapper and therefore never load `Alchemist/Session`.
+ * The terminal shows a failed command's friendly message; this keeps its
+ * full cause chain in the command's run log.
+ */
+export declare const logCommandFailure: <A, E, R>(effect: Effect.Effect<A, E, R>) => Effect.Effect<A, E, R>;
+/**
+ * The pre-command version check. The CLI entrypoint sets it with its
+ * services already provided; elsewhere (tests, the API) it does nothing.
+ */
+export declare const VersionCheck: Context.Reference<Effect.Effect<void, never, never>>;
+/**
+ * Wraps a command handler as one traced, metered unit. A best-effort check
+ * for a newer published version runs first, so its warning prints before
+ * any interactive prompt; it is cached for a day and bounded by a short
+ * timeout, so this stays fast.
  */
 export declare const instrumentCommand: <AttrsArgs = unknown>(command: string, attrs?: (args: AttrsArgs) => Record<string, unknown>) => <Args extends AttrsArgs, A, E, R>(handler: (args: Args) => Effect.Effect<A, E, R>) => ((args: Args) => Effect.Effect<A, E, R>);
 //# sourceMappingURL=instrument.d.ts.map

package/lib/Cli/commands/instrument.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"instrument.d.ts","sourceRoot":"","sources":["../../../src/Cli/commands/instrument.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AAIxC;;;;;;GAMG;AACH,eAAO,MAAM,iBAAiB,GAC3B,SAAS,GAAG,OAAO,WAAW,MAAM,UAAU,CAAC,IAAI,EAAE,SAAS,KAAK,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,MAC1F,IAAI,SAAS,SAAS,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,WACrB,CAAC,IAAI,EAAE,IAAI,KAAK,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,KAC9C,CAAC,CAAC,IAAI,EAAE,IAAI,KAAK,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAQvC,CAAC"}
+{"version":3,"file":"instrument.d.ts","sourceRoot":"","sources":["../../../src/Cli/commands/instrument.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,OAAO,MAAM,gBAAgB,CAAC;AAC1C,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AAgBxC;;;GAGG;AACH,eAAO,MAAM,iBAAiB,GAAI,CAAC,EAAE,CAAC,EAAE,CAAC,UAAU,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,2BACuB,CAAC;AAEjG;;;GAGG;AACH,eAAO,MAAM,YAAY,sDAEvB,CAAC;AAEH;;;;;GAKG;AACH,eAAO,MAAM,iBAAiB,GAC3B,SAAS,GAAG,OAAO,WAAW,MAAM,UAAU,CAAC,IAAI,EAAE,SAAS,KAAK,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,MAC1F,IAAI,SAAS,SAAS,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,WACrB,CAAC,IAAI,EAAE,IAAI,KAAK,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,KAC9C,CAAC,CAAC,IAAI,EAAE,IAAI,KAAK,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAWvC,CAAC"}

package/lib/Cli/commands/instrument.js

@@ -1,14 +1,39 @@
+import * as Cause from "effect/Cause";
+import * as Context from "effect/Context";
 import * as Effect from "effect/Effect";
-import { routeCacheLayer } from "../../Alchemist/Session.js";
+import { identity } from "effect/Function";
+import { authRegistryLayer } from "../../Alchemist/AuthRegistry.js";
 import { recordCli } from "../../Telemetry/Metrics.js";
+import { globalLogs } from "../../Util/LogRecord.js";
 /**
- * Wraps a command handler as one traced, metered unit that is also one
- * route-cache scope: the stack sessions and auth registries its routes open
- * are memoized for the command's duration (`routeCacheLayer`). Commands that
- * never open a session (`dev`, which only supervises the exec child) stay
- * off this wrapper and therefore never load `Alchemist/Session`.
+ * Commands about the account, not a project: their logs go to the global run
+ * log (`~/.alchemy/logs`), so running one outside a project creates nothing
+ * there.
  */
-export const instrumentCommand = (command, attrs) => (handler) => (args) => handler(args).pipe(Effect.withSpan(`cli.${command}`, {
+const isGlobalCommand = (command) => /^(profile|provider)(\.|$)/.test(command) ||
+    command === "state.bootstrap" ||
+    command === "state.teardown";
+/**
+ * The terminal shows a failed command's friendly message; this keeps its
+ * full cause chain in the command's run log.
+ */
+export const logCommandFailure = (effect) => Effect.tapCause(effect, (cause) => Effect.logDebug(`command failed:\n${Cause.pretty(cause)}`));
+/**
+ * The pre-command version check. The CLI entrypoint sets it with its
+ * services already provided; elsewhere (tests, the API) it does nothing.
+ */
+export const VersionCheck = Context.Reference("alchemy/Cli/VersionCheck", {
+    defaultValue: () => Effect.void,
+});
+/**
+ * Wraps a command handler as one traced, metered unit. A best-effort check
+ * for a newer published version runs first, so its warning prints before
+ * any interactive prompt; it is cached for a day and bounded by a short
+ * timeout, so this stays fast.
+ */
+export const instrumentCommand = (command, attrs) => (handler) => (args) => Effect.andThen(Effect.flatten(VersionCheck), handler(args)).pipe(Effect.withSpan(`cli.${command}`, {
     attributes: attrs ? attrs(args) : {},
-}), recordCli(command), Effect.provide(routeCacheLayer));
+}), recordCli(command), logCommandFailure, isGlobalCommand(command) ? globalLogs : identity, 
+// Auth registries are memoized for the command's duration.
+Effect.provide(authRegistryLayer));
 //# sourceMappingURL=instrument.js.map

package/lib/Cli/commands/instrument.js.map

@@ -1 +1 @@
-{"version":3,"file":"instrument.js","sourceRoot":"","sources":["../../../src/Cli/commands/instrument.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AACxC,OAAO,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAC;AAC7D,OAAO,EAAE,SAAS,EAAE,MAAM,4BAA4B,CAAC;AAEvD;;;;;;GAMG;AACH,MAAM,CAAC,MAAM,iBAAiB,GAC5B,CAAsB,OAAe,EAAE,KAAoD,EAAE,EAAE,CAC/F,CACE,OAA+C,EACL,EAAE,CAC9C,CAAC,IAAI,EAAE,EAAE,CACP,OAAO,CAAC,IAAI,CAAC,CAAC,IAAI,CAChB,MAAM,CAAC,QAAQ,CAAC,OAAO,OAAO,EAAE,EAAE;IAChC,UAAU,EAAE,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,EAAE;CACrC,CAAC,EACF,SAAS,CAAC,OAAO,CAAC,EAClB,MAAM,CAAC,OAAO,CAAC,eAAe,CAAC,CAChC,CAAC"}
+{"version":3,"file":"instrument.js","sourceRoot":"","sources":["../../../src/Cli/commands/instrument.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,cAAc,CAAC;AACtC,OAAO,KAAK,OAAO,MAAM,gBAAgB,CAAC;AAC1C,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AACxC,OAAO,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAC3C,OAAO,EAAE,iBAAiB,EAAE,MAAM,iCAAiC,CAAC;AACpE,OAAO,EAAE,SAAS,EAAE,MAAM,4BAA4B,CAAC;AACvD,OAAO,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AAErD;;;;GAIG;AACH,MAAM,eAAe,GAAG,CAAC,OAAe,EAAE,EAAE,CAC1C,2BAA2B,CAAC,IAAI,CAAC,OAAO,CAAC;IACzC,OAAO,KAAK,iBAAiB;IAC7B,OAAO,KAAK,gBAAgB,CAAC;AAE/B;;;GAGG;AACH,MAAM,CAAC,MAAM,iBAAiB,GAAG,CAAU,MAA8B,EAAE,EAAE,CAC3E,MAAM,CAAC,QAAQ,CAAC,MAAM,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,MAAM,CAAC,QAAQ,CAAC,oBAAoB,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,CAAC;AAEjG;;;GAGG;AACH,MAAM,CAAC,MAAM,YAAY,GAAG,OAAO,CAAC,SAAS,CAAsB,0BAA0B,EAAE;IAC7F,YAAY,EAAE,GAAG,EAAE,CAAC,MAAM,CAAC,IAAI;CAChC,CAAC,CAAC;AAEH;;;;;GAKG;AACH,MAAM,CAAC,MAAM,iBAAiB,GAC5B,CAAsB,OAAe,EAAE,KAAoD,EAAE,EAAE,CAC/F,CACE,OAA+C,EACL,EAAE,CAC9C,CAAC,IAAI,EAAE,EAAE,CACP,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,YAAY,CAAC,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAC9D,MAAM,CAAC,QAAQ,CAAC,OAAO,OAAO,EAAE,EAAE;IAChC,UAAU,EAAE,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,EAAE;CACrC,CAAC,EACF,SAAS,CAAC,OAAO,CAAC,EAClB,iBAAiB,EACjB,eAAe,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,QAAQ;AAChD,2DAA2D;AAC3D,MAAM,CAAC,OAAO,CAAC,iBAAiB,CAAC,CAClC,CAAC"}

package/lib/Cli/commands/logs.d.ts

@@ -9,5 +9,5 @@ export declare const logsCommand: Command.Command<"logs", {
     readonly limit: number;
     readonly since: string | undefined;
     readonly tail: boolean;
-}, {}, any, import("../../AlchemyContext.ts").AlchemyContext | import("effect/process/ChildProcessSpawner").ChildProcessSpawner | import("../../Auth/Credentials.ts").CredentialsStore | import("effect/Crypto").Crypto | import("effect/FileSystem").FileSystem | import("effect/http/HttpClient").HttpClient | import("../../Interaction.ts").Interaction | import("effect/Path").Path | import("../../Auth/Profile.ts").ProfileStore | import("effect/Scope").Scope>;
+}, {}, any, import("../../AlchemyContext.ts").AlchemyContext | import("effect/FileSystem").FileSystem | import("effect/Path").Path>;
 //# sourceMappingURL=logs.d.ts.map

package/lib/Cli/commands/logs.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"logs.d.ts","sourceRoot":"","sources":["../../../src/Cli/commands/logs.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAQ,MAAM,YAAY,CAAC;AAG3C,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AA4GxC,eAAO,MAAM,WAAW;;;;;;;;;ucAwBkD,CAAC"}
+{"version":3,"file":"logs.d.ts","sourceRoot":"","sources":["../../../src/Cli/commands/logs.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAQ,MAAM,YAAY,CAAC;AAG3C,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AAoGxC,eAAO,MAAM,WAAW;;;;;;;;;mIAwBkD,CAAC"}