fix bugs from coderabbit

Author: carderne

apps/webapp/app/components/navigation/EnvironmentSelector.tsx

@@ -235,7 +235,12 @@ function Branches({
       ? "no-active-branches"
       : "has-branches";
 
-  const currentBranchIsArchived = environment.archivedAt !== null;
+  // Only surface the active environment's archived-branch item in the submenu it
+  // actually belongs to. Both Development and Preview render this component, so
+  // without the parent check an archived dev branch would leak into the Preview
+  // submenu (and vice-versa).
+  const currentBranchIsArchived =
+    environment.archivedAt !== null && environment.parentEnvironmentId === parentEnvironment.id;
 
   const envTextClassName = environmentTextClassName(parentEnvironment);
 

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

@@ -138,7 +138,7 @@ export class BranchesPresenter {
         // The branchable parent is the root env (no parent). For dev that's
         // derivable; for preview we trust the isBranchableEnvironment column.
         ...(envType === "DEVELOPMENT"
-          ? { parentEnvironmentId: null }
+          ? { parentEnvironmentId: null, orgMember: { userId } }
           : { isBranchableEnvironment: true }),
       },
     });

apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.dev-branches/route.tsx

@@ -202,7 +202,7 @@ export default function Page() {
                                   className={cn("size-4", isSelected && "text-dev")}
                                 />
                                 <CopyableText
-                                  value={branch.branchName ?? ""}
+                                  value={branch.branchName}
                                   className={cn(isSelected && "text-dev")}
                                 />
                                 {isSelected && <Badge variant="extra-small">Current</Badge>}

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

@@ -318,26 +318,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";
 
@@ -354,11 +354,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);
 
 /**
@@ -539,10 +539,18 @@ export async function authenticatedEnvironmentForAuthentication(
       const environment = await $replica.runtimeEnvironment.findFirst({
         where: {
           projectId: project.id,
+          slug: slug,
           type: {
             in: ["PREVIEW", "DEVELOPMENT"],
           },
           branchName: resolvedBranch,
+          ...(slug === "dev"
+            ? {
+              orgMember: {
+                userId: user.id,
+              },
+            }
+            : {}),
           archivedAt: null,
         },
         include: authIncludeWithParent,
@@ -605,9 +613,9 @@ export async function authenticatedEnvironmentForAuthentication(
       const environment = await $replica.runtimeEnvironment.findFirst({
         where: {
           projectId: project.id,
-          type: {
-            in: ["PREVIEW", "DEVELOPMENT"],
-          },
+          slug: slug,
+          // No Development branches for OAT
+          type: "PREVIEW",
           branchName: resolvedBranch,
           archivedAt: null,
         },

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

@@ -241,6 +241,7 @@ async function startDev(options: StartDevOptions) {
   logger.debug("Starting dev CLI", { options });
 
   let watcher: Awaited<ReturnType<typeof watchConfig>> | undefined;
+  let removeLockFile: (() => void) | undefined;
 
   try {
     if (options.logLevel) {
@@ -269,7 +270,7 @@ async function startDev(options: StartDevOptions) {
     const envVars = resolveLocalEnvVars(options.envFile);
     const branch = getDevBranch({ specified: options.branch ?? envVars.TRIGGER_DEV_BRANCH });
 
-    const removeLockFile = await createLockFile(options.cwd, branch);
+    removeLockFile = await createLockFile(options.cwd, branch);
 
     let devInstance: DevSessionInstance | undefined;
 
@@ -348,11 +349,12 @@ async function startDev(options: StartDevOptions) {
       stop: async () => {
         devInstance?.stop();
         await watcher?.stop();
-        removeLockFile();
+        removeLockFile?.();
       },
       waitUntilExit,
     };
   } catch (error) {
+    removeLockFile?.();
     await watcher?.stop();
     throw error;
   }

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

@@ -5,17 +5,21 @@ import { devBranchPathSegment } from "../utilities/devBranch.js";
 import { logger } from "../utilities/logger.js";
 import { mkdir, writeFile } from "node:fs/promises";
 import { existsSync, unlinkSync } from "node:fs";
+import { createHash } from "node:crypto";
 import { onExit } from "signal-exit";
 
 const LOCK_FILE_NAME = "dev.lock";
 
 /**
  * Builds the lock file name for a given branch. The default branch keeps the
  * original `dev.lock` name (backwards compatible).
+ * Throws in a SHA1 of the non-sanitized filename to prevent collision
  */
 function lockFileName(branch?: string) {
   const safeBranch = devBranchPathSegment(branch);
-  return safeBranch ? `dev.${safeBranch}.lock` : LOCK_FILE_NAME;
+  if (!safeBranch || !branch) return LOCK_FILE_NAME;
+  const branchHash = createHash("sha1").update(branch).digest("hex").slice(0, 8);
+  return `dev.${safeBranch}.${branchHash}.lock`;
 }
 
 export async function createLockFile(cwd: string, branch?: string) {

packages/cli-v3/src/utilities/analyze.ts

@@ -209,7 +209,7 @@ function formatSize(bytes: number): string {
 function normalizePath(path: string): string {
   // Remove .trigger/tmp/build-<hash>/ prefix (tmp root may be branch-scoped,
   // e.g. .trigger/tmp-feature-foo/build-<hash>/)
-  return path.replace(/(^|\/)\.trigger\/tmp(-[^/]+)?\/build-[^/]+\//, "");
+  return path.replace(/(^|\/)\.trigger\/tmp(-[^/]+)?\/build-[^/]+\//, "$1");
 }
 
 interface BundleTreeData {