@base44-preview/cli 0.1.14-pr.621.e6723c1 → 0.1.14-pr.623.3dbbbbb

package/dist/cli/index.js

@@ -246959,6 +246959,39 @@ function showPlainError(error) {
   }
 }
 
+// src/core/resources/branch/api.ts
+var BranchesSchema = array(object({
+  id: string2().min(1),
+  branch_name: string2(),
+  status: _enum(["active", "merged", "deleted"])
+}));
+async function listBranches() {
+  let response;
+  try {
+    response = await getAppClient().get("branches", { timeout: 30000 });
+  } catch (error) {
+    throw await ApiError.fromHttpError(error, "listing branches");
+  }
+  const result = BranchesSchema.safeParse(await response.json());
+  if (!result.success) {
+    throw new SchemaValidationError("Invalid branches response from server", result.error);
+  }
+  return result.data.filter((branch) => branch.status === "active");
+}
+async function resolveBranchName(name) {
+  if (name === "main")
+    return;
+  const branches = await listBranches();
+  const matches = branches.filter((branch) => branch.branch_name === name);
+  if (matches.length === 0) {
+    throw new InvalidInputError(`Branch "${name}" was not found in this app.`);
+  }
+  if (matches.length > 1) {
+    throw new InvalidInputError(`Branch name "${name}" is ambiguous. Give the branches unique names before retrying.`);
+  }
+  return matches[0].id;
+}
+
 // src/cli/utils/command/Base44Command.ts
 function writeJsonSuccess(result) {
   if (result.stdout) {
@@ -247005,7 +247038,8 @@ class Base44Command extends Command2 {
     this._commandOptions = {
       requireAuth: options?.requireAuth ?? true,
       requireAppContext: options?.requireAppContext ?? true,
-      fullBanner: options?.fullBanner ?? false
+      fullBanner: options?.fullBanner ?? false,
+      supportsBranch: options?.supportsBranch ?? false
     };
   }
   setContext(context) {
@@ -247026,6 +247060,13 @@ class Base44Command extends Command2 {
       }
       const upgradeCheckPromise = startUpgradeCheck();
       try {
+        const { branch } = this.optsWithGlobals();
+        if (branch !== undefined && !this._commandOptions.supportsBranch) {
+          throw new InvalidInputError("--branch is not supported by this command. Use sandbox commands to read or edit branch files; no app changes were made.");
+        }
+        if (branch !== undefined && !branch.trim()) {
+          throw new InvalidInputError("--branch must not be empty.");
+        }
         if (this._commandOptions.requireAuth) {
           await ensureAuth(this.context);
         }
@@ -247033,7 +247074,8 @@ class Base44Command extends Command2 {
           const { appId } = this.optsWithGlobals();
           await ensureAppContext(this.context, { appId });
         }
-        const result = await fn(this.context, ...args) ?? {};
+        const resolvedBranchId = branch !== undefined ? await resolveBranchName(branch) : undefined;
+        const result = await fn({ ...this.context, branchId: resolvedBranchId }, ...args) ?? {};
         if (!quiet) {
           await showCommandEnd(result, upgradeCheckPromise, this.context.distribution);
         } else if (jsonMode) {
@@ -247881,6 +247923,31 @@ function getWhoamiCommand() {
   return new Base44Command("whoami", { requireAppContext: false }).description("Display current authenticated user").action(whoami);
 }
 
+// src/cli/commands/branches/index.ts
+async function listBranchesAction({
+  log,
+  runTask,
+  jsonMode
+}) {
+  const remote = await runTask("Fetching branches", () => listBranches());
+  const branches = [
+    { name: "main", status: "active" },
+    ...remote.map((branch) => ({
+      name: branch.branch_name,
+      status: branch.status
+    }))
+  ];
+  if (jsonMode)
+    return { stdout: `${JSON.stringify({ branches })}
+` };
+  for (const branch of branches)
+    log.message(`${branch.name} (${branch.status})`);
+  return { outroMessage: `${branches.length} branches` };
+}
+function getBranchesCommand() {
+  return new Command2("branches").description("Discover an app's branches").addCommand(new Base44Command("list").description("List main and active branch names for use with --branch").action(listBranchesAction));
+}
+
 // ../../node_modules/open/index.js
 import process20 from "node:process";
 import path16 from "node:path";
@@ -250294,13 +250361,16 @@ function parsePositiveInt(value, flagName) {
 }
 
 // src/cli/commands/sandbox/checkpoint.ts
-async function checkpointAction({ runTask }, options) {
+async function checkpointAction({ runTask, branchId }, options) {
   const { id: appId } = getAppContext();
-  const result = await runTask("Creating checkpoint", () => createCheckpoint(appId, { name: options.name }));
+  const result = await runTask("Creating checkpoint", () => createCheckpoint(appId, {
+    name: options.name,
+    branch_id: branchId
+  }));
   return { outroMessage: "Created checkpoint", stdout: toJsonStdout(result) };
 }
 function getSandboxCheckpointCommand() {
-  return new Base44Command("checkpoint").description("Create a restore-point checkpoint of an app's remote sandbox").option("--name <name>", "Optional message/title for the checkpoint (defaults to an auto-generated title)").addHelpText("after", `
+  return new Base44Command("checkpoint", { supportsBranch: true }).description("Create a restore-point checkpoint of an app's remote sandbox").option("--name <name>", "Optional message/title for the checkpoint (defaults to an auto-generated title)").addHelpText("after", `
 Examples:
   $ base44 sandbox checkpoint
   $ base44 sandbox checkpoint --name "before refactor"`).action(checkpointAction);
@@ -250325,18 +250395,23 @@ function parseEdits(raw) {
   }
   return result.data;
 }
-async function editFileAction({ runTask }, path, options) {
+async function editFileAction({ runTask, branchId }, path, options) {
   const { id: appId } = getAppContext();
   const raw = await resolveFlagOrStdin(options.editsJson, "--edits-json");
   const edits = parseEdits(raw);
-  const result = await runTask(options.dryRun ? "Previewing edit" : "Editing file", () => editFile(appId, { path, edits, dry_run: options.dryRun }));
+  const result = await runTask(options.dryRun ? "Previewing edit" : "Editing file", () => editFile(appId, {
+    path,
+    edits,
+    dry_run: options.dryRun,
+    branch_id: branchId
+  }));
   return {
     outroMessage: options.dryRun ? "Previewed edit" : "Edited file",
     stdout: toJsonStdout(result)
   };
 }
 function getSandboxEditFileCommand() {
-  return new Base44Command("edit").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", `
+  return new Base44Command("edit", { supportsBranch: true }).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:
@@ -250345,7 +250420,7 @@ Examples:
 }
 
 // src/cli/commands/sandbox/grep.ts
-async function grepAction({ runTask }, pattern, options) {
+async function grepAction({ runTask, branchId }, pattern, options) {
   const { id: appId } = getAppContext();
   const maxResults = parsePositiveInt(options.maxResults, "--max-results");
   const result = await runTask("Searching files", () => grep(appId, {
@@ -250354,20 +250429,22 @@ async function grepAction({ runTask }, pattern, options) {
     is_regex: options.regex,
     case_sensitive: options.caseSensitive,
     glob: options.glob,
-    max_results: maxResults
+    max_results: maxResults,
+    branch_id: branchId
   }));
   return { outroMessage: "Searched files", stdout: toJsonStdout(result) };
 }
 function getSandboxGrepCommand() {
-  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);
+  return new Base44Command("grep", { supportsBranch: true }).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 }, path, options) {
+async function listDirectoryAction({ runTask, branchId }, path, options) {
   const { id: appId } = getAppContext();
   const maxDepth = parsePositiveInt(options.maxDepth, "--max-depth");
   const result = await runTask("Listing directory", () => listDirectory(appId, {
     path,
+    branch_id: branchId,
     recursive: options.recursive,
     max_depth: maxDepth,
     include_hidden: options.includeHidden
@@ -250375,45 +250452,55 @@ async function listDirectoryAction({ runTask }, path, options) {
   return { outroMessage: "Listed directory", stdout: toJsonStdout(result) };
 }
 function getSandboxListDirectoryCommand() {
-  return new Base44Command("ls").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);
+  return new Base44Command("ls", { supportsBranch: true }).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 }, paths, options) {
+async function readFileAction({ runTask, branchId }, paths, options) {
   const { id: appId } = getAppContext();
   const offset = parsePositiveInt(options.offset, "--offset");
   const limit = parsePositiveInt(options.limit, "--limit");
-  const result = await runTask("Reading file", () => readFile4(appId, { paths, offset, limit }));
+  const result = await runTask("Reading file", () => readFile4(appId, { paths, offset, limit, branch_id: branchId }));
   return { outroMessage: "Read file", stdout: toJsonStdout(result) };
 }
 function getSandboxReadFileCommand() {
-  return new Base44Command("read").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);
+  return new Base44Command("read", { supportsBranch: true }).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/run-command.ts
-async function runCommandAction({ runTask }, commandParts, options) {
+async function runCommandAction({ runTask, branchId }, commandParts, options) {
   const { id: appId } = getAppContext();
   const timeoutMs = parsePositiveInt(options.timeoutMs, "--timeout-ms");
   const command = commandParts.join(" ");
-  const result = await runTask("Running command", () => runCommand(appId, { command, cwd: options.cwd, timeout_ms: timeoutMs }));
+  const result = await runTask("Running command", () => runCommand(appId, {
+    command,
+    cwd: options.cwd,
+    timeout_ms: timeoutMs,
+    branch_id: branchId
+  }));
   return { outroMessage: "Ran command", stdout: toJsonStdout(result) };
 }
 function getSandboxRunCommandCommand() {
-  return new Base44Command("run").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", `
+  return new Base44Command("run", { supportsBranch: true }).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 "npm test"
   $ base44 sandbox run ls -la --cwd src`).action(runCommandAction);
 }
 
 // src/cli/commands/sandbox/write-file.ts
-async function writeFileAction({ runTask }, path, options) {
+async function writeFileAction({ runTask, branchId }, path, options) {
   const { id: appId } = getAppContext();
   const content = await resolveFlagOrStdin(options.content, "--content");
-  const result = await runTask("Writing file", () => writeFile2(appId, { path, content, overwrite: options.overwrite }));
+  const result = await runTask("Writing file", () => writeFile2(appId, {
+    path,
+    content,
+    overwrite: options.overwrite,
+    branch_id: branchId
+  }));
   return { outroMessage: "Wrote file", stdout: toJsonStdout(result) };
 }
 function getSandboxWriteFileCommand() {
-  return new Base44Command("write").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", `
+  return new Base44Command("write", { supportsBranch: true }).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 notes.txt
   $ base44 sandbox write notes.txt --content "hello" --overwrite`).action(writeFileAction);
@@ -255407,7 +255494,7 @@ function getEjectCommand() {
 // src/cli/program.ts
 function createProgram(context) {
   const program = new Command2;
-  program.name("base44").description("Base44 CLI - Unified interface for managing Base44 applications").version(package_default.version).addOption(new Option2("--app-id <id>", "Base44 app ID to use").env(BASE44_APP_ID_ENV_VAR)).addOption(new Option2("--json", "Output machine-readable JSON to stdout (status/logs go to stderr)"));
+  program.name("base44").description("Base44 CLI - Unified interface for managing Base44 applications").version(package_default.version).option("--branch <name>", "Target an app branch by exact name (sandbox commands only)").addOption(new Option2("--app-id <id>", "Base44 app ID to use").env(BASE44_APP_ID_ENV_VAR)).addOption(new Option2("--json", "Output machine-readable JSON to stdout (status/logs go to stderr)"));
   program.configureHelp({
     sortSubcommands: true
   });
@@ -255436,6 +255523,7 @@ function createProgram(context) {
   program.addCommand(getWorkflowsCommand());
   program.addCommand(getSecretsCommand());
   program.addCommand(getSandboxCommand());
+  program.addCommand(getBranchesCommand());
   program.addCommand(getAuthCommand());
   program.addCommand(getSiteCommand());
   program.addCommand(getTypesCommand());
@@ -259489,4 +259577,4 @@ export {
   runCLI
 };
 
-//# debugId=08F7780409C3464664756E2164756E21
+//# debugId=DB7474A6029C0A5A64756E2164756E21