alchemy 2.0.0-beta.24 → 2.0.0-beta.26

package/bin/commands/bootstrap.ts

@@ -65,7 +65,9 @@ const bootstrapAwsCommand = Command.make(
     }),
   )(
     Effect.fnUntraced(function* ({ envFile, profile, region, destroy }) {
-      const logger = Logger.layer([fileLogger("bootstrap.txt")]);
+      const logger = Logger.layer([fileLogger("bootstrap.txt")], {
+        mergeWithExisting: true,
+      });
 
       return yield* Effect.gen(function* () {
         const ssoProfile = yield* Auth.loadProfile(profile);
@@ -168,7 +170,9 @@ const bootstrapCloudflareCommand = Command.make(
     }),
   )(
     Effect.fnUntraced(function* ({ envFile, profile, force, workerName }) {
-      const logger = Logger.layer([fileLogger("bootstrap.txt")]);
+      const logger = Logger.layer([fileLogger("bootstrap.txt")], {
+        mergeWithExisting: true,
+      });
 
       // Wire up the same Cloudflare auth chain that
       // `Cloudflare.state(...)` uses internally. CloudflareAuth is an

package/bin/commands/deploy.ts

@@ -106,7 +106,7 @@ export const execStack = Effect.fn(function* ({
     ConfigProvider.layer(
       withProfileOverride(yield* loadConfigProvider(envFile), profile),
     ),
-    Logger.layer([fileLogger("out")]),
+    Logger.layer([fileLogger("out")], { mergeWithExisting: true }),
     Layer.succeed(Stage, stage),
   );
 

package/bin/commands/dev.ts

@@ -6,6 +6,18 @@ import { fileURLToPath } from "node:url";
 import { envFile, force, main, profile, stage } from "./_shared.ts";
 import { ExecStackOptions } from "./deploy.ts";
 
+// Source iteration uses unbundled exec.ts so --watch sees source-file changes;
+// published installs use the bundled exec.js so react/ink/pathe stay
+// devDependencies (matching the CLI bundle's intent). Detect which world we're
+// in by whether dev.ts (or the alchemy.js bundle that contains it) lives
+// inside a node_modules tree — same heuristic as bin/cli.js.
+const selfPath = fileURLToPath(import.meta.url);
+const isInstalled =
+  selfPath.includes("/node_modules/") || selfPath.includes("\\node_modules\\");
+const execEntry = isInstalled
+  ? "alchemy/bin/exec.js"
+  : "alchemy/bin/exec.ts";
+
 export const devCommand = Command.make(
   "dev",
   {
@@ -28,7 +40,7 @@ export const devCommand = Command.make(
         "run",
         "--watch",
         "--no-clear-screen",
-        fileURLToPath(import.meta.resolve("../exec.ts")),
+        fileURLToPath(import.meta.resolve(execEntry)),
       ],
       {
         stdin: "inherit",

package/bin/commands/login.ts

@@ -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/commands/logs.ts

@@ -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/commands/profile.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/commands/state.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
@@ -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"));
         }),
       );
     }),

package/bin/commands/tail.ts

@@ -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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "alchemy",
-  "version": "2.0.0-beta.24",
+  "version": "2.0.0-beta.26",
   "homepage": "https://alchemy.run",
   "license": "Apache-2.0",
   "author": "Sam Goodwin <sam@alchemy.run>",
@@ -21,7 +21,7 @@
   "sideEffects": false,
   "scripts": {
     "dev": "tsdown --watch",
-    "build": "tsc -b && bun bundle",
+    "build": "bun bundle",
     "bundle": "tsdown",
     "bundle:watch": "tsdown --watch",
     "publish:npm": "cp ../README.md . && bun publish && rm README.md",
@@ -29,204 +29,206 @@
   },
   "exports": {
     ".": {
-      "types": "./src/index.ts",
+      "types": "./lib/index.d.ts",
       "bun": "./src/index.ts",
       "worker": "./src/index.ts",
       "import": "./lib/index.js"
     },
     "./*": {
-      "types": "./src/*.ts",
+      "types": "./lib/*.d.ts",
       "bun": "./src/*.ts",
       "worker": "./src/*.ts",
       "import": "./lib/*.js"
     },
     "./Agent": {
-      "types": "./src/Agent/index.ts",
+      "types": "./lib/Agent/index.d.ts",
       "bun": "./src/Agent/index.ts",
       "worker": "./src/Agent/index.ts",
       "import": "./lib/Agent/index.js"
     },
     "./Auth": {
-      "types": "./src/Auth/index.ts",
+      "types": "./lib/Auth/index.d.ts",
       "bun": "./src/Auth/index.ts",
       "worker": "./src/Auth/index.ts",
       "import": "./lib/Auth/index.js"
     },
     "./AWS": {
-      "types": "./src/AWS/index.ts",
+      "types": "./lib/AWS/index.d.ts",
       "bun": "./src/AWS/index.ts",
       "worker": "./src/AWS/index.ts",
       "import": "./lib/AWS/index.js"
     },
     "./AWS/*": {
-      "types": "./src/AWS/*/index.ts",
+      "types": "./lib/AWS/*/index.d.ts",
       "bun": "./src/AWS/*/index.ts",
       "worker": "./src/AWS/*/index.ts",
       "import": "./lib/AWS/*/index.js"
     },
     "./AWS/Credentials": {
-      "types": "./src/AWS/Credentials/index.ts",
+      "types": "./lib/AWS/Credentials/index.d.ts",
       "bun": "./src/AWS/Credentials/index.ts",
       "worker": "./src/AWS/Credentials/index.ts",
       "import": "./lib/AWS/Credentials/index.js"
     },
     "./AWS/Endpoint": {
-      "types": "./src/AWS/Endpoint/index.ts",
+      "types": "./lib/AWS/Endpoint/index.d.ts",
       "bun": "./src/AWS/Endpoint/index.ts",
       "worker": "./src/AWS/Endpoint/index.ts",
       "import": "./lib/AWS/Endpoint/index.js"
     },
     "./AWS/Region": {
-      "types": "./src/AWS/Region/index.ts",
+      "types": "./lib/AWS/Region/index.d.ts",
       "bun": "./src/AWS/Region/index.ts",
       "worker": "./src/AWS/Region/index.ts",
       "import": "./lib/AWS/Region/index.js"
     },
     "./AWS/Profile": {
-      "types": "./src/AWS/Profile/index.ts",
+      "types": "./lib/AWS/Profile/index.d.ts",
       "bun": "./src/AWS/Profile/index.ts",
       "worker": "./src/AWS/Profile/index.ts",
       "import": "./lib/AWS/Profile/index.js"
     },
     "./AWS/Lambda/*": {
-      "types": "./src/AWS/Lambda/*.ts",
+      "types": "./lib/AWS/Lambda/*.d.ts",
       "bun": "./src/AWS/Lambda/*.ts",
       "worker": "./src/AWS/Lambda/*.ts",
       "import": "./lib/AWS/Lambda/*.js"
     },
     "./Build": {
-      "types": "./src/Build/index.ts",
+      "types": "./lib/Build/index.d.ts",
       "bun": "./src/Build/index.ts",
       "worker": "./src/Build/index.ts",
       "import": "./lib/Build/index.js"
     },
     "./Construct": {
-      "types": "./src/Construct/index.ts",
+      "types": "./lib/Construct/index.d.ts",
       "bun": "./src/Construct/index.ts",
       "worker": "./src/Construct/index.ts",
       "import": "./lib/Construct/index.js"
     },
     "./Bundle": {
-      "types": "./src/Bundle/index.ts",
+      "types": "./lib/Bundle/index.d.ts",
       "bun": "./src/Bundle/index.ts",
       "worker": "./src/Bundle/index.ts",
       "import": "./lib/Bundle/index.js"
     },
     "./ContentType": {
-      "types": "./src/ContentType.ts",
+      "types": "./lib/ContentType.d.ts",
       "bun": "./src/ContentType.ts",
       "worker": "./src/ContentType.ts",
       "import": "./lib/ContentType.js"
     },
     "./Cloudflare": {
-      "types": "./src/Cloudflare/index.ts",
+      "types": "./lib/Cloudflare/index.d.ts",
       "bun": "./src/Cloudflare/index.ts",
       "worker": "./src/Cloudflare/index.ts",
       "import": "./lib/Cloudflare/index.js"
     },
     "./Cloudflare/Live": {
-      "types": "./src/Cloudflare/Live.ts",
+      "types": "./lib/Cloudflare/Live.d.ts",
       "bun": "./src/Cloudflare/Live.ts",
       "worker": "./src/Cloudflare/Live.ts",
       "import": "./lib/Cloudflare/Live.js"
     },
     "./Cloudflare/*": {
-      "types": "./src/Cloudflare/*/index.ts",
+      "types": "./lib/Cloudflare/*/index.d.ts",
       "bun": "./src/Cloudflare/*/index.ts",
       "worker": "./src/Cloudflare/*/index.ts",
       "import": "./lib/Cloudflare/*/index.js"
     },
     "./Axiom": {
-      "types": "./src/Axiom/index.ts",
+      "types": "./lib/Axiom/index.d.ts",
       "bun": "./src/Axiom/index.ts",
       "worker": "./src/Axiom/index.ts",
       "import": "./lib/Axiom/index.js"
     },
     "./GitHub": {
-      "types": "./src/GitHub/index.ts",
+      "types": "./lib/GitHub/index.d.ts",
       "bun": "./src/GitHub/index.ts",
       "worker": "./src/GitHub/index.ts",
       "import": "./lib/GitHub/index.js"
     },
     "./Endpoint": {
-      "types": "./src/Endpoint/index.ts",
+      "types": "./lib/Endpoint/index.d.ts",
       "bun": "./src/Endpoint/index.ts",
       "worker": "./src/Endpoint/index.ts",
       "import": "./lib/Endpoint/index.js"
     },
     "./Kubernetes": {
-      "types": "./src/Kubernetes/index.ts",
+      "types": "./lib/Kubernetes/index.d.ts",
       "bun": "./src/Kubernetes/index.ts",
       "worker": "./src/Kubernetes/index.ts",
       "import": "./lib/Kubernetes/index.js"
     },
     "./Output": {
-      "types": "./src/Output.ts",
+      "types": "./lib/Output.d.ts",
       "bun": "./src/Output.ts",
       "worker": "./src/Output.ts",
       "import": "./lib/Output.js"
     },
     "./Process": {
-      "types": "./src/Process/index.ts",
+      "types": "./lib/Process/index.d.ts",
       "bun": "./src/Process/index.ts",
       "worker": "./src/Process/index.ts",
       "import": "./lib/Process/index.js"
     },
     "./SQLite": {
-      "types": "./src/SQLite/index.ts",
+      "types": "./lib/SQLite/index.d.ts",
       "bun": "./src/SQLite/index.ts",
       "worker": "./src/SQLite/index.ts",
       "import": "./lib/SQLite/index.js"
     },
     "./TUI": {
-      "types": "./src/TUI/index.ts",
+      "types": "./lib/TUI/index.d.ts",
       "bun": "./src/TUI/index.ts",
       "worker": "./src/TUI/index.ts",
       "import": "./lib/TUI/index.js"
     },
     "./Server": {
-      "types": "./src/Server/index.ts",
+      "types": "./lib/Server/index.d.ts",
       "bun": "./src/Server/index.ts",
       "worker": "./src/Server/index.ts",
       "import": "./lib/Server/index.js"
     },
     "./Stack": {
-      "types": "./src/Stack.ts",
+      "types": "./lib/Stack.d.ts",
       "bun": "./src/Stack.ts",
       "worker": "./src/Stack.ts",
       "import": "./lib/Stack.js"
     },
     "./State": {
-      "types": "./src/State/index.ts",
+      "types": "./lib/State/index.d.ts",
       "bun": "./src/State/index.ts",
       "worker": "./src/State/index.ts",
       "import": "./lib/State/index.js"
     },
     "./State/*": {
-      "types": "./src/State/*.ts",
+      "types": "./lib/State/*.d.ts",
       "bun": "./src/State/*.ts",
       "worker": "./src/State/*.ts",
       "import": "./lib/State/*.js"
     },
     "./Test/Bun": {
-      "types": "./src/Test/Bun.ts",
+      "types": "./lib/Test/Bun.d.ts",
       "bun": "./src/Test/Bun.ts",
       "worker": "./src/Test/Bun.ts",
       "import": "./lib/Test/Bun.js"
     },
     "./Util": {
-      "types": "./src/Util/index.ts",
+      "types": "./lib/Util/index.d.ts",
       "bun": "./src/Util/index.ts",
       "worker": "./src/Util/index.ts",
       "import": "./lib/Util/index.js"
     },
     "./Util/Clank": {
-      "types": "./src/Util/Clank.ts",
+      "types": "./lib/Util/Clank.d.ts",
       "bun": "./src/Util/Clank.ts",
       "worker": "./src/Util/Clank.ts",
       "import": "./lib/Util/Clank.js"
     },
-    "./bin/alchemy.js": "./bin/alchemy.js"
+    "./bin/alchemy.js": "./bin/alchemy.js",
+    "./bin/exec.ts": "./bin/exec.ts",
+    "./bin/exec.js": "./bin/exec.js"
   },
   "publishConfig": {
     "access": "public"
@@ -237,13 +239,13 @@
     "@ai-sdk/provider": "^3.0.8",
     "@aws-sdk/credential-providers": "^3.0.0",
     "@clack/prompts": "^0.11.0",
-    "@distilled.cloud/aws": "^0.13.1",
-    "@distilled.cloud/axiom": "^0.13.1",
-    "@distilled.cloud/cloudflare": "^0.13.1",
+    "@distilled.cloud/aws": "^0.15.2",
+    "@distilled.cloud/axiom": "^0.15.2",
+    "@distilled.cloud/cloudflare": "^0.15.2",
     "@distilled.cloud/cloudflare-rolldown-plugin": "0.3.0",
     "@distilled.cloud/cloudflare-runtime": "0.1.1",
     "@distilled.cloud/cloudflare-vite-plugin": "0.2.0",
-    "@distilled.cloud/core": "^0.13.1",
+    "@distilled.cloud/core": "^0.15.2",
     "@effect/vitest": "4.0.0-beta.58",
     "@libsql/client": "^0.17.0",
     "@octokit/rest": "^22.0.1",
@@ -293,7 +295,7 @@
     "tsconfig-paths": "^4.2.0",
     "tsdown": "^0.15.4",
     "tsx": "^4.20.6",
-    "typescript": "^5.9.3"
+    "typescript": "^6.0.3"
   },
   "peerDependencies": {
     "@effect/platform-bun": "4.0.0-beta.58",

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,6 +12,7 @@ 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 { fileURLToPath } from "node:url";
 import { SecretBindingLive } from "../SecretsStore/SecretBinding.ts";
 import * as Secret from "../SecretsStore/Secret.ts";
 import { Worker } from "../Workers/Worker.ts";
@@ -20,11 +21,32 @@ 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`.
+ */
+const API_SOURCE_PATH = (() => {
+  const here = fileURLToPath(import.meta.url);
+  if (here.endsWith(".ts")) return here;
+  return fileURLToPath(
+    new URL("../src/Cloudflare/StateStore/Api.ts", import.meta.url),
+  );
+})();
+
 export default Worker(
   "Api",
   {
     name: STATE_STORE_SCRIPT_NAME,
-    main: import.meta.path,
+    main: API_SOURCE_PATH,
     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 });

package/src/Cloudflare/Workers/Assets.ts

@@ -109,16 +109,7 @@ export const readAssets = Effect.fnUntraced(function* (props: AssetsProps) {
   const path = yield* Path.Path;
   const resolvedDirectory = path.resolve(props.directory);
   const [files, ignore, _headers, _redirects] = yield* Effect.all([
-    // Tolerate a missing directory: state may carry an absolute path
-    // from a different machine (e.g. CI) and we'd rather upload no
-    // assets than crash the whole deploy.
-    fs.readDirectory(resolvedDirectory, { recursive: true }).pipe(
-      Effect.catchTag("PlatformError", (e) =>
-        e.reason._tag === "NotFound"
-          ? Effect.succeed([] as readonly string[])
-          : Effect.fail(e),
-      ),
-    ),
+    fs.readDirectory(resolvedDirectory, { recursive: true }),
     maybeReadString(path.join(resolvedDirectory, ".assetsignore")),
     maybeReadString(path.join(resolvedDirectory, "_headers")),
     maybeReadString(path.join(resolvedDirectory, "_redirects")),