@base44-preview/cli 0.0.54-pr.538.e94d5b7 → 0.0.54-pr.539.4825ad9

package/dist/cli/index.js

@@ -235154,24 +235154,39 @@ function getTestOverrides() {
 // src/core/auth/config.ts
 var TOKEN_REFRESH_BUFFER_MS = 60 * 1000;
 var refreshPromise = null;
-function readEnvAuth() {
+function decodeJwtClaims(token) {
+  const parts = token.split(".");
+  if (parts.length !== 3) {
+    return null;
+  }
+  try {
+    return JSON.parse(Buffer.from(parts[1], "base64url").toString("utf8"));
+  } catch {
+    return null;
+  }
+}
+async function seedAuthFromEnv() {
   const accessToken = process.env.BASE44_ACCESS_TOKEN;
   if (!accessToken) {
-    return null;
+    return false;
   }
-  return {
+  const refreshToken = process.env.BASE44_REFRESH_TOKEN;
+  const claims = decodeJwtClaims(accessToken);
+  const sub = typeof claims?.sub === "string" ? claims.sub : undefined;
+  const exp = typeof claims?.exp === "number" ? claims.exp : undefined;
+  if (!refreshToken || !sub || !exp) {
+    return false;
+  }
+  await writeAuth({
     accessToken,
-    refreshToken: process.env.BASE44_REFRESH_TOKEN ?? "",
-    expiresAt: Number.POSITIVE_INFINITY,
-    email: "",
-    name: ""
-  };
+    refreshToken,
+    expiresAt: exp * 1000,
+    email: sub,
+    name: sub
+  });
+  return true;
 }
 async function readAuth() {
-  const envAuth = readEnvAuth();
-  if (envAuth) {
-    return envAuth;
-  }
   try {
     const authData = await readJsonFile(getAuthFilePath());
     const result = AuthDataSchema.safeParse(authData);
@@ -235208,9 +235223,6 @@ function isTokenExpired(auth) {
   return Date.now() >= auth.expiresAt - TOKEN_REFRESH_BUFFER_MS;
 }
 async function refreshAndSaveTokens() {
-  if (readEnvAuth()) {
-    return null;
-  }
   if (refreshPromise) {
     return refreshPromise;
   }
@@ -244410,6 +244422,7 @@ async function login({
 
 // src/cli/utils/command/middleware.ts
 async function ensureAuth(ctx) {
+  await seedAuthFromEnv();
   const loggedIn = await isLoggedIn();
   if (!loggedIn) {
     ctx.log.info("You need to login first to continue.");
@@ -251792,8 +251805,7 @@ function getLogoutCommand() {
 // src/cli/commands/auth/whoami.ts
 async function whoami(_ctx) {
   const auth2 = await readAuth();
-  const identity4 = auth2.email || "environment credentials";
-  return { outroMessage: `Logged in as: ${theme.styles.bold(identity4)}` };
+  return { outroMessage: `Logged in as: ${theme.styles.bold(auth2.email)}` };
 }
 function getWhoamiCommand() {
   return new Base44Command("whoami", { requireAppConfig: false }).description("Display current authenticated user").action(whoami);
@@ -253140,6 +253152,28 @@ async function executeCreate({
   return await completeProjectSetup({ projectId, name: name2, resolvedPath, deploy: deploy5, skills, isInteractive }, { log, runTask: runTask2 });
 }
 async function createAction({ log, runTask: runTask2, isNonInteractive }, name2, options) {
+  const existingAppId = process.env.BASE44_APP_ID;
+  if (existingAppId && !options.force) {
+    if (isNonInteractive) {
+      throw new InvalidInputError(`BASE44_APP_ID is set (${existingAppId}) — this environment already has a Base44 app, so \`create\` won't make a new one.`, {
+        hints: [
+          {
+            message: "Run `base44 scaffold` to set up a project for the existing app"
+          },
+          { message: "Or pass --force to create a new app anyway" }
+        ]
+      });
+    }
+    const proceed = await Re({
+      message: `BASE44_APP_ID is set (${existingAppId}). This environment already has a Base44 app — \`base44 scaffold\` sets up a project for it, while \`create\` makes a new one. Create a new app anyway?`,
+      initialValue: false
+    });
+    if (Ct(proceed) || !proceed) {
+      return {
+        outroMessage: "Run `base44 scaffold` to set up a project for the existing app"
+      };
+    }
+  }
   if (name2 && !options.path) {
     options.path = `./${import_kebabCase.default(name2)}`;
   }
@@ -253163,7 +253197,7 @@ function getCreateCommand() {
   return new Base44Command("create", {
     requireAppConfig: false,
     fullBanner: true
-  }).description("Create a new Base44 project").addArgument(new Argument("name", "Project name").argOptional()).option("-p, --path <path>", "Path where to create the project").option("-t, --template <id>", "Template ID (e.g., backend-only, backend-and-client)").option("--deploy", "Build and deploy the site").option("--no-skills", "Skip AI agent skills installation").addHelpText("after", `
+  }).description("Create a new Base44 project").addArgument(new Argument("name", "Project name").argOptional()).option("-p, --path <path>", "Path where to create the project").option("-t, --template <id>", "Template ID (e.g., backend-only, backend-and-client)").option("--deploy", "Build and deploy the site").option("--no-skills", "Skip AI agent skills installation").option("--force", "Create a new app even when BASE44_APP_ID is set in the environment").addHelpText("after", `
 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
@@ -253263,129 +253297,6 @@ function printStripeResult(r, log) {
   log.info(`  Connectors dashboard: ${theme.colors.links(getConnectorsUrl())}`);
 }
 
-// src/cli/commands/project/init.ts
-import { basename as basename4, resolve as resolve6 } from "node:path";
-function resolveAppId(options) {
-  const appId = options.appId ?? process.env.BASE44_APP_ID;
-  if (!appId) {
-    throw new InvalidInputError("No app ID found. `base44 init` scaffolds a local project for an existing Base44 app.", {
-      hints: [
-        { message: "Pass it explicitly with --app-id <id>" },
-        {
-          message: "Or set BASE44_APP_ID (the Stripe Projects CLI writes it to .env via `stripe projects env --pull`)"
-        }
-      ]
-    });
-  }
-  return appId;
-}
-async function executeInit({
-  template: template2,
-  name: rawName,
-  description,
-  appId,
-  projectPath,
-  deploy: deploy5,
-  skills,
-  isInteractive
-}, { log, runTask: runTask2 }) {
-  const name2 = rawName.trim();
-  const resolvedPath = resolve6(projectPath);
-  const { projectId, skippedFiles } = await runTask2("Setting up your project...", async () => {
-    return await initProjectFiles({
-      name: name2,
-      description: description?.trim(),
-      path: resolvedPath,
-      template: template2,
-      appId
-    });
-  }, {
-    successMessage: theme.colors.base44Orange("Project created successfully"),
-    errorMessage: "Failed to create project"
-  });
-  if (skippedFiles.length > 0) {
-    log.info(`Kept existing file${skippedFiles.length > 1 ? "s" : ""}: ${skippedFiles.join(", ")}`);
-  }
-  setAppConfig({ id: projectId, projectRoot: resolvedPath });
-  return await completeProjectSetup({ projectId, name: name2, resolvedPath, deploy: deploy5, skills, isInteractive }, { log, runTask: runTask2 });
-}
-async function initInteractive(appId, options, ctx) {
-  const templates = await listTemplates();
-  const templateOptions = templates.map((t) => ({
-    value: t,
-    label: t.name,
-    hint: t.description
-  }));
-  const result = await Oe({
-    template: () => Je({
-      message: "Pick an option",
-      options: templateOptions
-    }),
-    name: () => {
-      return options.name ? Promise.resolve(options.name) : Ze({
-        message: "What is the name of your project?",
-        placeholder: basename4(process.cwd()),
-        initialValue: basename4(process.cwd()),
-        validate: (value) => {
-          if (!value || value.trim().length === 0) {
-            return "Every project deserves a name";
-          }
-        }
-      });
-    },
-    projectPath: () => Ze({
-      message: "Where should we set up your project?",
-      placeholder: "./",
-      initialValue: options.path ?? "./"
-    })
-  }, {
-    onCancel: onPromptCancel
-  });
-  return await executeInit({
-    template: result.template,
-    name: result.name,
-    appId,
-    projectPath: result.projectPath,
-    deploy: options.deploy,
-    skills: options.skills,
-    isInteractive: true
-  }, ctx);
-}
-async function initNonInteractive(appId, options, ctx) {
-  const projectPath = options.path ?? "./";
-  const name2 = options.name ?? basename4(resolve6(projectPath));
-  ctx.log.info(`Initializing project at ${resolve6(projectPath)}`);
-  const template2 = await getTemplateById(options.template ?? DEFAULT_TEMPLATE_ID);
-  return await executeInit({
-    template: template2,
-    name: name2,
-    appId,
-    projectPath,
-    deploy: options.deploy,
-    skills: options.skills,
-    isInteractive: false
-  }, ctx);
-}
-async function initAction({ log, runTask: runTask2, isNonInteractive }, name2, options) {
-  const appId = resolveAppId(options);
-  const opts = { ...options, name: options.name ?? name2 };
-  const ctx = { log, runTask: runTask2 };
-  if (isNonInteractive) {
-    return await initNonInteractive(appId, opts, ctx);
-  }
-  return await initInteractive(appId, opts, ctx);
-}
-function getInitCommand() {
-  return new Base44Command("init", {
-    requireAppConfig: false,
-    fullBanner: true
-  }).description("Scaffold a local project for an existing Base44 app (e.g. one provisioned by the Stripe Projects CLI)").addArgument(new Argument("name", "Project name").argOptional()).option("--app-id <id>", "Existing Base44 app ID (defaults to the BASE44_APP_ID environment variable)").option("-p, --path <path>", "Path where to set up the project (defaults to the current directory)").option("-t, --template <id>", "Template ID (e.g., backend-only, backend-and-client)").option("--deploy", "Build and deploy the site").option("--no-skills", "Skip AI agent skills installation").addHelpText("after", `
-Examples:
-  $ base44 init                                  Scaffolds in the current dir using $BASE44_APP_ID
-  $ base44 init --app-id app_123                 Scaffolds in the current dir for the given app
-  $ base44 init my-app --app-id app_123          Scaffolds in the current dir named "my-app"`).action(initAction);
-}
-
 // src/cli/commands/project/link.ts
 function validateNonInteractiveFlags2(command2) {
   const { create: create4, name: name2, projectId } = command2.opts();
@@ -253655,6 +253566,63 @@ function getLogsCommand() {
   return new Base44Command("logs").description("Fetch function logs for this app").option("--function <names>", "Filter by function name(s), comma-separated. If omitted, fetches logs for all project functions").option("--since <datetime>", "Show logs from this time (ISO format)", normalizeDatetime).option("--until <datetime>", "Show logs until this time (ISO format)", normalizeDatetime).addOption(new Option("--level <level>", "Filter by log level").choices([...LogLevelSchema.options]).hideHelp()).option("-n, --limit <n>", "Results per page (1-1000, default: 50)").addOption(new Option("--order <order>", "Sort order").choices(["asc", "desc"])).action(logsAction);
 }
 
+// src/cli/commands/project/scaffold.ts
+import { basename as basename4, resolve as resolve6 } from "node:path";
+function resolveAppId(options) {
+  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: "Or set the BASE44_APP_ID environment variable (e.g. via .env)"
+        }
+      ]
+    });
+  }
+  return appId;
+}
+async function scaffoldAction({ log, runTask: runTask2 }, name2, options) {
+  const appId = resolveAppId(options);
+  const resolvedPath = resolve6("./");
+  const projectName = (name2 ?? basename4(resolvedPath)).trim();
+  const template2 = await getTemplateById("backend-only");
+  log.info(`Scaffolding project at ${resolvedPath}`);
+  const { projectId, skippedFiles } = await runTask2("Setting up your project...", async () => {
+    return await initProjectFiles({
+      name: projectName,
+      path: resolvedPath,
+      template: template2,
+      appId
+    });
+  }, {
+    successMessage: theme.colors.base44Orange("Project created successfully"),
+    errorMessage: "Failed to create project"
+  });
+  if (skippedFiles.length > 0) {
+    log.info(`Kept existing file${skippedFiles.length > 1 ? "s" : ""}: ${skippedFiles.join(", ")}`);
+  }
+  setAppConfig({ id: projectId, projectRoot: resolvedPath });
+  return await completeProjectSetup({
+    projectId,
+    name: projectName,
+    resolvedPath,
+    deploy: false,
+    skills: options.skills,
+    isInteractive: false
+  }, { log, runTask: runTask2 });
+}
+function getScaffoldCommand() {
+  return new Base44Command("scaffold", {
+    requireAppConfig: 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 (defaults to the BASE44_APP_ID environment variable)").option("--no-skills", "Skip AI agent skills installation").addHelpText("after", `
+Examples:
+  $ base44 scaffold                          Scaffolds the current dir for $BASE44_APP_ID
+  $ 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);
+}
+
 // src/cli/commands/secrets/delete.ts
 async function deleteSecretAction({ runTask: runTask2 }, key) {
   await runTask2(`Deleting secret "${key}"`, async () => {
@@ -257549,7 +257517,7 @@ function createProgram(context) {
   program2.addCommand(getWhoamiCommand());
   program2.addCommand(getLogoutCommand());
   program2.addCommand(getCreateCommand());
-  program2.addCommand(getInitCommand());
+  program2.addCommand(getScaffoldCommand());
   program2.addCommand(getDashboardCommand());
   program2.addCommand(getDeployCommand2());
   program2.addCommand(getLinkCommand());
@@ -261810,4 +261778,4 @@ export {
   CLIExitError
 };
 
-//# debugId=7BE6B0F316AC51B064756E2164756E21
+//# debugId=F9E7F25C4BCCD31164756E2164756E21