@alchemy.run/drizzle 2.0.0-beta.84 → 2.0.0-beta.85

package/lib/Schema.js

@@ -9,20 +9,84 @@ var __rewriteRelativeImportExtension = (this && this.__rewriteRelativeImportExte
 import * as crypto from "node:crypto";
 import * as Artifacts from "alchemy/Artifacts";
 import { isResolved } from "alchemy/Diff";
+import { Interaction } from "alchemy/Interaction";
 import * as Provider from "alchemy/Provider";
 import { Resource } from "alchemy/Resource";
-import { exec } from "alchemy/Util/exec";
-import { isNonInteractive } from "alchemy/Util/interactive";
+import * as Data from "effect/Data";
 import * as Effect from "effect/Effect";
 import * as FileSystem from "effect/FileSystem";
+import * as Match from "effect/Match";
+import * as Option from "effect/Option";
 import * as Path from "effect/Path";
-import { ChildProcess } from "effect/process";
+import * as Record from "effect/Record";
+import * as S from "effect/Schema";
+import * as Semaphore from "effect/Semaphore";
+// Unlisted fields are kept (the rest records), so a decoded snapshot can be
+// written back whole.
+const DdlEntry = S.StructWithRest(S.Struct({
+    entityType: S.String,
+    schema: S.optional(S.String),
+    table: S.optional(S.String),
+    name: S.optional(S.String),
+}), [S.Record(S.String, S.Unknown)]);
+// A `snapshot.json`. Postgres folders hold one `base` snapshot followed by
+// `diff` snapshots carrying `deltas`; mysql and sqlite snapshots are full.
+const Snapshot = S.StructWithRest(S.Struct({
+    type: S.optional(S.Literals(["base", "diff"])),
+    version: S.optional(S.String),
+    dialect: S.optional(S.String),
+    id: S.optional(S.String),
+    prevIds: S.String.pipe(S.Array, S.optional),
+    ddl: DdlEntry.pipe(S.Array, S.optional),
+}), [S.Record(S.String, S.Unknown)]);
+const decodeSnapshot = S.decodeEffect(S.fromJsonString(Snapshot));
+class DrizzleKitLoadFailed extends Data.TaggedError("DrizzleKitLoadFailed") {
+    get message() {
+        return `Failed to load ${this.module} (is drizzle-kit installed?): ${this.cause instanceof Error ? this.cause.message : String(this.cause)}`;
+    }
+}
+class InvalidSnapshot extends Data.TaggedError("InvalidSnapshot") {
+    get message() {
+        return `Invalid drizzle snapshot at ${this.file}: ${this.cause.message}`;
+    }
+}
+class SchemaImportFailed extends Data.TaggedError("SchemaImportFailed") {
+    get message() {
+        return `Failed to import schema at ${this.schema}: ${this.cause instanceof Error ? this.cause.message : String(this.cause)}`;
+    }
+}
+class DrizzleKitFailed extends Data.TaggedError("DrizzleKitFailed") {
+    get message() {
+        // Thrown errors carry their own message; reported ones (`{ status:
+        // "error", error }`) are plain objects like `{ code, kind, snapshot }`.
+        const { cause } = this;
+        const detail = cause instanceof Error ? cause.message : JSON.stringify(cause);
+        return `drizzle-kit ${this.command} failed: ${detail}`;
+    }
+}
+class DrizzleKitExited extends Data.TaggedError("DrizzleKitExited") {
+    get message() {
+        return `drizzle-kit ${this.command} found errors in the schema (such as two columns with one name) and tried to exit the process`;
+    }
+}
+/** An ambiguous schema change with no terminal to ask. */
+class UndecidedSchemaChange extends Data.TaggedError("UndecidedSchemaChange") {
+    get message() {
+        const { props, hint } = this;
+        return [
+            `${props.schema} has an ambiguous change that needs a decision:`,
+            `  ${formatEntity(hint.entity)}: created or renamed?`,
+            "Re-run in an interactive terminal to answer it.",
+        ].join("\n");
+    }
+}
 /**
  * A Drizzle schema managed as an Alchemy resource.
  *
- * Wraps drizzle-kit's programmatic API (`generateDrizzleJson` /
- * `generateMigration`) so migration SQL is regenerated as part of `alchemy
- * deploy` whenever the source schema changes. The output directory is
+ * Runs `drizzle-kit generate` through drizzle-kit's programmatic API so
+ * migration SQL is regenerated as part of `alchemy deploy` whenever the
+ * source schema changes. Ambiguous changes (a rename or a new column/table?)
+ * are asked with Alchemy's prompts during plan. The output directory is
  * intended to be passed straight to a database resource's `migrations`
  * prop, giving you a single deploy-driven flow:
  *
@@ -53,18 +117,51 @@ import { ChildProcess } from "effect/process";
  * @resource
  */
 export const Schema = Resource("Drizzle.Schema");
-const dialectModule = (dialect) => {
-    switch (dialect) {
-        case "postgres":
-            return "drizzle-kit/api-postgres";
-        case "mysql":
-            return "drizzle-kit/api-mysql";
-        case "sqlite":
-            return "drizzle-kit/api-sqlite";
+const cliDialect = (props) => props.dialect === undefined || props.dialect === "postgres" ? "postgresql" : props.dialect;
+const sha = (s) => crypto.createHash("sha256").update(s).digest("hex");
+const importModule = (module) => Effect.tryPromise({
+    try: () => import(__rewriteRelativeImportExtension(/* @vite-ignore */ module)),
+    catch: (cause) => new DrizzleKitLoadFailed({ module, cause }),
+});
+// drizzle-kit runs in-process but calls `process.exit` on schema errors.
+// Calls trap the exit and fail instead, one at a time since the trap swaps
+// the global.
+const exitTrap = Semaphore.makeUnsafe(1);
+const callDrizzleKit = (command, run) => Effect.acquireUseRelease(Effect.sync(() => {
+    // oxlint-disable-next-line typescript/unbound-method -- saved only to restore `process.exit` verbatim, never called unbound
+    const trap = { exit: process.exit, exited: false };
+    process.exit = () => {
+        trap.exited = true;
+        throw new Error("drizzle-kit exited");
+    };
+    return trap;
+}), (trap) => 
+// `cli` commands catch the trap's throw and report it as an error result.
+// Uninterruptible: the promise can't be cancelled, so the trap stays
+// until it settles.
+Effect.tryPromise({
+    try: run,
+    catch: (cause) => trap.exited
+        ? new DrizzleKitExited({ command })
+        : new DrizzleKitFailed({ command, cause }),
+}).pipe(Effect.flatMap((result) => trap.exited ? Effect.fail(new DrizzleKitExited({ command })) : Effect.succeed(result)), Effect.uninterruptible), (trap) => Effect.sync(() => {
+    process.exit = trap.exit;
+})).pipe((effect) => exitTrap.withPermit(effect));
+// A `drizzle-kit/cli` command as an Effect, failing on a thrown or reported error.
+const command = (name) => Effect.fn(`drizzleKit.${name}`)(function* (options) {
+    const cli = yield* importModule("drizzle-kit/cli");
+    const result = yield* callDrizzleKit(name, () => cli[name](options));
+    if (result.status === "error") {
+        return yield* new DrizzleKitFailed({ command: name, cause: result.error });
     }
+    return result;
+});
+const drizzleKit = {
+    /** `drizzle-kit generate`; with `explain` a dry run that writes nothing. */
+    generate: command("generate"),
+    /** `drizzle-kit up`: upgrade snapshots to the current format. */
+    up: command("up"),
 };
-const sha = (s) => crypto.createHash("sha256").update(s).digest("hex");
-const tsStamp = () => new Date().toISOString().replace(/[-:T]/g, "").slice(0, 14);
 export const SchemaProvider = () => Provider.effect(Schema, Effect.gen(function* () {
     const fs = yield* FileSystem.FileSystem;
     const path = yield* Path.Path;
@@ -75,227 +172,176 @@ export const SchemaProvider = () => Provider.effect(Schema, Effect.gen(function*
     // `resolveOut` form.
     const relativeOut = (abs) => path.relative(process.cwd(), abs);
     const resolveSchema = (p) => path.resolve(process.cwd(), p.schema);
-    const loadSchemaModule = (p) => Effect.gen(function* () {
-        const schemaPath = resolveSchema(p);
-        return yield* Effect.tryPromise({
-            try: () => import(__rewriteRelativeImportExtension(/* @vite-ignore */ schemaPath)),
-            catch: (cause) => new Error(`Failed to import schema at ${p.schema}: ${cause}`),
-        });
-    });
-    const loadKit = (dialect) => Effect.tryPromise({
-        try: () => import(__rewriteRelativeImportExtension(/* @vite-ignore */ dialectModule(dialect))),
-        catch: (cause) => new Error(`Failed to load drizzle-kit/${dialect} (is drizzle-kit installed?): ${cause}`),
-    });
-    const drizzleKitBin = (dialect) => Effect.gen(function* () {
-        const apiUrl = yield* Effect.try({
-            try: () => import.meta.resolve(dialectModule(dialect)),
-            catch: (cause) => new Error(`Failed to resolve drizzle-kit/${dialect}: ${cause}`),
-        });
-        const apiFileUrl = yield* Effect.try({
-            try: () => new URL(apiUrl),
-            catch: (cause) => new Error(`Failed to parse drizzle-kit/${dialect} URL: ${cause}`),
-        });
-        const apiPath = yield* path.fromFileUrl(apiFileUrl);
-        return path.join(path.dirname(apiPath), "bin.cjs");
-    });
-    const runDrizzleGenerate = (props, out) => Effect.gen(function* () {
-        const dialect = props.dialect ?? "postgres";
-        const bin = yield* drizzleKitBin(dialect);
-        const schemaPath = resolveSchema(props);
-        const nodeExecPath = yield* Effect.sync(() => process.execPath);
-        const nodeModulesPath = path.join(process.cwd(), "node_modules");
-        // drizzle-kit globs the --schema/--out values; Windows backslashes
-        // are treated as glob escapes and match nothing, so pass forward
-        // slashes.
-        const args = [
-            bin,
-            "generate",
-            "--dialect",
-            dialect === "postgres" ? "postgresql" : dialect,
-            "--schema",
-            schemaPath.replaceAll("\\", "/"),
-            "--out",
-            out.replaceAll("\\", "/"),
-        ];
-        const commandOptions = {
-            cwd: process.cwd(),
-            env: { NODE_PATH: nodeModulesPath },
-            extendEnv: true,
-        };
-        // Hand the terminal to drizzle-kit only when this process may
-        // prompt at all — the same detection (TTY, CI, `--no-input`,
-        // `ALCHEMY_NO_TUI`, agent env) every other spawned command uses.
-        if (!isNonInteractive() && process.stderr.isTTY) {
-            const handle = yield* ChildProcess.make(nodeExecPath, args, {
-                ...commandOptions,
-                stdin: "inherit",
-                stdout: "inherit",
-                stderr: "inherit",
-            }).pipe(Effect.mapError((cause) => new Error(`drizzle-kit generate failed: ${String(cause)}`)));
-            const exitCode = yield* handle.exitCode;
-            if (exitCode !== 0) {
-                return yield* Effect.fail(new Error(`drizzle-kit generate failed with exit ${exitCode}`));
-            }
-            return;
-        }
-        const result = yield* exec(ChildProcess.make(nodeExecPath, args, commandOptions)).pipe(Effect.mapError((cause) => new Error(`drizzle-kit generate failed: ${String(cause)}`)));
-        if (result.exitCode === 0)
-            return;
-        // Since drizzle-kit 1.0.0-rc.4 the non-interactive CLI refuses
-        // ambiguous decisions (rename-vs-create, data-loss confirmation)
-        // with a `missing_hints` report on exit 2. These are deliberate
-        // safety prompts — the generated SQL is applied to the real
-        // database later in the same deploy — so we never answer them
-        // automatically. Ask the user to decide.
-        if (result.exitCode === 2) {
-            return yield* Effect.fail(new Error([
-                `drizzle-kit needs a decision for ${props.schema} that cannot be made non-interactively (rename vs create, or a change that loses data):`,
-                "",
-                result.stdout.trim(),
-                "",
-                "To resolve, generate the migration yourself and commit it:",
-                `  npx drizzle-kit generate --dialect ${dialect === "postgres" ? "postgresql" : dialect} --schema ${props.schema} --out ${props.out ?? "./migrations"}`,
-                "then re-run the deploy (the schema resource will see no drift and apply the committed migration).",
-                "Alternatively, run the deploy in a terminal to answer drizzle-kit's prompts interactively.",
-            ].join("\n")));
-        }
-        return yield* Effect.fail(new Error(`drizzle-kit generate failed: ${result.stdout}\n${result.stderr}`));
-    });
+    // drizzle-kit reads `schema` as a glob, where `\` is an escape.
+    const schemaGlob = (p) => resolveSchema(p).replaceAll("\\", "/");
     // List `<ts>_*` migration directories under `out`, sorted by numeric
     // prefix. Returns an empty array if `out` doesn't exist.
-    const listMigrationDirs = (out) => Effect.gen(function* () {
-        const exists = yield* fs.exists(out);
-        if (!exists)
+    const listMigrationDirs = Effect.fn("Drizzle.listMigrationDirs")(function* (out) {
+        if (!(yield* fs.exists(out)))
             return [];
         const entries = yield* fs.readDirectory(out);
         return entries.filter((name) => /^\d+_/.test(name)).sort();
     });
+    const readSnapshots = Effect.fn("Drizzle.readSnapshots")(function* (out) {
+        const entries = yield* Effect.forEach(yield* listMigrationDirs(out), (dir) => Effect.gen(function* () {
+            const file = path.join(out, dir, "snapshot.json");
+            if (!(yield* fs.exists(file)))
+                return [];
+            const text = yield* fs.readFileString(file);
+            const snapshot = yield* decodeSnapshot(text).pipe(Effect.mapError((cause) => new InvalidSnapshot({ file, cause })));
+            return [[dir, { snapshot, text }]];
+        }));
+        return Record.fromEntries(entries.flat());
+    });
     // The latest snapshot is the head of the `prevIds` chain — the one no
     // other snapshot points back to. Directory-name order alone is not
     // enough: two migrations generated within the same second share the
     // timestamp prefix, and the random name suffix then decides the sort.
-    const readLatestSnapshot = (out) => Effect.gen(function* () {
-        const dirs = yield* listMigrationDirs(out);
-        const entries = [];
-        for (const dir of dirs) {
-            const snapshotPath = path.join(out, dir, "snapshot.json");
-            const exists = yield* fs.exists(snapshotPath);
-            if (!exists)
-                continue;
-            const text = yield* fs.readFileString(snapshotPath);
-            entries.push({
-                snapshot: JSON.parse(text),
-                hash: sha(text),
-            });
-        }
+    const readLatestSnapshot = Effect.fn("Drizzle.readLatestSnapshot")(function* (out) {
+        const entries = Record.values(yield* readSnapshots(out));
         if (entries.length === 0)
             return undefined;
         const referenced = new Set(entries.flatMap((entry) => entry.snapshot.prevIds ?? []));
         const head = entries.find((entry) => entry.snapshot.id !== undefined && !referenced.has(entry.snapshot.id));
         // Fall back to name order for snapshots without id/prevIds chains.
-        return head ?? entries[entries.length - 1];
+        const latest = head ?? entries[entries.length - 1];
+        return { snapshot: latest.snapshot, hash: sha(latest.text) };
     });
-    const detectDriftWithCli = (props) => Effect.gen(function* () {
-        const out = resolveOut(props);
-        const tmpOut = yield* fs.makeTempDirectory({
-            prefix: "alchemy-drizzle-generate-",
-        });
-        return yield* Effect.gen(function* () {
-            const outExists = yield* fs.exists(out);
-            if (outExists)
-                yield* copyDirectory(out, tmpOut);
-            const before = yield* listMigrationDirs(tmpOut);
-            yield* runDrizzleGenerate(props, tmpOut);
-            const after = yield* listMigrationDirs(tmpOut);
-            const latest = yield* readLatestSnapshot(tmpOut);
-            const changed = after.some((dir) => !before.includes(dir));
-            const prevEntry = outExists ? yield* readLatestSnapshot(out) : undefined;
-            return {
-                mode: "cli",
-                out,
-                cur: latest?.snapshot,
-                prevEntry,
-                changed,
-            };
-        }).pipe(Effect.ensuring(fs.remove(tmpOut, { recursive: true }).pipe(Effect.ignore)));
+    /**
+     * Bring a migrations folder up to drizzle-kit's current snapshot format
+     * with `drizzle-kit up`. Returns whether anything changed.
+     *
+     * Earlier Alchemy versions wrote every postgres snapshot as a full
+     * version-9 snapshot without a `type`. That is the version-8 shape, which
+     * `up` turns into drizzle-kit's base/diff chain, so relabel them first.
+     */
+    const upgradeFolder = Effect.fn("Drizzle.upgradeFolder")(function* (props, out) {
+        if (!(yield* fs.exists(out)))
+            return false;
+        if (cliDialect(props) === "postgresql") {
+            for (const [dir, { snapshot }] of Record.toEntries(yield* readSnapshots(out))) {
+                if (snapshot.type !== undefined || snapshot.version !== "9")
+                    continue;
+                yield* fs.writeFileString(path.join(out, dir, "snapshot.json"), JSON.stringify({ ...snapshot, version: "8", renames: [] }, null, 2));
+            }
+        }
+        const { upgraded } = yield* drizzleKit.up({ dialect: cliDialect(props), out });
+        return upgraded.length > 0;
+    });
+    // The schema the migrations folder describes. Postgres folders are diff
+    // chains drizzle-kit rebuilds; other dialects store full snapshots.
+    const readPreviousSnapshot = Effect.fn("Drizzle.readPreviousSnapshot")(function* (kit, out) {
+        const reconstruct = kit.reconstruct;
+        if (reconstruct === undefined)
+            return (yield* readLatestSnapshot(out))?.snapshot;
+        const files = Record.map(yield* readSnapshots(out), ({ snapshot }) => snapshot);
+        if (Record.isEmptyRecord(files))
+            return undefined;
+        const parents = new Set(Record.values(files).flatMap((file) => file.prevIds ?? []));
+        const leaves = Record.values(files).filter(({ id }) => id !== undefined && !parents.has(id));
+        if (leaves.length < 2) {
+            return yield* callDrizzleKit("reconstruct", () => reconstruct(files));
+        }
+        // Unmerged branches: reconstruct an empty merge of their leaves, the
+        // combined state drizzle-kit's generate diffs against.
+        const merge = {
+            ...leaves[0],
+            id: MERGE_ID,
+            prevIds: leaves.map(({ id }) => id),
+            deltas: [],
+        };
+        return yield* callDrizzleKit("reconstruct", () => reconstruct({ ...files, [`99999999999999_${MERGE_ID}`]: merge }, MERGE_ID));
     });
     /**
-     * Run drizzle-kit's diff against the latest stored snapshot and
-     * return whether any SQL statements would be emitted. Used by both
-     * `diff` (to decide whether the resource actually needs an update)
-     * and `regenerate` (to decide whether to write a new migration dir).
+     * The previous and current schema, for working out which entities a
+     * rename-or-create question could have been renamed from.
      */
-    const detectDrift = (props) => Effect.gen(function* () {
-        const out = resolveOut(props);
+    const loadRenameContext = Effect.fn("Drizzle.loadRenameContext")(function* (props, out) {
         const dialect = props.dialect ?? "postgres";
-        const kit = yield* loadKit(dialect);
-        if (!kit.generateDrizzleJson || !kit.generateMigration) {
-            return yield* detectDriftWithCli(props);
-        }
-        const generateDrizzleJson = kit.generateDrizzleJson;
-        const generateMigration = kit.generateMigration;
-        const schemaModule = yield* loadSchemaModule(props);
-        const prevEntry = yield* readLatestSnapshot(out);
-        const cur = yield* Effect.tryPromise({
-            try: () => generateDrizzleJson(schemaModule, prevEntry?.snapshot.id),
-            catch: (cause) => new Error(`drizzle-kit generateDrizzleJson failed: ${cause}`),
-        });
-        // For the initial migration, drizzle-kit needs an *empty* snapshot
-        // produced by `generateDrizzleJson({})`, not a bare `{}` — the
-        // snapshot has internal fields (`ddl`, etc.) that the differ reads.
-        const prev = prevEntry?.snapshot ??
-            (yield* Effect.tryPromise({
-                try: () => generateDrizzleJson({}),
-                catch: (cause) => new Error(`drizzle-kit generateDrizzleJson (empty baseline) failed: ${cause}`),
-            }));
-        const sqlStatements = yield* Effect.tryPromise({
-            try: () => generateMigration(prev, cur),
-            catch: (cause) => new Error(`drizzle-kit generateMigration failed: ${cause}`),
+        const kit = yield* importModule(`drizzle-kit/payload/${dialect}`);
+        const schemaModule = yield* Effect.tryPromise({
+            try: () => import(__rewriteRelativeImportExtension(/* @vite-ignore */ resolveSchema(props))),
+            catch: (cause) => new SchemaImportFailed({ schema: props.schema, cause }),
         });
-        return {
-            mode: "programmatic",
-            out,
-            cur,
-            prevEntry,
-            sqlStatements,
-        };
-    }).pipe(Artifacts.cached("detectDrift"));
+        const cur = yield* callDrizzleKit("generateDrizzleJson", () => kit.generateDrizzleJson(schemaModule));
+        const prev = yield* readPreviousSnapshot(kit, out);
+        return { prev: prev?.ddl ?? [], cur: cur.ddl ?? [] };
+    });
     /**
-     * Generate a new migration directory if the schema has drifted from
-     * the latest snapshot. Returns the new state regardless.
+     * Dry-run `drizzle-kit generate` until it has no unanswered questions,
+     * asking the user each rename-or-create question it reports. The SQL is
+     * applied to the real database later in the same deploy, so ambiguous
+     * changes are never answered automatically.
      */
-    const regenerate = (props) => Effect.gen(function* () {
-        const drift = yield* detectDrift(props);
-        if (drift.mode === "cli") {
-            if (drift.changed) {
-                yield* runDrizzleGenerate(props, drift.out);
+    const resolveHints = Effect.fn("Drizzle.resolveHints")(function* (props, out) {
+        const hints = [];
+        const context = yield* Effect.cached(loadRenameContext(props, out));
+        // `explain` dry-runs generate: it reports the pending migration
+        // (`ok`), `no_changes`, or the questions it still needs answered
+        // (`missing_hints`) without writing anything. Answers can raise new
+        // questions (columns of a renamed table), so ask until none are left.
+        const result = yield* Effect.gen(function* () {
+            const result = yield* drizzleKit.generate({
+                dialect: cliDialect(props),
+                schema: schemaGlob(props),
+                out,
+                explain: true,
+                hints,
+            });
+            if (result.status === "missing_hints") {
+                const { prev, cur } = yield* context;
+                for (const hint of result.unresolved) {
+                    hints.push(yield* askHint(props, hint, prev, cur, hints));
+                }
             }
-            const migrations = yield* listMigrationDirs(drift.out);
-            const latest = yield* readLatestSnapshot(drift.out);
-            const snapshotHash = latest?.hash ?? sha(JSON.stringify(drift.cur));
-            return {
-                out: relativeOut(drift.out),
-                snapshotHash,
-                migrations,
-            };
-        }
-        const { out, cur, sqlStatements } = drift;
-        if (sqlStatements.length > 0) {
+            return result;
+        }).pipe(Effect.repeat({ until: (result) => result.status !== "missing_hints" }));
+        return { hints, changed: result.status === "ok" };
+    });
+    /**
+     * Decide what a deploy would change, without touching `out`: upgrade a
+     * scratch copy of the folder, then resolve every question drizzle-kit
+     * has about the schema change. Cached so `diff` and `reconcile` share
+     * one set of answers.
+     */
+    const detectDrift = Effect.fn("Drizzle.detectDrift")(function* (props) {
+        const out = resolveOut(props);
+        const scratch = yield* fs.makeTempDirectoryScoped({ prefix: "alchemy-drizzle-" });
+        const migrations = path.join(scratch, "migrations");
+        if (yield* fs.exists(out))
+            yield* fs.copy(out, migrations);
+        const upgraded = yield* upgradeFolder(props, migrations);
+        const { hints, changed } = yield* resolveHints(props, migrations);
+        return { out, upgraded, hints, changed };
+    }, 
+    // Keyed by props: an interrupted create's recovery `read` sees the
+    // persisted props, which may differ from the ones being deployed.
+    (effect, props) => effect.pipe(Effect.scoped, Artifacts.cached(`detectDrift:${cliDialect(props)}:${resolveSchema(props)}:${resolveOut(props)}`)));
+    /**
+     * Upgrade `out` if needed and generate the pending migration with the
+     * answers gathered by {@link detectDrift}.
+     */
+    const regenerate = Effect.fn("Drizzle.regenerate")(function* (props) {
+        const { out, upgraded, hints, changed } = yield* detectDrift(props);
+        if (upgraded)
+            yield* upgradeFolder(props, out);
+        if (changed) {
             yield* fs.makeDirectory(out, { recursive: true });
-            const dirName = `${tsStamp()}_migration`;
-            const dirPath = path.join(out, dirName);
-            yield* fs.makeDirectory(dirPath, { recursive: true });
-            const sql = sqlStatements.join("\n--> statement-breakpoint\n") + "\n";
-            yield* fs.writeFileString(path.join(dirPath, "migration.sql"), sql);
-            yield* fs.writeFileString(path.join(dirPath, "snapshot.json"), JSON.stringify(cur, null, 2));
+            const result = yield* drizzleKit.generate({
+                dialect: cliDialect(props),
+                schema: schemaGlob(props),
+                out,
+                hints,
+            });
+            if (result.status === "missing_hints") {
+                return yield* new UndecidedSchemaChange({ props, hint: result.unresolved[0] });
+            }
         }
-        const migrations = yield* listMigrationDirs(out);
         const latest = yield* readLatestSnapshot(out);
-        const snapshotHash = latest?.hash ?? sha(JSON.stringify(cur));
         return {
             out: relativeOut(out),
-            snapshotHash,
-            migrations,
+            snapshotHash: latest?.hash ?? sha(""),
+            migrations: yield* listMigrationDirs(out),
         };
     });
     return {
@@ -307,14 +353,17 @@ export const SchemaProvider = () => Provider.effect(Schema, Effect.gen(function*
         diff: Effect.fn(function* ({ news, output }) {
             if (!isResolved(news))
                 return undefined;
-            if (!output)
+            if (!output) {
+                // Re-driving an interrupted create: answer questions now, not
+                // during apply.
+                yield* detectDrift(news);
                 return undefined;
-            // Only flag an update when drizzle-kit would emit new SQL —
-            // otherwise downstream resources (e.g. Neon.Branch) would see
-            // `schema.out` as an unresolved Output during plan and cascade
-            // into spurious updates of their own.
-            const drift = yield* detectDrift(news);
-            const changed = drift.mode === "cli" ? drift.changed : drift.sqlStatements.length > 0;
+            }
+            // Only flag an update when drizzle-kit would emit new SQL (or the
+            // folder needs upgrading) — otherwise downstream resources (e.g.
+            // Neon.Branch) would see `schema.out` as an unresolved Output during
+            // plan and cascade into spurious updates of their own.
+            const { changed, upgraded } = yield* detectDrift(news);
             // Originally `output.out` was an absolute path, which is not portable.
             // So, we trigger an update to migrate existing resources to the
             // canonical (cwd-relative) form. This is safe because `regenerate`
@@ -322,13 +371,19 @@ export const SchemaProvider = () => Provider.effect(Schema, Effect.gen(function*
             // testing `isAbsolute`: on Windows a cross-drive `out` can never be
             // relativized, so its canonical form IS absolute and an isAbsolute
             // check would flag an update on every deploy.
-            return changed || output.out !== relativeOut(resolveOut(news))
+            return changed || upgraded || output.out !== relativeOut(resolveOut(news))
                 ? { action: "update" }
                 : undefined;
         }),
         read: Effect.fn(function* ({ olds, output }) {
-            if (!output)
+            if (!output) {
+                // A create never reaches `diff`; plan only calls `read` to look
+                // for something to adopt. Ask any rename questions now so they
+                // are answered before apply starts changing other resources.
+                if (olds && isResolved(olds))
+                    yield* detectDrift(olds);
                 return undefined;
+            }
             const out = resolveOut(olds ?? {});
             const exists = yield* fs.exists(out);
             if (!exists)
@@ -351,22 +406,109 @@ export const SchemaProvider = () => Provider.effect(Schema, Effect.gen(function*
         }),
     };
 }));
-const copyDirectory = (from, to) => Effect.gen(function* () {
-    const path = yield* Path.Path;
-    const fs = yield* FileSystem.FileSystem;
-    yield* fs.makeDirectory(to, { recursive: true });
-    const entries = yield* fs.readDirectory(from);
-    for (const entry of entries) {
-        const source = path.join(from, entry);
-        const target = path.join(to, entry);
-        const stat = yield* fs.stat(source);
-        if (stat.type === "Directory") {
-            yield* copyDirectory(source, target);
-        }
-        else {
-            const contents = yield* fs.readFile(source);
-            yield* fs.writeFile(target, contents);
-        }
-    }
+// drizzle-kit hint kinds → snapshot `ddl` entity types.
+const ddlEntityTypes = {
+    table: "tables",
+    column: "columns",
+    index: "indexes",
+    enum: "enums",
+    sequence: "sequences",
+    view: "views",
+    schema: "schemas",
+    policy: "policies",
+    role: "roles",
+    check: "checks",
+    unique: "uniques",
+    primary_key: "pks",
+    "foreign key": "fks",
+};
+const MERGE_ID = "alchemy-unmerged-branches";
+// mysql and sqlite have no schemas; drizzle-kit fills ids with `public`.
+const DEFAULT_SCHEMA = "public";
+const formatEntity = (entity) => (entity.length > 1 && entity[0] === DEFAULT_SCHEMA ? entity.slice(1) : entity).join(".");
+const locate = (row) => ({
+    entityType: row.entityType,
+    schema: row.schema ?? DEFAULT_SCHEMA,
+    table: row.table ?? "",
+    name: row.name ?? "",
 });
+const idOf = (row, arity) => Match.value(arity).pipe(Match.when(1, () => [row.name]), Match.when(2, () => [row.schema, row.name]), Match.orElse(() => [row.schema, row.table, row.name]));
+// Give `row` the id `to`, shaped like the `from` id it was matched by.
+const withId = (row, to) => Match.value(to.length).pipe(Match.when(1, () => ({ ...row, name: to[0] })), Match.when(2, () => ({ ...row, schema: to[0], name: to[1] })), Match.orElse(() => ({ ...row, schema: to[0], table: to[1], name: to[2] })));
+const renameRow = (row, rename) => {
+    const { from, to } = rename;
+    return Match.value(rename).pipe(
+    // Schema rows name themselves; everything else names its schema.
+    Match.when({ kind: "schema" }, () => Match.value(row).pipe(Match.when({ entityType: "schemas", name: from[0] }, () => ({ ...row, name: to[0] })), Match.when({ entityType: (type) => type !== "schemas", schema: from[0] }, () => ({
+        ...row,
+        schema: to[0],
+    })), Match.orElse(() => row))), 
+    // The table and everything inside it follow the rename (or move).
+    Match.when({ kind: "table" }, () => Match.value(row).pipe(Match.when({ entityType: "tables", schema: from[0], name: from[1] }, () => withId(row, to)), Match.when({ schema: from[0], table: from[1] }, () => ({
+        ...row,
+        schema: to[0],
+        table: to[1],
+    })), Match.orElse(() => row))), Match.orElse(({ kind }) => row.entityType === ddlEntityTypes[kind] &&
+        JSON.stringify(idOf(row, from.length)) === JSON.stringify(from)
+        ? withId(row, to)
+        : row));
+};
+/**
+ * Carry previous entities through the renames answered so far, so a later
+ * question about the renamed table (or a table moved to another schema)
+ * matches the entities that moved with it.
+ */
+const applyRenames = (rows, hints) => {
+    let current = rows;
+    for (const hint of hints) {
+        if (hint.type === "rename")
+            current = current.map((row) => renameRow(row, hint));
+    }
+    return current;
+};
+/**
+ * Entities a rename-or-create question could have been renamed from: same
+ * kind, present before (after the renames answered so far), gone now.
+ * Columns, indexes, … are offered from the same table first.
+ */
+const renameCandidates = (hint, prev, cur, hints) => {
+    const entityType = ddlEntityTypes[hint.kind];
+    const arity = hint.entity.length;
+    const ofKind = (rows) => rows.filter((row) => row.entityType === entityType);
+    const current = new Set(ofKind(cur.map(locate)).map((row) => JSON.stringify(idOf(row, arity))));
+    const gone = ofKind(applyRenames(prev.map(locate), hints))
+        .map((row) => idOf(row, arity))
+        .filter((id) => !current.has(JSON.stringify(id)));
+    const sameParent = gone.filter((id) => arity < 3 || (id[0] === hint.entity[0] && id[1] === hint.entity[1]));
+    return sameParent.length > 0 ? sameParent : gone;
+};
+/**
+ * Answer one drizzle-kit `MissingHint` with an Alchemy prompt. drizzle-kit
+ * only asks when a rename is possible, so the question is always shown —
+ * never answered with "create" on the user's behalf. A dismissed prompt stays
+ * a `TerminalCancelled` so the CLI exits quietly, the same as cancelling the
+ * deploy confirmation.
+ */
+const askHint = Effect.fn("Drizzle.askHint")(function* (props, hint, prev, cur, hints) {
+    const interaction = yield* Effect.serviceOption(Interaction);
+    if (Option.isNone(interaction))
+        return yield* new UndecidedSchemaChange({ props, hint });
+    const name = formatEntity(hint.entity);
+    return yield* interaction.value.prompt.select({
+        message: `Is ${hint.kind} ${name} created or renamed from another ${hint.kind}?`,
+        options: [
+            {
+                value: { type: "create", kind: hint.kind, entity: hint.entity },
+                label: `+ ${name}`,
+                description: `create ${hint.kind}`,
+            },
+            ...renameCandidates(hint, prev, cur, hints).map((from) => ({
+                value: { type: "rename", kind: hint.kind, from, to: hint.entity },
+                label: `~ ${formatEntity(from)} › ${name}`,
+                description: `rename ${hint.kind}`,
+            })),
+        ],
+        descriptionPlacement: "inline",
+    });
+}, (effect, props, hint) => effect.pipe(Effect.catchTag("NonInteractiveTerminal", () => Effect.fail(new UndecidedSchemaChange({ props, hint })))));
 //# sourceMappingURL=Schema.js.map