@base44-preview/cli 0.0.37-pr.365.600b1d5 → 0.0.38-pr.251.a2ee20c

package/dist/cli/index.js

@@ -8933,10 +8933,10 @@ var require_ejs = __commonJS((exports) => {
   exports.localsName = _DEFAULT_LOCALS_NAME;
   exports.promiseImpl = new Function("return this;")().Promise;
   exports.resolveInclude = function(name2, filename, isDir) {
-    var dirname6 = path11.dirname;
+    var dirname7 = path11.dirname;
     var extname = path11.extname;
     var resolve = path11.resolve;
-    var includePath = resolve(isDir ? filename : dirname6(filename), name2);
+    var includePath = resolve(isDir ? filename : dirname7(filename), name2);
     var ext = extname(name2);
     if (!ext) {
       includePath += ".ejs";
@@ -12652,8 +12652,8 @@ var require_main = __commonJS((exports, module) => {
       const shortPaths = [];
       for (const filePath of optionPaths) {
         try {
-          const relative = path11.relative(process.cwd(), filePath);
-          shortPaths.push(relative);
+          const relative3 = path11.relative(process.cwd(), filePath);
+          shortPaths.push(relative3);
         } catch (e2) {
           if (debug) {
             _debug(`Failed to load ${filePath} ${e2.message}`);
@@ -18062,7 +18062,7 @@ var require_lodash = __commonJS((exports, module) => {
       function nth(array2, n2) {
         return array2 && array2.length ? baseNth(array2, toInteger(n2)) : undefined2;
       }
-      var pull = baseRest(pullAll);
+      var pull2 = baseRest(pullAll);
       function pullAll(array2, values2) {
         return array2 && array2.length && values2 && values2.length ? basePullAll(array2, values2) : array2;
       }
@@ -19827,7 +19827,7 @@ __p += '`;
       lodash.pickBy = pickBy;
       lodash.property = property;
       lodash.propertyOf = propertyOf;
-      lodash.pull = pull;
+      lodash.pull = pull2;
       lodash.pullAll = pullAll;
       lodash.pullAllBy = pullAllBy;
       lodash.pullAllWith = pullAllWith;
@@ -110477,9 +110477,9 @@ function getMessage2(key2, parameters, self2) {
     assert22.ok(message.length <= parameters.length, `Code: ${key2}; The provided arguments length (${parameters.length}) does not match the required ones (${message.length}).`);
     return Reflect.apply(message, self2, parameters);
   }
-  const regex2 = /%[dfijoOs]/g;
+  const regex = /%[dfijoOs]/g;
   let expectedLength = 0;
-  while (regex2.exec(message) !== null)
+  while (regex.exec(message) !== null)
     expectedLength++;
   assert22.ok(expectedLength === parameters.length, `Code: ${key2}; The provided arguments length (${parameters.length}) does not match the required ones (${expectedLength}).`);
   if (parameters.length === 0)
@@ -111380,9 +111380,9 @@ function convertEndOfLineOptionToCharacter2(endOfLineOption) {
   return endOfLineOption === OPTION_CR2 ? CHARACTER_CR2 : endOfLineOption === OPTION_CRLF2 ? CHARACTER_CRLF2 : DEFAULT_EOL2;
 }
 function countEndOfLineCharacters(text, endOfLineCharacter) {
-  const regex2 = regexps.get(endOfLineCharacter);
+  const regex = regexps.get(endOfLineCharacter);
   if (false) {}
-  return text.match(regex2)?.length ?? 0;
+  return text.match(regex)?.length ?? 0;
 }
 function normalizeEndOfLine(text) {
   return method_replace_all_default2(0, text, END_OF_LINE_REGEXP, CHARACTER_LF2);
@@ -113584,8 +113584,8 @@ function legacyIsNextLineEmpty(text, node, locEnd) {
 }
 function makeString(rawText, enclosingQuote, unescapeUnnecessaryEscapes) {
   const otherQuote = enclosingQuote === '"' ? "'" : '"';
-  const regex2 = /\\(.)|(["'])/gsu;
-  const raw2 = method_replace_all_default2(0, rawText, regex2, (match, escaped, quote) => {
+  const regex = /\\(.)|(["'])/gsu;
+  const raw2 = method_replace_all_default2(0, rawText, regex, (match, escaped, quote) => {
     if (escaped === otherQuote) {
       return escaped;
     }
@@ -117006,17 +117006,17 @@ var init_prettier = __esm(() => {
         }
         const opts = options8 || {};
         const posix = utils3.isWindows(options8);
-        const regex2 = isState ? picomatch.compileRe(glob, options8) : picomatch.makeRe(glob, options8, false, true);
-        const state = regex2.state;
-        delete regex2.state;
+        const regex = isState ? picomatch.compileRe(glob, options8) : picomatch.makeRe(glob, options8, false, true);
+        const state = regex.state;
+        delete regex.state;
         let isIgnored2 = () => false;
         if (opts.ignore) {
           const ignoreOpts = { ...options8, ignore: null, onMatch: null, onResult: null };
           isIgnored2 = picomatch(opts.ignore, ignoreOpts, returnState);
         }
         const matcher = (input, returnObject = false) => {
-          const { isMatch, match, output } = picomatch.test(input, regex2, options8, { glob, posix });
-          const result = { glob, state, regex: regex2, posix, input, output, match, isMatch };
+          const { isMatch, match, output } = picomatch.test(input, regex, options8, { glob, posix });
+          const result = { glob, state, regex, posix, input, output, match, isMatch };
           if (typeof opts.onResult === "function") {
             opts.onResult(result);
           }
@@ -117041,7 +117041,7 @@ var init_prettier = __esm(() => {
         }
         return matcher;
       };
-      picomatch.test = (input, regex2, options8, { glob, posix } = {}) => {
+      picomatch.test = (input, regex, options8, { glob, posix } = {}) => {
         if (typeof input !== "string") {
           throw new TypeError("Expected input to be a string");
         }
@@ -117058,16 +117058,16 @@ var init_prettier = __esm(() => {
         }
         if (match === false || opts.capture === true) {
           if (opts.matchBase === true || opts.basename === true) {
-            match = picomatch.matchBase(input, regex2, options8, posix);
+            match = picomatch.matchBase(input, regex, options8, posix);
           } else {
-            match = regex2.exec(output);
+            match = regex.exec(output);
           }
         }
         return { isMatch: Boolean(match), match, output };
       };
       picomatch.matchBase = (input, glob, options8, posix = utils3.isWindows(options8)) => {
-        const regex2 = glob instanceof RegExp ? glob : picomatch.makeRe(glob, options8);
-        return regex2.test(path152.basename(input));
+        const regex = glob instanceof RegExp ? glob : picomatch.makeRe(glob, options8);
+        return regex.test(path152.basename(input));
       };
       picomatch.isMatch = (str, patterns, options8) => picomatch(patterns, options8)(str);
       picomatch.parse = (pattern, options8) => {
@@ -117087,11 +117087,11 @@ var init_prettier = __esm(() => {
         if (state && state.negated === true) {
           source2 = `^(?!${source2}).*$`;
         }
-        const regex2 = picomatch.toRegex(source2, options8);
+        const regex = picomatch.toRegex(source2, options8);
         if (returnState === true) {
-          regex2.state = state;
+          regex.state = state;
         }
-        return regex2;
+        return regex;
       };
       picomatch.makeRe = (input, options8 = {}, returnOutput = false, returnState = false) => {
         if (!input || typeof input !== "string") {
@@ -117255,8 +117255,8 @@ var init_prettier = __esm(() => {
       };
       micromatch2.capture = (glob, input, options8) => {
         let posix = utils3.isWindows(options8);
-        let regex2 = picomatch.makeRe(String(glob), { ...options8, capture: true });
-        let match = regex2.exec(posix ? utils3.toPosixSlashes(input) : input);
+        let regex = picomatch.makeRe(String(glob), { ...options8, capture: true });
+        let match = regex.exec(posix ? utils3.toPosixSlashes(input) : input);
         if (match) {
           return match.slice(1).map((v10) => v10 === undefined ? "" : v10);
         }
@@ -117434,15 +117434,15 @@ var init_prettier = __esm(() => {
       exports.removeDuplicateSlashes = removeDuplicateSlashes;
       function partitionAbsoluteAndRelative(patterns) {
         const absolute = [];
-        const relative2 = [];
+        const relative22 = [];
         for (const pattern of patterns) {
           if (isAbsolute2(pattern)) {
             absolute.push(pattern);
           } else {
-            relative2.push(pattern);
+            relative22.push(pattern);
           }
         }
-        return [absolute, relative2];
+        return [absolute, relative22];
       }
       exports.partitionAbsoluteAndRelative = partitionAbsoluteAndRelative;
       function isAbsolute2(pattern) {
@@ -121695,7 +121695,7 @@ globstar while`, file2, fr10, pattern, pr8, swallowee);
       };
       Object.defineProperty(exports, "__esModule", { value: true });
       var fs42 = __importStar(__require2("fs"));
-      var regex2 = {
+      var regex = {
         section: /^\s*\[(([^#;]|\\#|\\;)+)\]\s*([#;].*)?$/,
         param: /^\s*([\w\.\-\_]+)\s*[=:]\s*(.*?)\s*([#;].*)?$/,
         comment: /^\s*[#;].*$/
@@ -121727,14 +121727,14 @@ globstar while`, file2, fr10, pattern, pr8, swallowee);
         var lines = data.split(/\r\n|\r|\n/);
         lines.forEach(function(line3) {
           var match;
-          if (regex2.comment.test(line3)) {
+          if (regex.comment.test(line3)) {
             return;
           }
-          if (regex2.param.test(line3)) {
-            match = line3.match(regex2.param);
+          if (regex.param.test(line3)) {
+            match = line3.match(regex.param);
             sectionBody[match[1]] = match[2];
-          } else if (regex2.section.test(line3)) {
-            match = line3.match(regex2.section);
+          } else if (regex.section.test(line3)) {
+            match = line3.match(regex.section);
             sectionName = match[1];
             sectionBody = {};
             value.push([sectionName, sectionBody]);
@@ -122820,8 +122820,8 @@ globstar while`, file2, fr10, pattern, pr8, swallowee);
         }
         _make(mode, key2) {
           const str = this.regexPrefix.replace(REGEX_REPLACE_TRAILING_WILDCARD, TRAILING_WILD_CARD_REPLACERS[mode]);
-          const regex2 = this.ignoreCase ? new RegExp(str, "i") : new RegExp(str);
-          return define2(this, key2, regex2);
+          const regex = this.ignoreCase ? new RegExp(str, "i") : new RegExp(str);
+          return define2(this, key2, regex);
         }
       };
       var createRule = ({
@@ -127617,8 +127617,8 @@ var require_prettier = __commonJS((exports, module) => {
   }
   function makeString2(rawText, enclosingQuote, unescapeUnnecessaryEscapes) {
     const otherQuote = enclosingQuote === '"' ? "'" : '"';
-    const regex2 = /\\(.)|(["'])/gsu;
-    const raw2 = method_replace_all_default3(0, rawText, regex2, (match, escaped, quote) => {
+    const regex = /\\(.)|(["'])/gsu;
+    const raw2 = method_replace_all_default3(0, rawText, regex, (match, escaped, quote) => {
       if (escaped === otherQuote) {
         return escaped;
       }
@@ -132397,7 +132397,7 @@ var require_url = __commonJS((exports) => {
   exports.fromFileSystemPath = fromFileSystemPath;
   exports.toFileSystemPath = toFileSystemPath;
   exports.safePointerToPath = safePointerToPath;
-  exports.relative = relative2;
+  exports.relative = relative4;
   var convert_path_to_posix_1 = __importDefault(require_convert_path_to_posix());
   var path_1 = __importStar(__require("path"));
   var forwardSlashPattern = /\//g;
@@ -132547,7 +132547,7 @@ var require_url = __commonJS((exports) => {
       return decodeURIComponent(value).replace(jsonPointerSlash, "/").replace(jsonPointerTilde, "~");
     });
   }
-  function relative2(from, to5) {
+  function relative4(from, to5) {
     if (!isFileSystemPath(from) || !isFileSystemPath(to5)) {
       return resolve6(from, to5);
     }
@@ -138614,7 +138614,7 @@ var require_depd = __commonJS((exports, module) => {
    * Copyright(c) 2014-2018 Douglas Christopher Wilson
    * MIT Licensed
    */
-  var relative2 = __require("path").relative;
+  var relative4 = __require("path").relative;
   module.exports = depd;
   var basePath = process.cwd();
   function containsNamespace(str, namespace) {
@@ -138810,7 +138810,7 @@ var require_depd = __commonJS((exports, module) => {
     return formatted;
   }
   function formatLocation(callSite) {
-    return relative2(basePath, callSite[0]) + ":" + callSite[1] + ":" + callSite[2];
+    return relative4(basePath, callSite[0]) + ":" + callSite[1] + ":" + callSite[2];
   }
   function getStack() {
     var limit = Error.stackTraceLimit;
@@ -156272,7 +156272,7 @@ var require_view = __commonJS((exports, module) => {
   var debug = require_src4()("express:view");
   var path18 = __require("node:path");
   var fs28 = __require("node:fs");
-  var dirname11 = path18.dirname;
+  var dirname12 = path18.dirname;
   var basename4 = path18.basename;
   var extname2 = path18.extname;
   var join15 = path18.join;
@@ -156311,7 +156311,7 @@ var require_view = __commonJS((exports, module) => {
     for (var i5 = 0;i5 < roots.length && !path19; i5++) {
       var root2 = roots[i5];
       var loc = resolve6(root2, name2);
-      var dir = dirname11(loc);
+      var dir = dirname12(loc);
       var file2 = basename4(loc);
       path19 = this.resolve(dir, file2);
     }
@@ -156661,12 +156661,12 @@ var require_ipaddr = __commonJS((exports, module) => {
         return this.toNormalizedString().replace(/((^|:)(0(:|$))+)/, "::");
       };
       IPv6.prototype.toRFC5952String = function() {
-        var bestMatchIndex, bestMatchLength, match, regex2, string4;
-        regex2 = /((^|:)(0(:|$)){2,})/g;
+        var bestMatchIndex, bestMatchLength, match, regex, string4;
+        regex = /((^|:)(0(:|$)){2,})/g;
         string4 = this.toNormalizedString();
         bestMatchIndex = 0;
         bestMatchLength = -1;
-        while (match = regex2.exec(string4)) {
+        while (match = regex.exec(string4)) {
           if (match[0].length > bestMatchLength) {
             bestMatchIndex = match.index;
             bestMatchLength = match[0].length;
@@ -161958,8 +161958,8 @@ var require_follow_redirects = __commonJS((exports, module) => {
     }
     return parsed;
   }
-  function resolveUrl(relative2, base) {
-    return useNativeURL ? new URL2(relative2, base) : parseUrl(url3.resolve(base, relative2));
+  function resolveUrl(relative4, base) {
+    return useNativeURL ? new URL2(relative4, base) : parseUrl(url3.resolve(base, relative4));
   }
   function validateUrl(input) {
     if (/^\[/.test(input.hostname) && !/^\[[:0-9a-f]+\]$/i.test(input.hostname)) {
@@ -161984,10 +161984,10 @@ var require_follow_redirects = __commonJS((exports, module) => {
     spread.path = spread.search ? spread.pathname + spread.search : spread.pathname;
     return spread;
   }
-  function removeMatchingHeaders(regex2, headers) {
+  function removeMatchingHeaders(regex, headers) {
     var lastValue;
     for (var header2 in headers) {
-      if (regex2.test(header2)) {
+      if (regex.test(header2)) {
         lastValue = headers[header2];
         delete headers[header2];
       }
@@ -193547,9 +193547,9 @@ var require_dist4 = __commonJS((exports, module) => {
         name2 = "/" + name2;
       let nsp = this._nsps.get(name2);
       if (!nsp) {
-        for (const [regex2, parentNamespace] of this.parentNamespacesFromRegExp) {
-          if (regex2.test(name2)) {
-            debug("attaching namespace %s to parent namespace %s", name2, regex2);
+        for (const [regex, parentNamespace] of this.parentNamespacesFromRegExp) {
+          if (regex.test(name2)) {
+            debug("attaching namespace %s to parent namespace %s", name2, regex);
             return parentNamespace.createChild(name2);
           }
         }
@@ -210671,7 +210671,7 @@ var {
 } = import__.default;
 
 // src/cli/commands/agents/pull.ts
-import { dirname as dirname7, join as join9 } from "node:path";
+import { dirname as dirname8, join as join9 } from "node:path";
 
 // node_modules/@clack/core/dist/index.mjs
 var import_picocolors = __toESM(require_picocolors(), 1);
@@ -225313,6 +225313,9 @@ var UserInfoSchema = exports_external.object({
   name: exports_external.string()
 });
 
+// src/core/clients/base44-client.ts
+import { randomUUID as randomUUID2 } from "node:crypto";
+
 // node_modules/ky/distribution/errors/HTTPError.js
 class HTTPError extends Error {
   response;
@@ -226141,7 +226144,9 @@ import { fileURLToPath } from "node:url";
 var PROJECT_SUBDIR = "base44";
 var CONFIG_FILE_EXTENSION = "jsonc";
 var CONFIG_FILE_EXTENSION_GLOB = "{json,jsonc}";
-var FUNCTION_CONFIG_FILE = `function.${CONFIG_FILE_EXTENSION_GLOB}`;
+var FUNCTION_CONFIG_GLOB = `**/function.${CONFIG_FILE_EXTENSION_GLOB}`;
+var ENTRY_FILE_GLOB = "**/entry.{js,ts}";
+var ENTRY_IGNORE_DOT_PATHS = ["**/*.*/**"];
 var APP_CONFIG_PATTERN = `**/.app.${CONFIG_FILE_EXTENSION_GLOB}`;
 var PROJECT_CONFIG_PATTERNS = [
   `${PROJECT_SUBDIR}/config.${CONFIG_FILE_EXTENSION_GLOB}`,
@@ -233170,7 +233175,7 @@ var generateGlobTasks = normalizeArguments(generateTasks);
 var generateGlobTasksSync = normalizeArgumentsSync(generateTasksSync);
 
 // src/core/project/config.ts
-import { dirname as dirname5, join as join6 } from "node:path";
+import { dirname as dirname6, join as join6 } from "node:path";
 
 // src/core/resources/agent/schema.ts
 var EntityOperationSchema = exports_external.enum(["create", "update", "delete", "read"]);
@@ -233386,6 +233391,10 @@ var GoogleBigQueryConnectorSchema = exports_external.object({
   type: exports_external.literal("googlebigquery"),
   scopes: exports_external.array(exports_external.string()).default([])
 });
+var StripeConnectorSchema = exports_external.object({
+  type: exports_external.literal("stripe"),
+  scopes: exports_external.array(exports_external.string()).default([])
+});
 var CustomTypeSchema = exports_external.string().min(1).regex(/^[a-z0-9_-]+$/i);
 var GenericConnectorSchema = exports_external.object({
   type: CustomTypeSchema,
@@ -233405,6 +233414,7 @@ var ConnectorResourceSchema = exports_external.union([
   HubspotConnectorSchema,
   LinkedInConnectorSchema,
   TikTokConnectorSchema,
+  StripeConnectorSchema,
   GenericConnectorSchema
 ]);
 var KnownIntegrationTypes = [
@@ -233420,7 +233430,8 @@ var KnownIntegrationTypes = [
   "salesforce",
   "hubspot",
   "linkedin",
-  "tiktok"
+  "tiktok",
+  "stripe"
 ];
 var IntegrationTypeSchema = exports_external.union([
   exports_external.enum(KnownIntegrationTypes),
@@ -233473,6 +233484,18 @@ var RemoveConnectorResponseSchema = exports_external.object({
   status: data.status,
   integrationType: data.integration_type
 }));
+var STRIPE_CONNECTOR_TYPE = "stripe";
+var InstallStripeResponseSchema = exports_external.object({
+  already_installed: exports_external.boolean(),
+  claim_url: exports_external.string().nullable()
+});
+var StripeStatusResponseSchema = exports_external.object({
+  stripe_mode: exports_external.enum(["sandbox", "live"]).nullable(),
+  sandbox_claim_url: exports_external.string().nullable().optional()
+});
+var RemoveStripeResponseSchema = exports_external.object({
+  success: exports_external.boolean()
+});
 
 // src/core/resources/connector/api.ts
 async function listConnectors() {
@@ -233540,6 +233563,54 @@ async function removeConnector(integrationType) {
   }
   return result.data;
 }
+async function installStripe() {
+  const appClient = getAppClient();
+  let response;
+  try {
+    response = await appClient.post("payments/stripe/install", {
+      timeout: 60000
+    });
+  } catch (error48) {
+    throw await ApiError.fromHttpError(error48, "installing Stripe");
+  }
+  const result = InstallStripeResponseSchema.safeParse(await response.json());
+  if (!result.success) {
+    throw new SchemaValidationError("Invalid response from server", result.error);
+  }
+  return result.data;
+}
+async function getStripeStatus() {
+  const appClient = getAppClient();
+  let response;
+  try {
+    response = await appClient.get("payments/stripe/status", {
+      timeout: 60000
+    });
+  } catch (error48) {
+    throw await ApiError.fromHttpError(error48, "checking Stripe integration status");
+  }
+  const result = StripeStatusResponseSchema.safeParse(await response.json());
+  if (!result.success) {
+    throw new SchemaValidationError("Invalid response from server", result.error);
+  }
+  return result.data;
+}
+async function removeStripe() {
+  const appClient = getAppClient();
+  let response;
+  try {
+    response = await appClient.delete("payments/stripe", {
+      timeout: 60000
+    });
+  } catch (error48) {
+    throw await ApiError.fromHttpError(error48, "removing Stripe integration");
+  }
+  const result = RemoveStripeResponseSchema.safeParse(await response.json());
+  if (!result.success) {
+    throw new SchemaValidationError("Invalid response from server", result.error);
+  }
+  return result.data;
+}
 // src/core/resources/connector/config.ts
 import { join as join4 } from "node:path";
 import { isDeepStrictEqual as isDeepStrictEqual2 } from "node:util";
@@ -233588,7 +233659,7 @@ async function readAllConnectors(connectorsDir) {
 async function writeConnectors(connectorsDir, remoteConnectors) {
   const entries = await readConnectorFiles(connectorsDir);
   const typeToEntry = buildTypeToEntryMap(entries);
-  const newTypes = new Set(remoteConnectors.map((c) => c.integrationType));
+  const newTypes = new Set(remoteConnectors.map((c) => c.type));
   const deleted = [];
   for (const [type, entry] of typeToEntry) {
     if (!newTypes.has(type)) {
@@ -233598,22 +233669,44 @@ async function writeConnectors(connectorsDir, remoteConnectors) {
   }
   const written = [];
   for (const connector of remoteConnectors) {
-    const existing = typeToEntry.get(connector.integrationType);
-    const localConnector = {
-      type: connector.integrationType,
-      scopes: connector.scopes
-    };
-    if (existing && isDeepStrictEqual2(existing.data, localConnector)) {
+    const existing = typeToEntry.get(connector.type);
+    if (existing && isDeepStrictEqual2(existing.data, connector)) {
       continue;
     }
-    const filePath = existing?.filePath ?? join4(connectorsDir, `${connector.integrationType}.${CONFIG_FILE_EXTENSION}`);
-    await writeJsonFile(filePath, localConnector);
-    written.push(connector.integrationType);
+    const filePath = existing?.filePath ?? join4(connectorsDir, `${connector.type}.${CONFIG_FILE_EXTENSION}`);
+    await writeJsonFile(filePath, connector);
+    written.push(connector.type);
   }
   return { written, deleted };
 }
+// src/core/resources/connector/pull.ts
+async function pullAllConnectors() {
+  const [oauthResponse, stripeStatus] = await Promise.all([
+    listConnectors(),
+    getStripeStatus()
+  ]);
+  const connectors = oauthResponse.integrations.map((i) => ({
+    type: i.integrationType,
+    scopes: i.scopes
+  }));
+  if (stripeStatus.stripe_mode !== null) {
+    connectors.push({ type: STRIPE_CONNECTOR_TYPE, scopes: [] });
+  }
+  return connectors;
+}
 // src/core/resources/connector/push.ts
 async function pushConnectors(connectors) {
+  const stripeConnector = connectors.find((c) => c.type === STRIPE_CONNECTOR_TYPE);
+  const oauthConnectors = connectors.filter((c) => c.type !== STRIPE_CONNECTOR_TYPE);
+  const oauthResults = await syncOAuthConnectors(oauthConnectors);
+  const stripeResult = await syncStripeConnector(stripeConnector);
+  const results = [...oauthResults];
+  if (stripeResult) {
+    results.push(stripeResult);
+  }
+  return { results };
+}
+async function syncOAuthConnectors(connectors) {
   const results = [];
   const upstream = await listConnectors();
   const localTypes = new Set(connectors.map((c) => c.type));
@@ -233646,7 +233739,62 @@ async function pushConnectors(connectors) {
       }
     }
   }
-  return { results };
+  return results;
+}
+async function syncStripeConnector(localStripe) {
+  const remoteStatus = await fetchStripeRemoteStatus();
+  if (remoteStatus === "error") {
+    return localStripe ? stripeError("Failed to check Stripe integration status") : null;
+  }
+  const isRemoteInstalled = remoteStatus.stripe_mode !== null;
+  const needsInstall = localStripe && !isRemoteInstalled;
+  const alreadySynced = localStripe && isRemoteInstalled;
+  const needsRemoval = !localStripe && isRemoteInstalled;
+  if (needsInstall) {
+    return handleStripeInstall();
+  }
+  if (alreadySynced) {
+    return stripeSynced();
+  }
+  if (needsRemoval) {
+    return handleStripeRemoval();
+  }
+  return null;
+}
+async function fetchStripeRemoteStatus() {
+  try {
+    return await getStripeStatus();
+  } catch {
+    return "error";
+  }
+}
+async function handleStripeInstall() {
+  try {
+    const result = await installStripe();
+    return stripeProvisioned(result.claim_url ?? undefined);
+  } catch (err) {
+    return stripeError(err instanceof Error ? err.message : String(err));
+  }
+}
+async function handleStripeRemoval() {
+  try {
+    await removeStripe();
+    return stripeRemoved();
+  } catch (err) {
+    return stripeError(err instanceof Error ? err.message : String(err));
+  }
+}
+function stripeSynced() {
+  return { type: STRIPE_CONNECTOR_TYPE, action: "synced" };
+}
+function stripeProvisioned(claimUrl) {
+  return { type: STRIPE_CONNECTOR_TYPE, action: "provisioned", claimUrl };
+}
+function stripeRemoved() {
+  return { type: STRIPE_CONNECTOR_TYPE, action: "removed" };
+}
+function stripeError(error48) {
+  return { type: STRIPE_CONNECTOR_TYPE, action: "error", error: error48 };
 }
 function getConnectorSyncResult(type, response) {
   if (response.error === "different_user") {
@@ -233664,7 +233812,7 @@ function getConnectorSyncResult(type, response) {
       type,
       action: "needs_oauth",
       redirectUrl: response.redirectUrl,
-      connectionId: response.connectionId ?? undefined
+      connectionId: response.connectionId ?? ""
     };
   }
   return { type, action: "synced" };
@@ -233980,7 +234128,7 @@ async function fetchFunctionLogs(functionName, filters = {}) {
   return result.data;
 }
 // src/core/resources/function/config.ts
-import { dirname as dirname4, join as join5 } from "node:path";
+import { basename as basename2, dirname as dirname4, join as join5, relative } from "node:path";
 async function readFunctionConfig(configPath) {
   const parsed = await readJsonFile(configPath);
   const result = FunctionConfigSchema.safeParse(parsed);
@@ -233998,7 +234146,7 @@ async function readFunction(configPath) {
       hints: [{ message: "Check the 'entry' field in your function config" }]
     });
   }
-  const filePaths = await globby("*.{js,ts,json}", {
+  const filePaths = await globby("**/*.{js,ts,json}", {
     cwd: functionDir,
     absolute: true
   });
@@ -234009,26 +234157,61 @@ async function readAllFunctions(functionsDir) {
   if (!await pathExists(functionsDir)) {
     return [];
   }
-  const configFiles = await globby(`*/${FUNCTION_CONFIG_FILE}`, {
+  const configFiles = await globby(FUNCTION_CONFIG_GLOB, {
     cwd: functionsDir,
     absolute: true
   });
-  const functions = await Promise.all(configFiles.map((configPath) => readFunction(configPath)));
+  const entryFiles = await globby(ENTRY_FILE_GLOB, {
+    cwd: functionsDir,
+    absolute: true,
+    ignore: ENTRY_IGNORE_DOT_PATHS
+  });
+  const configFilesDirs = new Set(configFiles.map((f) => dirname4(f)));
+  const entryFilesWithoutConfig = entryFiles.filter((entryFile) => !configFilesDirs.has(dirname4(entryFile)));
+  const functionsFromConfig = await Promise.all(configFiles.map((configPath) => readFunction(configPath)));
+  const functionsWithoutConfig = await Promise.all(entryFilesWithoutConfig.map(async (entryFile) => {
+    const functionDir = dirname4(entryFile);
+    const filePaths = await globby("**/*.{js,ts,json}", {
+      cwd: functionDir,
+      absolute: true
+    });
+    const name2 = relative(functionsDir, functionDir).split(/[/\\]/).join("/");
+    if (!name2) {
+      throw new InvalidInputError("entry.ts found directly in the functions directory — it must be inside a named subfolder", {
+        hints: [
+          {
+            message: `Move ${entryFile} into a subfolder (e.g. functions/myFunc/entry.ts)`
+          }
+        ]
+      });
+    }
+    const entry = basename2(entryFile);
+    return { name: name2, entry, entryPath: entryFile, filePaths };
+  }));
+  const functions = [...functionsFromConfig, ...functionsWithoutConfig];
   const names = new Set;
   for (const fn of functions) {
     if (names.has(fn.name)) {
-      throw new Error(`Duplicate function name "${fn.name}"`);
+      throw new InvalidInputError(`Duplicate function name "${fn.name}"`, {
+        hints: [
+          {
+            message: "Ensure each function has a unique name (or path for zero-config functions)."
+          }
+        ]
+      });
     }
     names.add(fn.name);
   }
   return functions;
 }
 // src/core/resources/function/deploy.ts
-import { basename as basename2 } from "node:path";
+import { dirname as dirname5, relative as relative2 } from "node:path";
 async function loadFunctionCode(fn) {
+  const functionDir = dirname5(fn.entryPath);
   const loadedFiles = await Promise.all(fn.filePaths.map(async (filePath) => {
     const content = await readTextFile(filePath);
-    return { path: basename2(filePath), content };
+    const path11 = relative2(functionDir, filePath).split(/[/\\]/).join("/");
+    return { path: path11, content };
   }));
   return { ...fn, files: loadedFiles };
 }
@@ -234054,12 +234237,12 @@ async function findConfigInDir(dir) {
 }
 async function findProjectRoot(startPath) {
   let current = startPath || process.cwd();
-  while (current !== dirname5(current)) {
+  while (current !== dirname6(current)) {
     const configPath = await findConfigInDir(current);
     if (configPath) {
       return { root: current, configPath };
     }
-    current = dirname5(current);
+    current = dirname6(current);
   }
   return null;
 }
@@ -234081,7 +234264,7 @@ async function readProjectConfig(projectRoot) {
     throw new SchemaValidationError("Invalid project configuration", result.error, configPath);
   }
   const project = result.data;
-  const configDir = dirname5(configPath);
+  const configDir = dirname6(configPath);
   const [entities, functions, agents, connectors] = await Promise.all([
     entityResource.readAll(join6(configDir, project.entitiesDir)),
     functionResource.readAll(join6(configDir, project.functionsDir)),
@@ -234183,7 +234366,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 join7 } from "node:path";
+import { dirname as dirname7, join as join7 } from "node:path";
 async function listTemplates() {
   const parsed = await readJsonFile(getTemplatesIndexPath());
   const result = TemplatesConfigSchema.safeParse(parsed);
@@ -234205,7 +234388,7 @@ async function renderTemplate(template, destPath, data) {
       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 ? join7(dirname6(file2), attributes.outputFileName) : file2.replace(/\.ejs$/, "");
+        const destFile = attributes.outputFileName ? join7(dirname7(file2), attributes.outputFileName) : file2.replace(/\.ejs$/, "");
         const destFilePath = join7(destPath, destFile);
         await writeFile(destFilePath, body);
       } else {
@@ -234391,8 +234574,12 @@ async function handleUnauthorized(request, _options, response) {
     return;
   }
   retriedRequests.add(request);
+  const requestId = request.headers.get("X-Request-ID");
   return distribution_default(request.clone(), {
-    headers: { Authorization: `Bearer ${newAccessToken}` }
+    headers: {
+      ...requestId && { "X-Request-ID": requestId },
+      Authorization: `Bearer ${newAccessToken}`
+    }
   });
 }
 var base44Client = distribution_default.create({
@@ -234402,6 +234589,9 @@ var base44Client = distribution_default.create({
   },
   hooks: {
     beforeRequest: [
+      (request) => {
+        request.headers.set("X-Request-ID", randomUUID2());
+      },
       captureRequestBody,
       async (request) => {
         try {
@@ -234427,10 +234617,18 @@ function getAppClient() {
   });
 }
 // src/core/clients/oauth-client.ts
+import { randomUUID as randomUUID3 } from "node:crypto";
 var oauthClient = distribution_default.create({
   prefixUrl: getBase44ApiUrl(),
   headers: {
     "User-Agent": "Base44 CLI"
+  },
+  hooks: {
+    beforeRequest: [
+      (request) => {
+        request.headers.set("X-Request-ID", randomUUID3());
+      }
+    ]
   }
 });
 // src/core/auth/api.ts
@@ -234575,7 +234773,8 @@ async function deleteSecret(name2) {
   let response;
   try {
     response = await appClient.delete("secrets", {
-      searchParams: { secret_name: name2 }
+      searchParams: { secret_name: name2 },
+      timeout: false
     });
   } catch (error48) {
     throw await ApiError.fromHttpError(error48, "deleting secret");
@@ -235383,24 +235582,6 @@ async function login() {
   };
 }
 
-// node_modules/ansi-regex/index.js
-function ansiRegex({ onlyFirst = false } = {}) {
-  const ST = "(?:\\u0007|\\u001B\\u005C|\\u009C)";
-  const osc = `(?:\\u001B\\][\\s\\S]*?${ST})`;
-  const csi = "[\\u001B\\u009B][[\\]()#;?]*(?:\\d{1,4}(?:[;:]\\d{0,4})*)?[\\dA-PR-TZcf-nq-uy=><~]";
-  const pattern = `${osc}|${csi}`;
-  return new RegExp(pattern, onlyFirst ? undefined : "g");
-}
-
-// node_modules/strip-ansi/index.js
-var regex = ansiRegex();
-function stripAnsi(string4) {
-  if (typeof string4 !== "string") {
-    throw new TypeError(`Expected a \`string\`, got \`${typeof string4}\``);
-  }
-  return string4.replace(regex, "");
-}
-
 // node_modules/is-plain-obj/index.js
 function isPlainObject2(value) {
   if (typeof value !== "object" || value === null) {
@@ -241899,7 +242080,7 @@ var {
 // package.json
 var package_default = {
   name: "base44",
-  version: "0.0.37",
+  version: "0.0.38",
   description: "Base44 CLI - Unified interface for managing Base44 applications",
   type: "module",
   bin: {
@@ -242017,35 +242198,16 @@ async function checkForUpgrade() {
 }
 
 // src/cli/utils/upgradeNotification.ts
-var UPGRADE_COMMAND = "npm install -g base44@latest";
-function formatUpgradeBox(info) {
+function formatUpgradeMessage(info) {
   const { shinyOrange } = theme.colors;
   const { bold: bold2 } = theme.styles;
-  const lines = [
-    shinyOrange(`Update available! ${info.currentVersion} → ${bold2(info.latestVersion)}`),
-    shinyOrange(`Run: ${bold2(UPGRADE_COMMAND)}`)
-  ];
-  const maxVisualWidth = Math.max(...lines.map((l) => stripAnsi(l).length));
-  const pad = (line) => {
-    const visual = stripAnsi(line).length;
-    return `${line}${" ".repeat(maxVisualWidth - visual)}`;
-  };
-  const top = `┌${"─".repeat(maxVisualWidth + 2)}┐`;
-  const bottom = `└${"─".repeat(maxVisualWidth + 2)}┘`;
-  const body = lines.map((l) => `│ ${pad(l)} │`).join(`
-`);
-  return `${top}
-${body}
-${bottom}`;
-}
-function startUpgradeCheck() {
-  return checkForUpgrade().catch(() => null);
+  return `${shinyOrange("Update available!")} ${shinyOrange(`${info.currentVersion} → ${info.latestVersion}`)}  ${shinyOrange("Run:")} ${bold2(shinyOrange("npm install -g base44@latest"))}`;
 }
-async function printUpgradeNotification(upgradeCheckPromise) {
+async function printUpgradeNotificationIfAvailable() {
   try {
-    const upgradeInfo = await upgradeCheckPromise;
+    const upgradeInfo = await checkForUpgrade();
     if (upgradeInfo) {
-      R2.warn(formatUpgradeBox(upgradeInfo));
+      R2.message(formatUpgradeMessage(upgradeInfo));
     }
   } catch {}
 }
@@ -242058,7 +242220,7 @@ async function runCommand(commandFn, options, context) {
   } else {
     We(theme.colors.base44OrangeBackground(" Base 44 "));
   }
-  const upgradeCheckPromise = startUpgradeCheck();
+  await printUpgradeNotificationIfAvailable();
   try {
     if (options?.requireAuth) {
       const loggedIn = await isLoggedIn();
@@ -242078,14 +242240,12 @@ async function runCommand(commandFn, options, context) {
       context.errorReporter.setContext({ appId: appConfig.id });
     }
     const result = await commandFn();
-    await printUpgradeNotification(upgradeCheckPromise);
     Le(result.outroMessage || "");
     if (result.stdout) {
       process.stdout.write(result.stdout);
     }
   } catch (error48) {
     displayError(error48);
-    await printUpgradeNotification(upgradeCheckPromise);
     const errorContext = context.errorReporter.getErrorContext();
     Le(theme.format.errorContext(errorContext));
     throw error48;
@@ -242126,10 +242286,14 @@ function getDashboardUrl(projectId) {
   const id = projectId ?? getAppConfig().id;
   return `${getBase44ApiUrl()}/apps/${id}/editor/workspace/overview`;
 }
+function getConnectorsUrl(projectId) {
+  const id = projectId ?? getAppConfig().id;
+  return `${getBase44ApiUrl()}/apps/${id}/editor/workspace/app-connections`;
+}
 // src/cli/commands/agents/pull.ts
 async function pullAgentsAction() {
   const { project: project2 } = await readProjectConfig();
-  const configDir = dirname7(project2.configPath);
+  const configDir = dirname8(project2.configPath);
   const agentsDir = join9(configDir, project2.agentsDir);
   const remoteAgents = await runTask("Fetching agents from Base44", async () => {
     return await fetchAgents();
@@ -242224,19 +242388,19 @@ function getWhoamiCommand(context) {
 }
 
 // src/cli/commands/connectors/pull.ts
-import { dirname as dirname8, join as join10 } from "node:path";
+import { dirname as dirname9, join as join10 } from "node:path";
 async function pullConnectorsAction() {
   const { project: project2 } = await readProjectConfig();
-  const configDir = dirname8(project2.configPath);
+  const configDir = dirname9(project2.configPath);
   const connectorsDir = join10(configDir, project2.connectorsDir);
   const remoteConnectors = await runTask("Fetching connectors from Base44", async () => {
-    return await listConnectors();
+    return await pullAllConnectors();
   }, {
     successMessage: "Connectors fetched successfully",
     errorMessage: "Failed to fetch connectors"
   });
   const { written, deleted } = await runTask("Syncing connector files", async () => {
-    return await writeConnectors(connectorsDir, remoteConnectors.integrations);
+    return await writeConnectors(connectorsDir, remoteConnectors);
   }, {
     successMessage: "Connector files synced successfully",
     errorMessage: "Failed to sync connector files"
@@ -242251,7 +242415,7 @@ async function pullConnectorsAction() {
     R2.info("All connectors are already up to date");
   }
   return {
-    outroMessage: `Pulled ${remoteConnectors.integrations.length} connectors to ${connectorsDir}`
+    outroMessage: `Pulled ${remoteConnectors.length} connectors to ${connectorsDir}`
   };
 }
 function getConnectorsPullCommand(context) {
@@ -242870,7 +243034,7 @@ var open_default = open;
 var POLL_INTERVAL_MS = 2000;
 var POLL_TIMEOUT_MS = 2 * 60 * 1000;
 function filterPendingOAuth(results) {
-  return results.filter((r) => r.action === "needs_oauth" && !!r.redirectUrl && !!r.connectionId);
+  return results.filter((r) => r.action === "needs_oauth" && !!r.connectionId);
 }
 async function runOAuthFlowWithSkip(connector2) {
   await open_default(connector2.redirectUrl);
@@ -242950,32 +243114,49 @@ async function promptOAuthFlows(pending, options) {
 function printSummary(results, oauthOutcomes) {
   const synced = [];
   const added = [];
+  let provisioned;
   const removed = [];
   const skipped = [];
   const failed = [];
   for (const r of results) {
-    const oauthStatus = oauthOutcomes.get(r.type);
-    if (r.action === "synced") {
-      synced.push(r.type);
-    } else if (r.action === "removed") {
-      removed.push(r.type);
-    } else if (r.action === "error") {
-      failed.push({ type: r.type, error: r.error });
-    } else if (r.action === "needs_oauth") {
-      if (oauthStatus === "ACTIVE") {
-        added.push(r.type);
-      } else if (oauthStatus === "SKIPPED") {
-        skipped.push(r.type);
-      } else if (oauthStatus === "PENDING") {
-        failed.push({ type: r.type, error: "authorization timed out" });
-      } else if (oauthStatus === "FAILED") {
-        failed.push({ type: r.type, error: "authorization failed" });
-      } else {
-        failed.push({ type: r.type, error: "needs authorization" });
+    switch (r.action) {
+      case "provisioned":
+        provisioned = r;
+        break;
+      case "synced":
+        synced.push(r.type);
+        break;
+      case "removed":
+        removed.push(r.type);
+        break;
+      case "error":
+        failed.push({ type: r.type, error: r.error });
+        break;
+      case "needs_oauth": {
+        const oauthStatus = oauthOutcomes.get(r.type);
+        if (oauthStatus === "ACTIVE") {
+          added.push(r.type);
+        } else if (oauthStatus === "SKIPPED") {
+          skipped.push(r.type);
+        } else if (oauthStatus === "PENDING") {
+          failed.push({ type: r.type, error: "authorization timed out" });
+        } else if (oauthStatus === "FAILED") {
+          failed.push({ type: r.type, error: "authorization failed" });
+        } else {
+          failed.push({ type: r.type, error: "needs authorization" });
+        }
+        break;
       }
     }
   }
   R2.info(theme.styles.bold("Summary:"));
+  if (provisioned) {
+    R2.success("Stripe sandbox provisioned");
+    if (provisioned.claimUrl) {
+      R2.info(`  Claim your Stripe sandbox: ${theme.colors.links(provisioned.claimUrl)}`);
+    }
+    R2.info(`  Connectors dashboard: ${theme.colors.links(getConnectorsUrl())}`);
+  }
   if (synced.length > 0) {
     R2.success(`Synced: ${synced.join(", ")}`);
   }
@@ -242989,7 +243170,7 @@ function printSummary(results, oauthOutcomes) {
     R2.warn(`Skipped: ${skipped.join(", ")}`);
   }
   for (const r of failed) {
-    R2.error(`Failed: ${r.type}${r.error ? ` - ${r.error}` : ""}`);
+    R2.error(`Failed: ${r.type} - ${r.error}`);
   }
 }
 async function pushConnectorsAction(isNonInteractive) {
@@ -243023,7 +243204,7 @@ function getConnectorsPushCommand(context) {
 
 // src/cli/commands/connectors/index.ts
 function getConnectorsCommand(context) {
-  return new Command("connectors").description("Manage project connectors (OAuth integrations)").addCommand(getConnectorsPullCommand(context)).addCommand(getConnectorsPushCommand(context));
+  return new Command("connectors").description("Manage project connectors").addCommand(getConnectorsPullCommand(context)).addCommand(getConnectorsPushCommand(context));
 }
 
 // src/cli/commands/dashboard/open.ts
@@ -243337,15 +243518,11 @@ ${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 || options.isNonInteractive
-    });
-    const allAuthorized = oauthOutcomes.size > 0 && [...oauthOutcomes.values()].every((s) => s === "ACTIVE");
-    if (!allAuthorized) {
-      R2.info("Some connectors still require authorization. Run 'base44 connectors push' or open the links above in your browser.");
-    }
+  const connectorResults = result.connectorResults ?? [];
+  await handleOAuthConnectors(connectorResults, options);
+  const stripeResult = connectorResults.find((r) => r.action === "provisioned");
+  if (stripeResult) {
+    printStripeResult(stripeResult);
   }
   R2.message(`${theme.styles.header("Dashboard")}: ${theme.colors.links(getDashboardUrl())}`);
   if (result.appUrl) {
@@ -243361,6 +243538,25 @@ function getDeployCommand(context) {
     }), { requireAuth: true }, context);
   });
 }
+async function handleOAuthConnectors(connectorResults, options) {
+  const needsOAuth = filterPendingOAuth(connectorResults);
+  if (needsOAuth.length === 0)
+    return;
+  const oauthOutcomes = await promptOAuthFlows(needsOAuth, {
+    skipPrompt: options.yes || options.isNonInteractive
+  });
+  const allAuthorized = oauthOutcomes.size > 0 && [...oauthOutcomes.values()].every((s) => s === "ACTIVE");
+  if (!allAuthorized) {
+    R2.info("Some connectors still require authorization. Run 'base44 connectors push' or open the links above in your browser.");
+  }
+}
+function printStripeResult(r) {
+  R2.success("Stripe sandbox provisioned");
+  if (r.claimUrl) {
+    R2.info(`  Claim your Stripe sandbox: ${theme.colors.links(r.claimUrl)}`);
+  }
+  R2.info(`  Connectors dashboard: ${theme.colors.links(getConnectorsUrl())}`);
+}
 
 // src/cli/commands/project/link.ts
 function validateNonInteractiveFlags2(command) {
@@ -243923,7 +244119,7 @@ function getTypesCommand(context) {
 }
 
 // src/cli/dev/dev-server/main.ts
-import { dirname as dirname14, join as join18 } from "node:path";
+import { dirname as dirname15, join as join18 } from "node:path";
 var import_cors = __toESM(require_lib4(), 1);
 var import_express4 = __toESM(require_express(), 1);
 
@@ -244082,9 +244278,9 @@ function createDevLogger() {
 
 // src/cli/dev/dev-server/function-manager.ts
 import { spawn as spawn2, spawnSync as spawnSync2 } from "node:child_process";
-import { dirname as dirname11, join as join15 } from "node:path";
+import { dirname as dirname12, join as join15 } from "node:path";
 import { fileURLToPath as fileURLToPath7 } from "node:url";
-var __dirname5 = dirname11(fileURLToPath7(import.meta.url));
+var __dirname5 = dirname12(fileURLToPath7(import.meta.url));
 var WRAPPER_PATH = join15(__dirname5, "../deno-runtime/main.js");
 var READY_TIMEOUT = 30000;
 
@@ -244286,9 +244482,8 @@ function createFunctionRouter(manager, logger) {
 var import_nedb = __toESM(require_nedb(), 1);
 
 class Database {
-  collections;
-  constructor(entities) {
-    this.collections = new Map;
+  collections = new Map;
+  load(entities) {
     for (const entity2 of entities) {
       this.collections.set(entity2.name, new import_nedb.default);
     }
@@ -244299,6 +244494,12 @@ class Database {
   getCollectionNames() {
     return Array.from(this.collections.keys());
   }
+  dropAll() {
+    for (const collection of this.collections.values()) {
+      collection.remove({}, { multi: true });
+    }
+    this.collections.clear();
+  }
 }
 
 // node_modules/socket.io/wrapper.mjs
@@ -244581,7 +244782,7 @@ function createEntityRoutes(db2, logger, remoteProxy, broadcast) {
 // src/cli/dev/dev-server/routes/integrations.ts
 var import_express3 = __toESM(require_express(), 1);
 var import_multer = __toESM(require_multer(), 1);
-import { randomUUID as randomUUID2 } from "node:crypto";
+import { randomUUID as randomUUID4 } from "node:crypto";
 import fs28 from "node:fs";
 import path18 from "node:path";
 function createIntegrationRoutes(mediaFilesDir, baseUrl, remoteProxy, logger) {
@@ -244592,7 +244793,7 @@ function createIntegrationRoutes(mediaFilesDir, baseUrl, remoteProxy, logger) {
     destination: mediaFilesDir,
     filename: (_req, file2, cb2) => {
       const ext = path18.extname(file2.originalname);
-      cb2(null, `${randomUUID2()}${ext}`);
+      cb2(null, `${randomUUID4()}${ext}`);
     }
   });
   const MAX_FILE_SIZE = 50 * 1024 * 1024;
@@ -244619,7 +244820,7 @@ function createIntegrationRoutes(mediaFilesDir, baseUrl, remoteProxy, logger) {
       res.status(400).json({ error: "file_uri is required" });
       return;
     }
-    const signature = randomUUID2();
+    const signature = randomUUID4();
     const signed_url = `${baseUrl}/media/${file_uri}?signature=${signature}`;
     res.json({ signed_url });
   });
@@ -244654,7 +244855,7 @@ function createCustomIntegrationRoutes(remoteProxy, logger) {
 
 // src/cli/dev/dev-server/watcher.ts
 import { EventEmitter as EventEmitter4 } from "node:events";
-import { relative as relative4 } from "node:path";
+import { relative as relative6 } from "node:path";
 
 // node_modules/chokidar/index.js
 import { EventEmitter as EventEmitter3 } from "node:events";
@@ -245384,9 +245585,9 @@ class NodeFsHandler {
     if (this.fsw.closed) {
       return;
     }
-    const dirname13 = sp2.dirname(file2);
+    const dirname14 = sp2.dirname(file2);
     const basename5 = sp2.basename(file2);
-    const parent = this.fsw._getWatchedDir(dirname13);
+    const parent = this.fsw._getWatchedDir(dirname14);
     let prevStats = stats;
     if (parent.has(basename5))
       return;
@@ -245413,7 +245614,7 @@ class NodeFsHandler {
             prevStats = newStats2;
           }
         } catch (error48) {
-          this.fsw._remove(dirname13, basename5);
+          this.fsw._remove(dirname14, basename5);
         }
       } else if (parent.has(basename5)) {
         const at13 = newStats.atimeMs;
@@ -245636,11 +245837,11 @@ function createPattern(matcher) {
       if (matcher.path === string4)
         return true;
       if (matcher.recursive) {
-        const relative4 = sp3.relative(matcher.path, string4);
-        if (!relative4) {
+        const relative6 = sp3.relative(matcher.path, string4);
+        if (!relative6) {
           return false;
         }
-        return !relative4.startsWith("..") && !sp3.isAbsolute(relative4);
+        return !relative6.startsWith("..") && !sp3.isAbsolute(relative6);
       }
       return false;
     };
@@ -246275,79 +246476,74 @@ var WATCH_QUEUE_DELAY_MS = 500;
 class WatchBase44 extends EventEmitter4 {
   itemsToWatch;
   logger;
-  watchers = [];
-  queueWaitForCreation = [];
+  entryNames;
+  watchers = new Map;
   queueWaitForCreationTimeout = null;
   constructor(itemsToWatch, logger) {
     super();
     this.itemsToWatch = itemsToWatch;
     this.logger = logger;
+    this.entryNames = Object.keys(itemsToWatch);
   }
   async start() {
-    if (this.watchers.length > 0 || this.queueWaitForCreation.length > 0) {
+    if (this.watchers.size > 0) {
       return;
     }
-    for (const item of this.itemsToWatch) {
-      if (await pathExists(item.path)) {
-        this.watchers.push(this.watchTarget(item));
-      } else {
-        this.queueWaitForCreation.push(item);
+    for (const name2 of this.entryNames) {
+      const targetPath = this.itemsToWatch[name2];
+      if (await pathExists(targetPath)) {
+        this.watchers.set(name2, this.watchTarget(name2, targetPath));
       }
     }
-    this.watchCreationQueue();
+    this.watchEntries();
   }
   async close() {
     if (this.queueWaitForCreationTimeout) {
       clearTimeout(this.queueWaitForCreationTimeout);
       this.queueWaitForCreationTimeout = null;
     }
-    for (const watcher of this.watchers) {
+    for (const watcher of this.watchers.values()) {
       await watcher.close();
     }
-    this.watchers = [];
-    this.queueWaitForCreation = [];
+    this.watchers.clear();
   }
-  watchCreationQueue() {
+  watchEntries() {
     if (this.queueWaitForCreationTimeout) {
       clearTimeout(this.queueWaitForCreationTimeout);
     }
     this.queueWaitForCreationTimeout = setTimeout(async () => {
-      const toRemove = [];
-      for (const entry of this.queueWaitForCreation) {
-        if (await pathExists(entry.path)) {
-          this.watchers.push(this.watchTarget(entry));
-          toRemove.push(entry);
+      for (const name2 of this.entryNames) {
+        const path19 = this.itemsToWatch[name2];
+        const watchItem = this.watchers.get(name2);
+        const exists = await pathExists(path19);
+        if (!watchItem && exists) {
+          this.emit("change", name2, path19);
+          this.watchers.set(name2, this.watchTarget(name2, path19));
+        } else if (watchItem && !exists) {
+          await watchItem.close();
+          this.emit("change", name2, path19);
+          setTimeout(() => {
+            this.watchers.forEach((watcher, watcherName) => {
+              if (watcher.closed) {
+                this.watchers.delete(watcherName);
+              }
+            });
+          });
         }
       }
-      this.queueWaitForCreation = this.queueWaitForCreation.filter((entry) => !toRemove.includes(entry));
-      if (this.queueWaitForCreation.length > 0) {
-        this.watchCreationQueue();
-      } else {
-        this.queueWaitForCreationTimeout = null;
-      }
+      this.queueWaitForCreationTimeout = null;
+      this.watchEntries();
     }, WATCH_QUEUE_DELAY_MS);
   }
-  watchTarget(item) {
-    const handler = import_debounce.default(async (_event, path19) => {
-      this.emit("change", item.name, relative4(item.path, path19));
-    }, WATCH_DEBOUNCE_MS);
-    const watcher = watch(item.path, {
+  watchTarget(name2, targetPath) {
+    const watcher = watch(targetPath, {
       ignoreInitial: true
     });
-    watcher.on("all", handler);
-    watcher.on("unlinkDir", async (deletedPath) => {
-      if (deletedPath !== item.path) {
-        return;
-      }
-      await watcher.close();
-      this.queueWaitForCreation.push(item);
-      this.watchCreationQueue();
-      setTimeout(() => {
-        this.watchers = this.watchers.filter((watcher2) => !watcher2.closed);
-      });
-    });
+    watcher.on("all", import_debounce.default(async (_event, path19) => {
+      this.emit("change", name2, relative6(targetPath, path19));
+    }, WATCH_DEBOUNCE_MS));
     watcher.on("error", (err) => {
-      this.logger.error(`Watch handler failed for ${item.path}`, err instanceof Error ? err : undefined);
+      this.logger.error(`Watch handler failed for ${targetPath}`, err instanceof Error ? err : undefined);
     });
     return watcher;
   }
@@ -246385,7 +246581,8 @@ async function createDevServer(options8) {
   if (functionManager.getFunctionNames().length > 0) {
     R2.info(`Loaded functions: ${functionManager.getFunctionNames().join(", ")}`);
   }
-  const db2 = new Database(entities);
+  const db2 = new Database;
+  db2.load(entities);
   if (db2.getCollectionNames().length > 0) {
     R2.info(`Loaded entities: ${db2.getCollectionNames().join(", ")}`);
   }
@@ -246419,16 +246616,14 @@ async function createDevServer(options8) {
   emitEntityEvent = (appId, entityName, event) => {
     broadcastEntityEvent(io6, appId, entityName, event);
   };
-  const base44ConfigWatcher = new WatchBase44([
-    {
-      name: "functions",
-      path: join18(dirname14(project2.configPath), project2.functionsDir)
-    }
-  ], devLogger);
+  const base44ConfigWatcher = new WatchBase44({
+    functions: join18(dirname15(project2.configPath), project2.functionsDir),
+    entities: join18(dirname15(project2.configPath), project2.entitiesDir)
+  }, devLogger);
   base44ConfigWatcher.on("change", async (name2) => {
     try {
+      const { functions: functions2, entities: entities2 } = await options8.loadResources();
       if (name2 === "functions") {
-        const { functions: functions2 } = await options8.loadResources();
         const previousFunctionCount = functionManager.getFunctionNames().length;
         functionManager.reload(functions2);
         const names = functionManager.getFunctionNames();
@@ -246438,6 +246633,17 @@ async function createDevServer(options8) {
           devLogger.log("All functions removed");
         }
       }
+      if (name2 === "entities") {
+        const previousEntityCount = db2.getCollectionNames().length;
+        db2.dropAll();
+        if (previousEntityCount > 0) {
+          devLogger.log("Entities directory changed, clearing data...");
+        }
+        db2.load(entities2);
+        if (db2.getCollectionNames().length > 0) {
+          devLogger.log(`Loaded entities: ${db2.getCollectionNames().join(", ")}`);
+        }
+      }
     } catch (error48) {
       const errorMessage = error48 instanceof Error ? error48.message : String(error48);
       devLogger.error(errorMessage);
@@ -246601,7 +246807,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 dirname15, posix, sep } from "path";
+import { dirname as dirname16, posix, sep } from "path";
 function createModulerModifier() {
   const getModuleFromFileName = createGetModuleFromFilename();
   return async (frames) => {
@@ -246610,7 +246816,7 @@ function createModulerModifier() {
     return frames;
   };
 }
-function createGetModuleFromFilename(basePath = process.argv[1] ? dirname15(process.argv[1]) : process.cwd(), isWindows5 = sep === "\\") {
+function createGetModuleFromFilename(basePath = process.argv[1] ? dirname16(process.argv[1]) : process.cwd(), isWindows5 = sep === "\\") {
   const normalizedBase = isWindows5 ? normalizeWindowsPath2(basePath) : basePath;
   return (filename) => {
     if (!filename)
@@ -249814,9 +250020,9 @@ function matchPropertyGroup(propertyGroup, propertyValues, cohortProperties, deb
     throw new InconclusiveMatchError("can't match cohort without a given cohort property value");
   return propertyGroupType === "AND";
 }
-function isValidRegex(regex2) {
+function isValidRegex(regex) {
   try {
-    new RegExp(regex2);
+    new RegExp(regex);
     return true;
   } catch (err) {
     return false;
@@ -249834,8 +250040,8 @@ function convertToDateTime(value) {
   throw new InconclusiveMatchError(`The date provided ${value} must be a string, number, or date object`);
 }
 function relativeDateParseForFeatureFlagMatching(value) {
-  const regex2 = /^-?(?<number>[0-9]+)(?<interval>[a-z])$/;
-  const match = value.match(regex2);
+  const regex = /^-?(?<number>[0-9]+)(?<interval>[a-z])$/;
+  const match = value.match(regex);
   const parsedDt = new Date(new Date().toISOString());
   if (!match)
     return null;
@@ -250828,4 +251034,4 @@ export {
   CLIExitError
 };
 
-//# debugId=BFC56E0BF807E18264756E2164756E21
+//# debugId=213D2B84FD9C210664756E2164756E21