@base44-preview/cli 0.1.15-pr.630.a6f9272 → 0.1.15-pr.630.f6b9987

package/dist/cli/index.js

@@ -269546,7 +269546,7 @@ function getModelCommand() {
 
 // src/cli/commands/app/shared.ts
 import { mkdir as mkdir3, writeFile as writeFile2 } from "node:fs/promises";
-import { join as join21 } from "node:path";
+import { basename as basename6, join as join21, relative as relative6, resolve as resolve6 } from "node:path";
 
 // src/cli/commands/code/render.ts
 var TOOL_ALIASES = {
@@ -269983,11 +269983,17 @@ async function createAndLinkApp(options) {
   if (options.name && !APP_NAME_RE.test(options.name)) {
     throw new InvalidInputError("The name becomes a directory — letters, digits, dots, dashes and underscores only.");
   }
-  const name = options.name ?? (options.importRepo ? repoBasename(options.importRepo) : inventAppName(options.prompt));
-  const targetDir = join21(process.cwd(), name);
+  const cwd = process.cwd();
+  const fallbackName = () => options.importRepo ? repoBasename(options.importRepo) : inventAppName(options.prompt);
+  const chosenDir = options.path ? resolve6(cwd, options.path) : await isDirEmpty(cwd) ? cwd : undefined;
+  const dirBase = chosenDir ? basename6(chosenDir) : undefined;
+  const name = options.name ?? (dirBase && APP_NAME_RE.test(dirBase) ? dirBase : fallbackName());
+  const targetDir = chosenDir ?? join21(cwd, name);
+  const here = targetDir === cwd;
+  const dirName = here ? "." : relative6(cwd, targetDir) || name;
   await mkdir3(targetDir, { recursive: true });
   if (await appConfigExists(targetDir)) {
-    throw new InvalidInputError(`./${name} is already linked to a Base44 app. Pick another name.`);
+    throw new InvalidInputError(here ? "This directory is already linked to a Base44 app. Run `base44 code` here to keep building it, or pass --path for a new one." : `./${dirName} is already linked to a Base44 app. Pick another name or --path.`);
   }
   const created = options.importRepo ? await createImportedApp({
     appName: name,
@@ -270011,16 +270017,18 @@ async function createAndLinkApp(options) {
     id: created.id,
     editorUrl: `${getBase44ApiUrl()}/apps/${created.id}/editor/preview`,
     repoUrl: created.imported_repo_url ?? undefined,
-    dirName: name,
-    targetDir
+    dirName,
+    targetDir,
+    here
   };
 }
 function nextStepsLines(app) {
+  const cd = app.here ? "" : `cd ${app.dirName} && `;
   return [
     "",
-    `${source_default.bold("Your app lives in")}  ./${app.dirName}`,
-    source_default.dim(`  cd ${app.dirName} && base44 code        # keep building with the agent`),
-    source_default.dim(`  cd ${app.dirName} && base44 app send "…"  # one non-interactive turn`)
+    `${source_default.bold("Your app lives in")}  ${app.here ? "./  (this directory)" : `./${app.dirName}`}`,
+    source_default.dim(`  ${cd}base44 code        # keep building with the agent`),
+    source_default.dim(`  ${cd}base44 app send "…"  # one non-interactive turn`)
   ];
 }
 async function githubReauthLines(error) {
@@ -270253,7 +270261,8 @@ async function newAction({ log, runTask, jsonMode }, prompt, options) {
       importRepo: options.import,
       mode: options.mode,
       repoName: options.repoName,
-      fromBranch: options.fromBranch
+      fromBranch: options.fromBranch,
+      path: options.path
     }));
   } catch (error) {
     for (const line of await githubReauthLines(error) ?? [])
@@ -270264,7 +270273,7 @@ async function newAction({ log, runTask, jsonMode }, prompt, options) {
     if (app.repoUrl)
       log.message(source_default.dim(`repo    ${app.repoUrl}`));
     log.message(source_default.dim(`editor  ${app.editorUrl}`));
-    log.message(source_default.dim(`linked  ./${app.dirName}`));
+    log.message(source_default.dim(`linked  ${app.here ? "./  (this directory)" : `./${app.dirName}`}`));
   }
   let finalState;
   let previewUrl;
@@ -270323,7 +270332,7 @@ async function newAction({ log, runTask, jsonMode }, prompt, options) {
 }
 function getNewCommand() {
   const command = new Base44Command("new", { requireAppContext: false });
-  command.description("Create an app and start building: from a prompt (the Base44 template), or over an existing GitHub repo with --import").argument("[prompt]", "What to build; the first agent turn starts immediately").option("--import <repo>", "Build over an existing GitHub repository instead of the template").option("--mode <mode>", "How to import: direct, fork, or copy (default: direct)").option("--name <name>", "Directory and app name (invented when omitted)").option("--repo-name <name>", "Name for the new GitHub repo when forking/copying").option("--from-branch <name>", "Import a specific branch of the repo").action(newAction);
+  command.description("Create an app and start building: from a prompt (the Base44 template), or over an existing GitHub repo with --import").argument("[prompt]", "What to build; the first agent turn starts immediately").option("--import <repo>", "Build over an existing GitHub repository instead of the template").option("--mode <mode>", "How to import: direct, fork, or copy (default: direct)").option("--name <name>", "Directory and app name (invented when omitted)").option("--path <dir>", "Directory to link (default: the current directory when empty, else ./<name>)").option("--repo-name <name>", "Name for the new GitHub repo when forking/copying").option("--from-branch <name>", "Import a specific branch of the repo").action(newAction);
   return command;
 }
 
@@ -270533,7 +270542,7 @@ function getAuthPushCommand() {
 }
 
 // src/cli/commands/auth/social-login.ts
-import { dirname as dirname17, join as join24, resolve as resolve6 } from "node:path";
+import { dirname as dirname17, join as join24, resolve as resolve7 } from "node:path";
 var PROVIDER_LABELS = {
   google: "Google",
   microsoft: "Microsoft",
@@ -270573,7 +270582,7 @@ async function socialLoginAction({ log, isNonInteractive, runTask }, provider, a
   let clientSecret;
   if (useCustomOAuth && oauth && oauthCli && hasSecretOptions(options)) {
     if (options.envFile) {
-      const secrets = await parseEnvFile(resolve6(options.envFile));
+      const secrets = await parseEnvFile(resolve7(options.envFile));
       const value = secrets[oauthCli.envVar];
       if (!value) {
         throw new InvalidInputError(`Key "${oauthCli.envVar}" not found in ${options.envFile}.`);
@@ -270629,7 +270638,7 @@ function getSocialLoginCommand() {
 }
 
 // src/cli/commands/auth/sso.ts
-import { dirname as dirname18, join as join25, resolve as resolve7 } from "node:path";
+import { dirname as dirname18, join as join25, resolve as resolve8 } from "node:path";
 var SSOConfigFileSchema = object({
   provider: _enum(Object.values(KNOWN_SSO_PROVIDERS)),
   clientId: string2(),
@@ -270645,7 +270654,7 @@ var SSOConfigFileSchema = object({
   ssoName: string2().optional()
 });
 async function loadSSOConfigFile(filePath) {
-  const resolved = resolve7(filePath);
+  const resolved = resolve8(filePath);
   const raw = await readJsonFile(resolved);
   const result = SSOConfigFileSchema.safeParse(raw);
   if (!result.success) {
@@ -270733,7 +270742,7 @@ async function ssoEnableAction({ isNonInteractive, runTask }, options) {
   }
   let clientSecret;
   if (merged.envFile && !merged.clientSecret) {
-    const secrets = await parseEnvFile(resolve7(merged.envFile));
+    const secrets = await parseEnvFile(resolve8(merged.envFile));
     const value = secrets.sso_client_secret;
     if (!value) {
       throw new InvalidInputError(`Key "sso_client_secret" not found in ${merged.envFile}.`);
@@ -276598,21 +276607,21 @@ async function runGenesisSession(options) {
 
 // src/cli/commands/code/index.ts
 var BRAND_ORANGE2 = "#E86B3C";
-async function bootstrapApp(prompt, footer, emit, onCreated, importRepo) {
+async function bootstrapApp(prompt, footer, emit, onCreated, importRepo, path) {
   let app;
   try {
-    app = await createAndLinkApp({ prompt, importRepo });
+    app = await createAndLinkApp({ prompt, importRepo, path });
   } catch (error) {
     for (const line of await githubReauthLines(error) ?? [])
       emit(line);
     throw error;
   }
   onCreated(app);
-  footer.push(source_default.dim(`dir ./${app.dirName}`));
+  footer.push(source_default.dim(`dir ${app.here ? "./" : `./${app.dirName}`}`));
   if (app.repoUrl)
     footer.push(terminalLink("repo", app.repoUrl));
   footer.push(terminalLink("editor", app.editorUrl));
-  emit(source_default.dim(`linked  ./${app.dirName}  (cd ${app.dirName} after the session)`));
+  emit(source_default.dim(app.here ? "linked  ./  (this directory)" : `linked  ./${app.dirName}  (cd ${app.dirName} after the session)`));
   const branchId = await resolveActiveBranchId().catch(() => {
     return;
   });
@@ -276646,8 +276655,8 @@ async function codeAction({ log }, options) {
     linked = true;
   } catch {}
   if (linked) {
-    if (options.import) {
-      throw new InvalidInputError("--import creates a new app; run it outside a linked project.");
+    if (options.import || options.path) {
+      throw new InvalidInputError("--import and --path create a new app; run them outside a linked project.");
     }
     const branchId = await resolveActiveBranchId().catch(() => {
       return;
@@ -276675,7 +276684,7 @@ async function codeAction({ log }, options) {
     footer,
     createApp: (prompt, emit) => bootstrapApp(prompt, footer, emit, (app) => {
       created = app;
-    }, options.import)
+    }, options.import, options.path)
   });
   if (!created) {
     return { outroMessage: "Session closed. No app was created." };
@@ -276687,7 +276696,7 @@ async function codeAction({ log }, options) {
 }
 function getCodeCommand() {
   const command = new Base44Command("code", { requireAppContext: false });
-  command.description("Open Base44 Code: an interactive agent session — in an empty directory your first prompt creates the app (add --import <repo> to build over an existing repository)").option("--import <repo>", "Build over an existing GitHub repository instead of the Base44 template").action(codeAction);
+  command.description("Open Base44 Code: an interactive agent session — in an empty directory your first prompt creates the app (add --import <repo> to build over an existing repository)").option("--import <repo>", "Build over an existing GitHub repository instead of the Base44 template").option("--path <dir>", "Directory to link the new app to (default: the current directory when empty, else ./<name>)").action(codeAction);
   return command;
 }
 
@@ -277485,10 +277494,10 @@ function getConnectorsListAvailableCommand() {
 }
 
 // src/cli/commands/connectors/pull.ts
-import { dirname as dirname19, join as join27, resolve as resolve8 } from "node:path";
+import { dirname as dirname19, join as join27, resolve as resolve9 } from "node:path";
 async function resolveConnectorsDir(options) {
   if (!getAppContext().projectRoot) {
-    return resolve8(options.dir ?? "connectors");
+    return resolve9(options.dir ?? "connectors");
   }
   const { project } = await readProjectConfig();
   return join27(dirname19(project.configPath), project.connectorsDir);
@@ -277532,10 +277541,10 @@ function getConnectorsPullCommand() {
 }
 
 // src/cli/commands/connectors/push.ts
-import { resolve as resolve9 } from "node:path";
+import { resolve as resolve10 } from "node:path";
 async function readConnectorsToPush(options) {
   if (!getAppContext().projectRoot) {
-    return readAllConnectors(resolve9(options.dir ?? "connectors"));
+    return readAllConnectors(resolve10(options.dir ?? "connectors"));
   }
   const { connectors } = await readProjectConfig();
   return connectors;
@@ -278004,7 +278013,7 @@ function getBuildCommand() {
 }
 
 // src/cli/commands/project/create.ts
-import { basename as basename6, resolve as resolve10 } from "node:path";
+import { basename as basename7, resolve as resolve11 } from "node:path";
 var import_kebabCase2 = __toESM(require_kebabCase(), 1);
 
 // src/cli/commands/project/scaffold-shared.ts
@@ -278169,8 +278178,8 @@ async function createInteractive(options, ctx) {
     name: () => {
       return options.name ? Promise.resolve(options.name) : Ze({
         message: "What is the name of your project?",
-        placeholder: basename6(process.cwd()),
-        initialValue: basename6(process.cwd()),
+        placeholder: basename7(process.cwd()),
+        initialValue: basename7(process.cwd()),
         validate: (value) => {
           if (!value || value.trim().length === 0) {
             return "Every project deserves a name";
@@ -278200,7 +278209,7 @@ async function createInteractive(options, ctx) {
   }, ctx);
 }
 async function createNonInteractive(options, ctx) {
-  ctx.log.info(`Creating a new project at ${resolve10(options.path)}`);
+  ctx.log.info(`Creating a new project at ${resolve11(options.path)}`);
   const template = await getTemplateById(options.template ?? DEFAULT_TEMPLATE_ID);
   return await executeCreate({
     template,
@@ -278224,7 +278233,7 @@ async function executeCreate({
 }, ctx) {
   const { log, runTask } = ctx;
   const name = rawName.trim();
-  const resolvedPath = resolve10(projectPath);
+  const resolvedPath = resolve11(projectPath);
   const organizationId = await resolveWorkspaceId(ctx, flagWorkspaceId, isInteractive);
   const { projectId } = await runTask("Setting up your project...", async () => {
     return await createProjectFiles({
@@ -278865,7 +278874,7 @@ function getLogsCommand() {
 }
 
 // src/cli/commands/project/scaffold.ts
-import { basename as basename7, resolve as resolve11 } from "node:path";
+import { basename as basename8, resolve as resolve12 } from "node:path";
 function resolveAppId(options) {
   const appId = options.appId;
   if (!appId) {
@@ -278881,8 +278890,8 @@ function resolveAppId(options) {
 async function scaffoldAction(ctx, name, options, command) {
   const { log, runTask } = ctx;
   const appId = resolveAppId(command.optsWithGlobals());
-  const resolvedPath = resolve11("./");
-  const projectName = (name ?? basename7(resolvedPath)).trim();
+  const resolvedPath = resolve12("./");
+  const projectName = (name ?? basename8(resolvedPath)).trim();
   const template = await getTemplateById("backend-only");
   log.info(`Scaffolding project at ${resolvedPath}`);
   const { projectId } = await runTask("Setting up your project...", async () => {
@@ -279298,7 +279307,7 @@ function getSecretsListCommand() {
 }
 
 // src/cli/commands/secrets/set.ts
-import { resolve as resolve12 } from "node:path";
+import { resolve as resolve13 } from "node:path";
 function parseEntries(entries) {
   const secrets = {};
   for (const entry of entries) {
@@ -279329,7 +279338,7 @@ async function setSecretsAction({ log, runTask }, entries, options) {
   validateInput(entries, options);
   let secrets;
   if (options.envFile) {
-    secrets = await parseEnvFile(resolve12(options.envFile));
+    secrets = await parseEnvFile(resolve13(options.envFile));
     if (Object.keys(secrets).length === 0) {
       throw new InvalidInputError("The env file contains no valid KEY=VALUE entries.");
     }
@@ -279358,7 +279367,7 @@ function getSecretsCommand() {
 }
 
 // src/cli/commands/site/deploy.ts
-import { resolve as resolve13 } from "node:path";
+import { resolve as resolve14 } from "node:path";
 async function deployAction2(ctx, options) {
   const { isNonInteractive } = ctx;
   if (isNonInteractive && !options.yes) {
@@ -279436,7 +279445,7 @@ async function deployTarball({ runTask }, project) {
 }
 function siteOutputDir(project) {
   const outputDirectory = project.site?.outputDirectory;
-  return outputDirectory ? resolve13(project.root, outputDirectory) : null;
+  return outputDirectory ? resolve14(project.root, outputDirectory) : null;
 }
 function getSiteDeployCommand() {
   const command = new Base44Command("deploy").description("Deploy built site files to Base44 hosting").option("-y, --yes", "Skip confirmation prompt").option("--build", "Build the site before deploying (skips the prompt)").option("--no-build", "Deploy without building (skips the prompt)");
@@ -281938,7 +281947,7 @@ function createCustomIntegrationRoutes(remoteProxy, logger) {
 
 // src/cli/dev/dev-server/watcher.ts
 import { EventEmitter as EventEmitter6 } from "node:events";
-import { relative as relative9 } from "node:path";
+import { relative as relative10 } from "node:path";
 
 // ../../node_modules/chokidar/index.js
 import { EventEmitter as EventEmitter5 } from "node:events";
@@ -283623,7 +283632,7 @@ class WatchBase44 extends EventEmitter6 {
       ignoreInitial: true
     });
     watcher.on("all", import_debounce4.default(async (_event, path) => {
-      this.emit("change", name, relative9(targetPath, path));
+      this.emit("change", name, relative10(targetPath, path));
     }, WATCH_DEBOUNCE_MS));
     watcher.on("error", (err) => {
       this.logger.error(`Watch handler failed for ${targetPath}`, err);
@@ -284133,7 +284142,7 @@ Examples:
 }
 
 // src/cli/commands/project/eject.ts
-import { resolve as resolve17 } from "node:path";
+import { resolve as resolve18 } from "node:path";
 var import_kebabCase3 = __toESM(require_kebabCase(), 1);
 async function eject(ctx, options, command) {
   const { log, runTask, isNonInteractive } = ctx;
@@ -284197,7 +284206,7 @@ async function eject(ctx, options, command) {
     Ne("Operation cancelled.");
     throw new CLIExitError(0);
   }
-  const resolvedPath = resolve17(selectedPath);
+  const resolvedPath = resolve18(selectedPath);
   await runTask("Downloading your project's code...", async (updateMessage) => {
     await createProjectFilesForExistingProject({
       projectId,
@@ -288334,4 +288343,4 @@ export {
   runCLI
 };
 
-//# debugId=72FC25F5FAAAB35A64756E2164756E21
+//# debugId=291EFF5BA3908B9064756E2164756E21