chore: fix formatting and clippy lints
This commit is contained in:
1 parent
8952bd5399
commit
9d9e959744
35 files changed
+1091
-582
No files matched your search
@@ -41,7 +41,10 @@ pub async fn wait_for_event_handler(
|
||||
}
|
||||
}
|
||||
Err(tokio::sync::broadcast::error::RecvError::Lagged(skipped)) => {
|
||||
tracing::warn!("Event bus receiver lagged by {} messages; continuing wait.", skipped);
|
||||
tracing::warn!(
|
||||
"Event bus receiver lagged by {} messages; continuing wait.",
|
||||
skipped
|
||||
);
|
||||
continue;
|
||||
}
|
||||
Err(tokio::sync::broadcast::error::RecvError::Closed) => {
|
||||
|
||||
+42
-24
@@ -44,8 +44,7 @@ pub fn find_projected_knowledge(
|
||||
|| normalized_file.ends_with(&format!("/{}", ndfp.trim_start_matches('/')))
|
||||
|| ndfp.ends_with(&format!("/{}", normalized_file.trim_start_matches('/')))
|
||||
|| (!file_name.is_empty()
|
||||
&& (ndfp == file_name
|
||||
|| ndfp.ends_with(&format!("/{}", file_name))))
|
||||
&& (ndfp == file_name || ndfp.ends_with(&format!("/{}", file_name))))
|
||||
{
|
||||
return true;
|
||||
}
|
||||
@@ -73,8 +72,7 @@ pub fn find_projected_knowledge(
|
||||
all_adrs
|
||||
.iter()
|
||||
.filter(|a| {
|
||||
a.status.eq_ignore_ascii_case("accepted")
|
||||
|| a.status.eq_ignore_ascii_case("active")
|
||||
a.status.eq_ignore_ascii_case("accepted") || a.status.eq_ignore_ascii_case("active")
|
||||
})
|
||||
.filter(|a| {
|
||||
for comp in &a.affected_components {
|
||||
@@ -189,31 +187,47 @@ pub async fn nvim_telemetry_handler(
|
||||
|
||||
if payload.event.starts_with("agent_") || payload.event.starts_with("diff_") {
|
||||
let payload_val = serde_json::json!(&payload);
|
||||
let _ = state.handler.state.event_bus_tx.send(crate::state::GenericEvent {
|
||||
topic: format!("nvim:ui:{}", payload.event),
|
||||
session_id: Some(payload.session_id.clone()),
|
||||
payload: payload_val.clone(),
|
||||
});
|
||||
|
||||
if let Some(ref req_id) = payload.request_id {
|
||||
let _ = state.handler.state.event_bus_tx.send(crate::state::GenericEvent {
|
||||
topic: format!("nvim:ui:{}:{}", payload.event, req_id),
|
||||
let _ = state
|
||||
.handler
|
||||
.state
|
||||
.event_bus_tx
|
||||
.send(crate::state::GenericEvent {
|
||||
topic: format!("nvim:ui:{}", payload.event),
|
||||
session_id: Some(payload.session_id.clone()),
|
||||
payload: payload_val.clone(),
|
||||
});
|
||||
|
||||
if let Some(ref req_id) = payload.request_id {
|
||||
let _ = state
|
||||
.handler
|
||||
.state
|
||||
.event_bus_tx
|
||||
.send(crate::state::GenericEvent {
|
||||
topic: format!("nvim:ui:{}:{}", payload.event, req_id),
|
||||
session_id: Some(payload.session_id.clone()),
|
||||
payload: payload_val.clone(),
|
||||
});
|
||||
}
|
||||
|
||||
if let Some(ref diff_id) = payload.diff_id {
|
||||
let _ = state.handler.state.event_bus_tx.send(crate::state::GenericEvent {
|
||||
topic: format!("nvim:ui:{}:{}", payload.event, diff_id),
|
||||
session_id: Some(payload.session_id.clone()),
|
||||
payload: payload_val.clone(),
|
||||
});
|
||||
let _ = state.handler.state.event_bus_tx.send(crate::state::GenericEvent {
|
||||
topic: format!("nvim:ui:diff_decision:{}", diff_id),
|
||||
session_id: Some(payload.session_id.clone()),
|
||||
payload: payload_val.clone(),
|
||||
});
|
||||
let _ = state
|
||||
.handler
|
||||
.state
|
||||
.event_bus_tx
|
||||
.send(crate::state::GenericEvent {
|
||||
topic: format!("nvim:ui:{}:{}", payload.event, diff_id),
|
||||
session_id: Some(payload.session_id.clone()),
|
||||
payload: payload_val.clone(),
|
||||
});
|
||||
let _ = state
|
||||
.handler
|
||||
.state
|
||||
.event_bus_tx
|
||||
.send(crate::state::GenericEvent {
|
||||
topic: format!("nvim:ui:diff_decision:{}", diff_id),
|
||||
session_id: Some(payload.session_id.clone()),
|
||||
payload: payload_val.clone(),
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
@@ -230,7 +244,11 @@ pub async fn nvim_telemetry_handler(
|
||||
tasks
|
||||
.iter()
|
||||
.find(|t| t.is_active())
|
||||
.or_else(|| tasks.iter().find(|t| t.status == "pending" && t.parent_id.is_none()))
|
||||
.or_else(|| {
|
||||
tasks
|
||||
.iter()
|
||||
.find(|t| t.status == "pending" && t.parent_id.is_none())
|
||||
})
|
||||
.map(|t| t.title.clone())
|
||||
});
|
||||
|
||||
|
||||
+16
-8
@@ -66,9 +66,11 @@ pub async fn handle_socket(socket: WebSocket, state: Arc<AppState>, _client_type
|
||||
activities
|
||||
.iter()
|
||||
.filter_map(|act_val| {
|
||||
if act_val["category"] == "TASK_EVENT" {
|
||||
if let Some(details_str) = act_val["details"].as_str() {
|
||||
if let Ok(event_val) = serde_json::from_str::<serde_json::Value>(details_str) {
|
||||
if act_val["category"] == "TASK_EVENT"
|
||||
&& let Some(details_str) = act_val["details"].as_str()
|
||||
&& let Ok(event_val) =
|
||||
serde_json::from_str::<serde_json::Value>(details_str)
|
||||
{
|
||||
return Some(
|
||||
serde_json::json!({
|
||||
"jsonrpc": "2.0",
|
||||
@@ -78,8 +80,6 @@ pub async fn handle_socket(socket: WebSocket, state: Arc<AppState>, _client_type
|
||||
.to_string(),
|
||||
);
|
||||
}
|
||||
}
|
||||
}
|
||||
None
|
||||
})
|
||||
.take(5)
|
||||
@@ -262,7 +262,10 @@ mod tests {
|
||||
mem_state.broadcast_task_event(task_event.clone());
|
||||
|
||||
// Verify recent activities recorded the event
|
||||
let recorded = mem_state.telemetry.recent_activities.read_with(|act| act.clone());
|
||||
let recorded = mem_state
|
||||
.telemetry
|
||||
.recent_activities
|
||||
.read_with(|act| act.clone());
|
||||
assert!(!recorded.is_empty());
|
||||
assert_eq!(recorded[0]["category"], "TASK_EVENT");
|
||||
|
||||
@@ -293,7 +296,9 @@ mod tests {
|
||||
.filter_map(|act_val| {
|
||||
if act_val["category"] == "TASK_EVENT" {
|
||||
if let Some(details_str) = act_val["details"].as_str() {
|
||||
if let Ok(event_val) = serde_json::from_str::<serde_json::Value>(details_str) {
|
||||
if let Ok(event_val) =
|
||||
serde_json::from_str::<serde_json::Value>(details_str)
|
||||
{
|
||||
return Some(
|
||||
serde_json::json!({
|
||||
"jsonrpc": "2.0",
|
||||
@@ -315,7 +320,10 @@ mod tests {
|
||||
let _ = tx.try_send(notif);
|
||||
}
|
||||
|
||||
let replayed_msg = rx.recv().await.expect("Expected replayed task event notification");
|
||||
let replayed_msg = rx
|
||||
.recv()
|
||||
.await
|
||||
.expect("Expected replayed task event notification");
|
||||
let parsed: serde_json::Value = serde_json::from_str(&replayed_msg).unwrap();
|
||||
assert_eq!(parsed["method"], "notifications/task/completed");
|
||||
assert_eq!(parsed["params"]["task_id"], "task-999");
|
||||
|
||||
Reference in new issue
Block a user