From 7b2a4f1998cbd0487320ff712f79436835c985ed Mon Sep 17 00:00:00 2001
From: "omegent-app[bot]" <306514130+omegent-app[bot]@users.noreply.github.com>
Date: Thu, 6 Aug 2026 06:51:49 +0000
Subject: [PATCH] chore(stack): drain the integration overlays
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

fork/dev was cut from the composed fork/integration tip, so every registered
overlay's product content has been in fork/dev since the cutover. Verified
again against the current tip: identity 17/17 and desktop-deeplinks 8/8 commits
present, and the four that are not present (discord 3, vscode 1) touch
pnpm-lock.yaml only — regeneration artifacts that compose discards by its own
"pnpm-lock.yaml -> theirs" rule and replaces with its own lockfile commit.

Empty integrationOverlays and drop the matching pull_request bases from
fork-ci.yml, which carried an explicit instruction to stay in sync with it.
Overlay PRs #254, #174, #175 and #250 are closed alongside this; leaving them
open against fork/changes would duplicate their commits the next time anything
composes.

Scoped deliberately. The overlay machinery itself — compose-integration,
rebase-integration-overlays, force-update-overlay-tip, client-overlay-ownership
and the surrounding docs — is left in place and still passes its tests with an
empty manifest (69/69). Removing it is a larger change and a separate decision.

Co-authored-by: Patrick Roza <42661+patroza@users.noreply.github.com>
---
 .github/pr-stack.json         | 19 +------------------
 .github/workflows/fork-ci.yml |  8 ++------
 2 files changed, 3 insertions(+), 24 deletions(-)

diff --git a/.github/pr-stack.json b/.github/pr-stack.json
index 6742eb5e118..76e6344326d 100644
--- a/.github/pr-stack.json
+++ b/.github/pr-stack.json
@@ -21,24 +21,7 @@
       "branch": "fork/changes"
     }
   ],
-  "integrationOverlays": [
-    {
-      "number": 254,
-      "branch": "t3-discord/f7d37879-desktop-deeplinks"
-    },
-    {
-      "number": 174,
-      "branch": "fork/discord"
-    },
-    {
-      "number": 175,
-      "branch": "fork/vscode"
-    },
-    {
-      "number": 250,
-      "branch": "fork/identity"
-    }
-  ],
+  "integrationOverlays": [],
   "conflictResolutions": [
     {
       "branch": "fork/integration",
diff --git a/.github/workflows/fork-ci.yml b/.github/workflows/fork-ci.yml
index c27c9214aed..cd7abf132da 100644
--- a/.github/workflows/fork-ci.yml
+++ b/.github/workflows/fork-ci.yml
@@ -29,7 +29,8 @@ on:
   # Upstream Blacksmith CI must stay disabled_manually. fork/base supplies
   # GitHub-hosted runners + fork-ci.yml for all layers above it.
   #
-  # Keep overlay bases in sync with integrationOverlays in pr-stack.json.
+  # integrationOverlays is empty: the overlays were drained into fork/dev at
+  # cutover. Re-add bases here if one is ever registered again.
   pull_request:
     branches:
       - fork/base
@@ -38,11 +39,6 @@ on:
       - fork/changes
       # Stable contributor and release branch (docs/stable-dev-release-branch-handover.md).
       - fork/dev
-      # Registered integration overlays (same names as .github/pr-stack.json)
-      - t3-discord/f7d37879-desktop-deeplinks
-      - fork/discord
-      - fork/vscode
-      - fork/identity
   # fork/dev is never rebased, so its merge commits are the release candidates.
   # Deployment promotes an exact green SHA and keys on a successful run of this
   # workflow for that SHA, so every merge must produce one — a green PR tip is