fix(webapp): make dev branch shortcodes deterministic

Author: carderne

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

@@ -17,7 +17,6 @@ import { logger } from "./logger.server";
 import { getCurrentPlan, getLimit } from "./platform.v3.server";
 import { type z } from "zod";
 import invariant from "tiny-invariant";
-import { nanoid } from "nanoid";
 import { type CreateBranchOptions } from "~/utils/branches";
 import {
   applyBillingLimitPauseAfterEnvCreate,
@@ -148,8 +147,11 @@ export class UpsertBranchService {
       const pkApiKey = createPkApiKeyForEnv(parentEnvironment.type);
       const isDevelopmentBranch = parentEnvironment.type === "DEVELOPMENT";
       // Dev branch slugs are member-scoped, but shortcodes remain project-scoped.
-      // Keep the readable slug while giving each member's branch a unique shortcode.
-      const shortcode = isDevelopmentBranch ? `${branchSlug}-${nanoid()}` : branchSlug;
+      // The parent shortcode is already unique within the project, so it gives
+      // each member's branch a stable, readable shortcode without a migration.
+      const shortcode = isDevelopmentBranch
+        ? `${branchSlug}-${parentEnvironment.shortcode}`
+        : branchSlug;
       let branchWhere: Prisma.RuntimeEnvironmentWhereUniqueInput;
       if (isDevelopmentBranch) {
         invariant(parentEnvironment.orgMemberId, "Development branches require an org member");

apps/webapp/test/devBranchServices.test.ts

@@ -97,7 +97,7 @@ describe("UpsertBranchService — DEVELOPMENT parent", () => {
       },
     });
 
-    await Promise.all([
+    const [firstRoot, secondRoot] = await Promise.all([
       createDevRoot(prisma, project.id, organization.id, firstMember.id),
       createDevRoot(prisma, project.id, organization.id, secondMember.id),
     ]);
@@ -122,7 +122,8 @@ describe("UpsertBranchService — DEVELOPMENT parent", () => {
     if (!firstResult.success || !secondResult.success) return;
     expect(firstResult.branch.id).not.toBe(secondResult.branch.id);
     expect(firstResult.branch.slug).toBe(secondResult.branch.slug);
-    expect(firstResult.branch.shortcode).not.toBe(secondResult.branch.shortcode);
+    expect(firstResult.branch.shortcode).toBe(`dev-shared-name-${firstRoot.shortcode}`);
+    expect(secondResult.branch.shortcode).toBe(`dev-shared-name-${secondRoot.shortcode}`);
     expect(firstResult.branch.orgMemberId).toBe(firstMember.id);
     expect(secondResult.branch.orgMemberId).toBe(secondMember.id);