Skip to content

fix(feedback): decouple local diagnostics from remote refresh #4816

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

Closed
ScriptedAlchemy wants to merge 1 commit into from
Closed

fix(feedback): decouple local diagnostics from remote refresh #4816

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
82 changes: 63 additions & 19 deletions crates/tracedecay/src/daemon/project_open_owners/advisory_runtime.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
//! Project-open composition for the canonical feedback and advisory owners.

use std::fmt::Write as _;
use std::future::Future;
use std::path::Path;
use std::process::Command;
use std::sync::Arc;
Expand Down Expand Up @@ -151,6 +152,33 @@ struct ProjectOpenAdvisoryCycleExecutionV1 {
feedback_cycle: Arc<FeedbackCycleRuntime>,
}

/// Local editor/hook feedback must not wait for remote refresh. The explicit
/// advisory operation keeps its existing GitHub and CI refresh semantics.
#[derive(Clone, Copy)]
enum AdvisoryRemoteReadMode {
LocalFeedback,
ExplicitRefresh,
}

async fn advisory_remote_requests<DiscoverCi>(
mode: AdvisoryRemoteReadMode,
github: Option<GitHubReviewReadRequestV1>,
discover_ci: DiscoverCi,
) -> (
Option<GitHubReviewReadRequestV1>,
ProductionCiFailureDiscoveryOutcomeV1,
)
where
DiscoverCi: Future<Output = ProductionCiFailureDiscoveryOutcomeV1>,
{
match mode {
AdvisoryRemoteReadMode::LocalFeedback => {
(None, ProductionCiFailureDiscoveryOutcomeV1::NotConfigured)
}
AdvisoryRemoteReadMode::ExplicitRefresh => (github, discover_ci.await),
}
}

#[derive(Clone)]
struct ProjectOpenFeedbackCyclePinV1 {
revision_id: ConfigurationRevisionId,
Expand Down Expand Up @@ -220,6 +248,7 @@ impl ProjectOpenAdvisoryFeedbackCycleV1 {
deadline: MonotonicDeadline,
agent_stop_gate: bool,
expected_generation: Option<&tracedecay_domain::CodeGenerationId>,
remote_mode: AdvisoryRemoteReadMode,
) -> std::result::Result<ProjectOpenAdvisoryCycleExecutionV1, LspRuntimeFailure> {
let pin = self.producer.feedback_cycle.read().await.clone();
let lsp_input = pin.runtime.lsp_input();
Expand All @@ -242,7 +271,7 @@ impl ProjectOpenAdvisoryFeedbackCycleV1 {
Some(&latest.generation().manifest().generation_id)
== invocation.request.input.target.generation_id.as_ref()
});
self.run_cycle_with_invocation(pin, invocation, deadline, agent_stop_gate)
self.run_cycle_with_invocation(pin, invocation, deadline, agent_stop_gate, remote_mode)
.await
}

Expand All @@ -252,6 +281,7 @@ impl ProjectOpenAdvisoryFeedbackCycleV1 {
mut invocation: FeedbackCycleInvocation,
deadline: MonotonicDeadline,
agent_stop_gate: bool,
remote_mode: AdvisoryRemoteReadMode,
) -> std::result::Result<ProjectOpenAdvisoryCycleExecutionV1, LspRuntimeFailure> {
if agent_stop_gate {
invocation.request.input.request.trigger = FeedbackTriggerV1::AgentStopGate;
Expand All @@ -265,17 +295,34 @@ impl ProjectOpenAdvisoryFeedbackCycleV1 {
.request
.configuration_digest
.clone();
let ci = match self.ci_discovery_config.as_ref() {
Some(config) => {
discover_production_ci_failure_request_v1(
&invocation.context,
config,
&self.feedback_scope,
)
.await
}
None => ProductionCiFailureDiscoveryOutcomeV1::NotConfigured,
};
// Construct the discovery future without polling it on editor or hook
// paths. A pending/denied remote provider cannot consume local feedback's
// deadline or cancel its independently authorized diagnostics.
let github_request = self.github_review_read.clone().map(
|(pull_request_id, operation)| GitHubReviewReadRequestV1 {
operation,
scope: self.feedback_scope.clone(),
pull_request_id,
},
);
let (github, ci) = advisory_remote_requests(
remote_mode,
github_request,
async {
match self.ci_discovery_config.as_ref() {
Some(config) => {
discover_production_ci_failure_request_v1(
&invocation.context,
config,
&self.feedback_scope,
)
.await
}
None => ProductionCiFailureDiscoveryOutcomeV1::NotConfigured,
}
},
)
.await;
let expires_at = UtcMicros(observed_at.0.saturating_add(5 * 60 * 1_000_000));
let operation = daemon_operation_event_authority()
.begin(
Expand Down Expand Up @@ -305,13 +352,7 @@ impl ProjectOpenAdvisoryFeedbackCycleV1 {
},
AdvisoryCycleRequest {
feedback: invocation.request,
github: self.github_review_read.clone().map(
|(pull_request_id, operation)| GitHubReviewReadRequestV1 {
operation,
scope: self.feedback_scope.clone(),
pull_request_id,
},
),
github,
ci,
proximity: Some(ProximityEvaluationRequestV1 {
scope: self.feedback_scope.clone(),
Expand Down Expand Up @@ -458,6 +499,7 @@ impl FeedbackCycleRuntimePort for ProjectOpenAdvisoryFeedbackCycleV1 {
MonotonicDeadline::at(Instant::now() + Duration::from_secs(5)),
false,
None,
AdvisoryRemoteReadMode::LocalFeedback,
)
.await?;
Ok(())
Expand Down Expand Up @@ -549,6 +591,7 @@ impl DaemonAdvisoryCycleInvocationPort for ProjectOpenAdvisoryFeedbackCycleV1 {
monotonic_deadline,
false,
None,
AdvisoryRemoteReadMode::ExplicitRefresh,
)
.await
.map_err(|failure| {
Expand Down Expand Up @@ -1137,6 +1180,7 @@ async fn run_production_hook_cycle(
MonotonicDeadline::at(Instant::now() + Duration::from_secs(5)),
request.trigger == HookOrchestrationTriggerV1::Stop,
Some(&indexed_generation.metadata().manifest().generation_id),
AdvisoryRemoteReadMode::LocalFeedback,
)
.await
{
Expand Down
59 changes: 59 additions & 0 deletions crates/tracedecay/src/daemon/project_open_owners/advisory_runtime/tests.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,65 @@ fn feedback_scope() -> FeedbackScopeV1 {
}
}

/// A blocked CI discovery must not even be polled for an editor/hook run.
/// The matching GitHub request is also excluded from local admission.
#[tokio::test]
async fn local_advisory_feedback_does_not_poll_remote_refresh() {
let github_request = GitHubReviewReadRequestV1 {
operation: GitHubReviewReadOperationV1::RestGetPullRequest,
scope: feedback_scope(),
pull_request_id: GitHubPullRequestIdV1::new("42").expect("pull request"),
};
let forbidden_ci = std::future::poll_fn(
|_| -> std::task::Poll<ProductionCiFailureDiscoveryOutcomeV1> {
panic!("local feedback polled remote CI discovery")
},
);
let (github, ci) = advisory_remote_requests(
AdvisoryRemoteReadMode::LocalFeedback,
Some(github_request),
forbidden_ci,
)
.await;
assert!(github.is_none(), "local feedback must not request GitHub refresh");
assert!(matches!(
ci,
ProductionCiFailureDiscoveryOutcomeV1::NotConfigured
));
}

/// Explicit advisory demand still owns the remote read and propagates its
/// terminal result. The barrier proves the operation awaits actual discovery.
#[tokio::test]
async fn explicit_advisory_refresh_waits_for_its_own_remote_discovery() {
let (started_tx, started_rx) = tokio::sync::oneshot::channel::<()>();
let (release_tx, release_rx) =
tokio::sync::oneshot::channel::<ProductionCiFailureDiscoveryOutcomeV1>();
let github_request = GitHubReviewReadRequestV1 {
operation: GitHubReviewReadOperationV1::RestGetPullRequest,
scope: feedback_scope(),
pull_request_id: GitHubPullRequestIdV1::new("42").expect("pull request"),
};
let mut refresh = Box::pin(advisory_remote_requests(
AdvisoryRemoteReadMode::ExplicitRefresh,
Some(github_request.clone()),
async move {
started_tx.send(()).expect("reader still owns the admission barrier");
release_rx.await.expect("explicit discovery must settle")
},
));
tokio::select! {
result = &mut refresh => panic!("explicit refresh completed before its remote read: {result:?}"),
started = started_rx => started.expect("remote read started"),
}
release_tx
.send(ProductionCiFailureDiscoveryOutcomeV1::Denied)
.expect("remote read still awaited");
let (github, ci) = refresh.await;
assert_eq!(github, Some(github_request));
assert!(matches!(ci, ProductionCiFailureDiscoveryOutcomeV1::Denied));
}

#[test]
fn hook_notice_registration_is_released_with_the_published_owner() {
let scope = feedback_scope();
Expand Down
Loading