Repository navigation
Docs-only fast path for the merge queue #2135
Description
Parent
Spec #2116
What to build
Close the #1307 shim gap on the merge queue: a first job in the main CI workflow detects a docs-only merge-group diff (the same path set the shim triggers on) and the heavy jobs report immediate success without running. The shim lock-step contract test extends to cover the merge-group path so required-context names cannot drift. Code-touching merge groups still run everything (ADR 0059 unchanged).
Acceptance criteria
- A docs-only PR merges through the queue in under 2 minutes (measured on a real merge).
- A code-touching PR still runs the full suite in the merge group; the contract test pins both paths.
- Full CI gate green.
Current blocker
status: blocked
kind: merge-conflict
summary: pre_merge-abort — the worker branch carries commits on origin; PR #2180 is open on it
next: Resolve the merge conflict or add guidance for the next agent attempt.
parked_at: 1785953877
Activity
filipeforattini commentedon Aug 5, 2026
🤖 AFK claim by worker
7e60bc642fef:hEH80(runnercodex).filipeforattini commentedon Aug 5, 2026
🤖 /afk started at
2026-08-05T18:06:04.206Zon runnercodex(workerhEH80). branch:afk/2135-docs-only-fast-path-for-the-merge-queuetest(ci): pin merge-group docs fast path
ci: skip heavy merge-group jobs for docs
filipeforattini commentedon Aug 5, 2026
worker `hEH80` · status: merge-conflict · duration: 8m56s · diff: merge-conflict · attempt: 1
diff
live branch: afk/2135-docs-only-fast-path-for-the-merge-queue
local worktree:
[REDACTED_HOME]/workspace/reddb/.red/tmp/workers/hEH80/2135log
filipeforattini commentedon Aug 5, 2026
🤖 AFK worker
7e60bc642fef:hEH80conceded this issue (released the claim it held).12 remaining items
filipeforattini commentedon Aug 5, 2026
🤖 /afk started at
2026-08-05T18:17:13.144Zon runnercodex(workerhRJQB). branch:afk/2135-docs-only-fast-path-for-the-merge-queuefilipeforattini commentedon Aug 5, 2026
🤖 /afk Attempt PRs for #2135: #2180. Adopting #2180 from
afk/2135-docs-only-fast-path-for-the-merge-queuethrough the no-agent gate.filipeforattini commentedon Aug 5, 2026
🤖 /afk escalating to ready-for-human: blocked:merge-conflict retry budget exhausted (attempt 3/3).
filipeforattini commentedon Aug 5, 2026
Decision card — Docs-only fast path for the merge queue (#2135)
Status
2f67909Refreshed: 2026-08-05 18:17 UTC
Available actions
Post a comment with one of:
/approve— merge the linked PR and close this issue/approve-ci— merge when all CI checks pass (waits if pending)/reject [reason]— close the PR without merging; reopen for rework/requeue <guidance>— send back to agent with guidanceOr reply in plain English — the bot maps your intent to an action.
Your instructions are processed securely; issue and PR content is treated as untrusted data.
filipeforattini commentedon Aug 5, 2026
worker `hRJQB` · status: merge-conflict · duration: 0m52s · diff: merge-conflict · attempt: 1
diff
live branch: afk/2135-docs-only-fast-path-for-the-merge-queue
local worktree:
[REDACTED_HOME]/workspace/reddb/.red/tmp/workers/hRJQB/2135log
filipeforattini commentedon Aug 5, 2026
🤖 AFK worker
7e60bc642fef:hRJQBconceded this issue (released the claim it held).filipeforattini commentedon Aug 5, 2026
worker `hY7XF` · status: blocked · duration: 7m17s · diff: not-landed · attempt: 0
notes
diff
live branch: afk/2135-docs-only-fast-path-for-the-merge-queue
local worktree:
[REDACTED_HOME]/workspace/reddb/.red/tmp/worktrees/reconcile/2135