@base44-preview/cli 0.0.34-pr.321.2426836 → 0.0.34-pr.321.4e7633d

package/dist/cli/index.js

@@ -185389,18 +185389,16 @@ 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, "");
-}
+import { isDeepStrictEqual } from "node:util";
 async function readAgentFile(agentPath) {
-  const parsed = await readJsonFile(agentPath);
-  const result = AgentConfigSchema.safeParse(parsed);
+  const raw2 = await readJsonFile(agentPath);
+  const result = AgentConfigSchema.safeParse(raw2);
   if (!result.success) {
     throw new SchemaValidationError("Invalid agent file", result.error, agentPath);
   }
-  return result.data;
+  return { data: result.data, raw: raw2 };
 }
-async function readAllAgents(agentsDir) {
+async function readAgentFiles(agentsDir) {
   if (!await pathExists(agentsDir)) {
     return [];
   }
@@ -185408,37 +185406,72 @@ async function readAllAgents(agentsDir) {
     cwd: agentsDir,
     absolute: true
   });
-  const agents = await Promise.all(files.map((filePath) => readAgentFile(filePath)));
-  const names = new Set;
-  for (const agent of agents) {
-    if (names.has(agent.name)) {
-      throw new Error(`Duplicate agent name "${agent.name}"`);
+  return await Promise.all(files.map(async (filePath) => {
+    const { data, raw: raw2 } = await readAgentFile(filePath);
+    return { data, raw: raw2, filePath };
+  }));
+}
+function buildNameToEntryMap(entries) {
+  const nameToEntry = new Map;
+  for (const entry of entries) {
+    if (nameToEntry.has(entry.data.name)) {
+      throw new InvalidInputError(`Duplicate agent name "${entry.data.name}"`, {
+        hints: [
+          {
+            message: `Remove duplicate agents with name "${entry.data.name}" - only one agent per name is allowed`
+          }
+        ]
+      });
+    }
+    nameToEntry.set(entry.data.name, entry);
+  }
+  return nameToEntry;
+}
+async function readAllAgents(agentsDir) {
+  const entries = await readAgentFiles(agentsDir);
+  const nameToEntry = buildNameToEntryMap(entries);
+  return [...nameToEntry.values()].map((e2) => e2.data);
+}
+function findAvailablePath(agentsDir, name2, claimedPaths) {
+  const base = join3(agentsDir, `${name2}.${CONFIG_FILE_EXTENSION}`);
+  if (!claimedPaths.has(base)) {
+    return base;
+  }
+  for (let i = 1;; i++) {
+    const candidate = join3(agentsDir, `${name2}_${i}.${CONFIG_FILE_EXTENSION}`);
+    if (!claimedPaths.has(candidate)) {
+      return candidate;
     }
-    names.add(agent.name);
   }
-  return agents;
 }
 async function writeAgents(agentsDir, remoteAgents) {
-  const existingAgents = await readAllAgents(agentsDir);
+  const entries = await readAgentFiles(agentsDir);
+  const nameToEntry = buildNameToEntryMap(entries);
   const newNames = new Set(remoteAgents.map((a) => a.name));
-  const toDelete = existingAgents.filter((a) => !newNames.has(a.name));
-  for (const agent of toDelete) {
-    const slug = toFileSlug(agent.name);
-    const files = await globby(`${slug}.${CONFIG_FILE_EXTENSION_GLOB}`, {
-      cwd: agentsDir,
-      absolute: true
-    });
-    for (const filePath of files) {
-      await deleteFile(filePath);
+  const deleted = [];
+  for (const [name2, entry] of nameToEntry) {
+    if (!newNames.has(name2)) {
+      await deleteFile(entry.filePath);
+      deleted.push(name2);
+    }
+  }
+  const claimedPaths = new Set;
+  for (const [name2, entry] of nameToEntry) {
+    if (newNames.has(name2)) {
+      claimedPaths.add(entry.filePath);
     }
   }
+  const written = [];
   for (const agent of remoteAgents) {
-    const slug = toFileSlug(agent.name);
-    const filePath = join3(agentsDir, `${slug}.${CONFIG_FILE_EXTENSION}`);
+    const existing = nameToEntry.get(agent.name);
+    if (existing && isDeepStrictEqual(existing.raw, agent)) {
+      continue;
+    }
+    const filePath = existing?.filePath ?? findAvailablePath(agentsDir, agent.name, claimedPaths);
+    claimedPaths.add(filePath);
     await writeJsonFile(filePath, agent);
+    written.push(agent.name);
   }
-  const written = remoteAgents.map((a) => a.name);
-  const deleted = toDelete.map((a) => a.name);
   return { written, deleted };
 }
 // src/core/resources/agent/resource.ts
@@ -185655,7 +185688,7 @@ async function removeConnector(integrationType) {
 }
 // src/core/resources/connector/config.ts
 import { join as join4 } from "node:path";
-import { isDeepStrictEqual } from "node:util";
+import { isDeepStrictEqual as isDeepStrictEqual2 } from "node:util";
 async function readConnectorFile(connectorPath) {
   const parsed = await readJsonFile(connectorPath);
   const result = ConnectorResourceSchema.safeParse(parsed);
@@ -185716,7 +185749,7 @@ async function writeConnectors(connectorsDir, remoteConnectors) {
       type: connector.integrationType,
       scopes: connector.scopes
     };
-    if (existing && isDeepStrictEqual(existing.data, localConnector)) {
+    if (existing && isDeepStrictEqual2(existing.data, localConnector)) {
       continue;
     }
     const filePath = existing?.filePath ?? join4(connectorsDir, `${connector.integrationType}.${CONFIG_FILE_EXTENSION}`);
@@ -194209,14 +194242,11 @@ async function pullAgentsAction() {
     successMessage: "Agents fetched successfully",
     errorMessage: "Failed to fetch agents"
   });
-  if (remoteAgents.items.length === 0) {
-    return { outroMessage: "No agents found on Base44" };
-  }
-  const { written, deleted } = await runTask("Writing agent files", async () => {
+  const { written, deleted } = await runTask("Syncing agent files", async () => {
     return await writeAgents(agentsDir, remoteAgents.items);
   }, {
-    successMessage: "Agent files written successfully",
-    errorMessage: "Failed to write agent files"
+    successMessage: "Agent files synced successfully",
+    errorMessage: "Failed to sync agent files"
   });
   if (written.length > 0) {
     R2.success(`Written: ${written.join(", ")}`);
@@ -194224,6 +194254,9 @@ async function pullAgentsAction() {
   if (deleted.length > 0) {
     R2.warn(`Deleted: ${deleted.join(", ")}`);
   }
+  if (written.length === 0 && deleted.length === 0) {
+    R2.info("All agents are already up to date");
+  }
   return {
     outroMessage: `Pulled ${remoteAgents.total} agents to ${agentsDir}`
   };
@@ -195700,6 +195733,9 @@ function getLogsCommand(context) {
 
 // src/cli/commands/secrets/delete.ts
 async function deleteSecretsAction(keys) {
+  if (keys.length === 0) {
+    throw new InvalidInputError("Provide one or more secret names. Example: base44 secrets delete KEY1 KEY2");
+  }
   for (const key of keys) {
     await runTask(`Deleting secret "${key}"`, async () => {
       return await deleteSecret(key);
@@ -195714,7 +195750,7 @@ async function deleteSecretsAction(keys) {
   };
 }
 function getSecretsDeleteCommand(context) {
-  return new Command("delete").description("Delete one or more secrets").argument("<keys...>", "Secret name(s) to delete").action(async (keys) => {
+  return new Command("delete").description("Delete one or more secrets").argument("[keys...]", "Secret name(s) to delete").action(async (keys) => {
     await runCommand(() => deleteSecretsAction(keys), { requireAuth: true }, context);
   });
 }
@@ -195729,7 +195765,6 @@ async function listSecretsAction() {
   });
   const names = Object.keys(secrets);
   if (names.length === 0) {
-    R2.info("No secrets found for this project.");
     return { outroMessage: "No secrets configured." };
   }
   for (const [name2, maskedValue] of Object.entries(secrets)) {
@@ -195768,7 +195803,7 @@ async function setSecretsAction(entries, options) {
   const hasEntries = entries.length > 0;
   const hasEnvFile = Boolean(options.envFile);
   if (!hasEntries && !hasEnvFile) {
-    throw new InvalidInputError("Provide KEY=VALUE pairs or --env-file, but not neither.");
+    throw new InvalidInputError("Provide KEY=VALUE pairs or use --env-file. Example: base44 secrets set KEY1=VALUE1 KEY2=VALUE2");
   }
   if (hasEntries && hasEnvFile) {
     throw new InvalidInputError("Provide KEY=VALUE pairs or --env-file, but not both.");
@@ -195795,7 +195830,7 @@ async function setSecretsAction(entries, options) {
   };
 }
 function getSecretsSetCommand(context) {
-  return new Command("set").description("Set one or more secrets (KEY=VALUE format)").argument("[entries...]", "KEY=VALUE pairs (e.g. OPENAI_API_KEY=sk-abc123)").option("--env-file <path>", "Path to .env file").action(async (entries, options) => {
+  return new Command("set").description("Set one or more secrets (KEY=VALUE format)").argument("[entries...]", "KEY=VALUE pairs (e.g. KEY1=VALUE1 KEY2=VALUE2)").option("--env-file <path>", "Path to .env file").action(async (entries, options) => {
     await runCommand(() => setSecretsAction(entries, options), { requireAuth: true }, context);
   });
 }
@@ -200792,4 +200827,4 @@ export {
   CLIExitError
 };
 
-//# debugId=744F4836F1F0A62164756E2164756E21
+//# debugId=FC109C2ECB8C3B1064756E2164756E21