@base44-preview/cli 0.0.34-pr.279.558a4e6 → 0.0.34-pr.279.622bfdf

package/dist/cli/index.js

@@ -215342,18 +215342,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 [];
   }
@@ -215361,37 +215359,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
@@ -215608,7 +215641,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);
@@ -215669,7 +215702,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}`);
@@ -224085,14 +224118,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(", ")}`);
@@ -224100,6 +224130,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}`
   };
@@ -226116,12 +226149,6 @@ class Database {
   getCollection(name2) {
     return this.collections.get(name2);
   }
-  hasCollection(name2) {
-    return this.collections.has(name2);
-  }
-  getEntityNames() {
-    return [...this.collections.keys()];
-  }
 }
 
 // node_modules/socket.io/wrapper.mjs
@@ -226212,16 +226239,27 @@ function parseFields(fields) {
   }
   return Object.keys(projection).length > 0 ? projection : undefined;
 }
+function stripInternalFields(doc2) {
+  const { _id, ...rest } = doc2;
+  return rest;
+}
 function createEntityRoutes(db2, logger, remoteProxy, broadcast) {
   const router = import_express2.Router({ mergeParams: true });
   const parseBody = import_express2.json();
   function emit(appId, entityName, type, data) {
-    broadcast?.(appId, entityName, {
+    const createData = (item) => ({
       type,
-      data,
-      id: data.id,
+      data: item,
+      id: item.id,
       timestamp: new Date().toISOString()
     });
+    if (Array.isArray(data)) {
+      for (const item of data) {
+        broadcast(appId, entityName, createData(item));
+      }
+      return;
+    }
+    broadcast(appId, entityName, createData(data));
   }
   router.get("/User/me", (req, res, next) => {
     req.url = req.originalUrl;
@@ -226240,7 +226278,7 @@ function createEntityRoutes(db2, logger, remoteProxy, broadcast) {
         res.status(404).json({ error: `Record with id "${id2}" not found` });
         return;
       }
-      res.json(doc2);
+      res.json(stripInternalFields(doc2));
     } catch (error48) {
       logger.error(`Error in GET /${entityName}/${id2}:`, error48);
       res.status(500).json({ error: "Internal server error" });
@@ -226286,7 +226324,7 @@ function createEntityRoutes(db2, logger, remoteProxy, broadcast) {
         cursor3 = cursor3.projection(projection);
       }
       const docs = await cursor3;
-      res.json(docs);
+      res.json(docs.map(stripInternalFields));
     } catch (error48) {
       logger.error(`Error in GET /${entityName}:`, error48);
       res.status(500).json({ error: "Internal server error" });
@@ -226309,7 +226347,7 @@ function createEntityRoutes(db2, logger, remoteProxy, broadcast) {
       };
       const inserted = await collection.insertAsync(record2);
       emit(appId, entityName, "create", inserted);
-      res.status(201).json(inserted);
+      res.status(201).json(stripInternalFields(inserted));
     } catch (error48) {
       logger.error(`Error in POST /${entityName}:`, error48);
       res.status(500).json({ error: "Internal server error" });
@@ -226334,14 +226372,8 @@ function createEntityRoutes(db2, logger, remoteProxy, broadcast) {
         created_date: now,
         updated_date: now
       }));
-      const inserted = [];
-      for (const record2 of records) {
-        const doc2 = await collection.insertAsync(record2);
-        inserted.push(doc2);
-      }
-      for (const doc2 of inserted) {
-        emit(appId, entityName, "create", doc2);
-      }
+      const inserted = (await collection.insertAsync(records)).map(stripInternalFields);
+      emit(appId, entityName, "create", inserted);
       res.status(201).json(inserted);
     } catch (error48) {
       logger.error(`Error in POST /${entityName}/bulk:`, error48);
@@ -226355,20 +226387,19 @@ function createEntityRoutes(db2, logger, remoteProxy, broadcast) {
       res.status(404).json({ error: `Entity "${entityName}" not found` });
       return;
     }
+    const { id: _id, ...body } = req.body;
     try {
       const updateData = {
-        ...req.body,
+        ...body,
         updated_date: new Date().toISOString()
       };
-      const result = await collection.updateAsync({ id: id2 }, { $set: updateData }, { returnUpdatedDocs: false });
-      if (result.numAffected === 0) {
+      const result = await collection.updateAsync({ id: id2 }, { $set: updateData }, { returnUpdatedDocs: true });
+      if (result.numAffected === 0 || !result.affectedDocuments) {
         res.status(404).json({ error: `Record with id "${id2}" not found` });
         return;
       }
-      const updated = await collection.findOneAsync({ id: id2 });
-      if (updated) {
-        emit(appId, entityName, "update", updated);
-      }
+      const updated = Array.isArray(result.affectedDocuments) ? result.affectedDocuments.map(stripInternalFields) : stripInternalFields(result.affectedDocuments);
+      emit(appId, entityName, "update", updated);
       res.json(updated);
     } catch (error48) {
       logger.error(`Error in PUT /${entityName}/${id2}:`, error48);
@@ -230861,4 +230892,4 @@ export {
   CLIExitError
 };
 
-//# debugId=F959EA086BEFC49F64756E2164756E21
+//# debugId=4A9C27B9C6E48A4D64756E2164756E21