gencow 0.1.165 → 0.1.166

package/bin/gencow.mjs

@@ -11,7 +11,7 @@
  *   gencow db:restore  — restore DB from backup
  *   gencow db:studio   — open Drizzle Studio (visual DB browser)
  *   gencow dashboard   — open /_admin in browser
- *   gencow backup      — manage database backups (list/create/restore/delete/download)
+ *   gencow backup      — manage database backups (list/create/restore/restore-file/delete/download)
  *   gencow templates   — publish/list/download/clone marketplace templates
  *   gencow help        — show this help
  */

package/lib/auth-command.mjs

@@ -7,7 +7,7 @@ export const CREDS_PATH_LABEL = "~/.gencow/credentials.json";
 
 export function getBrowserOpenCommand(platform = process.platform) {
   if (platform === "darwin") return "open";
-  if (platform === "win32") return "start";
+  if (platform === "win32") return 'cmd /c start ""';
   return "xdg-open";
 }
 
@@ -18,9 +18,14 @@ export function formatWhoamiExpiry(expiresAt, now = Date.now()) {
   return `${expiresDate.toLocaleString()} (${daysLeft} days left)`;
 }
 
-async function defaultOpenUrl(url, platform) {
-  const { exec } = await import("child_process");
-  exec(`${getBrowserOpenCommand(platform)} "${url}"`);
+export async function openBrowserUrl(url, options = {}) {
+  const { openImpl } = options;
+  const openFn = openImpl ?? (await import("open")).default;
+  await openFn(url);
+}
+
+async function defaultOpenUrl(url) {
+  await openBrowserUrl(url);
 }
 
 function sleep(ms, setTimeoutImpl) {

package/lib/backup-command.mjs

@@ -17,6 +17,18 @@ export function resolveBackupAppId(restArgs, gencowJson = null) {
   return appId;
 }
 
+export function resolveBackupFilePath(restArgs) {
+  for (let i = 0; i < restArgs.length; i++) {
+    const arg = restArgs[i];
+    if (arg === "--app" || arg === "-a") {
+      i++;
+      continue;
+    }
+    if (!arg.startsWith("-")) return arg;
+  }
+  return null;
+}
+
 export function formatBackupSize(bytes) {
   if (bytes < 1024) return `${bytes} B`;
   if (bytes < 1024 * 1024) return `${(bytes / 1024).toFixed(1)} KB`;
@@ -39,16 +51,17 @@ function renderBackupHelp(logImpl = log, errorImpl = error, subCmd = null) {
   logImpl(`    gencow backup list               List all backups`);
   logImpl(`    gencow backup create [note]       Create a manual backup`);
   logImpl(`    gencow backup restore <id>        Restore from backup`);
+  logImpl(`    gencow backup restore-file <path> Restore from a downloaded dump file`);
   logImpl(`    gencow backup delete <id>         Delete a backup`);
   logImpl(`    gencow backup download <id>       Download backup file (Pro+)\n`);
 }
 
-async function promptRestoreConfirm(backupId, { createInterfaceImpl }) {
+async function promptRestoreConfirm(sourceLabel, { createInterfaceImpl }) {
   const createInterface = createInterfaceImpl ?? (await import("readline")).createInterface;
   const rl = createInterface({ input: process.stdin, output: process.stdout });
   return await new Promise((resolveAnswer) => {
     rl.question(
-      `\n  ${YELLOW}⚠ 현재 데이터베이스가 백업 #${backupId}로 교체됩니다. 계속하시겠습니까? (y/N): ${RESET}`,
+      `\n  ${YELLOW}⚠ 현재 데이터베이스가 ${sourceLabel}로 교체됩니다. 계속하시겠습니까? (y/N): ${RESET}`,
       (answer) => {
         rl.close();
         const normalized = answer.trim().toLowerCase();
@@ -66,6 +79,7 @@ export function createBackupCommand({
   infoImpl = info,
   logImpl = log,
   platformFetchImpl = platformFetch,
+  readFileAsyncImpl,
   readFileSyncImpl = readFileSync,
   requireCredsImpl = requireCreds,
   resolvePathImpl = resolve,
@@ -155,7 +169,7 @@ export function createBackupCommand({
           return;
         }
 
-        const confirmed = await promptRestoreConfirm(backupId, { createInterfaceImpl });
+        const confirmed = await promptRestoreConfirm(`백업 #${backupId}`, { createInterfaceImpl });
         if (!confirmed) {
           infoImpl("Restore cancelled.");
           return;
@@ -173,6 +187,46 @@ export function createBackupCommand({
         return;
       }
 
+      case "restore-file": {
+        const filePath = resolveBackupFilePath(restArgs);
+        if (!filePath) {
+          errorImpl("Specify backup file path: gencow backup restore-file <path>");
+          return;
+        }
+        if (!existsSyncImpl(filePath)) {
+          errorImpl(`Backup file not found: ${filePath}`);
+          return;
+        }
+
+        const confirmed = await promptRestoreConfirm(`파일 ${filePath}`, { createInterfaceImpl });
+        if (!confirmed) {
+          infoImpl("Restore cancelled.");
+          return;
+        }
+
+        logImpl(`\n${BOLD}Restoring from file ${filePath}...${RESET}\n`);
+        const readFileAsync = readFileAsyncImpl ?? (await import("fs/promises")).readFile;
+        const buffer = await readFileAsync(filePath);
+        const form = new FormData();
+        form.append("file", new Blob([buffer]), filePath.split(/[\\/]/).pop() || "backup.dump");
+        const response = await platformFetchImpl(
+          creds,
+          `/platform/apps/${appId}/backups/restore-file`,
+          {
+            method: "POST",
+            body: form,
+          },
+        );
+        if (!response.ok) {
+          errorImpl(
+            `Restore failed: ${(await response.json?.().catch(() => ({}))).error || response.statusText}`,
+          );
+          return;
+        }
+        successImpl("Database restored from file. App restarted.");
+        return;
+      }
+
       case "delete":
       case "rm": {
         const backupId = parseInt(restArgs[0], 10);

package/lib/cli-project-runtime.mjs

@@ -1,7 +1,7 @@
 import { execSync, spawn } from "child_process";
 import { appendFileSync, existsSync, readdirSync, readFileSync, rmSync, statSync, writeFileSync } from "fs";
 import { createRequire } from "module";
-import { basename, dirname, join, resolve } from "path";
+import { basename, delimiter, dirname, join, resolve } from "path";
 import { fileURLToPath, pathToFileURL } from "url";
 
 import { resolveCodegenServerPublishDir } from "./codegen-command.mjs";
@@ -400,9 +400,20 @@ function ensureEsbuildConsistency(options = {}) {
 }
 
 export function buildDrizzleKitCommand(subcmd, options = {}) {
-  const { cwd = process.cwd(), existsSyncImpl = existsSync, resolvePathImpl = resolve } = options;
+  const {
+    cwd = process.cwd(),
+    existsSyncImpl = existsSync,
+    platform = process.platform,
+    resolvePathImpl = resolve,
+  } = options;
   const localBin = resolvePathImpl(cwd, "node_modules/.bin/drizzle-kit");
-  const cmd = existsSyncImpl(localBin) ? `"${localBin}" ${subcmd}` : `npx drizzle-kit ${subcmd}`;
+  const windowsBin = `${localBin}.cmd`;
+  const resolvedBin = platform === "win32" && existsSyncImpl(windowsBin)
+    ? windowsBin
+    : existsSyncImpl(localBin)
+      ? localBin
+      : null;
+  const cmd = resolvedBin ? `"${resolvedBin}" ${subcmd}` : `npx drizzle-kit ${subcmd}`;
   const env = ensureEsbuildConsistency({ ...options, cwd });
   return { cmd, env };
 }
@@ -509,6 +520,7 @@ export function buildEnv(config, options = {}) {
     findServerRootImpl = findServerRoot,
     processEnv = process.env,
     existsSyncImpl = existsSync,
+    pathDelimiter = delimiter,
     readFileSyncImpl = readFileSync,
     resolvePathImpl = resolve,
   } = options;
@@ -531,7 +543,7 @@ export function buildEnv(config, options = {}) {
   const existingNodePath = processEnv.NODE_PATH || "";
   const nodePath = [cwdNodeModules, cliNodeModules, serverNodeModules, monoNodeModules, existingNodePath]
     .filter(Boolean)
-    .join(":");
+    .join(pathDelimiter);
 
   const drizzleSchemaPaths = resolveDrizzleSchemaPaths(config, {
     cwd,

package/lib/codegen/index.mjs

@@ -8953,7 +8953,7 @@ function sortArtifacts(artifacts) {
 // src/codegen/infra/auth-schema-worker.ts
 import { spawnSync } from "node:child_process";
 import { unlinkSync, writeFileSync } from "node:fs";
-import { resolve } from "node:path";
+import { delimiter, resolve } from "node:path";
 import { pathToFileURL } from "node:url";
 function buildGeneratorScript(authPath, emitRelations = true) {
   const authUrl = pathToFileURL(authPath).href;
@@ -9015,7 +9015,7 @@ function runAuthSchemaWorker({
       encoding: "utf8",
       env: {
         ...process.env,
-        NODE_PATH: [resolve(cwd, "node_modules"), process.env.NODE_PATH ?? ""].filter(Boolean).join(":")
+        NODE_PATH: [resolve(cwd, "node_modules"), process.env.NODE_PATH ?? ""].filter(Boolean).join(delimiter)
       }
     });
     if (result.error) throw result.error;
@@ -11942,8 +11942,8 @@ function emoji() {
 }
 var ipv4 = /^(?:(?:25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9][0-9]|[0-9])\.){3}(?:25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9][0-9]|[0-9])$/;
 var ipv6 = /^(([0-9a-fA-F]{1,4}:){7}[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,7}:|([0-9a-fA-F]{1,4}:){1,6}:[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,5}(:[0-9a-fA-F]{1,4}){1,2}|([0-9a-fA-F]{1,4}:){1,4}(:[0-9a-fA-F]{1,4}){1,3}|([0-9a-fA-F]{1,4}:){1,3}(:[0-9a-fA-F]{1,4}){1,4}|([0-9a-fA-F]{1,4}:){1,2}(:[0-9a-fA-F]{1,4}){1,5}|[0-9a-fA-F]{1,4}:((:[0-9a-fA-F]{1,4}){1,6})|:((:[0-9a-fA-F]{1,4}){1,7}|:))$/;
-var mac = (delimiter) => {
-  const escapedDelim = escapeRegex(delimiter ?? ":");
+var mac = (delimiter3) => {
+  const escapedDelim = escapeRegex(delimiter3 ?? ":");
   return new RegExp(`^(?:[0-9A-F]{2}${escapedDelim}){5}[0-9A-F]{2}$|^(?:[0-9a-f]{2}${escapedDelim}){5}[0-9a-f]{2}$`);
 };
 var cidrv4 = /^((25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9][0-9]|[0-9])\.){3}(25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9][0-9]|[0-9])\/([0-9]|[1-2][0-9]|3[0-2])$/;
@@ -25120,7 +25120,7 @@ function assertSourceEntrypoints(input) {
 }
 
 // src/codegen/frontend/table-introspector.ts
-import { relative as relative3, resolve as resolve7 } from "node:path";
+import { delimiter as delimiter2, relative as relative3, resolve as resolve7 } from "node:path";
 function createTableIntrospector(deps) {
   return {
     extract(input) {
@@ -25141,7 +25141,7 @@ async function extractTables(input, deps) {
       args: [scriptPath],
       cwd: workDir,
       env: {
-        NODE_PATH: [resolve7(input.projectRoot, "node_modules"), process.env.NODE_PATH ?? ""].filter(Boolean).join(":")
+        NODE_PATH: [resolve7(input.projectRoot, "node_modules"), process.env.NODE_PATH ?? ""].filter(Boolean).join(delimiter2)
       }
     });
     if (result.exitCode !== 0) {

package/lib/cron-manifest.mjs

@@ -284,19 +284,48 @@ function collectInternalProcedureNames(source) {
 
 function parseDefineApiCronJobsSource(source) {
   const stripped = stripComments(source);
-
   const internalNames = collectInternalProcedureNames(stripped);
+  const parseJob = ({ name, method, scheduleArgs, actionSource }) => {
+    if (!name) return null;
+    let pattern = null;
+    if (method === "interval") pattern = intervalOptionsToPattern(scheduleArgs);
+    if (method === "daily") {
+      const hour = parseNumericOption(scheduleArgs, "hour");
+      const minute = parseNumericOption(scheduleArgs, "minute") ?? 0;
+      if (hour !== undefined) pattern = `${minute} ${hour} * * *`;
+    }
+    if (method === "weekly") {
+      const dayOfWeek = parseNumericOption(scheduleArgs, "dayOfWeek");
+      const hour = parseNumericOption(scheduleArgs, "hour");
+      const minute = parseNumericOption(scheduleArgs, "minute") ?? 0;
+      if (dayOfWeek !== undefined && hour !== undefined) pattern = `${minute} ${hour} * * ${dayOfWeek}`;
+    }
+    if (method === "cron") pattern = parseStringLiteral(scheduleArgs);
+    if (!pattern) return null;
+
+    const procedureName = parseStringLiteral(actionSource) ?? internalNames.get(actionSource?.trim());
+    if (!procedureName) {
+      return { skipped: { name, reason: "inline or non-internal action is not supported in cloud cron manifest" } };
+    }
+    return { job: { name, pattern, procedureName } };
+  };
+
+  const entries = [];
+  let entryOrder = 0;
+  const addParsed = (index, parsed) => {
+    if (!parsed) return;
+    entries.push({ index, order: entryOrder, parsed });
+    entryOrder += 1;
+  };
+
   const builderNames = new Set();
   const builderRegex = /\bconst\s+([A-Za-z_$][\w$]*)\s*=\s*cronJobs\s*\(\s*\)\s*;?/g;
   let builderMatch;
   while ((builderMatch = builderRegex.exec(stripped))) {
     builderNames.add(builderMatch[1]);
   }
-  if (builderNames.size === 0) return { jobs: [], skipped: [], skippedInlineCount: 0 };
 
   const callRegex = /\b([A-Za-z_$][\w$]*)\.(interval|daily|weekly|cron)\s*\(([\s\S]*?)\)\s*;?/g;
-  const jobs = [];
-  const skipped = [];
   let match;
   while ((match = callRegex.exec(stripped))) {
     const builderName = match[1];
@@ -305,34 +334,54 @@ function parseDefineApiCronJobsSource(source) {
     const method = match[2];
     const args = splitTopLevelArgs(match[3] ?? "");
     const name = parseStringLiteral(args[0]);
-    if (!name) continue;
+    addParsed(
+      match.index,
+      parseJob({ name, method, scheduleArgs: args[1], actionSource: args[2]?.trim() }),
+    );
+  }
 
-    let pattern = null;
-    if (method === "interval") pattern = intervalOptionsToPattern(args[1]);
-    if (method === "daily") {
-      const hour = parseNumericOption(args[1], "hour");
-      const minute = parseNumericOption(args[1], "minute") ?? 0;
-      if (hour !== undefined) pattern = `${minute} ${hour} * * *`;
-    }
-    if (method === "weekly") {
-      const dayOfWeek = parseNumericOption(args[1], "dayOfWeek");
-      const hour = parseNumericOption(args[1], "hour");
-      const minute = parseNumericOption(args[1], "minute") ?? 0;
-      if (dayOfWeek !== undefined && hour !== undefined) pattern = `${minute} ${hour} * * ${dayOfWeek}`;
+  const chainRegex = /\b(?:export\s+)?const\s+[A-Za-z_$][\w$]*\s*=\s*cronJobs\s*\(\s*\)([\s\S]*?);/g;
+  while ((match = chainRegex.exec(stripped))) {
+    const chainSource = match[1] ?? "";
+    const chainCallRegex = /\.(interval|daily|weekly|cron)\s*\(([\s\S]*?)\)/g;
+    let chainMatch;
+    while ((chainMatch = chainCallRegex.exec(chainSource))) {
+      const args = splitTopLevelArgs(chainMatch[2] ?? "");
+      addParsed(
+        match.index + chainMatch.index,
+        parseJob({
+          name: parseStringLiteral(args[0]),
+          method: chainMatch[1],
+          scheduleArgs: args[1],
+          actionSource: args[2]?.trim(),
+        }),
+      );
     }
-    if (method === "cron") pattern = parseStringLiteral(args[1]);
-    if (!pattern) continue;
+  }
 
-    const actionSource = args[2]?.trim();
-    const stringAction = parseStringLiteral(actionSource);
-    const procedureName = stringAction ?? internalNames.get(actionSource);
-    if (!procedureName) {
-      skipped.push({ name, reason: "inline or non-internal action is not supported in cloud cron manifest" });
-      continue;
-    }
-    jobs.push({ name, pattern, procedureName });
+  const declarativeRegex =
+    /\b(?:export\s+)?const\s+[A-Za-z_$][\w$]*\s*=\s*cron\s*\.\s*name\s*\(\s*(['"`])([^'"`]+)\1\s*\)\s*\.\s*(interval|daily|weekly|cron)\s*\(([\s\S]*?)\)\s*\.\s*handler\s*\(([\s\S]*?)\)\s*;?/g;
+  while ((match = declarativeRegex.exec(stripped))) {
+    addParsed(
+      match.index,
+      parseJob({
+        name: match[2],
+        method: match[3],
+        scheduleArgs: match[4],
+        actionSource: splitTopLevelArgs(match[5] ?? "")[0]?.trim(),
+      }),
+    );
   }
 
+  const jobs = [];
+  const skipped = [];
+  entries
+    .sort((a, b) => a.index - b.index || a.order - b.order)
+    .forEach(({ parsed }) => {
+      if (parsed.job) jobs.push(parsed.job);
+      if (parsed.skipped) skipped.push(parsed.skipped);
+    });
+
   return { jobs, skipped, skippedInlineCount: skipped.length };
 }
 
@@ -501,6 +550,50 @@ async function collectDefineApiCronJobsWithShimFallback(params) {
   }
 }
 
+function resolveLocalImportFile({ importerFile, specifier, existsSyncImpl, resolvePathImpl }) {
+  if (!specifier.startsWith(".")) return null;
+  const base = resolvePathImpl(dirname(importerFile), specifier);
+  const candidates = [
+    base,
+    `${base}.ts`,
+    `${base}.js`,
+    resolvePathImpl(base, "index.ts"),
+    resolvePathImpl(base, "index.js"),
+  ];
+  return candidates.find((candidate) => existsSyncImpl(candidate)) ?? null;
+}
+
+function collectLocalImportSourceText({
+  source,
+  file,
+  existsSyncImpl,
+  readFileSyncImpl,
+  resolvePathImpl,
+}) {
+  const imports = [];
+  const fromRegex = /\bimport\s+[^'"]*?\s+from\s+["']([^"']+)["']/g;
+  const sideEffectRegex = /\bimport\s+["']([^"']+)["']/g;
+  for (const regex of [fromRegex, sideEffectRegex]) {
+    let match;
+    while ((match = regex.exec(source))) imports.push(match[1]);
+  }
+
+  const seen = new Set();
+  const chunks = [];
+  for (const specifier of imports) {
+    const importedFile = resolveLocalImportFile({
+      importerFile: file,
+      specifier,
+      existsSyncImpl,
+      resolvePathImpl,
+    });
+    if (!importedFile || seen.has(importedFile)) continue;
+    seen.add(importedFile);
+    chunks.push(readFileSyncImpl(importedFile, "utf8"));
+  }
+  return chunks.join("\n");
+}
+
 export async function writeCronManifestForProject({
   cwd,
   functionsDir = "gencow",
@@ -526,7 +619,14 @@ export async function writeCronManifestForProject({
 
   if (!cronsFile && apiFile) {
     const source = readFileSyncImpl(apiFile, "utf8");
-    const staticParsed = parseDefineApiCronJobsSource(source);
+    const importedSource = collectLocalImportSourceText({
+      source,
+      file: apiFile,
+      existsSyncImpl,
+      readFileSyncImpl,
+      resolvePathImpl,
+    });
+    const staticParsed = parseDefineApiCronJobsSource(`${source}\n${importedSource}`);
     let parsed = staticParsed;
     if (shouldLoadDefineApiCrons(source)) {
       try {

package/lib/db-command.mjs

@@ -1,8 +1,10 @@
 import { execSync } from "child_process";
 import { cpSync, existsSync, mkdirSync, readFileSync, readdirSync, rmSync, statSync, unlinkSync } from "fs";
 import { dirname, resolve } from "path";
+import { runDrizzleGenerateWithFallback } from "./drizzle-generate.mjs";
 import { BOLD, CYAN, DIM, GREEN, RED, RESET, error, info, log, success, warn } from "./output.mjs";
 import { platformFetch, requireCreds } from "./platform-client.mjs";
+import { createTarGzipArchive } from "./tar-archive.mjs";
 
 export function resolveDbCloudTarget(args, gencowJson = null) {
   const isProd = args.includes("--prod");
@@ -139,6 +141,7 @@ export function createDbCommands({
   runInServer,
   statSyncImpl = statSync,
   successImpl = success,
+  tarCreateImpl,
   unlinkSyncImpl = unlinkSync,
   cpSyncImpl = cpSync,
   dirnameImpl = dirname,
@@ -444,11 +447,13 @@ export function createDbCommands({
 
       infoImpl("Generating schema migrations...");
       try {
-        const dk = drizzleKitCmdImpl("generate");
-        execSyncImpl(dk.cmd, {
+        runDrizzleGenerateWithFallback({
           cwd: cwdImpl(),
-          env: { ...processEnv, ...dk.env },
+          drizzleKitCmdImpl,
+          env: processEnv,
+          execSyncImpl,
           stdio: "inherit",
+          warnImpl,
         });
         successImpl("Migrations generated");
       } catch (e) {
@@ -469,8 +474,11 @@ export function createDbCommands({
       mkdirSyncImpl(dirnameImpl(tmpBundle), { recursive: true });
 
       const tarSourceDir = functionsDir.startsWith("./") ? functionsDir.slice(2) : functionsDir;
-      execSyncImpl(`COPYFILE_DISABLE=1 tar -czf "${tmpBundle}" -C "${cwdImpl()}" "${tarSourceDir}/"`, {
-        stdio: ["ignore", "pipe", "pipe"],
+      await createTarGzipArchive({
+        cwd: cwdImpl(),
+        file: tmpBundle,
+        entries: [`${tarSourceDir}/`],
+        tarCreateImpl,
       });
 
       const bundleData = readFileSyncImpl(tmpBundle);
@@ -518,11 +526,13 @@ export function createDbCommands({
       if (isMonorepo()) {
         runInServer("pnpm db:generate", buildEnv(config));
       } else {
-        const dk = drizzleKitCmdImpl("generate");
-        execSyncImpl(dk.cmd, {
+        runDrizzleGenerateWithFallback({
           cwd: cwdImpl(),
-          env: { ...buildEnv(config), ...dk.env },
+          drizzleKitCmdImpl,
+          env: buildEnv(config),
+          execSyncImpl,
           stdio: "inherit",
+          warnImpl,
         });
       }
       successImpl("Migration files generated in gencow/migrations/");

package/lib/deploy-package-runtime.mjs

@@ -1,13 +1,15 @@
 import { execSync } from "child_process";
-import { existsSync, mkdirSync, readFileSync, statSync, unlinkSync, writeFileSync } from "fs";
+import { cpSync, existsSync, mkdirSync, readFileSync, rmSync, statSync, unlinkSync, writeFileSync } from "fs";
 import { dirname, resolve } from "path";
 import {
   fetchAppDiagnosticLogsViaRest,
   normalizeDiagnosticLogLines,
 } from "./app-diagnostics.mjs";
 import { CRON_MANIFEST_RELATIVE_PATH, writeCronManifestForProject } from "./cron-manifest.mjs";
+import { getCommandErrorMessage, runDrizzleGenerateWithFallback } from "./drizzle-generate.mjs";
 import { CYAN, DIM, RED, RESET, YELLOW, error, info, log, success, warn } from "./output.mjs";
 import { platformFetch, rpcMutation } from "./platform-client.mjs";
+import { createTarGzipArchive } from "./tar-archive.mjs";
 
 export function writeProjectMetadata({
   appId,
@@ -44,15 +46,18 @@ export function createDeployPackageRuntime({
   loadConfigImpl,
   logImpl = log,
   mkdirSyncImpl = mkdirSync,
+  cpSyncImpl = cpSync,
   platformFetchImpl = platformFetch,
   processRef = process,
   readFileSyncImpl = readFileSync,
   resolvePathImpl = resolve,
+  rmSyncImpl = rmSync,
   rpcMutationImpl = rpcMutation,
   setIntervalImpl = setInterval,
   setTimeoutImpl = setTimeout,
   statSyncImpl = statSync,
   successImpl = success,
+  tarCreateImpl,
   unlinkSyncImpl = unlinkSync,
   verifyAppReadyImpl,
   warnImpl = warn,
@@ -106,16 +111,18 @@ export function createDeployPackageRuntime({
           stdio: "inherit",
         });
       } else {
-        const dk = drizzleKitCmdImpl("generate");
-        execGen(dk.cmd, {
+        runDrizzleGenerateWithFallback({
           cwd,
-          env: { ...(genEnv ?? processRef.env), ...dk.env },
+          drizzleKitCmdImpl,
+          env: genEnv ?? processRef.env,
+          execSyncImpl: execGen,
           stdio: "inherit",
+          warnImpl,
         });
       }
       successImpl("Schema -> migrations synced");
     } catch (caught) {
-      const message = (caught?.stderr?.toString() || caught?.message || "").trim();
+      const message = getCommandErrorMessage(caught);
       if (
         message.includes("No schema changes") ||
         message.includes("nothing to migrate") ||
@@ -280,16 +287,26 @@ export function createDeployPackageRuntime({
           const src = resolvePathImpl(cwd, file);
           const dst = resolvePathImpl(tmpDir, file);
           if (file.endsWith("/")) {
-            execSyncImpl(`cp -r "${src}" "${dst}"`, { cwd });
+            cpSyncImpl(src, dst, { recursive: true });
           } else if (existsSyncImpl(src)) {
             mkdirSyncImpl(dirname(dst), { recursive: true });
-            execSyncImpl(`cp "${src}" "${dst}"`, { cwd });
+            cpSyncImpl(src, dst);
           }
         }
-        execSyncImpl(`COPYFILE_DISABLE=1 tar -czf "${tmpBundle}" .`, { cwd: tmpDir });
-        execSyncImpl(`rm -rf "${tmpDir}"`, { cwd });
+        await createTarGzipArchive({
+          cwd: tmpDir,
+          file: tmpBundle,
+          entries: ["."],
+          tarCreateImpl,
+        });
+        rmSyncImpl(tmpDir, { recursive: true, force: true });
       } else {
-        execSyncImpl(`COPYFILE_DISABLE=1 tar -czf "${tmpBundle}" ${filesToPack.join(" ")}`, { cwd });
+        await createTarGzipArchive({
+          cwd,
+          file: tmpBundle,
+          entries: filesToPack,
+          tarCreateImpl,
+        });
       }
     } catch (caught) {
       errorImpl(`Packaging failed: ${caught.message}`);

package/lib/dev-cloud-migrations.mjs

@@ -1,4 +1,5 @@
 import { execSync } from "child_process";
+import { runDrizzleGenerateWithFallback } from "./drizzle-generate.mjs";
 
 export function runDevCloudMigrationGenerate(config, deps) {
   const cwd = deps.cwdImpl();
@@ -18,11 +19,13 @@ export function runDevCloudMigrationGenerate(config, deps) {
     return "server";
   }
 
-  const dk = deps.drizzleKitCmdImpl("generate");
-  execSyncImpl(dk.cmd, {
+  runDrizzleGenerateWithFallback({
     cwd,
-    env: { ...genEnv, ...dk.env },
+    drizzleKitCmdImpl: deps.drizzleKitCmdImpl,
+    env: genEnv,
+    execSyncImpl,
     stdio: "inherit",
+    warnImpl: deps.warnImpl,
   });
   return "local";
 }