@base44-preview/cli 0.0.31-pr.211.1b42e07 → 0.0.31-pr.211.1c10469

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);
@@ -194298,9 +194303,55 @@ defineLazyProperty(apps, "safari", () => detectPlatformBinary({
 var open_default = open;
 
 // 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) {
@@ -194320,30 +194371,15 @@ async function promptOAuthFlows(pending, options) {
     return outcomes;
   }
   for (const connector2 of pending) {
-    M2.info(`
+    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;
-      }
-    });
-    outcomes.set(connector2.type, finalStatus);
+      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;
 }
@@ -194353,6 +194389,7 @@ 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);
@@ -194365,6 +194402,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") {
@@ -194384,6 +194423,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}` : ""}`);
   }
@@ -194404,8 +194446,9 @@ async function pushConnectorsAction() {
   const oauthOutcomes = await promptOAuthFlows(needsOAuth, {
     skipPrompt: !!process.env.CI
   });
-  if (needsOAuth.length > 0 && oauthOutcomes.size === 0) {
-    outroMessage = process.env.CI ? "Skipped OAuth in CI. Run 'base44 connectors push' locally or open the links above to authorize." : "Authorization skipped. Run 'base44 connectors push' or open the links above to authorize.";
+  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 };
@@ -194739,8 +194782,9 @@ ${summaryLines.join(`
     const oauthOutcomes = await promptOAuthFlows(needsOAuth, {
       skipPrompt: options.yes || !!process.env.CI
     });
-    if (oauthOutcomes.size === 0) {
-      M2.info("To authorize, run 'base44 connectors push' or open the links above in your browser.");
+    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())}`);
@@ -199641,4 +199685,4 @@ export {
   CLIExitError
 };
 
-//# debugId=3AF0A883AF7DD29464756E2164756E21
+//# debugId=2EB2E2FCC8EF3F8464756E2164756E21