diff --git a/packages/cli/cli/changes/5.27.6/bump-generator-cli-0.9.29.yml b/packages/cli/cli/changes/5.27.6/bump-generator-cli-0.9.29.yml
new file mode 100644
index 000000000000..813e0c1254af
--- /dev/null
+++ b/packages/cli/cli/changes/5.27.6/bump-generator-cli-0.9.29.yml
@@ -0,0 +1,5 @@
+- summary: |
+    Bump @fern-api/generator-cli to 0.9.29, which includes @fern-api/replay
+    0.15.1 with fixes for fallback patch anchoring, composite-patch survival,
+    and FileOwnership divergence.
+  type: chore
diff --git a/packages/cli/cli/changes/5.27.7/bump-generator-cli-0.9.30.yml b/packages/cli/cli/changes/5.27.7/bump-generator-cli-0.9.30.yml
new file mode 100644
index 000000000000..cca1ce9eff6a
--- /dev/null
+++ b/packages/cli/cli/changes/5.27.7/bump-generator-cli-0.9.30.yml
@@ -0,0 +1,5 @@
+- summary: |
+    Bump @fern-api/generator-cli to 0.9.30, which includes @fern-api/replay
+    0.15.2 with a fix for customer commits on merged regen branches surviving
+    replay detection.
+  type: chore
diff --git a/packages/cli/cli/versions.yml b/packages/cli/cli/versions.yml
index 5cfbecbcbca3..b29705449b5e 100644
--- a/packages/cli/cli/versions.yml
+++ b/packages/cli/cli/versions.yml
@@ -1,4 +1,22 @@
 # yaml-language-server: $schema=../../../fern-versions-yml.schema.json
+- version: 5.27.7
+  changelogEntry:
+    - summary: |
+        Bump @fern-api/generator-cli to 0.9.30, which includes @fern-api/replay
+        0.15.2 with a fix for customer commits on merged regen branches surviving
+        replay detection.
+      type: chore
+  createdAt: "2026-05-17"
+  irVersion: 66
+- version: 5.27.6
+  changelogEntry:
+    - summary: |
+        Bump @fern-api/generator-cli to 0.9.29, which includes @fern-api/replay
+        0.15.1 with fixes for fallback patch anchoring, composite-patch survival,
+        and FileOwnership divergence.
+      type: chore
+  createdAt: "2026-05-17"
+  irVersion: 66
 - version: 5.27.5
   changelogEntry:
     - summary: |
diff --git a/packages/generator-cli/package.json b/packages/generator-cli/package.json
index ac1ee0c7541f..51f4a2c23943 100644
--- a/packages/generator-cli/package.json
+++ b/packages/generator-cli/package.json
@@ -41,7 +41,7 @@
     "@fern-api/docker-utils": "workspace:*",
     "@fern-api/logger": "workspace:*",
     "@fern-api/logging-execa": "workspace:*",
-    "@fern-api/replay": "0.15.0",
+    "@fern-api/replay": "0.15.2",
     "@fern-api/task-context": "workspace:*",
     "@octokit/rest": "catalog:",
     "es-toolkit": "catalog:",
diff --git a/packages/generator-cli/versions.yml b/packages/generator-cli/versions.yml
index d53e7d136ebe..e778a72afe26 100644
--- a/packages/generator-cli/versions.yml
+++ b/packages/generator-cli/versions.yml
@@ -1,4 +1,18 @@
 # yaml-language-server: $schema=../../versions-yml.schema.json
+- changelogEntry:
+    - summary: |
+        Bump @fern-api/replay to 0.15.2.
+      type: chore
+  createdAt: "2026-05-17"
+  version: 0.9.30
+
+- changelogEntry:
+    - summary: |
+        Bump @fern-api/replay to 0.15.1.
+      type: chore
+  createdAt: "2026-05-17"
+  version: 0.9.29
+
 - changelogEntry:
     - summary: |
         Set explicit author and committer on API-created commits to the Fern bot
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index c1c4902e3b74..a3091f34945a 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -7939,8 +7939,8 @@ importers:
         specifier: workspace:*
         version: link:../commons/logging-execa
       '@fern-api/replay':
-        specifier: 0.15.0
-        version: 0.15.0
+        specifier: 0.15.2
+        version: 0.15.2
       '@fern-api/task-context':
         specifier: workspace:*
         version: link:../cli/task-context
@@ -9459,6 +9459,11 @@ packages:
     engines: {node: '>=18'}
     hasBin: true
 
+  '@fern-api/replay@0.15.2':
+    resolution: {integrity: sha512-B9eTCbYhr4UKCnuLIVEVA8aFC8uMp9f4eV1Sv+yL+OCkrNhaNGbuzi15mU+18/m8iOiuJ/IYXntImlS/JT5KYw==}
+    engines: {node: '>=18'}
+    hasBin: true
+
   '@fern-api/ui-core-utils@0.145.12-b50d999d1':
     resolution: {integrity: sha512-S1sE+Fs6kc/7F1Gzwsz7sZlAhMLIsaMeVDQ68038YXfzsLhrsg3DEVPvil5T3KxH/qV80Uso25q1D1W/LwXo6Q==}
 
@@ -16403,6 +16408,15 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
+  '@fern-api/replay@0.15.2':
+    dependencies:
+      minimatch: 10.2.5
+      node-diff3: 3.2.0
+      simple-git: 3.36.0
+      yaml: 2.8.3
+    transitivePeerDependencies:
+      - supports-color
+
   '@fern-api/ui-core-utils@0.145.12-b50d999d1':
     dependencies:
       date-fns: 4.1.0