@@ -78,7 +78,7 @@ const { action, loader } = createActionApiRoute(
         }
       }
 
-      // Step 1: Create the waitpoint. Co-locate it with the owning run (run-ops split) so a ksuid
+      // Create the waitpoint. Co-locate it with the owning run (run-ops split) so a ksuid
       // run's input-stream waitpoint lands on the run's DB and its block edge resolves.
       const result = await engine.createManualWaitpoint({
         runId: run.id,
@@ -90,7 +90,7 @@ const { action, loader } = createActionApiRoute(
         tags: bodyTags,
       });
 
-      // Step 2: Cache the mapping in Redis for fast lookup from .send()
+      // Cache the mapping in Redis for fast lookup from .send()
       const ttlMs = timeout ? timeout.getTime() - Date.now() : undefined;
       await setInputStreamWaitpoint(
         run.friendlyId,
@@ -99,7 +99,7 @@ const { action, loader } = createActionApiRoute(
         ttlMs && ttlMs > 0 ? ttlMs : undefined
       );
 
-      // Step 3: Check if data was already sent to this input stream (race condition handling).
+      // Check if data was already sent to this input stream (race condition handling).
       // If .send() landed before .wait(), the data is in the S2 stream but no waitpoint
       // existed to complete. We check from the client's last known position.
       if (!result.isCached) {
 
@@ -99,7 +99,7 @@ const { action, loader } = createActionApiRoute(
         }
       }
 
-      // Step 1: Create the waitpoint. Co-locate it with the owning run (run-ops split) so a ksuid
+      // Create the waitpoint. Co-locate it with the owning run (run-ops split) so a ksuid
       // run's session-stream waitpoint lands on the run's DB and its block edge resolves.
       const result = await engine.createManualWaitpoint({
         runId: run.id,
@@ -111,7 +111,7 @@ const { action, loader } = createActionApiRoute(
         tags: bodyTags,
       });
 
-      // Step 2: Register the waitpoint on the session channel so the next
+      // Register the waitpoint on the session channel so the next
       // append fires it. Keyed by (environmentId, addressingKey, io) — the
       // canonical string for the row, scoped to the environment because
       // externalIds are only unique per environment. The append handler
@@ -126,7 +126,7 @@ const { action, loader } = createActionApiRoute(
         ttlMs && ttlMs > 0 ? ttlMs : undefined
       );
 
-      // Step 3: Race-check. If a record landed on the channel before this
+      // Race-check. If a record landed on the channel before this
       // .wait() call, complete the waitpoint synchronously with that data
       // and remove the pending registration.
       if (!result.isCached) {
 
@@ -54,7 +54,7 @@ function buildEngine(opts: {
 }
 
 describe("waitpoint-token complete route — cross-seam guard", () => {
-  // (A) the completion path consults the guard FIRST with routeKind RESUME_TOKEN
+  // The completion path consults the guard FIRST with routeKind RESUME_TOKEN
   // recording the waitpointId, then delegates and the waitpoint becomes COMPLETED.
   containerTest(
     "consults the guard first (RESUME_TOKEN), then completes (single-store)",
@@ -96,7 +96,7 @@ describe("waitpoint-token complete route — cross-seam guard", () => {
     }
   );
 
-  // (B) an injected guard that throws (unclassifiable) causes completeWaitpoint
+  // An injected guard that throws (unclassifiable) causes completeWaitpoint
   // to reject and the waitpoint stays PENDING (loud, not silently applied).
   containerTest(
     "propagates a guard throw and leaves the waitpoint PENDING (loud)",
@@ -132,7 +132,7 @@ describe("waitpoint-token complete route — cross-seam guard", () => {
   );
 });
 
-// (D) no-FK-abort: with the Waitpoint table split off control-plane, the env/project Cascade
+// no-FK-abort: with the Waitpoint table split off control-plane, the env/project Cascade
 // FKs are physically absent. Completing a waitpoint (status flip) must not trip a now-missing FK
 // on EITHER the PG14 (legacy) or PG17 (new) store. Seed + complete on the SAME store (single-store
 // write, no two-store router). The DB is never mocked: writes hit the real PG14/PG17 containers.
 
@@ -64,7 +64,7 @@ function buildEngine(opts: {
 }
 
 describe("waitpoint-token create engine seam — residency-keyed id contract", () => {
-  // Test A: a standalone token (no owning run) mints a cuid WaitpointId and stays LEGACY.
+  // A standalone token (no owning run) mints a cuid WaitpointId and stays LEGACY.
   containerTest(
     "create mints a cuid WaitpointId for a standalone token (LEGACY)",
     async ({ prisma, redisOptions }) => {
@@ -99,7 +99,7 @@ describe("waitpoint-token create engine seam — residency-keyed id contract", (
     }
   );
 
-  // Test B: the standalone token id classifies LEGACY and resolves back.
+  // The standalone token id classifies LEGACY and resolves back.
   containerTest(
     "token id classifies to the legacy store and resolves back",
     async ({ prisma, redisOptions }) => {
@@ -129,7 +129,7 @@ describe("waitpoint-token create engine seam — residency-keyed id contract", (
     }
   );
 
-  // Test C: the control-plane WaitpointTag write stays control-plane — it cannot
+  // The control-plane WaitpointTag write stays control-plane — it cannot
   // route through the run-ops store, which exposes no tag-write surface at all.
   containerTest(
     "control-plane WaitpointTag write stays control-plane, not on the run-ops store",
@@ -330,7 +330,7 @@ function makeRouter(prisma14: PrismaClient, prisma17: RunOpsPrismaClient) {
 }
 
 describe("waitpoint-token create engine seam — NEW residency via a ksuid run across the version boundary", () => {
-  // Test D: NEW residency comes from co-locating the token with a ksuid run; the token
+  // NEW residency comes from co-locating the token with a ksuid run; the token
   // resolves only on its owning (#new) store across the PG14<->PG17 boundary, never #legacy.
   twoDbEngineTest(
     "a ksuid run's token co-locates on #new and resolves only there, not on #legacy",
 
@@ -16,7 +16,7 @@ import { WaitpointId } from "@trigger.dev/core/v3/isomorphic";
 const NEW_WP = WaitpointId.toFriendlyId("0".repeat(27)); // 27-char internal body → NEW
 const LEGACY_WP = WaitpointId.toFriendlyId("c".repeat(25)); // 25-char internal body → LEGACY
 
-describe("cross-seam guard — exhaustive per-route store selection (Leg 1)", () => {
+describe("cross-seam guard — exhaustive per-route store selection", () => {
   for (const route of UNBLOCK_ROUTES) {
     it(`routes ${route.id} (${route.kind}) to new store for a NEW waitpoint`, () => {
       const d = selectStoreForWaitpoint({ waitpointId: NEW_WP, routeKind: route.kind });
@@ -32,7 +32,7 @@ describe("cross-seam guard — exhaustive per-route store selection (Leg 1)", ()
   }
 });
 
-describe("cross-seam guard — single-DB no-op (Leg 2)", () => {
+describe("cross-seam guard — single-DB no-op", () => {
   for (const route of UNBLOCK_ROUTES) {
     it(`${route.id}: single-DB returns legacy without consulting the classifier`, () => {
       const calls: string[] = [];
@@ -70,7 +70,7 @@ function tally(sites: string[]): Record<string, number> {
   return counts;
 }
 
-describe("cross-seam guard — CI drift guard (Leg 3)", () => {
+describe("cross-seam guard — CI drift guard", () => {
   it("per-file completeWaitpoint( tally in source matches the catalog", () => {
     const root = repoRoot();
 
@@ -90,17 +90,15 @@ describe("cross-seam guard — CI drift guard (Leg 3)", () => {
   });
 });
 
-// ---------------------------------------------------------------------------
-// Leg 4 — PG14+PG17 hetero-fixture proof. The pure legs above prove the guard
-// SELECTS the right store; this leg proves the selected store corresponds to the
+// PG14+PG17 hetero-fixture proof. The pure-selection tests above prove the guard
+// SELECTS the right store; this proves the selected store corresponds to the
 // DB the Waitpoint row PHYSICALLY lives in, on a REAL heterogeneous PG14+PG17
 // fixture. NEVER mock. Seed Org->Project->Env (parents before children, or the
 // required Waitpoint.projectId/environmentId FKs abort the insert) then the
 // Waitpoint, on the matching DB ONLY: NEW residency on PG17, LEGACY on PG14. The
 // cross-DB toBeNull checks then prove no ghost row leaked to the other version.
 // Seed pattern copied from
 // internal-packages/run-engine/src/engine/tests/crossVersionCompat.test.ts.
-// ---------------------------------------------------------------------------
 
 const FIXED_TS = "2024-01-01 00:00:00+00";
 
@@ -161,7 +159,7 @@ async function seedWaitpoint(
   );
 }
 
-describe("cross-seam guard — PG14+PG17 hetero-fixture proof (Leg 4)", () => {
+describe("cross-seam guard — PG14+PG17 hetero-fixture proof", () => {
   heteroPostgresTest(
     "exhaustive routes resolve to the physically-correct store on PG14+PG17",
     async ({ prisma14, prisma17 }) => {