alchemy 2.0.0-beta.37 → 2.0.0-beta.39

package/src/Apply.ts

@@ -21,7 +21,13 @@ import { toFqn } from "./FQN.ts";
 import type { Input } from "./Input.ts";
 import { generateInstanceId, InstanceId } from "./InstanceId.ts";
 import * as Output from "./Output.ts";
-import { type Apply, type Delete, type Plan } from "./Plan.ts";
+import {
+  type Apply,
+  type Delete,
+  type Plan,
+  type ActionApply,
+  type ActionDelete,
+} from "./Plan.ts";
 import { findProviderByType } from "./Provider.ts";
 import type { ResourceBinding } from "./Resource.ts";
 import { Stack } from "./Stack.ts";
@@ -31,14 +37,19 @@ import {
   type CreatedResourceState,
   type CreatingResourceState,
   type DeletingResourceState,
+  type PersistedState,
+  type RanActionState,
   type ReplacedResourceState,
   type ReplacingResourceState,
   type ResourceState,
+  type RunningActionState,
+  type ActionState,
   type UpdatedResourceState,
   type UpdatingReourceState,
   State,
   StateStoreError,
 } from "./State/index.ts";
+import { hashInput } from "./Util/hash.ts";
 
 export type ApplyEffect<
   P extends Plan,
@@ -139,7 +150,7 @@ export const apply = <P extends Plan>(
       {
         id: string;
         type: string;
-        status: Extract<ApplyStatus, "created" | "updated">;
+        status: Extract<ApplyStatus, "created" | "updated" | "ran" | "skipped">;
       }
     >();
 
@@ -218,12 +229,12 @@ const executePlan = Effect.fnUntraced(function* (
     {
       id: string;
       type: string;
-      status: Extract<ApplyStatus, "created" | "updated">;
+      status: Extract<ApplyStatus, "created" | "updated" | "ran" | "skipped">;
     }
   >,
   session: PlanStatusSession,
   state: {
-    set: <V extends ResourceState>(req: {
+    set: <V extends PersistedState>(req: {
       stack: string;
       stage: string;
       fqn: string;
@@ -233,9 +244,29 @@ const executePlan = Effect.fnUntraced(function* (
   stackName: string,
   stage: string,
 ) {
+  // Resources and tasks share the same FQN namespace and DAG, so the
+  // scheduler tracks them together. Each entry gets a single Deferred that
+  // signals "my output is available in `tracker`."
+  const allNodes: Record<string, Apply | ActionApply> = {
+    ...plan.resources,
+    ...plan.actions,
+  };
+
   const ready = Object.fromEntries(
     yield* Effect.all(
-      Object.keys(plan.resources).map((fqn) =>
+      Object.keys(allNodes).map((fqn) =>
+        Effect.map(Deferred.make<void>(), (d) => [fqn, d] as const),
+      ),
+    ),
+  ) as Record<string, Deferred.Deferred<void>>;
+
+  // `readyStable` fires only when a node has reached its TERMINAL output —
+  // resources after `reconcile`, tasks after the body completes. Resource
+  // precreate stubs do NOT signal `readyStable`, so any consumer that
+  // requires stable inputs (e.g. Tasks) waits past the precreate phase.
+  const readyStable = Object.fromEntries(
+    yield* Effect.all(
+      Object.keys(allNodes).map((fqn) =>
         Effect.map(Deferred.make<void>(), (d) => [fqn, d] as const),
       ),
     ),
@@ -254,25 +285,50 @@ const executePlan = Effect.fnUntraced(function* (
       { concurrency: "unbounded" },
     );
 
+  const waitForStableDeps = (fqns: string[]) =>
+    Effect.all(
+      fqns
+        .filter((fqn) => fqn in readyStable)
+        .map((fqn) => Deferred.await(readyStable[fqn])),
+      { concurrency: "unbounded" },
+    );
+
   const failures: LifecycleFailure[] = [];
 
   yield* Effect.all(
-    Object.entries(plan.resources).map(([fqn, node]) =>
-      executeNode(
-        fqn,
-        node,
-        tracker,
-        ready,
-        terminalStatuses,
-        session,
-        state,
-        stackName,
-        stage,
-        getOutputs,
-        waitForDeps,
-        failures,
-        plan.cycleMembers.has(fqn),
-      ),
+    Object.entries(allNodes).map(([fqn, node]) =>
+      (node as ActionApply).kind === "action"
+        ? executeActionNode(
+            fqn,
+            node as ActionApply,
+            tracker,
+            ready,
+            readyStable,
+            terminalStatuses,
+            session,
+            state,
+            stackName,
+            stage,
+            getOutputs,
+            waitForStableDeps,
+            failures,
+          )
+        : executeNode(
+            fqn,
+            node as Apply,
+            tracker,
+            ready,
+            readyStable,
+            terminalStatuses as any,
+            session,
+            state,
+            stackName,
+            stage,
+            getOutputs,
+            waitForDeps,
+            failures,
+            plan.cycleMembers.has(fqn),
+          ),
     ),
     { concurrency: "unbounded" },
   );
@@ -297,6 +353,7 @@ const executeNode = (
   node: Apply,
   tracker: Record<string, ResourceTracker>,
   ready: Record<string, Deferred.Deferred<void>>,
+  readyStable: Record<string, Deferred.Deferred<void>>,
   terminalStatuses: Map<
     string,
     {
@@ -357,6 +414,10 @@ const executeNode = (
       });
 
     const signalReady = Deferred.succeed(ready[fqn], void 0);
+    // Signal only after reconcile completes — never during precreate. Tasks
+    // (and any other consumer that calls `waitForStableDeps`) block on this
+    // so they observe the resource's final attrs rather than a stub.
+    const signalReadyStable = Deferred.succeed(readyStable[fqn], void 0);
 
     const storeAndSignal = (t: ResourceTracker) =>
       Effect.gen(function* () {
@@ -367,6 +428,8 @@ const executeNode = (
     // ── noop ──
 
     if (node.action === "noop") {
+      // No work to do — the persisted attr is already stable.
+      yield* signalReadyStable;
       yield* storeAndSignal({
         output: node.state.attr,
         props: node.state.props,
@@ -570,6 +633,7 @@ const executeNode = (
           instanceId,
         };
         yield* signalReady;
+        yield* signalReadyStable;
 
         yield* markTerminal("created");
         return;
@@ -701,6 +765,7 @@ const executeNode = (
         // the deferred has already been resolved by the early `storeAndSignal`
         // above and `signalReady` is a no-op the second time.
         yield* signalReady;
+        yield* signalReadyStable;
 
         yield* markTerminal("updated");
         return;
@@ -718,6 +783,7 @@ const executeNode = (
             instanceId,
           };
           yield* signalReady;
+          yield* signalReadyStable;
           yield* markTerminal("created");
           return;
         }
@@ -864,6 +930,7 @@ const executeNode = (
           instanceId,
         };
         yield* signalReady;
+        yield* signalReadyStable;
 
         // Keep progress anchored to the live replacement while GC drains the
         // previous generation(s) in the background.
@@ -889,6 +956,10 @@ const executeNode = (
           cause,
         });
         yield* Deferred.failCause(ready[fqn], cause as Cause.Cause<never>);
+        yield* Deferred.failCause(
+          readyStable[fqn],
+          cause as Cause.Cause<never>,
+        );
         yield* session.emit({
           kind: "status-change",
           id: node.resource.LogicalId,
@@ -907,6 +978,168 @@ const executeNode = (
     }),
   ) as Effect.Effect<void, never, never>;
 
+// ── Task execution ─────────────────────────────────────────────────────────
+//
+// Tasks slot into the same scheduler as resources. They have no provider
+// lifecycle — just a single Effect that runs when inputs change (or when
+// `--force` is set). The output value is written to `tracker[fqn].output`
+// so downstream Output evaluation works identically to resource attrs.
+
+const executeActionNode = (
+  fqn: string,
+  node: ActionApply,
+  tracker: Record<string, ResourceTracker>,
+  ready: Record<string, Deferred.Deferred<void>>,
+  readyStable: Record<string, Deferred.Deferred<void>>,
+  terminalStatuses: Map<
+    string,
+    {
+      id: string;
+      type: string;
+      status: Extract<ApplyStatus, "created" | "updated" | "ran" | "skipped">;
+    }
+  >,
+  session: PlanStatusSession,
+  state: {
+    set: <V extends PersistedState>(req: {
+      stack: string;
+      stage: string;
+      fqn: string;
+      value: V;
+    }) => Effect.Effect<V, StateStoreError, never>;
+  },
+  stackName: string,
+  stage: string,
+  getOutputs: () => Record<string, any>,
+  waitForDeps: (fqns: string[]) => Effect.Effect<void[], never, never>,
+  failures: LifecycleFailure[],
+): Effect.Effect<void, never, any> =>
+  Effect.gen(function* () {
+    const task = node.def;
+    const logicalId = task.LogicalId;
+    const namespace = task.Namespace;
+
+    const commit = <S extends ActionState>(value: Omit<S, "namespace">) =>
+      state.set({
+        stack: stackName,
+        stage,
+        fqn,
+        value: { ...value, namespace } as S,
+      });
+
+    const report = (status: ApplyStatus) =>
+      session.emit({
+        kind: "status-change",
+        id: logicalId,
+        type: task.Type,
+        status,
+      });
+
+    const signalReady = Deferred.succeed(ready[fqn], void 0);
+    const signalReadyStable = Deferred.succeed(readyStable[fqn], void 0);
+
+    if (node.action === "noop") {
+      tracker[fqn] = {
+        output: node.state.output,
+        props: { __input: node.state.input },
+        bindings: [],
+        instanceId: fqn,
+      };
+      yield* signalReady;
+      yield* signalReadyStable;
+      terminalStatuses.set(fqn, {
+        id: logicalId,
+        type: task.Type,
+        status: "skipped",
+      });
+      return;
+    }
+
+    // ── run ──
+    // Wait for stable (post-reconcile) upstream attrs — not precreate stubs.
+    // This is `waitForStableDeps` at the call site, passed in as the
+    // `waitForDeps` parameter here.
+    yield* waitForDeps(
+      Object.keys(Output.resolveUpstream(node.input)).filter(
+        (f) => f in readyStable,
+      ),
+    );
+
+    const outputs = getOutputs();
+    const resolvedInput = (yield* Output.evaluate(node.input, outputs)) as any;
+    const inputHashValue = yield* hashInput(resolvedInput);
+
+    yield* commit<RunningActionState>({
+      kind: "action",
+      status: "running",
+      fqn,
+      logicalId,
+      actionType: task.Type,
+      inputHash: inputHashValue,
+      input: resolvedInput,
+      downstream: node.downstream,
+    });
+    yield* report("running");
+
+    const result = yield* task.Run(resolvedInput);
+
+    yield* commit<RanActionState>({
+      kind: "action",
+      status: "ran",
+      fqn,
+      logicalId,
+      actionType: task.Type,
+      inputHash: inputHashValue,
+      input: resolvedInput,
+      output: result,
+      downstream: node.downstream,
+    });
+
+    tracker[fqn] = {
+      output: result,
+      props: { __input: resolvedInput },
+      bindings: [],
+      instanceId: fqn,
+    };
+    yield* signalReady;
+    yield* signalReadyStable;
+    terminalStatuses.set(fqn, {
+      id: logicalId,
+      type: task.Type,
+      status: "ran",
+    });
+  }).pipe(
+    Effect.catchCause((cause) =>
+      Effect.gen(function* () {
+        failures.push({
+          fqn,
+          logicalId: node.def.LogicalId,
+          type: node.def.Type,
+          cause,
+        });
+        yield* Deferred.failCause(ready[fqn], cause as Cause.Cause<never>);
+        yield* Deferred.failCause(
+          readyStable[fqn],
+          cause as Cause.Cause<never>,
+        );
+        yield* session.emit({
+          kind: "status-change",
+          id: node.def.LogicalId,
+          type: node.def.Type,
+          status: "fail",
+        });
+      }),
+    ),
+    Effect.withSpan("apply.action", {
+      attributes: {
+        "alchemy.action.fqn": fqn,
+        "alchemy.action.type": node.def.Type,
+        "alchemy.action.logical_id": node.def.LogicalId,
+        "alchemy.action.verb": node.action,
+      },
+    }),
+  ) as Effect.Effect<void, never, any>;
+
 // ── Phase 3: imperative convergence loop ───────────────────────────────────
 //
 // After the initial concurrent pass, some resources may have been created
@@ -924,12 +1157,12 @@ const converge = Effect.fnUntraced(function* (
     {
       id: string;
       type: string;
-      status: Extract<ApplyStatus, "created" | "updated">;
+      status: Extract<ApplyStatus, "created" | "updated" | "ran" | "skipped">;
     }
   >,
   session: PlanStatusSession,
   state: {
-    set: <V extends ResourceState>(req: {
+    set: <V extends PersistedState>(req: {
       stack: string;
       stage: string;
       fqn: string;
@@ -1034,6 +1267,75 @@ const converge = Effect.fnUntraced(function* (
       });
     }
 
+    // Tasks: re-run when their resolved input drifts vs. the value they
+    // last applied with (e.g. an upstream resource produced new attrs in
+    // this pass). Skipped (noop) tasks are not re-checked here — their
+    // recorded inputHash is authoritative until the next plan.
+    for (const [fqn, node] of Object.entries(plan.actions)) {
+      if (node.action !== "run") continue;
+      if (!tracker[fqn]) continue;
+
+      const outputs = Object.fromEntries(
+        Object.entries(tracker).map(([k, t]) => [k, t.output]),
+      );
+      const newInput = (yield* Output.evaluate(node.input, outputs)) as any;
+      const newHash = yield* hashInput(newInput);
+      const oldInput = tracker[fqn].props?.__input;
+      const oldHash = yield* hashInput(oldInput);
+      if (newHash === oldHash) continue;
+
+      anyUpdated = true;
+
+      yield* state.set({
+        stack: stackName,
+        stage,
+        fqn,
+        value: {
+          kind: "action",
+          status: "running",
+          fqn,
+          logicalId: node.def.LogicalId,
+          namespace: node.def.Namespace,
+          actionType: node.def.Type,
+          inputHash: newHash,
+          input: newInput,
+          downstream: node.downstream,
+        } satisfies RunningActionState,
+      });
+
+      const result = yield* node.def.Run(newInput);
+
+      yield* state.set({
+        stack: stackName,
+        stage,
+        fqn,
+        value: {
+          kind: "action",
+          status: "ran",
+          fqn,
+          logicalId: node.def.LogicalId,
+          namespace: node.def.Namespace,
+          actionType: node.def.Type,
+          inputHash: newHash,
+          input: newInput,
+          output: result,
+          downstream: node.downstream,
+        } satisfies RanActionState,
+      });
+
+      tracker[fqn] = {
+        output: result,
+        props: { __input: newInput },
+        bindings: [],
+        instanceId: fqn,
+      };
+      terminalStatuses.set(fqn, {
+        id: node.def.LogicalId,
+        type: node.def.Type,
+        status: "ran",
+      });
+    }
+
     if (!anyUpdated) break;
   }
 });
@@ -1049,6 +1351,32 @@ const collectGarbage = Effect.fnUntraced(function* (
   const stackName = stack.name;
   const stage = yield* Stage;
 
+  // Task deletions are pure state drops — no body is invoked. Run them in
+  // parallel before resource GC; tasks never have provider-side dependencies
+  // to wait on.
+  yield* Effect.all(
+    Object.entries(plan.actionDeletions ?? {}).map(([fqn, node]) =>
+      node === undefined
+        ? Effect.void
+        : Effect.gen(function* () {
+            yield* session.emit({
+              kind: "status-change",
+              id: node.def.LogicalId,
+              type: node.def.Type,
+              status: "deleting",
+            });
+            yield* state.delete({ stack: stackName, stage, fqn });
+            yield* session.emit({
+              kind: "status-change",
+              id: node.def.LogicalId,
+              type: node.def.Type,
+              status: "deleted",
+            });
+          }),
+    ),
+    { concurrency: "unbounded" },
+  );
+
   const deleteGraph = Effect.fnUntraced(function* (
     deletionGraph: Record<string, Delete | ReplacedResourceState | undefined>,
   ) {

package/src/Artifacts.ts

@@ -78,7 +78,7 @@ const getOrCreateBag = (
 export const makeScopedArtifacts = (
   store: Map<string, ArtifactBag>,
   fqn: string,
-): typeof Artifacts.Service => {
+): Artifacts["Service"] => {
   const bag = getOrCreateBag(store, fqn);
   return {
     get: <T>(key: string) => Effect.sync(() => bag.get(key) as T | undefined),
@@ -98,9 +98,7 @@ export const scopedArtifacts = (
 ): Layer.Layer<Artifacts, never, ArtifactStore> =>
   Layer.effect(
     Artifacts,
-    ArtifactStore.asEffect().pipe(
-      Effect.map((store) => makeScopedArtifacts(store, fqn)),
-    ),
+    ArtifactStore.useSync((store) => makeScopedArtifacts(store, fqn)),
   );
 
 /**

package/src/Auth/AuthProvider.ts

@@ -220,7 +220,7 @@ export const getAuthProvider = <
 >(
   name: string,
 ): Effect.Effect<AuthProvider<Config, Credentials>, AuthError, AuthProviders> =>
-  Effect.flatMap(AuthProviders.asEffect(), (registry) =>
+  AuthProviders.use((registry) =>
     registry[name] == null
       ? Effect.fail(
           new AuthError({

package/src/Auth/Env.ts

@@ -4,32 +4,24 @@ import * as Clank from "../Util/Clank.ts";
 import { AuthError } from "./AuthProvider.ts";
 
 export const getEnv = (key: string) =>
-  Config.string(key)
-    .asEffect()
-    .pipe(Effect.orElseSucceed(() => undefined));
+  Config.string(key).pipe(Effect.orElseSucceed(() => undefined));
 
 export const getEnvRequired = (key: string) =>
-  Config.string(key)
-    .asEffect()
-    .pipe(
-      Effect.catch(() =>
-        Effect.fail(new AuthError({ message: `Missing required env: ${key}` })),
-      ),
-    );
+  Config.string(key).pipe(
+    Effect.catch(() =>
+      Effect.fail(new AuthError({ message: `Missing required env: ${key}` })),
+    ),
+  );
 
 export const getEnvRedacted = (key: string) =>
-  Config.redacted(key)
-    .asEffect()
-    .pipe(Effect.orElseSucceed(() => undefined));
+  Config.redacted(key).pipe(Effect.orElseSucceed(() => undefined));
 
 export const getEnvRedactedRequired = (key: string) =>
-  Config.redacted(key)
-    .asEffect()
-    .pipe(
-      Effect.catch(() =>
-        Effect.fail(new AuthError({ message: `Missing required env: ${key}` })),
-      ),
-    );
+  Config.redacted(key).pipe(
+    Effect.catch(() =>
+      Effect.fail(new AuthError({ message: `Missing required env: ${key}` })),
+    ),
+  );
 
 export const retryOnce = <A, R>(
   self: Effect.Effect<A, Clank.PromptCancelled, R>,

package/src/Binding.ts

@@ -141,7 +141,7 @@ export const Policy =
       Effect.flatMap((service) =>
         service
           ? Effect.succeed(service)
-          : Effect.all([CurrentStack, ALCHEMY_PHASE.asEffect()]).pipe(
+          : Effect.all([CurrentStack, ALCHEMY_PHASE]).pipe(
               Effect.flatMap(([stack, phase]) =>
                 stack && phase === "plan"
                   ? Effect.die(
@@ -154,7 +154,7 @@ export const Policy =
     );
 
     const asEffect = () =>
-      Effect.all([Self.asEffect(), Service]).pipe(
+      Effect.all([Self, Service]).pipe(
         Effect.map(
           ([resource, fn]) =>
             (...args: any[]) =>
@@ -174,7 +174,7 @@ export const Policy =
     // @ts-expect-error
     return Object.assign(self, {
       [Symbol.iterator]() {
-        return new SingleShotGen(this);
+        return new SingleShotGen(asEffect());
       },
       asEffect,
       bind: (...args: any[]) =>
@@ -190,9 +190,7 @@ export const Policy =
             self,
             // @ts-expect-error
             (...args: Parameters<Shape>) =>
-              Self.asEffect().pipe(
-                Effect.flatMap((self) => fn(self as ResourceLike, ...args)),
-              ),
+              Self.use((self) => fn(self as ResourceLike, ...args)),
           ),
         effect: (
           fn: Effect.Effect<
@@ -209,9 +207,7 @@ export const Policy =
               fn,
               (fn) =>
                 (...args: Parameters<Shape>) =>
-                  Effect.flatMap(Self.asEffect(), (self) =>
-                    fn(self as ResourceLike, ...args),
-                  ),
+                  Self.use((self) => fn(self as ResourceLike, ...args)),
             ),
           ),
       },

package/src/Bundle/Docker.ts

@@ -3,7 +3,7 @@ import * as Effect from "effect/Effect";
 import * as FileSystem from "effect/FileSystem";
 import * as Path from "effect/Path";
 import { ChildProcess } from "effect/unstable/process";
-import { exec } from "../Agent/util/exec.ts";
+import { exec } from "../Util/exec.ts";
 
 export class DockerCommandError extends Data.TaggedError("DockerCommandError")<{
   readonly command: string;

package/src/Cli/Event.ts

@@ -12,6 +12,10 @@ export type ApplyStatus =
   | "deleted"
   | "replacing"
   | "replaced"
+  // Task lifecycle (see {@link Task})
+  | "running"
+  | "ran"
+  | "skipped"
   | "fail";
 
 export type ApplyEvent = AnnotateEvent | StatusChangeEvent;