Merge pull request #44 from Forward-Future/codex/prevent-nested-integration-promotion

Prevent recursive nested integration promotion

Author: mberman84

README.md

@@ -11,11 +11,11 @@ integration PRs, follows `main` through production, and pauses after failures.
 
 ## Install
 
-Install the reviewed `v0.2.17` source commit directly from GitHub:
+Install the reviewed `v0.2.18` source commit directly from GitHub:
 
 ```bash
 python3 -m pip install \
-  'deploybot-merge-queue[mcp] @ git+https://github.com/Forward-Future/DeployBot.git@7842edbd5fe75cdb68324e98c2a7244aed3009f6'
+  'deploybot-merge-queue[mcp] @ git+https://github.com/Forward-Future/DeployBot.git@208d4168e5a02b994905e94d648599d06b4afbd2'
 deploybot init
 ```
 
@@ -95,7 +95,7 @@ worker can dispatch deployment when GitHub suppresses the `workflow_run` event
 for token-dispatched CI. Pin the Action to the full reviewed release commit:
 
 ```yaml
-- uses: Forward-Future/DeployBot@7842edbd5fe75cdb68324e98c2a7244aed3009f6
+- uses: Forward-Future/DeployBot@208d4168e5a02b994905e94d648599d06b4afbd2
 ```
 
 The Action uses GitHub's built-in workflow token. GitHub intentionally does not

adapters/claude-code/.claude-plugin/plugin.json

@@ -1,6 +1,6 @@
 {
   "name": "deploybot",
-  "version": "0.2.17",
+  "version": "0.2.18",
   "description": "DeployBot: a provider-neutral GitHub merge queue for coding agents",
   "author": {
     "name": "DeployBot contributors"

adapters/claude-code/.mcp.json

@@ -4,7 +4,7 @@
       "command": "uvx",
       "args": [
         "--from",
-        "deploybot-merge-queue[mcp] @ git+https://github.com/Forward-Future/DeployBot.git@7842edbd5fe75cdb68324e98c2a7244aed3009f6",
+        "deploybot-merge-queue[mcp] @ git+https://github.com/Forward-Future/DeployBot.git@208d4168e5a02b994905e94d648599d06b4afbd2",
         "deploybot-mcp"
       ]
     }

adapters/codex/agent-merge-queue/.codex-plugin/plugin.json

@@ -1,6 +1,6 @@
 {
   "name": "deploybot",
-  "version": "0.2.17",
+  "version": "0.2.18",
   "description": "Coordinate exact-head pull requests through verified deployment and thread notification",
   "author": {
     "name": "DeployBot contributors"

adapters/cursor/.cursor/mcp.json

@@ -4,7 +4,7 @@
       "command": "uvx",
       "args": [
         "--from",
-        "deploybot-merge-queue[mcp] @ git+https://github.com/Forward-Future/DeployBot.git@7842edbd5fe75cdb68324e98c2a7244aed3009f6",
+        "deploybot-merge-queue[mcp] @ git+https://github.com/Forward-Future/DeployBot.git@208d4168e5a02b994905e94d648599d06b4afbd2",
         "deploybot-mcp"
       ]
     }

docs/reference.md

@@ -1,7 +1,7 @@
 # DeployBot reference
 
 This reference describes the CLI, MCP server, policy file, and GitHub Action in
-DeployBot v0.2.17. GitHub labels and authenticated comments are the durable state;
+DeployBot v0.2.18. GitHub labels and authenticated comments are the durable state;
 the CLI and MCP tools are two interfaces to the same operations.
 
 ## CLI

examples/github-workflow.yml

@@ -59,5 +59,5 @@ jobs:
         with:
           ref: ${{ github.event.repository.default_branch }}
           persist-credentials: false
-      # v0.2.17 implementation; keep the full commit for privileged workflows.
-      - uses: Forward-Future/DeployBot@7842edbd5fe75cdb68324e98c2a7244aed3009f6
+      # v0.2.18 implementation; keep the full commit for privileged workflows.
+      - uses: Forward-Future/DeployBot@208d4168e5a02b994905e94d648599d06b4afbd2

pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "deploybot-merge-queue"
-version = "0.2.17"
+version = "0.2.18"
 description = "DeployBot: a provider-neutral GitHub merge queue for coding agents"
 readme = "README.md"
 license = "MIT"

src/agent_merge_queue/__init__.py

@@ -1,3 +1,3 @@
 """DeployBot: a provider-neutral GitHub merge queue for coding agents."""
 
-__version__ = "0.2.17"
+__version__ = "0.2.18"

src/agent_merge_queue/cli.py

@@ -3290,7 +3290,13 @@ def promote_integrations(
     known_checks_by_number: dict[int, dict[str, str]] | None = None,
 ) -> list[int]:
     promoted: list[int] = []
+    delegated_integrations = client.active_integration_sources()
     for number in client.integration_pull_request_numbers():
+        # A newer cumulative PR owns any integration PR listed among its
+        # sources. Re-promoting that nested source would recursively integrate
+        # the same frozen work into another cumulative PR.
+        if number in delegated_integrations:
+            continue
         comments = client.comments(number)
         integration = latest_payload(
             comments,