@supacloud/cli 0.14.0 → 0.14.2

package/dist/index.js

@@ -6087,6 +6087,11 @@ function schemaProperties(schema) {
 }
 
 // src/shared/cli.ts
+function cliToolResultIsError(toolResult) {
+  if (toolResult.isError === true)
+    return true;
+  return toolResult.content?.some((chunk) => chunk.type === "text" && chunk.text?.trimStart().startsWith("❌") === true) ?? false;
+}
 function coerceCliValue(value) {
   if (value === "true")
     return true;
@@ -6193,7 +6198,7 @@ async function runCli(cliTools, args, options = {}) {
     } else {
       console.log(JSON.stringify(result, null, 2));
     }
-    process.exit(result && typeof result === "object" && "isError" in result && result.isError === true ? 1 : 0);
+    process.exit(cliToolResultIsError(result) ? 1 : 0);
   } catch (error) {
     const message = error instanceof Error ? error.message : String(error);
     console.error(`❌ Error: ${message}`);
@@ -6330,29 +6335,46 @@ function resolveSupaCloudContext(env = process.env, cwd = process.cwd()) {
 var DEFAULT_TIMEOUT = 30000;
 var MAX_RETRIES = 2;
 var RETRY_BASE_DELAY = 500;
-async function fetchWithRetry(url, options, retries = MAX_RETRIES) {
+function isRetryableMethod(method) {
+  const normalizedMethod = (method ?? "GET").toUpperCase();
+  return normalizedMethod === "GET" || normalizedMethod === "HEAD";
+}
+function isRetryableError(error) {
+  if (!(error instanceof Error))
+    return false;
+  const networkError = error;
+  return networkError.name === "AbortError" || networkError.code === "ECONNREFUSED" || networkError.code === "ECONNRESET";
+}
+async function fetchWithTimeout(url, options) {
+  const controller = new AbortController;
+  const timeout = setTimeout(() => controller.abort(), DEFAULT_TIMEOUT);
+  try {
+    return await fetch(url, {
+      ...options,
+      signal: controller.signal
+    });
+  } finally {
+    clearTimeout(timeout);
+  }
+}
+async function fetchWithRetry(url, options) {
+  const retries = isRetryableMethod(options.method) ? MAX_RETRIES : 0;
   for (let attempt = 0;attempt <= retries; attempt++) {
     try {
-      const controller = new AbortController;
-      const timeout = setTimeout(() => controller.abort(), DEFAULT_TIMEOUT);
-      const res = await fetch(url, {
-        ...options,
-        signal: controller.signal
-      });
-      clearTimeout(timeout);
-      if (res.status >= 500 && attempt < retries) {
+      const res = await fetchWithTimeout(url, options);
+      if (res.status >= 500 && res.status < 600 && attempt < retries) {
         const delay = RETRY_BASE_DELAY * Math.pow(2, attempt);
         await new Promise((r) => setTimeout(r, delay));
         continue;
       }
       return res;
-    } catch (err) {
-      if (attempt < retries && (err.name === "AbortError" || err.code === "ECONNREFUSED" || err.code === "ECONNRESET")) {
+    } catch (error) {
+      if (attempt < retries && isRetryableError(error)) {
         const delay = RETRY_BASE_DELAY * Math.pow(2, attempt);
         await new Promise((r) => setTimeout(r, delay));
         continue;
       }
-      throw err;
+      throw error;
     }
   }
   throw new Error("Unreachable");
@@ -6889,8 +6911,7 @@ Actions: ${allActions.join(", ")}${readOnly ? " (read-only mode)" : ""}`, {
 `);
           break;
         }
-        const baselineSql = buildMigrationBaselineSql(missing);
-        const baselineResult = await execSql(baselineSql, "migration");
+        const baselineResult = await http.post(`/v1/projects/${ref}/database/migrations/baseline`, { migrations: missing.map(({ name, version }) => ({ name, version })) });
         text = baselineResult.ok ? [
           `✅ Migration baseline completed for ${dir}`,
           `Marked applied: ${missing.length}`,
@@ -6958,48 +6979,6 @@ function buildRlsPolicySql(qualifiedTable, policyMode, ownerColumnValue) {
       CREATE POLICY "SupaCloud owner update" ON ${qualifiedTable} FOR UPDATE TO authenticated USING (${predicate}) WITH CHECK (${predicate});
       CREATE POLICY "SupaCloud owner delete" ON ${qualifiedTable} FOR DELETE TO authenticated USING (${predicate});`;
 }
-function sqlString(value) {
-  return `'${value.replace(/'/g, "''")}'`;
-}
-function buildMigrationBaselineSql(migrations) {
-  const values = migrations.map(({ name, version }) => `(${version}, ${sqlString(name)}, ARRAY[${sqlString(`baseline:${name}`)}]::text[])`).join(`,
-    `);
-  return `
-CREATE SCHEMA IF NOT EXISTS supabase_migrations;
-
-CREATE TABLE IF NOT EXISTS supabase_migrations.schema_migrations (
-  version BIGINT PRIMARY KEY,
-  statements TEXT[],
-  name TEXT
-);
-
-CREATE TABLE IF NOT EXISTS public.schema_migrations (
-  version VARCHAR(255) PRIMARY KEY,
-  statements TEXT[],
-  name TEXT
-);
-
-WITH baseline(version, name, statements) AS (
-  VALUES
-    ${values}
-)
-INSERT INTO supabase_migrations.schema_migrations (version, statements, name)
-SELECT version, statements, name FROM baseline
-ON CONFLICT (version) DO UPDATE
-SET statements = EXCLUDED.statements,
-    name = EXCLUDED.name;
-
-WITH baseline(version, name, statements) AS (
-  VALUES
-    ${values}
-)
-INSERT INTO public.schema_migrations (version, statements, name)
-SELECT version::text, statements, name FROM baseline
-ON CONFLICT (version) DO UPDATE
-SET statements = EXCLUDED.statements,
-    name = EXCLUDED.name;
-`.trim();
-}
 function formatSqlResult(data) {
   if (!data || typeof data !== "object")
     return JSON.stringify(data, null, 2);
@@ -9872,7 +9851,7 @@ async function main() {
           console.log(chunk.text);
         }
       }
-      if (result.isError === true)
+      if (cliToolResultIsError(result))
         process.exitCode = 1;
       return;
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@supacloud/cli",
-  "version": "0.14.0",
+  "version": "0.14.2",
   "description": "Project-scoped CLI for SupaCloud users",
   "type": "module",
   "main": "./dist/index.js",