@base44-preview/cli 0.0.31-pr.214.27ce774 → 0.0.31-pr.214.681d4a1

package/dist/cli/index.js

@@ -185978,26 +185978,24 @@ async function createArchive(pathToArchive, targetArchivePath) {
 }
 // src/core/project/deploy.ts
 function hasResourcesToDeploy(projectData) {
-  const { project, entities, functions, agents, connectors } = projectData;
+  const { project, entities, functions, agents } = projectData;
   const hasSite = Boolean(project.site?.outputDirectory);
   const hasEntities = entities.length > 0;
   const hasFunctions = functions.length > 0;
   const hasAgents = agents.length > 0;
-  const hasConnectors = connectors.length > 0;
-  return hasEntities || hasFunctions || hasAgents || hasConnectors || hasSite;
+  return hasEntities || hasFunctions || hasAgents || hasSite;
 }
 async function deployAll(projectData) {
-  const { project, entities, functions, agents, connectors } = projectData;
+  const { project, entities, functions, agents } = projectData;
   await entityResource.push(entities);
   await functionResource.push(functions);
   await agentResource.push(agents);
-  const { results: connectorResults } = await pushConnectors(connectors);
   if (project.site?.outputDirectory) {
     const outputDir = resolve(project.root, project.site.outputDirectory);
     const { appUrl } = await deploySite(outputDir);
-    return { appUrl, connectorResults };
+    return { appUrl };
   }
-  return { connectorResults };
+  return {};
 }
 // src/core/clients/base44-client.ts
 var retriedRequests = new WeakSet;
@@ -194375,30 +194373,27 @@ defineLazyProperty(apps, "safari", () => detectPlatformBinary({
 }));
 var open_default = open;
 
-// src/cli/commands/connectors/oauth-prompt.ts
+// src/cli/commands/connectors/push.ts
 var POLL_INTERVAL_MS = 2000;
 var POLL_TIMEOUT_MS = 2 * 60 * 1000;
-function filterPendingOAuth(results) {
-  return results.filter((r2) => r2.action === "needs_oauth" && !!r2.redirectUrl && !!r2.connectionId);
-}
-async function runOAuthFlowWithSkip(connector2) {
-  await open_default(connector2.redirectUrl);
+async function runOAuthFlowWithSkip(params) {
+  await open_default(params.redirectUrl);
   let finalStatus = "PENDING";
   let skipped = false;
   const s = Y2();
   const originalExit = process.exit;
   process.exit = () => {
     skipped = true;
-    s.stop(`${connector2.type} skipped`);
+    s.stop(`${params.type} skipped`);
   };
-  s.start(`Waiting for ${connector2.type} authorization... (Esc to skip)`);
+  s.start(`Waiting for ${params.type} authorization... (Esc to skip)`);
   try {
     await pWaitFor(async () => {
       if (skipped) {
         finalStatus = "SKIPPED";
         return true;
       }
-      const response = await getOAuthStatus(connector2.type, connector2.connectionId);
+      const response = await getOAuthStatus(params.type, params.connectionId);
       finalStatus = response.status;
       return response.status !== "PENDING";
     }, {
@@ -194415,49 +194410,19 @@ async function runOAuthFlowWithSkip(connector2) {
     process.exit = originalExit;
     if (!skipped) {
       if (finalStatus === "ACTIVE") {
-        s.stop(`${connector2.type} authorization complete`);
+        s.stop(`${params.type} authorization complete`);
       } else if (finalStatus === "FAILED") {
-        s.stop(`${connector2.type} authorization failed`);
+        s.stop(`${params.type} authorization failed`);
       } else {
-        s.stop(`${connector2.type} authorization timed out`);
+        s.stop(`${params.type} authorization timed out`);
       }
     }
   }
-  return finalStatus;
+  return { type: params.type, status: finalStatus };
 }
-async function promptOAuthFlows(pending, options) {
-  const outcomes = new Map;
-  if (pending.length === 0) {
-    return outcomes;
-  }
-  M2.warn(`${pending.length} connector(s) require authorization in your browser:`);
-  for (const connector2 of pending) {
-    M2.info(`  ${connector2.type}: ${theme.styles.dim(connector2.redirectUrl)}`);
-  }
-  if (options?.skipPrompt) {
-    return outcomes;
-  }
-  const shouldAuth = await ye({
-    message: "Open browser to authorize now?"
-  });
-  if (pD(shouldAuth) || !shouldAuth) {
-    return outcomes;
-  }
-  for (const connector2 of pending) {
-    try {
-      M2.info(`
-Opening browser for ${connector2.type}...`);
-      const status = await runOAuthFlowWithSkip(connector2);
-      outcomes.set(connector2.type, status);
-    } catch (err) {
-      M2.error(`Failed to authorize ${connector2.type}: ${err instanceof Error ? err.message : String(err)}`);
-      outcomes.set(connector2.type, "FAILED");
-    }
-  }
-  return outcomes;
+function isPendingOAuth(r2) {
+  return r2.action === "needs_oauth" && !!r2.redirectUrl && !!r2.connectionId;
 }
-
-// src/cli/commands/connectors/push.ts
 function printSummary(results, oauthOutcomes) {
   const synced = [];
   const added = [];
@@ -194486,6 +194451,7 @@ function printSummary(results, oauthOutcomes) {
       }
     }
   }
+  M2.info("");
   M2.info(theme.styles.bold("Summary:"));
   if (synced.length > 0) {
     M2.success(`Synced: ${synced.join(", ")}`);
@@ -194514,14 +194480,43 @@ async function pushConnectorsAction() {
   const { results } = await runTask("Pushing connectors to Base44", async () => {
     return await pushConnectors(connectors);
   });
-  const needsOAuth = filterPendingOAuth(results);
+  const oauthOutcomes = new Map;
+  const needsOAuth = results.filter(isPendingOAuth);
   let outroMessage = "Connectors pushed to Base44";
-  const oauthOutcomes = await promptOAuthFlows(needsOAuth, {
-    skipPrompt: !!process.env.CI
-  });
-  const allAuthorized = oauthOutcomes.size > 0 && [...oauthOutcomes.values()].every((s) => s === "ACTIVE");
-  if (needsOAuth.length > 0 && !allAuthorized) {
-    outroMessage = process.env.CI ? "Skipped OAuth in CI. Run 'base44 connectors push' locally or open the links above to authorize." : "Some connectors still require authorization. Run 'base44 connectors push' or open the links above to authorize.";
+  if (needsOAuth.length === 0) {
+    printSummary(results, oauthOutcomes);
+    return { outroMessage };
+  }
+  M2.warn(`${needsOAuth.length} connector(s) require authorization in your browser:`);
+  for (const connector2 of needsOAuth) {
+    M2.info(`  '${connector2.type}': ${theme.styles.dim(connector2.redirectUrl)}`);
+  }
+  const pending = needsOAuth.map((c3) => c3.type).join(", ");
+  if (process.env.CI) {
+    outroMessage = `Skipped OAuth in CI. Pending: ${pending}. Run 'base44 connectors push' locally to authorize.`;
+  } else {
+    const shouldAuth = await ye({
+      message: "Open browser to authorize now?"
+    });
+    if (pD(shouldAuth) || !shouldAuth) {
+      outroMessage = `Authorization skipped. Pending: ${pending}. Run 'base44 connectors push' again to complete.`;
+    } else {
+      for (const connector2 of needsOAuth) {
+        try {
+          M2.info(`
+Opening browser for '${connector2.type}'...`);
+          const oauthResult = await runOAuthFlowWithSkip({
+            type: connector2.type,
+            redirectUrl: connector2.redirectUrl,
+            connectionId: connector2.connectionId
+          });
+          oauthOutcomes.set(connector2.type, oauthResult.status);
+        } catch (err) {
+          M2.error(`Failed to authorize '${connector2.type}': ${err instanceof Error ? err.message : String(err)}`);
+          oauthOutcomes.set(connector2.type, "FAILED");
+        }
+      }
+    }
   }
   printSummary(results, oauthOutcomes);
   return { outroMessage };
@@ -194812,7 +194807,7 @@ async function deployAction(options) {
       outroMessage: "No resources found to deploy"
     };
   }
-  const { project: project2, entities, functions, agents, connectors } = projectData;
+  const { project: project2, entities, functions, agents } = projectData;
   const summaryLines = [];
   if (entities.length > 0) {
     summaryLines.push(`  - ${entities.length} ${entities.length === 1 ? "entity" : "entities"}`);
@@ -194823,9 +194818,6 @@ async function deployAction(options) {
   if (agents.length > 0) {
     summaryLines.push(`  - ${agents.length} ${agents.length === 1 ? "agent" : "agents"}`);
   }
-  if (connectors.length > 0) {
-    summaryLines.push(`  - ${connectors.length} ${connectors.length === 1 ? "connector" : "connectors"}`);
-  }
   if (project2.site?.outputDirectory) {
     summaryLines.push(`  - Site from ${project2.site.outputDirectory}`);
   }
@@ -194850,16 +194842,6 @@ ${summaryLines.join(`
     successMessage: theme.colors.base44Orange("Deployment completed"),
     errorMessage: "Deployment failed"
   });
-  const needsOAuth = filterPendingOAuth(result.connectorResults ?? []);
-  if (needsOAuth.length > 0) {
-    const oauthOutcomes = await promptOAuthFlows(needsOAuth, {
-      skipPrompt: options.yes || !!process.env.CI
-    });
-    const allAuthorized = oauthOutcomes.size > 0 && [...oauthOutcomes.values()].every((s) => s === "ACTIVE");
-    if (!allAuthorized) {
-      M2.info("Some connectors still require authorization. Run 'base44 connectors push' or open the links above in your browser.");
-    }
-  }
   M2.message(`${theme.styles.header("Dashboard")}: ${theme.colors.links(getDashboardUrl())}`);
   if (result.appUrl) {
     M2.message(`${theme.styles.header("App URL")}: ${theme.colors.links(result.appUrl)}`);
@@ -194867,7 +194849,7 @@ ${summaryLines.join(`
   return { outroMessage: "App deployed successfully" };
 }
 function getDeployCommand(context) {
-  return new Command("deploy").description("Deploy all project resources (entities, functions, agents, connectors, and site)").option("-y, --yes", "Skip confirmation prompt").action(async (options) => {
+  return new Command("deploy").description("Deploy all project resources (entities, functions, agents, and site)").option("-y, --yes", "Skip confirmation prompt").action(async (options) => {
     await runCommand(() => deployAction(options), { requireAuth: true }, context);
   });
 }
@@ -199758,4 +199740,4 @@ export {
   CLIExitError
 };
 
-//# debugId=F8EEF50D0741958B64756E2164756E21
+//# debugId=C6B64E5818FEF02264756E2164756E21