Skip to content

Commit bf96fe7

Browse files
committed
chore: share acp legacy error adapter
1 parent 4dd5c1a commit bf96fe7

3 files changed

Lines changed: 4 additions & 18 deletions

File tree

crates/server/src/runtime/handlers/acp.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ mod session_support;
8888

8989
use history::acp_update_from_history_item;
9090
use mcp::acp_mcp_config;
91-
use response::legacy_error_to_acp;
91+
pub(super) use response::legacy_error_to_acp;
9292
use session_support::decode_session_list_cursor;
9393
use session_support::encode_session_list_cursor;
9494
use session_support::validate_acp_session_roots;

crates/server/src/runtime/handlers/acp/response.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
use super::*;
22

3-
pub(super) fn legacy_error_to_acp(
3+
pub(in crate::runtime::handlers) fn legacy_error_to_acp(
44
request_id: serde_json::Value,
55
legacy_response: serde_json::Value,
66
) -> serde_json::Value {

crates/server/src/runtime/handlers/acp_slash_commands.rs

Lines changed: 2 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@ use super::super::*;
22

33
use std::sync::Arc;
44

5+
use super::acp::legacy_error_to_acp;
6+
57
use devo_protocol::GoalClearParams;
68
use devo_protocol::GoalClearResult;
79
use devo_protocol::GoalSetParams;
@@ -23,7 +25,6 @@ use crate::AcpSessionNotification;
2325
use crate::AcpSessionUpdate;
2426
use crate::AcpStopReason;
2527
use crate::CollaborationMode;
26-
use crate::ErrorResponse;
2728
use crate::InputItem;
2829
use crate::SessionCompactParams;
2930
use crate::SessionCompactResult;
@@ -503,21 +504,6 @@ fn acp_prompt_success_response(request_id: serde_json::Value) -> serde_json::Val
503504
)
504505
}
505506

506-
fn legacy_error_to_acp(
507-
request_id: serde_json::Value,
508-
legacy_response: serde_json::Value,
509-
) -> serde_json::Value {
510-
if let Ok(error) = serde_json::from_value::<ErrorResponse>(legacy_response) {
511-
acp_error_response(request_id, AcpErrorCode::ServerError, error.error.message)
512-
} else {
513-
acp_error_response(
514-
request_id,
515-
AcpErrorCode::InternalError,
516-
"failed to decode internal runtime response",
517-
)
518-
}
519-
}
520-
521507
fn goal_summary_message(goal: &ThreadGoal) -> String {
522508
let status = goal_status_label(goal.status);
523509
let objective = &goal.objective;

0 commit comments

Comments
 (0)