@x12i/catalox 3.1.1 → 3.2.0

package/dist/src/catalox/restore-firestore-backup.d.ts

@@ -1,4 +1,4 @@
-import type { RestoreFirestoreBackupInput, RestoreFirestoreBackupResult, RestoreFirestoreBackupSource, UndoFirestoreRestoreInput, UndoFirestoreRestoreResult } from "../contracts/restore.js";
+import type { UndoFirestoreRestoreInput, UndoFirestoreRestoreResult } from "../contracts/restore.js";
 import type { BackupDataDeps } from "./backup-data.js";
 import { NativeItemStore } from "../firebase/native-item-store.js";
 import { DefinitionStore } from "../firebase/definition-store.js";
@@ -12,7 +12,11 @@ export type RestoreFirestoreDeps = BackupDataDeps & {
 export type RestoreFirestoreBackupSessionManifest = {
     restoreSessionId: string;
     createdAt: string;
-    source: RestoreFirestoreBackupSource;
+    source: {
+        kind: "gcs";
+        gcsBucket: string;
+        gcsRunFolder: string;
+    };
     includeSnapshots: boolean;
     phase: "preRestoreCaptured" | "restored" | "undone" | "failed";
     nativeCatalogIds: string[];
@@ -24,6 +28,5 @@ export type RestoreFirestoreBackupSessionManifest = {
         runId: string;
     }[];
 };
-export declare function runRestoreFirestoreBackup(deps: RestoreFirestoreDeps, input: RestoreFirestoreBackupInput): Promise<RestoreFirestoreBackupResult>;
 export declare function runUndoFirestoreRestore(deps: RestoreFirestoreDeps, input: UndoFirestoreRestoreInput): Promise<UndoFirestoreRestoreResult>;
 //# sourceMappingURL=restore-firestore-backup.d.ts.map

package/dist/src/catalox/restore-firestore-backup.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"restore-firestore-backup.d.ts","sourceRoot":"","sources":["../../../src/catalox/restore-firestore-backup.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EACV,2BAA2B,EAE3B,4BAA4B,EAC5B,4BAA4B,EAE5B,yBAAyB,EAEzB,0BAA0B,EAC3B,MAAM,yBAAyB,CAAC;AACjC,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAavD,OAAO,EAAE,eAAe,EAAE,MAAM,kCAAkC,CAAC;AACnE,OAAO,EAAE,eAAe,EAAE,MAAM,iCAAiC,CAAC;AAClE,OAAO,EAAE,qBAAqB,EAAE,MAAM,yCAAyC,CAAC;AAQhF,eAAO,MAAM,2CAA2C,2BAA2B,CAAC;AAIpF,MAAM,MAAM,oBAAoB,GAAG,cAAc,GAAG;IAClD,WAAW,EAAE,eAAe,CAAC;IAC7B,WAAW,EAAE,eAAe,CAAC;IAC7B,gBAAgB,EAAE,qBAAqB,CAAC;CACzC,CAAC;AAWF,MAAM,MAAM,qCAAqC,GAAG;IAClD,gBAAgB,EAAE,MAAM,CAAC;IACzB,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,4BAA4B,CAAC;IACrC,gBAAgB,EAAE,OAAO,CAAC;IAC1B,KAAK,EAAE,oBAAoB,GAAG,UAAU,GAAG,QAAQ,GAAG,QAAQ,CAAC;IAC/D,gBAAgB,EAAE,MAAM,EAAE,CAAC;IAC3B,iCAAiC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,QAAQ,CAAC,CAAC;IACrE,mBAAmB,EAAE,SAAS,MAAM,EAAE,CAAC;IACvC,kBAAkB,EAAE,MAAM,EAAE,CAAC;IAC7B,YAAY,EAAE;QAAE,SAAS,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,EAAE,CAAC;CACtD,CAAC;AAkEF,wBAAsB,yBAAyB,CAC7C,IAAI,EAAE,oBAAoB,EAC1B,KAAK,EAAE,2BAA2B,GACjC,OAAO,CAAC,4BAA4B,CAAC,CA0LvC;AAED,wBAAsB,uBAAuB,CAC3C,IAAI,EAAE,oBAAoB,EAC1B,KAAK,EAAE,yBAAyB,GAC/B,OAAO,CAAC,0BAA0B,CAAC,CAwFrC"}
+{"version":3,"file":"restore-firestore-backup.d.ts","sourceRoot":"","sources":["../../../src/catalox/restore-firestore-backup.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EACV,yBAAyB,EAEzB,0BAA0B,EAC3B,MAAM,yBAAyB,CAAC;AASjC,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AACvD,OAAO,EAAE,eAAe,EAAE,MAAM,kCAAkC,CAAC;AACnE,OAAO,EAAE,eAAe,EAAE,MAAM,iCAAiC,CAAC;AAClE,OAAO,EAAE,qBAAqB,EAAE,MAAM,yCAAyC,CAAC;AAMhF,eAAO,MAAM,2CAA2C,2BAA2B,CAAC;AAIpF,MAAM,MAAM,oBAAoB,GAAG,cAAc,GAAG;IAClD,WAAW,EAAE,eAAe,CAAC;IAC7B,WAAW,EAAE,eAAe,CAAC;IAC7B,gBAAgB,EAAE,qBAAqB,CAAC;CACzC,CAAC;AAMF,MAAM,MAAM,qCAAqC,GAAG;IAClD,gBAAgB,EAAE,MAAM,CAAC;IACzB,SAAS,EAAE,MAAM,CAAC;IAElB,MAAM,EAAE;QAAE,IAAI,EAAE,KAAK,CAAC;QAAC,SAAS,EAAE,MAAM,CAAC;QAAC,YAAY,EAAE,MAAM,CAAA;KAAE,CAAC;IACjE,gBAAgB,EAAE,OAAO,CAAC;IAC1B,KAAK,EAAE,oBAAoB,GAAG,UAAU,GAAG,QAAQ,GAAG,QAAQ,CAAC;IAC/D,gBAAgB,EAAE,MAAM,EAAE,CAAC;IAC3B,iCAAiC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,QAAQ,CAAC,CAAC;IACrE,mBAAmB,EAAE,SAAS,MAAM,EAAE,CAAC;IACvC,kBAAkB,EAAE,MAAM,EAAE,CAAC;IAC7B,YAAY,EAAE;QAAE,SAAS,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,EAAE,CAAC;CACtD,CAAC;AAiBF,wBAAsB,uBAAuB,CAC3C,IAAI,EAAE,oBAAoB,EAC1B,KAAK,EAAE,yBAAyB,GAC/B,OAAO,CAAC,0BAA0B,CAAC,CAwFrC"}

package/dist/src/catalox/restore-firestore-backup.js

@@ -1,66 +1,13 @@
-import { BACKUP_METADATA_SOURCE_NAMES, deleteAllDocsInFirestoreCollection, discoverNativeCatalogIds, firebaseNativeLogical, firebaseSnapshotLogical, firebaseSnapshotRunLogical, firebaseVersionedName, formatBackupTimestamp, paginatedCopyFirestoreToFirestore, firebaseLatestName, } from "./backup-data.js";
+import { BACKUP_METADATA_SOURCE_NAMES, deleteAllDocsInFirestoreCollection, firebaseNativeLogical, firebaseSnapshotLogical, firebaseSnapshotRunLogical, paginatedCopyFirestoreToFirestore, } from "./backup-data.js";
 import { NativeItemStore } from "../firebase/native-item-store.js";
 import { DefinitionStore } from "../firebase/definition-store.js";
 import { CatalogDataIndexStore } from "../firebase/catalog-data-index-store.js";
-import { legacyNativeItemsCollectionRef, resolveNativeItemsLayout, nativeItemsCollectionId, } from "../firebase/catalog-data-paths.js";
-import { fixNativeCatalogDataMetadata } from "../migrations/migrate-native-catalog-layout.js";
+import { legacyNativeItemsCollectionRef, nativeItemsCollectionId, } from "../firebase/catalog-data-paths.js";
 export const RESTORE_FIRESTORE_BACKUP_SESSION_COLLECTION = "backup-restoreSessions";
 const RESTORE_MANIFEST_COLLECTION = RESTORE_FIRESTORE_BACKUP_SESSION_COLLECTION;
-function sourceBackupCollectionId(source, logical) {
-    if (source.kind === "latest")
-        return firebaseLatestName(logical);
-    return firebaseVersionedName(source.versionTimestamp, logical);
-}
 function preRestoreCollectionId(restoreSessionId, logical) {
     return `${restoreSessionId}__preRestore-${logical}`;
 }
-/**
- * Discover snapshot backup mirrors by scanning top-level collection ids.
- * Parses `catalogSnapshotsRun--{catalogId}--{runId}` with the last `--` as delimiter (catalogId / runId must not contain `--`).
- */
-async function listSnapshotRestoreWork(fs, source, includeSnapshots) {
-    if (!includeSnapshots)
-        return { snapshotCatalogIds: [], snapshotRuns: [] };
-    const cols = await fs.listCollections();
-    const itemPrefix = source.kind === "latest" ? "backup-catalogSnapshots--" : `${source.versionTimestamp}__backup-catalogSnapshots--`;
-    const runPrefix = source.kind === "latest"
-        ? "backup-catalogSnapshotsRun--"
-        : `${source.versionTimestamp}__backup-catalogSnapshotsRun--`;
-    const snapshotCatalogIds = new Set();
-    const snapshotRuns = [];
-    for (const c of cols) {
-        const id = c.id;
-        if (!id.startsWith(itemPrefix) || id.includes("catalogSnapshotsRun"))
-            continue;
-        const catalogId = id.slice(itemPrefix.length);
-        if (!catalogId)
-            continue;
-        const probe = await fs.collection(id).limit(1).get();
-        if (!probe.empty)
-            snapshotCatalogIds.add(catalogId);
-    }
-    const runSeen = new Set();
-    for (const c of cols) {
-        const id = c.id;
-        if (!id.startsWith(runPrefix))
-            continue;
-        const rest = id.slice(runPrefix.length);
-        const delim = rest.lastIndexOf("--");
-        if (delim === -1)
-            continue;
-        const catalogId = rest.slice(0, delim);
-        const runId = rest.slice(delim + 2);
-        const probe = await fs.collection(id).limit(1).get();
-        if (probe.empty)
-            continue;
-        const rk = `${catalogId}\0${runId}`;
-        if (runSeen.has(rk))
-            continue;
-        runSeen.add(rk);
-        snapshotRuns.push({ catalogId, runId });
-    }
-    return { snapshotCatalogIds: [...snapshotCatalogIds], snapshotRuns };
-}
 async function writeManifest(fs, manifest) {
     await fs.collection(RESTORE_MANIFEST_COLLECTION).doc(manifest.restoreSessionId).set(manifest, { merge: true });
 }
@@ -70,175 +17,7 @@ async function readManifest(fs, restoreSessionId) {
         return null;
     return snap.data();
 }
-export async function runRestoreFirestoreBackup(deps, input) {
-    const issues = [];
-    const counts = {};
-    const nativeItemSourceLayoutByCatalogId = {};
-    if (input.source.kind === "versioned" && !input.source.versionTimestamp?.trim()) {
-        return {
-            ok: false,
-            restoreSessionId: "",
-            counts: {},
-            issues: [{ code: "missing_version_timestamp", message: "versioned restore requires versionTimestamp" }],
-            nativeItemSourceLayoutByCatalogId: {},
-        };
-    }
-    const fs = deps.firestoreStore.firestore;
-    const restoreSessionId = (input.restoreSessionId?.trim() && input.restoreSessionId) || formatBackupTimestamp();
-    const includeSnapshots = Boolean(input.includeSnapshots);
-    const allCatalogs = await deps.catalogs.listAll();
-    const nativeCatalogIds = await discoverNativeCatalogIds(fs, allCatalogs, {
-        bindings: deps.bindings,
-        ...(input.catalogIds != null && input.catalogIds.length ? { catalogIds: input.catalogIds } : {}),
-        ...(input.appId != null && input.appId !== "" ? { appId: input.appId } : {}),
-    });
-    const probeLogical = BACKUP_METADATA_SOURCE_NAMES[0];
-    const probeId = sourceBackupCollectionId(input.source, probeLogical);
-    const probeSnap = await fs.collection(probeId).limit(1).get();
-    if (probeSnap.empty) {
-        return {
-            ok: false,
-            restoreSessionId,
-            counts,
-            issues: [
-                {
-                    code: "backup_source_empty",
-                    message: `No documents in backup collection ${probeId}; nothing to restore from this source`,
-                    detail: { probeId },
-                },
-            ],
-            nativeItemSourceLayoutByCatalogId: {},
-        };
-    }
-    const { snapshotCatalogIds, snapshotRuns } = await listSnapshotRestoreWork(fs, input.source, includeSnapshots);
-    try {
-        for (const name of BACKUP_METADATA_SOURCE_NAMES) {
-            const destPre = preRestoreCollectionId(restoreSessionId, name);
-            await deleteAllDocsInFirestoreCollection(fs, destPre);
-            await paginatedCopyFirestoreToFirestore(fs, name, destPre, counts, `pre:${destPre}`);
-        }
-        for (const catalogId of nativeCatalogIds) {
-            const layout = await resolveNativeItemsLayout(fs, catalogId);
-            nativeItemSourceLayoutByCatalogId[String(catalogId)] = layout;
-            const logical = firebaseNativeLogical(String(catalogId));
-            const destPre = preRestoreCollectionId(restoreSessionId, logical);
-            await deleteAllDocsInFirestoreCollection(fs, destPre);
-            const livePath = layout === "legacy"
-                ? legacyNativeItemsCollectionRef(fs, catalogId).path
-                : fs.collection(nativeItemsCollectionId(String(catalogId))).path;
-            await paginatedCopyFirestoreToFirestore(fs, livePath, destPre, counts, `pre:${destPre}`);
-        }
-        if (includeSnapshots) {
-            for (const catalogId of snapshotCatalogIds) {
-                const logical = firebaseSnapshotLogical(catalogId);
-                const destPre = preRestoreCollectionId(restoreSessionId, logical);
-                await deleteAllDocsInFirestoreCollection(fs, destPre);
-                const liveItems = fs.collection("catalogSnapshots").doc(catalogId).collection("items").path;
-                await paginatedCopyFirestoreToFirestore(fs, liveItems, destPre, counts, `pre:${destPre}`);
-            }
-            for (const { catalogId, runId } of snapshotRuns) {
-                const logical = firebaseSnapshotRunLogical(catalogId, runId);
-                const destPre = preRestoreCollectionId(restoreSessionId, logical);
-                await deleteAllDocsInFirestoreCollection(fs, destPre);
-                const livePath = fs.collection("catalogSnapshots").doc(catalogId).collection("runs").doc(runId).collection("items")
-                    .path;
-                await paginatedCopyFirestoreToFirestore(fs, livePath, destPre, counts, `pre:${destPre}`);
-            }
-        }
-        const manifest = {
-            restoreSessionId,
-            createdAt: new Date().toISOString(),
-            source: input.source,
-            includeSnapshots,
-            phase: "preRestoreCaptured",
-            nativeCatalogIds: nativeCatalogIds.map(String),
-            nativeItemSourceLayoutByCatalogId: { ...nativeItemSourceLayoutByCatalogId },
-            metadataSourceNames: BACKUP_METADATA_SOURCE_NAMES,
-            snapshotCatalogIds,
-            snapshotRuns,
-        };
-        await writeManifest(fs, manifest);
-        for (const name of BACKUP_METADATA_SOURCE_NAMES) {
-            const src = sourceBackupCollectionId(input.source, name);
-            await deleteAllDocsInFirestoreCollection(fs, name);
-            await paginatedCopyFirestoreToFirestore(fs, src, name, counts, `restore:${name}`);
-        }
-        for (const catalogId of nativeCatalogIds) {
-            const cid = String(catalogId);
-            const flatPath = nativeItemsCollectionId(cid);
-            await deleteAllDocsInFirestoreCollection(fs, flatPath);
-            const src = sourceBackupCollectionId(input.source, firebaseNativeLogical(cid));
-            await paginatedCopyFirestoreToFirestore(fs, src, flatPath, counts, `restore:nativeFlat:${cid}`);
-            const legacyPath = legacyNativeItemsCollectionRef(fs, catalogId).path;
-            await deleteAllDocsInFirestoreCollection(fs, legacyPath);
-        }
-        const nowIso = new Date().toISOString();
-        if (nativeCatalogIds.length > 0) {
-            await fixNativeCatalogDataMetadata({
-                definitions: deps.definitions,
-                catalogDataIndex: deps.catalogDataIndex,
-                nativeItems: deps.nativeItems,
-            }, nativeCatalogIds, nowIso);
-        }
-        if (includeSnapshots) {
-            for (const catalogId of snapshotCatalogIds) {
-                const dest = fs.collection("catalogSnapshots").doc(catalogId).collection("items").path;
-                const src = sourceBackupCollectionId(input.source, firebaseSnapshotLogical(catalogId));
-                await deleteAllDocsInFirestoreCollection(fs, dest);
-                await paginatedCopyFirestoreToFirestore(fs, src, dest, counts, `restore:snap:${catalogId}`);
-            }
-            for (const { catalogId, runId } of snapshotRuns) {
-                const dest = fs
-                    .collection("catalogSnapshots")
-                    .doc(catalogId)
-                    .collection("runs")
-                    .doc(runId)
-                    .collection("items").path;
-                const src = sourceBackupCollectionId(input.source, firebaseSnapshotRunLogical(catalogId, runId));
-                await deleteAllDocsInFirestoreCollection(fs, dest);
-                await paginatedCopyFirestoreToFirestore(fs, src, dest, counts, `restore:snaprun:${catalogId}:${runId}`);
-            }
-        }
-        await writeManifest(fs, { ...manifest, phase: "restored" });
-        deps.nativeItems.invalidateLayoutCache();
-        return {
-            ok: true,
-            restoreSessionId,
-            counts,
-            issues,
-            nativeItemSourceLayoutByCatalogId,
-        };
-    }
-    catch (e) {
-        const msg = e instanceof Error ? e.message : String(e);
-        issues.push({ code: "restore_failed", message: msg });
-        try {
-            await writeManifest(fs, {
-                restoreSessionId,
-                createdAt: new Date().toISOString(),
-                source: input.source,
-                includeSnapshots,
-                phase: "failed",
-                nativeCatalogIds: nativeCatalogIds.map(String),
-                nativeItemSourceLayoutByCatalogId: { ...nativeItemSourceLayoutByCatalogId },
-                metadataSourceNames: BACKUP_METADATA_SOURCE_NAMES,
-                snapshotCatalogIds,
-                snapshotRuns,
-            });
-        }
-        catch {
-            // ignore manifest write errors during failure handling
-        }
-        deps.nativeItems.invalidateLayoutCache();
-        return {
-            ok: false,
-            restoreSessionId,
-            counts,
-            issues,
-            nativeItemSourceLayoutByCatalogId,
-        };
-    }
-}
+// Firestore mirror restore (backup-* / {ts}__backup-*) removed; backups are storage-only (GCS).
 export async function runUndoFirestoreRestore(deps, input) {
     const issues = [];
     const counts = {};

package/dist/src/catalox/restore-firestore-backup.js.map

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

package/dist/src/cli/index.js

@@ -267,25 +267,21 @@ storeCmd
 });
 const firestoreCmd = program
     .command("firestore")
-    .description("Firestore backup, restore (Firebase mirrors), and native layout migration");
+    .description("Firestore backup (GCS), restore-from-GCS, and native layout migration");
 firestoreCmd
     .command("backup")
-    .description("Generic Catalox backup to Mongo (catalox-backups), Firebase (backup-* collections), or GCS (NDJSON via @x12i/helpers/gcs)")
+    .description("Catalox backup to GCS only (NDJSON + catalox-backup-manifest.json)")
     .requiredOption("--app <appId>", "AppId for Catalox context")
-    .requiredOption("--mode <mongo|firebase|gcs>", "Backup target")
-    .option("--mongo-uri <uri>", "Mongo connection string (required when mode=mongo)")
-    .option("--bucket <name>", "GCS bucket name (required when mode=gcs)")
+    .requiredOption("--bucket <name>", "GCS bucket name")
     .option("--gcs-prefix <path>", "Optional prefix before timestamp folder (default: catalox-firestore-backups/)", "")
     .option("--label <text>", "Backup label stored on manifest")
     .option("--snapshots", "Include catalogSnapshots data", false)
     .option("--catalog <catalogId...>", "Restrict which native catalogs are copied")
     .option("--god", "God mode", false)
     .action(async (opts) => {
-    const m = String(opts.mode).toLowerCase();
-    const mode = m === "mongo" ? "mongo" : m === "gcs" ? "gcs" : "firebase";
-    if (mode === "gcs" && !(opts.bucket != null && String(opts.bucket).trim())) {
+    if (!(opts.bucket != null && String(opts.bucket).trim())) {
         // eslint-disable-next-line no-console
-        console.error("--bucket is required when --mode gcs");
+        console.error("--bucket is required");
         process.exitCode = 1;
         return;
     }
@@ -293,14 +289,9 @@ firestoreCmd
     const ctx = baseContext({ app: opts.app, god: opts.god });
     const gcsPrefixOpt = opts.gcsPrefix != null && String(opts.gcsPrefix).trim() ? String(opts.gcsPrefix).trim() : undefined;
     const res = await catalox.backupData(ctx, {
-        mode,
-        mongoBackupUri: opts.mongoUri,
-        ...(mode === "gcs"
-            ? {
-                gcsBucket: String(opts.bucket).trim(),
-                ...(gcsPrefixOpt !== undefined ? { gcsPrefix: gcsPrefixOpt } : {}),
-            }
-            : {}),
+        mode: "gcs",
+        gcsBucket: String(opts.bucket).trim(),
+        ...(gcsPrefixOpt !== undefined ? { gcsPrefix: gcsPrefixOpt } : {}),
         includeSnapshots: Boolean(opts.snapshots),
         ...(opts.catalog?.length ? { catalogIds: opts.catalog } : {}),
         ...(opts.label != null && String(opts.label) !== "" ? { backupLabel: String(opts.label) } : {}),
@@ -309,42 +300,11 @@ firestoreCmd
     if (!res.ok)
         process.exitCode = 1;
 });
-firestoreCmd
-    .command("restore-backup")
-    .description("Restore live Firestore from backup-* (same DB). Captures pre-restore copies to {session}__preRestore-* for undo.")
-    .requiredOption("--app <appId>", "AppId for Catalox context")
-    .option("--from <latest|versioned>", "Backup source", "latest")
-    .option("--version-ts <token>", "When --from versioned: timestamp token matching backup collection prefix")
-    .option("--snapshots", "Also restore catalogSnapshots from backup mirrors", false)
-    .option("--catalog <catalogId...>", "Restrict which native catalogs are restored")
-    .option("--god", "God mode", false)
-    .action(async (opts) => {
-    const catalox = createCatalox();
-    const ctx = baseContext({ app: opts.app, god: opts.god });
-    const from = String(opts.from).toLowerCase();
-    const source = from === "versioned"
-        ? { kind: "versioned", versionTimestamp: String(opts.versionTs ?? "") }
-        : { kind: "latest" };
-    if (from === "versioned" && !String(opts.versionTs ?? "").trim()) {
-        // eslint-disable-next-line no-console
-        console.error("--version-ts is required when --from versioned");
-        process.exitCode = 1;
-        return;
-    }
-    const res = await catalox.restoreFirestoreBackup(ctx, {
-        source,
-        includeSnapshots: Boolean(opts.snapshots),
-        ...(opts.catalog?.length ? { catalogIds: opts.catalog } : {}),
-    });
-    await writeOrStdout(JSON.stringify(res, null, 2));
-    if (!res.ok)
-        process.exitCode = 1;
-});
 firestoreCmd
     .command("undo-restore-backup")
-    .description("Revert a prior restore-backup or restore-backup-from-gcs using backup-restoreSessions/{sessionId} and preRestore collections")
+    .description("Revert a prior restore-backup-from-gcs using backup-restoreSessions/{sessionId} and preRestore collections")
     .requiredOption("--app <appId>", "AppId for Catalox context")
-    .requiredOption("--session <restoreSessionId>", "restoreSessionId returned by restore-backup")
+    .requiredOption("--session <restoreSessionId>", "restoreSessionId returned by restore-backup-from-gcs")
     .option("--god", "God mode", false)
     .action(async (opts) => {
     const catalox = createCatalox();
@@ -358,7 +318,7 @@ firestoreCmd
 });
 firestoreCmd
     .command("restore-backup-from-gcs")
-    .description("Restore live Firestore from one backupData GCS run (NDJSON under --run-folder). Same undo semantics as restore-backup.")
+    .description("Restore live Firestore from one backupData GCS run (NDJSON under --run-folder). Uses pre-restore sidecars so undo works.")
     .requiredOption("--app <appId>", "AppId for Catalox context")
     .requiredOption("--bucket <name>", "GCS bucket name")
     .requiredOption("--run-folder <path>", "Run folder within bucket (e.g. catalox-firestore-backups/2026_04_18T12_00_00Z)")
@@ -457,9 +417,11 @@ firestoreCmd
 });
 firestoreCmd
     .command("migrate-native-catalog-data")
-    .description("Backup (Firebase) then copy legacy catalogData/{catalogId}/items → flat catalogData-{catalogId}-items (stops OLD layout)")
+    .description("Optional pre-migrate backup to GCS, then copy legacy catalogData/{catalogId}/items → flat catalogData-{catalogId}-items")
     .requiredOption("--app <appId>", "AppId for Catalox context")
-    .option("--skip-backup", "Skip Firebase backupData before migrate", false)
+    .option("--skip-backup", "Skip pre-migrate GCS backup", false)
+    .option("--backup-bucket <name>", "GCS bucket for pre-migrate backup (required unless --skip-backup)")
+    .option("--backup-prefix <path>", "Optional gcsPrefix for pre-migrate backupData")
     .option("--backup-label <text>", "Label for pre-migrate backup", "pre-native-layout-migration")
     .option("--snapshots", "Include snapshots in pre-migrate backup", false)
     .option("--dry-run", "Count/copy simulation only for migrate", false)
@@ -474,8 +436,18 @@ firestoreCmd
     const catalox = createCatalox();
     const ctx = baseContext({ app: opts.app, god: opts.god });
     if (!opts.skipBackup) {
+        if (!(opts.backupBucket != null && String(opts.backupBucket).trim())) {
+            // eslint-disable-next-line no-console
+            console.error("--backup-bucket is required unless --skip-backup");
+            process.exitCode = 1;
+            return;
+        }
         const b = await catalox.backupData(ctx, {
-            mode: "firebase",
+            mode: "gcs",
+            gcsBucket: String(opts.backupBucket).trim(),
+            ...(opts.backupPrefix != null && String(opts.backupPrefix).trim() !== ""
+                ? { gcsPrefix: String(opts.backupPrefix).trim() }
+                : {}),
             backupLabel: String(opts.backupLabel != null ? opts.backupLabel : "pre-native-layout-migration"),
             includeSnapshots: Boolean(opts.snapshots),
         });