feat(runway): wire merge-conflict-check controller to Merger extension#280
Open
kevinlnew wants to merge 1 commit into
Open
feat(runway): wire merge-conflict-check controller to Merger extension#280kevinlnew wants to merge 1 commit into
kevinlnew wants to merge 1 commit into
Conversation
The merge-conflict-check controller was a parse-and-log stub. Wire it to the Merger extension so it performs the dry-run check and publishes the MergeResult to the merge-conflict-check-signal topic. A merge conflict is an expected outcome (ack + publish FAILED), not an infrastructure error. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
kevinlnew
requested review from
a team,
behinddwalls and
sbalabanov
as code owners
sbalabanov
requested changes
Jun 26, 2026
| "id", request.GetId(), | ||
| "queue_name", request.GetQueueName(), | ||
| ) | ||
| result = &runwaymq.MergeResult{ |
Contributor
There was a problem hiding this comment.
at some point it would be nice to return and log a list of conflicting files as well
| Outcome: runwaypb.Outcome_FAILED, | ||
| Reason: err.Error(), | ||
| } | ||
| } else { |
Contributor
There was a problem hiding this comment.
reverse if statement and return early to avoid branching
| // Retryable: publishing the result is the hand-off that keeps this | ||
| // conflict check alive; a transient enqueue blip should replay rather | ||
| // than DLQ the only message carrying the result back to the orchestrator. | ||
| return errs.NewRetryableError(fmt.Errorf("failed to publish merge-conflict-check result for %s: %w", request.GetId(), err)) |
Contributor
There was a problem hiding this comment.
do not do classification here; not all errors are retryable, for example programming bugs are not retryable. Only certain errors (like connection failure) are retryable and should be recognized by a generic-purpose classifier.
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
merger.Factoryextension so it performs the actual dry-run merge check instead of just loggingMergeResultto themerge-conflict-check-signaltopic —SUCCEEDEDon clean merge,FAILEDonmerger.ErrConflict(ack, not a controller error)errs.NewRetryableError); deserialize/factory/check errors are non-retryable (DLQ)Test plan
bazel test //runway/controller/mergeconflictcheck:mergeconflictcheck_testpassesbazel build //example/runway/server:runwaybuilds cleanlymake gazelle— BUILD files in syncmake fmt— no formatting changes🤖 Generated with Claude Code