@base44-preview/cli 0.0.51-pr.484.a220663 → 0.0.51-pr.503.3e3774c

package/dist/cli/index.js

@@ -988,7 +988,7 @@ Expecting one of '${allowedValues.join("', '")}'`);
         this._exitCallback = (err) => {
           if (err.code !== "commander.executeSubCommandAsync") {
             throw err;
-          } else {}
+          }
         };
       }
       return this;
@@ -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 resolve2 = path11.resolve;
+    var includePath = resolve2(isDir ? filename : dirname7(filename), name2);
     var ext = extname(name2);
     if (!ext) {
       includePath += ".ejs";
@@ -9011,10 +9011,10 @@ var require_ejs = __commonJS((exports) => {
     var result;
     if (!cb) {
       if (typeof exports.promiseImpl == "function") {
-        return new exports.promiseImpl(function(resolve, reject) {
+        return new exports.promiseImpl(function(resolve2, reject) {
           try {
             result = handleCache(options)(data);
-            resolve(result);
+            resolve2(result);
           } catch (err) {
             reject(err);
           }
@@ -12452,12 +12452,12 @@ var require_isexe = __commonJS((exports, module) => {
       if (typeof Promise !== "function") {
         throw new TypeError("callback not provided");
       }
-      return new Promise(function(resolve2, reject) {
+      return new Promise(function(resolve3, reject) {
         isexe(path11, options || {}, function(er, is) {
           if (er) {
             reject(er);
           } else {
-            resolve2(is);
+            resolve3(is);
           }
         });
       });
@@ -12519,27 +12519,27 @@ var require_which = __commonJS((exports, module) => {
       opt = {};
     const { pathEnv, pathExt, pathExtExe } = getPathInfo(cmd, opt);
     const found = [];
-    const step = (i) => new Promise((resolve2, reject) => {
+    const step = (i) => new Promise((resolve3, reject) => {
       if (i === pathEnv.length)
-        return opt.all && found.length ? resolve2(found) : reject(getNotFoundError(cmd));
+        return opt.all && found.length ? resolve3(found) : reject(getNotFoundError(cmd));
       const ppRaw = pathEnv[i];
       const pathPart = /^".*"$/.test(ppRaw) ? ppRaw.slice(1, -1) : ppRaw;
       const pCmd = path11.join(pathPart, cmd);
       const p = !pathPart && /^\.[\\\/]/.test(cmd) ? cmd.slice(0, 2) + pCmd : pCmd;
-      resolve2(subStep(p, i, 0));
+      resolve3(subStep(p, i, 0));
     });
-    const subStep = (p, i, ii) => new Promise((resolve2, reject) => {
+    const subStep = (p, i, ii) => new Promise((resolve3, reject) => {
       if (ii === pathExt.length)
-        return resolve2(step(i + 1));
+        return resolve3(step(i + 1));
       const ext = pathExt[ii];
       isexe(p + ext, { pathExt: pathExtExe }, (er, is) => {
         if (!er && is) {
           if (opt.all)
             found.push(p + ext);
           else
-            return resolve2(p + ext);
+            return resolve3(p + ext);
         }
-        return resolve2(subStep(p, i, ii + 1));
+        return resolve3(subStep(p, i, ii + 1));
       });
     });
     return cb ? step(0).then((res) => cb(null, res), cb) : step(0);
@@ -16067,7 +16067,7 @@ var require_lodash = __commonJS((exports, module) => {
         }
         return mapped.length && mapped[0] === arrays[0] ? baseIntersection(mapped, undefined2, comparator) : [];
       });
-      function join12(array2, separator) {
+      function join13(array2, separator) {
         return array2 == null ? "" : nativeJoin.call(array2, separator);
       }
       function last(array2) {
@@ -17999,7 +17999,7 @@ __p += '`;
       lodash.isUndefined = isUndefined;
       lodash.isWeakMap = isWeakMap;
       lodash.isWeakSet = isWeakSet;
-      lodash.join = join12;
+      lodash.join = join13;
       lodash.kebabCase = kebabCase;
       lodash.last = last;
       lodash.lastIndexOf = lastIndexOf;
@@ -27503,7 +27503,7 @@ function cleanDoc(doc2) {
   return mapDoc(doc2, (currentDoc) => cleanDocFn(currentDoc));
 }
 function replaceEndOfLine(doc2, replacement = literalline) {
-  return mapDoc(doc2, (currentDoc) => typeof currentDoc === "string" ? join20(replacement, currentDoc.split(`
+  return mapDoc(doc2, (currentDoc) => typeof currentDoc === "string" ? join21(replacement, currentDoc.split(`
 `)) : currentDoc);
 }
 function canBreakFn(doc2) {
@@ -27583,7 +27583,7 @@ function indentIfBreak(contents, options) {
     negate: options.negate
   };
 }
-function join20(separator, docs) {
+function join21(separator, docs) {
   assertDoc(separator);
   assertDocArray(docs);
   const parts = [];
@@ -28294,7 +28294,7 @@ var init_doc = __esm(() => {
   MODE_FLAT = Symbol("MODE_FLAT");
   DOC_FILL_PRINTED_LENGTH = Symbol("DOC_FILL_PRINTED_LENGTH");
   builders = {
-    join: join20,
+    join: join21,
     line,
     softline,
     hardline,
@@ -115559,7 +115559,7 @@ import { fileURLToPath as fileURLToPath22 } from "url";
 import v8 from "v8";
 import assert22 from "assert";
 import { format as format2, inspect as inspect3 } from "util";
-import { createRequire as createRequire2 } from "module";
+import { createRequire as createRequire3 } from "module";
 import { equal, ok, strictEqual } from "assert";
 import path112 from "path";
 import { fileURLToPath as fileURLToPath52 } from "url";
@@ -118133,7 +118133,7 @@ function importFromFile(specifier, parent) {
   return import(url3);
 }
 function requireFromFile(id2, parent) {
-  const require22 = createRequire2(parent);
+  const require22 = createRequire3(parent);
   return require22(id2);
 }
 async function loadExternalConfig(externalConfig, configFile) {
@@ -133208,7 +133208,7 @@ Expected it to be ${EXPECTED_TYPE_VALUES}.`;
       return mapDoc2(doc2, (currentDoc) => cleanDocFn2(currentDoc));
     }
     function replaceEndOfLine2(doc2, replacement = literalline2) {
-      return mapDoc2(doc2, (currentDoc) => typeof currentDoc === "string" ? join22(replacement, currentDoc.split(`
+      return mapDoc2(doc2, (currentDoc) => typeof currentDoc === "string" ? join23(replacement, currentDoc.split(`
 `)) : currentDoc);
     }
     function canBreakFn2(doc2) {
@@ -133294,7 +133294,7 @@ Expected it to be ${EXPECTED_TYPE_VALUES}.`;
         negate: options8.negate
       };
     }
-    function join22(separator, docs) {
+    function join23(separator, docs) {
       assertDoc2(separator);
       assertDocArray2(docs);
       const parts = [];
@@ -133959,7 +133959,7 @@ Expected it to be ${EXPECTED_TYPE_VALUES}.`;
       }
     }
     var builders2 = {
-      join: join22,
+      join: join23,
       line: line3,
       softline: softline2,
       hardline: hardline4,
@@ -134606,7 +134606,7 @@ var require_prettier = __commonJS((exports, module) => {
     prettier.util = (init_public(), __toCommonJS(public_exports3));
     prettier.doc = require_doc();
     prettier.version = (init_version_evaluate(), __toCommonJS(version_evaluate_exports)).default;
-  } else {}
+  }
   module.exports = prettier;
 });
 
@@ -134614,11 +134614,11 @@ var require_prettier = __commonJS((exports, module) => {
 var require_formatter = __commonJS((exports) => {
   var __awaiter = exports && exports.__awaiter || function(thisArg, _arguments, P9, generator) {
     function adopt(value) {
-      return value instanceof P9 ? value : new P9(function(resolve8) {
-        resolve8(value);
+      return value instanceof P9 ? value : new P9(function(resolve9) {
+        resolve9(value);
       });
     }
-    return new (P9 || (P9 = Promise))(function(resolve8, reject) {
+    return new (P9 || (P9 = Promise))(function(resolve9, reject) {
       function fulfilled(value) {
         try {
           step(generator.next(value));
@@ -134634,7 +134634,7 @@ var require_formatter = __commonJS((exports) => {
         }
       }
       function step(result) {
-        result.done ? resolve8(result.value) : adopt(result.value).then(fulfilled, rejected);
+        result.done ? resolve9(result.value) : adopt(result.value).then(fulfilled, rejected);
       }
       step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
@@ -139287,7 +139287,7 @@ var require_url = __commonJS((exports) => {
   };
   Object.defineProperty(exports, "__esModule", { value: true });
   exports.parse = undefined;
-  exports.resolve = resolve8;
+  exports.resolve = resolve9;
   exports.cwd = cwd;
   exports.getProtocol = getProtocol;
   exports.getExtension = getExtension;
@@ -139315,7 +139315,7 @@ var require_url = __commonJS((exports) => {
   var urlDecodePatterns = [/%23/g, "#", /%24/g, "$", /%26/g, "&", /%2C/g, ",", /%40/g, "@"];
   var parse11 = (u4) => new URL(u4);
   exports.parse = parse11;
-  function resolve8(from, to5) {
+  function resolve9(from, to5) {
     const fromUrl = new URL((0, convert_path_to_posix_1.default)(from), "https://aaa.nonexistanturl.com");
     const resolvedUrl = new URL((0, convert_path_to_posix_1.default)(to5), fromUrl);
     const endSpaces = to5.match(/(\s*)$/)?.[1] || "";
@@ -139451,7 +139451,7 @@ var require_url = __commonJS((exports) => {
   }
   function relative4(from, to5) {
     if (!isFileSystemPath(from) || !isFileSystemPath(to5)) {
-      return resolve8(from, to5);
+      return resolve9(from, to5);
     }
     const fromDir = path_1.default.dirname(stripHash(from));
     const toPath4 = stripHash(to5);
@@ -140127,7 +140127,7 @@ var require_plugins = __commonJS((exports) => {
     let plugin;
     let lastError;
     let index = 0;
-    return new Promise((resolve8, reject) => {
+    return new Promise((resolve9, reject) => {
       runNextPlugin();
       function runNextPlugin() {
         plugin = plugins[index++];
@@ -140155,7 +140155,7 @@ var require_plugins = __commonJS((exports) => {
         }
       }
       function onSuccess(result) {
-        resolve8({
+        resolve9({
           plugin,
           result
         });
@@ -141488,11 +141488,11 @@ var require_lib3 = __commonJS((exports) => {
 var require_resolver = __commonJS((exports) => {
   var __awaiter = exports && exports.__awaiter || function(thisArg, _arguments, P9, generator) {
     function adopt(value) {
-      return value instanceof P9 ? value : new P9(function(resolve8) {
-        resolve8(value);
+      return value instanceof P9 ? value : new P9(function(resolve9) {
+        resolve9(value);
       });
     }
-    return new (P9 || (P9 = Promise))(function(resolve8, reject) {
+    return new (P9 || (P9 = Promise))(function(resolve9, reject) {
       function fulfilled(value) {
         try {
           step(generator.next(value));
@@ -141508,7 +141508,7 @@ var require_resolver = __commonJS((exports) => {
         }
       }
       function step(result) {
-        result.done ? resolve8(result.value) : adopt(result.value).then(fulfilled, rejected);
+        result.done ? resolve9(result.value) : adopt(result.value).then(fulfilled, rejected);
       }
       step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
@@ -141629,11 +141629,11 @@ var require_optionValidator = __commonJS((exports) => {
 var require_src3 = __commonJS((exports) => {
   var __awaiter = exports && exports.__awaiter || function(thisArg, _arguments, P9, generator) {
     function adopt(value) {
-      return value instanceof P9 ? value : new P9(function(resolve8) {
-        resolve8(value);
+      return value instanceof P9 ? value : new P9(function(resolve9) {
+        resolve9(value);
       });
     }
-    return new (P9 || (P9 = Promise))(function(resolve8, reject) {
+    return new (P9 || (P9 = Promise))(function(resolve9, reject) {
       function fulfilled(value) {
         try {
           step(generator.next(value));
@@ -141649,7 +141649,7 @@ var require_src3 = __commonJS((exports) => {
         }
       }
       function step(result) {
-        result.done ? resolve8(result.value) : adopt(result.value).then(fulfilled, rejected);
+        result.done ? resolve9(result.value) : adopt(result.value).then(fulfilled, rejected);
       }
       step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
@@ -145360,7 +145360,7 @@ var require_dbcs_codec = __commonJS((exports) => {
           if (resCode !== undefined) {
             dbcsCode = resCode;
             nextChar = uCode;
-          } else {}
+          }
         }
         seqObj = undefined;
       } else if (uCode >= 0) {
@@ -145425,7 +145425,7 @@ var require_dbcs_codec = __commonJS((exports) => {
           newBuf[j10++] = dbcsCode >> 8;
           newBuf[j10++] = dbcsCode & 255;
         }
-      } else {}
+      }
       this.seqObj = undefined;
     }
     if (this.leadSurrogate !== -1) {
@@ -147274,11 +147274,11 @@ var require_raw_body = __commonJS((exports, module) => {
     if (done) {
       return readStream(stream, encoding, length, limit, wrap(done));
     }
-    return new Promise(function executor(resolve8, reject) {
+    return new Promise(function executor(resolve9, reject) {
       readStream(stream, encoding, length, limit, function onRead2(err, buf) {
         if (err)
           return reject(err);
-        resolve8(buf);
+        resolve9(buf);
       });
     });
   }
@@ -160399,11 +160399,11 @@ var require_view = __commonJS((exports, module) => {
   var debug = require_src4()("express:view");
   var path18 = __require("node:path");
   var fs28 = __require("node:fs");
-  var dirname16 = path18.dirname;
+  var dirname17 = path18.dirname;
   var basename4 = path18.basename;
   var extname2 = path18.extname;
-  var join23 = path18.join;
-  var resolve8 = path18.resolve;
+  var join24 = path18.join;
+  var resolve9 = path18.resolve;
   module.exports = View;
   function View(name2, options8) {
     var opts = options8 || {};
@@ -160437,8 +160437,8 @@ var require_view = __commonJS((exports, module) => {
     debug('lookup "%s"', name2);
     for (var i5 = 0;i5 < roots.length && !path19; i5++) {
       var root2 = roots[i5];
-      var loc = resolve8(root2, name2);
-      var dir = dirname16(loc);
+      var loc = resolve9(root2, name2);
+      var dir = dirname17(loc);
       var file2 = basename4(loc);
       path19 = this.resolve(dir, file2);
     }
@@ -160462,14 +160462,14 @@ var require_view = __commonJS((exports, module) => {
     });
     sync = false;
   };
-  View.prototype.resolve = function resolve9(dir, file2) {
+  View.prototype.resolve = function resolve10(dir, file2) {
     var ext = this.ext;
-    var path19 = join23(dir, file2);
+    var path19 = join24(dir, file2);
     var stat2 = tryStat(path19);
     if (stat2 && stat2.isFile()) {
       return path19;
     }
-    path19 = join23(dir, basename4(file2, ext), "index" + ext);
+    path19 = join24(dir, basename4(file2, ext), "index" + ext);
     stat2 = tryStat(path19);
     if (stat2 && stat2.isFile()) {
       return path19;
@@ -162621,7 +162621,7 @@ var require_application = __commonJS((exports, module) => {
   var compileETag = require_utils10().compileETag;
   var compileQueryParser = require_utils10().compileQueryParser;
   var compileTrust = require_utils10().compileTrust;
-  var resolve8 = __require("node:path").resolve;
+  var resolve9 = __require("node:path").resolve;
   var once9 = require_once();
   var Router = require_router();
   var slice = Array.prototype.slice;
@@ -162675,7 +162675,7 @@ var require_application = __commonJS((exports, module) => {
     this.mountpath = "/";
     this.locals.settings = this.settings;
     this.set("view", View);
-    this.set("views", resolve8("views"));
+    this.set("views", resolve9("views"));
     this.set("jsonp callback name", "callback");
     if (env3 === "production") {
       this.enable("view cache");
@@ -164164,9 +164164,9 @@ var require_send = __commonJS((exports, module) => {
   var Stream2 = __require("stream");
   var util2 = __require("util");
   var extname2 = path18.extname;
-  var join23 = path18.join;
+  var join24 = path18.join;
   var normalize2 = path18.normalize;
-  var resolve8 = path18.resolve;
+  var resolve9 = path18.resolve;
   var sep = path18.sep;
   var BYTES_RANGE_REGEXP = /^ *bytes=/;
   var MAX_MAXAGE = 60 * 60 * 24 * 365 * 1000;
@@ -164195,7 +164195,7 @@ var require_send = __commonJS((exports, module) => {
     this._maxage = opts.maxAge || opts.maxage;
     this._maxage = typeof this._maxage === "string" ? ms8(this._maxage) : Number(this._maxage);
     this._maxage = !isNaN(this._maxage) ? Math.min(Math.max(0, this._maxage), MAX_MAXAGE) : 0;
-    this._root = opts.root ? resolve8(opts.root) : null;
+    this._root = opts.root ? resolve9(opts.root) : null;
   }
   util2.inherits(SendStream, Stream2);
   SendStream.prototype.error = function error48(status, err) {
@@ -164336,7 +164336,7 @@ var require_send = __commonJS((exports, module) => {
         return res;
       }
       parts = path19.split(sep);
-      path19 = normalize2(join23(root2, path19));
+      path19 = normalize2(join24(root2, path19));
     } else {
       if (UP_PATH_REGEXP.test(path19)) {
         debug('malicious path "%s"', path19);
@@ -164344,7 +164344,7 @@ var require_send = __commonJS((exports, module) => {
         return res;
       }
       parts = normalize2(path19).split(sep);
-      path19 = resolve8(path19);
+      path19 = resolve9(path19);
     }
     if (containsDotFile(parts)) {
       debug('%s dotfile "%s"', this._dotfiles, path19);
@@ -164476,7 +164476,7 @@ var require_send = __commonJS((exports, module) => {
           return self2.onStatError(err);
         return self2.error(404);
       }
-      var p4 = join23(path19, self2._index[i5]);
+      var p4 = join24(path19, self2._index[i5]);
       debug('stat "%s"', p4);
       fs28.stat(p4, function(err2, stat2) {
         if (err2)
@@ -164672,7 +164672,7 @@ var require_response = __commonJS((exports, module) => {
   var cookie = require_cookie();
   var send = require_send();
   var extname2 = path18.extname;
-  var resolve8 = path18.resolve;
+  var resolve9 = path18.resolve;
   var vary = require_vary();
   var { Buffer: Buffer7 } = __require("node:buffer");
   var res = Object.create(http.ServerResponse.prototype);
@@ -164881,7 +164881,7 @@ var require_response = __commonJS((exports, module) => {
     }
     opts = Object.create(opts);
     opts.headers = headers;
-    var fullPath = !opts.root ? resolve8(path19) : path19;
+    var fullPath = !opts.root ? resolve9(path19) : path19;
     return this.sendFile(fullPath, opts, done);
   };
   res.contentType = res.type = function contentType(type) {
@@ -165142,7 +165142,7 @@ var require_serve_static = __commonJS((exports, module) => {
   var encodeUrl = require_encodeurl();
   var escapeHtml = require_escape_html();
   var parseUrl = require_parseurl();
-  var resolve8 = __require("path").resolve;
+  var resolve9 = __require("path").resolve;
   var send = require_send();
   var url3 = __require("url");
   module.exports = serveStatic;
@@ -165161,7 +165161,7 @@ var require_serve_static = __commonJS((exports, module) => {
       throw new TypeError("option setHeaders must be function");
     }
     opts.maxage = opts.maxage || opts.maxAge || 0;
-    opts.root = resolve8(root2);
+    opts.root = resolve9(root2);
     var onDirectory = redirect ? createRedirectDirectoryListener() : createNotFoundDirectoryListener();
     return function serveStatic2(req, res, next) {
       if (req.method !== "GET" && req.method !== "HEAD") {
@@ -168535,8 +168535,8 @@ var require_executor = __commonJS((exports, module) => {
     }
     resetBuffer() {
       this.buffer = new Waterfall;
-      this.buffer.chain(new Promise((resolve8) => {
-        this._triggerBuffer = resolve8;
+      this.buffer.chain(new Promise((resolve9) => {
+        this._triggerBuffer = resolve9;
       }));
       if (this.ready)
         this._triggerBuffer();
@@ -169556,7 +169556,7 @@ var require_storage = __commonJS((exports, module) => {
       throw e8;
     }
   };
-  var writeFileLinesAsync = (filename, lines, mode = DEFAULT_FILE_MODE) => new Promise((resolve8, reject) => {
+  var writeFileLinesAsync = (filename, lines, mode = DEFAULT_FILE_MODE) => new Promise((resolve9, reject) => {
     try {
       const stream = writeFileStream(filename, { mode });
       const readable2 = Readable6.from(lines);
@@ -169573,7 +169573,7 @@ var require_storage = __commonJS((exports, module) => {
           if (err)
             reject(err);
           else
-            resolve8();
+            resolve9();
         });
       });
       readable2.on("error", (err) => {
@@ -169744,7 +169744,7 @@ var require_persistence = __commonJS((exports, module) => {
       return { data: tdata, indexes };
     }
     treatRawStreamAsync(rawStream) {
-      return new Promise((resolve8, reject) => {
+      return new Promise((resolve9, reject) => {
         const dataById = {};
         const indexes = {};
         let corruptItems = 0;
@@ -169787,7 +169787,7 @@ var require_persistence = __commonJS((exports, module) => {
             }
           }
           const data = Object.values(dataById);
-          resolve8({ data, indexes });
+          resolve9({ data, indexes });
         });
         lineStream.on("error", function(err) {
           reject(err, null);
@@ -190013,7 +190013,7 @@ var require_socket = __commonJS((exports) => {
         } else {
           this.remoteAddress = req.connection.remoteAddress;
         }
-      } else {}
+      }
       this.pingTimeoutTimer = null;
       this.pingIntervalTimer = null;
       this.setTransport(transport);
@@ -195398,13 +195398,13 @@ var require_broadcast_operator = __commonJS((exports) => {
       return true;
     }
     emitWithAck(ev2, ...args) {
-      return new Promise((resolve8, reject) => {
+      return new Promise((resolve9, reject) => {
         args.push((err, responses) => {
           if (err) {
             err.responses = responses;
             return reject(err);
           } else {
-            return resolve8(responses);
+            return resolve9(responses);
           }
         });
         this.emit(ev2, ...args);
@@ -195592,12 +195592,12 @@ var require_socket2 = __commonJS((exports) => {
     }
     emitWithAck(ev2, ...args) {
       const withErr = this.flags.timeout !== undefined;
-      return new Promise((resolve8, reject) => {
+      return new Promise((resolve9, reject) => {
         args.push((arg1, arg2) => {
           if (withErr) {
-            return arg1 ? reject(arg1) : resolve8(arg2);
+            return arg1 ? reject(arg1) : resolve9(arg2);
           } else {
-            return resolve8(arg1);
+            return resolve9(arg1);
           }
         });
         this.emit(ev2, ...args);
@@ -196052,13 +196052,13 @@ var require_namespace = __commonJS((exports) => {
       return true;
     }
     serverSideEmitWithAck(ev2, ...args) {
-      return new Promise((resolve8, reject) => {
+      return new Promise((resolve9, reject) => {
         args.push((err, responses) => {
           if (err) {
             err.responses = responses;
             return reject(err);
           } else {
-            return resolve8(responses);
+            return resolve9(responses);
           }
         });
         this.serverSideEmit(ev2, ...args);
@@ -196742,7 +196742,7 @@ var require_cluster_adapter = __commonJS((exports) => {
         return localSockets;
       }
       const requestId = randomId();
-      return new Promise((resolve8, reject) => {
+      return new Promise((resolve9, reject) => {
         const timeout3 = setTimeout(() => {
           const storedRequest2 = this.requests.get(requestId);
           if (storedRequest2) {
@@ -196752,7 +196752,7 @@ var require_cluster_adapter = __commonJS((exports) => {
         }, opts.flags.timeout || DEFAULT_TIMEOUT);
         const storedRequest = {
           type: MessageType.FETCH_SOCKETS,
-          resolve: resolve8,
+          resolve: resolve9,
           timeout: timeout3,
           current: 0,
           expected: expectedResponseCount,
@@ -196962,7 +196962,7 @@ var require_cluster_adapter = __commonJS((exports) => {
         return localSockets;
       }
       const requestId = randomId();
-      return new Promise((resolve8, reject) => {
+      return new Promise((resolve9, reject) => {
         const timeout3 = setTimeout(() => {
           const storedRequest2 = this.customRequests.get(requestId);
           if (storedRequest2) {
@@ -196972,7 +196972,7 @@ var require_cluster_adapter = __commonJS((exports) => {
         }, opts.flags.timeout || DEFAULT_TIMEOUT);
         const storedRequest = {
           type: MessageType.FETCH_SOCKETS,
-          resolve: resolve8,
+          resolve: resolve9,
           timeout: timeout3,
           missingUids: new Set([...this.nodesMap.keys()]),
           responses: localSockets
@@ -197701,13 +197701,13 @@ var require_dist4 = __commonJS((exports, module) => {
       this.engine.close();
       (0, uws_1.restoreAdapter)();
       if (this.httpServer) {
-        return new Promise((resolve8) => {
+        return new Promise((resolve9) => {
           this.httpServer.close((err) => {
             fn9 && fn9(err);
             if (err) {
               debug("server was not running");
             }
-            resolve8();
+            resolve9();
           });
         });
       } else {
@@ -214616,7 +214616,7 @@ var require_buffer_list = __commonJS((exports, module) => {
       }
     }, {
       key: "join",
-      value: function join23(s5) {
+      value: function join24(s5) {
         if (this.length === 0)
           return "";
         var p4 = this.head;
@@ -215914,14 +215914,14 @@ var require_async_iterator = __commonJS((exports, module) => {
     };
   }
   function readAndResolve(iter) {
-    var resolve8 = iter[kLastResolve];
-    if (resolve8 !== null) {
+    var resolve9 = iter[kLastResolve];
+    if (resolve9 !== null) {
       var data = iter[kStream].read();
       if (data !== null) {
         iter[kLastPromise] = null;
         iter[kLastResolve] = null;
         iter[kLastReject] = null;
-        resolve8(createIterResult(data, false));
+        resolve9(createIterResult(data, false));
       }
     }
   }
@@ -215929,13 +215929,13 @@ var require_async_iterator = __commonJS((exports, module) => {
     process.nextTick(readAndResolve, iter);
   }
   function wrapForNext(lastPromise, iter) {
-    return function(resolve8, reject) {
+    return function(resolve9, reject) {
       lastPromise.then(function() {
         if (iter[kEnded]) {
-          resolve8(createIterResult(undefined, true));
+          resolve9(createIterResult(undefined, true));
           return;
         }
-        iter[kHandlePromise](resolve8, reject);
+        iter[kHandlePromise](resolve9, reject);
       }, reject);
     };
   }
@@ -215954,12 +215954,12 @@ var require_async_iterator = __commonJS((exports, module) => {
         return Promise.resolve(createIterResult(undefined, true));
       }
       if (this[kStream].destroyed) {
-        return new Promise(function(resolve8, reject) {
+        return new Promise(function(resolve9, reject) {
           process.nextTick(function() {
             if (_this[kError]) {
               reject(_this[kError]);
             } else {
-              resolve8(createIterResult(undefined, true));
+              resolve9(createIterResult(undefined, true));
             }
           });
         });
@@ -215982,13 +215982,13 @@ var require_async_iterator = __commonJS((exports, module) => {
     return this;
   }), _defineProperty(_Object$setPrototypeO, "return", function _return() {
     var _this2 = this;
-    return new Promise(function(resolve8, reject) {
+    return new Promise(function(resolve9, reject) {
       _this2[kStream].destroy(null, function(err) {
         if (err) {
           reject(err);
           return;
         }
-        resolve8(createIterResult(undefined, true));
+        resolve9(createIterResult(undefined, true));
       });
     });
   }), _Object$setPrototypeO), AsyncIteratorPrototype);
@@ -216010,15 +216010,15 @@ var require_async_iterator = __commonJS((exports, module) => {
       value: stream._readableState.endEmitted,
       writable: true
     }), _defineProperty(_Object$create, kHandlePromise, {
-      value: function value(resolve8, reject) {
+      value: function value(resolve9, reject) {
         var data = iterator[kStream].read();
         if (data) {
           iterator[kLastPromise] = null;
           iterator[kLastResolve] = null;
           iterator[kLastReject] = null;
-          resolve8(createIterResult(data, false));
+          resolve9(createIterResult(data, false));
         } else {
-          iterator[kLastResolve] = resolve8;
+          iterator[kLastResolve] = resolve9;
           iterator[kLastReject] = reject;
         }
       },
@@ -216037,12 +216037,12 @@ var require_async_iterator = __commonJS((exports, module) => {
         iterator[kError] = err;
         return;
       }
-      var resolve8 = iterator[kLastResolve];
-      if (resolve8 !== null) {
+      var resolve9 = iterator[kLastResolve];
+      if (resolve9 !== null) {
         iterator[kLastPromise] = null;
         iterator[kLastResolve] = null;
         iterator[kLastReject] = null;
-        resolve8(createIterResult(undefined, true));
+        resolve9(createIterResult(undefined, true));
       }
       iterator[kEnded] = true;
     });
@@ -216054,7 +216054,7 @@ var require_async_iterator = __commonJS((exports, module) => {
 
 // ../../node_modules/readable-stream/lib/internal/streams/from.js
 var require_from = __commonJS((exports, module) => {
-  function asyncGeneratorStep(gen, resolve8, reject, _next, _throw, key2, arg) {
+  function asyncGeneratorStep(gen, resolve9, reject, _next, _throw, key2, arg) {
     try {
       var info = gen[key2](arg);
       var value = info.value;
@@ -216063,7 +216063,7 @@ var require_from = __commonJS((exports, module) => {
       return;
     }
     if (info.done) {
-      resolve8(value);
+      resolve9(value);
     } else {
       Promise.resolve(value).then(_next, _throw);
     }
@@ -216071,13 +216071,13 @@ var require_from = __commonJS((exports, module) => {
   function _asyncToGenerator(fn9) {
     return function() {
       var self2 = this, args = arguments;
-      return new Promise(function(resolve8, reject) {
+      return new Promise(function(resolve9, reject) {
         var gen = fn9.apply(self2, args);
         function _next(value) {
-          asyncGeneratorStep(gen, resolve8, reject, _next, _throw, "next", value);
+          asyncGeneratorStep(gen, resolve9, reject, _next, _throw, "next", value);
         }
         function _throw(err) {
-          asyncGeneratorStep(gen, resolve8, reject, _next, _throw, "throw", err);
+          asyncGeneratorStep(gen, resolve9, reject, _next, _throw, "throw", err);
         }
         _next(undefined);
       });
@@ -218270,7 +218270,7 @@ var require_dist5 = __commonJS((exports, module) => {
 });
 
 // src/cli/index.ts
-import { dirname as dirname20, join as join26 } from "node:path";
+import { dirname as dirname21, join as join27 } from "node:path";
 import { fileURLToPath as fileURLToPath6 } from "node:url";
 
 // ../../node_modules/@clack/core/dist/index.mjs
@@ -219478,7 +219478,7 @@ var {
 } = import__.default;
 
 // src/cli/commands/agents/pull.ts
-import { dirname as dirname7, join as join12 } from "node:path";
+import { dirname as dirname8, join as join13 } from "node:path";
 // ../../node_modules/chalk/source/vendor/ansi-styles/index.js
 var ANSI_BACKGROUND_OFFSET = 10;
 var wrapAnsi16 = (offset = 0) => (code) => `\x1B[${code + offset}m`;
@@ -231128,7 +231128,7 @@ function finalize(ctx, schema) {
     result.$schema = "http://json-schema.org/draft-07/schema#";
   } else if (ctx.target === "draft-04") {
     result.$schema = "http://json-schema.org/draft-04/schema#";
-  } else if (ctx.target === "openapi-3.0") {} else {}
+  } else if (ctx.target === "openapi-3.0") {}
   if (ctx.external?.uri) {
     const id = ctx.external.registry.get(schema)?.id;
     if (!id)
@@ -231376,7 +231376,7 @@ var literalProcessor = (schema, ctx, json, _params) => {
     if (val === undefined) {
       if (ctx.unrepresentable === "throw") {
         throw new Error("Literal `undefined` cannot be represented in JSON Schema");
-      } else {}
+      }
     } else if (typeof val === "bigint") {
       if (ctx.unrepresentable === "throw") {
         throw new Error("BigInt literals cannot be represented in JSON Schema");
@@ -234622,6 +234622,12 @@ var SiteConfigSchema = exports_external.object({
   outputDirectory: exports_external.string().optional(),
   installCommand: exports_external.string().optional()
 });
+var PluginMetadataSchema = exports_external.object({
+  namespace: exports_external.string().min(1, "Plugin namespace cannot be empty").regex(/^[a-zA-Z0-9_-]+$/, "Plugin namespace can only contain letters, numbers, underscores, and dashes")
+});
+var PluginReferenceSchema = exports_external.object({
+  source: exports_external.string().min(1, "Plugin source cannot be empty")
+});
 var ProjectConfigSchema = exports_external.object({
   name: exports_external.string({
     error: "App name cannot be empty"
@@ -234632,7 +234638,9 @@ var ProjectConfigSchema = exports_external.object({
   functionsDir: exports_external.string().optional().default("functions"),
   agentsDir: exports_external.string().optional().default("agents"),
   connectorsDir: exports_external.string().optional().default("connectors"),
-  authDir: exports_external.string().optional().default("auth")
+  authDir: exports_external.string().optional().default("auth"),
+  plugin: PluginMetadataSchema.optional(),
+  plugins: exports_external.array(PluginReferenceSchema).optional().default([])
 });
 var AppConfigSchema = exports_external.object({
   id: exports_external.string().min(1, "id cannot be empty")
@@ -241579,7 +241587,43 @@ var generateGlobTasks = normalizeArguments(generateTasks);
 var generateGlobTasksSync = normalizeArgumentsSync(generateTasksSync);
 
 // src/core/project/config.ts
-import { dirname as dirname5, join as join8 } from "node:path";
+import { dirname as dirname6, join as join9 } from "node:path";
+
+// src/core/project/plugins.ts
+import { createRequire as createRequire2 } from "node:module";
+import { dirname as dirname3, join as join3, resolve } from "node:path";
+function resolvePluginRoot(pluginSource, fromRoot) {
+  if (pluginSource.startsWith(".")) {
+    return resolve(fromRoot, pluginSource);
+  }
+  const req = createRequire2(join3(fromRoot, "package.json"));
+  return dirname3(req.resolve(`${pluginSource}/package.json`));
+}
+function requirePluginNamespace(project, pluginSource, configPath) {
+  if (!project.plugin?.namespace) {
+    throw new ConfigInvalidError(`Plugin loaded from "${pluginSource}" must define plugin.namespace`, configPath);
+  }
+  return project.plugin.namespace;
+}
+function namespacePluginFunctions(functions, pluginNamespace) {
+  return functions.map((fn) => ({
+    ...fn,
+    name: `${pluginNamespace}__${fn.name}`,
+    source: {
+      type: "plugin",
+      namespace: pluginNamespace
+    }
+  }));
+}
+function markPluginEntities(entities, pluginNamespace) {
+  return entities.map((entity) => ({
+    ...entity,
+    source: {
+      type: "plugin",
+      namespace: pluginNamespace
+    }
+  }));
+}
 
 // src/core/resources/agent/schema.ts
 var EntityOperationSchema = exports_external.enum(["create", "update", "delete", "read"]);
@@ -241651,7 +241695,7 @@ async function fetchAgents() {
   return result.data;
 }
 // src/core/resources/agent/config.ts
-import { join as join3, normalize } from "node:path";
+import { join as join4, normalize } from "node:path";
 import { isDeepStrictEqual } from "node:util";
 async function readAgentFile(agentPath) {
   const raw2 = await readJsonFile(agentPath);
@@ -241696,12 +241740,12 @@ async function readAllAgents(agentsDir) {
   return [...nameToEntry.values()].map((e2) => e2.data);
 }
 function findAvailablePath(agentsDir, name2, claimedPaths) {
-  const base = join3(agentsDir, `${name2}.${CONFIG_FILE_EXTENSION}`);
+  const base = join4(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}`);
+    const candidate = join4(agentsDir, `${name2}_${i}.${CONFIG_FILE_EXTENSION}`);
     if (!claimedPaths.has(candidate)) {
       return candidate;
     }
@@ -241847,7 +241891,7 @@ async function pushAuthConfigToApi(config3) {
   return result.data.authConfig;
 }
 // src/core/resources/auth-config/config.ts
-import { join as join4 } from "node:path";
+import { join as join5 } from "node:path";
 import { isDeepStrictEqual as isDeepStrictEqual2 } from "node:util";
 var AUTH_CONFIG_FILENAME = `config.${CONFIG_FILE_EXTENSION}`;
 var DEFAULT_AUTH_CONFIG = {
@@ -241863,7 +241907,7 @@ var DEFAULT_AUTH_CONFIG = {
   useWorkspaceSSO: false
 };
 function getAuthConfigPath(authDir) {
-  return join4(authDir, AUTH_CONFIG_FILENAME);
+  return join5(authDir, AUTH_CONFIG_FILENAME);
 }
 async function readAuthConfig(authDir) {
   const filePath = getAuthConfigPath(authDir);
@@ -242515,7 +242559,7 @@ async function removeStripe() {
   return result.data;
 }
 // src/core/resources/connector/config.ts
-import { join as join5 } from "node:path";
+import { join as join6 } from "node:path";
 import { isDeepStrictEqual as isDeepStrictEqual3 } from "node:util";
 async function readConnectorFile(connectorPath) {
   const parsed = await readJsonFile(connectorPath);
@@ -242576,7 +242620,7 @@ async function writeConnectors(connectorsDir, remoteConnectors) {
     if (existing && isDeepStrictEqual3(existing.data, connector)) {
       continue;
     }
-    const filePath = existing?.filePath ?? join5(connectorsDir, `${connector.type}.${CONFIG_FILE_EXTENSION}`);
+    const filePath = existing?.filePath ?? join6(connectorsDir, `${connector.type}.${CONFIG_FILE_EXTENSION}`);
     await writeJsonFile(filePath, connector);
     written.push(connector.type);
   }
@@ -242731,6 +242775,17 @@ var connectorResource = {
   readAll: readAllConnectors,
   push: pushConnectors
 };
+// src/core/resources/types.ts
+var ResourceSourceSchema = exports_external.discriminatedUnion("type", [
+  exports_external.object({
+    type: exports_external.literal("project")
+  }),
+  exports_external.object({
+    type: exports_external.literal("plugin"),
+    namespace: exports_external.string().min(1, "Plugin namespace cannot be empty")
+  })
+]);
+
 // src/core/resources/entity/schema.ts
 var FieldConditionSchema = exports_external.union([
   exports_external.string(),
@@ -242837,7 +242892,8 @@ var EntitySchema = exports_external.looseObject({
   description: exports_external.string().optional(),
   properties: exports_external.record(exports_external.string(), PropertyDefinitionSchema).default({}),
   required: exports_external.array(exports_external.string()).optional(),
-  rls: EntityRLSSchema.optional()
+  rls: EntityRLSSchema.optional(),
+  source: ResourceSourceSchema.default({ type: "project" })
 });
 var SyncEntitiesResponseSchema = exports_external.object({
   created: exports_external.array(exports_external.string()),
@@ -242848,7 +242904,7 @@ var SyncEntitiesResponseSchema = exports_external.object({
 // src/core/resources/entity/api.ts
 async function syncEntities(entities) {
   const appClient = getAppClient();
-  const schemaSyncPayload = Object.fromEntries(entities.map((entity) => [entity.name, entity]));
+  const schemaSyncPayload = Object.fromEntries(entities.map(({ source: _source, ...entity }) => [entity.name, entity]));
   let response;
   try {
     response = await appClient.put("entity-schemas", {
@@ -242884,6 +242940,19 @@ async function readAllEntities(entitiesDir) {
     absolute: true
   });
   const entities = await Promise.all(files.map((filePath) => readEntityFile(filePath)));
+  const names = new Set;
+  for (const entity of entities) {
+    if (names.has(entity.name)) {
+      throw new InvalidInputError(`Duplicate entity name "${entity.name}"`, {
+        hints: [
+          {
+            message: `Remove duplicate entities with name "${entity.name}" - only one entity per name is allowed`
+          }
+        ]
+      });
+    }
+    names.add(entity.name);
+  }
   return entities;
 }
 // src/core/resources/entity/deploy.ts
@@ -242898,6 +242967,57 @@ var entityResource = {
   readAll: readAllEntities,
   push: pushEntities
 };
+// src/core/resources/entity/merge.ts
+function mergePluginEntity(pluginEntity, projectEntity, configPath) {
+  const unsupportedFields = [
+    projectEntity.title ? "title" : null,
+    projectEntity.description ? "description" : null,
+    projectEntity.rls ? "rls" : null
+  ].filter(Boolean);
+  if (unsupportedFields.length > 0) {
+    throw new ConfigInvalidError(`Project entity "${projectEntity.name}" extends a plugin entity and cannot override fields: ${unsupportedFields.join(", ")}.`, configPath);
+  }
+  const projectProperties = projectEntity.properties ?? {};
+  const addedPropertyNames = new Set(Object.keys(projectProperties));
+  for (const propertyName of addedPropertyNames) {
+    if (propertyName in pluginEntity.properties) {
+      throw new ConfigInvalidError(`Cannot override plugin-defined property "${propertyName}"`, configPath);
+    }
+  }
+  for (const requiredProperty of projectEntity.required ?? []) {
+    if (!addedPropertyNames.has(requiredProperty)) {
+      throw new ConfigInvalidError(`Required property "${requiredProperty}" must be declared in project entity "${projectEntity.name}" properties`, configPath);
+    }
+  }
+  const required2 = pluginEntity.required || projectEntity.required ? [
+    ...new Set([
+      ...pluginEntity.required ?? [],
+      ...projectEntity.required ?? []
+    ])
+  ] : undefined;
+  return {
+    ...pluginEntity,
+    properties: {
+      ...pluginEntity.properties,
+      ...projectProperties
+    },
+    ...required2 ? { required: required2 } : {}
+  };
+}
+function mergeProjectAndPluginEntities(projectEntities, pluginEntities, configPath) {
+  const projectEntitiesByName = new Map(projectEntities.map((entity) => [entity.name, entity]));
+  const pluginEntityNames = new Set(pluginEntities.map((entity) => entity.name));
+  const resolvedPluginEntities = pluginEntities.map((pluginEntity) => {
+    const projectEntity = projectEntitiesByName.get(pluginEntity.name);
+    if (!projectEntity) {
+      return pluginEntity;
+    }
+    return mergePluginEntity(pluginEntity, projectEntity, configPath);
+  });
+  const projectOnlyEntities = projectEntities.filter((entity) => !pluginEntityNames.has(entity.name));
+  return [...resolvedPluginEntities, ...projectOnlyEntities];
+}
+
 // src/core/resources/function/schema.ts
 var FunctionNameSchema = exports_external.string().trim().min(1, "Function name cannot be empty").regex(/^[^.]+$/, "Function name cannot contain dots");
 var FunctionFileSchema = exports_external.object({
@@ -242995,7 +243115,8 @@ var FunctionConfigSchema = exports_external.object({
 });
 var BackendFunctionSchema = FunctionConfigSchema.extend({
   entryPath: exports_external.string().min(1, "Entry path cannot be empty"),
-  filePaths: exports_external.array(exports_external.string()).min(1, "Function must have at least one file")
+  filePaths: exports_external.array(exports_external.string()).min(1, "Function must have at least one file"),
+  source: ResourceSourceSchema
 });
 var DeploySingleFunctionResponseSchema = exports_external.object({
   status: exports_external.enum(["deployed", "unchanged"])
@@ -243100,7 +243221,7 @@ async function fetchFunctionLogs(functionName, filters = {}) {
   return result.data;
 }
 // src/core/resources/function/config.ts
-import { basename as basename2, dirname as dirname3, join as join6, relative } from "node:path";
+import { basename as basename2, dirname as dirname4, join as join7, relative } from "node:path";
 async function readFunctionConfig(configPath) {
   const parsed = await readJsonFile(configPath);
   const result = FunctionConfigSchema.safeParse(parsed);
@@ -243111,8 +243232,8 @@ async function readFunctionConfig(configPath) {
 }
 async function readFunction(configPath) {
   const config6 = await readFunctionConfig(configPath);
-  const functionDir = dirname3(configPath);
-  const entryPath = join6(functionDir, config6.entry);
+  const functionDir = dirname4(configPath);
+  const entryPath = join7(functionDir, config6.entry);
   if (!await pathExists(entryPath)) {
     throw new InvalidInputError(`Function entry file not found: ${entryPath} (referenced in ${configPath})`, {
       hints: [{ message: "Check the 'entry' field in your function config" }]
@@ -243122,7 +243243,12 @@ async function readFunction(configPath) {
     cwd: functionDir,
     absolute: true
   });
-  const functionData = { ...config6, entryPath, filePaths };
+  const functionData = {
+    ...config6,
+    entryPath,
+    filePaths,
+    source: { type: "project" }
+  };
   return functionData;
 }
 async function readAllFunctions(functionsDir) {
@@ -243138,11 +243264,11 @@ async function readAllFunctions(functionsDir) {
     absolute: true,
     ignore: ENTRY_IGNORE_DOT_PATHS
   });
-  const configFilesDirs = new Set(configFiles.map((f) => dirname3(f)));
-  const entryFilesWithoutConfig = entryFiles.filter((entryFile) => !configFilesDirs.has(dirname3(entryFile)));
+  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 = dirname3(entryFile);
+    const functionDir = dirname4(entryFile);
     const filePaths = await globby("**/*.{js,ts,json}", {
       cwd: functionDir,
       absolute: true
@@ -243158,7 +243284,14 @@ async function readAllFunctions(functionsDir) {
       });
     }
     const entry = basename2(entryFile);
-    return { name: name2, entry, entryPath: entryFile, filePaths };
+    const functionData = {
+      name: name2,
+      entry,
+      entryPath: entryFile,
+      filePaths,
+      source: { type: "project" }
+    };
+    return functionData;
   }));
   const functions = [...functionsFromConfig, ...functionsWithoutConfig];
   const names = new Set;
@@ -243177,9 +243310,9 @@ async function readAllFunctions(functionsDir) {
   return functions;
 }
 // src/core/resources/function/deploy.ts
-import { dirname as dirname4, relative as relative2 } from "node:path";
+import { dirname as dirname5, relative as relative2 } from "node:path";
 async function loadFunctionCode(fn) {
-  const functionDir = dirname4(fn.entryPath);
+  const functionDir = dirname5(fn.entryPath);
   const resolvedFiles = await Promise.all(fn.filePaths.map(async (filePath) => {
     const content = await readTextFile(filePath);
     const path11 = relative2(functionDir, filePath).split(/[/\\]/).join("/");
@@ -243246,14 +243379,14 @@ async function pruneRemovedFunctions(localFunctionNames, options) {
   return results;
 }
 // src/core/resources/function/pull.ts
-import { join as join7 } from "node:path";
+import { join as join8 } from "node:path";
 import { isDeepStrictEqual as isDeepStrictEqual4 } from "node:util";
 async function writeFunctions(functionsDir, functions) {
   const written = [];
   const skipped = [];
   for (const fn of functions) {
-    const functionDir = join7(functionsDir, fn.name);
-    const configPath = join7(functionDir, "function.jsonc");
+    const functionDir = join8(functionsDir, fn.name);
+    const configPath = join8(functionDir, "function.jsonc");
     if (await isFunctionUnchanged(functionDir, fn)) {
       skipped.push(fn.name);
       continue;
@@ -243267,7 +243400,7 @@ async function writeFunctions(functionsDir, functions) {
     }
     await writeJsonFile(configPath, config6);
     for (const file2 of fn.files) {
-      await writeFile(join7(functionDir, file2.path), file2.content);
+      await writeFile(join8(functionDir, file2.path), file2.content);
     }
     written.push(fn.name);
   }
@@ -243277,7 +243410,7 @@ async function isFunctionUnchanged(functionDir, fn) {
   if (!await pathExists(functionDir)) {
     return false;
   }
-  const configPath = join7(functionDir, "function.jsonc");
+  const configPath = join8(functionDir, "function.jsonc");
   try {
     const localConfig = await readJsonFile(configPath);
     if (localConfig.entry !== fn.entry) {
@@ -243290,7 +243423,7 @@ async function isFunctionUnchanged(functionDir, fn) {
     return false;
   }
   for (const file2 of fn.files) {
-    const filePath = join7(functionDir, file2.path);
+    const filePath = join8(functionDir, file2.path);
     if (!await pathExists(filePath)) {
       return false;
     }
@@ -243320,49 +243453,145 @@ 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;
 }
-async function readProjectConfig(projectRoot) {
-  let found;
-  if (projectRoot) {
-    const configPath2 = await findConfigInDir(projectRoot);
-    found = configPath2 ? { root: projectRoot, configPath: configPath2 } : null;
-  } else {
-    found = await findProjectRoot();
+
+class ProjectConfigReader {
+  pluginNamespaces = new Set;
+  async readProjectConfig(projectRoot) {
+    const { root, configPath } = await this.findConfigOrThrow(projectRoot);
+    const project = await this.readConfigFile(configPath);
+    this.assertPluginProjectDoesNotLoadPlugins(project, configPath);
+    const localResources = await this.readProjectResources(configPath, project);
+    const pluginResources = await this.readPlugins(project.plugins, configPath);
+    const entities = mergeProjectAndPluginEntities(localResources.entities, pluginResources.entities, configPath);
+    const functions = [
+      ...localResources.functions,
+      ...pluginResources.functions
+    ];
+    return {
+      project: { ...project, root, configPath },
+      entities,
+      functions,
+      agents: localResources.agents,
+      connectors: localResources.connectors,
+      authConfig: localResources.authConfig
+    };
+  }
+  async findConfigOrThrow(projectRoot) {
+    let found;
+    if (projectRoot) {
+      const configPath = await findConfigInDir(projectRoot);
+      found = configPath ? { root: projectRoot, configPath } : null;
+    } else {
+      found = await findProjectRoot();
+    }
+    if (!found) {
+      throw new ConfigNotFoundError(`Project root not found. Please ensure config.jsonc or config.json exists in the project directory or ${PROJECT_SUBDIR}/ subdirectory.`);
+    }
+    return found;
   }
-  if (!found) {
-    throw new ConfigNotFoundError(`Project root not found. Please ensure config.jsonc or config.json exists in the project directory or ${PROJECT_SUBDIR}/ subdirectory.`);
+  async readConfigFile(configPath) {
+    const parsed = await readJsonFile(configPath);
+    const result = ProjectConfigSchema.safeParse(parsed);
+    if (!result.success) {
+      throw new SchemaValidationError("Invalid project configuration", result.error, configPath);
+    }
+    return result.data;
   }
-  const { root, configPath } = found;
-  const parsed = await readJsonFile(configPath);
-  const result = ProjectConfigSchema.safeParse(parsed);
-  if (!result.success) {
-    throw new SchemaValidationError("Invalid project configuration", result.error, configPath);
-  }
-  const project = result.data;
-  const configDir = dirname5(configPath);
-  const [entities, functions, agents, connectors, authConfig] = await Promise.all([
-    entityResource.readAll(join8(configDir, project.entitiesDir)),
-    functionResource.readAll(join8(configDir, project.functionsDir)),
-    agentResource.readAll(join8(configDir, project.agentsDir)),
-    connectorResource.readAll(join8(configDir, project.connectorsDir)),
-    authConfigResource.readAll(join8(configDir, project.authDir))
-  ]);
-  return {
-    project: { ...project, root, configPath },
-    entities,
-    functions,
-    agents,
-    connectors,
-    authConfig
-  };
+  async readProjectResources(configPath, project) {
+    const configDir = dirname6(configPath);
+    const [entities, functions, agents, connectors, authConfig] = await Promise.all([
+      entityResource.readAll(join9(configDir, project.entitiesDir)),
+      functionResource.readAll(join9(configDir, project.functionsDir)),
+      agentResource.readAll(join9(configDir, project.agentsDir)),
+      connectorResource.readAll(join9(configDir, project.connectorsDir)),
+      authConfigResource.readAll(join9(configDir, project.authDir))
+    ]);
+    return { entities, functions, agents, connectors, authConfig };
+  }
+  assertPluginProjectDoesNotLoadPlugins(project, configPath) {
+    if (project.plugin && project.plugins.length > 0) {
+      throw new ConfigInvalidError("Plugin projects cannot define plugins in this version.", configPath);
+    }
+  }
+  registerPluginNamespace(pluginNamespace, configPath) {
+    if (this.pluginNamespaces.has(pluginNamespace)) {
+      throw new ConfigInvalidError(`Duplicate plugin namespace "${pluginNamespace}" in project configuration`, configPath, {
+        hints: [
+          {
+            message: "Remove the plugin or change plugin namespace"
+          }
+        ]
+      });
+    }
+    this.pluginNamespaces.add(pluginNamespace);
+  }
+  async readPluginConfig(plugin, hostConfigPath) {
+    const pluginRoot = resolvePluginRoot(plugin.source, dirname6(hostConfigPath));
+    const { configPath } = await this.findConfigOrThrow(pluginRoot);
+    const project = await this.readConfigFile(configPath);
+    const pluginNamespace = requirePluginNamespace(project, plugin.source, configPath);
+    this.assertPluginProjectDoesNotLoadPlugins(project, configPath);
+    return { configPath, pluginNamespace, project };
+  }
+  async readPluginResources(project, configPath, pluginNamespace) {
+    const resources = await this.readProjectResources(configPath, project);
+    return {
+      entities: markPluginEntities(resources.entities, pluginNamespace),
+      functions: namespacePluginFunctions(resources.functions, pluginNamespace),
+      agents: [],
+      connectors: [],
+      authConfig: []
+    };
+  }
+  async readPlugins(plugins, configPath) {
+    const entities = [];
+    const functions = [];
+    const entityNameByPluginNamespace = new Map;
+    for (const plugin of plugins) {
+      const {
+        configPath: pluginConfigPath,
+        pluginNamespace,
+        project
+      } = await this.readPluginConfig(plugin, configPath);
+      this.registerPluginNamespace(pluginNamespace, pluginConfigPath);
+      const pluginData = await this.readPluginResources(project, pluginConfigPath, pluginNamespace);
+      for (const entity of pluginData.entities) {
+        const existingPluginNamespace = entityNameByPluginNamespace.get(entity.name);
+        if (existingPluginNamespace) {
+          throw new ConfigInvalidError(`Entity "${entity.name}" is defined by more than one plugin: "${existingPluginNamespace}" and "${pluginNamespace}".`, pluginConfigPath, {
+            hints: [
+              {
+                message: "Plugin entity names are not namespaced. Remove one plugin or rename one of the entities."
+              }
+            ]
+          });
+        }
+        entityNameByPluginNamespace.set(entity.name, pluginNamespace);
+      }
+      entities.push(...pluginData.entities);
+      functions.push(...pluginData.functions);
+    }
+    return {
+      entities,
+      functions,
+      agents: [],
+      connectors: [],
+      authConfig: []
+    };
+  }
+}
+async function readProjectConfig(projectRoot) {
+  const reader = new ProjectConfigReader;
+  return await reader.readProjectConfig(projectRoot);
 }
 
 // src/core/project/app-config.ts
@@ -243539,12 +243768,12 @@ async function getSiteUrl(projectId) {
 // 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 join10 } from "node:path";
+import { dirname as dirname7, join as join11 } from "node:path";
 
 // src/core/assets.ts
 import { cpSync, existsSync } from "node:fs";
 import { homedir as homedir2 } from "node:os";
-import { join as join9 } from "node:path";
+import { join as join10 } from "node:path";
 // package.json
 var package_default = {
   name: "base44",
@@ -243643,18 +243872,18 @@ var package_default = {
 };
 
 // src/core/assets.ts
-var ASSETS_DIR = join9(homedir2(), ".base44", "assets", package_default.version);
+var ASSETS_DIR = join10(homedir2(), ".base44", "assets", package_default.version);
 function getTemplatesDir() {
-  return join9(ASSETS_DIR, "templates");
+  return join10(ASSETS_DIR, "templates");
 }
 function getTemplatesIndexPath() {
-  return join9(ASSETS_DIR, "templates", "templates.json");
+  return join10(ASSETS_DIR, "templates", "templates.json");
 }
 function getDenoWrapperPath() {
-  return join9(ASSETS_DIR, "deno-runtime", "main.ts");
+  return join10(ASSETS_DIR, "deno-runtime", "main.ts");
 }
 function getExecWrapperPath() {
-  return join9(ASSETS_DIR, "deno-runtime", "exec.ts");
+  return join10(ASSETS_DIR, "deno-runtime", "exec.ts");
 }
 function ensureNpmAssets(sourceDir) {
   if (existsSync(ASSETS_DIR))
@@ -243675,23 +243904,23 @@ async function listTemplates() {
   return result.data.templates;
 }
 async function renderTemplate(template, destPath, data) {
-  const templateDir = join10(getTemplatesDir(), template.path);
+  const templateDir = join11(getTemplatesDir(), template.path);
   const files = await globby("**/*", {
     cwd: templateDir,
     dot: true,
     onlyFiles: true
   });
   for (const file2 of files) {
-    const srcPath = join10(templateDir, file2);
+    const srcPath = join11(templateDir, file2);
     try {
       if (file2.endsWith(".ejs")) {
         const rendered = await import_ejs.default.renderFile(srcPath, data);
         const { attributes, body } = import_front_matter.default(rendered);
-        const destFile = attributes.outputFileName ? join10(dirname6(file2), attributes.outputFileName) : file2.replace(/\.ejs$/, "");
-        const destFilePath = join10(destPath, destFile);
+        const destFile = attributes.outputFileName ? join11(dirname7(file2), attributes.outputFileName) : file2.replace(/\.ejs$/, "");
+        const destFilePath = join11(destPath, destFile);
         await writeFile(destFilePath, body);
       } else {
-        const destFilePath = join10(destPath, file2);
+        const destFilePath = join11(destPath, file2);
         await copyFile(srcPath, destFilePath);
       }
     } catch (error48) {
@@ -243731,7 +243960,7 @@ async function createProjectFilesForExistingProject(options) {
   };
 }
 // src/core/project/deploy.ts
-import { resolve } from "node:path";
+import { resolve as resolve2 } from "node:path";
 
 // src/core/site/api.ts
 async function uploadSite(archivePath) {
@@ -243766,7 +243995,7 @@ async function getSiteFilePaths(outputDir) {
 // src/core/site/deploy.ts
 import { randomUUID } from "node:crypto";
 import { tmpdir } from "node:os";
-import { join as join11 } from "node:path";
+import { join as join12 } from "node:path";
 async function deploySite(siteOutputDir) {
   if (!await pathExists(siteOutputDir)) {
     throw new InvalidInputError(`Output directory does not exist: ${siteOutputDir}. Make sure to build your project first.`, {
@@ -243783,7 +244012,7 @@ async function deploySite(siteOutputDir) {
       ]
     });
   }
-  const archivePath = join11(tmpdir(), `base44-site-${randomUUID()}.tar.gz`);
+  const archivePath = join12(tmpdir(), `base44-site-${randomUUID()}.tar.gz`);
   try {
     await createArchive(siteOutputDir, archivePath);
     return await uploadSite(archivePath);
@@ -243820,7 +244049,7 @@ async function deployAll(projectData, options) {
   await authConfigResource.push(authConfig);
   const { results: connectorResults } = await pushConnectors(connectors);
   if (project.site?.outputDirectory) {
-    const outputDir = resolve(project.root, project.site.outputDirectory);
+    const outputDir = resolve2(project.root, project.site.outputDirectory);
     const { appUrl } = await deploySite(outputDir);
     return { appUrl, connectorResults };
   }
@@ -245635,8 +245864,8 @@ var disconnect = (anyProcess) => {
 // ../../node_modules/execa/lib/utils/deferred.js
 var createDeferred = () => {
   const methods = {};
-  const promise2 = new Promise((resolve2, reject) => {
-    Object.assign(methods, { resolve: resolve2, reject });
+  const promise2 = new Promise((resolve3, reject) => {
+    Object.assign(methods, { resolve: resolve3, reject });
   });
   return Object.assign(promise2, methods);
 };
@@ -250000,11 +250229,11 @@ var addConcurrentStream = (concurrentStreams, stream, waitName) => {
   const promises = weakMap.get(stream);
   const promise2 = createDeferred();
   promises.push(promise2);
-  const resolve2 = promise2.resolve.bind(promise2);
-  return { resolve: resolve2, promises };
+  const resolve3 = promise2.resolve.bind(promise2);
+  return { resolve: resolve3, promises };
 };
-var waitForConcurrentStreams = async ({ resolve: resolve2, promises }, subprocess) => {
-  resolve2();
+var waitForConcurrentStreams = async ({ resolve: resolve3, promises }, subprocess) => {
+  resolve3();
   const [isSubprocessExit] = await Promise.race([
     Promise.allSettled([true, subprocess]),
     Promise.all([false, ...promises])
@@ -250970,8 +251199,8 @@ async function pullAgentsAction({
   runTask: runTask2
 }) {
   const { project: project2 } = await readProjectConfig();
-  const configDir = dirname7(project2.configPath);
-  const agentsDir = join12(configDir, project2.agentsDir);
+  const configDir = dirname8(project2.configPath);
+  const agentsDir = join13(configDir, project2.agentsDir);
   const remoteAgents = await runTask2("Fetching agents from Base44", async () => {
     return await fetchAgents();
   }, {
@@ -251035,12 +251264,12 @@ function getAgentsCommand() {
 }
 
 // src/cli/commands/auth/password-login.ts
-import { dirname as dirname8, join as join13 } from "node:path";
+import { dirname as dirname9, join as join14 } from "node:path";
 async function passwordLoginAction({ log, runTask: runTask2 }, action) {
   const shouldEnable = action === "enable";
   const { project: project2 } = await readProjectConfig();
-  const configDir = dirname8(project2.configPath);
-  const authDir = join13(configDir, project2.authDir);
+  const configDir = dirname9(project2.configPath);
+  const authDir = join14(configDir, project2.authDir);
   const updated = await runTask2("Updating local auth config", async () => {
     const current = await readAuthConfig(authDir) ?? DEFAULT_AUTH_CONFIG;
     const merged = { ...current, enableUsernamePassword: shouldEnable };
@@ -251060,14 +251289,14 @@ function getPasswordLoginCommand() {
 }
 
 // src/cli/commands/auth/pull.ts
-import { dirname as dirname9, join as join14 } from "node:path";
+import { dirname as dirname10, join as join15 } from "node:path";
 async function pullAuthAction({
   log,
   runTask: runTask2
 }) {
   const { project: project2 } = await readProjectConfig();
-  const configDir = dirname9(project2.configPath);
-  const authDir = join14(configDir, project2.authDir);
+  const configDir = dirname10(project2.configPath);
+  const authDir = join15(configDir, project2.authDir);
   const remoteConfig = await runTask2("Fetching auth config from Base44", async () => {
     return await pullAuthConfig();
   }, {
@@ -251131,7 +251360,7 @@ function getAuthPushCommand() {
 }
 
 // src/cli/commands/auth/social-login.ts
-import { dirname as dirname10, join as join15, resolve as resolve2 } from "node:path";
+import { dirname as dirname11, join as join16, resolve as resolve3 } from "node:path";
 var PROVIDER_LABELS = {
   google: "Google",
   microsoft: "Microsoft",
@@ -251171,7 +251400,7 @@ async function socialLoginAction({ log, isNonInteractive, runTask: runTask2 }, p
   let clientSecret;
   if (useCustomOAuth && oauth && oauthCli && hasSecretOptions(options)) {
     if (options.envFile) {
-      const secrets = await parseEnvFile(resolve2(options.envFile));
+      const secrets = await parseEnvFile(resolve3(options.envFile));
       const value = secrets[oauthCli.envVar];
       if (!value) {
         throw new InvalidInputError(`Key "${oauthCli.envVar}" not found in ${options.envFile}.`);
@@ -251201,8 +251430,8 @@ async function socialLoginAction({ log, isNonInteractive, runTask: runTask2 }, p
     }
   }
   const { project: project2 } = await readProjectConfig();
-  const configDir = dirname10(project2.configPath);
-  const authDir = join15(configDir, project2.authDir);
+  const configDir = dirname11(project2.configPath);
+  const authDir = join16(configDir, project2.authDir);
   const { config: updated } = await runTask2("Updating local auth config", async () => updateSocialLoginConfig(authDir, provider, shouldEnable, useCustomOAuth && options.clientId ? { clientId: options.clientId } : undefined));
   if (clientSecret) {
     await runTask2("Saving client secret", async () => pushCustomOAuthSecret(provider, clientSecret));
@@ -251227,7 +251456,7 @@ function getSocialLoginCommand() {
 }
 
 // src/cli/commands/auth/sso.ts
-import { dirname as dirname11, join as join16, resolve as resolve3 } from "node:path";
+import { dirname as dirname12, join as join17, resolve as resolve4 } from "node:path";
 var SSOConfigFileSchema = exports_external.object({
   provider: exports_external.enum(Object.values(KNOWN_SSO_PROVIDERS)),
   clientId: exports_external.string(),
@@ -251243,7 +251472,7 @@ var SSOConfigFileSchema = exports_external.object({
   ssoName: exports_external.string().optional()
 });
 async function loadSSOConfigFile(filePath) {
-  const resolved = resolve3(filePath);
+  const resolved = resolve4(filePath);
   const raw2 = await readJsonFile(resolved);
   const result = SSOConfigFileSchema.safeParse(raw2);
   if (!result.success) {
@@ -251270,8 +251499,21 @@ function mergeFileWithFlags(fileConfig, options) {
   };
 }
 var providerNames = Object.keys(KNOWN_SSO_PROVIDERS);
+var SECRET_KEY_TO_FLAG = {
+  ["sso_name" /* Name */]: "--sso-name",
+  ["sso_client_id" /* ClientId */]: "--client-id",
+  ["sso_client_secret" /* ClientSecret */]: "--client-secret",
+  ["sso_scope" /* Scope */]: "--scope",
+  ["sso_discovery_url" /* DiscoveryUrl */]: "--discovery-url",
+  ["sso_tenant_id" /* TenantId */]: "--tenant-id",
+  ["sso_auth_endpoint" /* AuthEndpoint */]: "--auth-endpoint",
+  ["sso_token_endpoint" /* TokenEndpoint */]: "--token-endpoint",
+  ["sso_userinfo_endpoint" /* UserinfoEndpoint */]: "--userinfo-endpoint",
+  ["sso_okta_domain" /* OktaDomain */]: "--okta-domain",
+  ["sso_jwks_uri" /* JwksUri */]: "--jwks-uri"
+};
 function secretKeyToFlag(key) {
-  return `--${key.replace(/^sso_/, "").replace(/_/g, "-")}`;
+  return SECRET_KEY_TO_FLAG[key];
 }
 function exampleCommand(provider) {
   let cmd = `base44 auth sso enable --provider ${provider} --client-id <id> --client-secret <secret>`;
@@ -251318,7 +251560,7 @@ async function ssoEnableAction({ isNonInteractive, runTask: runTask2 }, options)
   }
   let clientSecret;
   if (merged.envFile && !merged.clientSecret) {
-    const secrets2 = await parseEnvFile(resolve3(merged.envFile));
+    const secrets2 = await parseEnvFile(resolve4(merged.envFile));
     const value = secrets2.sso_client_secret;
     if (!value) {
       throw new InvalidInputError(`Key "sso_client_secret" not found in ${merged.envFile}.`);
@@ -251377,8 +251619,8 @@ async function ssoEnableAction({ isNonInteractive, runTask: runTask2 }, options)
     throw error48;
   }
   const { project: project2 } = await readProjectConfig();
-  const configDir = dirname11(project2.configPath);
-  const authDir = join16(configDir, project2.authDir);
+  const configDir = dirname12(project2.configPath);
+  const authDir = join17(configDir, project2.authDir);
   await runTask2("Updating local auth config", async () => updateSSOConfig(authDir, provider, true));
   await runTask2("Saving SSO credentials", async () => pushSSOSecrets(secrets));
   return {
@@ -251393,8 +251635,8 @@ async function ssoDisableAction({ log, runTask: runTask2 }, options) {
     throw new InvalidInputError("Configuration options cannot be used with disable. To disable SSO: base44 auth sso disable");
   }
   const { project: project2 } = await readProjectConfig();
-  const configDir = dirname11(project2.configPath);
-  const authDir = join16(configDir, project2.authDir);
+  const configDir = dirname12(project2.configPath);
+  const authDir = join17(configDir, project2.authDir);
   const updated = await runTask2("Updating local auth config", async () => updateSSOConfig(authDir, null, false));
   await runTask2("Removing SSO credentials", async () => deleteSSOSecrets());
   if (!hasAnyLoginMethod(updated)) {
@@ -251481,14 +251723,14 @@ function getConnectorsListAvailableCommand() {
 }
 
 // src/cli/commands/connectors/pull.ts
-import { dirname as dirname12, join as join17 } from "node:path";
+import { dirname as dirname13, join as join18 } from "node:path";
 async function pullConnectorsAction({
   log,
   runTask: runTask2
 }) {
   const { project: project2 } = await readProjectConfig();
-  const configDir = dirname12(project2.configPath);
-  const connectorsDir = join17(configDir, project2.connectorsDir);
+  const configDir = dirname13(project2.configPath);
+  const connectorsDir = join18(configDir, project2.connectorsDir);
   const remoteConnectors = await runTask2("Fetching connectors from Base44", async () => {
     return await pullAllConnectors();
   }, {
@@ -252017,19 +252259,19 @@ var baseOpen = async (options) => {
   }
   const subprocess = childProcess3.spawn(command2, cliArguments, childProcessOptions);
   if (options.wait) {
-    return new Promise((resolve4, reject) => {
+    return new Promise((resolve5, reject) => {
       subprocess.once("error", reject);
       subprocess.once("close", (exitCode) => {
         if (!options.allowNonzeroExitCode && exitCode !== 0) {
           reject(new Error(`Exited with code ${exitCode}`));
           return;
         }
-        resolve4(subprocess);
+        resolve5(subprocess);
       });
     });
   }
   if (isFallbackAttempt) {
-    return new Promise((resolve4, reject) => {
+    return new Promise((resolve5, reject) => {
       subprocess.once("error", reject);
       subprocess.once("spawn", () => {
         subprocess.once("close", (exitCode) => {
@@ -252039,17 +252281,17 @@ var baseOpen = async (options) => {
             return;
           }
           subprocess.unref();
-          resolve4(subprocess);
+          resolve5(subprocess);
         });
       });
     });
   }
   subprocess.unref();
-  return new Promise((resolve4, reject) => {
+  return new Promise((resolve5, reject) => {
     subprocess.once("error", reject);
     subprocess.once("spawn", () => {
       subprocess.off("error", reject);
-      resolve4(subprocess);
+      resolve5(subprocess);
     });
   });
 };
@@ -252492,6 +252734,11 @@ async function deployFunctionsAction({ log }, names, options) {
       formatDeployResult(result, log);
     }
   });
+  const hasFailures = results.some((r) => r.status === "error");
+  if (hasFailures) {
+    log.message(buildDeploySummary(results));
+    throw new CLIExitError(1);
+  }
   if (options.force) {
     const allLocalNames = functions.map((f) => f.name);
     let pruneCompleted = 0;
@@ -252543,25 +252790,38 @@ function getListCommand() {
 }
 
 // src/cli/commands/functions/pull.ts
-import { dirname as dirname13, join as join18 } from "node:path";
+import { dirname as dirname14, join as join19 } from "node:path";
 async function pullFunctionsAction({ log, runTask: runTask2 }, name2) {
-  const { project: project2 } = await readProjectConfig();
-  const configDir = dirname13(project2.configPath);
-  const functionsDir = join18(configDir, project2.functionsDir);
+  const { project: project2, functions } = await readProjectConfig();
+  const configDir = dirname14(project2.configPath);
+  const functionsDir = join19(configDir, project2.functionsDir);
+  const pluginFunctionNames = new Set(functions.filter((fn) => fn.source.type === "plugin").map((fn) => fn.name));
   const remoteFunctions = await runTask2("Fetching functions from Base44", async () => {
-    const { functions } = await listDeployedFunctions();
-    return functions;
+    const { functions: functions2 } = await listDeployedFunctions();
+    return functions2;
   }, {
     successMessage: "Functions fetched successfully",
     errorMessage: "Failed to fetch functions"
   });
-  const toPull = name2 ? remoteFunctions.filter((f) => f.name === name2) : remoteFunctions;
-  if (name2 && toPull.length === 0) {
+  const matchingRemote = name2 ? remoteFunctions.filter((f) => f.name === name2) : remoteFunctions;
+  if (name2 && pluginFunctionNames.has(name2)) {
+    return {
+      outroMessage: `Function "${name2}" is managed by a plugin and was not pulled into ${functionsDir}`
+    };
+  }
+  if (name2 && matchingRemote.length === 0) {
     return {
       outroMessage: `Function "${name2}" not found on remote`
     };
   }
+  const skippedPluginOwned = matchingRemote.filter((fn) => pluginFunctionNames.has(fn.name));
+  const toPull = matchingRemote.filter((fn) => !pluginFunctionNames.has(fn.name));
   if (toPull.length === 0) {
+    if (skippedPluginOwned.length > 0) {
+      return {
+        outroMessage: `Skipped ${skippedPluginOwned.length} plugin-owned function${skippedPluginOwned.length !== 1 ? "s" : ""}; no project-owned functions to pull`
+      };
+    }
     return { outroMessage: "No functions found on remote" };
   }
   const { written, skipped } = await runTask2("Writing function files", async () => {
@@ -252576,8 +252836,11 @@ async function pullFunctionsAction({ log, runTask: runTask2 }, name2) {
   for (const name3 of skipped) {
     log.info(`${name3.padEnd(25)} unchanged`);
   }
+  for (const fn of skippedPluginOwned) {
+    log.info(`${fn.name.padEnd(25)} plugin-owned, skipped`);
+  }
   return {
-    outroMessage: `Pulled ${toPull.length} function${toPull.length !== 1 ? "s" : ""} to ${functionsDir}`
+    outroMessage: `Pulled ${toPull.length} function${toPull.length !== 1 ? "s" : ""} to ${functionsDir}${skippedPluginOwned.length > 0 ? `; skipped ${skippedPluginOwned.length} plugin-owned` : ""}`
   };
 }
 function getPullCommand() {
@@ -252590,7 +252853,7 @@ function getFunctionsCommand() {
 }
 
 // src/cli/commands/project/create.ts
-import { basename as basename3, join as join19, resolve as resolve4 } from "node:path";
+import { basename as basename3, join as join20, resolve as resolve5 } from "node:path";
 var import_kebabCase = __toESM(require_kebabCase(), 1);
 var DEFAULT_TEMPLATE_ID = "backend-only";
 async function getTemplateById(templateId) {
@@ -252655,7 +252918,7 @@ async function createInteractive(options, ctx) {
   }, ctx);
 }
 async function createNonInteractive(options, ctx) {
-  ctx.log.info(`Creating a new project at ${resolve4(options.path)}`);
+  ctx.log.info(`Creating a new project at ${resolve5(options.path)}`);
   const template2 = await getTemplateById(options.template ?? DEFAULT_TEMPLATE_ID);
   return await executeCreate({
     template: template2,
@@ -252676,7 +252939,7 @@ async function executeCreate({
   isInteractive
 }, { log, runTask: runTask2 }) {
   const name2 = rawName.trim();
-  const resolvedPath = resolve4(projectPath);
+  const resolvedPath = resolve5(projectPath);
   const { projectId } = await runTask2("Setting up your project...", async () => {
     return await createProjectFiles({
       name: name2,
@@ -252727,7 +252990,7 @@ async function executeCreate({
         updateMessage("Building project...");
         await execa({ cwd: resolvedPath, shell: true })`${buildCommand}`;
         updateMessage("Deploying site...");
-        return await deploySite(join19(resolvedPath, outputDirectory));
+        return await deploySite(join20(resolvedPath, outputDirectory));
       }, {
         successMessage: theme.colors.base44Orange("Site deployed successfully"),
         errorMessage: "Failed to deploy site"
@@ -253192,7 +253455,7 @@ function getSecretsListCommand() {
 }
 
 // src/cli/commands/secrets/set.ts
-import { resolve as resolve5 } from "node:path";
+import { resolve as resolve6 } from "node:path";
 function parseEntries(entries) {
   const secrets = {};
   for (const entry of entries) {
@@ -253223,7 +253486,7 @@ async function setSecretsAction({ log, runTask: runTask2 }, entries, options) {
   validateInput(entries, options);
   let secrets;
   if (options.envFile) {
-    secrets = await parseEnvFile(resolve5(options.envFile));
+    secrets = await parseEnvFile(resolve6(options.envFile));
     if (Object.keys(secrets).length === 0) {
       throw new InvalidInputError("The env file contains no valid KEY=VALUE entries.");
     }
@@ -253252,7 +253515,7 @@ function getSecretsCommand() {
 }
 
 // src/cli/commands/site/deploy.ts
-import { resolve as resolve6 } from "node:path";
+import { resolve as resolve7 } from "node:path";
 async function deployAction2({ isNonInteractive, runTask: runTask2 }, options) {
   if (isNonInteractive && !options.yes) {
     throw new InvalidInputError("--yes is required in non-interactive mode");
@@ -253267,7 +253530,7 @@ async function deployAction2({ isNonInteractive, runTask: runTask2 }, options) {
       ]
     });
   }
-  const outputDir = resolve6(project2.root, project2.site.outputDirectory);
+  const outputDir = resolve7(project2.root, project2.site.outputDirectory);
   if (!options.yes) {
     const shouldDeploy = await Re({
       message: `Deploy site from ${project2.site.outputDirectory}?`
@@ -253393,10 +253656,10 @@ function toPascalCase(name2) {
   return name2.split(/[-_\s]+/).map((w8) => w8.charAt(0).toUpperCase() + w8.slice(1)).join("");
 }
 // src/core/types/update-project.ts
-import { join as join22 } from "node:path";
+import { join as join23 } from "node:path";
 var TYPES_INCLUDE_PATH = `${PROJECT_SUBDIR}/${TYPES_OUTPUT_SUBDIR}/*.d.ts`;
 async function updateProjectConfig(projectRoot) {
-  const tsconfigPath = join22(projectRoot, "tsconfig.json");
+  const tsconfigPath = join23(projectRoot, "tsconfig.json");
   if (!await pathExists(tsconfigPath)) {
     return false;
   }
@@ -253444,7 +253707,7 @@ import process21 from "node:process";
 // src/cli/dev/dev-server/main.ts
 var import_cors = __toESM(require_lib4(), 1);
 var import_express6 = __toESM(require_express(), 1);
-import { dirname as dirname18, join as join25 } from "node:path";
+import { dirname as dirname19, join as join26 } from "node:path";
 
 // ../../node_modules/get-port/index.js
 import net from "node:net";
@@ -253471,14 +253734,14 @@ var getLocalHosts = () => {
   }
   return results;
 };
-var checkAvailablePort = (options8) => new Promise((resolve8, reject) => {
+var checkAvailablePort = (options8) => new Promise((resolve9, reject) => {
   const server = net.createServer();
   server.unref();
   server.on("error", reject);
   server.listen(options8, () => {
     const { port } = server.address();
     server.close(() => {
-      resolve8(port);
+      resolve9(port);
     });
   });
 });
@@ -253738,7 +254001,7 @@ class FunctionManager {
     });
   }
   waitForReady(name2, runningFunc) {
-    return new Promise((resolve8, reject) => {
+    return new Promise((resolve9, reject) => {
       runningFunc.process.on("exit", (code2) => {
         if (!runningFunc.ready) {
           clearTimeout(timeout3);
@@ -253761,7 +254024,7 @@ class FunctionManager {
           runningFunc.ready = true;
           clearTimeout(timeout3);
           runningFunc.process.stdout?.off("data", onData);
-          resolve8(runningFunc.port);
+          resolve9(runningFunc.port);
         }
       };
       runningFunc.process.stdout?.on("data", onData);
@@ -254062,7 +254325,8 @@ class Database {
       return {
         name: "User",
         type: "object",
-        properties: { ...builtInFields, role: { type: "string" } }
+        properties: { ...builtInFields, role: { type: "string" } },
+        source: { type: "project" }
       };
     }
     for (const field of Object.keys(builtInFields)) {
@@ -255682,9 +255946,9 @@ class NodeFsHandler {
     if (this.fsw.closed) {
       return;
     }
-    const dirname17 = sp2.dirname(file2);
+    const dirname18 = sp2.dirname(file2);
     const basename5 = sp2.basename(file2);
-    const parent = this.fsw._getWatchedDir(dirname17);
+    const parent = this.fsw._getWatchedDir(dirname18);
     let prevStats = stats;
     if (parent.has(basename5))
       return;
@@ -255711,7 +255975,7 @@ class NodeFsHandler {
             prevStats = newStats2;
           }
         } catch (error48) {
-          this.fsw._remove(dirname17, basename5);
+          this.fsw._remove(dirname18, basename5);
         }
       } else if (parent.has(basename5)) {
         const at13 = newStats.atimeMs;
@@ -255800,7 +256064,7 @@ class NodeFsHandler {
         this._addToNodeFs(path19, initialAdd, wh2, depth + 1);
       }
     }).on(EV.ERROR, this._boundHandleError);
-    return new Promise((resolve9, reject) => {
+    return new Promise((resolve10, reject) => {
       if (!stream)
         return reject();
       stream.once(STR_END, () => {
@@ -255809,7 +256073,7 @@ class NodeFsHandler {
           return;
         }
         const wasThrottled = throttler ? throttler.clear() : false;
-        resolve9(undefined);
+        resolve10(undefined);
         previous.getChildren().filter((item) => {
           return item !== directory && !current.has(item);
         }).forEach((item) => {
@@ -256720,7 +256984,7 @@ async function createDevServer(options8) {
     }
     remoteProxy(req, res, next);
   });
-  const server = await new Promise((resolve10, reject) => {
+  const server = await new Promise((resolve11, reject) => {
     const s5 = app.listen(port, "127.0.0.1", (err) => {
       if (err) {
         if ("code" in err && err.code === "EADDRINUSE") {
@@ -256729,7 +256993,7 @@ async function createDevServer(options8) {
           reject(err);
         }
       } else {
-        resolve10(s5);
+        resolve11(s5);
       }
     });
   });
@@ -256738,8 +257002,8 @@ async function createDevServer(options8) {
     broadcastEntityEvent(io6, appId, entityName, event);
   };
   const base44ConfigWatcher = new WatchBase44({
-    functions: join25(dirname18(project2.configPath), project2.functionsDir),
-    entities: join25(dirname18(project2.configPath), project2.entitiesDir)
+    functions: join26(dirname19(project2.configPath), project2.functionsDir),
+    entities: join26(dirname19(project2.configPath), project2.entitiesDir)
   }, devLogger);
   base44ConfigWatcher.on("change", async (name2) => {
     try {
@@ -256846,13 +257110,13 @@ async function runScript(options8) {
 }
 // src/cli/commands/exec.ts
 function readStdin2() {
-  return new Promise((resolve10, reject) => {
+  return new Promise((resolve11, reject) => {
     let data = "";
     process.stdin.setEncoding("utf-8");
     process.stdin.on("data", (chunk) => {
       data += chunk;
     });
-    process.stdin.on("end", () => resolve10(data));
+    process.stdin.on("end", () => resolve11(data));
     process.stdin.on("error", reject);
   });
 }
@@ -256891,7 +257155,7 @@ Examples:
 }
 
 // src/cli/commands/project/eject.ts
-import { resolve as resolve10 } from "node:path";
+import { resolve as resolve11 } from "node:path";
 var import_kebabCase2 = __toESM(require_kebabCase(), 1);
 async function eject(ctx, options8) {
   const { log, runTask: runTask2, isNonInteractive } = ctx;
@@ -256947,7 +257211,7 @@ async function eject(ctx, options8) {
     Ne("Operation cancelled.");
     throw new CLIExitError(0);
   }
-  const resolvedPath = resolve10(selectedPath);
+  const resolvedPath = resolve11(selectedPath);
   await runTask2("Downloading your project's code...", async (updateMessage) => {
     await createProjectFilesForExistingProject({
       projectId,
@@ -257028,7 +257292,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 dirname19, posix, sep } from "path";
+import { dirname as dirname20, posix, sep } from "path";
 function createModulerModifier() {
   const getModuleFromFileName = createGetModuleFromFilename();
   return async (frames) => {
@@ -257037,7 +257301,7 @@ function createModulerModifier() {
     return frames;
   };
 }
-function createGetModuleFromFilename(basePath = process.argv[1] ? dirname19(process.argv[1]) : process.cwd(), isWindows5 = sep === "\\") {
+function createGetModuleFromFilename(basePath = process.argv[1] ? dirname20(process.argv[1]) : process.cwd(), isWindows5 = sep === "\\") {
   const normalizedBase = isWindows5 ? normalizeWindowsPath2(basePath) : basePath;
   return (filename) => {
     if (!filename)
@@ -259315,14 +259579,14 @@ async function addSourceContext(frames) {
   return frames;
 }
 function getContextLinesFromFile(path19, ranges, output) {
-  return new Promise((resolve11) => {
+  return new Promise((resolve12) => {
     const stream = createReadStream2(path19);
     const lineReaded = createInterface2({
       input: stream
     });
     function destroyStreamAndResolve() {
       stream.destroy();
-      resolve11();
+      resolve12();
     }
     let lineNumber = 0;
     let currentRangeIndex = 0;
@@ -260434,15 +260698,15 @@ class PostHogBackendClient extends PostHogCoreStateless {
       return true;
     if (this.featureFlagsPoller === undefined)
       return false;
-    return new Promise((resolve11) => {
+    return new Promise((resolve12) => {
       const timeout3 = setTimeout(() => {
         cleanup();
-        resolve11(false);
+        resolve12(false);
       }, timeoutMs);
       const cleanup = this._events.on("localEvaluationFlagsLoaded", (count2) => {
         clearTimeout(timeout3);
         cleanup();
-        resolve11(count2 > 0);
+        resolve12(count2 > 0);
       });
     });
   }
@@ -261226,9 +261490,9 @@ function addCommandInfoToErrorReporter(program2, errorReporter) {
   });
 }
 // src/cli/index.ts
-var __dirname4 = dirname20(fileURLToPath6(import.meta.url));
+var __dirname4 = dirname21(fileURLToPath6(import.meta.url));
 async function runCLI(options8) {
-  ensureNpmAssets(join26(__dirname4, "../assets"));
+  ensureNpmAssets(join27(__dirname4, "../assets"));
   const errorReporter = new ErrorReporter;
   errorReporter.registerProcessErrorHandlers();
   const isNonInteractive = !process.stdin.isTTY || !process.stdout.isTTY;
@@ -261265,4 +261529,4 @@ export {
   CLIExitError
 };
 
-//# debugId=3A692D5B92B6C98C64756E2164756E21
+//# debugId=F9698F6E012A29BB64756E2164756E21