revert: remove DEPLOY_VERSION_SUFFIX and version-suffix handling

The version-suffix work (DEPLOY_VERSION_SUFFIX env var, suffix-aware
ordering in calculateNextBuildVersion / compareDeploymentVersions, SQL
ORDER BY rewrites in DeploymentListPresenter / TestPresenter,
suffix-aware comparisons in devQueueConsumer, test setup duplication
in run-engine) is no longer needed.

For our self-hosted deployment:
  - upstream's default version scheme (YYYYMMDD.N) is fine for tracking
    deployments
  - custom image tagging is handled by DEPLOY_IMAGE_OVERRIDE (separate
    feature, kept)

Restore the affected files to upstream main. Drop the related test
files and the suffix-fix commit's coverage.

Author: Conner Aldrich

apps/webapp/app/env.server.ts

@@ -344,7 +344,6 @@ const EnvironmentSchema = z
     COMPUTE_TEMPLATE_SHADOW_ROLLOUT_PCT: z.string().optional(),
 
     DEPLOY_IMAGE_PLATFORM: z.string().default("linux/amd64"),
-    DEPLOY_VERSION_SUFFIX: z.string().optional(),
     /**
      * Full image reference override - bypasses auto-generation of image tags.
      * When set, every deployment uses this exact image reference instead of

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

@@ -202,11 +202,7 @@ WHERE
   wd."projectId" = ${project.id}
   AND wd."environmentId" = ${environment.id}
 ORDER BY
-  string_to_array(split_part(wd."version", '-', 1), '.')::int[] DESC,
-  -- Capture the full suffix (everything after the first hyphen) so multi-hyphen
-  -- suffixes like "20260101.1-pre-rc.1" sort correctly. split_part(..., 2)
-  -- would drop everything after the second hyphen and tie-break incorrectly.
-  COALESCE(substring(wd."version" from '-(.*)$'), '') DESC
+  string_to_array(wd."version", '.')::int[] DESC
 LIMIT ${pageSize} OFFSET ${pageSize * (page - 1)};`;
 
     const { connectedGithubRepository } = project;
@@ -323,16 +319,7 @@ LIMIT ${pageSize} OFFSET ${pageSize * (page - 1)};`;
       FROM ${sqlDatabaseSchema}."WorkerDeployment"
       WHERE "projectId" = ${project.id}
         AND "environmentId" = ${environment.id}
-        AND (
-          string_to_array(split_part(version, '-', 1), '.')::int[] > string_to_array(split_part(${version}, '-', 1), '.')::int[]
-          OR (
-            string_to_array(split_part(version, '-', 1), '.')::int[] = string_to_array(split_part(${version}, '-', 1), '.')::int[]
-            -- Compare the full suffix (everything after the first hyphen) so
-            -- multi-hyphen suffixes like "1-pre-rc.1" vs "1-pre-rc.2" don't
-            -- tie. split_part(..., 2) only returns the second segment.
-            AND COALESCE(substring(version from '-(.*)$'), '') > COALESCE(substring(${version} from '-(.*)$'), '')
-          )
-        )
+        AND string_to_array(version, '.')::int[] > string_to_array(${version}, '.')::int[]
     `;
 
     const count = Number(deploymentsSinceVersion[0].count);

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

@@ -45,13 +45,7 @@ export class TestPresenter extends BasePresenter {
       >`WITH workers AS (
           SELECT
                 bw.*,
-                ROW_NUMBER() OVER(
-                  ORDER BY
-                    string_to_array(split_part(bw.version, '-', 1), '.')::int[] DESC,
-                    -- Capture the full suffix (everything after the first hyphen) so
-                    -- multi-hyphen suffixes like "1-pre-rc.1" sort correctly.
-                    COALESCE(substring(bw.version from '-(.*)$'), '') DESC
-                ) AS rn
+                ROW_NUMBER() OVER(ORDER BY string_to_array(bw.version, '.')::int[] DESC) AS rn
           FROM
                 ${sqlDatabaseSchema}."BackgroundWorker" bw
           WHERE "runtimeEnvironmentId" = ${envId}

apps/webapp/app/v3/marqs/devQueueConsumer.server.ts

@@ -22,7 +22,6 @@ import { FailedTaskRunService } from "../failedTaskRun.server";
 import { CancelDevSessionRunsService } from "../services/cancelDevSessionRuns.server";
 import { CompleteAttemptService } from "../services/completeAttempt.server";
 import { attributesFromAuthenticatedEnv, tracer } from "../tracer.server";
-import { compareDeploymentVersions } from "../utils/deploymentVersions";
 import { DevSubscriber, devPubSub } from "./devPubSub.server";
 
 const MessageBody = z.discriminatedUnion("type", [
@@ -591,7 +590,7 @@ export class DevQueueConsumer {
   }
 
   // Get the latest background worker based on the version.
-  // Versions are in the format of YYYYMMDD.N (e.g., 20240101.1) with optional suffix (e.g., 20240101.1-hardened)
+  // Versions are in the format of 20240101.1 and 20240101.2, or even 20240101.10, 20240101.11, etc.
   #getLatestBackgroundWorker() {
     const workers = Array.from(this._backgroundWorkers.values());
 
@@ -600,10 +599,22 @@ export class DevQueueConsumer {
     }
 
     return workers.reduce((acc, curr) => {
-      // Use compareDeploymentVersions to properly handle versions with suffixes
-      const comparison = compareDeploymentVersions(acc.version, curr.version);
-      // If curr is newer (comparison returns -1), use curr, otherwise use acc
-      return comparison < 0 ? curr : acc;
+      const accParts = acc.version.split(".").map(Number);
+      const currParts = curr.version.split(".").map(Number);
+
+      // Compare the major part
+      if (accParts[0] < currParts[0]) {
+        return curr;
+      } else if (accParts[0] > currParts[0]) {
+        return acc;
+      }
+
+      // Compare the minor part (assuming all versions have two parts)
+      if (accParts[1] < currParts[1]) {
+        return curr;
+      } else {
+        return acc;
+      }
     });
   }
 }

apps/webapp/app/v3/services/createBackgroundWorker.server.ts

@@ -10,7 +10,6 @@ import { BackgroundWorkerId, stringifyDuration } from "@trigger.dev/core/v3/isom
 import type { BackgroundWorker, TaskQueue, TaskQueueType } from "@trigger.dev/database";
 import cronstrue from "cronstrue";
 import { $transaction, Prisma, PrismaClientOrTransaction } from "~/db.server";
-import { env } from "~/env.server";
 import { sanitizeQueueName } from "~/models/taskQueue.server";
 import { AuthenticatedEnvironment } from "~/services/apiAuth.server";
 import { logger } from "~/services/logger.server";
@@ -67,7 +66,7 @@ export class CreateBackgroundWorkerService extends BaseService {
         return latestBackgroundWorker;
       }
 
-      const nextVersion = calculateNextBuildVersion(project.backgroundWorkers[0]?.version, env.DEPLOY_VERSION_SUFFIX);
+      const nextVersion = calculateNextBuildVersion(project.backgroundWorkers[0]?.version);
 
       logger.debug(`Creating background worker`, {
         nextVersion,

apps/webapp/app/v3/services/initializeDeployment.server.ts

@@ -107,7 +107,7 @@ export class InitializeDeploymentService extends BaseService {
         take: 1,
       });
 
-      const nextVersion = calculateNextBuildVersion(latestDeployment?.version, env.DEPLOY_VERSION_SUFFIX);
+      const nextVersion = calculateNextBuildVersion(latestDeployment?.version);
 
       if (payload.selfHosted && remoteBuildsEnabled()) {
         throw new ServiceValidationError(

apps/webapp/app/v3/utils/calculateNextBuildVersion.ts

@@ -1,34 +1,23 @@
 // Calculate next build version based on the previous version
 // Version formats are YYYYMMDD.1, YYYYMMDD.2, etc.
-// With optional suffix: YYYYMMDD.1-suffix
 // If there is no previous version, start at Todays date and .1
-export function calculateNextBuildVersion(latestVersion?: string | null, suffix?: string): string {
+export function calculateNextBuildVersion(latestVersion?: string | null): string {
   const today = new Date();
   const year = today.getFullYear();
   const month = today.getMonth() + 1;
   const day = today.getDate();
   const todayFormatted = `${year}${month < 10 ? "0" : ""}${month}${day < 10 ? "0" : ""}${day}`;
 
   if (!latestVersion) {
-    const baseVersion = `${todayFormatted}.1`;
-    return suffix ? `${baseVersion}-${suffix}` : baseVersion;
+    return `${todayFormatted}.1`;
   }
 
-  // Extract base version (everything before the first hyphen) — any existing
-  // suffix is intentionally discarded; the new version takes the suffix passed
-  // by the caller, which may differ. Avoid `split("-")` indexed destructuring
-  // here so multi-hyphen suffixes don't read confusingly.
-  const hyphenIndex = latestVersion.indexOf("-");
-  const baseVersion =
-    hyphenIndex === -1 ? latestVersion : latestVersion.slice(0, hyphenIndex);
-  const [date, buildNumber] = baseVersion.split(".");
+  const [date, buildNumber] = latestVersion.split(".");
 
   if (date === todayFormatted) {
     const nextBuildNumber = parseInt(buildNumber, 10) + 1;
-    const newBaseVersion = `${date}.${nextBuildNumber}`;
-    return suffix ? `${newBaseVersion}-${suffix}` : newBaseVersion;
+    return `${date}.${nextBuildNumber}`;
   }
 
-  const newBaseVersion = `${todayFormatted}.1`;
-  return suffix ? `${newBaseVersion}-${suffix}` : newBaseVersion;
+  return `${todayFormatted}.1`;
 }

apps/webapp/app/v3/utils/deploymentVersions.ts

@@ -1,26 +1,8 @@
 // Compares two versions of a deployment, like 20250208.1 and 20250208.2
-// Also handles versions with suffixes like 20250208.1-hardened
 // Returns -1 if versionA is older than versionB, 0 if they are the same, and 1 if versionA is newer than versionB
-
-const splitDeploymentVersion = (version: string): { base: string; suffix: string } => {
-  const hyphenIndex = version.indexOf("-");
-  if (hyphenIndex === -1) {
-    return { base: version, suffix: "" };
-  }
-  return {
-    base: version.slice(0, hyphenIndex),
-    // Capture everything after the first hyphen so multi-hyphen suffixes
-    // (e.g. "20250208.1-pre-rc.1") are preserved intact.
-    suffix: version.slice(hyphenIndex + 1),
-  };
-};
-
 export function compareDeploymentVersions(versionA: string, versionB: string) {
-  const { base: baseVersionA, suffix: suffixA } = splitDeploymentVersion(versionA);
-  const { base: baseVersionB, suffix: suffixB } = splitDeploymentVersion(versionB);
-
-  const [dateA, numberA] = baseVersionA.split(".");
-  const [dateB, numberB] = baseVersionB.split(".");
+  const [dateA, numberA] = versionA.split(".");
+  const [dateB, numberB] = versionB.split(".");
 
   if (dateA < dateB) {
     return -1;
@@ -42,20 +24,5 @@ export function compareDeploymentVersions(versionA: string, versionB: string) {
     return 1;
   }
 
-  // Base versions are equal, compare suffixes alphabetically
-  // Versions without suffixes should come before versions with suffixes
-  if (suffixA === "" && suffixB !== "") {
-    return -1;
-  }
-  if (suffixA !== "" && suffixB === "") {
-    return 1;
-  }
-  if (suffixA < suffixB) {
-    return -1;
-  }
-  if (suffixA > suffixB) {
-    return 1;
-  }
-
   return 0;
 }