chore: reuse acp success responses in client

Author: wangtsiao

crates/client/src/acp_fs.rs

@@ -5,7 +5,7 @@ use devo_protocol::ACP_FS_WRITE_TEXT_FILE_METHOD;
 use devo_protocol::AcpFsReadTextFileParams;
 use devo_protocol::AcpFsReadTextFileResult;
 use devo_protocol::AcpFsWriteTextFileParams;
-use devo_protocol::AcpSuccessResponse;
+use devo_protocol::acp_success_response;
 
 pub(crate) async fn handle_acp_fs_request(
     request_id: serde_json::Value,
@@ -17,7 +17,7 @@ pub(crate) async fn handle_acp_fs_request(
             let params = serde_json::from_value::<AcpFsReadTextFileParams>(params)
                 .map_err(|error| format!("invalid fs/read_text_file params: {error}"))?;
             let content = read_acp_text_file(&params.path, params.line, params.limit).await?;
-            Ok(acp_fs_success_response(
+            Ok(acp_success_response(
                 request_id,
                 AcpFsReadTextFileResult {
                     content,
@@ -29,7 +29,7 @@ pub(crate) async fn handle_acp_fs_request(
             let params = serde_json::from_value::<AcpFsWriteTextFileParams>(params)
                 .map_err(|error| format!("invalid fs/write_text_file params: {error}"))?;
             write_acp_text_file(&params.path, params.content).await?;
-            Ok(acp_fs_success_response(request_id, serde_json::Value::Null))
+            Ok(acp_success_response(request_id, serde_json::Value::Null))
         }
         _ => Err(format!("unknown ACP filesystem method {method}")),
     }
@@ -82,20 +82,13 @@ fn select_text_lines(
     Ok(selected)
 }
 
-fn acp_fs_success_response<T: serde::Serialize>(
-    id: serde_json::Value,
-    result: T,
-) -> serde_json::Value {
-    serde_json::to_value(AcpSuccessResponse::new(id, result))
-        .expect("serialize ACP filesystem success response")
-}
-
 #[cfg(test)]
 mod tests {
     use std::path::PathBuf;
     use std::sync::atomic::AtomicU64;
     use std::sync::atomic::Ordering;
 
+    use devo_protocol::AcpSuccessResponse;
     use pretty_assertions::assert_eq;
 
     use super::*;

crates/client/src/acp_terminal.rs

@@ -10,13 +10,13 @@ use devo_protocol::ACP_TERMINAL_KILL_METHOD;
 use devo_protocol::ACP_TERMINAL_OUTPUT_METHOD;
 use devo_protocol::ACP_TERMINAL_RELEASE_METHOD;
 use devo_protocol::ACP_TERMINAL_WAIT_FOR_EXIT_METHOD;
-use devo_protocol::AcpSuccessResponse;
 use devo_protocol::AcpTerminalCreateParams;
 use devo_protocol::AcpTerminalCreateResult;
 use devo_protocol::AcpTerminalExitStatus;
 use devo_protocol::AcpTerminalOutputResult;
 use devo_protocol::AcpTerminalParams;
 use devo_protocol::AcpTerminalWaitForExitResult;
+use devo_protocol::acp_success_response;
 use tokio::io::AsyncRead;
 use tokio::io::AsyncReadExt;
 use tokio::process::Child;
@@ -95,7 +95,7 @@ pub(crate) async fn handle_acp_terminal_request(
             let params = serde_json::from_value::<AcpTerminalCreateParams>(params)
                 .map_err(|error| format!("invalid terminal/create params: {error}"))?;
             let terminal_id = create_acp_terminal(params, terminals, notifications_tx).await?;
-            Ok(acp_terminal_success_response(
+            Ok(acp_success_response(
                 request_id,
                 AcpTerminalCreateResult {
                     terminal_id,
@@ -107,13 +107,13 @@ pub(crate) async fn handle_acp_terminal_request(
             let params = serde_json::from_value::<AcpTerminalParams>(params)
                 .map_err(|error| format!("invalid terminal/output params: {error}"))?;
             let result = acp_terminal_output(&params.terminal_id, terminals).await?;
-            Ok(acp_terminal_success_response(request_id, result))
+            Ok(acp_success_response(request_id, result))
         }
         ACP_TERMINAL_WAIT_FOR_EXIT_METHOD => {
             let params = serde_json::from_value::<AcpTerminalParams>(params)
                 .map_err(|error| format!("invalid terminal/wait_for_exit params: {error}"))?;
             let status = wait_for_acp_terminal_exit(&params.terminal_id, terminals).await?;
-            Ok(acp_terminal_success_response(
+            Ok(acp_success_response(
                 request_id,
                 AcpTerminalWaitForExitResult {
                     exit_code: status.exit_code,
@@ -126,19 +126,13 @@ pub(crate) async fn handle_acp_terminal_request(
             let params = serde_json::from_value::<AcpTerminalParams>(params)
                 .map_err(|error| format!("invalid terminal/kill params: {error}"))?;
             kill_acp_terminal(&params.terminal_id, terminals).await?;
-            Ok(acp_terminal_success_response(
-                request_id,
-                serde_json::json!({}),
-            ))
+            Ok(acp_success_response(request_id, serde_json::json!({})))
         }
         ACP_TERMINAL_RELEASE_METHOD => {
             let params = serde_json::from_value::<AcpTerminalParams>(params)
                 .map_err(|error| format!("invalid terminal/release params: {error}"))?;
             release_acp_terminal(&params.terminal_id, terminals).await?;
-            Ok(acp_terminal_success_response(
-                request_id,
-                serde_json::json!({}),
-            ))
+            Ok(acp_success_response(request_id, serde_json::json!({})))
         }
         _ => Err(format!("unknown ACP terminal method {method}")),
     }
@@ -450,16 +444,9 @@ fn acp_terminal_exit_status_from_process_status(status: ExitStatus) -> AcpTermin
     }
 }
 
-fn acp_terminal_success_response<T: serde::Serialize>(
-    id: serde_json::Value,
-    result: T,
-) -> serde_json::Value {
-    serde_json::to_value(AcpSuccessResponse::new(id, result))
-        .expect("serialize ACP terminal success response")
-}
-
 #[cfg(test)]
 mod tests {
+    use devo_protocol::AcpSuccessResponse;
     use pretty_assertions::assert_eq;
     use tokio::sync::mpsc;
     use tokio::time::Duration;

crates/client/src/stdio.rs

@@ -145,6 +145,7 @@ use devo_protocol::TurnStartParams;
 use devo_protocol::TurnStartResult;
 use devo_protocol::TurnSteerParams;
 use devo_protocol::TurnSteerResult;
+use devo_protocol::acp_success_response;
 use devo_protocol::devo_extension_inner_method;
 use devo_protocol::devo_extension_method;
 use devo_protocol::original_event_from_acp_notification;
@@ -656,7 +657,7 @@ impl StdioServerClient {
             let decision = acp_permission_response_from_approval(&params, &pending);
             write_acp_client_response(
                 Arc::clone(&self.stdin),
-                acp_client_success_response(pending.request_id.clone(), decision),
+                acp_success_response(pending.request_id.clone(), decision),
             )
             .await
             .context("write ACP permission response")?;
@@ -1326,17 +1327,6 @@ fn acp_approval_scope_label(scope: &ApprovalScopeValue) -> &'static str {
     }
 }
 
-fn acp_client_success_response(
-    id: serde_json::Value,
-    result: serde_json::Value,
-) -> serde_json::Value {
-    serde_json::json!({
-        "jsonrpc": "2.0",
-        "id": id,
-        "result": result
-    })
-}
-
 fn acp_client_error_response(
     id: serde_json::Value,
     code: i64,