alchemy 2.0.0-beta.34 → 2.0.0-beta.36

package/src/Sidecar/RpcServer.ts

@@ -1,9 +1,10 @@
+import { RpcSession, type RpcCompatible, type RpcTransport } from "capnweb";
+import * as Context from "effect/Context";
 import * as Effect from "effect/Effect";
 import * as Fiber from "effect/Fiber";
 import * as FileSystem from "effect/FileSystem";
-import * as Layer from "effect/Layer";
 import * as Schedule from "effect/Schedule";
-import * as AlchemyContext from "../AlchemyContext.ts";
+import type * as Scope from "effect/Scope";
 import * as Lock from "./Lock.ts";
 import {
   serializeRpcHandlers,
@@ -11,13 +12,21 @@ import {
   type RpcHandlers,
 } from "./RpcHandler.ts";
 import * as RpcPaths from "./RpcPaths.ts";
-import { makeBunWebSocketRpcServer } from "./RpcTransport.ts";
 
-export const layerServices = (main: string) =>
-  Layer.provideMerge(
-    Lock.LockLive,
-    Layer.provideMerge(RpcPaths.layer(main), AlchemyContext.AlchemyContextLive),
-  );
+export class RpcServer extends Context.Service<
+  RpcServer,
+  {
+    make: <T extends RpcCompatible<T>>(
+      main: () => T,
+    ) => Effect.Effect<
+      {
+        readonly url: string;
+      },
+      never,
+      Scope.Scope
+    >;
+  }
+>()("RpcServer") {}
 
 export const makeRpcServer = Effect.fn(function* <T extends RpcHandlers, E, R>(
   handlersEffect: Effect.Effect<T, E, R>,
@@ -30,28 +39,19 @@ export const makeRpcServer = Effect.fn(function* <T extends RpcHandlers, E, R>(
   const server = yield* Effect.gen(function* () {
     const heartbeat = yield* Heartbeat;
     const handlers = yield* handlersEffect;
-    const server = yield* Effect.acquireRelease(
-      Effect.sync(() =>
-        makeBunWebSocketRpcServer(() => {
-          const methods = Object.assign(
-            serializeRpcHandlers(handlers, schema),
-            {
-              heartbeat: () => Effect.runPromise(heartbeat.touch),
-              shutdown: () => Effect.runPromise(heartbeat.shutdown),
-            },
-          );
-          void methods.heartbeat();
-          return methods;
+    const server = yield* RpcServer.use((server) =>
+      server.make(() =>
+        Object.assign(serializeRpcHandlers(handlers, schema), {
+          heartbeat: () => Effect.runPromise(heartbeat.touch),
+          shutdown: () => Effect.runPromise(heartbeat.shutdown),
         }),
       ),
-      (server) => Effect.promise(() => server.stop(true)),
     );
-    const address = `ws://${server.hostname}:${server.port}`;
-    yield* fs.writeFileString(paths.url, address);
+    yield* fs.writeFileString(paths.url, server.url);
     yield* Effect.addFinalizer(() =>
       fs.readFileString(paths.url).pipe(
         Effect.flatMap((text) =>
-          text === address ? fs.remove(paths.url) : Effect.void,
+          text === server.url ? fs.remove(paths.url) : Effect.void,
         ),
         Effect.ignore,
       ),
@@ -78,3 +78,76 @@ const Heartbeat = Effect.gen(function* () {
     await: Fiber.join(fiber),
   };
 });
+
+interface ServerWebSocketLike {
+  send: (message: string) => any | Promise<any>;
+  close: (code?: number, reason?: string) => void;
+}
+
+export type WebSocketRpcSession<T extends RpcCompatible<T>> = ReturnType<
+  typeof makeWebSocketRpcSession<T>
+>;
+
+export function makeWebSocketRpcSession<T extends RpcCompatible<T>>(
+  ws: ServerWebSocketLike,
+  main: () => T,
+) {
+  const { transport, dispatch } = makeWebSocketRpcTransport(ws);
+  const session = new RpcSession(transport, main());
+  return { session, dispatch };
+}
+
+function makeWebSocketRpcTransport(ws: ServerWebSocketLike) {
+  let receiveQueue: Array<string> = [];
+  let receiveResolver: ((value: string) => void) | undefined;
+  let receiveRejecter: ((reason: unknown) => void) | undefined;
+  let error: unknown | undefined;
+  return {
+    transport: {
+      send: async (message: string) => await ws.send(message),
+      receive: async () => {
+        const next = receiveQueue.shift();
+        if (next) {
+          return next;
+        } else if (error) {
+          throw error;
+        }
+        return new Promise<string>((resolve, reject) => {
+          receiveResolver = resolve;
+          receiveRejecter = reject;
+        });
+      },
+      abort: (reason: unknown) => {
+        const message =
+          reason instanceof Error ? reason.message : String(reason);
+        ws.close(3000, message);
+        error ??= reason;
+      },
+    } satisfies RpcTransport,
+    dispatch: {
+      message: (data: string | Buffer<ArrayBuffer>) => {
+        if (error) {
+          return;
+        }
+        data = typeof data === "string" ? data : data.toString("utf-8");
+        if (receiveResolver) {
+          receiveResolver(data);
+          receiveResolver = undefined;
+          receiveRejecter = undefined;
+        } else {
+          receiveQueue.push(data);
+        }
+      },
+      close: (code: number, reason: string) => {
+        if (!error) {
+          error = new Error(`WebSocket closed with code ${code}: ${reason}`);
+          if (receiveRejecter) {
+            receiveRejecter(error);
+            receiveRejecter = undefined;
+            receiveResolver = undefined;
+          }
+        }
+      },
+    },
+  };
+}

package/src/Sidecar/RpcServerBun.ts

@@ -0,0 +1,41 @@
+import type { RpcCompatible } from "capnweb";
+import * as Effect from "effect/Effect";
+import * as Layer from "effect/Layer";
+import type { WebSocketRpcSession } from "./RpcServer.ts";
+import { makeWebSocketRpcSession, RpcServer } from "./RpcServer.ts";
+
+export const RpcServerBun = Layer.succeed(
+  RpcServer,
+  RpcServer.of({
+    make: <T extends RpcCompatible<T>>(main: () => T) =>
+      Effect.acquireRelease(
+        Effect.sync(() =>
+          Bun.serve<WebSocketRpcSession<T>>({
+            port: 0,
+            fetch: (request, server) => {
+              if (server.upgrade(request, { data: undefined! })) {
+                return;
+              }
+              return new Response("Upgrade failed", { status: 400 });
+            },
+            websocket: {
+              open: (ws) => {
+                ws.data = makeWebSocketRpcSession(ws, main);
+              },
+              message: (ws, message) => {
+                ws.data.dispatch.message(message);
+              },
+              close: (ws, code, reason) => {
+                ws.data.dispatch.close(code, reason);
+              },
+            },
+          }),
+        ),
+        (server) => Effect.sync(() => server.stop(true)),
+      ).pipe(
+        Effect.map((server) => ({
+          url: `ws://${server.hostname}:${server.port}`,
+        })),
+      ),
+  }),
+);

package/src/Sidecar/RpcServerNode.ts

@@ -0,0 +1,51 @@
+import * as Effect from "effect/Effect";
+import * as Layer from "effect/Layer";
+import { WebSocketServer, type Server } from "ws";
+import { makeWebSocketRpcSession, RpcServer } from "./RpcServer.ts";
+
+export const RpcServerNode = Layer.succeed(
+  RpcServer,
+  RpcServer.of({
+    make: Effect.fnUntraced(function* (main) {
+      const server = new WebSocketServer({ host: "127.0.0.1", port: 0 });
+      const url = yield* Effect.callback<string>((resume) => {
+        server.on("connection", (ws) => {
+          const session = makeWebSocketRpcSession(ws, main);
+          ws.on("message", (data) => {
+            session.dispatch.message(data.toString());
+          });
+          ws.on("close", (code, reason) => {
+            session.dispatch.close(code, reason.toString());
+          });
+        });
+        server.on("error", (error) => {
+          resume(Effect.die(error));
+        });
+        server.on("listening", () => {
+          resume(getServerAddress(server));
+        });
+      });
+      yield* Effect.addFinalizer(() => Effect.sync(() => server.close()));
+      return { url };
+    }),
+  }),
+);
+
+function getServerAddress(server: Server): Effect.Effect<string> {
+  const address = server.address();
+  if (
+    typeof address === "object" &&
+    address !== null &&
+    "address" in address &&
+    "port" in address
+  ) {
+    return Effect.succeed(
+      `ws://${address.address === "::" ? "localhost" : address.address}:${address.port}`,
+    );
+  }
+  return Effect.die(
+    new Error(
+      `Server address is not an object with address and port properties: ${JSON.stringify(address)}`,
+    ),
+  );
+}

package/src/Sidecar/RpcServices.ts

@@ -0,0 +1,48 @@
+import * as ConfigProvider from "effect/ConfigProvider";
+import * as Effect from "effect/Effect";
+import * as Layer from "effect/Layer";
+import * as Option from "effect/Option";
+import * as AlchemyContext from "../AlchemyContext.ts";
+import { withProfileOverride } from "../Auth/Profile.ts";
+import type { ExecStackOptionsEncoded } from "../Cli/commands/deploy.ts";
+import { loadConfigProvider } from "../Util/ConfigProvider.ts";
+import * as Lock from "./Lock.ts";
+import * as RpcPaths from "./RpcPaths.ts";
+
+export const layer = (main: string) =>
+  Layer.provideMerge(
+    Lock.LockLive,
+    Layer.provideMerge(
+      RpcPaths.layer(main),
+      Layer.mergeAll(
+        AlchemyContext.AlchemyContextLive,
+        makeConfigProvider(),
+        Layer.unwrap(
+          Effect.promise(() => {
+            if ("Bun" in globalThis) {
+              return import("./RpcServerBun.ts").then((m) => m.RpcServerBun);
+            } else {
+              return import("./RpcServerNode.js").then((m) => m.RpcServerNode);
+            }
+          }),
+        ),
+      ),
+    ),
+  );
+
+const makeConfigProvider = () => {
+  let options: Partial<ExecStackOptionsEncoded>;
+  try {
+    options = JSON.parse(
+      process.env.ALCHEMY_EXEC_OPTIONS!,
+    ) as ExecStackOptionsEncoded;
+  } catch {
+    options = {};
+  }
+  const envFile = Option.fromUndefinedOr(options.envFile);
+  return ConfigProvider.layer(
+    loadConfigProvider(envFile).pipe(
+      Effect.map((base) => withProfileOverride(base, options.profile)),
+    ),
+  );
+};

package/src/Stack.ts

@@ -13,6 +13,8 @@ import type { ChildProcessSpawner } from "effect/unstable/process/ChildProcessSp
 import { AlchemyContext, AlchemyContextLive } from "./AlchemyContext.ts";
 import { provideFreshArtifactStore } from "./Artifacts.ts";
 import { AuthProviders } from "./Auth/AuthProvider.ts";
+import { CredentialsStore, CredentialsStoreLive } from "./Auth/Credentials.ts";
+import { Profile, ProfileLive } from "./Auth/Profile.ts";
 import { Cli } from "./Cli/Cli.ts";
 import type { Input, InputProps } from "./Input.ts";
 import * as Output from "./Output.ts";
@@ -35,6 +37,8 @@ export type StackServices =
   | HttpClient
   | ChildProcessSpawner
   | AuthProviders
+  | Profile
+  | CredentialsStore
   | Cli;
 
 export type StackEffect<A, Err = never, Req = never> = Effect.Effect<
@@ -46,6 +50,8 @@ export type StackEffect<A, Err = never, Req = never> = Effect.Effect<
   | AuthProviders
   | AlchemyContext
   | Cli
+  | Profile
+  | CredentialsStore
   | State
   | Req
 >;
@@ -250,6 +256,8 @@ const platform = Layer.mergeAll(
   PlatformServices,
   FetchHttpClient.layer,
   Logger.layer([fileLogger("out")], { mergeWithExisting: true }),
+  Layer.provide(ProfileLive, PlatformServices),
+  Layer.provide(CredentialsStoreLive, PlatformServices),
 );
 // override alchemy state store, CLI/reporting, state, and Config
 const alchemy = (overrides?: { dev?: boolean }) =>

package/src/Test/Core.ts

@@ -9,8 +9,9 @@ import { AlchemyContext, AlchemyContextLive } from "../AlchemyContext.ts";
 import { apply } from "../Apply.ts";
 import { provideFreshArtifactStore } from "../Artifacts.ts";
 import { AuthProviders } from "../Auth/AuthProvider.ts";
-import { withProfileOverride } from "../Auth/Profile.ts";
-import { TestCli } from "./TestCli.ts";
+import { CredentialsStoreLive } from "../Auth/Credentials.ts";
+import { ProfileLive, withProfileOverride } from "../Auth/Profile.ts";
+import { LoggingCli } from "../Cli/LoggingCli.ts";
 import { deploy as _deploy } from "../Deploy.ts";
 import { destroy as _destroy } from "../Destroy.ts";
 import type { Input } from "../Input.ts";
@@ -72,9 +73,14 @@ const overrideAlchemyContext = (overrides: { dev: boolean }) =>
 
 export type TestEffect<A, Req = never> = StackEffect<A, any, Req>;
 
-const platformLayer = Layer.mergeAll(PlatformServices, FetchHttpClient.layer);
+const platformLayer = Layer.mergeAll(
+  PlatformServices,
+  FetchHttpClient.layer,
+  Layer.provide(ProfileLive, PlatformServices),
+  Layer.provide(CredentialsStoreLive, PlatformServices),
+);
 
-const alchemyLayer = Layer.mergeAll(TestCli, AlchemyContextLive);
+const alchemyLayer = Layer.mergeAll(LoggingCli, AlchemyContextLive);
 
 /**
  * Build the per-test runtime and return a self-contained Effect.

package/src/Test/Vitest.ts

@@ -10,8 +10,11 @@ import {
 import type { AlchemyContext } from "../AlchemyContext.ts";
 import type { CompiledStack } from "../Stack.ts";
 import type { Stage } from "../Stage.ts";
+import { installLocalhostDns } from "../Util/LocalhostDns.ts";
 import * as Core from "./Core.ts";
 
+installLocalhostDns();
+
 export type MakeOptions<ROut = any> = Core.MakeOptions<ROut>;
 export type ScratchStack = Core.ScratchStack;
 export type TestEffect<A, R = never> = Core.TestEffect<A, R>;

package/src/Util/LocalhostDns.ts

@@ -0,0 +1,58 @@
+/**
+ * Process-level DNS shim that makes `*.localhost` resolve to 127.0.0.1.
+ *
+ * Background: macOS's `getaddrinfo` does not honor RFC 6761 for arbitrary
+ * `*.localhost` names; only the bare `localhost` is mapped to loopback.
+ * workerd and browsers handle it themselves, but Node's undici-based fetch
+ * (and Bun's libcurl-based fetch on some platforms) fails with `ENOTFOUND`
+ * when calling URLs returned by the local Cloudflare worker proxy
+ * (e.g. `http://my-worker.localhost:1337`).
+ *
+ * The proxy in `@distilled.cloud/cloudflare-runtime` dispatches by the
+ * URL hostname, so we cannot rewrite the URL client-side to `127.0.0.1`
+ * (and `Host` is a forbidden fetch header). The fix is to make the host
+ * resolvable at the network layer.
+ *
+ * Calling `installLocalhostDns()` is idempotent.
+ */
+
+import { createRequire } from "node:module";
+
+let installed = false;
+
+const isLocalhost = (hostname: string): boolean =>
+  hostname === "localhost" ||
+  hostname === "[::1]" ||
+  hostname.endsWith(".localhost");
+
+export const installLocalhostDns = (): void => {
+  if (installed) return;
+  installed = true;
+  // Bun resolves `*.localhost` natively via its libcurl-based fetch on
+  // Darwin and Linux, so the shim is a no-op there. If a future Bun
+  // release changes this, install via Bun's undici-compatible global
+  // dispatcher here.
+  if (typeof (globalThis as { Bun?: unknown }).Bun !== "undefined") return;
+  try {
+    const require = createRequire(import.meta.url);
+    const undici: typeof import("undici") = require("undici");
+    const dns: typeof import("node:dns") = require("node:dns");
+    undici.setGlobalDispatcher(
+      new undici.Agent({
+        connect: {
+          lookup: (hostname, options, cb: any) => {
+            if (isLocalhost(hostname)) {
+              if (options && (options as { all?: boolean }).all) {
+                return cb(null, [{ address: "127.0.0.1", family: 4 }]);
+              }
+              return cb(null, "127.0.0.1", 4);
+            }
+            return dns.lookup(hostname, options, cb);
+          },
+        },
+      }),
+    );
+  } catch {
+    // undici not available; nothing to do.
+  }
+};

package/src/Util/PlatformServices.ts

@@ -9,6 +9,7 @@ import type { HttpServer } from "effect/unstable/http/HttpServer";
 import type { ServeError } from "effect/unstable/http/HttpServerError";
 import type { ChildProcessSpawner } from "effect/unstable/process/ChildProcessSpawner";
 import type { WebSocketConstructor } from "effect/unstable/socket/Socket";
+import { installLocalhostDns } from "./LocalhostDns.ts";
 
 const isBun = typeof Bun !== "undefined";
 
@@ -52,6 +53,7 @@ export const runMain = <E, A>(
     readonly teardown?: Teardown | undefined;
   },
 ): void => {
+  installLocalhostDns();
   if (isBun) {
     void import("@effect/platform-bun/BunRuntime").then((BunRuntime) =>
       BunRuntime.runMain(effect, options),
@@ -65,7 +67,7 @@ export const runMain = <E, A>(
 
 export const httpServer = (
   port: number = 0,
-  host: string = "localhost",
+  host: string = "127.0.0.1",
 ): Layer.Layer<HttpServer, ServeError> =>
   Effect.promise(async () => {
     if (isBun) {

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

@@ -1,20 +0,0 @@
-import type { FileSystem } from "effect/FileSystem";
-import { Path } from "effect/Path";
-import * as Command from "effect/unstable/cli/Command";
-import type { HttpClient } from "effect/unstable/http/HttpClient";
-import * as CloudflareAccess from "../../Cloudflare/Access.ts";
-export declare const bootstrapCommand: Command.Command<"bootstrap", {} | {}, {}, import("../../AlchemyContext.ts").AlchemyContext | import("effect/Config").ConfigError | import("../../Auth/AuthProvider").AuthError | import("../../Stage.ts").Stage | import("../../State/State.ts").StateStoreError | import("../../Output.ts").MissingSourceError | import("../../Output.ts").InvalidReferenceError | import("@distilled.cloud/aws/Errors").UnknownAwsError | import("@distilled.cloud/aws/Errors").AccessDeniedException | import("@distilled.cloud/aws/Errors").ExpiredTokenException | import("@distilled.cloud/aws/Errors").IncompleteSignature | import("@distilled.cloud/aws/Errors").InternalFailure | import("@distilled.cloud/aws/Errors").MalformedHttpRequestException | import("@distilled.cloud/aws/Errors").NotAuthorized | import("@distilled.cloud/aws/Errors").OptInRequired | import("@distilled.cloud/aws/Errors").RequestAbortedException | import("@distilled.cloud/aws/Errors").RequestEntityTooLargeException | import("@distilled.cloud/aws/Errors").RequestExpired | import("@distilled.cloud/aws/Errors").RequestTimeoutException | import("@distilled.cloud/aws/Errors").ServiceUnavailable | import("@distilled.cloud/aws/Errors").ThrottlingException | import("@distilled.cloud/aws/Errors").UnrecognizedClientException | import("@distilled.cloud/aws/Errors").UnknownOperationException | import("@distilled.cloud/aws/Errors").ValidationError | import("@distilled.cloud/aws/Errors").ValidationException | import("@distilled.cloud/aws/Errors").OperationAborted | import("@distilled.cloud/aws/Errors").EndpointError | import("@distilled.cloud/aws/Errors").NoMatchingRuleError | import("@distilled.cloud/aws/Credentials").CredentialsError | import("@distilled.cloud/aws/s3").RequestLimitExceeded | import("@distilled.cloud/aws/s3").RequestError | import("@distilled.cloud/aws/s3").NoSuchBucket | import("@distilled.cloud/aws/s3").PermanentRedirect | import("@distilled.cloud/aws/s3").BucketAlreadyExists | import("@distilled.cloud/aws/s3").IllegalLocationConstraintException | import("@distilled.cloud/aws/s3").InvalidArgument | import("@distilled.cloud/aws/s3").InvalidBucketName | import("@distilled.cloud/aws/s3").InvalidLocationConstraint | import("@distilled.cloud/aws/s3").NotFound | import("@distilled.cloud/aws/s3").ParseError | import("@distilled.cloud/aws/s3").BucketNotEmpty | CloudflareAccess.AccessError | import("@distilled.cloud/cloudflare").DefaultErrors | import("@distilled.cloud/cloudflare/workers").InvalidRoute | import("@distilled.cloud/cloudflare/secrets-store").InvalidAccountId | {
-    readonly _tag: "StateStoreVersionNotReady";
-    readonly expected: number;
-    readonly observed: number | undefined;
-    name: string;
-    message: string;
-    stack?: string;
-    cause?: unknown;
-    readonly "~effect/Runtime/errorExitCode"?: number;
-    readonly "~effect/Runtime/errorReported"?: boolean;
-    readonly "~effect/ErrorReporter/ignore"?: boolean;
-    readonly "~effect/ErrorReporter/severity"?: import("effect/LogLevel").Severity;
-    readonly "~effect/ErrorReporter/attributes"?: import("effect/Record").ReadonlyRecord<string, unknown>;
-}, import("../../AlchemyContext.ts").AlchemyContext | Path | FileSystem | import("effect/unstable/process/ChildProcessSpawner").ChildProcessSpawner | HttpClient | import("../Cli.ts").Cli>;
-//# sourceMappingURL=bootstrap.d.ts.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"bootstrap.d.ts","sourceRoot":"","sources":["../../../src/Cli/commands/bootstrap.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAIpD,OAAO,EAAE,IAAI,EAAE,MAAM,aAAa,CAAC;AACnC,OAAO,KAAK,OAAO,MAAM,6BAA6B,CAAC;AAEvD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,iCAAiC,CAAC;AAWlE,OAAO,KAAK,gBAAgB,MAAM,4BAA4B,CAAC;AA+L/D,eAAO,MAAM,gBAAgB;;;;;;;;;;;;;2LAE5B,CAAC"}

package/lib/Cli/commands/bootstrap.js

@@ -1,107 +0,0 @@
-import * as Auth from "@distilled.cloud/aws/Auth";
-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 { Path } from "effect/Path";
-import * as Command from "effect/unstable/cli/Command";
-import * as Flag from "effect/unstable/cli/Flag";
-import { bootstrap as bootstrapAws, destroyBootstrap as destroyBootstrapAws, } from "../../AWS/Bootstrap";
-import * as AWSCredentials from "../../AWS/Credentials";
-import * as AWSEnvironment from "../../AWS/Environment";
-import * as AWSRegion from "../../AWS/Region";
-import { AuthProviders } from "../../Auth/AuthProvider";
-import { withProfileOverride } from "../../Auth/Profile";
-import * as CloudflareAccess from "../../Cloudflare/Access.js";
-import { CloudflareAuth } from "../../Cloudflare/Auth/AuthProvider";
-import * as CloudflareEnvironment from "../../Cloudflare/CloudflareEnvironment";
-import * as CloudflareCredentials from "../../Cloudflare/Credentials";
-import { bootstrap as bootstrapCloudflare } from "../../Cloudflare/StateStore/State";
-import { loadConfigProvider } from "../../Util/ConfigProvider";
-import { fileLogger } from "../../Util/FileLogger";
-import { envFile, instrumentCommand, profile } from "./_shared.js";
-const awsProfile = Flag.string("profile").pipe(Flag.withDescription("AWS profile to use for credentials"), Flag.optional, Flag.map(Option.getOrElse(() => "default")));
-const awsRegion = Flag.string("region").pipe(Flag.withDescription("AWS region to bootstrap (defaults to AWS_REGION env var)"), Flag.optional, Flag.map(Option.getOrUndefined));
-const bootstrapDestroy = Flag.boolean("destroy").pipe(Flag.withDescription("Destroy all bootstrap buckets in the selected region"), Flag.withDefault(false));
-const bootstrapAwsCommand = Command.make("aws", {
-    envFile,
-    profile: awsProfile,
-    region: awsRegion,
-    destroy: bootstrapDestroy,
-}, instrumentCommand("bootstrap.aws", (a) => ({
-    "alchemy.profile": a.profile,
-    "alchemy.region": a.region ?? "",
-    "alchemy.destroy": a.destroy,
-}))(Effect.fnUntraced(function* ({ envFile, profile, region, destroy }) {
-    const logger = Logger.layer([fileLogger("bootstrap.txt")], {
-        mergeWithExisting: true,
-    });
-    return yield* Effect.gen(function* () {
-        const ssoProfile = yield* Auth.loadProfile(profile);
-        if (!ssoProfile.sso_account_id) {
-            return yield* Effect.die(`AWS SSO profile '${profile}' is missing sso_account_id`);
-        }
-        // Build a single AWSEnvironment, then derive Region/Credentials from
-        // it so resource providers downstream see a consistent view. The
-        // credentials Effect captures FileSystem/Path/HttpClient via the
-        // ambient context; AWSEnvironment expects R=never, so we provide it
-        // here.
-        const ambient = yield* Effect.context();
-        const environment = AWSEnvironment.makeEnvironment({
-            accountId: ssoProfile.sso_account_id,
-            region: region ?? ssoProfile.region ?? "us-east-1",
-            credentials: Auth.loadProfileCredentials(profile).pipe(Effect.provide(ambient)),
-            profile,
-        });
-        const awsLayers = Layer.provideMerge(Layer.mergeAll(AWSRegion.fromEnvironment, AWSCredentials.fromEnvironment), environment);
-        return yield* Effect.gen(function* () {
-            const provider = yield* loadConfigProvider(envFile);
-            const bootstrapLayer = Layer.provide(awsLayers, Layer.succeed(ConfigProvider.ConfigProvider, provider));
-            if (destroy) {
-                yield* destroyBootstrapAws().pipe(Effect.tap((result) => result.destroyed === 0
-                    ? Console.log("✓ No bootstrap buckets found to destroy")
-                    : Console.log(`✓ Destroyed ${result.destroyed} bootstrap bucket(s): ${result.bucketNames.join(", ")}`)), Effect.provide(bootstrapLayer));
-                return;
-            }
-            yield* bootstrapAws().pipe(Effect.tap(({ bucketName, created }) => created
-                ? Console.log(`✓ Created assets bucket: ${bucketName}`)
-                : Console.log(`✓ Assets bucket already exists: ${bucketName}`)), Effect.provide(bootstrapLayer));
-        });
-    }).pipe(Effect.provide(logger));
-})));
-const cloudflareForce = Flag.boolean("force").pipe(Flag.withDescription("Force a full redeploy even if the state-store worker already exists. " +
-    "Without this flag, an existing worker is adopted and only its credentials are refreshed."), Flag.withDefault(false));
-const cloudflareWorkerName = Flag.string("worker-name").pipe(Flag.withDescription("Override the default state-store worker name (advanced; only needed for multiple state stores per account)."), Flag.optional, Flag.map(Option.getOrUndefined));
-const bootstrapCloudflareCommand = Command.make("cloudflare", {
-    envFile,
-    profile,
-    force: cloudflareForce,
-    workerName: cloudflareWorkerName,
-}, instrumentCommand("bootstrap.cloudflare", (a) => ({
-    "alchemy.profile": a.profile,
-    "alchemy.force": a.force,
-    "alchemy.worker_name": a.workerName ?? "",
-}))(Effect.fnUntraced(function* ({ envFile, profile, force, workerName }) {
-    const logger = Logger.layer([fileLogger("bootstrap.txt")], {
-        mergeWithExisting: true,
-    });
-    // Wire up the same Cloudflare auth chain that
-    // `Cloudflare.state(...)` uses internally. CloudflareAuth is an
-    // `effectDiscard` layer that registers itself into the
-    // `AuthProviders` registry at build time, and downstream layers
-    // (`fromProfile`, `fromAuthProvider`) plus the deploy stack all
-    // look the registry back up through `getAuthProvider`. We need
-    // the registry to remain visible all the way through, so the
-    // composition uses `provideMerge` (provides + re-exports) rather
-    // than `provide` (provides + hides).
-    const authProviders = {};
-    const authRegistry = Layer.succeed(AuthProviders, authProviders);
-    const authLayer = Layer.provideMerge(CloudflareAuth, authRegistry);
-    const cloudflareLayers = Layer.provideMerge(Layer.mergeAll(CloudflareCredentials.fromAuthProvider(), CloudflareEnvironment.fromProfile(), CloudflareAccess.AccessLive), authLayer);
-    const services = Layer.mergeAll(cloudflareLayers, ConfigProvider.layer(withProfileOverride(yield* loadConfigProvider(envFile), profile)), logger);
-    yield* bootstrapCloudflare({ workerName, force }).pipe(Effect.provide(services));
-})));
-export const bootstrapCommand = Command.make("bootstrap", {}).pipe(Command.withSubcommands([bootstrapAwsCommand, bootstrapCloudflareCommand]));
-//# sourceMappingURL=bootstrap.js.map

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

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

package/lib/Sidecar/RpcTransport.d.ts

@@ -1,22 +0,0 @@
-import type { ServerWebSocket } from "bun";
-import type { RpcCompatible, RpcTransport } from "capnweb";
-import { RpcSession } from "capnweb";
-export declare function makeBunWebSocketRpcServer<T extends RpcCompatible<T>>(main: () => T): Bun.Server<{
-    transport: BunWebSocketRpcTransport;
-    session: RpcSession<T>;
-}>;
-declare class BunWebSocketRpcTransport implements RpcTransport {
-    private readonly ws;
-    private receiveQueue;
-    private receiveResolver?;
-    private receiveRejecter?;
-    private error?;
-    constructor(ws: ServerWebSocket<any>);
-    send(message: string): Promise<void>;
-    receive(): Promise<string>;
-    abort?(reason: any): void;
-    dispatchMessage(data: string | Buffer<ArrayBuffer>): void;
-    dispatchClose(code: number, reason: string): void;
-}
-export {};
-//# sourceMappingURL=RpcTransport.d.ts.map

package/lib/Sidecar/RpcTransport.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"RpcTransport.d.ts","sourceRoot":"","sources":["../../src/Sidecar/RpcTransport.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,KAAK,CAAC;AAC3C,OAAO,KAAK,EAAE,aAAa,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAC3D,OAAO,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AAErC,wBAAgB,yBAAyB,CAAC,CAAC,SAAS,aAAa,CAAC,CAAC,CAAC,EAClE,IAAI,EAAE,MAAM,CAAC;eAGA,wBAAwB;aAC1B,UAAU,CAAC,CAAC,CAAC;GAuBzB;AAED,cAAM,wBAAyB,YAAW,YAAY;IAKxC,OAAO,CAAC,QAAQ,CAAC,EAAE;IAJ/B,OAAO,CAAC,YAAY,CAAqB;IACzC,OAAO,CAAC,eAAe,CAAC,CAA0B;IAClD,OAAO,CAAC,eAAe,CAAC,CAA4B;IACpD,OAAO,CAAC,KAAK,CAAC,CAAU;gBACK,EAAE,EAAE,eAAe,CAAC,GAAG,CAAC;IAC/C,IAAI,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAGpC,OAAO,IAAI,OAAO,CAAC,MAAM,CAAC;IAYhC,KAAK,CAAC,CAAC,MAAM,EAAE,GAAG,GAAG,IAAI;IAKzB,eAAe,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAAC,WAAW,CAAC,GAAG,IAAI;IAczD,aAAa,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,IAAI;CAUlD"}