alchemy 2.0.0-beta.25 → 2.0.0-beta.27

package/{bin → src/Cli}/commands/login.ts

@@ -7,23 +7,23 @@ import * as Layer from "effect/Layer";
 import * as Logger from "effect/Logger";
 import { Command, Flag } from "effect/unstable/cli";
 
-import { AuthProviders } from "../../src/Auth/AuthProvider.ts";
+import { AuthProviders } from "../..//Auth/AuthProvider";
 import {
   getProfile,
   setProfile,
   withProfileOverride,
-} from "../../src/Auth/Profile.ts";
-import { Stage } from "../../src/Stage.ts";
-import * as State from "../../src/State/index.ts";
-import { loadConfigProvider } from "../../src/Util/ConfigProvider.ts";
-import { fileLogger } from "../../src/Util/FileLogger.ts";
+} from "../..//Auth/Profile";
+import { Stage } from "../..//Stage";
+import * as State from "../..//State/index";
+import { loadConfigProvider } from "../..//Util/ConfigProvider";
+import { fileLogger } from "../..//Util/FileLogger";
 
 import {
   envFile,
   importStack,
   instrumentCommand,
-  main,
   profile,
+  script,
   stage,
 } from "./_shared.ts";
 
@@ -37,7 +37,7 @@ const loginConfigure = Flag.boolean("configure").pipe(
 export const loginCommand = Command.make(
   "login",
   {
-    main,
+    main: script,
     envFile,
     stage,
     profile,
@@ -67,7 +67,7 @@ export const loginCommand = Command.make(
         ConfigProvider.layer(
           withProfileOverride(yield* loadConfigProvider(envFile), profile),
         ),
-        Logger.layer([fileLogger("out")]),
+        Logger.layer([fileLogger("out")], { mergeWithExisting: true }),
         Layer.succeed(Stage, stage),
         State.localState(),
       );

package/{bin → src/Cli}/commands/logs.ts

@@ -6,24 +6,24 @@ import * as Logger from "effect/Logger";
 import * as Option from "effect/Option";
 import { Command, Flag } from "effect/unstable/cli";
 
-import { findProviderByType, type LogLine } from "../../src/Provider.ts";
-import { Stage } from "../../src/Stage.ts";
-import * as State from "../../src/State/index.ts";
-import { loadConfigProvider } from "../../src/Util/ConfigProvider.ts";
-import { fileLogger } from "../../src/Util/FileLogger.ts";
-
-import { AuthProviders } from "../../src/Auth/AuthProvider.ts";
-import { withProfileOverride } from "../../src/Auth/Profile.ts";
+import { findProviderByType, type LogLine } from "../..//Provider";
+import { Stage } from "../..//Stage";
+import * as State from "../..//State/index";
+import { loadConfigProvider } from "../..//Util/ConfigProvider";
+import { fileLogger } from "../..//Util/FileLogger";
+
+import { AuthProviders } from "../..//Auth/AuthProvider";
+import { withProfileOverride } from "../..//Auth/Profile";
 import {
   envFile,
   formatLocalTimestamp,
   importStack,
   instrumentCommand,
-  main,
   parseResourceFilter,
   parseSince,
   profile,
   resourceFilter,
+  script,
   stage,
   TAIL_COLORS,
   TAIL_RESET,
@@ -45,7 +45,7 @@ const logsSince = Flag.string("since").pipe(
 export const logsCommand = Command.make(
   "logs",
   {
-    main,
+    main: script,
     envFile,
     stage,
     profile,
@@ -79,7 +79,7 @@ export const logsCommand = Command.make(
         ),
         Layer.succeed(AuthProviders, {}),
         Layer.succeed(Stage, stage),
-        Logger.layer([fileLogger("out")]),
+        Logger.layer([fileLogger("out")], { mergeWithExisting: true }),
         State.localState(),
       );
 

package/{bin → src/Cli}/commands/profile.ts

@@ -5,18 +5,18 @@ import * as Layer from "effect/Layer";
 import * as Logger from "effect/Logger";
 import { Command } from "effect/unstable/cli";
 
-import { AuthProviders } from "../../src/Auth/AuthProvider.ts";
-import { deleteProfileCredentials } from "../../src/Auth/Credentials.ts";
+import { AuthProviders } from "../..//Auth/AuthProvider";
+import { deleteProfileCredentials } from "../..//Auth/Credentials";
 import {
   deleteProfile,
   getProfile,
   readConfig,
   withProfileOverride,
-} from "../../src/Auth/Profile.ts";
-import { AwsAuth } from "../../src/AWS/AuthProvider.ts";
-import { CloudflareAuth } from "../../src/Cloudflare/Auth/AuthProvider.ts";
-import { loadConfigProvider } from "../../src/Util/ConfigProvider.ts";
-import { fileLogger } from "../../src/Util/FileLogger.ts";
+} from "../..//Auth/Profile";
+import { AwsAuth } from "../..//AWS/AuthProvider";
+import { CloudflareAuth } from "../..//Cloudflare/Auth/AuthProvider";
+import { loadConfigProvider } from "../..//Util/ConfigProvider";
+import { fileLogger } from "../../Util/FileLogger";
 
 import { envFile, instrumentCommand, profile } from "./_shared.ts";
 
@@ -55,7 +55,7 @@ const showCommand = Command.make(
         ConfigProvider.layer(
           withProfileOverride(yield* loadConfigProvider(envFile), profile),
         ),
-        Logger.layer([fileLogger("out")]),
+        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(CloudflareAuth, AwsAuth), authRegistry),

package/{bin → src/Cli}/commands/state.ts

@@ -6,21 +6,21 @@ import * as Logger from "effect/Logger";
 import * as Option from "effect/Option";
 import { Argument, Command, Flag } from "effect/unstable/cli";
 
-import { AuthProviders } from "../../src/Auth/AuthProvider.ts";
-import { withProfileOverride } from "../../src/Auth/Profile.ts";
-import { Stage } from "../../src/Stage.ts";
-import * as State from "../../src/State/index.ts";
-import { encodeState } from "../../src/State/StateEncoding.ts";
-import * as Clank from "../../src/Util/Clank.ts";
-import { loadConfigProvider } from "../../src/Util/ConfigProvider.ts";
-import { fileLogger } from "../../src/Util/FileLogger.ts";
+import { AuthProviders } from "../../Auth/AuthProvider";
+import { withProfileOverride } from "../../Auth/Profile";
+import { Stage } from "../../Stage";
+import * as State from "../../State/index";
+import { encodeState } from "../../State/StateEncoding";
+import * as Clank from "../../Util/Clank";
+import { loadConfigProvider } from "../../Util/ConfigProvider";
+import { fileLogger } from "../../Util/FileLogger";
 
 import {
   envFile,
   importStack,
   instrumentCommand,
-  main,
   profile,
+  script,
   stage,
   yes,
 } from "./_shared.ts";
@@ -79,7 +79,7 @@ const withStateService = <A, E>(
           args.profile,
         ),
       ),
-      Logger.layer([fileLogger("out")]),
+      Logger.layer([fileLogger("out")], { mergeWithExisting: true }),
       Layer.succeed(Stage, args.stage),
       // When --local is set we still build the stack to get its other
       // services, but force State to be LocalState. Without --local the
@@ -98,7 +98,7 @@ const withStateService = <A, E>(
 
 const stacksCommand = Command.make(
   "stacks",
-  { main, envFile, stage, profile, local: localFlag },
+  { main: script, envFile, stage, profile, local: localFlag },
   instrumentCommand("state.stacks")(
     Effect.fnUntraced(function* (args) {
       yield* withStateService(args, (state) =>
@@ -119,7 +119,7 @@ const stacksCommand = Command.make(
 
 const stagesCommand = Command.make(
   "stages",
-  { stack: stackArg, main, envFile, stage, profile, local: localFlag },
+  { stack: stackArg, main: script, envFile, stage, profile, local: localFlag },
   instrumentCommand("state.stages")(
     Effect.fnUntraced(function* ({ stack: stackName, ...rest }) {
       yield* withStateService(rest, (state) =>
@@ -145,7 +145,7 @@ const resourcesCommand = Command.make(
     stageName: Argument.string("stage").pipe(
       Argument.withDescription("Stage to list resources from"),
     ),
-    main,
+    main: script,
     envFile,
     stage,
     profile,
@@ -180,7 +180,7 @@ const getCommand = Command.make(
       Argument.withDescription("Stage the resource lives in"),
     ),
     fqn: fqnArg,
-    main,
+    main: script,
     envFile,
     stage,
     profile,
@@ -216,7 +216,7 @@ const getCommand = Command.make(
 
 const treeCommand = Command.make(
   "tree",
-  { main, envFile, stage, profile, local: localFlag },
+  { main: script, envFile, stage, profile, local: localFlag },
   instrumentCommand("state.tree")(
     Effect.fnUntraced(function* (args) {
       yield* withStateService(args, (state) =>
@@ -226,24 +226,45 @@ const treeCommand = Command.make(
             yield* Console.log("(empty state store)");
             return;
           }
-          for (const stk of stacks) {
-            yield* Console.log(stk);
-            const stages = [...(yield* state.listStages(stk))].sort();
+          // Fetch the entire tree in parallel: for each stack, list its
+          // stages; for each (stack, stage), list its resources. All
+          // network round-trips happen concurrently; output is rendered
+          // once at the end so the user doesn't see stuttered partial
+          // output.
+          const tree = yield* Effect.forEach(
+            stacks,
+            (stk) =>
+              Effect.gen(function* () {
+                const stages = [...(yield* state.listStages(stk))].sort();
+                const stageEntries = yield* Effect.forEach(
+                  stages,
+                  (stg) =>
+                    Effect.map(
+                      state.list({ stack: stk, stage: stg }),
+                      (fqns) => ({ stage: stg, fqns: [...fqns].sort() }),
+                    ),
+                  { concurrency: "unbounded" },
+                );
+                return { stack: stk, stages: stageEntries };
+              }),
+            { concurrency: "unbounded" },
+          );
+
+          const lines: string[] = [];
+          for (const { stack: stk, stages } of tree) {
+            lines.push(stk);
             for (let i = 0; i < stages.length; i++) {
-              const stg = stages[i]!;
+              const { stage: stg, fqns } = stages[i]!;
               const stageBranch = i === stages.length - 1 ? "└─" : "├─";
-              yield* Console.log(`${stageBranch} ${stg}`);
+              lines.push(`${stageBranch} ${stg}`);
               const indent = i === stages.length - 1 ? "   " : "│  ";
-              const fqns = [
-                ...(yield* state.list({ stack: stk, stage: stg })),
-              ].sort();
               for (let j = 0; j < fqns.length; j++) {
-                const fqn = fqns[j]!;
                 const leaf = j === fqns.length - 1 ? "└─" : "├─";
-                yield* Console.log(`${indent}${leaf} ${fqn}`);
+                lines.push(`${indent}${leaf} ${fqns[j]}`);
               }
             }
           }
+          yield* Console.log(lines.join("\n"));
         }),
       );
     }),
@@ -274,7 +295,7 @@ const clearCommand = Command.make(
   {
     stack: clearStackArg,
     stageName: clearStageArg,
-    main,
+    main: script,
     envFile,
     stage,
     profile,

package/{bin → src/Cli}/commands/tail.ts

@@ -6,23 +6,23 @@ import * as Logger from "effect/Logger";
 import * as Stream from "effect/Stream";
 import * as Command from "effect/unstable/cli/Command";
 
-import { findProviderByType, type LogLine } from "../../src/Provider.ts";
-import { Stage } from "../../src/Stage.ts";
-import * as State from "../../src/State/index.ts";
-import { loadConfigProvider } from "../../src/Util/ConfigProvider.ts";
-import { fileLogger } from "../../src/Util/FileLogger.ts";
-
-import { AuthProviders } from "../../src/Auth/AuthProvider.ts";
-import { withProfileOverride } from "../../src/Auth/Profile.ts";
+import { findProviderByType, type LogLine } from "../..//Provider";
+import { Stage } from "../..//Stage";
+import * as State from "../..//State/index";
+import { loadConfigProvider } from "../..//Util/ConfigProvider";
+import { fileLogger } from "../..//Util/FileLogger";
+
+import { AuthProviders } from "../..//Auth/AuthProvider";
+import { withProfileOverride } from "../..//Auth/Profile";
 import {
   envFile,
   formatLocalTimestamp,
   importStack,
   instrumentCommand,
-  main,
   parseResourceFilter,
   profile,
   resourceFilter,
+  script,
   stage,
   TAIL_COLORS,
   TAIL_RESET,
@@ -31,7 +31,7 @@ import {
 export const tailCommand = Command.make(
   "tail",
   {
-    main,
+    main: script,
     envFile,
     stage,
     profile,
@@ -54,7 +54,7 @@ export const tailCommand = Command.make(
         ),
         Layer.succeed(AuthProviders, {}),
         Layer.succeed(Stage, stage),
-        Logger.layer([fileLogger("out")]),
+        Logger.layer([fileLogger("out")], { mergeWithExisting: true }),
         State.localState(),
       );
 

package/src/Cli/exec.ts

@@ -0,0 +1,23 @@
+import { AlchemyContextLive } from "alchemy/AlchemyContext";
+import { PlatformServices } from "alchemy/Util";
+import * as ConfigProvider from "effect/ConfigProvider";
+import * as Effect from "effect/Effect";
+import * as Layer from "effect/Layer";
+import * as Schema from "effect/Schema";
+import * as FetchHttpClient from "effect/unstable/http/FetchHttpClient";
+import { execStack, ExecStackOptions } from "./commands/deploy.ts";
+import { inkCLI } from "./tui/InkCLI.tsx";
+
+const services = Layer.mergeAll(
+  Layer.provideMerge(AlchemyContextLive, PlatformServices),
+  FetchHttpClient.layer,
+  ConfigProvider.layer(ConfigProvider.fromEnv()),
+  inkCLI(),
+);
+
+export const exec = () =>
+  execStack(
+    Schema.decodeSync(ExecStackOptions)(
+      JSON.parse(process.env.ALCHEMY_EXEC_OPTIONS!),
+    ),
+  ).pipe(Effect.provide(services), Effect.scoped);

package/src/Cli/index.ts

@@ -1,5 +1,2 @@
-export * from "./Cli.ts";
-// Note: do NOT re-export InkCLI here. The Ink-based renderer pulls in
-// `react`/`ink`, which we do not want consumers of `alchemy/Cli` to
-// transitively depend on. Import `alchemy/Cli/InkCLI` directly when needed
-// (currently only from `bin/alchemy.ts`, which is bundled).
+export * from "./exec.ts";
+export * from "./main.ts";

package/src/Cli/main.ts

@@ -0,0 +1,60 @@
+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 FetchHttpClient from "effect/unstable/http/FetchHttpClient";
+
+import { AlchemyContextLive } from "alchemy/AlchemyContext";
+import { TelemetryLive } from "alchemy/Telemetry/Layer";
+import { PlatformServices } from "alchemy/Util/PlatformServices";
+import packageJson from "../../package.json" with { type: "json" };
+
+import { handleCancellation } from "./commands/_shared.ts";
+import { bootstrapCommand } from "./commands/bootstrap.ts";
+import {
+  deployCommand,
+  destroyCommand,
+  planCommand,
+} from "./commands/deploy.ts";
+import { devCommand } from "./commands/dev.ts";
+import { loginCommand } from "./commands/login.ts";
+import { logsCommand } from "./commands/logs.ts";
+import { profileCommand } from "./commands/profile.ts";
+import { stateCommand } from "./commands/state.ts";
+import { tailCommand } from "./commands/tail.ts";
+import { inkCLI } from "./tui/InkCLI.tsx";
+
+const root = Command.make("alchemy", {}).pipe(
+  Command.withSubcommands([
+    bootstrapCommand,
+    deployCommand,
+    devCommand,
+    destroyCommand,
+    planCommand,
+    tailCommand,
+    logsCommand,
+    loginCommand,
+    profileCommand,
+    stateCommand,
+  ]),
+);
+
+const cli = Command.run(root, {
+  // name: "Alchemy Effect CLI",
+  version: packageJson.version,
+});
+
+const services = Layer.mergeAll(
+  Layer.provideMerge(AlchemyContextLive, PlatformServices),
+  FetchHttpClient.layer,
+  ConfigProvider.layer(ConfigProvider.fromEnv()),
+  TelemetryLive,
+  inkCLI(),
+);
+
+export const main = cli.pipe(
+  // $USER and $STAGE are set by the environment
+  Effect.provide(services),
+  Effect.scoped,
+  handleCancellation,
+);

package/src/Cli/{InkCLI.tsx → tui/InkCLI.tsx}

@@ -2,9 +2,9 @@
 import * as Effect from "effect/Effect";
 import * as Layer from "effect/Layer";
 import { render } from "ink";
-import type { Plan } from "../Plan.ts";
-import { type PlanStatusSession, Cli } from "./Cli.ts";
-import type { ApplyEvent } from "./Event.ts";
+import type { Plan } from "../../Plan.ts";
+import { type PlanStatusSession, Cli } from "../Cli.ts";
+import type { ApplyEvent } from "../Event.ts";
 import { ApprovePlan } from "./components/ApprovePlan.tsx";
 import { Plan as PlanComponent } from "./components/Plan.tsx";
 import { PlanProgress } from "./components/PlanProgress.tsx";

package/src/Cli/{components → tui/components}/ApprovePlan.tsx

@@ -2,7 +2,7 @@
 import { useState, type JSX } from "react";
 
 import { Box, Text, useApp, useInput } from "ink";
-import type { Plan as AlchemyPlan } from "../../Plan.ts";
+import type { Plan as AlchemyPlan } from "../../../Plan.ts";
 
 import { Plan } from "./Plan.tsx";
 

package/src/Cli/{components → tui/components}/Plan.tsx

@@ -2,12 +2,16 @@
 import { useMemo, type JSX } from "react";
 
 import { Box, Text } from "ink";
-import type { Plan as AlchemyPlan, BindingAction, CRUD } from "../../Plan.ts";
+import type {
+  Plan as AlchemyPlan,
+  BindingAction,
+  CRUD,
+} from "../../../Plan.ts";
 import {
   buildNamespaceTree,
   flattenTree,
   type DerivedAction,
-} from "../NamespaceTree.ts";
+} from "../../NamespaceTree.ts";
 
 export interface PlanProps {
   plan: AlchemyPlan;

package/src/Cli/{components → tui/components}/PlanProgress.tsx

@@ -2,14 +2,18 @@
 import { useEffect, useMemo, useRef, useState, type JSX } from "react";
 
 import { Box, Text } from "ink";
-import type { CRUD, Plan } from "../../Plan.ts";
+import type { CRUD, Plan } from "../../../Plan.ts";
 
-import type { ApplyEvent, ApplyStatus, StatusChangeEvent } from "../Event.ts";
+import type {
+  ApplyEvent,
+  ApplyStatus,
+  StatusChangeEvent,
+} from "../../Event.ts";
 import {
   buildNamespaceTree,
   flattenTree,
   type FlattenedItem,
-} from "../NamespaceTree.ts";
+} from "../../NamespaceTree.ts";
 
 interface ProgressEventSource {
   subscribe(listener: (event: ApplyEvent) => void): () => void;

package/src/Cloudflare/Auth/AuthProvider.ts

@@ -271,11 +271,6 @@ const login = (profileName: string, config: CloudflareAuthConfig) =>
             "cf-oauth",
           );
 
-          if (creds?.type === "oauth" && creds.expires > Date.now() + 10_000) {
-            yield* Clank.info("Cloudflare: OAuth credentials are still valid.");
-            return;
-          }
-
           if (creds?.type === "oauth") {
             yield* Clank.info("Cloudflare: refreshing OAuth credentials...");
             yield* OAuthClient.refresh(creds).pipe(

package/src/Cloudflare/SecretsStore/SecretsStore.ts

@@ -83,8 +83,9 @@ export const SecretsStoreProvider = () =>
 
           const create = createStore({
             accountId,
-            //`default_secrets_store` is the name cloudflare uses to create a secret store
-            body: [{ name: "default_secrets_store" }],
+            // `default_secrets_store` is the name Cloudflare uses for an
+            // account's default Secrets Store.
+            name: "default_secrets_store",
           });
           const response = adoptEnabled
             ? yield* create.pipe(
@@ -97,10 +98,9 @@ export const SecretsStoreProvider = () =>
             : yield* create;
 
           if (response) {
-            const store = response.result[0]!;
             return {
-              storeId: store.id,
-              storeName: store.name,
+              storeId: response.id,
+              storeName: response.name,
               accountId,
             };
           }

package/src/Cloudflare/StateStore/Api.ts

@@ -12,19 +12,32 @@ import * as HttpRouter from "effect/unstable/http/HttpRouter";
 import * as HttpApiBuilder from "effect/unstable/httpapi/HttpApiBuilder";
 import * as HttpApiError from "effect/unstable/httpapi/HttpApiError";
 import crypto from "node:crypto";
-import { SecretBindingLive } from "../SecretsStore/SecretBinding.ts";
 import * as Secret from "../SecretsStore/Secret.ts";
+import { SecretBindingLive } from "../SecretsStore/SecretBinding.ts";
 import { Worker } from "../Workers/Worker.ts";
 import Store from "./Store.ts";
 import { AuthToken } from "./Token.ts";
 
 export const STATE_STORE_SCRIPT_NAME = "alchemy-state-store" as const;
 
+/**
+ * Path on disk to *this* file, used as the worker's bundling entry.
+ *
+ * When running from source (e.g. dev / monorepo), `import.meta.url` points
+ * at `Api.ts` and we can use it directly. When the alchemy CLI is run from
+ * its published `bin/alchemy.js` bundle, this module is inlined into the
+ * CLI bundle and `import.meta.url` resolves to `bin/alchemy.js` — which
+ * has no `default` export and breaks the worker bundler with
+ * `[MISSING_EXPORT] "default" is not exported by "bin/alchemy.js"`.
+ *
+ * In the bundled case, fall back to the published source file shipped
+ * alongside the CLI under `../src/Cloudflare/StateStore/Api.ts`.
+ */
 export default Worker(
   "Api",
   {
     name: STATE_STORE_SCRIPT_NAME,
-    main: import.meta.path,
+    main: import.meta.filename,
     url: true,
     compatibility: {
       flags: ["nodejs_compat"],

package/src/Cloudflare/StateStore/State.ts

@@ -86,9 +86,7 @@ export const bootstrap = (options: BootstrapOptions = {}) =>
         `Resuming Cloudflare State Store '${scriptName}' deployment...`,
       );
       yield* finishBootstrap({ scriptName, profileName, localState, isCI });
-      yield* Clank.success(
-        `Cloudflare State Store '${scriptName}' is ready.`,
-      );
+      yield* Clank.success(`Cloudflare State Store '${scriptName}' is ready.`);
       return;
     }
 
@@ -113,9 +111,7 @@ export const bootstrap = (options: BootstrapOptions = {}) =>
           credentials,
         );
       }
-      yield* Clank.success(
-        `Cloudflare State Store '${scriptName}' is ready.`,
-      );
+      yield* Clank.success(`Cloudflare State Store '${scriptName}' is ready.`);
       return;
     }
 
@@ -124,9 +120,7 @@ export const bootstrap = (options: BootstrapOptions = {}) =>
         `Forcing redeploy of Cloudflare State Store '${scriptName}'...`,
       );
     } else {
-      yield* Clank.info(
-        `Deploying Cloudflare State Store '${scriptName}'...`,
-      );
+      yield* Clank.info(`Deploying Cloudflare State Store '${scriptName}'...`);
     }
 
     yield* finishBootstrap({ scriptName, profileName, localState, isCI });