more env filtering correctness

Author: carderne

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

@@ -109,7 +109,7 @@ export class OrganizationsPresenter {
     const environment = this.#getEnvironment({
       user,
       projectId: fullProject.id,
-      environments: fullProject.environments,
+      environments,
       environmentSlug,
     });
 

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

@@ -73,7 +73,7 @@ export async function action({ request, params }: ActionFunctionArgs) {
           },
       // Dev branches are per-org-member: only the owner may archive their own.
       ...(authenticationResult.type !== "organizationAccessToken" &&
-      environmentType === "DEVELOPMENT"
+        environmentType === "DEVELOPMENT"
         ? { orgMember: { userId: authenticationResult.result.userId } }
         : {}),
       project: {
@@ -88,7 +88,21 @@ export async function action({ request, params }: ActionFunctionArgs) {
     return json({ error: "Branch not found" }, { status: 404 });
   }
 
-  const environment = environments.find((env) => env.archivedAt === null);
+  const activeEnvironments = environments.filter((env) => env.archivedAt === null);
+
+  if (
+    authenticationResult.type === "organizationAccessToken" &&
+    environmentType === "DEVELOPMENT" &&
+    activeEnvironments.length > 1
+  ) {
+    return json(
+      { error: "Branch name is ambiguous for development environments. Use a personal access token scoped to the branch owner." },
+      { status: 409 }
+    );
+  }
+
+  const environment = activeEnvironments[0];
+
   if (!environment) {
     return json({ error: "Branch already archived" }, { status: 400 });
   }

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

@@ -23,6 +23,7 @@ export const loader = createSSELoader({
         },
         project: {
           slug: projectParam,
+          organization: { slug: organizationSlug },
         },
       },
     });

apps/webapp/app/routes/resources.taskruns.$runParam.replay.ts

@@ -146,6 +146,7 @@ export async function loader({ request, params }: LoaderFunctionArgs) {
             type: true,
             slug: true,
             branchName: true,
+            parentEnvironmentId: true,
             orgMember: { select: { user: true } },
           },
           where: {