@base44-preview/cli 0.0.55-pr.547.7e43787 → 0.0.56-pr.547.00da3ae

package/dist/cli/index.js

@@ -138269,11 +138269,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(resolve10) {
-        resolve10(value);
+      return value instanceof P9 ? value : new P9(function(resolve12) {
+        resolve12(value);
       });
     }
-    return new (P9 || (P9 = Promise))(function(resolve10, reject) {
+    return new (P9 || (P9 = Promise))(function(resolve12, reject) {
       function fulfilled(value) {
         try {
           step(generator.next(value));
@@ -138289,7 +138289,7 @@ var require_formatter = __commonJS((exports) => {
         }
       }
       function step(result) {
-        result.done ? resolve10(result.value) : adopt(result.value).then(fulfilled, rejected);
+        result.done ? resolve12(result.value) : adopt(result.value).then(fulfilled, rejected);
       }
       step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
@@ -142942,7 +142942,7 @@ var require_url = __commonJS((exports) => {
   };
   Object.defineProperty(exports, "__esModule", { value: true });
   exports.parse = undefined;
-  exports.resolve = resolve10;
+  exports.resolve = resolve12;
   exports.cwd = cwd;
   exports.getProtocol = getProtocol;
   exports.getExtension = getExtension;
@@ -142970,7 +142970,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 resolve10(from, to5) {
+  function resolve12(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] || "";
@@ -143106,7 +143106,7 @@ var require_url = __commonJS((exports) => {
   }
   function relative4(from, to5) {
     if (!isFileSystemPath(from) || !isFileSystemPath(to5)) {
-      return resolve10(from, to5);
+      return resolve12(from, to5);
     }
     const fromDir = path_1.default.dirname(stripHash(from));
     const toPath4 = stripHash(to5);
@@ -143782,7 +143782,7 @@ var require_plugins = __commonJS((exports) => {
     let plugin;
     let lastError;
     let index = 0;
-    return new Promise((resolve10, reject) => {
+    return new Promise((resolve12, reject) => {
       runNextPlugin();
       function runNextPlugin() {
         plugin = plugins[index++];
@@ -143810,7 +143810,7 @@ var require_plugins = __commonJS((exports) => {
         }
       }
       function onSuccess(result) {
-        resolve10({
+        resolve12({
           plugin,
           result
         });
@@ -145143,11 +145143,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(resolve10) {
-        resolve10(value);
+      return value instanceof P9 ? value : new P9(function(resolve12) {
+        resolve12(value);
       });
     }
-    return new (P9 || (P9 = Promise))(function(resolve10, reject) {
+    return new (P9 || (P9 = Promise))(function(resolve12, reject) {
       function fulfilled(value) {
         try {
           step(generator.next(value));
@@ -145163,7 +145163,7 @@ var require_resolver = __commonJS((exports) => {
         }
       }
       function step(result) {
-        result.done ? resolve10(result.value) : adopt(result.value).then(fulfilled, rejected);
+        result.done ? resolve12(result.value) : adopt(result.value).then(fulfilled, rejected);
       }
       step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
@@ -145284,11 +145284,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(resolve10) {
-        resolve10(value);
+      return value instanceof P9 ? value : new P9(function(resolve12) {
+        resolve12(value);
       });
     }
-    return new (P9 || (P9 = Promise))(function(resolve10, reject) {
+    return new (P9 || (P9 = Promise))(function(resolve12, reject) {
       function fulfilled(value) {
         try {
           step(generator.next(value));
@@ -145304,7 +145304,7 @@ var require_src3 = __commonJS((exports) => {
         }
       }
       function step(result) {
-        result.done ? resolve10(result.value) : adopt(result.value).then(fulfilled, rejected);
+        result.done ? resolve12(result.value) : adopt(result.value).then(fulfilled, rejected);
       }
       step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
@@ -150819,11 +150819,11 @@ var require_raw_body = __commonJS((exports, module) => {
     if (done) {
       return readStream(stream, encoding, length, limit, wrap(done));
     }
-    return new Promise(function executor(resolve10, reject) {
+    return new Promise(function executor(resolve12, reject) {
       readStream(stream, encoding, length, limit, function onRead2(err, buf) {
         if (err)
           return reject(err);
-        resolve10(buf);
+        resolve12(buf);
       });
     });
   }
@@ -163948,7 +163948,7 @@ var require_view = __commonJS((exports, module) => {
   var basename6 = path18.basename;
   var extname2 = path18.extname;
   var join25 = path18.join;
-  var resolve10 = path18.resolve;
+  var resolve12 = path18.resolve;
   module.exports = View;
   function View(name2, options8) {
     var opts = options8 || {};
@@ -163982,7 +163982,7 @@ 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 = resolve10(root2, name2);
+      var loc = resolve12(root2, name2);
       var dir = dirname19(loc);
       var file2 = basename6(loc);
       path19 = this.resolve(dir, file2);
@@ -164007,7 +164007,7 @@ var require_view = __commonJS((exports, module) => {
     });
     sync = false;
   };
-  View.prototype.resolve = function resolve11(dir, file2) {
+  View.prototype.resolve = function resolve13(dir, file2) {
     var ext = this.ext;
     var path19 = join25(dir, file2);
     var stat2 = tryStat(path19);
@@ -166166,7 +166166,7 @@ var require_application = __commonJS((exports, module) => {
   var compileETag = require_utils10().compileETag;
   var compileQueryParser = require_utils10().compileQueryParser;
   var compileTrust = require_utils10().compileTrust;
-  var resolve10 = __require("node:path").resolve;
+  var resolve12 = __require("node:path").resolve;
   var once9 = require_once();
   var Router = require_router();
   var slice = Array.prototype.slice;
@@ -166220,7 +166220,7 @@ var require_application = __commonJS((exports, module) => {
     this.mountpath = "/";
     this.locals.settings = this.settings;
     this.set("view", View);
-    this.set("views", resolve10("views"));
+    this.set("views", resolve12("views"));
     this.set("jsonp callback name", "callback");
     if (env3 === "production") {
       this.enable("view cache");
@@ -167711,7 +167711,7 @@ var require_send = __commonJS((exports, module) => {
   var extname2 = path18.extname;
   var join25 = path18.join;
   var normalize2 = path18.normalize;
-  var resolve10 = path18.resolve;
+  var resolve12 = path18.resolve;
   var sep = path18.sep;
   var BYTES_RANGE_REGEXP = /^ *bytes=/;
   var MAX_MAXAGE = 60 * 60 * 24 * 365 * 1000;
@@ -167740,7 +167740,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 ? resolve10(opts.root) : null;
+    this._root = opts.root ? resolve12(opts.root) : null;
   }
   util2.inherits(SendStream, Stream2);
   SendStream.prototype.error = function error48(status, err) {
@@ -167889,7 +167889,7 @@ var require_send = __commonJS((exports, module) => {
         return res;
       }
       parts = normalize2(path19).split(sep);
-      path19 = resolve10(path19);
+      path19 = resolve12(path19);
     }
     if (containsDotFile(parts)) {
       debug('%s dotfile "%s"', this._dotfiles, path19);
@@ -168217,7 +168217,7 @@ var require_response = __commonJS((exports, module) => {
   var cookie = require_cookie();
   var send = require_send();
   var extname2 = path18.extname;
-  var resolve10 = path18.resolve;
+  var resolve12 = path18.resolve;
   var vary = require_vary();
   var { Buffer: Buffer7 } = __require("node:buffer");
   var res = Object.create(http.ServerResponse.prototype);
@@ -168426,7 +168426,7 @@ var require_response = __commonJS((exports, module) => {
     }
     opts = Object.create(opts);
     opts.headers = headers;
-    var fullPath = !opts.root ? resolve10(path19) : path19;
+    var fullPath = !opts.root ? resolve12(path19) : path19;
     return this.sendFile(fullPath, opts, done);
   };
   res.contentType = res.type = function contentType(type) {
@@ -168687,7 +168687,7 @@ var require_serve_static = __commonJS((exports, module) => {
   var encodeUrl = require_encodeurl();
   var escapeHtml = require_escape_html();
   var parseUrl = require_parseurl();
-  var resolve10 = __require("path").resolve;
+  var resolve12 = __require("path").resolve;
   var send = require_send();
   var url3 = __require("url");
   module.exports = serveStatic;
@@ -168706,7 +168706,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 = resolve10(root2);
+    opts.root = resolve12(root2);
     var onDirectory = redirect ? createRedirectDirectoryListener() : createNotFoundDirectoryListener();
     return function serveStatic2(req, res, next) {
       if (req.method !== "GET" && req.method !== "HEAD") {
@@ -172080,8 +172080,8 @@ var require_executor = __commonJS((exports, module) => {
     }
     resetBuffer() {
       this.buffer = new Waterfall;
-      this.buffer.chain(new Promise((resolve10) => {
-        this._triggerBuffer = resolve10;
+      this.buffer.chain(new Promise((resolve12) => {
+        this._triggerBuffer = resolve12;
       }));
       if (this.ready)
         this._triggerBuffer();
@@ -173101,7 +173101,7 @@ var require_storage = __commonJS((exports, module) => {
       throw e8;
     }
   };
-  var writeFileLinesAsync = (filename, lines, mode = DEFAULT_FILE_MODE) => new Promise((resolve10, reject) => {
+  var writeFileLinesAsync = (filename, lines, mode = DEFAULT_FILE_MODE) => new Promise((resolve12, reject) => {
     try {
       const stream = writeFileStream(filename, { mode });
       const readable2 = Readable6.from(lines);
@@ -173118,7 +173118,7 @@ var require_storage = __commonJS((exports, module) => {
           if (err)
             reject(err);
           else
-            resolve10();
+            resolve12();
         });
       });
       readable2.on("error", (err) => {
@@ -173289,7 +173289,7 @@ var require_persistence = __commonJS((exports, module) => {
       return { data: tdata, indexes };
     }
     treatRawStreamAsync(rawStream) {
-      return new Promise((resolve10, reject) => {
+      return new Promise((resolve12, reject) => {
         const dataById = {};
         const indexes = {};
         let corruptItems = 0;
@@ -173332,7 +173332,7 @@ var require_persistence = __commonJS((exports, module) => {
             }
           }
           const data = Object.values(dataById);
-          resolve10({ data, indexes });
+          resolve12({ data, indexes });
         });
         lineStream.on("error", function(err) {
           reject(err, null);
@@ -198943,13 +198943,13 @@ var require_broadcast_operator = __commonJS((exports) => {
       return true;
     }
     emitWithAck(ev2, ...args) {
-      return new Promise((resolve10, reject) => {
+      return new Promise((resolve12, reject) => {
         args.push((err, responses) => {
           if (err) {
             err.responses = responses;
             return reject(err);
           } else {
-            return resolve10(responses);
+            return resolve12(responses);
           }
         });
         this.emit(ev2, ...args);
@@ -199137,12 +199137,12 @@ var require_socket2 = __commonJS((exports) => {
     }
     emitWithAck(ev2, ...args) {
       const withErr = this.flags.timeout !== undefined;
-      return new Promise((resolve10, reject) => {
+      return new Promise((resolve12, reject) => {
         args.push((arg1, arg2) => {
           if (withErr) {
-            return arg1 ? reject(arg1) : resolve10(arg2);
+            return arg1 ? reject(arg1) : resolve12(arg2);
           } else {
-            return resolve10(arg1);
+            return resolve12(arg1);
           }
         });
         this.emit(ev2, ...args);
@@ -199597,13 +199597,13 @@ var require_namespace = __commonJS((exports) => {
       return true;
     }
     serverSideEmitWithAck(ev2, ...args) {
-      return new Promise((resolve10, reject) => {
+      return new Promise((resolve12, reject) => {
         args.push((err, responses) => {
           if (err) {
             err.responses = responses;
             return reject(err);
           } else {
-            return resolve10(responses);
+            return resolve12(responses);
           }
         });
         this.serverSideEmit(ev2, ...args);
@@ -200287,7 +200287,7 @@ var require_cluster_adapter = __commonJS((exports) => {
         return localSockets;
       }
       const requestId = randomId();
-      return new Promise((resolve10, reject) => {
+      return new Promise((resolve12, reject) => {
         const timeout3 = setTimeout(() => {
           const storedRequest2 = this.requests.get(requestId);
           if (storedRequest2) {
@@ -200297,7 +200297,7 @@ var require_cluster_adapter = __commonJS((exports) => {
         }, opts.flags.timeout || DEFAULT_TIMEOUT);
         const storedRequest = {
           type: MessageType.FETCH_SOCKETS,
-          resolve: resolve10,
+          resolve: resolve12,
           timeout: timeout3,
           current: 0,
           expected: expectedResponseCount,
@@ -200507,7 +200507,7 @@ var require_cluster_adapter = __commonJS((exports) => {
         return localSockets;
       }
       const requestId = randomId();
-      return new Promise((resolve10, reject) => {
+      return new Promise((resolve12, reject) => {
         const timeout3 = setTimeout(() => {
           const storedRequest2 = this.customRequests.get(requestId);
           if (storedRequest2) {
@@ -200517,7 +200517,7 @@ var require_cluster_adapter = __commonJS((exports) => {
         }, opts.flags.timeout || DEFAULT_TIMEOUT);
         const storedRequest = {
           type: MessageType.FETCH_SOCKETS,
-          resolve: resolve10,
+          resolve: resolve12,
           timeout: timeout3,
           missingUids: new Set([...this.nodesMap.keys()]),
           responses: localSockets
@@ -201246,13 +201246,13 @@ var require_dist4 = __commonJS((exports, module) => {
       this.engine.close();
       (0, uws_1.restoreAdapter)();
       if (this.httpServer) {
-        return new Promise((resolve10) => {
+        return new Promise((resolve12) => {
           this.httpServer.close((err) => {
             fn9 && fn9(err);
             if (err) {
               debug("server was not running");
             }
-            resolve10();
+            resolve12();
           });
         });
       } else {
@@ -215914,14 +215914,14 @@ var require_async_iterator = __commonJS((exports, module) => {
     };
   }
   function readAndResolve(iter) {
-    var resolve10 = iter[kLastResolve];
-    if (resolve10 !== null) {
+    var resolve12 = iter[kLastResolve];
+    if (resolve12 !== null) {
       var data = iter[kStream].read();
       if (data !== null) {
         iter[kLastPromise] = null;
         iter[kLastResolve] = null;
         iter[kLastReject] = null;
-        resolve10(createIterResult(data, false));
+        resolve12(createIterResult(data, false));
       }
     }
   }
@@ -215929,13 +215929,13 @@ var require_async_iterator = __commonJS((exports, module) => {
     process.nextTick(readAndResolve, iter);
   }
   function wrapForNext(lastPromise, iter) {
-    return function(resolve10, reject) {
+    return function(resolve12, reject) {
       lastPromise.then(function() {
         if (iter[kEnded]) {
-          resolve10(createIterResult(undefined, true));
+          resolve12(createIterResult(undefined, true));
           return;
         }
-        iter[kHandlePromise](resolve10, reject);
+        iter[kHandlePromise](resolve12, 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(resolve10, reject) {
+        return new Promise(function(resolve12, reject) {
           process.nextTick(function() {
             if (_this[kError]) {
               reject(_this[kError]);
             } else {
-              resolve10(createIterResult(undefined, true));
+              resolve12(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(resolve10, reject) {
+    return new Promise(function(resolve12, reject) {
       _this2[kStream].destroy(null, function(err) {
         if (err) {
           reject(err);
           return;
         }
-        resolve10(createIterResult(undefined, true));
+        resolve12(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(resolve10, reject) {
+      value: function value(resolve12, reject) {
         var data = iterator[kStream].read();
         if (data) {
           iterator[kLastPromise] = null;
           iterator[kLastResolve] = null;
           iterator[kLastReject] = null;
-          resolve10(createIterResult(data, false));
+          resolve12(createIterResult(data, false));
         } else {
-          iterator[kLastResolve] = resolve10;
+          iterator[kLastResolve] = resolve12;
           iterator[kLastReject] = reject;
         }
       },
@@ -216037,12 +216037,12 @@ var require_async_iterator = __commonJS((exports, module) => {
         iterator[kError] = err;
         return;
       }
-      var resolve10 = iterator[kLastResolve];
-      if (resolve10 !== null) {
+      var resolve12 = iterator[kLastResolve];
+      if (resolve12 !== null) {
         iterator[kLastPromise] = null;
         iterator[kLastResolve] = null;
         iterator[kLastReject] = null;
-        resolve10(createIterResult(undefined, true));
+        resolve12(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, resolve10, reject, _next, _throw, key2, arg) {
+  function asyncGeneratorStep(gen, resolve12, 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) {
-      resolve10(value);
+      resolve12(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(resolve10, reject) {
+      return new Promise(function(resolve12, reject) {
         var gen = fn9.apply(self2, args);
         function _next(value) {
-          asyncGeneratorStep(gen, resolve10, reject, _next, _throw, "next", value);
+          asyncGeneratorStep(gen, resolve12, reject, _next, _throw, "next", value);
         }
         function _throw(err) {
-          asyncGeneratorStep(gen, resolve10, reject, _next, _throw, "throw", err);
+          asyncGeneratorStep(gen, resolve12, reject, _next, _throw, "throw", err);
         }
         _next(undefined);
       });
@@ -218285,6 +218285,7 @@ var PROJECT_CONFIG_PATTERNS = [
   `${PROJECT_SUBDIR}/config.${CONFIG_FILE_EXTENSION_GLOB}`,
   `config.${CONFIG_FILE_EXTENSION_GLOB}`
 ];
+var BASE44_APP_ID_ENV_VAR = "BASE44_APP_ID";
 var TYPES_OUTPUT_SUBDIR = ".types";
 var TYPES_FILENAME = "types.d.ts";
 var AUTH_CLIENT_ID = "base44_cli";
@@ -233980,7 +233981,7 @@ async function parseEnvFile(filePath) {
 }
 var STRIPE_ENV_PREFIX = "BASE44_PROJECTS_";
 var BASE44_ENV_KEYS = [
-  "BASE44_APP_ID",
+  BASE44_APP_ID_ENV_VAR,
   "BASE44_ACCESS_TOKEN",
   "BASE44_REFRESH_TOKEN",
   "BASE44_API_URL"
@@ -234017,7 +234018,7 @@ function normalizeBase44Env() {
 loadProjectEnvFiles();
 
 // src/cli/index.ts
-import { dirname as dirname23, join as join29 } from "node:path";
+import { dirname as dirname23, join as join28 } from "node:path";
 import { fileURLToPath as fileURLToPath6 } from "node:url";
 
 // ../../node_modules/@clack/core/dist/index.mjs
@@ -241694,18 +241695,35 @@ function loadFromTestOverrides() {
   }
   return null;
 }
-async function initAppContext() {
+async function initAppContext(options = {}) {
   const testConfig = loadFromTestOverrides();
   if (testConfig) {
     cache2 = testConfig;
     return cache2;
   }
+  const projectRoot = findProjectRoot();
+  if (options.appId !== undefined) {
+    const id = options.appId.trim();
+    if (!id) {
+      throw new InvalidInputError("App id cannot be empty.");
+    }
+    cache2 = { id };
+    return cache2;
+  }
   if (cache2) {
     return cache2;
   }
-  const projectRoot = findProjectRoot();
   if (!projectRoot) {
-    throw new ConfigNotFoundError("No Base44 project found. Run this command from a project directory with a config.jsonc file.");
+    throw new ConfigNotFoundError(`No Base44 app ID found. Pass --app-id, set ${BASE44_APP_ID_ENV_VAR}, or run this command from a linked project with base44/.app.jsonc.`, {
+      hints: [
+        { message: "Pass an app ID explicitly with --app-id <id>" },
+        { message: `Set ${BASE44_APP_ID_ENV_VAR} in your environment` },
+        {
+          message: "Run from a linked Base44 project with base44/.app.jsonc, or run 'base44 link'",
+          command: "base44 link"
+        }
+      ]
+    });
   }
   const config3 = await readAppConfig(projectRoot.root);
   const appConfigPath = await findAppConfigPath(projectRoot.root);
@@ -243873,7 +243891,7 @@ import { join as join11 } from "node:path";
 // package.json
 var package_default = {
   name: "base44",
-  version: "0.0.55",
+  version: "0.0.56",
   description: "Base44 CLI - Unified interface for managing Base44 applications",
   type: "module",
   bin: {
@@ -244267,7 +244285,7 @@ async function generateDeviceCode() {
   const response = await oauthClient.post("oauth/device/code", {
     json: {
       client_id: AUTH_CLIENT_ID,
-      scope: "apps:read apps:write"
+      scope: "apps:read apps:write sandbox:write"
     },
     throwHttpErrors: false
   });
@@ -244438,8 +244456,8 @@ async function ensureAuth(ctx) {
     });
   } catch {}
 }
-async function ensureAppContext(ctx) {
-  const appContext = await initAppContext();
+async function ensureAppContext(ctx, options = {}) {
+  const appContext = await initAppContext(options);
   ctx.app = appContext;
   ctx.errorReporter.setContext({ appId: appContext.id });
 }
@@ -251095,7 +251113,8 @@ class Base44Command extends Command {
   }
   action(fn) {
     return super.action(async (...args) => {
-      const quiet = this.context.isNonInteractive;
+      const jsonMode = this.context.jsonMode;
+      const quiet = this.context.isNonInteractive || jsonMode;
       if (!quiet) {
         await showCommandStart(this._commandOptions.fullBanner);
       }
@@ -251105,14 +251124,16 @@ class Base44Command extends Command {
           await ensureAuth(this.context);
         }
         if (this._commandOptions.requireAppContext) {
-          await ensureAppContext(this.context);
+          const { appId } = this.optsWithGlobals();
+          await ensureAppContext(this.context, { appId });
         }
         const result = await fn(this.context, ...args) ?? {};
         if (!quiet) {
           await showCommandEnd(result, upgradeCheckPromise, this.context.distribution);
         } else {
           if (result.outroMessage) {
-            process.stdout.write(`${result.outroMessage}
+            const statusStream = jsonMode ? process.stderr : process.stdout;
+            statusStream.write(`${result.outroMessage}
 `);
           }
           if (result.stdout) {
@@ -251816,73 +251837,6 @@ function getWhoamiCommand() {
   return new Base44Command("whoami", { requireAppContext: false }).description("Display current authenticated user").action(whoami);
 }
 
-// src/cli/commands/connectors/list-available.ts
-async function listAvailableAction({
-  log,
-  runTask: runTask2
-}) {
-  const { integrations } = await runTask2("Fetching available integrations from Base44", async () => {
-    return await listAvailableIntegrations();
-  }, {
-    successMessage: "Available integrations fetched successfully",
-    errorMessage: "Failed to fetch available integrations"
-  });
-  if (integrations.length === 0) {
-    return { outroMessage: "No available integrations found." };
-  }
-  for (const { displayName, ...rest } of integrations) {
-    const yaml2 = formatYaml(rest);
-    const pad = " ".repeat(YAML_INDENT);
-    log.info(`${displayName}
-${pad}${yaml2.replace(/\n/g, `
-${pad}`)}`);
-  }
-  return {
-    outroMessage: `Found ${integrations.length} available integrations.`
-  };
-}
-function getConnectorsListAvailableCommand() {
-  return new Base44Command("list-available").description("List all available integration types").action(listAvailableAction);
-}
-
-// src/cli/commands/connectors/pull.ts
-import { dirname as dirname15, join as join19 } from "node:path";
-async function pullConnectorsAction({
-  log,
-  runTask: runTask2
-}) {
-  const { project: project2 } = await readProjectConfig();
-  const configDir = dirname15(project2.configPath);
-  const connectorsDir = join19(configDir, project2.connectorsDir);
-  const remoteConnectors = await runTask2("Fetching connectors from Base44", async () => {
-    return await pullAllConnectors();
-  }, {
-    successMessage: "Connectors fetched successfully",
-    errorMessage: "Failed to fetch connectors"
-  });
-  const { written, deleted } = await runTask2("Syncing connector files", async () => {
-    return await writeConnectors(connectorsDir, remoteConnectors);
-  }, {
-    successMessage: "Connector files synced successfully",
-    errorMessage: "Failed to sync connector files"
-  });
-  if (written.length > 0) {
-    log.success(`Written: ${written.join(", ")}`);
-  }
-  if (deleted.length > 0) {
-    log.warn(`Deleted: ${deleted.join(", ")}`);
-  }
-  if (written.length === 0 && deleted.length === 0) {
-    log.info("All connectors are already up to date");
-  }
-  return {
-    outroMessage: `Pulled ${remoteConnectors.length} connectors to ${connectorsDir}`
-  };
-}
-function getConnectorsPullCommand() {
-  return new Base44Command("pull").description("Pull connectors from Base44 to local files (replaces all local connector configs)").action(pullConnectorsAction);
-}
-
 // ../../node_modules/open/index.js
 import process20 from "node:process";
 import path16 from "node:path";
@@ -252573,7 +252527,165 @@ async function promptOAuthFlows(pending, log, options) {
   return outcomes;
 }
 
+// src/cli/commands/connectors/initiate.ts
+function parseIntegrationType(value) {
+  const result = IntegrationTypeSchema.safeParse(value);
+  if (!result.success) {
+    throw new InvalidInputError("A valid --integration-type is required (e.g. googlecalendar, gmail, slack).");
+  }
+  return result.data;
+}
+function parseScopes(scopes) {
+  return (scopes ?? []).flatMap((s) => s.split(",")).map((s) => s.trim()).filter(Boolean);
+}
+async function initiateAction(ctx, options) {
+  const { log, runTask: runTask2, isNonInteractive, jsonMode } = ctx;
+  const integrationType = parseIntegrationType(options.integrationType);
+  const scopes = parseScopes(options.scopes);
+  const response = await runTask2(`Initiating ${integrationType} connector`, () => setConnector(integrationType, scopes), {
+    successMessage: `Connector ${integrationType} initialized`,
+    errorMessage: `Failed to initialize ${integrationType}`
+  });
+  if (response.error) {
+    const detail = response.error === "different_user" && response.otherUserEmail ? ` (already authorized by ${response.otherUserEmail})` : response.errorMessage ? ` (${response.errorMessage})` : "";
+    throw new InvalidInputError(`Could not initiate ${integrationType}: ${response.error}${detail}`);
+  }
+  if (jsonMode) {
+    return {
+      outroMessage: response.alreadyAuthorized ? `${integrationType} already authorized` : `${integrationType} initialized`,
+      stdout: `${JSON.stringify({
+        integrationType,
+        alreadyAuthorized: response.alreadyAuthorized,
+        redirectUrl: response.redirectUrl,
+        connectionId: response.connectionId
+      }, null, 2)}
+`
+    };
+  }
+  if (response.alreadyAuthorized || !response.redirectUrl) {
+    return {
+      outroMessage: `${integrationType} is already authorized. Run 'base44 connectors pull' to fetch its config.`
+    };
+  }
+  log.info(`Authorize ${integrationType} here: ${theme.colors.links(response.redirectUrl)}`);
+  const pending = {
+    type: integrationType,
+    action: "needs_oauth",
+    redirectUrl: response.redirectUrl,
+    connectionId: response.connectionId ?? undefined
+  };
+  const outcomes = await promptOAuthFlows([pending], log, {
+    skipPrompt: isNonInteractive
+  });
+  if (outcomes.get(integrationType) === "ACTIVE") {
+    return {
+      outroMessage: `${integrationType} authorized. Run 'base44 connectors pull' to fetch its config.`
+    };
+  }
+  return {
+    outroMessage: `${integrationType} initialized. Open the link above to finish authorizing, then run 'base44 connectors pull'.`
+  };
+}
+function getConnectorsInitiateCommand() {
+  return new Base44Command("initiate").description("Initialize a connector on an app and start its OAuth flow (works with --app-id, no local project required)").requiredOption("--integration-type <type>", "Integration type to initiate (e.g. googlecalendar, gmail, slack)").option("--scopes <scopes...>", "OAuth scopes to request (space- or comma-separated)").addHelpText("after", `
+Examples:
+  $ base44 connectors initiate --app-id app_123 --integration-type googlecalendar --scopes https://www.googleapis.com/auth/calendar
+  $ base44 connectors initiate --integration-type gmail --scopes scope.a,scope.b`).action(initiateAction);
+}
+
+// src/cli/commands/connectors/list-available.ts
+async function listAvailableAction({
+  log,
+  runTask: runTask2,
+  jsonMode
+}) {
+  const { integrations } = await runTask2("Fetching available integrations from Base44", async () => {
+    return await listAvailableIntegrations();
+  }, {
+    successMessage: "Available integrations fetched successfully",
+    errorMessage: "Failed to fetch available integrations"
+  });
+  if (jsonMode) {
+    return {
+      outroMessage: `Found ${integrations.length} available integrations.`,
+      stdout: `${JSON.stringify({ integrations }, null, 2)}
+`
+    };
+  }
+  if (integrations.length === 0) {
+    return { outroMessage: "No available integrations found." };
+  }
+  for (const { displayName, ...rest } of integrations) {
+    const yaml2 = formatYaml(rest);
+    const pad = " ".repeat(YAML_INDENT);
+    log.info(`${displayName}
+${pad}${yaml2.replace(/\n/g, `
+${pad}`)}`);
+  }
+  return {
+    outroMessage: `Found ${integrations.length} available integrations.`
+  };
+}
+function getConnectorsListAvailableCommand() {
+  return new Base44Command("list-available").description("List all available integration types").action(listAvailableAction);
+}
+
+// src/cli/commands/connectors/pull.ts
+import { dirname as dirname15, join as join19, resolve as resolve5 } from "node:path";
+async function resolveConnectorsDir(options) {
+  if (!getAppContext().projectRoot) {
+    return resolve5(options.dir ?? "connectors");
+  }
+  const { project: project2 } = await readProjectConfig();
+  return join19(dirname15(project2.configPath), project2.connectorsDir);
+}
+async function pullConnectorsAction({ log, runTask: runTask2, jsonMode }, options) {
+  const connectorsDir = await resolveConnectorsDir(options);
+  const remoteConnectors = await runTask2("Fetching connectors from Base44", async () => {
+    return await pullAllConnectors();
+  }, {
+    successMessage: "Connectors fetched successfully",
+    errorMessage: "Failed to fetch connectors"
+  });
+  const { written, deleted } = await runTask2("Syncing connector files", async () => {
+    return await writeConnectors(connectorsDir, remoteConnectors);
+  }, {
+    successMessage: "Connector files synced successfully",
+    errorMessage: "Failed to sync connector files"
+  });
+  if (jsonMode) {
+    return {
+      outroMessage: `Pulled ${remoteConnectors.length} connectors to ${connectorsDir}`,
+      stdout: `${JSON.stringify({ connectorsDir, pulled: remoteConnectors.length, written, deleted }, null, 2)}
+`
+    };
+  }
+  if (written.length > 0) {
+    log.success(`Written: ${written.join(", ")}`);
+  }
+  if (deleted.length > 0) {
+    log.warn(`Deleted: ${deleted.join(", ")}`);
+  }
+  if (written.length === 0 && deleted.length === 0) {
+    log.info("All connectors are already up to date");
+  }
+  return {
+    outroMessage: `Pulled ${remoteConnectors.length} connectors to ${connectorsDir}`
+  };
+}
+function getConnectorsPullCommand() {
+  return new Base44Command("pull").description("Pull connectors from Base44 to local files (replaces all local connector configs)").option("--dir <path>", "Directory to write connector files to (default: ./connectors when using --app-id)").action(pullConnectorsAction);
+}
+
 // src/cli/commands/connectors/push.ts
+import { resolve as resolve6 } from "node:path";
+async function readConnectorsToPush(options) {
+  if (!getAppContext().projectRoot) {
+    return readAllConnectors(resolve6(options.dir ?? "connectors"));
+  }
+  const { connectors } = await readProjectConfig();
+  return connectors;
+}
 function printSummary(results, oauthOutcomes, log) {
   const synced = [];
   const added = [];
@@ -252636,17 +252748,15 @@ function printSummary(results, oauthOutcomes, log) {
     log.error(`Failed: ${r.type} - ${r.error}`);
   }
 }
-async function pushConnectorsAction({
-  isNonInteractive,
-  log,
-  runTask: runTask2
-}) {
-  const { connectors } = await readProjectConfig();
-  if (connectors.length === 0) {
-    log.info("No local connectors found - checking for remote connectors to remove");
-  } else {
-    const connectorNames = connectors.map((c3) => c3.type).join(", ");
-    log.info(`Found ${connectors.length} connectors to push: ${connectorNames}`);
+async function pushConnectorsAction({ isNonInteractive, log, runTask: runTask2, jsonMode }, options) {
+  const connectors = await readConnectorsToPush(options);
+  if (!jsonMode) {
+    if (connectors.length === 0) {
+      log.info("No local connectors found - checking for remote connectors to remove");
+    } else {
+      const connectorNames = connectors.map((c3) => c3.type).join(", ");
+      log.info(`Found ${connectors.length} connectors to push: ${connectorNames}`);
+    }
   }
   const { results } = await runTask2("Pushing connectors to Base44", async () => {
     return await pushConnectors(connectors);
@@ -252660,16 +252770,23 @@ async function pushConnectorsAction({
   if (needsOAuth.length > 0 && !allAuthorized) {
     outroMessage = isNonInteractive ? "Skipped OAuth in non-interactive mode. Run 'base44 connectors push' locally or open the links above to authorize." : "Some connectors still require authorization. Run 'base44 connectors push' or open the links above to authorize.";
   }
+  if (jsonMode) {
+    return {
+      outroMessage,
+      stdout: `${JSON.stringify({ results, oauth: Object.fromEntries(oauthOutcomes) }, null, 2)}
+`
+    };
+  }
   printSummary(results, oauthOutcomes, log);
   return { outroMessage };
 }
 function getConnectorsPushCommand() {
-  return new Base44Command("push").description("Push local connectors to Base44 (overwrites connectors on Base44)").action(pushConnectorsAction);
+  return new Base44Command("push").description("Push local connectors to Base44 (overwrites connectors on Base44)").option("--dir <path>", "Directory to read connector files from (default: ./connectors when using --app-id)").action(pushConnectorsAction);
 }
 
 // src/cli/commands/connectors/index.ts
 function getConnectorsCommand() {
-  return new Command("connectors").description("Manage project connectors (OAuth integrations)").addCommand(getConnectorsListAvailableCommand()).addCommand(getConnectorsPullCommand()).addCommand(getConnectorsPushCommand());
+  return new Command("connectors").description("Manage project connectors (OAuth integrations)").addCommand(getConnectorsListAvailableCommand()).addCommand(getConnectorsInitiateCommand()).addCommand(getConnectorsPullCommand()).addCommand(getConnectorsPushCommand());
 }
 
 // src/cli/commands/dashboard/open.ts
@@ -252976,7 +253093,7 @@ function getFunctionsCommand() {
 }
 
 // src/cli/commands/project/create.ts
-import { basename as basename4, resolve as resolve5 } from "node:path";
+import { basename as basename4, resolve as resolve7 } from "node:path";
 var import_kebabCase = __toESM(require_kebabCase(), 1);
 
 // src/cli/commands/project/scaffold-shared.ts
@@ -253075,7 +253192,11 @@ function printProjectSummary({ name: name2, dashboardUrl, appUrl }, log) {
 }
 
 // src/cli/commands/project/create.ts
-function validateNonInteractiveFlags(command2) {
+function validateCreateOptions(command2) {
+  const { appId } = command2.optsWithGlobals();
+  if (appId !== undefined) {
+    command2.error(`base44 create cannot be used with --app-id or ${BASE44_APP_ID_ENV_VAR}.`);
+  }
   const { path: path17 } = command2.opts();
   if (path17 && !command2.args.length) {
     command2.error("--path requires a project name argument. Usage: base44 create <name> --path <path>");
@@ -253126,7 +253247,7 @@ async function createInteractive(options, ctx) {
   }, ctx);
 }
 async function createNonInteractive(options, ctx) {
-  ctx.log.info(`Creating a new project at ${resolve5(options.path)}`);
+  ctx.log.info(`Creating a new project at ${resolve7(options.path)}`);
   const template2 = await getTemplateById(options.template ?? DEFAULT_TEMPLATE_ID);
   return await executeCreate({
     template: template2,
@@ -253148,7 +253269,7 @@ async function executeCreate({
 }, ctx) {
   const { log, runTask: runTask2 } = ctx;
   const name2 = rawName.trim();
-  const resolvedPath = resolve5(projectPath);
+  const resolvedPath = resolve7(projectPath);
   const { projectId } = await runTask2("Setting up your project...", async () => {
     return await createProjectFiles({
       name: name2,
@@ -253192,7 +253313,7 @@ function getCreateCommand() {
 Examples:
   $ base44 create my-app                                         Creates a base44 project at ./my-app
   $ base44 create my-todo-app --template backend-and-client      Creates a base44 backend-and-client project at ./my-todo-app
-  $ base44 create my-app --path ./projects/my-app --deploy       Creates a base44 project at ./project/my-app and deploys it`).hook("preAction", validateNonInteractiveFlags).action(createAction);
+  $ base44 create my-app --path ./projects/my-app --deploy       Creates a base44 project at ./project/my-app and deploys it`).hook("preAction", validateCreateOptions).action(createAction);
 }
 
 // src/cli/commands/project/deploy.ts
@@ -253288,11 +253409,32 @@ function printStripeResult(r, log) {
   log.info(`  Connectors dashboard: ${theme.colors.links(getConnectorsUrl())}`);
 }
 
+// src/cli/commands/project/app-id-options.ts
+function readExplicitAppId(command2) {
+  const { appId } = command2.optsWithGlobals();
+  const { projectId } = command2.opts();
+  const explicitAppId = command2.getOptionValueSourceWithGlobals("appId") === "cli" ? appId : undefined;
+  const legacyProjectId = command2.getOptionValueSource("projectId") === "cli" ? projectId : undefined;
+  return {
+    appId: explicitAppId,
+    legacyProjectId,
+    value: explicitAppId ?? legacyProjectId
+  };
+}
+
 // src/cli/commands/project/link.ts
-function validateNonInteractiveFlags2(command2) {
-  const { create: create4, name: name2, projectId } = command2.opts();
-  if (create4 && projectId) {
-    command2.error("--create and --projectId cannot be used together");
+function validateNonInteractiveFlags(command2) {
+  const { create: create4, name: name2 } = command2.opts();
+  const {
+    appId,
+    legacyProjectId,
+    value: selectedAppId
+  } = readExplicitAppId(command2);
+  if (appId && legacyProjectId) {
+    command2.error("--app-id and --project-id cannot be used together");
+  }
+  if (create4 && selectedAppId) {
+    command2.error("--create and --app-id cannot be used together");
   }
   if (create4 && !name2) {
     command2.error("--name is required when using --create");
@@ -253361,11 +253503,12 @@ async function promptForExistingProject(linkableProjects) {
   }
   return selectedProject;
 }
-async function link(ctx, options) {
+async function link(ctx, options, command2) {
   const { log, runTask: runTask2, isNonInteractive } = ctx;
-  const skipPrompts = !!options.create || !!options.projectId;
+  const appId = readExplicitAppId(command2).value;
+  const skipPrompts = !!options.create || !!appId;
   if (!skipPrompts && isNonInteractive) {
-    throw new InvalidInputError("--create with --name, or --projectId, is required in non-interactive mode");
+    throw new InvalidInputError("--create with --name, or --app-id, is required in non-interactive mode");
   }
   const projectRoot = findProjectRoot();
   if (!projectRoot) {
@@ -253380,8 +253523,8 @@ async function link(ctx, options) {
       ]
     });
   }
-  let finalProjectId;
-  const action = options.projectId ? "choose" : options.create ? "create" : await promptForLinkAction();
+  let finalAppId;
+  const action = appId ? "choose" : options.create ? "create" : await promptForLinkAction();
   if (action === "choose") {
     const projects = await runTask2("Fetching projects...", async () => listProjects(), {
       successMessage: "Projects fetched",
@@ -253391,32 +253534,32 @@ async function link(ctx, options) {
     if (!linkableProjects.length) {
       return { outroMessage: "No projects available for linking" };
     }
-    let projectId;
-    if (options.projectId) {
-      const project2 = linkableProjects.find((p) => p.id === options.projectId);
+    let linkedAppId;
+    if (appId) {
+      const project2 = linkableProjects.find((p) => p.id === appId);
       if (!project2) {
-        throw new InvalidInputError(`Project with ID "${options.projectId}" not found or not available for linking.`, {
+        throw new InvalidInputError(`App with ID "${appId}" not found or not available for linking.`, {
           hints: [
-            { message: "Check the project ID is correct" },
+            { message: "Check the app ID is correct" },
             {
-              message: "Use 'base44 link' without --projectId to see available projects"
+              message: "Use 'base44 link' without --app-id to see available projects"
             }
           ]
         });
       }
-      projectId = options.projectId;
+      linkedAppId = appId;
     } else {
       const selectedProject = await promptForExistingProject(linkableProjects);
-      projectId = selectedProject.id;
+      linkedAppId = selectedProject.id;
     }
     await runTask2("Linking project...", async () => {
-      await writeAppConfig(projectRoot.root, projectId);
-      setAppContext({ id: projectId, projectRoot: projectRoot.root });
+      await writeAppConfig(projectRoot.root, linkedAppId);
+      setAppContext({ id: linkedAppId, projectRoot: projectRoot.root });
     }, {
       successMessage: "Project linked successfully",
       errorMessage: "Failed to link project"
     });
-    finalProjectId = projectId;
+    finalAppId = linkedAppId;
   }
   if (action === "create") {
     const { name: name2, description } = options.create ? { name: options.name.trim(), description: options.description?.trim() } : await promptForNewProjectDetails();
@@ -253428,13 +253571,15 @@ async function link(ctx, options) {
     });
     await writeAppConfig(projectRoot.root, projectId);
     setAppContext({ id: projectId, projectRoot: projectRoot.root });
-    finalProjectId = projectId;
+    finalAppId = projectId;
   }
-  log.message(`${theme.styles.header("Dashboard")}: ${theme.colors.links(getDashboardUrl(finalProjectId))}`);
+  log.message(`${theme.styles.header("Dashboard")}: ${theme.colors.links(getDashboardUrl(finalAppId))}`);
   return { outroMessage: "Project linked" };
 }
 function getLinkCommand() {
-  return new Base44Command("link", { requireAppContext: false }).description("Link a local project to a Base44 project (create new or link existing)").option("-c, --create", "Create a new project (skip selection prompt)").option("-n, --name <name>", "Project name (required when --create is used)").option("-d, --description <description>", "Project description").option("-p, --projectId <id>", "Project ID to link to an existing project (skips selection prompt)").hook("preAction", validateNonInteractiveFlags2).action(link);
+  return new Base44Command("link", {
+    requireAppContext: false
+  }).description("Link a local project to a Base44 project (create new or link existing)").configureHelp({ showGlobalOptions: true }).option("-c, --create", "Create a new project (skip selection prompt)").option("-n, --name <name>", "Project name (required when --create is used)").option("-d, --description <description>", "Project description").addOption(new Option("-p, --project-id <id>", "Project ID to link to an existing project").hideHelp()).addOption(new Option("--projectId <id>", "Project ID to link to an existing project").hideHelp()).hook("preAction", validateNonInteractiveFlags).action(link);
 }
 
 // src/cli/commands/project/logs.ts
@@ -253524,8 +253669,12 @@ async function fetchLogsForFunctions(functionNames, options, availableFunctionNa
   }
   return allEntries;
 }
-async function getAllFunctionNames() {
-  const { functions } = await readProjectConfig();
+async function getProjectFunctionNames(projectRoot) {
+  const { functions } = await readProjectConfig(projectRoot);
+  return functions.map((fn) => fn.name);
+}
+async function getRemoteFunctionNames() {
+  const { functions } = await listDeployedFunctions();
   return functions.map((fn) => fn.name);
 }
 function validateLimit(limit) {
@@ -253536,15 +253685,18 @@ function validateLimit(limit) {
     throw new InvalidInputError(`Invalid limit: "${limit}". Must be a number between 1 and 1000.`);
   }
 }
-async function logsAction(_ctx, options) {
+async function logsAction(ctx, options) {
   validateLimit(options.limit);
   const specifiedFunctions = parseFunctionNames(options.function);
-  const allProjectFunctions = await getAllFunctionNames();
-  const functionNames = specifiedFunctions.length > 0 ? specifiedFunctions : allProjectFunctions;
+  const localProjectRoot = ctx.app?.projectRoot;
+  const availableFunctionNames = localProjectRoot ? await getProjectFunctionNames(localProjectRoot) : await getRemoteFunctionNames();
+  const functionNames = specifiedFunctions.length > 0 ? specifiedFunctions : availableFunctionNames;
   if (functionNames.length === 0) {
-    return { outroMessage: "No functions found in this project." };
+    return {
+      outroMessage: localProjectRoot ? "No functions found in this project." : "No functions found in this app."
+    };
   }
-  let entries = await fetchLogsForFunctions(functionNames, options, allProjectFunctions);
+  let entries = await fetchLogsForFunctions(functionNames, options, availableFunctionNames);
   const limit = options.limit ? Number.parseInt(options.limit, 10) : undefined;
   if (limit !== undefined && entries.length > limit) {
     entries = entries.slice(0, limit);
@@ -253558,20 +253710,23 @@ function getLogsCommand() {
 }
 
 // src/cli/commands/project/scaffold.ts
-import { basename as basename5, resolve as resolve6 } from "node:path";
+import { basename as basename5, resolve as resolve8 } from "node:path";
 function resolveAppId(options) {
-  const appId = options.appId ?? process.env.BASE44_APP_ID;
+  const appId = options.appId;
   if (!appId) {
     throw new InvalidInputError("No app ID found. `base44 scaffold` sets up a local project for an existing Base44 app.", {
-      hints: [{ message: "Pass it explicitly with --app-id <id>" }]
+      hints: [
+        { message: "Pass it explicitly with --app-id <id>" },
+        { message: `Set ${BASE44_APP_ID_ENV_VAR} in your environment` }
+      ]
     });
   }
   return appId;
 }
-async function scaffoldAction(ctx, name2, options) {
+async function scaffoldAction(ctx, name2, options, command2) {
   const { log, runTask: runTask2 } = ctx;
-  const appId = resolveAppId(options);
-  const resolvedPath = resolve6("./");
+  const appId = resolveAppId(command2.optsWithGlobals());
+  const resolvedPath = resolve8("./");
   const projectName = (name2 ?? basename5(resolvedPath)).trim();
   const template2 = await getTemplateById("backend-only");
   log.info(`Scaffolding project at ${resolvedPath}`);
@@ -253602,7 +253757,7 @@ function getScaffoldCommand() {
   return new Base44Command("scaffold", {
     requireAppContext: false,
     fullBanner: true
-  }).description("Scaffold a local project for an existing Base44 app").addArgument(new Argument("name", "Project name").argOptional()).option("--app-id <id>", "Existing Base44 app ID").option("--no-skills", "Skip AI agent skills installation").addHelpText("after", `
+  }).description("Scaffold a local project for an existing Base44 app").addArgument(new Argument("name", "Project name").argOptional()).option("--no-skills", "Skip AI agent skills installation").addHelpText("after", `
 Examples:
   $ base44 scaffold --app-id app_123         Scaffolds the current dir for the given app
   $ base44 scaffold my-app --app-id app_123  Scaffolds the current dir, named "my-app"`).action(scaffoldAction);
@@ -253695,13 +253850,42 @@ var ReleaseResponseSchema = exports_external.object({
 }));
 
 // src/core/resources/sandbox/api.ts
+function isMissingSandboxScope(error48) {
+  if (error48.statusCode !== 401 && error48.statusCode !== 403) {
+    return false;
+  }
+  const text = `${error48.message} ${JSON.stringify(error48.responseBody ?? "")}`;
+  return /sandbox:write/i.test(text) || /granting sandbox access/i.test(text);
+}
+function withSandboxAuthHint(error48) {
+  if (!isMissingSandboxScope(error48)) {
+    return error48;
+  }
+  return new ApiError(error48.message, {
+    statusCode: error48.statusCode,
+    requestUrl: error48.requestUrl,
+    requestMethod: error48.requestMethod,
+    requestBody: error48.requestBody,
+    responseBody: error48.responseBody,
+    requestId: error48.requestId,
+    details: error48.details,
+    hints: [
+      ...error48.hints,
+      {
+        message: "Run 'base44 login' again to grant sandbox access (the sandbox:write scope is only granted at login).",
+        command: "base44 login"
+      }
+    ],
+    cause: error48
+  });
+}
 async function callTool(appId, tool, payload, schema10, context, timeout2 = 60000) {
   const client = getSandboxClient(appId);
   let response;
   try {
     response = await client.post(tool, { json: payload, timeout: timeout2 });
   } catch (error48) {
-    throw await ApiError.fromHttpError(error48, context);
+    throw withSandboxAuthHint(await ApiError.fromHttpError(error48, context));
   }
   const result = schema10.safeParse(await response.json());
   if (!result.success) {
@@ -253732,23 +253916,6 @@ function releaseSession(appId) {
 }
 
 // src/cli/commands/sandbox/shared.ts
-async function resolveAppId2(options) {
-  const explicit = options.appId ?? process.env.BASE44_APP_ID;
-  if (explicit) {
-    return explicit;
-  }
-  try {
-    const { id } = await initAppContext();
-    return id;
-  } catch {
-    throw new InvalidInputError("No app ID found. Sandbox commands operate on a remote app.", {
-      hints: [
-        { message: "Pass it explicitly with --app-id <id>" },
-        { message: "Or run from a linked Base44 project directory" }
-      ]
-    });
-  }
-}
 async function resolveFlagOrStdin(flagValue, flagName) {
   if (flagValue !== undefined) {
     return flagValue;
@@ -253793,7 +253960,7 @@ function parseEdits(raw2) {
   return result.data;
 }
 async function editFileAction({ runTask: runTask2 }, path17, options) {
-  const appId = await resolveAppId2(options);
+  const { id: appId } = getAppContext();
   const raw2 = await resolveFlagOrStdin(options.editsJson, "--edits-json");
   const edits = parseEdits(raw2);
   const result = await runTask2(options.dryRun ? "Previewing edit" : "Editing file", () => editFile(appId, { path: path17, edits, dry_run: options.dryRun }));
@@ -253803,7 +253970,7 @@ async function editFileAction({ runTask: runTask2 }, path17, options) {
   };
 }
 function getSandboxEditFileCommand() {
-  return new Base44Command("edit-file", { requireAppContext: false }).description("Apply exact old→new string edits to a file in the sandbox").argument("<path>", "File path relative to the app root").option("--edits-json <json>", "JSON array of edits (if omitted, read from stdin)").option("--dry-run", "Return the unified diff without writing").option("--app-id <id>", "Target app ID (defaults to the current app)").addHelpText("after", `
+  return new Base44Command("edit-file").description("Apply exact old→new string edits to a file in the sandbox").argument("<path>", "File path relative to the app root").option("--edits-json <json>", "JSON array of edits (if omitted, read from stdin)").option("--dry-run", "Return the unified diff without writing").addHelpText("after", `
 Each edit is { "old_text": "...", "new_text": "...", "replace_all"?: true }.
 
 Examples:
@@ -253813,7 +253980,7 @@ Examples:
 
 // src/cli/commands/sandbox/grep.ts
 async function grepAction({ runTask: runTask2 }, pattern, options) {
-  const appId = await resolveAppId2(options);
+  const { id: appId } = getAppContext();
   const maxResults = parsePositiveInt(options.maxResults, "--max-results");
   const result = await runTask2("Searching files", () => grep(appId, {
     pattern,
@@ -253826,12 +253993,12 @@ async function grepAction({ runTask: runTask2 }, pattern, options) {
   return { outroMessage: "Searched files", stdout: toJsonStdout(result) };
 }
 function getSandboxGrepCommand() {
-  return new Base44Command("grep", { requireAppContext: false }).description("Search files for a pattern in an app's remote sandbox").argument("<pattern>", "Search pattern").option("--path <path>", "Subtree to search, relative to the app root").option("--no-regex", "Treat the pattern as a literal string, not a regex").option("--case-sensitive", "Case-sensitive match").option("--glob <glob>", 'File glob filter, e.g. "*.tsx"').option("--max-results <n>", "Maximum number of match lines to return").option("--app-id <id>", "Target app ID (defaults to the current app)").action(grepAction);
+  return new Base44Command("grep").description("Search files for a pattern in an app's remote sandbox").argument("<pattern>", "Search pattern").option("--path <path>", "Subtree to search, relative to the app root").option("--no-regex", "Treat the pattern as a literal string, not a regex").option("--case-sensitive", "Case-sensitive match").option("--glob <glob>", 'File glob filter, e.g. "*.tsx"').option("--max-results <n>", "Maximum number of match lines to return").action(grepAction);
 }
 
 // src/cli/commands/sandbox/list-directory.ts
 async function listDirectoryAction({ runTask: runTask2 }, path17, options) {
-  const appId = await resolveAppId2(options);
+  const { id: appId } = getAppContext();
   const maxDepth = parsePositiveInt(options.maxDepth, "--max-depth");
   const result = await runTask2("Listing directory", () => listDirectory(appId, {
     path: path17,
@@ -253842,24 +254009,26 @@ async function listDirectoryAction({ runTask: runTask2 }, path17, options) {
   return { outroMessage: "Listed directory", stdout: toJsonStdout(result) };
 }
 function getSandboxListDirectoryCommand() {
-  return new Base44Command("list-directory", { requireAppContext: false }).description("List directory entries in an app's remote sandbox").argument("[path]", "Directory relative to the app root (default: app root)").option("--recursive", "List nested entries").option("--max-depth <n>", "Max depth when recursive (1-10, default 3)").option("--include-hidden", "Include dotfiles").option("--app-id <id>", "Target app ID (defaults to the current app)").action(listDirectoryAction);
+  return new Base44Command("list-directory").description("List directory entries in an app's remote sandbox").argument("[path]", "Directory relative to the app root (default: app root)").option("--recursive", "List nested entries").option("--max-depth <n>", "Max depth when recursive (1-10, default 3)").option("--include-hidden", "Include dotfiles").action(listDirectoryAction);
 }
 
 // src/cli/commands/sandbox/read-file.ts
 async function readFileAction({ runTask: runTask2 }, paths, options) {
-  const appId = await resolveAppId2(options);
+  const { id: appId } = getAppContext();
   const offset = parsePositiveInt(options.offset, "--offset");
   const limit = parsePositiveInt(options.limit, "--limit");
   const result = await runTask2("Reading file", () => readFile2(appId, { paths, offset, limit }));
   return { outroMessage: "Read file", stdout: toJsonStdout(result) };
 }
 function getSandboxReadFileCommand() {
-  return new Base44Command("read-file", { requireAppContext: false }).description("Read file contents from an app's remote sandbox").argument("<paths...>", "One or more file paths relative to the app root").option("--offset <n>", "1-based start line").option("--limit <n>", "Max lines to return from offset").option("--app-id <id>", "Target app ID (defaults to the current app)").action(readFileAction);
+  return new Base44Command("read-file").description("Read file contents from an app's remote sandbox").argument("<paths...>", "One or more file paths relative to the app root").option("--offset <n>", "1-based start line").option("--limit <n>", "Max lines to return from offset").action(readFileAction);
 }
 
 // src/cli/commands/sandbox/release.ts
-async function releaseAction({ runTask: runTask2 }, options) {
-  const appId = await resolveAppId2(options);
+async function releaseAction({
+  runTask: runTask2
+}) {
+  const { id: appId } = getAppContext();
   const result = await runTask2("Releasing sandbox session", () => releaseSession(appId));
   return {
     outroMessage: "Released sandbox session",
@@ -253867,19 +254036,19 @@ async function releaseAction({ runTask: runTask2 }, options) {
   };
 }
 function getSandboxReleaseCommand() {
-  return new Base44Command("release", { requireAppContext: false }).description("Release the external-agent session so the in-app builder can resume").option("--app-id <id>", "Target app ID (defaults to the current app)").action(releaseAction);
+  return new Base44Command("release").description("Release the external-agent session so the in-app builder can resume").action(releaseAction);
 }
 
 // src/cli/commands/sandbox/run-command.ts
 async function runCommandAction({ runTask: runTask2 }, commandParts, options) {
-  const appId = await resolveAppId2(options);
+  const { id: appId } = getAppContext();
   const timeoutMs = parsePositiveInt(options.timeoutMs, "--timeout-ms");
   const command2 = commandParts.join(" ");
   const result = await runTask2("Running command", () => runCommand(appId, { command: command2, cwd: options.cwd, timeout_ms: timeoutMs }));
   return { outroMessage: "Ran command", stdout: toJsonStdout(result) };
 }
 function getSandboxRunCommandCommand() {
-  return new Base44Command("run-command", { requireAppContext: false }).description("Run a shell command in an app's remote sandbox").argument("<command...>", "Shell command to execute (quote to keep as one)").option("--cwd <path>", "Working directory relative to the app root").option("--timeout-ms <n>", "Timeout in milliseconds (default 120000, max 600000)").option("--app-id <id>", "Target app ID (defaults to the current app)").addHelpText("after", `
+  return new Base44Command("run-command").description("Run a shell command in an app's remote sandbox").argument("<command...>", "Shell command to execute (quote to keep as one)").option("--cwd <path>", "Working directory relative to the app root").option("--timeout-ms <n>", "Timeout in milliseconds (default 120000, max 600000)").addHelpText("after", `
 Examples:
   $ base44 sandbox run-command "npm test"
   $ base44 sandbox run-command ls -la --cwd src`).action(runCommandAction);
@@ -253887,13 +254056,13 @@ Examples:
 
 // src/cli/commands/sandbox/write-file.ts
 async function writeFileAction({ runTask: runTask2 }, path17, options) {
-  const appId = await resolveAppId2(options);
+  const { id: appId } = getAppContext();
   const content = await resolveFlagOrStdin(options.content, "--content");
   const result = await runTask2("Writing file", () => writeFile2(appId, { path: path17, content, overwrite: options.overwrite }));
   return { outroMessage: "Wrote file", stdout: toJsonStdout(result) };
 }
 function getSandboxWriteFileCommand() {
-  return new Base44Command("write-file", { requireAppContext: false }).description("Create or overwrite a file in an app's remote sandbox").argument("<path>", "File path relative to the app root").option("--content <content>", "File content (if omitted, read from stdin)").option("--overwrite", "Overwrite the file if it already exists").option("--app-id <id>", "Target app ID (defaults to the current app)").addHelpText("after", `
+  return new Base44Command("write-file").description("Create or overwrite a file in an app's remote sandbox").argument("<path>", "File path relative to the app root").option("--content <content>", "File content (if omitted, read from stdin)").option("--overwrite", "Overwrite the file if it already exists").addHelpText("after", `
 Examples:
   $ echo "hello" | base44 sandbox write-file notes.txt
   $ base44 sandbox write-file notes.txt --content "hello" --overwrite`).action(writeFileAction);
@@ -253947,7 +254116,7 @@ function getSecretsListCommand() {
 }
 
 // src/cli/commands/secrets/set.ts
-import { resolve as resolve7 } from "node:path";
+import { resolve as resolve9 } from "node:path";
 function parseEntries(entries) {
   const secrets = {};
   for (const entry of entries) {
@@ -253978,7 +254147,7 @@ async function setSecretsAction({ log, runTask: runTask2 }, entries, options) {
   validateInput(entries, options);
   let secrets;
   if (options.envFile) {
-    secrets = await parseEnvFile(resolve7(options.envFile));
+    secrets = await parseEnvFile(resolve9(options.envFile));
     if (Object.keys(secrets).length === 0) {
       throw new InvalidInputError("The env file contains no valid KEY=VALUE entries.");
     }
@@ -254007,7 +254176,7 @@ function getSecretsCommand() {
 }
 
 // src/cli/commands/site/deploy.ts
-import { resolve as resolve8 } from "node:path";
+import { resolve as resolve10 } from "node:path";
 async function deployAction2({ isNonInteractive, runTask: runTask2 }, options) {
   if (isNonInteractive && !options.yes) {
     throw new InvalidInputError("--yes is required in non-interactive mode");
@@ -254022,7 +254191,7 @@ async function deployAction2({ isNonInteractive, runTask: runTask2 }, options) {
       ]
     });
   }
-  const outputDir = resolve8(project2.root, project2.site.outputDirectory);
+  const outputDir = resolve10(project2.root, project2.site.outputDirectory);
   if (!options.yes) {
     const shouldDeploy = await Re({
       message: `Deploy site from ${project2.site.outputDirectory}?`
@@ -254198,10 +254367,6 @@ function getTypesCommand() {
   return new Command("types").description("Manage TypeScript type generation").addCommand(getTypesGenerateCommand());
 }
 
-// src/cli/commands/dev.ts
-import { join as join28 } from "node:path";
-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);
@@ -254232,14 +254397,14 @@ var getLocalHosts = () => {
   }
   return results;
 };
-var checkAvailablePort = (options8) => new Promise((resolve10, reject) => {
+var checkAvailablePort = (options8) => new Promise((resolve12, reject) => {
   const server = net.createServer();
   server.unref();
   server.on("error", reject);
   server.listen(options8, () => {
     const { port } = server.address();
     server.close(() => {
-      resolve10(port);
+      resolve12(port);
     });
   });
 });
@@ -254357,12 +254522,11 @@ var stringify = (item) => {
     return String(item);
   }
 };
-function createDevLogger() {
+function createDevLogger(label2, labelColor = theme.styles.dim) {
+  const prefix = label2 ? `${labelColor(`[${label2}]`)} ` : "";
   const print = (type, ...args) => {
     const colorize = colorByType[type];
-    console[type](...args.map((item) => {
-      return colorize(stringify(item));
-    }));
+    console[type](prefix + args.map((item) => colorize(stringify(item))).join(" "));
   };
   return {
     log: (...args) => print("log", ...args),
@@ -254499,7 +254663,7 @@ class FunctionManager {
     });
   }
   waitForReady(name2, runningFunc) {
-    return new Promise((resolve10, reject) => {
+    return new Promise((resolve12, reject) => {
       runningFunc.process.on("exit", (code2) => {
         if (!runningFunc.ready) {
           clearTimeout(timeout3);
@@ -254522,7 +254686,7 @@ class FunctionManager {
           runningFunc.ready = true;
           clearTimeout(timeout3);
           runningFunc.process.stdout?.off("data", onData);
-          resolve10(runningFunc.port);
+          resolve12(runningFunc.port);
         }
       };
       runningFunc.process.stdout?.on("data", onData);
@@ -255729,6 +255893,109 @@ function createCustomIntegrationRoutes(remoteProxy, logger2) {
   return router;
 }
 
+// src/cli/dev/dev-server/serve-runner.ts
+import { spawn as spawn3 } from "node:child_process";
+import process21 from "node:process";
+
+class ServeRunner {
+  command;
+  cwd;
+  env;
+  logger;
+  child;
+  stopping = false;
+  stopPromise;
+  exitListeners = [];
+  constructor(options8) {
+    this.command = options8.command;
+    this.cwd = options8.cwd;
+    this.env = options8.env;
+    this.logger = options8.logger;
+  }
+  start() {
+    if (this.child) {
+      return;
+    }
+    const stdin2 = process21.platform === "win32" ? "ignore" : "inherit";
+    const child = spawn3(this.command, {
+      cwd: this.cwd,
+      shell: true,
+      detached: process21.platform !== "win32",
+      env: { ...process21.env, ...this.env },
+      stdio: [stdin2, "pipe", "pipe"],
+      windowsHide: true
+    });
+    this.child = child;
+    this.setupHandlers(child);
+  }
+  onExit(listener) {
+    this.exitListeners.push(listener);
+  }
+  async stop() {
+    if (this.stopPromise) {
+      return this.stopPromise;
+    }
+    this.stopPromise = this.stopChild();
+    return this.stopPromise;
+  }
+  async stopChild() {
+    const child = this.child;
+    if (!child || child.exitCode !== null) {
+      return;
+    }
+    this.stopping = true;
+    const exited = new Promise((resolve12) => child.once("exit", () => resolve12()));
+    if (process21.platform === "win32" && child.pid) {
+      const taskkill = spawn3("taskkill", ["/pid", String(child.pid), "/T", "/F"], {
+        stdio: "ignore",
+        windowsHide: true
+      });
+      await new Promise((resolve12) => {
+        taskkill.once("exit", () => resolve12());
+        taskkill.once("error", () => resolve12());
+      });
+    } else if (child.pid) {
+      try {
+        process21.kill(-child.pid, "SIGTERM");
+      } catch {
+        child.kill();
+      }
+    }
+    await exited;
+  }
+  setupHandlers(child) {
+    child.stdout?.on("data", (data) => this.emitLines(data, "log"));
+    child.stderr?.on("data", (data) => this.emitLines(data, "error"));
+    child.on("error", (error48) => {
+      this.logger.error("Frontend dev server failed to start:", error48);
+      this.notifyExit(null);
+    });
+    child.on("exit", (code2) => {
+      if (this.stopping) {
+        return;
+      }
+      this.logger.error(`Frontend dev server exited with code ${code2}`);
+      this.notifyExit(code2);
+    });
+  }
+  notifyExit(code2) {
+    for (const listener of this.exitListeners) {
+      listener(code2);
+    }
+  }
+  emitLines(data, type) {
+    const lines = data.toString().trimEnd().split(`
+`);
+    for (const line3 of lines) {
+      if (type === "error") {
+        this.logger.error(line3);
+      } else {
+        this.logger.log(line3);
+      }
+    }
+  }
+}
+
 // src/cli/dev/dev-server/watcher.ts
 import { EventEmitter as EventEmitter4 } from "node:events";
 import { relative as relative6 } from "node:path";
@@ -256579,7 +256846,7 @@ class NodeFsHandler {
         this._addToNodeFs(path19, initialAdd, wh2, depth + 1);
       }
     }).on(EV.ERROR, this._boundHandleError);
-    return new Promise((resolve11, reject) => {
+    return new Promise((resolve13, reject) => {
       if (!stream)
         return reject();
       stream.once(STR_END, () => {
@@ -256588,7 +256855,7 @@ class NodeFsHandler {
           return;
         }
         const wasThrottled = throttler ? throttler.clear() : false;
-        resolve11(undefined);
+        resolve13(undefined);
         previous.getChildren().filter((item) => {
           return item !== directory && !current.has(item);
         }).forEach((item) => {
@@ -257434,7 +257701,7 @@ async function createDevServer(options8) {
     port: process.env.IS_TEST === "true" ? undefined : DEFAULT_PORT
   });
   const baseUrl = `http://localhost:${port}`;
-  const { functions, entities, project: project2 } = await options8.loadResources();
+  const { functions, entities, project: project2, siteUrl } = await options8.loadResources();
   const app = import_express6.default();
   const remoteProxy = import_http_proxy_middleware2.createProxyMiddleware({
     target: BASE44_APP_URL,
@@ -257452,17 +257719,17 @@ async function createDevServer(options8) {
     }
     next();
   });
-  const devLogger = createDevLogger();
+  const devLogger = createDevLogger("backend", theme.styles.info);
   const functionManager = new FunctionManager(functions, devLogger, options8.denoWrapperPath);
   const functionRoutes = createFunctionRouter(functionManager, devLogger);
   app.use("/api/apps/:appId/functions", functionRoutes);
   if (functionManager.getFunctionNames().length > 0) {
-    options8.log.info(`Loaded functions: ${functionManager.getFunctionNames().join(", ")}`);
+    devLogger.log(`Loaded functions: ${functionManager.getFunctionNames().join(", ")}`);
   }
   const db2 = new Database;
   await db2.load(entities);
   if (db2.getCollectionNames().length > 0) {
-    options8.log.info(`Loaded entities: ${db2.getCollectionNames().join(", ")}`);
+    devLogger.log(`Loaded entities: ${db2.getCollectionNames().join(", ")}`);
   }
   let emitEntityEvent = () => {};
   const entityRoutes = await createEntityRoutes(db2, devLogger, (...args) => emitEntityEvent(...args));
@@ -257494,12 +257761,18 @@ async function createDevServer(options8) {
   const customIntegrationRoutes = createCustomIntegrationRoutes(remoteProxy, devLogger);
   app.use("/api/apps/:appId/integrations/custom", customIntegrationRoutes);
   app.use((req, res, next) => {
+    if (siteUrl && (req.path === "/login" || req.path.startsWith("/login/"))) {
+      const targetUrl = new URL(req.originalUrl, siteUrl);
+      devLogger.warn(`"${req.originalUrl}" requires hosted login, redirecting to ${targetUrl.toString()}`);
+      res.redirect(targetUrl.toString());
+      return;
+    }
     if (!req.originalUrl.endsWith("analytics/track/batch")) {
       devLogger.warn(`"${req.originalUrl}" is not supported in local development, passing call to production`);
     }
     remoteProxy(req, res, next);
   });
-  const server = await new Promise((resolve12, reject) => {
+  const server = await new Promise((resolve14, reject) => {
     const s5 = app.listen(port, "127.0.0.1", (err) => {
       if (err) {
         if ("code" in err && err.code === "EADDRINUSE") {
@@ -257508,7 +257781,7 @@ async function createDevServer(options8) {
           reject(err);
         }
       } else {
-        resolve12(s5);
+        resolve14(s5);
       }
     });
   });
@@ -257550,59 +257823,101 @@ async function createDevServer(options8) {
     }
   });
   await base44ConfigWatcher.start();
-  const shutdown = async () => {
+  const serveCommand = project2.site?.serveCommand;
+  let serveRunner;
+  if (options8.appId && serveCommand) {
+    serveRunner = new ServeRunner({
+      command: serveCommand,
+      cwd: project2.root,
+      env: {
+        VITE_BASE44_APP_ID: options8.appId,
+        VITE_BASE44_APP_BASE_URL: baseUrl
+      },
+      logger: createDevLogger("frontend", theme.colors.base44Orange)
+    });
+  }
+  const handleShutdownError = (error48) => {
+    const errorMessage = error48 instanceof Error ? error48.message : String(error48);
+    devLogger.error(`Failed to shut down dev server: ${errorMessage}`);
+  };
+  const closeServerIfRunning = async () => {
+    if (!server.listening) {
+      return;
+    }
+    await new Promise((resolve14, reject) => {
+      server.close((error48) => {
+        if (error48) {
+          reject(error48);
+          return;
+        }
+        resolve14();
+      });
+    });
+  };
+  const runShutdown = async () => {
     base44ConfigWatcher.close();
-    io6.close();
+    await io6.close();
     await functionManager.stopAll();
-    server.close();
+    await serveRunner?.stop();
+    await closeServerIfRunning();
+  };
+  let shutdownPromise;
+  const shutdown = () => {
+    shutdownPromise ??= runShutdown().catch(handleShutdownError);
+    return shutdownPromise;
   };
   process.on("SIGINT", shutdown);
   process.on("SIGTERM", shutdown);
-  return { port, server };
+  serveRunner?.onExit(() => {
+    shutdown().finally(() => process.exit(1));
+  });
+  if (serveRunner) {
+    devLogger.log(`Backend running on ${baseUrl}`);
+    serveRunner.start();
+  }
+  return { port, server, isServingFrontend: serveRunner !== undefined };
 }
 
 // src/cli/commands/dev.ts
 function localServerUrl(port) {
   return `http://localhost:${port}`;
 }
-async function writeEnvLocalIfMissing(projectRoot, port, log) {
-  const envLocalPath = join28(projectRoot, ".env.local");
-  if (await pathExists(envLocalPath)) {
-    return;
+function validateDevOptions(command2) {
+  const { appId } = command2.optsWithGlobals();
+  if (appId !== undefined) {
+    command2.error(`base44 dev cannot be used with --app-id or ${BASE44_APP_ID_ENV_VAR}.`);
   }
-  const { id: appId } = await initAppContext();
-  await writeFile(envLocalPath, `VITE_BASE44_APP_ID=${appId}
-VITE_BASE44_APP_BASE_URL=${localServerUrl(port)}
-`);
-  log.info("Created .env.local with app ID and dev server URL");
 }
-async function devAction({ log }, options8) {
+async function devAction(ctx, options8) {
+  const { log, app } = ctx;
+  if (!app?.projectRoot) {
+    throw new ConfigInvalidError("base44 dev requires a linked local project. Run it from a project with base44/.app.jsonc.");
+  }
   const port = options8.port ? Number(options8.port) : undefined;
-  let projectRoot;
-  const { port: resolvedPort } = await createDevServer({
+  const appId = app.id;
+  const siteUrlPromise = getSiteUrl().catch(() => {
+    return;
+  });
+  const { port: resolvedPort, isServingFrontend } = await createDevServer({
     log,
     port,
-    cwd: process21.cwd(),
+    appId,
     denoWrapperPath: getDenoWrapperPath(),
     loadResources: async () => {
       const { functions, entities, project: project2 } = await readProjectConfig();
-      projectRoot = project2.root;
-      return { functions, entities, project: project2 };
+      const siteUrl = await siteUrlPromise;
+      return { functions, entities, project: project2, siteUrl };
     }
   });
-  if (projectRoot) {
-    await writeEnvLocalIfMissing(projectRoot, resolvedPort, log);
-  }
-  return {
-    outroMessage: `Dev server is available at ${theme.colors.links(localServerUrl(resolvedPort))}`
-  };
+  const outroMessage = isServingFrontend ? "Open your app using the frontend dev server URL" : `Dev server is available at ${theme.colors.links(localServerUrl(resolvedPort))}`;
+  return { outroMessage };
 }
 function getDevCommand() {
-  return new Base44Command("dev").description("Start the development server").option("-p, --port <number>", "Port for the development server").action(devAction);
+  return new Base44Command("dev").description("Start the development server").option("-p, --port <number>", "Port for the development server").hook("preAction", validateDevOptions).action(devAction);
 }
 
 // src/core/exec/run-script.ts
-import { spawn as spawn3 } from "node:child_process";
+import { spawn as spawn4 } from "node:child_process";
 import { copyFileSync, writeFileSync as writeFileSync2 } from "node:fs";
 async function runScript(options8) {
   const { appId, code: code2 } = options8;
@@ -257621,7 +257936,7 @@ async function runScript(options8) {
   copyFileSync(getExecWrapperPath(), tempWrapper.path);
   try {
     const exitCode = await new Promise((resolvePromise) => {
-      const child = spawn3("deno", ["run", "--allow-all", "--node-modules-dir=auto", tempWrapper.path], {
+      const child = spawn4("deno", ["run", "--allow-all", "--node-modules-dir=auto", tempWrapper.path], {
         env: {
           ...process.env,
           SCRIPT_PATH: scriptPath,
@@ -257644,17 +257959,20 @@ async function runScript(options8) {
 }
 // src/cli/commands/exec.ts
 function readStdin2() {
-  return new Promise((resolve12, reject) => {
+  return new Promise((resolve14, reject) => {
     let data = "";
     process.stdin.setEncoding("utf-8");
     process.stdin.on("data", (chunk) => {
       data += chunk;
     });
-    process.stdin.on("end", () => resolve12(data));
+    process.stdin.on("end", () => resolve14(data));
     process.stdin.on("error", reject);
   });
 }
-async function execAction(isNonInteractive) {
+async function execAction({
+  app,
+  isNonInteractive
+}) {
   const noInputError = new InvalidInputError("No input provided. Pipe a script to stdin.", {
     hints: [
       { message: "File:  cat ./script.ts | base44 exec" },
@@ -257670,7 +257988,7 @@ async function execAction(isNonInteractive) {
   if (!code2.trim()) {
     throw noInputError;
   }
-  const { exitCode } = await runScript({ appId: getAppContext().id, code: code2 });
+  const { exitCode } = await runScript({ appId: app.id, code: code2 });
   if (exitCode !== 0) {
     process.exitCode = exitCode;
   }
@@ -257683,18 +258001,26 @@ Examples:
     $ cat ./script.ts | base44 exec
 
   Inline script:
-    $ echo "const users = await base44.entities.User.list()" | base44 exec`).action(async ({ isNonInteractive }) => {
-    return await execAction(isNonInteractive);
+    $ echo "const users = await base44.entities.User.list()" | base44 exec`).action(async (ctx) => {
+    return await execAction(ctx);
   });
 }
 
 // src/cli/commands/project/eject.ts
-import { resolve as resolve12 } from "node:path";
+import { resolve as resolve14 } from "node:path";
 var import_kebabCase2 = __toESM(require_kebabCase(), 1);
-async function eject(ctx, options8) {
+async function eject(ctx, options8, command2) {
   const { log, runTask: runTask2, isNonInteractive } = ctx;
-  if (isNonInteractive && !options8.projectId) {
-    throw new InvalidInputError("--project-id is required in non-interactive mode");
+  const {
+    appId,
+    legacyProjectId,
+    value: selectedAppId
+  } = readExplicitAppId(command2);
+  if (appId && legacyProjectId) {
+    throw new InvalidInputError("--app-id and --project-id cannot be used together");
+  }
+  if (isNonInteractive && !selectedAppId) {
+    throw new InvalidInputError("--app-id is required in non-interactive mode");
   }
   if (isNonInteractive && !options8.path) {
     throw new InvalidInputError("--path is required in non-interactive mode");
@@ -257702,13 +258028,13 @@ async function eject(ctx, options8) {
   const projects = await listProjects();
   const ejectableProjects = projects.filter((p4) => p4.isManagedSourceCode !== false);
   let selectedProject;
-  if (options8.projectId) {
-    const foundProject = ejectableProjects.find((p4) => p4.id === options8.projectId);
+  if (selectedAppId) {
+    const foundProject = ejectableProjects.find((p4) => p4.id === selectedAppId);
     if (!foundProject) {
-      throw new InvalidInputError(`Project with ID "${options8.projectId}" not found or not ejectable`, {
+      throw new InvalidInputError(`App with ID "${selectedAppId}" not found or not ejectable`, {
         hints: [
           {
-            message: "Run 'base44 eject' without --project-id to see available projects"
+            message: "Run 'base44 eject' without --app-id to see available projects"
           }
         ]
       });
@@ -257745,7 +258071,7 @@ async function eject(ctx, options8) {
     Ne("Operation cancelled.");
     throw new CLIExitError(0);
   }
-  const resolvedPath = resolve12(selectedPath);
+  const resolvedPath = resolve14(selectedPath);
   await runTask2("Downloading your project's code...", async (updateMessage) => {
     await createProjectFilesForExistingProject({
       projectId,
@@ -257784,13 +258110,15 @@ async function eject(ctx, options8) {
   return { outroMessage: "Your new project is set and ready to use" };
 }
 function getEjectCommand() {
-  return new Base44Command("eject", { requireAppContext: false }).description("Download the code for an existing Base44 project").option("-p, --path <path>", "Path where to write the project").option("--project-id <id>", "Project ID to eject (skips interactive selection)").option("-y, --yes", "Skip confirmation prompts").action(eject);
+  return new Base44Command("eject", {
+    requireAppContext: false
+  }).description("Download the code for an existing Base44 project").configureHelp({ showGlobalOptions: true }).option("-p, --path <path>", "Path where to write the project").option("-y, --yes", "Skip confirmation prompts").addOption(new Option("--project-id <id>", "Project ID to eject (skips interactive selection)").hideHelp()).action(eject);
 }
 
 // src/cli/program.ts
 function createProgram(context) {
   const program2 = new Command;
-  program2.name("base44").description("Base44 CLI - Unified interface for managing Base44 applications").version(package_default.version);
+  program2.name("base44").description("Base44 CLI - Unified interface for managing Base44 applications").version(package_default.version).addOption(new Option("--app-id <id>", "Base44 app ID to use").env(BASE44_APP_ID_ENV_VAR)).addOption(new Option("--json", "Output machine-readable JSON to stdout (status/logs go to stderr)"));
   program2.configureHelp({
     sortSubcommands: true
   });
@@ -257818,7 +258146,7 @@ function createProgram(context) {
   program2.addCommand(getSiteCommand());
   program2.addCommand(getTypesCommand());
   program2.addCommand(getExecCommand());
-  program2.addCommand(getDevCommand(), { hidden: true });
+  program2.addCommand(getDevCommand());
   program2.addCommand(getLogsCommand());
   return program2;
 }
@@ -260115,14 +260443,14 @@ async function addSourceContext(frames) {
   return frames;
 }
 function getContextLinesFromFile(path19, ranges, output) {
-  return new Promise((resolve13) => {
+  return new Promise((resolve15) => {
     const stream = createReadStream2(path19);
     const lineReaded = createInterface2({
       input: stream
     });
     function destroyStreamAndResolve() {
       stream.destroy();
-      resolve13();
+      resolve15();
     }
     let lineNumber = 0;
     let currentRangeIndex = 0;
@@ -261234,15 +261562,15 @@ class PostHogBackendClient extends PostHogCoreStateless {
       return true;
     if (this.featureFlagsPoller === undefined)
       return false;
-    return new Promise((resolve13) => {
+    return new Promise((resolve15) => {
       const timeout3 = setTimeout(() => {
         cleanup();
-        resolve13(false);
+        resolve15(false);
       }, timeoutMs);
       const cleanup = this._events.on("localEvaluationFlagsLoaded", (count2) => {
         clearTimeout(timeout3);
         cleanup();
-        resolve13(count2 > 0);
+        resolve15(count2 > 0);
       });
     });
   }
@@ -262028,15 +262356,17 @@ function addCommandInfoToErrorReporter(program2, errorReporter) {
 // src/cli/index.ts
 var __dirname4 = dirname23(fileURLToPath6(import.meta.url));
 async function runCLI(options8) {
-  ensureNpmAssets(join29(__dirname4, "../assets"));
+  ensureNpmAssets(join28(__dirname4, "../assets"));
   const errorReporter = new ErrorReporter;
   errorReporter.registerProcessErrorHandlers();
-  const isNonInteractive = !process.stdin.isTTY || !process.stdout.isTTY;
+  const jsonMode = process.argv.includes("--json");
+  const isNonInteractive = !process.stdin.isTTY || !process.stdout.isTTY || jsonMode;
   const log = isNonInteractive ? new SimpleLogger : new ClackLogger;
   const runTask2 = isNonInteractive ? createSimpleRunTask(log) : createInteractiveRunTask();
   const context = {
     errorReporter,
     isNonInteractive,
+    jsonMode,
     distribution: options8?.distribution ?? "npm",
     log,
     runTask: runTask2
@@ -262065,4 +262395,4 @@ export {
   CLIExitError
 };
 
-//# debugId=61B9F8E330C194E064756E2164756E21
+//# debugId=64D861C59DC9E6B364756E2164756E21