@base44-preview/cli 0.0.31-pr.243.ce802aa → 0.0.31-pr.244.d6ebd8d

package/dist/cli/index.js

@@ -17446,7 +17446,7 @@ var require_lodash2 = __commonJS((exports, module) => {
         }
         return mapped.length && mapped[0] === arrays[0] ? baseIntersection(mapped, undefined2, comparator) : [];
       });
-      function join10(array2, separator) {
+      function join12(array2, separator) {
         return array2 == null ? "" : nativeJoin.call(array2, separator);
       }
       function last(array2) {
@@ -19378,7 +19378,7 @@ __p += '`;
       lodash.isUndefined = isUndefined;
       lodash.isWeakMap = isWeakMap;
       lodash.isWeakSet = isWeakSet;
-      lodash.join = join10;
+      lodash.join = join12;
       lodash.kebabCase = kebabCase2;
       lodash.last = last;
       lodash.lastIndexOf = lastIndexOf;
@@ -20007,7 +20007,7 @@ function cleanDoc(doc2) {
   return mapDoc(doc2, (currentDoc) => cleanDocFn(currentDoc));
 }
 function replaceEndOfLine(doc2, replacement = literalline) {
-  return mapDoc(doc2, (currentDoc) => typeof currentDoc === "string" ? join10(replacement, currentDoc.split(`
+  return mapDoc(doc2, (currentDoc) => typeof currentDoc === "string" ? join12(replacement, currentDoc.split(`
 `)) : currentDoc);
 }
 function canBreakFn(doc2) {
@@ -20087,7 +20087,7 @@ function indentIfBreak(contents, options) {
     negate: options.negate
   };
 }
-function join10(separator, docs) {
+function join12(separator, docs) {
   assertDoc(separator);
   assertDocArray(docs);
   const parts = [];
@@ -20798,7 +20798,7 @@ var init_doc = __esm(() => {
   MODE_FLAT = Symbol("MODE_FLAT");
   DOC_FILL_PRINTED_LENGTH = Symbol("DOC_FILL_PRINTED_LENGTH");
   builders = {
-    join: join10,
+    join: join12,
     line,
     softline,
     hardline,
@@ -125712,7 +125712,7 @@ Expected it to be ${EXPECTED_TYPE_VALUES}.`;
       return mapDoc2(doc2, (currentDoc) => cleanDocFn2(currentDoc));
     }
     function replaceEndOfLine2(doc2, replacement = literalline2) {
-      return mapDoc2(doc2, (currentDoc) => typeof currentDoc === "string" ? join12(replacement, currentDoc.split(`
+      return mapDoc2(doc2, (currentDoc) => typeof currentDoc === "string" ? join14(replacement, currentDoc.split(`
 `)) : currentDoc);
     }
     function canBreakFn2(doc2) {
@@ -125798,7 +125798,7 @@ Expected it to be ${EXPECTED_TYPE_VALUES}.`;
         negate: options8.negate
       };
     }
-    function join12(separator, docs) {
+    function join14(separator, docs) {
       assertDoc2(separator);
       assertDocArray2(docs);
       const parts = [];
@@ -126463,7 +126463,7 @@ Expected it to be ${EXPECTED_TYPE_VALUES}.`;
       }
     }
     var builders2 = {
-      join: join12,
+      join: join14,
       line: line3,
       softline: softline2,
       hardline: hardline4,
@@ -155678,10 +155678,10 @@ var require_view = __commonJS((exports, module) => {
   var debug = require_src4()("express:view");
   var path18 = __require("node:path");
   var fs28 = __require("node:fs");
-  var dirname10 = path18.dirname;
+  var dirname11 = path18.dirname;
   var basename4 = path18.basename;
   var extname2 = path18.extname;
-  var join13 = path18.join;
+  var join15 = path18.join;
   var resolve5 = path18.resolve;
   module.exports = View;
   function View(name2, options8) {
@@ -155717,7 +155717,7 @@ var require_view = __commonJS((exports, module) => {
     for (var i5 = 0;i5 < roots.length && !path19; i5++) {
       var root2 = roots[i5];
       var loc = resolve5(root2, name2);
-      var dir = dirname10(loc);
+      var dir = dirname11(loc);
       var file2 = basename4(loc);
       path19 = this.resolve(dir, file2);
     }
@@ -155743,12 +155743,12 @@ var require_view = __commonJS((exports, module) => {
   };
   View.prototype.resolve = function resolve6(dir, file2) {
     var ext = this.ext;
-    var path19 = join13(dir, file2);
+    var path19 = join15(dir, file2);
     var stat2 = tryStat(path19);
     if (stat2 && stat2.isFile()) {
       return path19;
     }
-    path19 = join13(dir, basename4(file2, ext), "index" + ext);
+    path19 = join15(dir, basename4(file2, ext), "index" + ext);
     stat2 = tryStat(path19);
     if (stat2 && stat2.isFile()) {
       return path19;
@@ -159443,7 +159443,7 @@ var require_send = __commonJS((exports, module) => {
   var Stream2 = __require("stream");
   var util2 = __require("util");
   var extname2 = path18.extname;
-  var join13 = path18.join;
+  var join15 = path18.join;
   var normalize = path18.normalize;
   var resolve5 = path18.resolve;
   var sep = path18.sep;
@@ -159615,7 +159615,7 @@ var require_send = __commonJS((exports, module) => {
         return res;
       }
       parts = path19.split(sep);
-      path19 = normalize(join13(root2, path19));
+      path19 = normalize(join15(root2, path19));
     } else {
       if (UP_PATH_REGEXP.test(path19)) {
         debug('malicious path "%s"', path19);
@@ -159755,7 +159755,7 @@ var require_send = __commonJS((exports, module) => {
           return self2.onStatError(err);
         return self2.error(404);
       }
-      var p4 = join13(path19, self2._index[i5]);
+      var p4 = join15(path19, self2._index[i5]);
       debug('stat "%s"', p4);
       fs28.stat(p4, function(err2, stat2) {
         if (err2)
@@ -162834,7 +162834,7 @@ var {
 } = import__.default;
 
 // src/cli/commands/agents/pull.ts
-import { dirname as dirname7, join as join8 } from "node:path";
+import { dirname as dirname7, join as join9 } from "node:path";
 
 // node_modules/@clack/core/dist/index.mjs
 var import_sisteransi = __toESM(require_src(), 1);
@@ -184871,7 +184871,7 @@ var generateGlobTasks = normalizeArguments(generateTasks);
 var generateGlobTasksSync = normalizeArgumentsSync(generateTasksSync);
 
 // src/core/project/config.ts
-import { dirname as dirname5, join as join5 } from "node:path";
+import { dirname as dirname5, join as join6 } from "node:path";
 
 // src/core/resources/agent/schema.ts
 var EntityOperationSchema = exports_external.enum(["create", "update", "delete", "read"]);
@@ -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);
@@ -185198,6 +185203,8 @@ async function removeConnector(integrationType) {
   return result.data;
 }
 // src/core/resources/connector/config.ts
+import { join as join4 } from "node:path";
+import { isDeepStrictEqual } from "node:util";
 async function readConnectorFile(connectorPath) {
   const parsed = await readJsonFile(connectorPath);
   const result = ConnectorResourceSchema.safeParse(parsed);
@@ -185206,7 +185213,7 @@ async function readConnectorFile(connectorPath) {
   }
   return result.data;
 }
-async function readAllConnectors(connectorsDir) {
+async function readConnectorFiles(connectorsDir) {
   if (!await pathExists(connectorsDir)) {
     return [];
   }
@@ -185214,24 +185221,58 @@ async function readAllConnectors(connectorsDir) {
     cwd: connectorsDir,
     absolute: true
   });
-  const connectors = await Promise.all(files.map((filePath) => readConnectorFile(filePath)));
-  assertNoDuplicateConnectors(connectors);
-  return connectors;
+  return await Promise.all(files.map(async (filePath) => ({
+    data: await readConnectorFile(filePath),
+    filePath
+  })));
 }
-function assertNoDuplicateConnectors(connectors) {
-  const types = new Set;
-  for (const connector of connectors) {
-    if (types.has(connector.type)) {
-      throw new InvalidInputError(`Duplicate connector type "${connector.type}"`, {
+function buildTypeToEntryMap(entries) {
+  const typeToEntry = new Map;
+  for (const entry of entries) {
+    if (typeToEntry.has(entry.data.type)) {
+      throw new InvalidInputError(`Duplicate connector type "${entry.data.type}"`, {
         hints: [
           {
-            message: `Remove duplicate connectors with type "${connector.type}" - only one connector per type is allowed`
+            message: `Remove duplicate connectors with type "${entry.data.type}" - only one connector per type is allowed`
           }
         ]
       });
     }
-    types.add(connector.type);
+    typeToEntry.set(entry.data.type, entry);
+  }
+  return typeToEntry;
+}
+async function readAllConnectors(connectorsDir) {
+  const entries = await readConnectorFiles(connectorsDir);
+  const typeToEntry = buildTypeToEntryMap(entries);
+  return [...typeToEntry.values()].map((e2) => e2.data);
+}
+async function writeConnectors(connectorsDir, remoteConnectors) {
+  const entries = await readConnectorFiles(connectorsDir);
+  const typeToEntry = buildTypeToEntryMap(entries);
+  const newTypes = new Set(remoteConnectors.map((c) => c.integrationType));
+  const deleted = [];
+  for (const [type, entry] of typeToEntry) {
+    if (!newTypes.has(type)) {
+      await deleteFile(entry.filePath);
+      deleted.push(type);
+    }
+  }
+  const written = [];
+  for (const connector of remoteConnectors) {
+    const existing = typeToEntry.get(connector.integrationType);
+    const localConnector = {
+      type: connector.integrationType,
+      scopes: connector.scopes
+    };
+    if (existing && isDeepStrictEqual(existing.data, localConnector)) {
+      continue;
+    }
+    const filePath = existing?.filePath ?? join4(connectorsDir, `${connector.integrationType}.${CONFIG_FILE_EXTENSION}`);
+    await writeJsonFile(filePath, localConnector);
+    written.push(connector.integrationType);
   }
+  return { written, deleted };
 }
 // src/core/resources/connector/push.ts
 async function pushConnectors(connectors) {
@@ -185573,7 +185614,7 @@ async function deployFunctions(functions) {
   return result.data;
 }
 // src/core/resources/function/config.ts
-import { dirname as dirname4, join as join4 } from "node:path";
+import { dirname as dirname4, join as join5 } from "node:path";
 async function readFunctionConfig(configPath) {
   const parsed = await readJsonFile(configPath);
   const result = FunctionConfigSchema.safeParse(parsed);
@@ -185585,7 +185626,7 @@ async function readFunctionConfig(configPath) {
 async function readFunction(configPath) {
   const config5 = await readFunctionConfig(configPath);
   const functionDir = dirname4(configPath);
-  const entryPath = join4(functionDir, config5.entry);
+  const entryPath = join5(functionDir, config5.entry);
   if (!await pathExists(entryPath)) {
     throw new FileNotFoundError(`Function entry file not found: ${entryPath} (referenced in ${configPath})`);
   }
@@ -185674,10 +185715,10 @@ async function readProjectConfig(projectRoot) {
   const project = result.data;
   const configDir = dirname5(configPath);
   const [entities, functions, agents, connectors] = await Promise.all([
-    entityResource.readAll(join5(configDir, project.entitiesDir)),
-    functionResource.readAll(join5(configDir, project.functionsDir)),
-    agentResource.readAll(join5(configDir, project.agentsDir)),
-    connectorResource.readAll(join5(configDir, project.connectorsDir))
+    entityResource.readAll(join6(configDir, project.entitiesDir)),
+    functionResource.readAll(join6(configDir, project.functionsDir)),
+    agentResource.readAll(join6(configDir, project.agentsDir)),
+    connectorResource.readAll(join6(configDir, project.connectorsDir))
   ]);
   return {
     project: { ...project, root, configPath },
@@ -185774,7 +185815,7 @@ async function readAppConfig(projectRoot) {
 // src/core/project/template.ts
 var import_ejs = __toESM(require_ejs(), 1);
 var import_front_matter = __toESM(require_front_matter(), 1);
-import { dirname as dirname6, join as join6 } from "node:path";
+import { dirname as dirname6, join as join7 } from "node:path";
 async function listTemplates() {
   const parsed = await readJsonFile(getTemplatesIndexPath());
   const result = TemplatesConfigSchema.safeParse(parsed);
@@ -185784,23 +185825,23 @@ async function listTemplates() {
   return result.data.templates;
 }
 async function renderTemplate(template, destPath, data) {
-  const templateDir = join6(getTemplatesDir(), template.path);
+  const templateDir = join7(getTemplatesDir(), template.path);
   const files = await globby("**/*", {
     cwd: templateDir,
     dot: true,
     onlyFiles: true
   });
   for (const file2 of files) {
-    const srcPath = join6(templateDir, file2);
+    const srcPath = join7(templateDir, file2);
     try {
       if (file2.endsWith(".ejs")) {
         const rendered = await import_ejs.default.renderFile(srcPath, data);
         const { attributes, body } = import_front_matter.default(rendered);
-        const destFile = attributes.outputFileName ? join6(dirname6(file2), attributes.outputFileName) : file2.replace(/\.ejs$/, "");
-        const destFilePath = join6(destPath, destFile);
+        const destFile = attributes.outputFileName ? join7(dirname6(file2), attributes.outputFileName) : file2.replace(/\.ejs$/, "");
+        const destFilePath = join7(destPath, destFile);
         await writeFile(destFilePath, body);
       } else {
-        const destFilePath = join6(destPath, file2);
+        const destFilePath = join7(destPath, file2);
         await copyFile(srcPath, destFilePath);
       }
     } catch (error48) {
@@ -185903,7 +185944,7 @@ async function getSiteFilePaths(outputDir) {
 // src/core/site/deploy.ts
 import { randomUUID } from "node:crypto";
 import { tmpdir } from "node:os";
-import { join as join7 } from "node:path";
+import { join as join8 } from "node:path";
 async function deploySite(siteOutputDir) {
   if (!await pathExists(siteOutputDir)) {
     throw new FileNotFoundError(`Output directory does not exist: ${siteOutputDir}. Make sure to build your project first.`, {
@@ -185920,7 +185961,7 @@ async function deploySite(siteOutputDir) {
       ]
     });
   }
-  const archivePath = join7(tmpdir(), `base44-site-${randomUUID()}.tar.gz`);
+  const archivePath = join8(tmpdir(), `base44-site-${randomUUID()}.tar.gz`);
   try {
     await createArchive(siteOutputDir, archivePath);
     return await uploadSite(archivePath);
@@ -185937,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;
@@ -193596,7 +193639,7 @@ function getDashboardUrl(projectId) {
 async function pullAgentsAction() {
   const { project: project2 } = await readProjectConfig();
   const configDir = dirname7(project2.configPath);
-  const agentsDir = join8(configDir, project2.agentsDir);
+  const agentsDir = join9(configDir, project2.agentsDir);
   const remoteAgents = await runTask("Fetching agents from Base44", async () => {
     return await fetchAgents();
   }, {
@@ -193689,6 +193732,43 @@ function getWhoamiCommand(context) {
   });
 }
 
+// src/cli/commands/connectors/pull.ts
+import { dirname as dirname8, join as join10 } from "node:path";
+async function pullConnectorsAction() {
+  const { project: project2 } = await readProjectConfig();
+  const configDir = dirname8(project2.configPath);
+  const connectorsDir = join10(configDir, project2.connectorsDir);
+  const remoteConnectors = await runTask("Fetching connectors from Base44", async () => {
+    return await listConnectors();
+  }, {
+    successMessage: "Connectors fetched successfully",
+    errorMessage: "Failed to fetch connectors"
+  });
+  const { written, deleted } = await runTask("Syncing connector files", async () => {
+    return await writeConnectors(connectorsDir, remoteConnectors.integrations);
+  }, {
+    successMessage: "Connector files synced successfully",
+    errorMessage: "Failed to sync connector files"
+  });
+  if (written.length > 0) {
+    M2.success(`Written: ${written.join(", ")}`);
+  }
+  if (deleted.length > 0) {
+    M2.warn(`Deleted: ${deleted.join(", ")}`);
+  }
+  if (written.length === 0 && deleted.length === 0) {
+    M2.info("All connectors are already up to date");
+  }
+  return {
+    outroMessage: `Pulled ${remoteConnectors.integrations.length} connectors to ${connectorsDir}`
+  };
+}
+function getConnectorsPullCommand(context) {
+  return new Command("pull").description("Pull connectors from Base44 to local files (replaces all local connector configs)").action(async () => {
+    await runCommand(pullConnectorsAction, { requireAuth: true }, context);
+  });
+}
+
 // node_modules/open/index.js
 import process20 from "node:process";
 import path16 from "node:path";
@@ -194295,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);
@@ -194315,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") {
@@ -194324,7 +194486,6 @@ function printSummary(results, oauthOutcomes) {
       }
     }
   }
-  M2.info("");
   M2.info(theme.styles.bold("Summary:"));
   if (synced.length > 0) {
     M2.success(`Synced: ${synced.join(", ")}`);
@@ -194335,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}` : ""}`);
   }
@@ -194350,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 };
@@ -194415,7 +194534,7 @@ function getConnectorsPushCommand(context) {
 
 // src/cli/commands/connectors/index.ts
 function getConnectorsCommand(context) {
-  return new Command("connectors").description("Manage project connectors (OAuth integrations)").addCommand(getConnectorsPushCommand(context));
+  return new Command("connectors").description("Manage project connectors (OAuth integrations)").addCommand(getConnectorsPullCommand(context)).addCommand(getConnectorsPushCommand(context));
 }
 
 // src/cli/commands/dashboard/open.ts
@@ -194509,7 +194628,7 @@ function getFunctionsDeployCommand(context) {
 }
 
 // src/cli/commands/project/create.ts
-import { basename as basename3, join as join9, resolve as resolve2 } from "node:path";
+import { basename as basename3, join as join11, resolve as resolve2 } from "node:path";
 var import_lodash = __toESM(require_lodash(), 1);
 var DEFAULT_TEMPLATE_ID = "backend-only";
 async function getTemplateById(templateId) {
@@ -194645,7 +194764,7 @@ async function executeCreate({
         updateMessage("Building project...");
         await execa({ cwd: resolvedPath, shell: true })`${buildCommand}`;
         updateMessage("Deploying site...");
-        return await deploySite(join9(resolvedPath, outputDirectory));
+        return await deploySite(join11(resolvedPath, outputDirectory));
       }, {
         successMessage: theme.colors.base44Orange("Site deployed successfully"),
         errorMessage: "Failed to deploy site"
@@ -194693,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"}`);
@@ -194704,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}`);
   }
@@ -194728,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)}`);
@@ -194735,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);
   });
 }
@@ -195026,10 +195158,10 @@ function toPascalCase(name2) {
   return name2.split(/[-_\s]+/).map((w9) => w9.charAt(0).toUpperCase() + w9.slice(1)).join("");
 }
 // src/core/types/update-project.ts
-import { join as join12 } from "node:path";
+import { join as join14 } from "node:path";
 var TYPES_INCLUDE_PATH = `${PROJECT_SUBDIR}/${TYPES_OUTPUT_SUBDIR}/*.d.ts`;
 async function updateProjectConfig(projectRoot) {
-  const tsconfigPath = join12(projectRoot, "tsconfig.json");
+  const tsconfigPath = join14(projectRoot, "tsconfig.json");
   if (!await pathExists(tsconfigPath)) {
     return false;
   }
@@ -195358,7 +195490,7 @@ function createProgram(context) {
   program2.addCommand(getConnectorsCommand(context));
   program2.addCommand(getFunctionsDeployCommand(context));
   program2.addCommand(getSiteCommand(context));
-  program2.addCommand(getTypesCommand(context), { hidden: true });
+  program2.addCommand(getTypesCommand(context));
   program2.addCommand(getDevCommand(context), { hidden: true });
   return program2;
 }
@@ -195398,7 +195530,7 @@ function nanoid3(size = 21) {
 }
 
 // node_modules/posthog-node/dist/extensions/error-tracking/modifiers/module.node.mjs
-import { dirname as dirname10, posix, sep } from "path";
+import { dirname as dirname11, posix, sep } from "path";
 function createModulerModifier() {
   const getModuleFromFileName = createGetModuleFromFilename();
   return async (frames) => {
@@ -195407,7 +195539,7 @@ function createModulerModifier() {
     return frames;
   };
 }
-function createGetModuleFromFilename(basePath = process.argv[1] ? dirname10(process.argv[1]) : process.cwd(), isWindows4 = sep === "\\") {
+function createGetModuleFromFilename(basePath = process.argv[1] ? dirname11(process.argv[1]) : process.cwd(), isWindows4 = sep === "\\") {
   const normalizedBase = isWindows4 ? normalizeWindowsPath2(basePath) : basePath;
   return (filename) => {
     if (!filename)
@@ -199626,4 +199758,4 @@ export {
   CLIExitError
 };
 
-//# debugId=6A2560FE978C00DF64756E2164756E21
+//# debugId=475C7FF08980E31A64756E2164756E21