alchemy-effect 0.8.0 → 0.9.0

package/bin/alchemy-effect.ts

@@ -4,7 +4,6 @@ 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 FileSystem from "effect/FileSystem";
 import * as Layer from "effect/Layer";
 import * as Logger from "effect/Logger";
 import * as Option from "effect/Option";
@@ -27,12 +26,14 @@ import {
 import * as AWSCredentials from "../src/AWS/Credentials.ts";
 import * as AWSRegion from "../src/AWS/Region.ts";
 import * as CLI from "../src/Cli/index.ts";
-import { DotAlchemy, dotAlchemy } from "../src/Config.ts";
+import { dotAlchemy } from "../src/Config.ts";
 import * as Plan from "../src/Plan.ts";
 import { getProviderByType, type LogLine } from "../src/Provider.ts";
 import * as Stack from "../src/Stack.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";
 
 const USER = Config.string("USER").pipe(
   Config.orElse(() => Config.string("USERNAME")),
@@ -100,44 +101,6 @@ const force = Flag.boolean("force").pipe(
   Flag.withDefault(false),
 );
 
-const fileLogger = Effect.fnUntraced(function* (
-  ...segments: ReadonlyArray<string>
-) {
-  const dotAlchemy = yield* DotAlchemy;
-  const fs = yield* FileSystem.FileSystem;
-  const path = yield* Path;
-  const logFile = path.join(dotAlchemy, "log", ...segments);
-
-  yield* fs.makeDirectory(path.dirname(logFile), { recursive: true });
-
-  return yield* Logger.formatLogFmt.pipe(
-    Logger.toFile(logFile, {
-      flag: "a",
-    }),
-  );
-});
-
-const loadConfigProvider = (envFile: Option.Option<string>) => {
-  if (Option.isSome(envFile)) {
-    return ConfigProvider.fromDotEnv({ path: envFile.value }).pipe(
-      Effect.map((dotEnv) =>
-        ConfigProvider.orElse(dotEnv, ConfigProvider.fromEnv()),
-      ),
-    );
-  }
-  return Effect.gen(function* () {
-    const fs = yield* FileSystem.FileSystem;
-    const exists = yield* fs.exists(".env");
-    if (!exists) {
-      return ConfigProvider.fromEnv();
-    }
-    return ConfigProvider.orElse(
-      yield* ConfigProvider.fromDotEnv({ path: ".env" }),
-      ConfigProvider.fromEnv(),
-    );
-  });
-};
-
 const main = Argument.file("main", {
   mustExist: true,
 }).pipe(
@@ -241,37 +204,36 @@ const execStack = Effect.fn(function* ({
     const cli = yield* CLI.Cli;
     const stack = yield* stackEffect;
 
-    yield* provideFreshArtifactStore(
-      Effect.gen(function* () {
-        const updatePlan = yield* Plan.make(
-          destroy
-            ? {
-                ...stack,
-                // zero these out (destroy will treat all as orphans)
-                // TODO(sam): probably better to have Plan.destroy and Plan.update
-                resources: {},
-                bindings: {},
-                output: {},
-              }
-            : stack,
-          { force },
-        );
-        if (dryRun) {
-          yield* cli.displayPlan(updatePlan);
-        } else {
-          if (!yes) {
-            const approved = yield* cli.approvePlan(updatePlan);
-            if (!approved) {
-              return;
+    yield* Effect.gen(function* () {
+      const updatePlan = yield* Plan.make(
+        destroy
+          ? {
+              ...stack,
+              // zero these out (destroy will treat all as orphans)
+              // TODO(sam): probably better to have Plan.destroy and Plan.update
+              resources: {},
+              bindings: {},
+              output: {},
             }
+          : stack,
+        { force },
+      );
+      if (dryRun) {
+        yield* cli.displayPlan(updatePlan);
+      } else {
+        if (!yes) {
+          const approved = yield* cli.approvePlan(updatePlan);
+          if (!approved) {
+            return;
           }
-          const outputs = yield* apply(updatePlan);
-
-          yield* Console.log(outputs);
         }
-      }),
-    ).pipe(
+        const outputs = yield* apply(updatePlan);
+
+        yield* Console.log(outputs);
+      }
+    }).pipe(
       Effect.provide(stack.services),
+      provideFreshArtifactStore,
       // Effect.provide(Logger.layer([fileLogger("stacks", stack.name, stage)])),
     );
   }).pipe(

package/lib/cli/index.d.ts

@@ -291,6 +291,7 @@ interface ProviderService<Res extends ResourceLike = ResourceLike, ReadReq = nev
     news: Props<Res>;
     instanceId: string;
     session: ScopedPlanStatusSession;
+    bindings: BindingData<Res>;
   }): Effect$1.Effect<Res["Attributes"], any, PrecreateReq>;
   create(input: {
     id: string;

package/lib/cli/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","names":[],"sources":["../../src/Util/data.ts","../../src/Http.ts","../../src/ExecutionContext.ts","../../src/Namespace.ts","../../src/RemovalPolicy.ts","../../src/Resource.ts","../../src/State/ResourceState.ts","../../src/Output.ts","../../src/Input.ts","../../src/Diff.ts","../../src/Provider.ts","../../src/Plan.ts","../../src/Cli/Event.ts","../../src/Cli/Cli.ts","../../src/Cli/InkCLI.tsx"],"sourcesContent":[],"mappings":"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"}
+{"version":3,"file":"index.d.ts","names":[],"sources":["../../src/Util/data.ts","../../src/Http.ts","../../src/ExecutionContext.ts","../../src/Namespace.ts","../../src/RemovalPolicy.ts","../../src/Resource.ts","../../src/State/ResourceState.ts","../../src/Output.ts","../../src/Input.ts","../../src/Diff.ts","../../src/Provider.ts","../../src/Plan.ts","../../src/Cli/Event.ts","../../src/Cli/Cli.ts","../../src/Cli/InkCLI.tsx"],"sourcesContent":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "alchemy-effect",
-  "version": "0.8.0",
+  "version": "0.9.0",
   "homepage": "https://alchemy.run",
   "license": "Apache-2.0",
   "author": "Sam Goodwin <sam@alchemy.run>",
@@ -194,8 +194,9 @@
     "jszip": "^3.10.1",
     "rolldown": "1.0.0-rc.13",
     "solid-js": "latest",
+    "sonda": "^0.11.1",
     "web-tree-sitter": "0.25.10",
-    "workerd": "1.20260405.1",
+    "workerd": "1.20260412.1",
     "yaml": "^2.0.0"
   },
   "devDependencies": {

package/src/Apply.ts

@@ -411,6 +411,7 @@ const executeNode = (
               news: node.props,
               session: scopedSession,
               instanceId,
+              bindings: excludeDeletedBindings(node.bindings),
             })
             .pipe(provideLifecycleScope(fqn, instanceId));
           yield* commit<CreatingResourceState>({
@@ -656,6 +657,7 @@ const executeNode = (
               news: node.props,
               session: scopedSession,
               instanceId,
+              bindings: excludeDeletedBindings(node.bindings),
             })
             .pipe(provideLifecycleScope(fqn, instanceId));
           yield* commit<ReplacingResourceState>({

package/src/Artifacts.ts

@@ -1,3 +1,4 @@
+import * as Deferred from "effect/Deferred";
 import * as Effect from "effect/Effect";
 import * as Layer from "effect/Layer";
 import * as Option from "effect/Option";
@@ -134,14 +135,22 @@ export const ensureArtifactStore = <A, E, R>(
 
 export const cached =
   (id: string) =>
-  <A, Err = never, Req = never>(eff: Effect.Effect<A, Err, Req>) =>
+  <A, Err = never, Req = never>(
+    eff: Effect.Effect<A, Err, Req>,
+  ): Effect.Effect<A, Err, Req | Artifacts> =>
     Effect.gen(function* () {
       const artifacts = yield* Artifacts;
+      const deferred = yield* Deferred.make<A>();
       const cached = yield* artifacts.get<A>(id);
       if (cached) {
+        if (Effect.isEffect(cached)) {
+          return yield* cached;
+        }
         return cached;
       }
+      yield* artifacts.set(id, Deferred.await(deferred));
       const result = yield* eff;
+      yield* Deferred.succeed(deferred, result);
       yield* artifacts.set(id, result);
       return result;
     });

package/src/Binding.ts

@@ -147,8 +147,16 @@ export const Policy =
         Effect.map(
           ([resource, fn]) =>
             (...args: any[]) =>
-              fn(...args).pipe(
-                Namespace.push((resource as ResourceLike).LogicalId),
+              Effect.all(
+                args.map((arg) =>
+                  Effect.isEffect(arg) ? arg : Effect.succeed(arg),
+                ),
+              ).pipe(
+                Effect.flatMap((args) =>
+                  fn(...args).pipe(
+                    Namespace.push((resource as ResourceLike).LogicalId),
+                  ),
+                ),
               ),
         ),
       );

package/src/Cloudflare/Container.ts

@@ -412,6 +412,32 @@ export const bindContainer = Effect.fnUntraced(function* <Shape, Req = never>(
   });
 });
 
+export const resolveDurableObjectApplicationRecovery = ({
+  namespaceId,
+  expectedName,
+  existingName,
+}: {
+  namespaceId: string;
+  expectedName: string;
+  existingName: string | undefined;
+}) => {
+  if (!existingName) {
+    return {
+      canAdopt: false as const,
+      message: `Container application for Durable Object namespace "${namespaceId}" already exists but could not be found for adoption.`,
+    };
+  }
+  if (existingName !== expectedName) {
+    return {
+      canAdopt: false as const,
+      message: `Existing container application "${existingName}" is already attached to Durable Object namespace "${namespaceId}". Use that application name to adopt it.`,
+    };
+  }
+  return {
+    canAdopt: true as const,
+  };
+};
+
 /**
  * Runs the Container in a Durable Object and monitors it, providing a durable fetch and RPC interface to it.
  */
@@ -529,6 +555,37 @@ export interface Rollout {
   stepPercentage?: number;
 }
 
+const containerApplicationReadinessSchedule = Schedule.exponential(100).pipe(
+  Schedule.both(Schedule.recurs(20)),
+);
+
+const isContainerApplicationNotFound = (
+  error: unknown,
+): error is Containers.ContainerApplicationNotFound =>
+  typeof error === "object" &&
+  error !== null &&
+  "_tag" in error &&
+  error._tag === "ContainerApplicationNotFound";
+
+export const retryForContainerApplicationReadiness = <A, E, R>(
+  operation: string,
+  applicationId: string,
+  effect: Effect.Effect<A, E, R>,
+) =>
+  effect.pipe(
+    Effect.tapError((error) =>
+      isContainerApplicationNotFound(error)
+        ? Effect.logDebug(
+            `Cloudflare Container ${operation}: application ${applicationId} not found yet, retrying`,
+          )
+        : Effect.void,
+    ),
+    Effect.retry({
+      while: isContainerApplicationNotFound,
+      schedule: containerApplicationReadinessSchedule,
+    }),
+  );
+
 export const ContainerProvider = () =>
   Container.provider.effect(
     Effect.gen(function* () {
@@ -857,18 +914,22 @@ await Effect.runPromise(serverEffect).catch((err) => {
         const stepPercentage =
           strategy === "immediate" ? 100 : (rollout?.stepPercentage ?? 25);
 
-        yield* createContainerApplicationRollout({
-          accountId,
+        yield* retryForContainerApplicationReadiness(
+          "rollout",
           applicationId,
-          description:
-            strategy === "immediate"
-              ? "Immediate update"
-              : "Progressive update",
-          strategy: "rolling",
-          kind: rollout?.kind ?? "full_auto",
-          stepPercentage,
-          targetConfiguration: configuration,
-        });
+          createContainerApplicationRollout({
+            accountId,
+            applicationId,
+            description:
+              strategy === "immediate"
+                ? "Immediate update"
+                : "Progressive update",
+            strategy: "rolling",
+            kind: rollout?.kind ?? "full_auto",
+            stepPercentage,
+            targetConfiguration: configuration,
+          }),
+        );
       });
 
       const createApplication = Effect.fnUntraced(function* ({
@@ -958,22 +1019,25 @@ await Effect.runPromise(serverEffect).catch((err) => {
           durableObjects,
         }).pipe(
           Effect.catchTag("DurableObjectAlreadyHasApplication", () =>
-            adoptPolicy && durableObjects
+            durableObjects
               ? Effect.gen(function* () {
                   const existing = yield* findApplicationByNamespace(
                     durableObjects.namespaceId,
                   );
-                  if (!existing) {
+                  const recovery = resolveDurableObjectApplicationRecovery({
+                    namespaceId: durableObjects.namespaceId,
+                    expectedName: name,
+                    existingName: existing?.name,
+                  });
+                  if (!recovery.canAdopt) {
                     return yield* Effect.fail(
-                      new Error(
-                        `Container application for Durable Object namespace "${durableObjects.namespaceId}" already exists but could not be found for adoption.`,
-                      ),
+                      new Error(recovery.message),
                     );
                   }
-                  if (existing.name !== name) {
+                  if (!existing) {
                     return yield* Effect.fail(
                       new Error(
-                        `Existing container application "${existing.name}" is already attached to Durable Object namespace "${durableObjects.namespaceId}". Use that application name to adopt it.`,
+                        `Container application for Durable Object namespace "${durableObjects.namespaceId}" already exists but could not be found for adoption.`,
                       ),
                     );
                   }
@@ -986,7 +1050,7 @@ await Effect.runPromise(serverEffect).catch((err) => {
                 })
               : Effect.fail(
                   new Error(
-                    `Durable Object namespace "${durableObjects?.namespaceId ?? "unknown"}" already has a container application. Set AdoptPolicy to adopt it.`,
+                    "Durable Object namespace already has a container application. Set AdoptPolicy to adopt it.",
                   ),
                 ),
           ),
@@ -1032,16 +1096,20 @@ await Effect.runPromise(serverEffect).catch((err) => {
         yield* session.note(
           `Updating container application ${existing.applicationName}...`,
         );
-        const application = yield* updateContainerApplication({
-          accountId,
-          applicationId: existing.applicationId,
-          instances: news.instances ?? 1,
-          maxInstances: news.maxInstances ?? 1,
-          schedulingPolicy: news.schedulingPolicy ?? "default",
-          constraints: news.constraints ?? {},
-          affinities: news.affinities,
-          configuration,
-        });
+        const application = yield* retryForContainerApplicationReadiness(
+          "update",
+          existing.applicationId,
+          updateContainerApplication({
+            accountId,
+            applicationId: existing.applicationId,
+            instances: news.instances ?? 1,
+            maxInstances: news.maxInstances ?? 1,
+            schedulingPolicy: news.schedulingPolicy ?? "default",
+            constraints: news.constraints ?? {},
+            affinities: news.affinities,
+            configuration,
+          }),
+        );
         const updated = toAttributes(application);
         if (!deepEqual(existing.configuration, configuration)) {
           yield* Effect.logInfo(
@@ -1175,6 +1243,31 @@ await Effect.runPromise(serverEffect).catch((err) => {
             !adoptPolicy &&
             !deepEqual(output.durableObjects, durableObjects)
           ) {
+            if (durableObjects) {
+              const existing = yield* findApplicationByNamespace(
+                durableObjects.namespaceId,
+              );
+              const recovery = resolveDurableObjectApplicationRecovery({
+                namespaceId: durableObjects.namespaceId,
+                expectedName: name,
+                existingName: existing?.name,
+              });
+              if (recovery.canAdopt) {
+                if (!existing) {
+                  return yield* Effect.fail(
+                    new Error(
+                      `Container application for Durable Object namespace "${durableObjects.namespaceId}" already exists but could not be found for adoption.`,
+                    ),
+                  );
+                }
+                return yield* upsertApplication({
+                  id,
+                  news,
+                  existing: toAttributes(existing),
+                  session,
+                });
+              }
+            }
             yield* Effect.logInfo(
               `Cloudflare Container create: recreating pre-created application ${name} with durable object binding`,
             );
@@ -1259,6 +1352,24 @@ await Effect.runPromise(serverEffect).catch((err) => {
           );
         }),
         read: Effect.fnUntraced(function* ({ id, olds, output }) {
+          const readByName = (name: string) =>
+            Effect.gen(function* () {
+              yield* Effect.logInfo(
+                `Cloudflare Container read: looking up ${name}`,
+              );
+              const existing = yield* findApplicationByName(name);
+              if (!existing) {
+                yield* Effect.logInfo(
+                  `Cloudflare Container read: ${name} not found`,
+                );
+                return undefined;
+              }
+              return {
+                ...toAttributes(existing),
+                hash: output?.hash,
+              };
+            });
+
           if (output?.applicationId) {
             yield* Effect.logInfo(
               `Cloudflare Container read: checking ${output.applicationName}`,
@@ -1272,24 +1383,13 @@ await Effect.runPromise(serverEffect).catch((err) => {
                 hash: output.hash,
               })),
               Effect.catchTag("ContainerApplicationNotFound", () =>
-                Effect.succeed(undefined),
+                readByName(output.applicationName),
               ),
             );
           }
 
           const name = yield* createApplicationName(id, olds?.name);
-          yield* Effect.logInfo(
-            `Cloudflare Container read: looking up ${name}`,
-          );
-          const existing = yield* findApplicationByName(name);
-          if (!existing) {
-            yield* Effect.logInfo(
-              `Cloudflare Container read: ${name} not found`,
-            );
-          }
-          return existing
-            ? { ...toAttributes(existing), hash: output?.hash }
-            : undefined;
+          return yield* readByName(name);
         }),
         tail: ({ output }) =>
           telemetry.tailStream({