@base44-preview/cli 0.0.55-pr.541.4704675 → 0.0.55-pr.545.63956fa

package/dist/cli/index.js

@@ -218285,7 +218285,6 @@ 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";
@@ -233981,7 +233980,7 @@ async function parseEnvFile(filePath) {
 }
 var STRIPE_ENV_PREFIX = "BASE44_PROJECTS_";
 var BASE44_ENV_KEYS = [
-  BASE44_APP_ID_ENV_VAR,
+  "BASE44_APP_ID",
   "BASE44_ACCESS_TOKEN",
   "BASE44_REFRESH_TOKEN",
   "BASE44_API_URL"
@@ -241695,35 +241694,18 @@ function loadFromTestOverrides() {
   }
   return null;
 }
-async function initAppContext(options = {}) {
+async function initAppContext() {
   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, projectRoot: projectRoot?.root };
-    return cache2;
-  }
   if (cache2) {
     return cache2;
   }
+  const projectRoot = findProjectRoot();
   if (!projectRoot) {
-    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"
-        }
-      ]
-    });
+    throw new ConfigNotFoundError("No Base44 project found. Run this command from a project directory with a config.jsonc file.");
   }
   const config3 = await readAppConfig(projectRoot.root);
   const appConfigPath = await findAppConfigPath(projectRoot.root);
@@ -241861,8 +241843,8 @@ async function getAppUserToken() {
     throw await ApiError.fromHttpError(error48, "exchanging platform token for app user token");
   }
 }
-async function getSiteUrl(projectId) {
-  const id = projectId ?? getAppContext().id;
+async function getSiteUrl() {
+  const id = getAppContext().id;
   let response;
   try {
     response = await base44Client.get(`api/apps/platform/${id}/published-url`);
@@ -244451,8 +244433,8 @@ async function ensureAuth(ctx) {
     });
   } catch {}
 }
-async function ensureAppContext(ctx, options = {}) {
-  const appContext = await initAppContext(options);
+async function ensureAppContext(ctx) {
+  const appContext = await initAppContext();
   ctx.app = appContext;
   ctx.errorReporter.setContext({ appId: appContext.id });
 }
@@ -251118,8 +251100,7 @@ class Base44Command extends Command {
           await ensureAuth(this.context);
         }
         if (this._commandOptions.requireAppContext) {
-          const { appId } = this.optsWithGlobals();
-          await ensureAppContext(this.context, { appId });
+          await ensureAppContext(this.context);
         }
         const result = await fn(this.context, ...args) ?? {};
         if (!quiet) {
@@ -253088,11 +253069,7 @@ function printProjectSummary({ name: name2, dashboardUrl, appUrl }, log) {
 }
 
 // src/cli/commands/project/create.ts
-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}.`);
-  }
+function validateNonInteractiveFlags(command2) {
   const { path: path17 } = command2.opts();
   if (path17 && !command2.args.length) {
     command2.error("--path requires a project name argument. Usage: base44 create <name> --path <path>");
@@ -253209,7 +253186,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", validateCreateOptions).action(createAction);
+  $ 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);
 }
 
 // src/cli/commands/project/deploy.ts
@@ -253305,32 +253282,11 @@ 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 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");
+function validateNonInteractiveFlags2(command2) {
+  const { create: create4, name: name2, projectId } = command2.opts();
+  if (create4 && projectId) {
+    command2.error("--create and --projectId cannot be used together");
   }
   if (create4 && !name2) {
     command2.error("--name is required when using --create");
@@ -253399,12 +253355,11 @@ async function promptForExistingProject(linkableProjects) {
   }
   return selectedProject;
 }
-async function link(ctx, options, command2) {
+async function link(ctx, options) {
   const { log, runTask: runTask2, isNonInteractive } = ctx;
-  const appId = readExplicitAppId(command2).value;
-  const skipPrompts = !!options.create || !!appId;
+  const skipPrompts = !!options.create || !!options.projectId;
   if (!skipPrompts && isNonInteractive) {
-    throw new InvalidInputError("--create with --name, or --app-id, is required in non-interactive mode");
+    throw new InvalidInputError("--create with --name, or --projectId, is required in non-interactive mode");
   }
   const projectRoot = findProjectRoot();
   if (!projectRoot) {
@@ -253419,8 +253374,8 @@ async function link(ctx, options, command2) {
       ]
     });
   }
-  let finalAppId;
-  const action = appId ? "choose" : options.create ? "create" : await promptForLinkAction();
+  let finalProjectId;
+  const action = options.projectId ? "choose" : options.create ? "create" : await promptForLinkAction();
   if (action === "choose") {
     const projects = await runTask2("Fetching projects...", async () => listProjects(), {
       successMessage: "Projects fetched",
@@ -253430,32 +253385,32 @@ async function link(ctx, options, command2) {
     if (!linkableProjects.length) {
       return { outroMessage: "No projects available for linking" };
     }
-    let linkedAppId;
-    if (appId) {
-      const project2 = linkableProjects.find((p) => p.id === appId);
+    let projectId;
+    if (options.projectId) {
+      const project2 = linkableProjects.find((p) => p.id === options.projectId);
       if (!project2) {
-        throw new InvalidInputError(`App with ID "${appId}" not found or not available for linking.`, {
+        throw new InvalidInputError(`Project with ID "${options.projectId}" not found or not available for linking.`, {
           hints: [
-            { message: "Check the app ID is correct" },
+            { message: "Check the project ID is correct" },
             {
-              message: "Use 'base44 link' without --app-id to see available projects"
+              message: "Use 'base44 link' without --projectId to see available projects"
             }
           ]
         });
       }
-      linkedAppId = appId;
+      projectId = options.projectId;
     } else {
       const selectedProject = await promptForExistingProject(linkableProjects);
-      linkedAppId = selectedProject.id;
+      projectId = selectedProject.id;
     }
     await runTask2("Linking project...", async () => {
-      await writeAppConfig(projectRoot.root, linkedAppId);
-      setAppContext({ id: linkedAppId, projectRoot: projectRoot.root });
+      await writeAppConfig(projectRoot.root, projectId);
+      setAppContext({ id: projectId, projectRoot: projectRoot.root });
     }, {
       successMessage: "Project linked successfully",
       errorMessage: "Failed to link project"
     });
-    finalAppId = linkedAppId;
+    finalProjectId = projectId;
   }
   if (action === "create") {
     const { name: name2, description } = options.create ? { name: options.name.trim(), description: options.description?.trim() } : await promptForNewProjectDetails();
@@ -253467,15 +253422,13 @@ async function link(ctx, options, command2) {
     });
     await writeAppConfig(projectRoot.root, projectId);
     setAppContext({ id: projectId, projectRoot: projectRoot.root });
-    finalAppId = projectId;
+    finalProjectId = projectId;
   }
-  log.message(`${theme.styles.header("Dashboard")}: ${theme.colors.links(getDashboardUrl(finalAppId))}`);
+  log.message(`${theme.styles.header("Dashboard")}: ${theme.colors.links(getDashboardUrl(finalProjectId))}`);
   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)").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);
+  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);
 }
 
 // src/cli/commands/project/logs.ts
@@ -253565,12 +253518,8 @@ async function fetchLogsForFunctions(functionNames, options, availableFunctionNa
   }
   return allEntries;
 }
-async function getProjectFunctionNames(projectRoot) {
-  const { functions } = await readProjectConfig(projectRoot);
-  return functions.map((fn) => fn.name);
-}
-async function getRemoteFunctionNames() {
-  const { functions } = await listDeployedFunctions();
+async function getAllFunctionNames() {
+  const { functions } = await readProjectConfig();
   return functions.map((fn) => fn.name);
 }
 function validateLimit(limit) {
@@ -253581,18 +253530,15 @@ 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 localProjectRoot = ctx.app?.projectRoot;
-  const availableFunctionNames = localProjectRoot ? await getProjectFunctionNames(localProjectRoot) : await getRemoteFunctionNames();
-  const functionNames = specifiedFunctions.length > 0 ? specifiedFunctions : availableFunctionNames;
+  const allProjectFunctions = await getAllFunctionNames();
+  const functionNames = specifiedFunctions.length > 0 ? specifiedFunctions : allProjectFunctions;
   if (functionNames.length === 0) {
-    return {
-      outroMessage: localProjectRoot ? "No functions found in this project." : "No functions found in this app."
-    };
+    return { outroMessage: "No functions found in this project." };
   }
-  let entries = await fetchLogsForFunctions(functionNames, options, availableFunctionNames);
+  let entries = await fetchLogsForFunctions(functionNames, options, allProjectFunctions);
   const limit = options.limit ? Number.parseInt(options.limit, 10) : undefined;
   if (limit !== undefined && entries.length > limit) {
     entries = entries.slice(0, limit);
@@ -253608,20 +253554,17 @@ function getLogsCommand() {
 // src/cli/commands/project/scaffold.ts
 import { basename as basename5, resolve as resolve6 } from "node:path";
 function resolveAppId(options) {
-  const appId = options.appId;
+  const appId = options.appId ?? process.env.BASE44_APP_ID;
   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>" },
-        { message: `Set ${BASE44_APP_ID_ENV_VAR} in your environment` }
-      ]
+      hints: [{ message: "Pass it explicitly with --app-id <id>" }]
     });
   }
   return appId;
 }
-async function scaffoldAction(ctx, name2, options, command2) {
+async function scaffoldAction(ctx, name2, options) {
   const { log, runTask: runTask2 } = ctx;
-  const appId = resolveAppId(command2.optsWithGlobals());
+  const appId = resolveAppId(options);
   const resolvedPath = resolve6("./");
   const projectName = (name2 ?? basename5(resolvedPath)).trim();
   const template2 = await getTemplateById("backend-only");
@@ -253653,7 +253596,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("--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("--app-id <id>", "Existing Base44 app ID").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);
@@ -253955,7 +253898,6 @@ function getTypesCommand() {
 
 // 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);
@@ -254112,12 +254054,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),
@@ -255484,6 +255425,92 @@ 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;
+  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 child = spawn3(this.command, {
+      cwd: this.cwd,
+      shell: true,
+      detached: process21.platform !== "win32",
+      env: { ...process21.env, ...this.env },
+      stdio: ["inherit", "pipe", "pipe"]
+    });
+    this.child = child;
+    this.setupHandlers(child);
+  }
+  onExit(listener) {
+    this.exitListeners.push(listener);
+  }
+  async stop() {
+    const child = this.child;
+    if (!child || child.exitCode !== null) {
+      return;
+    }
+    this.stopping = true;
+    const exited = new Promise((resolve10) => child.once("exit", () => resolve10()));
+    if (process21.platform === "win32" && child.pid) {
+      spawn3("taskkill", ["/pid", String(child.pid), "/T", "/F"]);
+    } 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";
@@ -257207,7 +257234,7 @@ 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);
@@ -257305,59 +257332,94 @@ async function createDevServer(options8) {
     }
   });
   await base44ConfigWatcher.start();
+  let serveRunner;
+  if (options8.serve) {
+    serveRunner = new ServeRunner({
+      command: options8.serve.command,
+      cwd: options8.serve.cwd,
+      env: {
+        VITE_BASE44_APP_ID: options8.serve.appId,
+        VITE_BASE44_APP_BASE_URL: baseUrl
+      },
+      logger: createDevLogger("frontend", theme.colors.base44Orange)
+    });
+  }
   const shutdown = async () => {
     base44ConfigWatcher.close();
     io6.close();
     await functionManager.stopAll();
+    await serveRunner?.stop();
     server.close();
   };
   process.on("SIGINT", shutdown);
   process.on("SIGTERM", shutdown);
+  serveRunner?.onExit(() => {
+    shutdown().finally(() => process.exit(1));
+  });
+  serveRunner?.start();
   return { port, server };
 }
 
 // src/cli/commands/dev.ts
+var ENV_HEADER = "# Edited by the base44 dev process";
+var MANAGED_ENV_KEYS = ["VITE_BASE44_APP_ID", "VITE_BASE44_APP_BASE_URL"];
 function localServerUrl(port) {
   return `http://localhost:${port}`;
 }
-async function writeEnvLocalIfMissing(projectRoot, port, log) {
+async function writeEnvLocal(projectRoot, port, appId, log) {
   const envLocalPath = join28(projectRoot, ".env.local");
+  const managed = [
+    `VITE_BASE44_APP_ID=${appId}`,
+    `VITE_BASE44_APP_BASE_URL=${localServerUrl(port)}`
+  ];
+  let preserved = "";
   if (await pathExists(envLocalPath)) {
-    return;
+    const existing = await readTextFile(envLocalPath);
+    preserved = existing.split(`
+`).map((line3) => {
+      const key2 = line3.match(/^\s*(\w+)\s*=/)?.[1];
+      return key2 && MANAGED_ENV_KEYS.includes(key2) ? `# ${line3}` : line3;
+    }).join(`
+`).trimEnd();
   }
-  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");
+  const block = `${ENV_HEADER}
+${managed.join(`
+`)}
+`;
+  await writeFile(envLocalPath, preserved ? `${preserved}
+
+${block}` : block);
+  log.info("Wrote .env.local with app ID and dev server URL");
 }
 async function devAction({ log }, options8) {
   const port = options8.port ? Number(options8.port) : undefined;
-  let projectRoot;
+  const serveEnabled = options8.serve !== false;
+  const { project: project2 } = await readProjectConfig();
+  const serveCommand = project2.site?.serveCommand;
+  const appId = serveEnabled || options8.writeEnv ? (await initAppContext()).id : undefined;
   const { port: resolvedPort } = await createDevServer({
     log,
     port,
-    cwd: process21.cwd(),
     denoWrapperPath: getDenoWrapperPath(),
+    serve: serveEnabled && serveCommand && appId ? { command: serveCommand, cwd: project2.root, appId } : undefined,
     loadResources: async () => {
-      const { functions, entities, project: project2 } = await readProjectConfig();
-      projectRoot = project2.root;
-      return { functions, entities, project: project2 };
+      const { functions, entities, project: project3 } = await readProjectConfig();
+      return { functions, entities, project: project3 };
     }
   });
-  if (projectRoot) {
-    await writeEnvLocalIfMissing(projectRoot, resolvedPort, log);
+  if (options8.writeEnv && appId) {
+    await writeEnvLocal(project2.root, resolvedPort, appId, log);
   }
   return {
     outroMessage: `Dev server is available at ${theme.colors.links(localServerUrl(resolvedPort))}`
   };
 }
 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").option("--no-serve", "Do not start the frontend dev server").option("--write-env", "Write the app ID and dev server URL to .env.local").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;
@@ -257376,7 +257438,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,
@@ -257409,10 +257471,7 @@ function readStdin2() {
     process.stdin.on("error", reject);
   });
 }
-async function execAction({
-  app,
-  isNonInteractive
-}) {
+async function execAction(isNonInteractive) {
   const noInputError = new InvalidInputError("No input provided. Pipe a script to stdin.", {
     hints: [
       { message: "File:  cat ./script.ts | base44 exec" },
@@ -257428,7 +257487,7 @@ async function execAction({
   if (!code2.trim()) {
     throw noInputError;
   }
-  const { exitCode } = await runScript({ appId: app.id, code: code2 });
+  const { exitCode } = await runScript({ appId: getAppContext().id, code: code2 });
   if (exitCode !== 0) {
     process.exitCode = exitCode;
   }
@@ -257441,26 +257500,18 @@ Examples:
     $ cat ./script.ts | base44 exec
 
   Inline script:
-    $ echo "const users = await base44.entities.User.list()" | base44 exec`).action(async (ctx) => {
-    return await execAction(ctx);
+    $ echo "const users = await base44.entities.User.list()" | base44 exec`).action(async ({ isNonInteractive }) => {
+    return await execAction(isNonInteractive);
   });
 }
 
 // src/cli/commands/project/eject.ts
 import { resolve as resolve12 } from "node:path";
 var import_kebabCase2 = __toESM(require_kebabCase(), 1);
-async function eject(ctx, options8, command2) {
+async function eject(ctx, options8) {
   const { log, runTask: runTask2, isNonInteractive } = ctx;
-  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.projectId) {
+    throw new InvalidInputError("--project-id is required in non-interactive mode");
   }
   if (isNonInteractive && !options8.path) {
     throw new InvalidInputError("--path is required in non-interactive mode");
@@ -257468,13 +257519,13 @@ async function eject(ctx, options8, command2) {
   const projects = await listProjects();
   const ejectableProjects = projects.filter((p4) => p4.isManagedSourceCode !== false);
   let selectedProject;
-  if (selectedAppId) {
-    const foundProject = ejectableProjects.find((p4) => p4.id === selectedAppId);
+  if (options8.projectId) {
+    const foundProject = ejectableProjects.find((p4) => p4.id === options8.projectId);
     if (!foundProject) {
-      throw new InvalidInputError(`App with ID "${selectedAppId}" not found or not ejectable`, {
+      throw new InvalidInputError(`Project with ID "${options8.projectId}" not found or not ejectable`, {
         hints: [
           {
-            message: "Run 'base44 eject' without --app-id to see available projects"
+            message: "Run 'base44 eject' without --project-id to see available projects"
           }
         ]
       });
@@ -257550,15 +257601,13 @@ async function eject(ctx, options8, command2) {
   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").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);
+  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);
 }
 
 // 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).addOption(new Option("--app-id <id>", "Base44 app ID to use").env(BASE44_APP_ID_ENV_VAR));
+  program2.name("base44").description("Base44 CLI - Unified interface for managing Base44 applications").version(package_default.version);
   program2.configureHelp({
     sortSubcommands: true
   });
@@ -261832,4 +261881,4 @@ export {
   CLIExitError
 };
 
-//# debugId=8E6F4E37112CE9D564756E2164756E21
+//# debugId=C265208687575E5664756E2164756E21