From adbc3cb27987ac2eb6933e5ba5d71720b8986373 Mon Sep 17 00:00:00 2001
From: ShiroKSH <kushidashiro@gmail.com>
Date: Wed, 15 Jul 2026 13:47:38 +0300
Subject: [PATCH] fix(core): retry failed migrations

---
 core/util/paths.ts        | 31 ++++++++++----
 core/util/paths.vitest.ts | 88 +++++++++++++++++++++++++++++++++++++++
 2 files changed, 110 insertions(+), 9 deletions(-)
 create mode 100644 core/util/paths.vitest.ts

diff --git a/core/util/paths.ts b/core/util/paths.ts
index 323697f774c..ff8480eaa47 100644
--- a/core/util/paths.ts
+++ b/core/util/paths.ts
@@ -308,18 +308,31 @@ export async function migrate(
 
   const migrationsPath = getMigrationsFolderPath();
   const migrationPath = path.join(migrationsPath, id);
+  let markerCreated = false;
 
-  if (!fs.existsSync(migrationPath)) {
-    try {
-      console.log(`Running migration: ${id}`);
+  try {
+    fs.writeFileSync(migrationPath, "", { flag: "wx" });
+    markerCreated = true;
+    console.log(`Running migration: ${id}`);
+
+    await Promise.resolve(callback());
+  } catch (e) {
+    if (!markerCreated && (e as NodeJS.ErrnoException).code === "EEXIST") {
+      onAlreadyComplete?.();
+      return;
+    }
 
-      fs.writeFileSync(migrationPath, "");
-      await Promise.resolve(callback());
-    } catch (e) {
-      console.warn(`Migration ${id} failed`, e);
+    if (markerCreated) {
+      try {
+        fs.rmSync(migrationPath, { force: true });
+      } catch (cleanupError) {
+        console.warn(
+          `Failed to remove migration marker after ${id} failed`,
+          cleanupError,
+        );
+      }
     }
-  } else if (onAlreadyComplete) {
-    onAlreadyComplete();
+    console.warn(`Migration ${id} failed`, e);
   }
 }
 
diff --git a/core/util/paths.vitest.ts b/core/util/paths.vitest.ts
new file mode 100644
index 00000000000..05be97b281c
--- /dev/null
+++ b/core/util/paths.vitest.ts
@@ -0,0 +1,88 @@
+import * as fs from "node:fs";
+import * as os from "node:os";
+import * as path from "node:path";
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+
+describe("migrate", () => {
+  let continueGlobalDir: string | undefined;
+
+  beforeEach(() => {
+    continueGlobalDir = fs.mkdtempSync(
+      path.join(os.tmpdir(), "continue-migration-test-"),
+    );
+    vi.stubEnv("CONTINUE_GLOBAL_DIR", continueGlobalDir);
+    vi.stubEnv("NODE_ENV", "development");
+    vi.spyOn(console, "warn").mockImplementation(() => {});
+  });
+
+  afterEach(() => {
+    vi.restoreAllMocks();
+    vi.unstubAllEnvs();
+    vi.resetModules();
+
+    if (continueGlobalDir) {
+      fs.rmSync(continueGlobalDir, { recursive: true, force: true });
+      continueGlobalDir = undefined;
+    }
+  });
+
+  it("retries a migration when its previous attempt failed", async () => {
+    const { migrate } = await import("./paths.js");
+    const migration = vi
+      .fn<() => Promise<void>>()
+      .mockRejectedValueOnce(new Error("temporary failure"))
+      .mockResolvedValueOnce(undefined);
+    const migrationPath = path.join(
+      continueGlobalDir!,
+      ".migrations",
+      "retry-after-failure",
+    );
+
+    await migrate("retry-after-failure", migration);
+    expect(fs.existsSync(migrationPath)).toBe(false);
+
+    await migrate("retry-after-failure", migration);
+
+    expect(migration).toHaveBeenCalledTimes(2);
+    expect(fs.existsSync(migrationPath)).toBe(true);
+
+    const onAlreadyComplete = vi.fn();
+    await migrate("retry-after-failure", migration, onAlreadyComplete);
+    expect(migration).toHaveBeenCalledTimes(2);
+    expect(onAlreadyComplete).toHaveBeenCalledOnce();
+  });
+
+  it("does not run the same migration while it is already in progress", async () => {
+    const { migrate } = await import("./paths.js");
+    let resolveFirstMigration: (() => void) | undefined;
+    const firstMigration = vi.fn(
+      () =>
+        new Promise<void>((resolve) => {
+          resolveFirstMigration = resolve;
+        }),
+    );
+    const skippedMigration = vi.fn();
+    const onConcurrentMigration = vi.fn();
+
+    const firstRun = migrate("concurrent-migration", firstMigration);
+    await migrate(
+      "concurrent-migration",
+      skippedMigration,
+      onConcurrentMigration,
+    );
+
+    expect(skippedMigration).not.toHaveBeenCalled();
+    expect(onConcurrentMigration).toHaveBeenCalledOnce();
+
+    if (!resolveFirstMigration) {
+      throw new Error("The first migration did not start");
+    }
+    resolveFirstMigration();
+    await firstRun;
+    expect(
+      fs.existsSync(
+        path.join(continueGlobalDir!, ".migrations", "concurrent-migration"),
+      ),
+    ).toBe(true);
+  });
+});