alchemy 2.0.0-beta.53 → 2.0.0-beta.55

package/src/Planetscale/Branch.ts

@@ -1,6 +1,7 @@
 import * as planetscale from "@distilled.cloud/planetscale";
 import { Credentials } from "@distilled.cloud/planetscale/Credentials";
 import * as Effect from "effect/Effect";
+import * as Schedule from "effect/Schedule";
 import { Unowned } from "../AdoptPolicy.ts";
 import { isResolved } from "../Diff.ts";
 import { createPhysicalName } from "../PhysicalName.ts";
@@ -157,6 +158,20 @@ export interface BranchMigrationRunners {
 
 const rootDir = Effect.sync(() => process.cwd());
 
+/**
+ * Matches the UnprocessableEntity errors PlanetScale returns when a
+ * branch promotion/demotion races an in-flight cluster resize, e.g.
+ * "Branches with a cluster resize in progress cannot be demoted."
+ */
+const isResizeInProgress = (error: unknown): boolean =>
+  typeof error === "object" &&
+  error !== null &&
+  (error as { readonly _tag?: unknown })._tag === "UnprocessableEntity" &&
+  typeof (error as { readonly message?: unknown }).message === "string" &&
+  (error as { readonly message: string }).message.includes(
+    "cluster resize in progress",
+  );
+
 /**
  * Build a branch provider for a specific PlanetScale engine. The
  * caller supplies the typed `Resource` token and the engine's migration
@@ -369,17 +384,30 @@ export const makeBranchProvider = <R extends ResourceLike>(opts: {
       if (opts.expectedKind === "mysql") {
         const desiredProduction = news.isProduction ?? false;
         if (current.production !== desiredProduction) {
+          // A keyspace can report `resizing: false` while the resize
+          // workflow is still finalizing, during which promote/demote is
+          // rejected with an UnprocessableEntity. Retry until it clears.
+          const retryWhileResizing = Effect.retry({
+            while: isResizeInProgress,
+            schedule: Schedule.spaced("5 seconds").pipe(
+              Schedule.both(Schedule.recurs(120)),
+            ),
+          });
           current = desiredProduction
-            ? yield* planetscale.promoteBranch({
-                organization,
-                database: databaseName,
-                branch: branchName,
-              })
-            : yield* planetscale.demoteBranch({
-                organization,
-                database: databaseName,
-                branch: branchName,
-              });
+            ? yield* planetscale
+                .promoteBranch({
+                  organization,
+                  database: databaseName,
+                  branch: branchName,
+                })
+                .pipe(retryWhileResizing)
+            : yield* planetscale
+                .demoteBranch({
+                  organization,
+                  database: databaseName,
+                  branch: branchName,
+                })
+                .pipe(retryWhileResizing);
         }
       }
 

package/src/Planetscale/Database.ts

@@ -65,7 +65,7 @@ export interface BaseDatabaseProps {
 
   /**
    * Name of the table used to track applied migrations.
-   * @default "planetscale_migrations"
+   * @default "__alchemy_migrations"
    */
   migrationsTable?: string;
 

package/src/Planetscale/Postgres/PostgresClusterSize.ts

@@ -1,6 +1,7 @@
 import * as planetscale from "@distilled.cloud/planetscale";
 import * as Effect from "effect/Effect";
-import { pollUntil } from "../Util.ts";
+import * as Schedule from "effect/Schedule";
+import { pollUntil, waitForBranchReady } from "../Util.ts";
 
 /**
  * Available PlanetScale PostgreSQL cluster sizes.
@@ -54,6 +55,15 @@ export function toPostgresClusterSku(input: {
   return `${size}_${provider}_${arch}`;
 }
 
+/**
+ * Schedule for polling branch change requests. Postgres cluster resizes
+ * routinely take longer than the default 10-minute polling budget, so
+ * give change requests a 60-minute budget (720 × 5s).
+ */
+const changeRequestSchedule = Schedule.spaced("5 seconds").pipe(
+  Schedule.both(Schedule.recurs(720)),
+);
+
 /**
  * Polls branch change requests until all visible changes are in a terminal
  * state (`completed` or `canceled`), or — if `changeId` is provided — until
@@ -85,6 +95,7 @@ export const waitForPendingPostgresChanges = Effect.fn(function* (
 
       return page.data.every((change) => isTerminal(change.state));
     },
+    changeRequestSchedule,
   );
 });
 
@@ -98,7 +109,10 @@ export const ensurePostgresProductionBranchClusterSize = Effect.fn(function* (
   branch: string,
   expectedClusterSize: PostgresClusterSize,
 ) {
-  const data = yield* planetscale.getBranch({ organization, database, branch });
+  // A freshly-forked branch can't accept (or complete) change requests
+  // until it has finished provisioning — queueing a resize against it
+  // just leaves the change pending until the poll budget runs out.
+  const data = yield* waitForBranchReady(organization, database, branch);
 
   const sku = toPostgresClusterSku({
     size: expectedClusterSize,

package/src/Planetscale/Util.ts

@@ -12,7 +12,7 @@ export const DEFAULT_MIGRATIONS_TABLE = "__alchemy_migrations";
  * been reached. Used internally with `Effect.retry` to drive long-running
  * status waits.
  */
-class NotReady extends Data.TaggedError("Planetscale::NotReady")<{
+export class NotReady extends Data.TaggedError("Planetscale::NotReady")<{
   description: string;
 }> {}
 
@@ -29,12 +29,14 @@ export class PlanetscaleConflict extends Data.TaggedError(
 }> {}
 
 /**
- * Default polling schedule: 5s spaced retries with a 10-minute total
- * budget (120 × 5s). Avoids the exponential-blowup trap where later
- * iterations would wait hours, indistinguishable from a hang.
+ * Default polling schedule: 5s spaced retries with a 30-minute total
+ * budget (360 × 5s). Avoids the exponential-blowup trap where later
+ * iterations would wait hours, indistinguishable from a hang. Postgres
+ * database creates routinely run 10-12 minutes, so a 10-minute budget
+ * regularly false-positives as "stuck".
  */
 const defaultSchedule = Schedule.spaced("5 seconds").pipe(
-  Schedule.both(Schedule.recurs(120)),
+  Schedule.both(Schedule.recurs(360)),
 );
 
 /**