refactor(rap-protocol)!: type tool-call IDs (ToolCallId, ProviderCallId, ChoiceId)

crates/infinity-agent-cli/src/daemon_client.rs

@@ -552,7 +552,8 @@ where
         mpsc::unbounded_channel::<HashMap<ThreadRef, SessionInfo>>();
     let (soft_detach_tx, soft_detach_rx) = mpsc::unbounded_channel::<()>();
     let (detach_result_tx, detach_result_rx) = mpsc::unbounded_channel::<DetachResult>();
-    let (choice_answered_tx, choice_answered_rx) = mpsc::unbounded_channel::<(String, usize)>();
+    let (choice_answered_tx, choice_answered_rx) =
+        mpsc::unbounded_channel::<(infinity_protocol::ChoiceId, usize)>();
 
     if let Some(info) = startup_info {
         let _ = display_tx.send((None, DisplayEvent::Info(info)));

crates/infinity-agent-cli/src/display.rs

@@ -36,14 +36,14 @@ pub enum DisplayEvent {
         auth_url: String,
     },
     UserChoiceRequired {
-        id: String,
+        id: infinity_protocol::ChoiceId,
         prompt: String,
         choices: Vec<String>,
         default: usize,
         response_url: String,
     },
     UserChoiceComplete {
-        choice_id: String,
+        choice_id: infinity_protocol::ChoiceId,
     },
     ThinkingStart,
     ThinkingEnd,

crates/infinity-agent-cli/src/terminal.rs

@@ -104,7 +104,7 @@ enum SoftDetachAction {
 
 /// A queued user choice request waiting to be shown in the TUI.
 struct PendingChoice {
-    id: String,
+    id: infinity_protocol::ChoiceId,
     prompt: String,
     choices: Vec<String>,
     default: usize,
@@ -134,7 +134,7 @@ pub async fn run<T, E>(
     >,
     soft_detach_tx: mpsc::UnboundedSender<()>,
     mut detach_result_rx: mpsc::UnboundedReceiver<DetachResult>,
-    choice_answered_tx: mpsc::UnboundedSender<(String, usize)>,
+    choice_answered_tx: mpsc::UnboundedSender<(infinity_protocol::ChoiceId, usize)>,
 ) -> Result<bool, BoxError>
 where
     T: TermOut,

crates/infinity-agent-cli/tests/common/mod.rs

@@ -442,7 +442,7 @@ pub struct TuiHarness {
     pub load_session_rx: mpsc::UnboundedReceiver<(Option<infinity_protocol::ThreadRef>, bool)>,
     pub model_switch_rx: mpsc::UnboundedReceiver<usize>,
     pub soft_detach_rx: mpsc::UnboundedReceiver<()>,
-    pub choice_answered_rx: mpsc::UnboundedReceiver<(String, usize)>,
+    pub choice_answered_rx: mpsc::UnboundedReceiver<(infinity_protocol::ChoiceId, usize)>,
     pub handle: tokio::task::JoinHandle<Result<bool, BoxError>>,
 }
 

crates/infinity-agent-cli/tests/tui_flow_snapshots.rs

@@ -315,14 +315,14 @@ async fn queued_choices_and_external_complete() {
     let mut h = TuiHarness::spawn(80, 16).await;
 
     h.display(Evt::UserChoiceRequired {
-        id: "choice-1".to_owned(),
+        id: "choice-1".into(),
         prompt: "First question?".to_owned(),
         choices: vec!["Yes".to_owned(), "No".to_owned()],
         default: 0,
         response_url: String::new(),
     });
     h.display(Evt::UserChoiceRequired {
-        id: "choice-2".to_owned(),
+        id: "choice-2".into(),
         prompt: "Second question?".to_owned(),
         choices: vec!["Red".to_owned(), "Green".to_owned(), "Blue".to_owned()],
         default: 1,
@@ -341,7 +341,7 @@ async fn queued_choices_and_external_complete() {
     insta::assert_snapshot!("second_choice_shown", h.screen());
 
     h.display(Evt::UserChoiceComplete {
-        choice_id: "choice-2".to_owned(),
+        choice_id: "choice-2".into(),
     });
     h.settle().await;
     insta::assert_snapshot!("choices_all_dismissed", h.screen());

crates/infinity-agent-cli/tests/tui_viewport_snapshots.rs

@@ -116,7 +116,7 @@ async fn choice_picker_during_stream() {
         chunk: "Working on it...".to_owned(),
     });
     h.display(Evt::UserChoiceRequired {
-        id: "choice-1".to_owned(),
+        id: "choice-1".into(),
         prompt: "Allow the tool to run?".to_owned(),
         choices: vec!["Allow".to_owned(), "Deny".to_owned()],
         default: 0,

crates/infinity-agent-core/examples/agent_scale.rs

@@ -118,15 +118,15 @@ impl Tool<ChannelSender> for RunCommand {
     async fn execute(
         &self,
         _args: serde_json::Value,
-        id: String,
-        call_id: Option<String>,
+        id: rap_protocol::ToolCallId,
+        call_id: Option<rap_protocol::ProviderCallId>,
         context: &ToolContext<ChannelSender>,
     ) -> Result<(), Box<dyn std::error::Error + Send + Sync>> {
         let result =
             InputMessage {
                 content: InputMessageContent::User(UserContent::ToolResult(ToolResult {
-                    id,
-                    call_id,
+                    id: id.into_inner(),
+                    call_id: call_id.map(|c| c.into_inner()),
                     content:
                         vec![ToolResultContent::Text(infinity_provider_protocol::message::Text {
                     text: "test result: ok. 148 passed; 0 failed; 3 ignored; finished in 21.38s"