alchemy 2.0.0-beta.84 → 2.0.0-beta.85

package/lib/Deploy.js

@@ -1,15 +1,20 @@
 import * as Effect from "effect/Effect";
 import { AlchemyContext } from "./AlchemyContext.js";
 import * as Apply from "./Apply.js";
+import { evalStack } from "./EvalStack.js";
 import * as Plan from "./Plan.js";
-import { evalStack } from "./Stack.js";
+import { renderApply } from "./Report.js";
 import { Stage } from "./Stage.js";
 export function deploy(options) {
     return deployStack(options);
 }
+/**
+ * Apply `plan`, drawing its progress through the ambient `Cli` when there
+ * is one. The engine only emits events; this is where they are rendered.
+ */
+export const applyAndRender = (plan) => Apply.apply(plan).pipe(renderApply(plan));
 const deployStack = ({ stack, stage, dev, scope, force, include, exclude, }) => evalStack(stack, (stack) => Effect.gen(function* () {
     const plan = yield* Plan.make(stack, { force, include, exclude });
-    const output = yield* Apply.apply(plan);
-    return output;
+    return yield* applyAndRender(plan);
 }), { stage, dev, scope });
 //# sourceMappingURL=Deploy.js.map

package/lib/Deploy.js.map

@@ -1 +1 @@
-{"version":3,"file":"Deploy.js","sourceRoot":"","sources":["../src/Deploy.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AAExC,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AACrD,OAAO,KAAK,KAAK,MAAM,YAAY,CAAC;AAEpC,OAAO,KAAK,IAAI,MAAM,WAAW,CAAC;AAElC,OAAO,EAAE,SAAS,EAAwC,MAAM,YAAY,CAAC;AAC7E,OAAO,EAAE,KAAK,EAAE,MAAM,YAAY,CAAC;AA2BnC,MAAM,UAAU,MAAM,CAAI,OAAiC;IACzD,OAAO,WAAW,CAAC,OAAO,CAAC,CAAC;AAC9B,CAAC;AAED,MAAM,WAAW,GAAG,CAAI,EACtB,KAAK,EACL,KAAK,EACL,GAAG,EACH,KAAK,EACL,KAAK,EACL,OAAO,EACP,OAAO,GACkB,EAAE,EAAE,CAC7B,SAAS,CACP,KAAK,EACL,CAAC,KAAK,EAAE,EAAE,CACR,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;IAClB,MAAM,IAAI,GAAG,KAAK,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE,EAAE,KAAK,EAAE,OAAO,EAAE,OAAO,EAAE,CAAC,CAAC;IAClE,MAAM,MAAM,GAAG,KAAK,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IACxC,OAAO,MAAM,CAAC;AAChB,CAAC,CAAC,EACJ,EAAE,KAAK,EAAE,GAAG,EAAE,KAAK,EAAE,CACtB,CAAC"}
+{"version":3,"file":"Deploy.js","sourceRoot":"","sources":["../src/Deploy.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AAExC,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AACrD,OAAO,KAAK,KAAK,MAAM,YAAY,CAAC;AACpC,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAE3C,OAAO,KAAK,IAAI,MAAM,WAAW,CAAC;AAClC,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAG1C,OAAO,EAAE,KAAK,EAAE,MAAM,YAAY,CAAC;AA2BnC,MAAM,UAAU,MAAM,CAAI,OAAiC;IACzD,OAAO,WAAW,CAAC,OAAO,CAAC,CAAC;AAC9B,CAAC;AAED;;;GAGG;AACH,MAAM,CAAC,MAAM,cAAc,GAAG,CAAsB,IAAO,EAAE,EAAE,CAC7D,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC;AAE5C,MAAM,WAAW,GAAG,CAAI,EACtB,KAAK,EACL,KAAK,EACL,GAAG,EACH,KAAK,EACL,KAAK,EACL,OAAO,EACP,OAAO,GACkB,EAAE,EAAE,CAC7B,SAAS,CACP,KAAK,EACL,CAAC,KAAK,EAAE,EAAE,CACR,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;IAClB,MAAM,IAAI,GAAG,KAAK,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE,EAAE,KAAK,EAAE,OAAO,EAAE,OAAO,EAAE,CAAC,CAAC;IAClE,OAAO,KAAK,CAAC,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC;AACrC,CAAC,CAAC,EACJ,EAAE,KAAK,EAAE,GAAG,EAAE,KAAK,EAAE,CACtB,CAAC"}

package/lib/Destroy.d.ts

@@ -1,12 +1,9 @@
 import { Effect } from "effect";
-import type { ConfigError } from "effect/Config";
 import type * as Scope from "effect/Scope";
-import type { AlchemyContext } from "./AlchemyContext.ts";
-import * as Apply from "./Apply.ts";
-import type { CompiledStack, StackEffect } from "./Stack.ts";
-import type { Stage } from "./Stage.ts";
-export declare const destroy: ({ stack, stage, dev, scope, include, exclude, }: {
-    stack: StackEffect<CompiledStack, ConfigError, Stage | AlchemyContext>;
+import type { StackDefinition } from "./Stack.ts";
+export declare const destroy: <ROut>({ stack, stage, dev, scope, include, exclude, }: {
+    /** The stack to tear down; its program is never run. */
+    stack: StackDefinition<ROut>;
     stage: string;
     dev?: boolean;
     /** See {@link evalStack} — when set, scoped resources outlive `destroy`. */
@@ -14,5 +11,5 @@ export declare const destroy: ({ stack, stage, dev, scope, include, exclude, }:
     /** Destroy always operates on the full stack. */
     include?: never;
     exclude?: never;
-}) => Effect.Effect<undefined, import("./Auth/AuthProvider.ts").AuthError | ConfigError | import("./Auth/Demand.ts").CredentialsRequired | Apply.DestroyError | import("./Output.ts").InvalidReferenceError | import("./Output.ts").MissingSourceError | import("./Auth/AuthProvider.ts").NeedsReauth | import("effect/PlatformError").PlatformError | import("./State/State.ts").StateStoreError, AlchemyContext | import("./Artifacts.ts").ArtifactStore | import("effect/FileSystem").FileSystem | import("./Interaction.ts").Interaction | import("effect/Path").Path | import("./State/State.ts").State>;
+}) => Effect.Effect<undefined, import("./Auth/AuthProvider.ts").AuthError | import("effect/Config").ConfigError | import("./Auth/Demand.ts").CredentialsRequired | import("./Apply.ts").DestroyError | import("./Output.ts").InvalidReferenceError | import("./Output.ts").MissingSourceError | import("./Auth/AuthProvider.ts").NeedsReauth | import("effect/PlatformError").PlatformError | import("./State/State.ts").StateStoreError, import("./Artifacts.ts").ArtifactStore | import("./index.ts").AuthProviders | import("./Interaction.ts").Interaction | import("./State/State.ts").State>;
 //# sourceMappingURL=Destroy.d.ts.map

package/lib/Destroy.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Destroy.d.ts","sourceRoot":"","sources":["../src/Destroy.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAChC,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AACjD,OAAO,KAAK,KAAK,KAAK,MAAM,cAAc,CAAC;AAC3C,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAC1D,OAAO,KAAK,KAAK,MAAM,YAAY,CAAC;AAEpC,OAAO,KAAK,EAAE,aAAa,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAE7D,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,YAAY,CAAC;AAExC,eAAO,MAAM,OAAO,oDAOjB;IACD,KAAK,EAAE,WAAW,CAAC,aAAa,EAAE,WAAW,EAAE,KAAK,GAAG,cAAc,CAAC,CAAC;IACvE,KAAK,EAAE,MAAM,CAAC;IACd,GAAG,CAAC,EAAE,OAAO,CAAC;IACd,4EAA4E;IAC5E,KAAK,CAAC,EAAE,KAAK,CAAC,KAAK,CAAC;IACpB,iDAAiD;IACjD,OAAO,CAAC,EAAE,KAAK,CAAC;IAChB,OAAO,CAAC,EAAE,KAAK,CAAC;CACjB,4kBASO,CAAC"}
+{"version":3,"file":"Destroy.d.ts","sourceRoot":"","sources":["../src/Destroy.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAEhC,OAAO,KAAK,KAAK,KAAK,MAAM,cAAc,CAAC;AAI3C,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAGlD,eAAO,MAAM,OAAO,GAAI,IAAI,mDAOzB;IACD,wDAAwD;IACxD,KAAK,EAAE,eAAe,CAAC,IAAI,CAAC,CAAC;IAC7B,KAAK,EAAE,MAAM,CAAC;IACd,GAAG,CAAC,EAAE,OAAO,CAAC;IACd,4EAA4E;IAC5E,KAAK,CAAC,EAAE,KAAK,CAAC,KAAK,CAAC;IACpB,iDAAiD;IACjD,OAAO,CAAC,EAAE,KAAK,CAAC;IAChB,OAAO,CAAC,EAAE,KAAK,CAAC;CACjB,ikBAeM,CAAC"}

package/lib/Destroy.js

@@ -1,12 +1,15 @@
 import { Effect } from "effect";
-import * as Apply from "./Apply.js";
+import * as Context from "effect/Context";
+import { applyAndRender } from "./Deploy.js";
+import { evalStack } from "./EvalStack.js";
 import * as Plan from "./Plan.js";
-import { evalStack } from "./Stack.js";
+import { build, Stack } from "./Stack.js";
 export const destroy = ({ stack, stage, dev, scope, include, exclude, }) => include !== undefined || exclude !== undefined
     ? Effect.die(new Plan.InvalidResourceSelection({ message: "Filtered destroy is not supported." }))
-    : evalStack(stack, (stack) => Plan.destroy(stack).pipe(Effect.flatMap(Apply.apply)), {
-        stage,
-        dev,
-        scope,
-    });
+    : evalStack(build({
+        name: stack.stackName,
+        providers: stack.providers,
+        state: stack.state,
+        secrets: stack.secrets,
+    }).pipe(Effect.map((services) => ({ services }))), ({ services }) => Plan.destroy(Context.get(services, Stack)).pipe(Effect.flatMap(applyAndRender)), { stage, dev, scope });
 //# sourceMappingURL=Destroy.js.map

package/lib/Destroy.js.map

@@ -1 +1 @@
-{"version":3,"file":"Destroy.js","sourceRoot":"","sources":["../src/Destroy.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAIhC,OAAO,KAAK,KAAK,MAAM,YAAY,CAAC;AACpC,OAAO,KAAK,IAAI,MAAM,WAAW,CAAC;AAElC,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAGvC,MAAM,CAAC,MAAM,OAAO,GAAG,CAAC,EACtB,KAAK,EACL,KAAK,EACL,GAAG,EACH,KAAK,EACL,OAAO,EACP,OAAO,GAUR,EAAE,EAAE,CACH,OAAO,KAAK,SAAS,IAAI,OAAO,KAAK,SAAS;IAC5C,CAAC,CAAC,MAAM,CAAC,GAAG,CACR,IAAI,IAAI,CAAC,wBAAwB,CAAC,EAAE,OAAO,EAAE,oCAAoC,EAAE,CAAC,CACrF;IACH,CAAC,CAAC,SAAS,CAAC,KAAK,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,EAAE;QACjF,KAAK;QACL,GAAG;QACH,KAAK;KACN,CAAC,CAAC"}
+{"version":3,"file":"Destroy.js","sourceRoot":"","sources":["../src/Destroy.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAChC,OAAO,KAAK,OAAO,MAAM,gBAAgB,CAAC;AAE1C,OAAO,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAC7C,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAC3C,OAAO,KAAK,IAAI,MAAM,WAAW,CAAC;AAElC,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,YAAY,CAAC;AAE1C,MAAM,CAAC,MAAM,OAAO,GAAG,CAAO,EAC5B,KAAK,EACL,KAAK,EACL,GAAG,EACH,KAAK,EACL,OAAO,EACP,OAAO,GAWR,EAAE,EAAE,CACH,OAAO,KAAK,SAAS,IAAI,OAAO,KAAK,SAAS;IAC5C,CAAC,CAAC,MAAM,CAAC,GAAG,CACR,IAAI,IAAI,CAAC,wBAAwB,CAAC,EAAE,OAAO,EAAE,oCAAoC,EAAE,CAAC,CACrF;IACH,CAAC,CAAC,SAAS,CACP,KAAK,CAAC;QACJ,IAAI,EAAE,KAAK,CAAC,SAAS;QACrB,SAAS,EAAE,KAAK,CAAC,SAAS;QAC1B,KAAK,EAAE,KAAK,CAAC,KAAK;QAClB,OAAO,EAAE,KAAK,CAAC,OAAO;KACvB,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC,EAAE,QAAQ,EAAE,CAAC,CAAC,CAAC,EACjD,CAAC,EAAE,QAAQ,EAAE,EAAE,EAAE,CACf,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC,EACjF,EAAE,KAAK,EAAE,GAAG,EAAE,KAAK,EAAE,CACtB,CAAC"}

package/lib/Diff.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Diff.d.ts","sourceRoot":"","sources":["../src/Diff.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,YAAY,CAAC;AAExC,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,WAAW,CAAC;AAC7C,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,eAAe,CAAC;AAGrD,MAAM,MAAM,IAAI,GAAG,QAAQ,GAAG,UAAU,GAAG,WAAW,CAAC;AAEvD,MAAM,WAAW,QAAQ;IACvB,MAAM,EAAE,MAAM,CAAC;IACf;;;;;;;OAOG;IACH,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;CACpB;AAED,MAAM,WAAW,UAAU;IACzB,MAAM,EAAE,QAAQ,CAAC;IACjB,0DAA0D;IAC1D,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;CACpB;AAED,MAAM,WAAW,WAAW;IAC1B,MAAM,EAAE,SAAS,CAAC;IAClB,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,OAAO,CAAC,EAAE,SAAS,CAAC;CACrB;AAED;;;;;;;;;;;GAWG;AACH,eAAO,MAAM,mBAAmB,GAAI,CAAC,SAAS,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,KAAG,KAAK,IAAI,CACpD,CAAC;AAExB,eAAO,MAAM,UAAU,GAAI,CAAC,SAAS,KAAK,CAAC,CAAC,CAAC,KAAG,KAAK,IAAI,CAA2B,CAAC;AAerF;;;;;;;;;;;;;;GAcG;AACH,eAAO,MAAM,eAAe,GAAI,CAAC,SAAS,CAAC,KAAG,CAAiC,CAAC;AA2BhF;;;;;;;;;;;GAWG;AACH,eAAO,MAAM,YAAY,GAAI,CAAC,SAAS,CAAC,KAAG,CAA8B,CAAC;AAyB1E,eAAO,MAAM,qBAAqB,GAAI,KAAK,SAAS,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,QAC/D,KAAK,QACL,KAAK,SACJ,CAAC,MAAM,KAAK,CAAC,EAAE,YAQvB,CAAC;AAEF,eAAO,MAAM,oBAAoB,GAAI,KAAK,SAAS,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,QAC9D,KAAK,QACL,KAAK,YAaZ,CAAC;AAEF,eAAO,MAAM,gBAAgB,GAAI,KAAK,SAAS,MAAM,YACzC,KAAK,GAAG,SAAS,YACjB,KAAK,YAauD,CAAC;AAEzE,MAAM,MAAM,gBAAgB,GAAG;IAC7B;;;;;;;OAOG;IACH,YAAY,CAAC,EAAE,OAAO,CAAC;CACxB,CAAC;AAEF;;;;;;GAMG;AACH,eAAO,MAAM,SAAS,MAAO,OAAO,KAAK,OAAO,YAAY,gBAAgB,KAAG,OAEd,CAAC;AAwDlE,eAAO,MAAM,YAAY,GAAI,CAAC,SAAS;IAAE,GAAG,EAAE,MAAM,CAAA;CAAE,YAAY,CAAC,EAAE,KAAG,CAAC,EAC9C,CAAC;AAE5B;;;;;;;;;;GAUG;AACH,eAAO,MAAM,cAAc,GAAI,CAAC,SAAS,eAAe,YAAY,CAAC,EAAE,KAAG,CAAC,EACE,CAAC;AAE9E,eAAO,MAAM,YAAY,gBACV,eAAe,EAAE,eACjB,eAAe,EAAE,KAC7B,WAAW,EAwBb,CAAC"}
+{"version":3,"file":"Diff.d.ts","sourceRoot":"","sources":["../src/Diff.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,YAAY,CAAC;AAExC,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,WAAW,CAAC;AAC7C,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,eAAe,CAAC;AAIrD,MAAM,MAAM,IAAI,GAAG,QAAQ,GAAG,UAAU,GAAG,WAAW,CAAC;AAEvD,MAAM,WAAW,QAAQ;IACvB,MAAM,EAAE,MAAM,CAAC;IACf;;;;;;;OAOG;IACH,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;CACpB;AAED,MAAM,WAAW,UAAU;IACzB,MAAM,EAAE,QAAQ,CAAC;IACjB,0DAA0D;IAC1D,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;CACpB;AAED,MAAM,WAAW,WAAW;IAC1B,MAAM,EAAE,SAAS,CAAC;IAClB,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,OAAO,CAAC,EAAE,SAAS,CAAC;CACrB;AAED;;;;;;;;;;;GAWG;AACH,eAAO,MAAM,mBAAmB,GAAI,CAAC,SAAS,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,KAAG,KAAK,IAAI,CACpD,CAAC;AAExB,eAAO,MAAM,UAAU,GAAI,CAAC,SAAS,KAAK,CAAC,CAAC,CAAC,KAAG,KAAK,IAAI,CAA2B,CAAC;AAerF;;;;;;;;;;;;;;GAcG;AACH,eAAO,MAAM,eAAe,GAAI,CAAC,SAAS,CAAC,KAAG,CAAiC,CAAC;AAgChF;;;;;;;;;;;GAWG;AACH,eAAO,MAAM,YAAY,GAAI,CAAC,SAAS,CAAC,KAAG,CAA8B,CAAC;AA8B1E,eAAO,MAAM,qBAAqB,GAAI,KAAK,SAAS,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,QAC/D,KAAK,QACL,KAAK,SACJ,CAAC,MAAM,KAAK,CAAC,EAAE,YAQvB,CAAC;AAEF,eAAO,MAAM,oBAAoB,GAAI,KAAK,SAAS,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,QAC9D,KAAK,QACL,KAAK,YAaZ,CAAC;AAEF,eAAO,MAAM,gBAAgB,GAAI,KAAK,SAAS,MAAM,YACzC,KAAK,GAAG,SAAS,YACjB,KAAK,YAauD,CAAC;AAEzE,MAAM,MAAM,gBAAgB,GAAG;IAC7B;;;;;;;OAOG;IACH,YAAY,CAAC,EAAE,OAAO,CAAC;CACxB,CAAC;AAEF;;;;;;GAMG;AACH,eAAO,MAAM,SAAS,MAAO,OAAO,KAAK,OAAO,YAAY,gBAAgB,KAAG,OAEd,CAAC;AA0DlE,eAAO,MAAM,YAAY,GAAI,CAAC,SAAS;IAAE,GAAG,EAAE,MAAM,CAAA;CAAE,YAAY,CAAC,EAAE,KAAG,CAAC,EAC9C,CAAC;AAE5B;;;;;;;;;;GAUG;AACH,eAAO,MAAM,cAAc,GAAI,CAAC,SAAS,eAAe,YAAY,CAAC,EAAE,KAAG,CAAC,EACE,CAAC;AAE9E,eAAO,MAAM,YAAY,gBACV,eAAe,EAAE,eACjB,eAAe,EAAE,KAC7B,WAAW,EAwBb,CAAC"}

package/lib/Diff.js

@@ -2,6 +2,7 @@ import * as Duration from "effect/Duration";
 import * as Effect from "effect/Effect";
 import * as Redacted from "effect/Redacted";
 import * as Output from "./Output.js";
+import { bytesToBase64 } from "./Util/base64.js";
 import { isPlainData, isPrimitive, mapPlainData } from "./Util/data.js";
 /**
  * Returns true when `value` (or any nested leaf) is still an unresolved
@@ -59,9 +60,12 @@ ancestors = new WeakSet()) => {
     if (Output.isExpr(value) || Effect.isEffect(value))
         return undefined;
     // Serializable leaves — the only class instances persisted state may
-    // carry (StateEncoding knows Redacted/Duration; Date JSON-encodes).
-    // Rebuilding them structurally would strip their prototype.
-    if (Redacted.isRedacted(value) || Duration.isDuration(value) || value instanceof Date) {
+    // carry (StateEncoding knows Redacted/Duration/Date/bytes). Rebuilding
+    // them structurally would strip their prototype.
+    if (Redacted.isRedacted(value) ||
+        Duration.isDuration(value) ||
+        value instanceof Date ||
+        value instanceof Uint8Array) {
         return value;
     }
     if (isPlainData(value)) {
@@ -97,7 +101,10 @@ ancestors = new WeakSet()) => {
         return value;
     if (Effect.isEffect(value))
         return undefined;
-    if (Redacted.isRedacted(value) || Duration.isDuration(value) || value instanceof Date) {
+    if (Redacted.isRedacted(value) ||
+        Duration.isDuration(value) ||
+        value instanceof Date ||
+        value instanceof Uint8Array) {
         return value;
     }
     if (isPlainData(value)) {
@@ -165,6 +172,9 @@ ancestors = new WeakSet()) => {
     // toJSON).
     if (Duration.isDuration(value) || value instanceof Date)
         return value;
+    // Bytes compare by content.
+    if (value instanceof Uint8Array)
+        return { __bytes__: bytesToBase64(value) };
     if (isPlainData(value)) {
         const rebuilt = mapPlainData(value, ancestors, (child) => canonicalize(child, stripNullish, ancestors));
         if (rebuilt === undefined || Array.isArray(rebuilt))

package/lib/Diff.js.map

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

package/lib/Drift.d.ts

@@ -2,7 +2,6 @@
 import * as Cause from "effect/Cause";
 import * as Effect from "effect/Effect";
 import type { Plan } from "./Plan.ts";
-import { type PlanStatusSession } from "./Report.ts";
 import { State } from "./State/index.ts";
 import { type ResourceOp } from "./Telemetry/Metrics.ts";
 /**
@@ -39,10 +38,6 @@ export interface DriftResourceResult {
 export interface DriftResult {
     resources: Record<string, DriftResourceResult>;
 }
-export interface DriftOptions {
-    /** Optional progress session (the CLI passes one; tests usually don't). */
-    session?: PlanStatusSession;
-}
 declare const DriftResourceError_base: new <A extends Record<string, any> = {}>(args: import("effect/Types").VoidIfEmpty<{ readonly [P in keyof A as P extends "_tag" ? never : P]: A[P]; }>) => Cause.YieldableError & {
     readonly _tag: "DriftResourceError";
 } & Readonly<A>;
@@ -61,11 +56,16 @@ export declare const detect: (stack: {
     name: string;
     stage: string;
 }) => Effect.Effect<DriftResult, any, State>;
-/** Reconcile resources back to their last-deployed desired state. */
+/**
+ * Reconcile resources back to their last-deployed desired state. With
+ * `only`, just those resources are re-checked and repaired.
+ */
 export declare const repair: (stack: {
     name: string;
     stage: string;
-}, options?: DriftOptions) => Effect.Effect<DriftResult, any, State>;
+}, options?: {
+    readonly only?: ReadonlyArray<string>;
+}) => Effect.Effect<DriftResult, any, State>;
 export interface DriftPlan {
     /** Per-resource detection outcome (a dry-run {@link DriftResult}). */
     result: DriftResult;

package/lib/Drift.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Drift.d.ts","sourceRoot":"","sources":["../src/Drift.ts"],"names":[],"mappings":"AAAA,uDAAuD;AACvD,OAAO,KAAK,KAAK,MAAM,cAAc,CAAC;AAEtC,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AAaxC,OAAO,KAAK,EAAS,IAAI,EAAE,MAAM,WAAW,CAAC;AAG7C,OAAO,EAGL,KAAK,iBAAiB,EAEvB,MAAM,aAAa,CAAC;AAGrB,OAAO,EAEL,KAAK,EAIN,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,KAAK,UAAU,EAAoB,MAAM,wBAAwB,CAAC;AAE3E;;;;;;;;;;;;;;;GAeG;AACH,MAAM,MAAM,WAAW,GACnB,WAAW,GACX,SAAS,GACT,SAAS,GACT,UAAU,GACV,WAAW,GACX,SAAS,CAAC;AAEd,MAAM,WAAW,mBAAmB;IAClC,GAAG,EAAE,MAAM,CAAC;IACZ,SAAS,EAAE,MAAM,CAAC;IAClB,YAAY,EAAE,MAAM,CAAC;IACrB,MAAM,EAAE,WAAW,CAAC;IACpB,2EAA2E;IAC3E,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB;;;;OAIG;IACH,IAAI,CAAC,EAAE,GAAG,CAAC;CACZ;AAED,MAAM,WAAW,WAAW;IAC1B,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,mBAAmB,CAAC,CAAC;CAChD;AAED,MAAM,WAAW,YAAY;IAC3B,2EAA2E;IAC3E,OAAO,CAAC,EAAE,iBAAiB,CAAC;CAC7B;;;;AAED,8EAA8E;AAC9E,qBAAa,kBAAmB,SAAQ,wBAAuC;IAC7E,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC;IACrB,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAC;IAC9B,QAAQ,CAAC,SAAS,EAAE,UAAU,CAAC;IAC/B,QAAQ,CAAC,KAAK,EAAE,OAAO,CAAC;CACzB,CAAC;CAAG;AA6TL,oEAAoE;AACpE,eAAO,MAAM,MAAM,UAAW;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,2CAAsC,CAAC;AAEpG,qEAAqE;AACrE,eAAO,MAAM,MAAM,UAAW;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,YAAW,YAAY,2CACpC,CAAC;AAgDjD,MAAM,WAAW,SAAS;IACxB,sEAAsE;IACtE,MAAM,EAAE,WAAW,CAAC;IACpB;;;;;OAKG;IACH,IAAI,EAAE,IAAI,CAAC;CACZ;AAED;;;;;GAKG;AACH,eAAO,MAAM,IAAI,UAAW;IAC1B,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;CACf,KAAG,MAAM,CAAC,MAAM,CAAC,SAAS,EAAE,GAAG,EAAE,KAAK,CAqFpC,CAAC"}
+{"version":3,"file":"Drift.d.ts","sourceRoot":"","sources":["../src/Drift.ts"],"names":[],"mappings":"AAAA,uDAAuD;AACvD,OAAO,KAAK,KAAK,MAAM,cAAc,CAAC;AAGtC,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AAcxC,OAAO,KAAK,EAAS,IAAI,EAAE,MAAM,WAAW,CAAC;AAM7C,OAAO,EAEL,KAAK,EAIN,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,KAAK,UAAU,EAAoB,MAAM,wBAAwB,CAAC;AAG3E;;;;;;;;;;;;;;;GAeG;AACH,MAAM,MAAM,WAAW,GACnB,WAAW,GACX,SAAS,GACT,SAAS,GACT,UAAU,GACV,WAAW,GACX,SAAS,CAAC;AAEd,MAAM,WAAW,mBAAmB;IAClC,GAAG,EAAE,MAAM,CAAC;IACZ,SAAS,EAAE,MAAM,CAAC;IAClB,YAAY,EAAE,MAAM,CAAC;IACrB,MAAM,EAAE,WAAW,CAAC;IACpB,2EAA2E;IAC3E,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB;;;;OAIG;IACH,IAAI,CAAC,EAAE,GAAG,CAAC;CACZ;AAED,MAAM,WAAW,WAAW;IAC1B,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,mBAAmB,CAAC,CAAC;CAChD;;;;AAED,8EAA8E;AAC9E,qBAAa,kBAAmB,SAAQ,wBAAuC;IAC7E,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC;IACrB,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAC;IAC9B,QAAQ,CAAC,SAAS,EAAE,UAAU,CAAC;IAC/B,QAAQ,CAAC,KAAK,EAAE,OAAO,CAAC;CACzB,CAAC;CAAG;AAgcL,oEAAoE;AACpE,eAAO,MAAM,MAAM,UAAW;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,2CAAsC,CAAC;AAEpG;;;GAGG;AACH,eAAO,MAAM,MAAM,UACV;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,YAC7B;IAAE,QAAQ,CAAC,IAAI,CAAC,EAAE,aAAa,CAAC,MAAM,CAAC,CAAA;CAAE,2CACO,CAAC;AAgD5D,MAAM,WAAW,SAAS;IACxB,sEAAsE;IACtE,MAAM,EAAE,WAAW,CAAC;IACpB;;;;;OAKG;IACH,IAAI,EAAE,IAAI,CAAC;CACZ;AAED;;;;;GAKG;AACH,eAAO,MAAM,IAAI,UAAW;IAC1B,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;CACf,KAAG,MAAM,CAAC,MAAM,CAAC,SAAS,EAAE,GAAG,EAAE,KAAK,CAqFpC,CAAC"}

package/lib/Drift.js

@@ -1,6 +1,7 @@
 /** @effect-diagnostics anyUnknownInErrorContext:off */
 import * as Cause from "effect/Cause";
 import * as Data from "effect/Data";
+import * as Deferred from "effect/Deferred";
 import * as Effect from "effect/Effect";
 import * as Layer from "effect/Layer";
 import * as Option from "effect/Option";
@@ -8,12 +9,14 @@ import * as Ref from "effect/Ref";
 import { stripUnowned } from "./AdoptPolicy.js";
 import { Artifacts, ArtifactStore, createArtifactStore, ensureArtifactStore, makeScopedArtifacts, } from "./Artifacts.js";
 import { deepEqual } from "./Diff.js";
+import { captureEmit, emit } from "./Events.js";
 import { findProviderByType, Provider } from "./Provider.js";
 import { stampedMode } from "./ProviderMode.js";
-import { noopSession, Progress, } from "./Report.js";
+import { resourceSession } from "./Report.js";
 import { ResourceContext } from "./ResourceContext.js";
 import { isActionState, State, } from "./State/index.js";
 import { recordResourceOp } from "./Telemetry/Metrics.js";
+import { findCycleMembers } from "./Util/scc.js";
 /** A provider lifecycle failure annotated with the resource being checked. */
 export class DriftResourceError extends Data.TaggedError("DriftResourceError") {
 }
@@ -39,11 +42,14 @@ export class DriftResourceError extends Data.TaggedError("DriftResourceError") {
  *    deterministic physical names regenerate identically.
  * 4. **Persist** — write the fresh attributes back to the state store.
  *
- * Resources are checked concurrently and independently — persisted props are
- * fully resolved values, so there are no upstream/downstream data edges to
- * order by. A failure checking one resource does not interrupt the others;
- * all failures are aggregated into a single combined cause after every
- * resource has been attempted.
+ * Resources are observed concurrently. Repairs follow the persisted
+ * `downstream` edges: a recreated topic exists before its subscription is
+ * recreated. Missing resources are recreated without their bindings first and
+ * bound once every missing resource exists again, because binding data (an S3
+ * notification's target topic) can point at a resource recreated later. A
+ * failure checking one resource does not interrupt the others; all failures
+ * are aggregated into a single combined cause after every resource has been
+ * attempted.
  *
  * Resources that cannot be checked are reported as `skipped` rather than
  * failing the run: providers without `read` (nothing to observe), and
@@ -53,13 +59,11 @@ export class DriftResourceError extends Data.TaggedError("DriftResourceError") {
  * and dependency ordering. Action rows have no cloud state and are ignored.
  */
 const runDrift = (stack, options) => Effect.gen(function* () {
-    // Phase markers + per-resource observation progress go through the
-    // ambient Progress reporter (a no-op by default) so renderers can show the
-    // drift check as it runs.
-    const reportPlanned = yield* Progress;
-    yield* reportPlanned({ _tag: "plan.phase", phase: "loading-state" });
+    // Phase markers and per-resource progress are emitted as events so
+    // renderers can show the drift check as it runs.
+    yield* emit({ type: "plan.phase", phase: "loading-state" });
     const state = yield* yield* State;
-    const session = options.session ?? noopSession;
+    const reportEvent = yield* captureEmit;
     const stackName = stack.name;
     const stage = stack.stage;
     const dryRun = options.dryRun;
@@ -77,21 +81,12 @@ const runDrift = (stack, options) => Effect.gen(function* () {
             resourceType,
             ...partial,
         });
-        const scopedSession = {
-            ...session,
-            note: (note, options) => session.emit({
-                fqn,
-                id: logicalId,
-                _tag: "apply.resource.note",
-                message: note,
-                kind: options?.kind,
-            }),
-        };
-        const report = (status) => session.emit({
-            _tag: "apply.resource.status",
+        const scopedSession = resourceSession(reportEvent, fqn, logicalId);
+        const report = (status) => reportEvent({
+            type: "apply.resource.status",
             fqn,
             id: logicalId,
-            type: resourceType,
+            resourceType,
             status,
         });
         // Surface the skip reason through the session (the TUI renders it as a
@@ -117,18 +112,42 @@ const runDrift = (stack, options) => Effect.gen(function* () {
         if (!provider.read) {
             return yield* skip(`provider '${resourceType}' does not implement read`);
         }
-        const commit = (value) => state.set({
-            stack: stackName,
-            stage,
-            fqn,
-            value: { ...value, namespace },
-        });
+        // Persist a repaired row. Everything but the status, attributes and
+        // bindings carries over from the persisted row — notably the
+        // `providerMode` stamp, without which a repaired local row would be
+        // treated as live.
+        const commit = (status, attr, bindings) => {
+            const row = {
+                kind: old.kind,
+                namespace,
+                fqn,
+                logicalId,
+                instanceId,
+                resourceType,
+                props: old.props,
+                attr: attr,
+                providerVersion: provider.version ?? 0,
+                bindings,
+                downstream: old.downstream,
+                removalPolicy: old.removalPolicy,
+                providerMode: old.providerMode,
+                adoptionBlocked: old.adoptionBlocked,
+            };
+            return state.set({
+                stack: stackName,
+                stage,
+                fqn,
+                value: status === "created"
+                    ? { ...row, status }
+                    : { ...row, status },
+            });
+        };
         // Paired with the resource-planned completion so renderers can show
         // which rows' cloud reads are actually in flight (the slowest part of
         // a drift check). Emitted after the skip gates: skipped rows settle
         // instantly and never read the cloud.
-        yield* reportPlanned({
-            _tag: "plan.resource.started",
+        yield* emit({
+            type: "plan.resource.started",
             fqn,
             logicalId,
             resourceType,
@@ -143,39 +162,11 @@ const runDrift = (stack, options) => Effect.gen(function* () {
             output: old.attr,
         })
             .pipe(instrumentLifecycle("read", fqn, resourceType, logicalId, instanceId));
-        // ── missing — recreate under the same instance id ──
         if (observed === undefined) {
             if (dryRun) {
                 return result({ action: "missing" });
             }
-            yield* report("creating");
-            const attr = yield* provider
-                .reconcile({
-                id: logicalId,
-                fqn,
-                instanceId,
-                news: old.props,
-                olds: undefined,
-                output: undefined,
-                session: scopedSession,
-                bindings: old.bindings,
-            })
-                .pipe(instrumentLifecycle("create", fqn, resourceType, logicalId, instanceId));
-            yield* commit({
-                status: "created",
-                fqn,
-                logicalId,
-                instanceId,
-                resourceType,
-                props: old.props,
-                attr,
-                providerVersion: provider.version ?? 0,
-                bindings: old.bindings,
-                downstream: old.downstream,
-                removalPolicy: old.removalPolicy,
-            });
-            yield* report("created");
-            return result({ action: "recreated", attr });
+            return { fqn, old, provider, live: undefined, result, scopedSession, report, commit };
         }
         // `read` may brand the attributes as Unowned when ownership markers
         // (tags) have drifted out from under us — the brand is a plan-time
@@ -189,8 +180,50 @@ const runDrift = (stack, options) => Effect.gen(function* () {
         if (dryRun) {
             return result({ action: "drifted", attr: live });
         }
-        // ── drifted — converge the cloud back to the last-deployed props ──
-        yield* report("updating");
+        return { fqn, old, provider, live, result, scopedSession, report, commit };
+    });
+    const isPendingRepair = (observed) => observed !== undefined && "old" in observed;
+    // ── missing — recreate under the same instance id, without bindings ──
+    //
+    // Binding data often points at other resources (an S3 notification
+    // targets a topic), and a binding edge inside a cycle is not recorded in
+    // `downstream`. So, like Apply's precreate, missing resources are first
+    // created bare in `downstream` order; their bindings are attached in the
+    // second phase, once every missing resource exists again. The bare
+    // create is committed with no bindings so a crash in between leaves a
+    // row the next deploy re-binds.
+    const recreate = Effect.fn("drift.recreate")(function* (pending) {
+        const { fqn, old, provider, report, commit, scopedSession, result } = pending;
+        const { logicalId, instanceId, resourceType } = old;
+        const bindings = old.bindings ?? [];
+        yield* report("creating");
+        const attr = yield* provider
+            .reconcile({
+            id: logicalId,
+            fqn,
+            instanceId,
+            news: old.props,
+            olds: undefined,
+            output: undefined,
+            session: scopedSession,
+            bindings: [],
+        })
+            .pipe(instrumentLifecycle("create", fqn, resourceType, logicalId, instanceId));
+        yield* commit("created", attr, []);
+        if (bindings.length === 0) {
+            yield* report("created");
+            return { done: result({ action: "recreated", attr }) };
+        }
+        return { rebind: { ...pending, live: attr, recreated: true } };
+    });
+    // ── drifted — converge the cloud back to the last-deployed props ──
+    //
+    // Also attaches the bindings of resources recreated bare above.
+    const reconcile = Effect.fn("drift.reconcile")(function* (pending) {
+        const { fqn, old, provider, live, report, commit, scopedSession, result, recreated } = pending;
+        const { logicalId, instanceId, resourceType } = old;
+        if (!recreated)
+            yield* report("updating");
         const attr = yield* provider
             .reconcile({
             id: logicalId,
@@ -204,67 +237,114 @@ const runDrift = (stack, options) => Effect.gen(function* () {
             session: scopedSession,
             bindings: old.bindings,
         })
-            .pipe(instrumentLifecycle("update", fqn, resourceType, logicalId, instanceId));
-        yield* commit({
-            status: "updated",
-            fqn,
-            logicalId,
-            instanceId,
-            resourceType,
-            props: old.props,
-            attr,
-            providerVersion: provider.version ?? 0,
-            bindings: old.bindings,
-            downstream: old.downstream,
-            removalPolicy: old.removalPolicy,
-        });
-        yield* report("updated");
-        return result({ action: "repaired", attr });
+            .pipe(instrumentLifecycle(recreated ? "create" : "update", fqn, resourceType, logicalId, instanceId));
+        yield* commit(recreated ? "created" : "updated", attr, old.bindings);
+        yield* report(recreated ? "created" : "updated");
+        return result({ action: recreated ? "recreated" : "repaired", attr });
     });
-    const fqns = yield* state.list({ stack: stackName, stage });
-    yield* reportPlanned({ _tag: "plan.phase", phase: "computing-plan" });
+    const listed = yield* state.list({ stack: stackName, stage });
+    const fqns = options.only === undefined ? listed : listed.filter((fqn) => options.only.includes(fqn));
+    yield* emit({ type: "plan.phase", phase: "computing-plan" });
     // Per-resource observation progress: each row is reported through the
-    // ambient Progress reporter as its cloud read lands (drift checks are the
+    // events as its cloud read lands (drift checks are the
     // slowest planning path). Failed or action rows advance the count
     // without an event, so progress stays monotonic.
     const observedCount = yield* Ref.make(0);
-    const resourceObserved = (result) => Ref.updateAndGet(observedCount, (count) => count + 1).pipe(Effect.flatMap((completed) => result === undefined
+    const resourceObserved = (observed) => Ref.updateAndGet(observedCount, (count) => count + 1).pipe(Effect.flatMap((completed) => observed === undefined
         ? Effect.void
-        : reportPlanned({
-            _tag: "plan.resource.completed",
-            fqn: result.fqn,
-            logicalId: result.logicalId,
-            resourceType: result.resourceType,
+        : emit({
+            type: "plan.resource.completed",
+            fqn: observed.fqn,
+            logicalId: isPendingRepair(observed) ? observed.old.logicalId : observed.logicalId,
+            resourceType: isPendingRepair(observed)
+                ? observed.old.resourceType
+                : observed.resourceType,
             // Drift observation compares attributes, not binding rows.
             bindings: [],
-            action: result.action === "drifted" || result.action === "repaired"
-                ? "update"
-                : result.action === "missing"
+            action: isPendingRepair(observed)
+                ? observed.live === undefined
                     ? "create"
-                    : "noop",
+                    : "update"
+                : observed.action === "drifted"
+                    ? "update"
+                    : observed.action === "missing"
+                        ? "create"
+                        : "noop",
             completed,
             total: fqns.length,
         })));
     // Drift every resource even if some fail, then surface all failures as
     // one combined cause (mirrors Apply's failure aggregation).
     const failures = [];
-    const results = yield* Effect.all(fqns.map((fqn) => driftResource(fqn).pipe(Effect.catchCause((cause) => Effect.gen(function* () {
+    const recordFailure = (fqn) => (cause) => Effect.gen(function* () {
         failures.push(cause);
         const persisted = yield* state
             .get({ stack: stackName, stage, fqn })
             .pipe(Effect.orElseSucceed(() => undefined));
         if (persisted && !isActionState(persisted)) {
-            yield* session.emit({
-                _tag: "apply.resource.status",
+            yield* reportEvent({
+                type: "apply.resource.status",
                 fqn,
                 id: persisted.logicalId,
-                type: persisted.resourceType,
+                resourceType: persisted.resourceType,
                 status: "fail",
             });
         }
         return undefined;
-    })), Effect.tap(resourceObserved))), { concurrency: "unbounded" });
-    yield* session.done(failures.length === 0 ? "success" : "failure");
+    });
+    const observed = yield* Effect.forEach(fqns, (fqn) => driftResource(fqn).pipe(Effect.catchCause(recordFailure(fqn)), Effect.tap(resourceObserved)), { concurrency: "unbounded" });
+    const pending = observed.filter(isPendingRepair);
+    // Upstreams per the persisted `downstream` edges, among the resources
+    // being repaired (an unchanged or skipped upstream never blocks). Edges
+    // inside a cycle — only possible through merged historical edges — are
+    // dropped.
+    const upstream = Object.fromEntries(pending.map((node) => [node.fqn, []]));
+    for (const node of pending) {
+        for (const down of node.old.downstream ?? []) {
+            if (down !== node.fqn)
+                upstream[down]?.push(node.fqn);
+        }
+    }
+    const cyclic = findCycleMembers(upstream);
+    const upstreamOf = (fqn) => upstream[fqn].filter((up) => !(cyclic.has(up) && cyclic.has(fqn)));
+    // Resources whose repair failed, or was skipped because an upstream's
+    // did. Like Apply, a dependent never runs against a failed upstream.
+    const failed = new Set();
+    // Run `run` over `nodes`, each node after its upstreams in `nodes` have
+    // settled. Upstreams outside `nodes` settled in an earlier phase.
+    const inDependencyOrder = Effect.fn(function* (nodes, run) {
+        const settled = new Map();
+        for (const node of nodes)
+            settled.set(node.fqn, yield* Deferred.make());
+        return yield* Effect.forEach(nodes, (node) => Effect.gen(function* () {
+            const ups = upstreamOf(node.fqn);
+            yield* Effect.all(ups.flatMap((up) => {
+                const deferred = settled.get(up);
+                return deferred ? [Deferred.await(deferred)] : [];
+            }));
+            const blocked = ups.filter((up) => failed.has(up));
+            if (blocked.length > 0) {
+                failed.add(node.fqn);
+                yield* node.scopedSession.note(`not repaired: upstream ${blocked.map((up) => `'${up}'`).join(", ")} failed`);
+                yield* node.report("skipped");
+                return undefined;
+            }
+            return yield* run(node).pipe(Effect.catchCause((cause) => Effect.sync(() => failed.add(node.fqn)).pipe(Effect.andThen(recordFailure(node.fqn)(cause)))));
+        }).pipe(Effect.ensuring(Deferred.succeed(settled.get(node.fqn), undefined))), { concurrency: "unbounded" });
+    });
+    const recreated = yield* inDependencyOrder(pending.filter((node) => node.live === undefined), recreate);
+    const rebind = recreated.flatMap((node) => (node?.rebind ? [node.rebind] : []));
+    const repaired = yield* inDependencyOrder([
+        ...pending
+            .filter((node) => node.live !== undefined)
+            .map((node) => ({ ...node, recreated: false })),
+        ...rebind,
+    ], reconcile);
+    const results = [
+        ...observed.filter((r) => !isPendingRepair(r)),
+        ...recreated.map((r) => r?.done),
+        ...repaired,
+    ].filter((r) => r !== undefined);
     if (failures.length > 0) {
         return yield* Effect.failCause(failures.reduce(Cause.combine));
     }
@@ -280,8 +360,11 @@ const runDrift = (stack, options) => Effect.gen(function* () {
 }));
 /** Detect drift without reconciling resources or updating state. */
 export const detect = (stack) => runDrift(stack, { dryRun: true });
-/** Reconcile resources back to their last-deployed desired state. */
-export const repair = (stack, options = {}) => runDrift(stack, { ...options, dryRun: false });
+/**
+ * Reconcile resources back to their last-deployed desired state. With
+ * `only`, just those resources are re-checked and repaired.
+ */
+export const repair = (stack, options = {}) => runDrift(stack, { dryRun: false, only: options.only });
 /**
  * Same shape as Apply's lifecycle instrumentation: scoped artifacts +
  * resource context, the resource op metrics, and a `provider.<op>` span.