wip4

Author: carderne

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

@@ -215,7 +215,7 @@ export async function acceptInvite({
         organization: invite.organization,
         project,
         type: "DEVELOPMENT",
-        isBranchableEnvironment: false,
+        isBranchableEnvironment: true,
         member,
         prismaClient: tx,
       });

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

@@ -126,7 +126,7 @@ export async function createProject(
       organization,
       project,
       type: "DEVELOPMENT",
-      isBranchableEnvironment: false,
+      isBranchableEnvironment: true,
       member,
     });
   }

apps/webapp/app/presenters/OrganizationsPresenter.server.ts

@@ -244,7 +244,7 @@ export class OrganizationsPresenter {
 
     //otherwise show their dev environment
     const yourDevEnvironment = environments.find(
-      (env) => env.type === "DEVELOPMENT" && env.orgMember?.userId === user.id
+      (env) => env.type === "DEVELOPMENT" && env.branchName === null && env.orgMember?.userId === user.id
     );
     if (yourDevEnvironment) {
       return yourDevEnvironment;

apps/webapp/app/presenters/SelectBestEnvironmentPresenter.server.ts

@@ -1,7 +1,7 @@
 import {
   type RuntimeEnvironment,
   type PrismaClient,
-  RuntimeEnvironmentType,
+  type RuntimeEnvironmentType,
 } from "@trigger.dev/database";
 import { prisma } from "~/db.server";
 import { logger } from "~/services/logger.server";
@@ -140,7 +140,7 @@ export class SelectBestEnvironmentPresenter {
   }
 
   async selectBestEnvironment<
-    T extends { id: string; type: RuntimeEnvironmentType; orgMember: { userId: string } | null }
+    T extends { id: string; type: RuntimeEnvironmentType; slug: string; orgMember: { userId: string } | null }
   >(projectId: string, user: UserFromSession, environments: T[]): Promise<T> {
     //try get current environment from prefs
     const currentEnvironmentId: string | undefined =
@@ -153,7 +153,8 @@ export class SelectBestEnvironmentPresenter {
 
     //otherwise show their dev environment
     const yourDevEnvironment = environments.find(
-      (env) => env.type === "DEVELOPMENT" && env.orgMember?.userId === user.id
+      // Return the default dev environment, not a branch
+      (env) => env.type === "DEVELOPMENT" && env.slug === "dev" && env.orgMember?.userId === user.id
     );
     if (yourDevEnvironment) {
       return yourDevEnvironment;

apps/webapp/app/presenters/v3/BranchesPresenter.server.ts

@@ -92,6 +92,7 @@ export class BranchesPresenter {
       },
       where: {
         projectId: project.id,
+        type: "PREVIEW",
         isBranchableEnvironment: true,
       },
     });
@@ -124,18 +125,18 @@ export class BranchesPresenter {
         projectId: project.id,
         branchName: search
           ? {
-              contains: search,
-              mode: "insensitive",
-            }
+            contains: search,
+            mode: "insensitive",
+          }
           : {
-              not: null,
-            },
+            not: null,
+          },
         ...(showArchived ? {} : { archivedAt: null }),
       },
     });
 
     // Limits
-    const limits = await checkBranchLimit({ prisma: this.#prismaClient, organizationId: project.organizationId, projectId: project.id });
+    const limits = await checkBranchLimit({ prisma: this.#prismaClient, organizationId: project.organizationId, projectId: project.id, env: "preview" });
 
     const [currentPlan, plans] = await Promise.all([
       getCurrentPlan(project.organizationId),
@@ -163,12 +164,12 @@ export class BranchesPresenter {
         projectId: project.id,
         branchName: search
           ? {
-              contains: search,
-              mode: "insensitive",
-            }
+            contains: search,
+            mode: "insensitive",
+          }
           : {
-              not: null,
-            },
+            not: null,
+          },
         ...(showArchived ? {} : { archivedAt: null }),
       },
       orderBy: {

apps/webapp/app/routes/api.v1.projects.$projectRef.branches.archive.ts

@@ -11,6 +11,7 @@ const ParamsSchema = z.object({
 });
 
 const BodySchema = z.object({
+  env: z.enum(["preview", "development"]),
   branch: z.string(),
 });
 
@@ -49,6 +50,9 @@ export async function action({ request, params }: ActionFunctionArgs) {
     return json({ error: parsed.error.message }, { status: 400 });
   }
 
+  const { env, branch } = parsed.data;
+
+  const environmentType = env === "preview" ? "PREVIEW" : "DEVELOPMENT";
   const environments = await prisma.runtimeEnvironment.findMany({
     select: {
       id: true,
@@ -59,16 +63,17 @@ export async function action({ request, params }: ActionFunctionArgs) {
         authenticationResult.type === "organizationAccessToken"
           ? { id: authenticationResult.result.organizationId }
           : {
-              members: {
-                some: {
-                  userId: authenticationResult.result.userId,
-                },
+            members: {
+              some: {
+                userId: authenticationResult.result.userId,
               },
             },
+          },
       project: {
         externalRef: projectRef,
       },
-      branchName: parsed.data.branch,
+      type: environmentType,
+      branchName: branch,
     },
   });
 

apps/webapp/app/routes/resources.branches.archive.tsx

@@ -91,7 +91,7 @@ export function ArchiveButton({
         <div className="mt-2 flex flex-col gap-4">
           <Form
             method="post"
-            action="/resources/branches/archive"
+            action="/resources/branssches/archive"
             {...form.props}
             className="w-full"
           >

apps/webapp/app/routes/resources.orgs.$organizationSlug.projects.$projectParam.dev.presence.tsx

@@ -14,6 +14,7 @@ export const loader = createSSELoader({
     const userId = await requireUserId(request);
     const { organizationSlug, projectParam } = ProjectParamSchema.parse(params);
 
+    // TODO support branch dev envs
     const environment = await $replica.runtimeEnvironment.findFirst({
       where: {
         type: "DEVELOPMENT",

apps/webapp/app/services/apiAuth.server.ts

@@ -305,26 +305,26 @@ function getApiKeyResult(apiKey: string): {
   const type = isPublicApiKey(apiKey)
     ? "PUBLIC"
     : isSecretApiKey(apiKey)
-    ? "PRIVATE"
-    : isPublicJWT(apiKey)
-    ? "PUBLIC_JWT"
-    : "PRIVATE"; // Fallback to private key
+      ? "PRIVATE"
+      : isPublicJWT(apiKey)
+        ? "PUBLIC_JWT"
+        : "PRIVATE"; // Fallback to private key
   return { apiKey, type };
 }
 
 export type AuthenticationResult =
   | {
-      type: "personalAccessToken";
-      result: PersonalAccessTokenAuthenticationResult;
-    }
+    type: "personalAccessToken";
+    result: PersonalAccessTokenAuthenticationResult;
+  }
   | {
-      type: "organizationAccessToken";
-      result: OrganizationAccessTokenAuthenticationResult;
-    }
+    type: "organizationAccessToken";
+    result: OrganizationAccessTokenAuthenticationResult;
+  }
   | {
-      type: "apiKey";
-      result: ApiAuthenticationResult;
-    };
+    type: "apiKey";
+    result: ApiAuthenticationResult;
+  };
 
 type AuthenticationMethod = "personalAccessToken" | "organizationAccessToken" | "apiKey";
 
@@ -341,11 +341,11 @@ type FilteredAuthenticationResult<
   T extends AllowedAuthenticationMethods = AllowedAuthenticationMethods
 > =
   | (T["personalAccessToken"] extends true
-      ? Extract<AuthenticationResult, { type: "personalAccessToken" }>
-      : never)
+    ? Extract<AuthenticationResult, { type: "personalAccessToken" }>
+    : never)
   | (T["organizationAccessToken"] extends true
-      ? Extract<AuthenticationResult, { type: "organizationAccessToken" }>
-      : never)
+    ? Extract<AuthenticationResult, { type: "organizationAccessToken" }>
+    : never)
   | (T["apiKey"] extends true ? Extract<AuthenticationResult, { type: "apiKey" }> : never);
 
 /**
@@ -501,10 +501,10 @@ export async function authenticatedEnvironmentForAuthentication(
             slug: slug,
             ...(slug === "dev"
               ? {
-                  orgMember: {
-                    userId: user.id,
-                  },
-                }
+                orgMember: {
+                  userId: user.id,
+                },
+              }
               : {}),
           },
           include: authIncludeBase,
@@ -520,7 +520,9 @@ export async function authenticatedEnvironmentForAuthentication(
       const environment = await $replica.runtimeEnvironment.findFirst({
         where: {
           projectId: project.id,
-          type: "PREVIEW",
+          type: {
+            in: ["PREVIEW", "DEVELOPMENT"],
+          },
           branchName: sanitizedBranch,
           archivedAt: null,
         },
@@ -532,10 +534,10 @@ export async function authenticatedEnvironmentForAuthentication(
       }
 
       if (!environment.parentEnvironment) {
-        throw json({ error: "Branch not associated with a preview environment" }, { status: 400 });
+        throw json({ error: "Branch not associated with a parent environment" }, { status: 400 });
       }
 
-      // PREVIEW envs reuse the parent's apiKey for downstream auth flows
+      // PREVIEW envs (and DEVELOPMENT branches) reuse the parent's apiKey for downstream auth flows
       // (signed JWTs, internal-fetch helpers). Override before mapping so
       // the slim shape carries the parent's key.
       return toAuthenticated({
@@ -586,7 +588,9 @@ export async function authenticatedEnvironmentForAuthentication(
       const environment = await $replica.runtimeEnvironment.findFirst({
         where: {
           projectId: project.id,
-          type: "PREVIEW",
+          type: {
+            in: ["PREVIEW", "DEVELOPMENT"],
+          },
           branchName: sanitizedBranch,
           archivedAt: null,
         },

apps/webapp/app/services/archiveBranch.server.ts

@@ -56,13 +56,20 @@ export class ArchiveBranchService {
         },
       });
 
-      if (!environment.parentEnvironmentId) {
+      if (!environment.parentEnvironmentId || environment.isBranchableEnvironment) {
         return {
           success: false as const,
           error: "This isn't a branch, and cannot be archived.",
         };
       }
 
+      if (environment.type === "DEVELOPMENT" && environment.branchName === null) {
+        return {
+          success: false as const,
+          error: "The default development branch cannot be archived.",
+        };
+      }
+
       const slug = `${environment.slug}-${nanoid(6)}`;
       const shortcode = slug;