Skip to content

XY-712: Control-plane status P3: split repeated degraded observer plumbing #187

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
yvette-carlisle merged 1 commit into from
Jun 3, 2026
Merged

XY-712: Control-plane status P3: split repeated degraded observer plumbing #187

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
170 changes: 108 additions & 62 deletions apps/decodex/src/orchestrator/status.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,74 @@ enum TrackerObserverOutcome {
RateLimited(TrackerConnectorBackoff),
}

#[derive(Clone, Copy, Debug, Eq, PartialEq)]
struct PostReviewReadbackDegradation<'a> {
reason: &'a str,
root_cause: PullRequestReadbackRootCause,
pr_url: &'a str,
pr_head_sha: &'a str,
}
impl<'a> PostReviewReadbackDegradation<'a> {
fn tracker_issue_from_handoff(review_handoff: &'a ReviewHandoffMarker) -> Self {
Self {
reason: "tracker_issue_readback_degraded",
root_cause: PullRequestReadbackRootCause::TrackerIssueReadbackFailed,
pr_url: review_handoff.pr_url(),
pr_head_sha: review_handoff.pr_head_oid(),
}
}

fn pull_request_state_from_handoff(
review_handoff: &'a ReviewHandoffMarker,
root_cause: PullRequestReadbackRootCause,
) -> Self {
Self {
reason: "pull_request_state_read_failed",
root_cause,
pr_url: review_handoff.pr_url(),
pr_head_sha: review_handoff.pr_head_oid(),
}
}

fn wait_for_review_classification(
self,
review_state: Option<PullRequestReviewState>,
) -> PostReviewLaneClassification {
let (
pr_head_sha,
pr_state,
review_decision,
mergeable,
check_state,
unresolved_review_threads,
) = match review_state {
Some(review_state) => (
Some(review_state.head_ref_oid),
Some(review_state.state),
review_state.review_decision,
Some(review_state.mergeable),
review_state.status_check_rollup_state,
Some(review_state.unresolved_review_threads),
),
None => (Some(self.pr_head_sha.to_owned()), None, None, None, None, None),
};

PostReviewLaneClassification {
decision: PostReviewLaneDecision::WaitForReview,
reason: self.reason.to_owned(),
pr_url: Some(self.pr_url.to_owned()),
pr_head_sha,
pr_state,
review_decision,
mergeable,
check_state,
unresolved_review_threads,
readback_warning: Some(self.reason.to_owned()),
readback_root_cause: Some(self.root_cause.as_str().to_owned()),
}
}
}

struct PostReviewOrchestrationStatus {
phase: ReviewOrchestrationPhase,
request_acknowledged: bool,
Expand Down Expand Up @@ -2370,62 +2438,50 @@ where
let review_state = review_state_inspector
.inspect_review_state(worktree.worktree_path(), review_handoff.pr_url())
.ok();
let readback_root_cause = Some(
PullRequestReadbackRootCause::TrackerIssueReadbackFailed
.as_str()
.to_owned(),
);
let (
pr_head_sha,
pr_state,
review_decision,
mergeable,
check_state,
unresolved_review_threads,
) = match review_state {
Some(review_state) => (
Some(review_state.head_ref_oid),
Some(review_state.state),
review_state.review_decision,
Some(review_state.mergeable),
review_state.status_check_rollup_state,
Some(review_state.unresolved_review_threads),
),
None => (
Some(review_handoff.pr_head_oid().to_owned()),
None,
None,
None,
None,
None,
),
};
let classification = PostReviewReadbackDegradation::tracker_issue_from_handoff(
&review_handoff,
)
.wait_for_review_classification(review_state);

lanes.push(OperatorPostReviewLaneStatus {
issue_id: worktree.issue_id().to_owned(),
lanes.push(degraded_post_review_lane_status_from_classification(
project,
&worktree,
issue_identifier,
issue_state: String::from("tracker_readback_degraded"),
branch_name: worktree.branch_name().to_owned(),
worktree_path: relative_worktree_path_for_path(project, worktree.worktree_path()),
classification: String::from("wait_for_review"),
reason: String::from("tracker_issue_readback_degraded"),
pr_url: Some(review_handoff.pr_url().to_owned()),
pr_head_sha,
pr_state,
review_decision,
mergeable,
check_state,
unresolved_review_threads,
readback_warning: Some(String::from("tracker_issue_readback_degraded")),
readback_root_cause,
});
classification,
));
}

lanes.sort_by(|left, right| left.issue_identifier.cmp(&right.issue_identifier));

Ok(lanes)
}

fn degraded_post_review_lane_status_from_classification(
project: &ServiceConfig,
worktree: &WorktreeMapping,
issue_identifier: String,
classification: PostReviewLaneClassification,
) -> OperatorPostReviewLaneStatus {
OperatorPostReviewLaneStatus {
issue_id: worktree.issue_id().to_owned(),
issue_identifier,
issue_state: String::from("tracker_readback_degraded"),
branch_name: worktree.branch_name().to_owned(),
worktree_path: relative_worktree_path_for_path(project, worktree.worktree_path()),
classification: classification.decision.as_str().to_owned(),
reason: classification.reason,
pr_url: classification.pr_url,
pr_head_sha: classification.pr_head_sha,
pr_state: classification.pr_state,
review_decision: classification.review_decision,
mergeable: classification.mergeable,
check_state: classification.check_state,
unresolved_review_threads: classification.unresolved_review_threads,
readback_warning: classification.readback_warning,
readback_root_cause: classification.readback_root_cause,
}
}

fn retained_issue_identifier_from_worktree(worktree: &WorktreeMapping) -> String {
worktree
.worktree_path()
Expand Down Expand Up @@ -3163,7 +3219,6 @@ where
return Ok(PostReviewLaneStateLoad::Classification(
readback_degraded_post_review_lane_from_handoff(
review_handoff,
"pull_request_state_read_failed",
error.root_cause(),
),
));
Expand Down Expand Up @@ -3563,22 +3618,13 @@ fn blocked_post_review_lane_from_handoff(

fn readback_degraded_post_review_lane_from_handoff(
review_handoff: &ReviewHandoffMarker,
reason: &str,
root_cause: PullRequestReadbackRootCause,
) -> PostReviewLaneClassification {
PostReviewLaneClassification {
decision: PostReviewLaneDecision::WaitForReview,
reason: reason.to_owned(),
pr_url: Some(review_handoff.pr_url().to_owned()),
pr_head_sha: Some(review_handoff.pr_head_oid().to_owned()),
pr_state: None,
review_decision: None,
mergeable: None,
check_state: None,
unresolved_review_threads: None,
readback_warning: Some(reason.to_owned()),
readback_root_cause: Some(root_cause.as_str().to_owned()),
}
PostReviewReadbackDegradation::pull_request_state_from_handoff(
review_handoff,
root_cause,
)
.wait_for_review_classification(None)
}

fn blocked_post_review_lane_status(
Expand Down
59 changes: 59 additions & 0 deletions apps/decodex/src/orchestrator/tests/review_landing/classification_checks.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
use orchestrator::PullRequestReadbackFailure;
use orchestrator::PostReviewReadbackDegradation;
use orchestrator::PullRequestReadbackRootCause;

#[test]
fn classify_post_review_lane_blocks_completed_issue_until_pull_request_is_merged() {
Expand Down Expand Up @@ -454,6 +456,63 @@ fn classify_post_review_lane_degrades_pull_request_state_read_failures_to_handof
);
}

#[test]
fn post_review_readback_degradation_helper_preserves_warning_and_typed_cause() {
let marker_head_oid = "1111111111111111111111111111111111111111";
let review_head_oid = "2222222222222222222222222222222222222222";
let pr_url = "https://github.com/hack-ink/decodex/pull/174";
let review_handoff = sample_review_handoff_marker("x/pubfi-pub-101", pr_url, marker_head_oid);
let pull_request_readback = PostReviewReadbackDegradation::pull_request_state_from_handoff(
&review_handoff,
PullRequestReadbackRootCause::GithubApiReadFailed,
)
.wait_for_review_classification(None);

assert_eq!(pull_request_readback.decision, PostReviewLaneDecision::WaitForReview);
assert_eq!(pull_request_readback.reason, "pull_request_state_read_failed");
assert_eq!(
pull_request_readback.readback_warning.as_deref(),
Some("pull_request_state_read_failed")
);
assert_eq!(
pull_request_readback.readback_root_cause.as_deref(),
Some("github_api_read_failed")
);
assert_eq!(pull_request_readback.pr_url.as_deref(), Some(pr_url));
assert_eq!(pull_request_readback.pr_head_sha.as_deref(), Some(marker_head_oid));
assert_eq!(pull_request_readback.pr_state, None);

let tracker_readback = PostReviewReadbackDegradation::tracker_issue_from_handoff(
&review_handoff,
)
.wait_for_review_classification(Some(sample_pull_request_review_state(
pr_url,
"x/pubfi-pub-101",
review_head_oid,
Some("APPROVED"),
"MERGEABLE",
"CLEAN",
Some("SUCCESS"),
2,
)));

assert_eq!(tracker_readback.decision, PostReviewLaneDecision::WaitForReview);
assert_eq!(tracker_readback.reason, "tracker_issue_readback_degraded");
assert_eq!(
tracker_readback.readback_warning.as_deref(),
Some("tracker_issue_readback_degraded")
);
assert_eq!(
tracker_readback.readback_root_cause.as_deref(),
Some("tracker_issue_readback_failed")
);
assert_eq!(tracker_readback.pr_head_sha.as_deref(), Some(review_head_oid));
assert_eq!(tracker_readback.pr_state.as_deref(), Some("OPEN"));
assert_eq!(tracker_readback.review_decision.as_deref(), Some("APPROVED"));
assert_eq!(tracker_readback.check_state.as_deref(), Some("SUCCESS"));
assert_eq!(tracker_readback.unresolved_review_threads, Some(2));
}

#[test]
fn classify_post_review_lane_degrades_missing_or_blank_github_token_env_var() {
let missing = classify_post_review_lane_with_github_token_env_var(None);
Expand Down