@base44-preview/cli 0.0.31-pr.214.25a02b0 → 0.0.31-pr.214.27ce774

package/dist/cli/index.js

@@ -184888,7 +184888,7 @@ var ToolConfigSchema = exports_external.union([
   BackendFunctionToolConfigSchema
 ]);
 var AgentConfigSchema = exports_external.looseObject({
-  name: exports_external.string().regex(/^[a-z0-9_]+$/, "Agent name must be lowercase alphanumeric with underscores").min(1).max(100),
+  name: exports_external.string().trim().min(1).max(100),
   description: exports_external.string().trim().min(1, "Description is required"),
   instructions: exports_external.string().trim().min(1, "Instructions are required"),
   tool_configs: exports_external.array(ToolConfigSchema).optional().default([]),
@@ -184944,6 +184944,9 @@ async function fetchAgents() {
 }
 // src/core/resources/agent/config.ts
 import { join as join3 } from "node:path";
+function toFileSlug(name2) {
+  return name2.toLowerCase().replace(/[^a-z0-9_]/g, "_").replace(/_+/g, "_").replace(/^_|_$/g, "");
+}
 async function readAgentFile(agentPath) {
   const parsed = await readJsonFile(agentPath);
   const result = AgentConfigSchema.safeParse(parsed);
@@ -184975,7 +184978,8 @@ async function writeAgents(agentsDir, remoteAgents) {
   const newNames = new Set(remoteAgents.map((a) => a.name));
   const toDelete = existingAgents.filter((a) => !newNames.has(a.name));
   for (const agent of toDelete) {
-    const files = await globby(`${agent.name}.${CONFIG_FILE_EXTENSION_GLOB}`, {
+    const slug = toFileSlug(agent.name);
+    const files = await globby(`${slug}.${CONFIG_FILE_EXTENSION_GLOB}`, {
       cwd: agentsDir,
       absolute: true
     });
@@ -184984,7 +184988,8 @@ async function writeAgents(agentsDir, remoteAgents) {
     }
   }
   for (const agent of remoteAgents) {
-    const filePath = join3(agentsDir, `${agent.name}.${CONFIG_FILE_EXTENSION}`);
+    const slug = toFileSlug(agent.name);
+    const filePath = join3(agentsDir, `${slug}.${CONFIG_FILE_EXTENSION}`);
     await writeJsonFile(filePath, agent);
   }
   const written = remoteAgents.map((a) => a.name);
@@ -185973,24 +185978,26 @@ async function createArchive(pathToArchive, targetArchivePath) {
 }
 // src/core/project/deploy.ts
 function hasResourcesToDeploy(projectData) {
-  const { project, entities, functions, agents } = projectData;
+  const { project, entities, functions, agents, connectors } = projectData;
   const hasSite = Boolean(project.site?.outputDirectory);
   const hasEntities = entities.length > 0;
   const hasFunctions = functions.length > 0;
   const hasAgents = agents.length > 0;
-  return hasEntities || hasFunctions || hasAgents || hasSite;
+  const hasConnectors = connectors.length > 0;
+  return hasEntities || hasFunctions || hasAgents || hasConnectors || hasSite;
 }
 async function deployAll(projectData) {
-  const { project, entities, functions, agents } = projectData;
+  const { project, entities, functions, agents, connectors } = 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 };
+    return { appUrl, connectorResults };
   }
-  return {};
+  return { connectorResults };
 }
 // src/core/clients/base44-client.ts
 var retriedRequests = new WeakSet;
@@ -194368,14 +194375,94 @@ defineLazyProperty(apps, "safari", () => detectPlatformBinary({
 }));
 var open_default = open;
 
-// src/cli/commands/connectors/push.ts
-function isPendingOAuth(r2) {
-  return r2.action === "needs_oauth" && !!r2.redirectUrl && !!r2.connectionId;
+// src/cli/commands/connectors/oauth-prompt.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);
+  let finalStatus = "PENDING";
+  let skipped = false;
+  const s = Y2();
+  const originalExit = process.exit;
+  process.exit = () => {
+    skipped = true;
+    s.stop(`${connector2.type} skipped`);
+  };
+  s.start(`Waiting for ${connector2.type} authorization... (Esc to skip)`);
+  try {
+    await pWaitFor(async () => {
+      if (skipped) {
+        finalStatus = "SKIPPED";
+        return true;
+      }
+      const response = await getOAuthStatus(connector2.type, connector2.connectionId);
+      finalStatus = response.status;
+      return response.status !== "PENDING";
+    }, {
+      interval: POLL_INTERVAL_MS,
+      timeout: POLL_TIMEOUT_MS
+    });
+  } catch (err) {
+    if (err instanceof TimeoutError2) {
+      finalStatus = "PENDING";
+    } else {
+      throw err;
+    }
+  } finally {
+    process.exit = originalExit;
+    if (!skipped) {
+      if (finalStatus === "ACTIVE") {
+        s.stop(`${connector2.type} authorization complete`);
+      } else if (finalStatus === "FAILED") {
+        s.stop(`${connector2.type} authorization failed`);
+      } else {
+        s.stop(`${connector2.type} authorization timed out`);
+      }
+    }
+  }
+  return 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;
 }
+
+// src/cli/commands/connectors/push.ts
 function printSummary(results, oauthOutcomes) {
   const synced = [];
   const added = [];
   const removed = [];
+  const skipped = [];
   const failed = [];
   for (const r2 of results) {
     const oauthStatus = oauthOutcomes.get(r2.type);
@@ -194388,6 +194475,8 @@ function printSummary(results, oauthOutcomes) {
     } else if (r2.action === "needs_oauth") {
       if (oauthStatus === "ACTIVE") {
         added.push(r2.type);
+      } else if (oauthStatus === "SKIPPED") {
+        skipped.push(r2.type);
       } else if (oauthStatus === "PENDING") {
         failed.push({ type: r2.type, error: "authorization timed out" });
       } else if (oauthStatus === "FAILED") {
@@ -194397,7 +194486,6 @@ function printSummary(results, oauthOutcomes) {
       }
     }
   }
-  M2.info("");
   M2.info(theme.styles.bold("Summary:"));
   if (synced.length > 0) {
     M2.success(`Synced: ${synced.join(", ")}`);
@@ -194408,6 +194496,9 @@ function printSummary(results, oauthOutcomes) {
   if (removed.length > 0) {
     M2.info(theme.styles.dim(`Removed: ${removed.join(", ")}`));
   }
+  if (skipped.length > 0) {
+    M2.warn(`Skipped: ${skipped.join(", ")}`);
+  }
   for (const r2 of failed) {
     M2.error(`Failed: ${r2.type}${r2.error ? ` - ${r2.error}` : ""}`);
   }
@@ -194423,59 +194514,14 @@ async function pushConnectorsAction() {
   const { results } = await runTask("Pushing connectors to Base44", async () => {
     return await pushConnectors(connectors);
   });
-  const oauthOutcomes = new Map;
-  const needsOAuth = results.filter(isPendingOAuth);
+  const needsOAuth = filterPendingOAuth(results);
   let outroMessage = "Connectors pushed to Base44";
-  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}'...`);
-          await open_default(connector2.redirectUrl);
-          let finalStatus = "PENDING";
-          await runTask(`Waiting for '${connector2.type}' authorization...`, async () => {
-            await pWaitFor(async () => {
-              const response = await getOAuthStatus(connector2.type, connector2.connectionId);
-              finalStatus = response.status;
-              return response.status !== "PENDING";
-            }, {
-              interval: 2000,
-              timeout: 2 * 60 * 1000
-            });
-          }, {
-            successMessage: `'${connector2.type}' authorization complete`,
-            errorMessage: `'${connector2.type}' authorization failed`
-          }).catch((err) => {
-            if (err instanceof TimeoutError2) {
-              finalStatus = "PENDING";
-            } else {
-              throw err;
-            }
-          });
-          oauthOutcomes.set(connector2.type, finalStatus);
-        } catch (err) {
-          M2.error(`Failed to authorize '${connector2.type}': ${err instanceof Error ? err.message : String(err)}`);
-          oauthOutcomes.set(connector2.type, "FAILED");
-        }
-      }
-    }
+  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.";
   }
   printSummary(results, oauthOutcomes);
   return { outroMessage };
@@ -194766,7 +194812,7 @@ async function deployAction(options) {
       outroMessage: "No resources found to deploy"
     };
   }
-  const { project: project2, entities, functions, agents } = projectData;
+  const { project: project2, entities, functions, agents, connectors } = projectData;
   const summaryLines = [];
   if (entities.length > 0) {
     summaryLines.push(`  - ${entities.length} ${entities.length === 1 ? "entity" : "entities"}`);
@@ -194777,6 +194823,9 @@ 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}`);
   }
@@ -194801,6 +194850,16 @@ ${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)}`);
@@ -194808,7 +194867,7 @@ ${summaryLines.join(`
   return { outroMessage: "App deployed successfully" };
 }
 function getDeployCommand(context) {
-  return new Command("deploy").description("Deploy all project resources (entities, functions, agents, and site)").option("-y, --yes", "Skip confirmation prompt").action(async (options) => {
+  return new Command("deploy").description("Deploy all project resources (entities, functions, agents, connectors, and site)").option("-y, --yes", "Skip confirmation prompt").action(async (options) => {
     await runCommand(() => deployAction(options), { requireAuth: true }, context);
   });
 }
@@ -199699,4 +199758,4 @@ export {
   CLIExitError
 };
 
-//# debugId=3B15B2EE2CDAA1C064756E2164756E21
+//# debugId=F8EEF50D0741958B64756E2164756E21