@base44-preview/cli 0.1.14-pr.614.e34e90d → 0.1.14-pr.618.6b8b5cf

package/dist/cli/index.js

@@ -31177,7 +31177,7 @@ function cleanDoc(doc) {
   return mapDoc(doc, (currentDoc) => cleanDocFn(currentDoc));
 }
 function replaceEndOfLine(doc, replacement = literalline) {
-  return mapDoc(doc, (currentDoc) => typeof currentDoc === "string" ? join28(replacement, currentDoc.split(`
+  return mapDoc(doc, (currentDoc) => typeof currentDoc === "string" ? join27(replacement, currentDoc.split(`
 `)) : currentDoc);
 }
 function canBreakFn(doc) {
@@ -31257,7 +31257,7 @@ function indentIfBreak(contents, options) {
     negate: options.negate
   };
 }
-function join28(separator, docs) {
+function join27(separator, docs) {
   assertDoc(separator);
   assertDocArray(docs);
   const parts = [];
@@ -31968,7 +31968,7 @@ var init_doc = __esm(() => {
   MODE_FLAT = Symbol("MODE_FLAT");
   DOC_FILL_PRINTED_LENGTH = Symbol("DOC_FILL_PRINTED_LENGTH");
   builders = {
-    join: join28,
+    join: join27,
     line,
     softline,
     hardline,
@@ -120869,7 +120869,7 @@ async function filter({ name, path: file }) {
 function getSearcher(stopDirectory) {
   return new FileSearcher(CONFIG_FILE_NAMES, { filter, stopDirectory });
 }
-function formatList2(array2, type = "and") {
+function formatList(array2, type = "and") {
   return array2.length < 3 ? array2.join(` ${type} `) : `${array2.slice(0, -1).join(", ")}, ${type} ${array2[array2.length - 1]}`;
 }
 function createError(sym, value, constructor) {
@@ -134665,18 +134665,18 @@ ${codeblock}`, options8);
       }
     }
     if (types.length > 0) {
-      message += `${types.length > 1 ? "one of type" : "of type"} ${formatList2(types, "or")}`;
+      message += `${types.length > 1 ? "one of type" : "of type"} ${formatList(types, "or")}`;
       if (instances.length > 0 || other.length > 0)
         message += " or ";
     }
     if (instances.length > 0) {
-      message += `an instance of ${formatList2(instances, "or")}`;
+      message += `an instance of ${formatList(instances, "or")}`;
       if (other.length > 0)
         message += " or ";
     }
     if (other.length > 0) {
       if (other.length > 1) {
-        message += `one of ${formatList2(other, "or")}`;
+        message += `one of ${formatList(other, "or")}`;
       } else {
         if (other[0].toLowerCase() !== other[0])
           message += "an ";
@@ -228779,7 +228779,7 @@ function normalizeBase44Env() {
 loadProjectEnvFiles();
 
 // src/cli/index.ts
-import { dirname as dirname27, join as join37 } from "node:path";
+import { dirname as dirname26, join as join36 } from "node:path";
 import { fileURLToPath as fileURLToPath6 } from "node:url";
 
 // ../../node_modules/@clack/core/dist/index.mjs
@@ -236754,6 +236754,9 @@ var ListAgentsResponseSchema = object({
 
 // src/core/resources/agent/api.ts
 async function pushAgents(agents) {
+  if (agents.length === 0) {
+    return { created: [], updated: [], deleted: [] };
+  }
   const appClient = getAppClient();
   let response;
   try {
@@ -246525,25 +246528,22 @@ async function deployAll(projectData, options) {
   if (project.visibility) {
     options?.onVisibilitySet?.(project.visibility);
   }
-  const syncResults = {};
-  syncResults.entities = await pushEntities(entities);
-  await deployFunctionsSequentially(functions, {
+  await entityResource.push(entities);
+  const functionResults = await deployFunctionsSequentially(functions, {
     onStart: options?.onFunctionStart,
     onResult: options?.onFunctionResult
   });
-  syncResults.agentSkills = await pushAgentSkills(agentSkills);
-  if (agents.length > 0) {
-    syncResults.agents = await pushAgents(agents);
-  }
+  await agentSkillResource.push(agentSkills);
+  await agentResource.push(agents);
   await authConfigResource.push(authConfig);
   const skipConnectorSync = connectors.length === 0 && hasWorkspaceApiKeyAuth();
   const connectorResults = skipConnectorSync ? [] : (await pushConnectors(connectors)).results;
   if (project.site?.outputDirectory) {
     const outputDir = resolve5(project.root, project.site.outputDirectory);
     const { appUrl } = await deploySite(outputDir);
-    return { appUrl, connectorResults, syncResults };
+    return { appUrl, connectorResults, functionResults };
   }
-  return { connectorResults, syncResults };
+  return { connectorResults, functionResults };
 }
 // src/core/clients/base44-client.ts
 var retriedRequests = new WeakSet;
@@ -247407,21 +247407,8 @@ function getAgentsPullCommand() {
 }
 
 // src/cli/commands/agents/push.ts
-import { dirname as dirname13, join as join20 } from "node:path";
-async function pushAgentsAction({ isNonInteractive, jsonMode, log, runTask }, options) {
-  const { project, agents } = await readProjectConfig();
-  if (agents.length === 0) {
-    const agentsDir = join20(dirname13(project.configPath), project.agentsDir);
-    if (!await pathExists(agentsDir)) {
-      throw new InvalidInputError(`No agents directory found at "${project.agentsDir}"`, {
-        hints: [
-          {
-            message: `Run 'base44 agents pull' to fetch the app's agents, or create an empty "${project.agentsDir}" directory to confirm you want every remote agent deleted`
-          }
-        ]
-      });
-    }
-  }
+async function pushAgentsAction({ isNonInteractive, log, runTask }, options) {
+  const { agents } = await readProjectConfig();
   log.info(agents.length === 0 ? "No local agents found - this will delete all remote agents" : `Found ${agents.length} agents to push`);
   const proceed = await confirmPush({
     isNonInteractive,
@@ -247447,12 +247434,6 @@ async function pushAgentsAction({ isNonInteractive, jsonMode, log, runTask }, op
   if (result.deleted.length > 0) {
     log.warn(`Deleted: ${result.deleted.join(", ")}`);
   }
-  if (jsonMode) {
-    return {
-      outroMessage: "Agents pushed to Base44",
-      stdout: toJsonStdout(result)
-    };
-  }
   return { outroMessage: "Agents pushed to Base44" };
 }
 function getAgentsPushCommand() {
@@ -247465,12 +247446,12 @@ function getAgentsCommand() {
 }
 
 // src/cli/commands/auth/password-login.ts
-import { dirname as dirname14, join as join21 } from "node:path";
+import { dirname as dirname13, join as join20 } from "node:path";
 async function passwordLoginAction({ log, runTask }, action) {
   const shouldEnable = action === "enable";
   const { project } = await readProjectConfig();
-  const configDir = dirname14(project.configPath);
-  const authDir = join21(configDir, project.authDir);
+  const configDir = dirname13(project.configPath);
+  const authDir = join20(configDir, project.authDir);
   const updated = await runTask("Updating local auth config", async () => {
     const current = await readAuthConfig(authDir) ?? DEFAULT_AUTH_CONFIG;
     const merged = { ...current, enableUsernamePassword: shouldEnable };
@@ -247490,14 +247471,14 @@ function getPasswordLoginCommand() {
 }
 
 // src/cli/commands/auth/pull.ts
-import { dirname as dirname15, join as join22 } from "node:path";
+import { dirname as dirname14, join as join21 } from "node:path";
 async function pullAuthAction({
   log,
   runTask
 }) {
   const { project } = await readProjectConfig();
-  const configDir = dirname15(project.configPath);
-  const authDir = join22(configDir, project.authDir);
+  const configDir = dirname14(project.configPath);
+  const authDir = join21(configDir, project.authDir);
   const remoteConfig = await runTask("Fetching auth config from Base44", async () => {
     return await pullAuthConfig();
   }, {
@@ -247561,7 +247542,7 @@ function getAuthPushCommand() {
 }
 
 // src/cli/commands/auth/social-login.ts
-import { dirname as dirname16, join as join23, resolve as resolve6 } from "node:path";
+import { dirname as dirname15, join as join22, resolve as resolve6 } from "node:path";
 var PROVIDER_LABELS = {
   google: "Google",
   microsoft: "Microsoft",
@@ -247631,8 +247612,8 @@ async function socialLoginAction({ log, isNonInteractive, runTask }, provider, a
     }
   }
   const { project } = await readProjectConfig();
-  const configDir = dirname16(project.configPath);
-  const authDir = join23(configDir, project.authDir);
+  const configDir = dirname15(project.configPath);
+  const authDir = join22(configDir, project.authDir);
   const { config: updated } = await runTask("Updating local auth config", async () => updateSocialLoginConfig(authDir, provider, shouldEnable, useCustomOAuth && options.clientId ? { clientId: options.clientId } : undefined));
   if (clientSecret) {
     await runTask("Saving client secret", async () => pushCustomOAuthSecret(provider, clientSecret));
@@ -247657,7 +247638,7 @@ function getSocialLoginCommand() {
 }
 
 // src/cli/commands/auth/sso.ts
-import { dirname as dirname17, join as join24, resolve as resolve7 } from "node:path";
+import { dirname as dirname16, join as join23, resolve as resolve7 } from "node:path";
 var SSOConfigFileSchema = object({
   provider: _enum(Object.values(KNOWN_SSO_PROVIDERS)),
   clientId: string2(),
@@ -247820,8 +247801,8 @@ async function ssoEnableAction({ isNonInteractive, runTask }, options) {
     throw error;
   }
   const { project } = await readProjectConfig();
-  const configDir = dirname17(project.configPath);
-  const authDir = join24(configDir, project.authDir);
+  const configDir = dirname16(project.configPath);
+  const authDir = join23(configDir, project.authDir);
   await runTask("Updating local auth config", async () => updateSSOConfig(authDir, provider, true));
   await runTask("Saving SSO credentials", async () => pushSSOSecrets(secrets));
   return {
@@ -247836,8 +247817,8 @@ async function ssoDisableAction({ log, runTask }, options) {
     throw new InvalidInputError("Configuration options cannot be used with disable. To disable SSO: base44 auth sso disable");
   }
   const { project } = await readProjectConfig();
-  const configDir = dirname17(project.configPath);
-  const authDir = join24(configDir, project.authDir);
+  const configDir = dirname16(project.configPath);
+  const authDir = join23(configDir, project.authDir);
   const updated = await runTask("Updating local auth config", async () => updateSSOConfig(authDir, null, false));
   await runTask("Removing SSO credentials", async () => deleteSSOSecrets());
   if (!hasAnyLoginMethod(updated)) {
@@ -248694,13 +248675,13 @@ function getConnectorsListAvailableCommand() {
 }
 
 // src/cli/commands/connectors/pull.ts
-import { dirname as dirname18, join as join25, resolve as resolve8 } from "node:path";
+import { dirname as dirname17, join as join24, resolve as resolve8 } from "node:path";
 async function resolveConnectorsDir(options) {
   if (!getAppContext().projectRoot) {
     return resolve8(options.dir ?? "connectors");
   }
   const { project } = await readProjectConfig();
-  return join25(dirname18(project.configPath), project.connectorsDir);
+  return join24(dirname17(project.configPath), project.connectorsDir);
 }
 async function pullConnectorsAction({ log, runTask, jsonMode }, options) {
   const connectorsDir = await resolveConnectorsDir(options);
@@ -249108,11 +249089,11 @@ function getListCommand() {
 }
 
 // src/cli/commands/functions/pull.ts
-import { dirname as dirname19, join as join26 } from "node:path";
+import { dirname as dirname18, join as join25 } from "node:path";
 async function pullFunctionsAction({ log, runTask }, name) {
   const { project, functions } = await readProjectConfig();
-  const configDir = dirname19(project.configPath);
-  const functionsDir = join26(configDir, project.functionsDir);
+  const configDir = dirname18(project.configPath);
+  const functionsDir = join25(configDir, project.functionsDir);
   const pluginFunctionNames = new Set(functions.filter((fn) => fn.source.type === "plugin").map((fn) => fn.name));
   const remoteFunctions = await runTask("Fetching functions from Base44", async () => {
     const { functions } = await listDeployedFunctions();
@@ -249238,7 +249219,7 @@ import { basename as basename5, resolve as resolve10 } from "node:path";
 var import_kebabCase = __toESM(require_kebabCase(), 1);
 
 // src/cli/commands/project/scaffold-shared.ts
-import { join as join27 } from "node:path";
+import { join as join26 } from "node:path";
 var DEFAULT_TEMPLATE_ID = "backend-only";
 async function getTemplateById(templateId) {
   const templates = await listTemplates();
@@ -249301,7 +249282,7 @@ async function completeProjectSetup({
           env: { VITE_BASE44_APP_ID: projectId }
         })`${buildCommand}`;
         updateMessage("Deploying site...");
-        return await deploySite(join27(resolvedPath, outputDirectory));
+        return await deploySite(join26(resolvedPath, outputDirectory));
       }, {
         successMessage: theme.colors.base44Orange("Site deployed successfully"),
         errorMessage: "Failed to deploy site"
@@ -249516,15 +249497,7 @@ async function deployAction(ctx, options = {}) {
       outroMessage: "No resources found to deploy"
     };
   }
-  const {
-    project,
-    entities,
-    functions,
-    agents,
-    agentSkills,
-    connectors,
-    authConfig
-  } = projectData;
+  const { project, entities, functions, agents, connectors, authConfig } = projectData;
   const summaryLines = [];
   if (entities.length > 0) {
     summaryLines.push(`  - ${entities.length} ${entities.length === 1 ? "entity" : "entities"}`);
@@ -249547,19 +249520,10 @@ async function deployAction(ctx, options = {}) {
   if (project.site?.outputDirectory) {
     summaryLines.push(`  - Site from ${project.site.outputDirectory}`);
   }
-  const fullSyncLabels = [
-    entities.length > 0 && "entities",
-    agents.length > 0 && "agents",
-    agentSkills.length > 0 && "agent skills"
-  ].filter((label) => typeof label === "string");
-  const destructiveWarning = fullSyncLabels.length > 0 ? `This is a full sync: ${formatList(fullSyncLabels)} that exist in your app but not locally will be DELETED.` : undefined;
   if (!options.yes) {
     log.warn(`This will update your Base44 app with:
 ${summaryLines.join(`
 `)}`);
-    if (destructiveWarning) {
-      log.warn(destructiveWarning);
-    }
     const shouldDeploy = await Re({
       message: "Are you sure you want to continue?"
     });
@@ -249570,9 +249534,6 @@ ${summaryLines.join(`
     log.info(`Deploying:
 ${summaryLines.join(`
 `)}`);
-    if (destructiveWarning) {
-      log.warn(destructiveWarning);
-    }
   }
   await maybeBuildBeforeDeploy(ctx, project, options.build);
   let functionCompleted = 0;
@@ -249590,7 +249551,6 @@ ${summaryLines.join(`
       formatDeployResult(r, log);
     }
   });
-  reportSyncResults(result.syncResults, log);
   const connectorResults = result.connectorResults ?? [];
   await handleOAuthConnectors(connectorResults, isNonInteractive, options, log);
   const stripeResult = connectorResults.find((r) => r.type === "stripe");
@@ -249601,45 +249561,13 @@ ${summaryLines.join(`
   if (result.appUrl) {
     log.message(`${theme.styles.header("App URL")}: ${theme.colors.links(result.appUrl)}`);
   }
-  if (ctx.jsonMode) {
-    return {
-      outroMessage: "App deployed successfully",
-      stdout: toJsonStdout({
-        appUrl: result.appUrl,
-        sync: result.syncResults
-      })
-    };
+  const failedFunctions = result.functionResults.filter((functionResult) => functionResult.status === "error").length;
+  if (failedFunctions > 0) {
+    log.warn(`${failedFunctions} ${failedFunctions === 1 ? "function" : "functions"} failed to deploy`);
+    throw new CLIExitError(1);
   }
   return { outroMessage: "App deployed successfully" };
 }
-function formatList(items) {
-  if (items.length <= 1) {
-    return items.join("");
-  }
-  return `${items.slice(0, -1).join(", ")} and ${items[items.length - 1]}`;
-}
-var SYNC_RESULT_LABELS = {
-  entities: "Entities",
-  agentSkills: "Agent skills",
-  agents: "Agents"
-};
-function reportSyncResults(syncResults, log) {
-  for (const [key, label] of Object.entries(SYNC_RESULT_LABELS)) {
-    const outcome = syncResults[key];
-    if (!outcome) {
-      continue;
-    }
-    if (outcome.created.length > 0) {
-      log.success(`${label} created: ${outcome.created.join(", ")}`);
-    }
-    if (outcome.updated.length > 0) {
-      log.success(`${label} updated: ${outcome.updated.join(", ")}`);
-    }
-    if (outcome.deleted.length > 0) {
-      log.warn(`${label} deleted: ${outcome.deleted.join(", ")}`);
-    }
-  }
-}
 function getDeployCommand2() {
   return new Base44Command("deploy").description("Deploy all project resources (entities, functions, agents, connectors, and site)").option("-y, --yes", "Skip confirmation prompt").option("--build", "Build the site before deploying (skips the prompt)").option("--no-build", "Deploy without building (skips the prompt)").action(deployAction);
 }
@@ -250810,10 +250738,10 @@ function toPascalCase(name) {
   return name.split(/[-_\s]+/).map((w) => w.charAt(0).toUpperCase() + w.slice(1)).join("");
 }
 // src/core/types/update-project.ts
-import { join as join30 } from "node:path";
+import { join as join29 } from "node:path";
 var TYPES_INCLUDE_PATH = `${PROJECT_SUBDIR}/${TYPES_OUTPUT_SUBDIR}/*.d.ts`;
 async function updateProjectConfig(projectRoot) {
-  const tsconfigPath = join30(projectRoot, "tsconfig.json");
+  const tsconfigPath = join29(projectRoot, "tsconfig.json");
   if (!await pathExists(tsconfigPath)) {
     return false;
   }
@@ -251277,7 +251205,7 @@ function createDevLogger(label, labelColor = theme.styles.dim) {
 // src/cli/dev/dev-server/main.ts
 var import_cors = __toESM(require_lib4(), 1);
 var import_express6 = __toESM(require_express(), 1);
-import { dirname as dirname25, join as join36 } from "node:path";
+import { dirname as dirname24, join as join35 } from "node:path";
 
 // ../../node_modules/get-port/index.js
 import net from "node:net";
@@ -251407,7 +251335,7 @@ var $tmpName = promisify11(tmp.tmpName);
 
 // src/cli/dev/dev-server/function-manager.ts
 import { spawn as spawn2 } from "node:child_process";
-import { dirname as dirname22, join as join31 } from "node:path";
+import { dirname as dirname21, join as join30 } from "node:path";
 import { pathToFileURL } from "node:url";
 
 // src/cli/dev/dev-server/base-function-manager.ts
@@ -251512,7 +251440,7 @@ class FunctionManager extends BaseFunctionManager {
   }
   spawnFunction(func, port) {
     this.logger.log(`Spawning function "${func.name}" on port ${port}`);
-    const importMapPath = join31(dirname22(this.wrapperPath), "import-map.json");
+    const importMapPath = join30(dirname21(this.wrapperPath), "import-map.json");
     const process2 = spawn2("deno", ["run", "--allow-all", "--import-map", importMapPath, this.wrapperPath], {
       env: {
         ...globalThis.process.env,
@@ -251586,7 +251514,7 @@ class FunctionManager extends BaseFunctionManager {
 import { mkdirSync as mkdirSync2, writeFileSync as writeFileSync2 } from "node:fs";
 import { isBuiltin } from "node:module";
 import { homedir as homedir3 } from "node:os";
-import { join as join33 } from "node:path";
+import { join as join31 } from "node:path";
 import { pathToFileURL as pathToFileURL6 } from "node:url";
 var depsPromise;
 function loadDeps() {
@@ -251707,9 +251635,9 @@ export default {
 };
 `;
 function ensureBundlerConfig() {
-  const dir = join33(homedir3(), ".base44", "function-bundler");
+  const dir = join31(homedir3(), ".base44", "function-bundler");
   mkdirSync2(dir, { recursive: true });
-  const configPath = join33(dir, "deno.json");
+  const configPath = join31(dir, "deno.json");
   writeFileSync2(configPath, `${JSON.stringify({ nodeModulesDir: "auto" }, null, 2)}
 `);
   return configPath;
@@ -254971,8 +254899,8 @@ async function createDevServer(options) {
     broadcastEntityEvent(io, appId, entityName, event);
   };
   const base44ConfigWatcher = new WatchBase44({
-    functions: join36(dirname25(project.configPath), project.functionsDir),
-    entities: join36(dirname25(project.configPath), project.entitiesDir)
+    functions: join35(dirname24(project.configPath), project.functionsDir),
+    entities: join35(dirname24(project.configPath), project.entitiesDir)
   }, devLogger);
   base44ConfigWatcher.on("change", async (name) => {
     try {
@@ -255527,7 +255455,7 @@ var import_detect_agent = __toESM(require_dist5(), 1);
 import { release, type } from "node:os";
 
 // ../../node_modules/posthog-node/dist/extensions/error-tracking/modifiers/module.node.mjs
-import { dirname as dirname26, posix, sep as sep2 } from "path";
+import { dirname as dirname25, posix, sep as sep2 } from "path";
 function createModulerModifier() {
   const getModuleFromFileName = createGetModuleFromFilename();
   return async (frames) => {
@@ -255536,7 +255464,7 @@ function createModulerModifier() {
     return frames;
   };
 }
-function createGetModuleFromFilename(basePath = process.argv[1] ? dirname26(process.argv[1]) : process.cwd(), isWindows = sep2 === "\\") {
+function createGetModuleFromFilename(basePath = process.argv[1] ? dirname25(process.argv[1]) : process.cwd(), isWindows = sep2 === "\\") {
   const normalizedBase = isWindows ? normalizeWindowsPath2(basePath) : basePath;
   return (filename) => {
     if (!filename)
@@ -259525,9 +259453,9 @@ function addCommandInfoToErrorReporter(program, errorReporter) {
   });
 }
 // src/cli/index.ts
-var __dirname4 = dirname27(fileURLToPath6(import.meta.url));
+var __dirname4 = dirname26(fileURLToPath6(import.meta.url));
 async function runCLI(options) {
-  ensureNpmAssets(join37(__dirname4, "../assets"));
+  ensureNpmAssets(join36(__dirname4, "../assets"));
   const errorReporter = new ErrorReporter;
   errorReporter.registerProcessErrorHandlers();
   const jsonMode = process.argv.includes("--json");
@@ -259566,4 +259494,4 @@ export {
   runCLI
 };
 
-//# debugId=B821E298EE7A5FD964756E2164756E21
+//# debugId=948085031B0FBD6764756E2164756E21