WIP

Author: carderne

apps/webapp/app/models/runtimeEnvironment.server.ts

@@ -99,11 +99,11 @@ export async function findEnvironmentByApiKey(
     ...authIncludeBase,
     childEnvironments: branchName
       ? {
-          where: {
-            branchName: sanitizeBranchName(branchName),
-            archivedAt: null,
-          },
-        }
+        where: {
+          branchName: sanitizeBranchName(branchName),
+          archivedAt: null,
+        },
+      }
       : undefined,
   } satisfies Prisma.RuntimeEnvironmentInclude;
 
@@ -162,6 +162,25 @@ export async function findEnvironmentByApiKey(
     return null;
   }
 
+  // If there is no branch name (or "default"), then fall back to regular behavior, return root env
+  if (environment.type === "DEVELOPMENT" && branchName !== undefined && branchName !== "default") {
+    const childEnvironment = environment.childEnvironments.at(0);
+
+    if (childEnvironment) {
+      return toAuthenticated({
+        ...childEnvironment,
+        apiKey: environment.apiKey,
+        orgMember: environment.orgMember,
+        organization: environment.organization,
+        project: environment.project,
+      });
+    }
+
+    //A branch was specified but no child environment was found
+    return null;
+
+  }
+
   return toAuthenticated(environment);
 }
 

packages/cli-v3/src/commands/dev.ts

@@ -32,6 +32,7 @@ const DevCommandOptions = CommonCommandOptions.extend({
   debugOtel: z.boolean().default(false),
   config: z.string().optional(),
   projectRef: z.string().optional(),
+  branch: z.string().optional().default("branch"),
   skipUpdateCheck: z.boolean().default(false),
   skipPlatformNotifications: z.boolean().default(false),
   envFile: z.string().optional(),
@@ -57,6 +58,11 @@ export function configureDevCommand(program: Command) {
         "-p, --project-ref <project ref>",
         "The project ref. Required if there is no config file."
       )
+      .option(
+        "-b, --branch <branch>",
+        "The dev branch to use. If not provided, we'll use the default branch."
+        "default",
+      )
       .option(
         "--env-file <env file>",
         "Path to the .env file to use for the dev session. Defaults to .env in the project directory."
@@ -164,8 +170,7 @@ export async function devCommand(options: DevCommandOptions) {
       );
     } else {
       logger.log(
-        `${chalkError("X Error:")} You must login first. Use the \`login\` CLI command.\n\n${
-          authorization.error
+        `${chalkError("X Error:")} You must login first. Use the \`login\` CLI command.\n\n${authorization.error
         }`
       );
     }
@@ -201,9 +206,9 @@ async function startDev(options: StartDevOptions) {
     const notificationPromise = options.skipPlatformNotifications
       ? undefined
       : fetchPlatformNotification({
-          apiClient: new CliApiClient(options.login.auth.apiUrl, options.login.auth.accessToken),
-          projectRef: options.projectRef,
-        });
+        apiClient: new CliApiClient(options.login.auth.apiUrl, options.login.auth.accessToken),
+        projectRef: options.projectRef,
+      });
 
     await printStandloneInitialBanner(true, options.profile);
 
@@ -274,7 +279,7 @@ async function startDev(options: StartDevOptions) {
 
     devInstance = await bootDevSession(watcher.config);
 
-    const waitUntilExit = async () => {};
+    const waitUntilExit = async () => { };
 
     return {
       watcher,

packages/core/src/v3/apiClient/getBranch.ts

@@ -31,3 +31,22 @@ export function getBranch({
 
   return undefined;
 }
+
+export function getDevBranch({
+  specified,
+}: {
+  specified?: string;
+}): string {
+  if (specified) {
+    return specified;
+  }
+
+  // not specified, so detect our variable from process.env
+  const envVar = getEnvVar("TRIGGER_DEV_BRANCH");
+  if (envVar) {
+    return envVar;
+  }
+
+  // For development we don't look at git/Vercel
+  return "default";
+}