alchemy 2.0.0-beta.61 → 2.0.0-beta.63

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

@@ -1,10 +1,14 @@
 import * as Config from "effect/Config";
+import * as FileSystem from "effect/FileSystem";
+import * as Option from "effect/Option";
 import { Command } from "effect/unstable/cli";
+import * as CliError from "effect/unstable/cli/CliError";
 import { AlchemyProfile } from "../../Auth/Profile.ts";
+import * as Clank from "../../Util/Clank.ts";
 export declare const loginCommand: Command.Command<"login", {
-    readonly main: string;
-    readonly envFile: import("effect/Option").Option<string>;
+    readonly main: Option.Option<string>;
+    readonly envFile: Option.Option<string>;
     readonly profile: string;
     readonly configure: boolean;
-}, {}, import("../../Auth/AuthProvider.ts").AuthError | Config.ConfigError | import("effect/PlatformError").PlatformError, import("../../AlchemyContext.ts").AlchemyContext | AlchemyProfile | import("effect/FileSystem").FileSystem | import("effect/Path").Path | import("effect/Scope").Scope>;
+}, {}, import("../../Auth/AuthProvider.ts").AuthError | Config.ConfigError | CliError.InvalidValue | import("effect/PlatformError").PlatformError | Clank.PromptCancelled, import("../../AlchemyContext.ts").AlchemyContext | AlchemyProfile | import("effect/unstable/process/ChildProcessSpawner").ChildProcessSpawner | import("../../Auth/Credentials.ts").CredentialsStore | FileSystem.FileSystem | import("effect/Path").Path | import("effect/Scope").Scope>;
 //# sourceMappingURL=login.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"login.d.ts","sourceRoot":"","sources":["../../../src/Cli/commands/login.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AAMxC,OAAO,EAAE,OAAO,EAAQ,MAAM,qBAAqB,CAAC;AAGpD,OAAO,EAAE,cAAc,EAAuB,MAAM,uBAAuB,CAAC;AAsB5E,eAAO,MAAM,YAAY;;;;;kSA4FxB,CAAC"}
+{"version":3,"file":"login.d.ts","sourceRoot":"","sources":["../../../src/Cli/commands/login.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AAGxC,OAAO,KAAK,UAAU,MAAM,mBAAmB,CAAC;AAChD,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AACxC,OAAO,EAAE,OAAO,EAAQ,MAAM,qBAAqB,CAAC;AAEpD,OAAO,KAAK,QAAQ,MAAM,8BAA8B,CAAC;AAGzD,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AACvD,OAAO,KAAK,KAAK,MAAM,qBAAqB,CAAC;AAgC7C,eAAO,MAAM,YAAY;;;;;ocA6HxB,CAAC"}

package/lib/Cli/commands/login.js

@@ -1,43 +1,90 @@
 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 Layer from "effect/Layer";
-import * as Logger from "effect/Logger";
+import * as FileSystem from "effect/FileSystem";
+import * as Option from "effect/Option";
 import { Command, Flag } from "effect/unstable/cli";
-import { AuthProviders } from "../../Auth/AuthProvider.js";
-import { AlchemyProfile, withProfileOverride } from "../../Auth/Profile.js";
-import { Stage } from "../../Stage.js";
-import { loadConfigProvider } from "../../Util/ConfigProvider.js";
-import { fileLogger } from "../../Util/FileLogger.js";
-import { Stack } from "../../Stack.js";
-import { envFile, importStack, instrumentCommand, printProfile, profile, script, } from "./_shared.js";
+import * as Argument from "effect/unstable/cli/Argument";
+import * as CliError from "effect/unstable/cli/CliError";
+import { AlchemyProfile } from "../../Auth/Profile.js";
+import * as Clank from "../../Util/Clank.js";
+import { buildBuiltinAuthProviders, buildStackProviders, envFile, instrumentCommand, printProfile, profile, } from "./_shared.js";
 const loginConfigure = Flag.boolean("configure").pipe(Flag.withDescription("Run the provider's interactive configure step before logging in"), Flag.withDefault(false));
+/**
+ * Stack entrypoint whose `providers()` layer selects which auth providers
+ * to log in with. Optional: when omitted and no `alchemy.run.ts` exists in
+ * the current folder, `alchemy login` falls back to every built-in auth
+ * provider, so logging in (and refreshing credentials) works from any
+ * folder.
+ */
+const loginMain = Argument.file("main").pipe(Argument.withDescription("Stack entrypoint whose providers() to log in with, defaults to alchemy.run.ts (falls back to all built-in providers when absent)"), Argument.optional);
 export const loginCommand = Command.make("login", {
-    main: script,
+    main: loginMain,
     envFile,
     profile,
     configure: loginConfigure,
 }, instrumentCommand("login", (a) => ({
     "alchemy.profile": a.profile,
-    "alchemy.main": a.main,
+    "alchemy.main": Option.getOrElse(a.main, () => "alchemy.run.ts"),
     "alchemy.configure": a.configure,
 }))(Effect.fn(function* ({ main, envFile, profile, configure }) {
-    const stackEffect = yield* importStack(main);
-    const authProviders = {};
-    // build the state + providers layer to capture the Auth Providers
-    yield* Layer.build((stackEffect.providers ?? Layer.empty).pipe(Layer.provideMerge(stackEffect.state ?? Layer.empty), Layer.provideMerge(Layer.mergeAll(Layer.succeed(AuthProviders, authProviders), ConfigProvider.layer(withProfileOverride(yield* loadConfigProvider(envFile), profile)), Logger.layer([fileLogger("out")], { mergeWithExisting: true }), Layer.succeed(Stage, "placeholder"), Layer.succeed(Stack, {
-        actions: {},
-        bindings: {},
-        name: stackEffect.stackName,
-        resources: {},
-        stage: "placeholder",
-    })))));
+    const fs = yield* FileSystem.FileSystem;
+    const explicitMain = Option.getOrUndefined(main);
+    const mainPath = explicitMain ?? "alchemy.run.ts";
+    const mainExists = yield* fs
+        .exists(mainPath)
+        .pipe(Effect.catch(() => Effect.succeed(false)));
+    // An explicitly-passed entrypoint must exist; only the default may
+    // fall back to the built-in providers.
+    if (explicitMain != null && !mainExists) {
+        return yield* Effect.fail(new CliError.InvalidValue({
+            option: "main",
+            value: explicitMain,
+            expected: "an existing stack entrypoint file",
+            kind: "argument",
+        }));
+    }
     const profiles = yield* AlchemyProfile;
     const ci = yield* Config.boolean("CI").pipe(Config.withDefault(false));
-    const providers = Object.values(authProviders);
+    let authProviders;
+    // Providers to actually log in with; `undefined` means all registered.
+    let selected;
+    if (mainExists) {
+        // Build the user's providers() (+ state) layer to capture the auth
+        // providers their stack wires up.
+        ({ authProviders } = yield* buildStackProviders({
+            main: mainPath,
+            envFile,
+            profile,
+        }));
+    }
+    else {
+        // No stack entrypoint — register every built-in auth provider so
+        // `alchemy login` works from any folder. Interactively, let the
+        // user pick which ones to log in with; in CI, take them all.
+        yield* Console.log("No alchemy.run.ts found — using Alchemy's built-in providers.");
+        authProviders = yield* buildBuiltinAuthProviders({ envFile, profile });
+        if (!ci) {
+            const existing = yield* profiles.getProfile(profile);
+            const names = Object.keys(authProviders).sort();
+            selected = yield* Clank.multiselect({
+                message: "Select providers to log in with",
+                options: names.map((name) => ({
+                    value: name,
+                    label: name,
+                    hint: existing?.[name] != null ? "configured" : undefined,
+                })),
+                // Pre-select providers already in the profile so re-running
+                // login naturally refreshes/re-prints what's set up.
+                initialValues: names.filter((name) => existing?.[name] != null),
+            });
+        }
+    }
+    const providers = Object.values(authProviders).filter((provider) => selected == null || selected.includes(provider.name));
     if (providers.length === 0) {
-        yield* Console.log("No AuthProviders registered. Make sure the stack's providers() layer includes AuthProviderLayer entries.");
+        yield* Console.log(selected != null
+            ? "No providers selected."
+            : "No AuthProviders registered. Make sure the stack's providers() layer includes AuthProviderLayer entries.");
         return;
     }
     yield* Effect.forEach(providers, (provider) => Effect.gen(function* () {

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

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

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":"AAKA,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AACxC,OAAO,EAAE,OAAO,EAAQ,MAAM,qBAAqB,CAAC;AAsCpD,eAAO,MAAM,WAAW;;;;;;;;odA2HvB,CAAC"}
+{"version":3,"file":"logs.d.ts","sourceRoot":"","sources":["../../../src/Cli/commands/logs.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AACxC,OAAO,EAAE,OAAO,EAAQ,MAAM,qBAAqB,CAAC;AAsCpD,eAAO,MAAM,WAAW;;;;;;;;odA4HvB,CAAC"}

package/lib/Cli/commands/logs.js

@@ -65,6 +65,7 @@ export const logsCommand = Command.make("logs", {
                     continue;
                 const lines = yield* provider.logs({
                     id: resource.LogicalId,
+                    fqn,
                     instanceId: resourceState.instanceId,
                     props: resourceState.props,
                     output: resourceState.attr,

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

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

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

@@ -1 +1 @@
-{"version":3,"file":"nuke.d.ts","sourceRoot":"","sources":["../../../src/Cli/commands/nuke.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,OAAO,EAAQ,MAAM,qBAAqB,CAAC;AAQpD,OAAO,KAAK,KAAK,MAAM,qBAAqB,CAAC;AAgkB7C,eAAO,MAAM,aAAa,qQAGzB,CAAC"}
+{"version":3,"file":"nuke.d.ts","sourceRoot":"","sources":["../../../src/Cli/commands/nuke.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,OAAO,EAAQ,MAAM,qBAAqB,CAAC;AAIpD,OAAO,KAAK,KAAK,MAAM,qBAAqB,CAAC;AAyiB7C,eAAO,MAAM,aAAa,qQAGzB,CAAC"}

package/lib/Cli/commands/nuke.js

@@ -1,4 +1,3 @@
-import * as ConfigProvider from "effect/ConfigProvider";
 import * as Console from "effect/Console";
 import * as Effect from "effect/Effect";
 import * as Layer from "effect/Layer";
@@ -6,16 +5,10 @@ import * as Logger from "effect/Logger";
 import { MinimumLogLevel } from "effect/References";
 import { Command, Flag } from "effect/unstable/cli";
 import picomatch from "picomatch";
-import { AuthProviders } from "../../Auth/AuthProvider.js";
-import { withProfileOverride } from "../../Auth/Profile.js";
-import { Stack } from "../../Stack.js";
-import { Stage } from "../../Stage.js";
 import * as Clank from "../../Util/Clank.js";
-import { loadConfigProvider } from "../../Util/ConfigProvider.js";
-import { fileLogger } from "../../Util/FileLogger.js";
 import { isNonInteractive } from "../selectCli.js";
 import * as NukeUI from "../tui/components/Nuke.js";
-import { dryRun, envFile, importStack, instrumentCommand, profile, script, yes, } from "./_shared.js";
+import { buildStackProviders, dryRun, envFile, instrumentCommand, profile, script, yes, } from "./_shared.js";
 const includeFlag = Flag.string("include").pipe(Flag.withDescription("Glob of provider IDs to include (e.g. 'Cloudflare.*' or 'Cloudflare.Worker'). " +
     "Repeatable; when omitted, every provider is included."), Flag.atLeast(0));
 const excludeFlag = Flag.string("exclude").pipe(Flag.withDescription("Glob of provider IDs to exclude (applied after --include). Repeatable."), Flag.atLeast(0));
@@ -209,22 +202,17 @@ const nukeCommand = Command.make("nuke", {
     // log stream isn't clobbered by the progress renderer.
     const debug = !!process.env.DEBUG;
     const interactive = !isNonInteractive() && !debug;
-    const stackEffect = yield* importStack(main);
-    const authProviders = {};
-    // Build the state + providers layer (same wiring as `alchemy login`) so
-    // that the resulting context holds every resource provider plus the
-    // cloud-environment services their `list`/`delete` need at call time.
-    const context = yield* Layer.build((stackEffect.providers ?? Layer.empty).pipe(Layer.provideMerge(stackEffect.state ?? Layer.empty), Layer.provideMerge(Layer.mergeAll(Layer.succeed(AuthProviders, authProviders), ConfigProvider.layer(withProfileOverride(yield* loadConfigProvider(envFile), profile)), debug
-        ? Logger.layer([Logger.defaultLogger])
-        : Logger.layer([fileLogger("out")], {
-            mergeWithExisting: true,
-        }), Layer.succeed(MinimumLogLevel, debug ? "Debug" : "Info"), Layer.succeed(Stage, "placeholder"), Layer.succeed(Stack, {
-        actions: {},
-        bindings: {},
-        name: stackEffect.stackName,
-        resources: {},
-        stage: "placeholder",
-    })))));
+    // Build the user's providers() (+ state) layer so the resulting context
+    // holds every resource provider plus the cloud-environment services
+    // their `list`/`delete` need at call time. DEBUG=1 routes provider logs
+    // to the console at Debug level instead of the .alchemy/log/out file.
+    const { context } = yield* buildStackProviders({
+        main,
+        envFile,
+        profile,
+        logger: debug ? Logger.layer([Logger.defaultLogger]) : undefined,
+        extra: Layer.succeed(MinimumLogLevel, debug ? "Debug" : "Info"),
+    });
     const discovered = discoverProviders(context);
     const matchInclude = include.length > 0 ? picomatch([...include]) : () => true;
     const matchExclude = exclude.length > 0 ? picomatch([...exclude]) : () => false;
@@ -336,6 +324,9 @@ const nukeCommand = Command.make("nuke", {
         const results = yield* Effect.all([...byType.values()].map((items) => Effect.all(items.map((item) => item.provider
             .delete({
             id: displayName(item.attr),
+            // Enumerated straight from the cloud, so there is no
+            // Alchemy namespace — an un-namespaced fqn is just the id.
+            fqn: displayName(item.attr),
             instanceId: "",
             olds: item.attr,
             output: item.attr,

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

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

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

@@ -1,3 +1,25 @@
+import * as Effect from "effect/Effect";
+import * as Option from "effect/Option";
 import { Command } from "effect/unstable/cli";
-export declare const profileCommand: Command.Command<"profile", {} | {}, {}, import("../../Auth/AuthProvider.ts").AuthError | import("effect/PlatformError").PlatformError, never>;
+import { CredentialsStore } from "../../Auth/Credentials.ts";
+import { AlchemyProfile } from "../../Auth/Profile.ts";
+/**
+ * Populate an {@link AuthProviders} registry for display: the built-in
+ * providers first, then the user's stack `providers()` layer on top so a
+ * customized provider (same name) overrides the built-in one. Loading the
+ * user's stack is best-effort — a missing or invalid entrypoint leaves the
+ * built-ins in place.
+ *
+ * Registration happens as a side effect of building each layer (see
+ * `AuthProviderLayer`), and later builds overwrite earlier entries by name,
+ * so build order is what gives the user's providers precedence.
+ */
+export declare const collectAuthProviders: (options: {
+    main: string;
+    envFile: Option.Option<string>;
+    profile: string;
+}) => Effect.Effect<{
+    [providerName: string]: import("../../Auth/AuthProvider.ts").AuthProvider<any, any>;
+}, import("effect/PlatformError").PlatformError, import("../../AlchemyContext.ts").AlchemyContext | AlchemyProfile | import("effect/unstable/process/ChildProcessSpawner").ChildProcessSpawner | CredentialsStore | import("effect/FileSystem").FileSystem | import("effect/Path").Path | import("effect/Scope").Scope>;
+export declare const profileCommand: Command.Command<"profile", {} | {}, {}, import("effect/PlatformError").PlatformError, never>;
 //# sourceMappingURL=profile.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"profile.d.ts","sourceRoot":"","sources":["../../../src/Cli/commands/profile.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAgG9C,eAAO,MAAM,cAAc,+IAE1B,CAAC"}
+{"version":3,"file":"profile.d.ts","sourceRoot":"","sources":["../../../src/Cli/commands/profile.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AACxC,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AACxC,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAI9C,OAAO,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAC;AAC7D,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAuBvD;;;;;;;;;;GAUG;AACH,eAAO,MAAM,oBAAoB;UAEvB,MAAM;aACH,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC;aACrB,MAAM;;;uTAyBlB,CAAC;AA0DF,eAAO,MAAM,cAAc,8FAE1B,CAAC"}

package/lib/Cli/commands/profile.js

@@ -1,24 +1,49 @@
-import * as ConfigProvider from "effect/ConfigProvider";
 import * as Console from "effect/Console";
 import * as Effect from "effect/Effect";
-import * as Layer from "effect/Layer";
-import * as Logger from "effect/Logger";
+import * as Option from "effect/Option";
 import { Command } from "effect/unstable/cli";
+import * as Argument from "effect/unstable/cli/Argument";
 import { AuthProviders } from "../../Auth/AuthProvider.js";
 import { CredentialsStore } from "../../Auth/Credentials.js";
-import { AlchemyProfile, withProfileOverride } from "../../Auth/Profile.js";
-import { AwsAuth } from "../../AWS/AuthProvider.js";
-import { AxiomAuth } from "../../Axiom/AuthProvider.js";
-import { CloudflareAuth } from "../../Cloudflare/Auth/AuthProvider.js";
-import { GitHubAuth } from "../../GitHub/AuthProvider.js";
-import { NeonAuth } from "../../Neon/AuthProvider.js";
-import { PlanetscaleAuth } from "../../Planetscale/AuthProvider.js";
-import { loadConfigProvider } from "../../Util/ConfigProvider.js";
-import { fileLogger } from "../../Util/FileLogger.js";
-import { envFile, instrumentCommand, printProfile, profile, } from "./_shared.js";
-const showCommand = Command.make("show", { profile, envFile }, instrumentCommand("profile.show", (a) => ({
+import { AlchemyProfile } from "../../Auth/Profile.js";
+import { buildBuiltinAuthProviders, buildStackProviders, envFile, instrumentCommand, printProfile, profile, } from "./_shared.js";
+/**
+ * Entrypoint whose `providers()` layer contributes the user's own auth
+ * providers. Optional and best-effort — if it's missing or fails to load,
+ * `profile show` still renders the built-in providers.
+ */
+const mainFile = Argument.file("main").pipe(Argument.withDescription("Stack entrypoint whose providers() should be used, defaults to alchemy.run.ts"), Argument.withDefault("alchemy.run.ts"));
+/**
+ * Populate an {@link AuthProviders} registry for display: the built-in
+ * providers first, then the user's stack `providers()` layer on top so a
+ * customized provider (same name) overrides the built-in one. Loading the
+ * user's stack is best-effort — a missing or invalid entrypoint leaves the
+ * built-ins in place.
+ *
+ * Registration happens as a side effect of building each layer (see
+ * `AuthProviderLayer`), and later builds overwrite earlier entries by name,
+ * so build order is what gives the user's providers precedence.
+ */
+export const collectAuthProviders = Effect.fn("collectAuthProviders")(function* (options) {
+    const authProviders = {};
+    // 1. Built-in providers first (baseline).
+    yield* buildBuiltinAuthProviders({
+        envFile: options.envFile,
+        profile: options.profile,
+        registry: authProviders,
+    });
+    // 2. The user's own providers() layer on top — building into the same
+    //    registry overrides the built-ins by name. Best-effort: swallow
+    //    load/build failures (including a missing entrypoint) so display
+    //    still works with just the built-ins.
+    yield* buildStackProviders({ ...options, registry: authProviders }).pipe(Effect.catchCause((cause) => Effect.logDebug("profile show: could not load user stack providers", {
+        cause,
+    })));
+    return authProviders;
+});
+const showCommand = Command.make("show", { profile, envFile, main: mainFile }, instrumentCommand("profile.show", (a) => ({
     "alchemy.profile": a.profile,
-}))(Effect.fn(function* ({ profile, envFile }) {
+}))(Effect.fn(function* ({ profile, envFile, main }) {
     const profiles = yield* AlchemyProfile;
     const stored = yield* profiles.getProfile(profile);
     if (stored == null) {
@@ -33,13 +58,12 @@ const showCommand = Command.make("show", { profile, envFile }, instrumentCommand
         }
         return;
     }
-    const authProviders = {};
-    const authRegistry = Layer.succeed(AuthProviders, authProviders);
-    const services = Layer.mergeAll(authRegistry, ConfigProvider.layer(withProfileOverride(yield* loadConfigProvider(envFile), profile)), Logger.layer([fileLogger("out")], { mergeWithExisting: true }), 
-    // Building these layers triggers their AuthProviderLayer effect, which
-    // registers the provider into the shared `authProviders` registry.
-    Layer.provide(Layer.mergeAll(AwsAuth, AxiomAuth, CloudflareAuth, GitHubAuth, NeonAuth, PlanetscaleAuth), authRegistry));
-    yield* printProfile(profile, stored, authProviders).pipe(Effect.provide(services));
+    const authProviders = yield* collectAuthProviders({
+        main,
+        envFile,
+        profile,
+    });
+    yield* printProfile(profile, stored, authProviders);
 })));
 const clearCommand = Command.make("clear", { profile }, instrumentCommand("profile.clear", (a) => ({
     "alchemy.profile": a.profile,

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

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

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

@@ -1 +1 @@
-{"version":3,"file":"tail.d.ts","sourceRoot":"","sources":["../../../src/Cli/commands/tail.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,OAAO,MAAM,6BAA6B,CAAC;AAwBvD,eAAO,MAAM,WAAW;;;;;;odAqHvB,CAAC"}
+{"version":3,"file":"tail.d.ts","sourceRoot":"","sources":["../../../src/Cli/commands/tail.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,OAAO,MAAM,6BAA6B,CAAC;AAwBvD,eAAO,MAAM,WAAW;;;;;;odAsHvB,CAAC"}

package/lib/Cli/commands/tail.js

@@ -61,6 +61,7 @@ export const tailCommand = Command.make("tail", {
                     logicalId: resource.LogicalId,
                     stream: provider.tail({
                         id: resource.LogicalId,
+                        fqn,
                         instanceId: resourceState.instanceId,
                         props: resourceState.props,
                         output: resourceState.attr,

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

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

package/lib/Cloudflare/AI/GatewayDynamicRouting.d.ts.map

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

package/lib/Cloudflare/AI/GatewayDynamicRouting.js

@@ -157,12 +157,41 @@ export const DynamicRoutingProvider = () => Provider.succeed(GatewayDynamicRouti
             id: routeId,
         });
         if (current.name !== name) {
-            yield* aiGateway.patchDynamicRouting({
+            yield* aiGateway
+                .patchDynamicRouting({
                 accountId,
                 gatewayId,
                 id: routeId,
                 name,
-            });
+            })
+                .pipe(
+            // Cloudflare does not cascade-delete a gateway's routes when the
+            // gateway itself is deleted: recreating a gateway with the same
+            // id resurrects its old route rows, and a rename onto one of
+            // those ghosts trips the backing `UNIQUE(routes.name,
+            // routes.gateway_id)` constraint (leaked as a 500, typed as
+            // `RouteAlreadyExists` via a distilled patch). Route names are
+            // unique and deterministic, so the holder is a stale duplicate
+            // of this logical resource — delete it and retry the rename.
+            Effect.catchTag("RouteAlreadyExists", (error) => Effect.gen(function* () {
+                const holder = yield* findByName(accountId, gatewayId, name);
+                if (holder === undefined || holder.id === routeId) {
+                    return yield* Effect.fail(error);
+                }
+                yield* aiGateway
+                    .deleteDynamicRouting({
+                    accountId,
+                    gatewayId,
+                    id: holder.id,
+                })
+                    .pipe(Effect.catchTag("RouteNotFound", () => Effect.void));
+                yield* aiGateway.patchDynamicRouting({
+                    accountId,
+                    gatewayId,
+                    id: routeId,
+                    name,
+                });
+            })));
         }
         // `get` returns the *deployed* version's graph, so an undeployed
         // draft version naturally shows up as drift and gets re-deployed.