feat(runway): add merge wire contract and topic keys#244
Merged
Conversation
This was referenced Jun 15, 2026
behinddwalls
force-pushed
the
preetam/runway-contract
branch
from
b8f3e22 to
ddbb5ab
Compare
behinddwalls
force-pushed
the
preetam/runway-contract
branch
from
ddbb5ab to
edf7ab9
Compare
behinddwalls
force-pushed
the
preetam/mergestrategy-promote
branch
from
20db3b8 to
bf357a5
Compare
behinddwalls
force-pushed
the
preetam/runway-contract
branch
from
edf7ab9 to
3e8071d
Compare
behinddwalls
changed the title
sbalabanov
approved these changes
Jun 16, 2026
behinddwalls
force-pushed
the
preetam/runway-contract
branch
from
3e8071d to
cd798f6
Compare
behinddwalls
changed the title
behinddwalls
force-pushed
the
preetam/runway-contract
branch
from
cd798f6 to
3e8071d
Compare
behinddwalls
changed the title
Runway owns the cross-service merge contract: entity.MergeRequest and MergeResult, carried over two queue pairs -- a dry-run merge-conflict check (merge-conflict-checker / -signal) and a committing merge (merger / -signal). A merge-conflict check is a dry run of a merge, so one contract serves both; the queue a request arrives on encodes whether runway commits the result and reports the revisions it produced (StepResult.OutputIDs, VCS-neutral). Co-authored-by: Cursor <cursoragent@cursor.com>
behinddwalls
force-pushed
the
preetam/runway-contract
branch
from
3e8071d to
78d66a5
Compare
behinddwalls
temporarily deployed
to
stack-rebase
GitHub Actions
Inactive
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
Why?
Both the merge-conflict check and the merge itself are moving out of SubmitQueue into an asynchronous round-trip with a separate service, runway. A merge-conflict check is a dry run of a merge, so one contract serves both. Runway owns the cross-service queues, their topic keys, and the wire contract — SubmitQueue cannot read runway's storage and vice versa, so the payloads carry full data, not entity IDs. This change adds only those runway-owned definitions; runway's gateway/orchestrator/controllers are out of scope.
What?
Adds a new
runway/domain folder holding contract-only definitions:runway/entity—MergeRequest(client-ownedID,QueueName, ordered[]MergeStep),MergeStep(StepID,[]change.Change,mergestrategy.MergeStrategy),StepResult(StepID, VCS-neutralOutputIDs,Reason), andMergeResult(ID,Success,Reason,[]StepResult), with JSONToBytes/FromBytes. The ordered step list encodes base-layering so one request expresses both "candidate vs target branch" (one step) and "candidate + in-flight vs target" (N steps). It imports only the sharedentity/changeandentity/mergestrategy— neversubmitqueue/entity.runway/core/topickey— two queue pairs over the one contract: the dry-run check (merge-conflict-checker/merge-conflict-checker-signal) and the committing merge (merger/merger-signal). The queue a request arrives on encodes whether runway commits the result and reports the revisions it produced (StepResult.OutputIDs— a git commit SHA, hg changeset, svn revision, …; empty for a dry-run check).Test Plan
✅
bazel test //runway/...(round-trip serialization tests pass)✅
bazel build //...Issues
Stack