@base44-preview/cli 0.0.30-pr.211.eb36cd7 → 0.0.30-pr.214.2479e76

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,
@@ -137148,7 +137148,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);
@@ -153650,7 +153650,7 @@ var generateGlobTasks = normalizeArguments(generateTasks);
 var generateGlobTasksSync = normalizeArgumentsSync(generateTasksSync);
 
 // src/core/project/config.ts
-import { dirname as dirname4, join as join4 } from "node:path";
+import { dirname as dirname4, join as join5 } from "node:path";
 
 // src/core/resources/agent/schema.ts
 var EntityOperationSchema = exports_external.enum(["create", "update", "delete", "read"]);
@@ -153911,6 +153911,9 @@ async function listConnectors() {
   }
   return result.data;
 }
+async function fetchConnectors() {
+  return await listConnectors();
+}
 async function setConnector(integrationType, scopes) {
   const appClient = getAppClient();
   let response;
@@ -153963,6 +153966,7 @@ async function removeConnector(integrationType) {
   return result.data;
 }
 // src/core/resources/connector/config.ts
+import { join as join3 } from "node:path";
 async function readConnectorFile(connectorPath) {
   const parsed = await readJsonFile(connectorPath);
   const result = ConnectorResourceSchema.safeParse(parsed);
@@ -153995,6 +153999,31 @@ async function readAllConnectors(connectorsDir) {
   }
   return connectors;
 }
+async function writeConnectors(connectorsDir, remoteConnectors) {
+  const existingConnectors = await readAllConnectors(connectorsDir);
+  const newTypes = new Set(remoteConnectors.map((c) => c.integration_type));
+  const toDelete = existingConnectors.filter((c) => !newTypes.has(c.type));
+  for (const connector of toDelete) {
+    const files = await globby(`${connector.type}.${CONFIG_FILE_EXTENSION_GLOB}`, {
+      cwd: connectorsDir,
+      absolute: true
+    });
+    for (const filePath of files) {
+      await deleteFile(filePath);
+    }
+  }
+  for (const connector of remoteConnectors) {
+    const filePath = join3(connectorsDir, `${connector.integration_type}.${CONFIG_FILE_EXTENSION}`);
+    const localConnector = {
+      type: connector.integration_type,
+      scopes: connector.scopes
+    };
+    await writeJsonFile(filePath, localConnector);
+  }
+  const written = remoteConnectors.map((c) => c.integration_type);
+  const deleted = toDelete.map((c) => c.type);
+  return { written, deleted };
+}
 // node_modules/open/index.js
 import process11 from "node:process";
 import path4 from "node:path";
@@ -155059,7 +155088,7 @@ async function deployFunctions(functions) {
   return result.data;
 }
 // src/core/resources/function/config.ts
-import { dirname as dirname3, join as join3 } from "node:path";
+import { dirname as dirname3, join as join4 } from "node:path";
 async function readFunctionConfig(configPath) {
   const parsed = await readJsonFile(configPath);
   const result = FunctionConfigSchema.safeParse(parsed);
@@ -155071,7 +155100,7 @@ async function readFunctionConfig(configPath) {
 async function readFunction(configPath) {
   const config5 = await readFunctionConfig(configPath);
   const functionDir = dirname3(configPath);
-  const entryPath = join3(functionDir, config5.entry);
+  const entryPath = join4(functionDir, config5.entry);
   if (!await pathExists(entryPath)) {
     throw new FileNotFoundError(`Function entry file not found: ${entryPath} (referenced in ${configPath})`);
   }
@@ -155160,10 +155189,10 @@ async function readProjectConfig(projectRoot) {
   const project = result.data;
   const configDir = dirname4(configPath);
   const [entities, functions, agents, connectors] = await Promise.all([
-    entityResource.readAll(join4(configDir, project.entitiesDir)),
-    functionResource.readAll(join4(configDir, project.functionsDir)),
-    agentResource.readAll(join4(configDir, project.agentsDir)),
-    connectorResource.readAll(join4(configDir, project.connectorsDir))
+    entityResource.readAll(join5(configDir, project.entitiesDir)),
+    functionResource.readAll(join5(configDir, project.functionsDir)),
+    agentResource.readAll(join5(configDir, project.agentsDir)),
+    connectorResource.readAll(join5(configDir, project.connectorsDir))
   ]);
   return {
     project: { ...project, root, configPath },
@@ -155260,7 +155289,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 dirname5, join as join5 } from "node:path";
+import { dirname as dirname5, join as join6 } from "node:path";
 async function listTemplates() {
   const parsed = await readJsonFile(getTemplatesIndexPath());
   const result = TemplatesConfigSchema.safeParse(parsed);
@@ -155270,23 +155299,23 @@ async function listTemplates() {
   return result.data.templates;
 }
 async function renderTemplate(template, destPath, data) {
-  const templateDir = join5(getTemplatesDir(), template.path);
+  const templateDir = join6(getTemplatesDir(), template.path);
   const files = await globby("**/*", {
     cwd: templateDir,
     dot: true,
     onlyFiles: true
   });
   for (const file2 of files) {
-    const srcPath = join5(templateDir, file2);
+    const srcPath = join6(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 ? join5(dirname5(file2), attributes.outputFileName) : file2.replace(/\.ejs$/, "");
-        const destFilePath = join5(destPath, destFile);
+        const destFile = attributes.outputFileName ? join6(dirname5(file2), attributes.outputFileName) : file2.replace(/\.ejs$/, "");
+        const destFilePath = join6(destPath, destFile);
         await writeFile(destFilePath, body);
       } else {
-        const destFilePath = join5(destPath, file2);
+        const destFilePath = join6(destPath, file2);
         await copyFile(srcPath, destFilePath);
       }
     } catch (error48) {
@@ -155376,7 +155405,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";
 
 // node_modules/@isaacs/fs-minipass/dist/esm/index.js
 import EE from "events";
@@ -161141,7 +161170,7 @@ var mkdirSync = (dir, opt) => {
 };
 
 // node_modules/tar/dist/esm/path-reservations.js
-import { join as join6 } from "node:path";
+import { join as join7 } from "node:path";
 
 // node_modules/tar/dist/esm/normalize-unicode.js
 var normalizeCache = Object.create(null);
@@ -161174,7 +161203,7 @@ var getDirs = (path10) => {
   const dirs = path10.split("/").slice(0, -1).reduce((set2, path11) => {
     const s = set2[set2.length - 1];
     if (s !== undefined) {
-      path11 = join6(s, path11);
+      path11 = join7(s, path11);
     }
     set2.push(path11 || "/");
     return set2;
@@ -161188,7 +161217,7 @@ class PathReservations {
   #running = new Set;
   reserve(paths, fn) {
     paths = isWindows2 ? ["win32 parallelization disabled"] : paths.map((p2) => {
-      return stripTrailingSlashes(join6(normalizeUnicode(p2)));
+      return stripTrailingSlashes(join7(normalizeUnicode(p2)));
     });
     const dirs = new Set(paths.map((path10) => getDirs(path10)).reduce((a, b3) => a.concat(b3)));
     this.#reservations.set(fn, { dirs, paths });
@@ -162223,7 +162252,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);
@@ -162240,26 +162269,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;
@@ -169796,7 +169823,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();
   }, {
@@ -169889,48 +169916,47 @@ function getWhoamiCommand(context) {
   });
 }
 
-// src/cli/commands/connectors/oauth-prompt.ts
-function filterPendingOAuth(results) {
-  return results.filter((r2) => r2.action === "needs_oauth" && !!r2.redirectUrl && !!r2.connectionId);
-}
-async function promptOAuthFlows(pending, options) {
-  const outcomes = new Map;
-  if (pending.length === 0) {
-    return outcomes;
-  }
-  M2.info("");
-  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;
+// 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 fetchConnectors();
+  }, {
+    successMessage: "Connectors fetched successfully",
+    errorMessage: "Failed to fetch connectors"
+  });
+  if (remoteConnectors.integrations.length === 0) {
+    return { outroMessage: "No connectors found on Base44" };
   }
-  const shouldAuth = await ye({
-    message: "Open browser to authorize now?"
+  const { written, deleted } = await runTask("Writing connector files", async () => {
+    return await writeConnectors(connectorsDir, remoteConnectors.integrations);
+  }, {
+    successMessage: "Connector files written successfully",
+    errorMessage: "Failed to write connector files"
   });
-  if (pD(shouldAuth) || !shouldAuth) {
-    return outcomes;
+  if (written.length > 0) {
+    M2.success(`Written: ${written.join(", ")}`);
   }
-  for (const connector2 of pending) {
-    M2.info(`
-Opening browser for ${connector2.type}...`);
-    const oauthResult = await runTask(`Waiting for ${connector2.type} authorization...`, async () => {
-      return await runOAuthFlow({
-        type: connector2.type,
-        redirectUrl: connector2.redirectUrl,
-        connectionId: connector2.connectionId
-      });
-    }, {
-      successMessage: `${connector2.type} authorization complete`,
-      errorMessage: `${connector2.type} authorization failed`
-    });
-    outcomes.set(connector2.type, oauthResult.status);
+  if (deleted.length > 0) {
+    M2.warn(`Deleted: ${deleted.join(", ")}`);
   }
-  return outcomes;
+  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);
+  });
 }
 
 // src/cli/commands/connectors/push.ts
+function isPendingOAuth(r2) {
+  return r2.action === "needs_oauth" && !!r2.redirectUrl && !!r2.connectionId;
+}
 function printSummary(results, oauthOutcomes) {
   const synced = [];
   const added = [];
@@ -169982,14 +170008,42 @@ 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
-  });
-  if (needsOAuth.length > 0 && oauthOutcomes.size === 0) {
+  if (needsOAuth.length > 0) {
+    M2.info("");
+    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(", ");
-    outroMessage = process.env.CI ? `Skipped OAuth in CI. Pending: ${pending}. Run 'base44 connectors push' locally or open the links above to authorize.` : `Authorization skipped. Pending: ${pending}. Run 'base44 connectors push' or open the links above to authorize.`;
+    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) {
+          M2.info(`
+Opening browser for ${connector2.type}...`);
+          const oauthResult = await runTask(`Waiting for ${connector2.type} authorization...`, async () => {
+            return await runOAuthFlow({
+              type: connector2.type,
+              redirectUrl: connector2.redirectUrl,
+              connectionId: connector2.connectionId
+            });
+          }, {
+            successMessage: `${connector2.type} authorization complete`,
+            errorMessage: `${connector2.type} authorization failed`
+          });
+          oauthOutcomes.set(connector2.type, oauthResult.status);
+        }
+      }
+    }
   }
   printSummary(results, oauthOutcomes);
   return { outroMessage };
@@ -170002,7 +170056,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
@@ -170096,7 +170150,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) {
@@ -170232,7 +170286,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"
@@ -170280,7 +170334,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"}`);
@@ -170291,9 +170345,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}`);
   }
@@ -170318,16 +170369,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
-    });
-    if (oauthOutcomes.size === 0) {
-      const pending = needsOAuth.map((c3) => c3.type).join(", ");
-      M2.info(`To authorize, 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)}`);
@@ -170335,7 +170376,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);
   });
 }
@@ -170626,10 +170667,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;
   }
@@ -170729,7 +170770,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) => {
@@ -170738,7 +170779,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)
@@ -174957,4 +174998,4 @@ export {
   CLIExitError
 };
 
-//# debugId=11497327DA6C4B7264756E2164756E21
+//# debugId=32B5EDD5767F60C664756E2164756E21