Merge remote-tracking branch 'origin/main' into feat/message-cursor-pagination

Author: zynx

Cargo.lock

@@ -53,12 +53,12 @@ aionui-cron = { path = "crates/aionui-cron" }
 aionui-assistant = { path = "crates/aionui-assistant" }
 aionui-app = { path = "crates/aionui-app" }
 
-aion-agent = { git = "https://github.com/iOfficeAI/aionrs.git", tag = "v0.1.32" }
-aion-providers = { git = "https://github.com/iOfficeAI/aionrs.git", tag = "v0.1.32" }
-aion-types = { git = "https://github.com/iOfficeAI/aionrs.git", tag = "v0.1.32" }
-aion-protocol = { git = "https://github.com/iOfficeAI/aionrs.git", tag = "v0.1.32" }
-aion-config = { git = "https://github.com/iOfficeAI/aionrs.git", tag = "v0.1.32" }
-aion-mcp = { git = "https://github.com/iOfficeAI/aionrs.git", tag = "v0.1.32" }
+aion-agent = { git = "https://github.com/iOfficeAI/aionrs.git", tag = "v0.1.33" }
+aion-providers = { git = "https://github.com/iOfficeAI/aionrs.git", tag = "v0.1.33" }
+aion-types = { git = "https://github.com/iOfficeAI/aionrs.git", tag = "v0.1.33" }
+aion-protocol = { git = "https://github.com/iOfficeAI/aionrs.git", tag = "v0.1.33" }
+aion-config = { git = "https://github.com/iOfficeAI/aionrs.git", tag = "v0.1.33" }
+aion-mcp = { git = "https://github.com/iOfficeAI/aionrs.git", tag = "v0.1.33" }
 
 # Core framework
 tokio = { version = "1", features = ["full"] }
@@ -70,6 +70,7 @@ http = "1"
 # Serialization
 serde = { version = "1", features = ["derive"] }
 serde_json = "1"
+serde_yaml = "0.9"
 
 # Async utilities
 futures-util = "0.3"

Cargo.toml

@@ -521,7 +521,8 @@ mod aionrs_config_option_tests {
             system_prompt: None,
             max_tokens: 4096,
             max_turns: None,
-            max_malformed_tool_call_turns: None,
+            max_tool_call_malformed_turns: None,
+            max_tool_call_failure_turns: None,
             compat_overrides: Default::default(),
             session_directory: std::env::temp_dir().join("aionrs-agent-task-test-sessions"),
             session_mode: None,

crates/aionui-ai-agent/src/agent_task.rs

@@ -189,7 +189,8 @@ pub(super) async fn build(
         system_prompt: overrides.system_prompt,
         max_tokens: overrides.max_tokens,
         max_turns: overrides.max_turns,
-        max_malformed_tool_call_turns: overrides.max_malformed_tool_call_turns,
+        max_tool_call_malformed_turns: overrides.max_tool_call_malformed_turns,
+        max_tool_call_failure_turns: overrides.max_tool_call_failure_turns,
         compat_overrides,
         session_directory,
         session_mode: overrides.session_mode,

crates/aionui-ai-agent/src/factory/aionrs.rs

@@ -78,7 +78,8 @@ impl AionrsAgentManager {
             model: Some(config_extra.model.clone()),
             max_tokens: Some(config_extra.max_tokens),
             max_turns: config_extra.max_turns,
-            max_malformed_tool_call_turns: config_extra.max_malformed_tool_call_turns,
+            max_tool_call_malformed_turns: config_extra.max_tool_call_malformed_turns,
+            max_tool_call_failure_turns: config_extra.max_tool_call_failure_turns,
             system_prompt: config_extra.system_prompt.clone(),
             profile: None,
             auto_approve: config_extra.session_mode.as_deref() == Some("yolo"),
@@ -485,7 +486,8 @@ mod tests {
             system_prompt: None,
             max_tokens: 4096,
             max_turns: None,
-            max_malformed_tool_call_turns: None,
+            max_tool_call_malformed_turns: None,
+            max_tool_call_failure_turns: None,
             compat_overrides: Default::default(),
             session_directory: std::env::temp_dir().join("aionrs-test-sessions"),
             session_mode: None,

crates/aionui-ai-agent/src/manager/aionrs/agent.rs

@@ -10,14 +10,15 @@ pub(super) fn aionrs_engine_error_to_send_error(error: &AionrsAgentError) -> Age
     let detail = format!("Aionrs agent error: {error}");
     match error {
         AionrsAgentError::Provider(provider_error) => aionrs_provider_error_to_send_error(provider_error, detail),
-        AionrsAgentError::RepeatedMalformedToolCall { .. } => provider_send_error(
+        AionrsAgentError::ToolCallMalformed { .. } => provider_send_error(
             "The model provider repeatedly returned malformed tool calls",
             AgentErrorCode::UserLlmProviderInvalidRequest,
             detail,
             false,
             AgentErrorResolutionKind::ChangeModel,
             Some(AgentErrorResolutionTarget::ProviderSettings),
         ),
+        AionrsAgentError::ToolCallFailures { .. } => tool_call_failure_send_error(detail),
         AionrsAgentError::ContextTooLong { .. } => provider_send_error(
             "The request is too large for the configured model context window",
             AgentErrorCode::UserLlmProviderContextTooLarge,
@@ -180,13 +181,25 @@ fn unknown_upstream_send_error(detail: String) -> AgentSendError {
     )
 }
 
+fn tool_call_failure_send_error(detail: String) -> AgentSendError {
+    AgentSendError::new(
+        "The upstream Agent repeatedly failed while executing tool calls",
+        AgentErrorCode::UnknownUpstreamError,
+        AgentErrorOwnership::UnknownUpstream,
+        Some(detail),
+        true,
+        true,
+        Some(AgentErrorResolution::new(AgentErrorResolutionKind::Retry, None)),
+    )
+}
+
 #[cfg(test)]
 mod tests {
     use super::*;
 
     #[test]
     fn aionrs_structured_malformed_tool_call_error_is_provider_error() {
-        let error = AionrsAgentError::RepeatedMalformedToolCall { count: 3, limit: 3 };
+        let error = AionrsAgentError::ToolCallMalformed { count: 3, limit: 3 };
         let send_error = aionrs_engine_error_to_send_error(&error);
 
         assert_eq!(
@@ -274,7 +287,7 @@ mod tests {
 
     #[test]
     fn aionrs_repeated_malformed_tool_call_is_user_llm_provider_error() {
-        let error = AionrsAgentError::RepeatedMalformedToolCall { count: 3, limit: 3 };
+        let error = AionrsAgentError::ToolCallMalformed { count: 3, limit: 3 };
         let send_error = aionrs_engine_error_to_send_error(&error);
 
         assert_eq!(
@@ -287,4 +300,20 @@ mod tests {
         );
         assert_eq!(send_error.stream_error().retryable, Some(false));
     }
+
+    #[test]
+    fn aionrs_tool_call_failures_are_unknown_upstream_error() {
+        let error = AionrsAgentError::ToolCallFailures { count: 3, limit: 3 };
+        let send_error = aionrs_engine_error_to_send_error(&error);
+
+        assert_eq!(
+            send_error.code(),
+            Some(aionui_api_types::AgentErrorCode::UnknownUpstreamError)
+        );
+        assert_eq!(
+            send_error.ownership(),
+            Some(aionui_api_types::AgentErrorOwnership::UnknownUpstream)
+        );
+        assert_eq!(send_error.stream_error().retryable, Some(true));
+    }
 }

crates/aionui-ai-agent/src/manager/aionrs/error.rs

@@ -217,6 +217,10 @@ impl AgentSendError {
         self.stream_error
     }
 
+    pub fn from_stream_error_data(stream_error: AgentStreamErrorData) -> Self {
+        Self { stream_error }
+    }
+
     pub fn code(&self) -> Option<AgentErrorCode> {
         self.stream_error.code
     }

crates/aionui-ai-agent/src/protocol/send_error.rs

@@ -82,7 +82,8 @@ impl ProviderHealthCheckService {
             system_prompt: Some("You are a provider health probe. Reply with exactly OK and do not use tools.".into()),
             max_tokens: 16,
             max_turns: Some(1),
-            max_malformed_tool_call_turns: Some(1),
+            max_tool_call_malformed_turns: Some(1),
+            max_tool_call_failure_turns: Some(1),
             compat_overrides,
             session_directory: self.data_dir.join("aionrs-health-check-sessions"),
             session_mode: None,
@@ -195,7 +196,8 @@ async fn build_probe_engine(config_extra: AionrsResolvedConfig) -> Result<AgentE
         model: Some(config_extra.model),
         max_tokens: Some(config_extra.max_tokens),
         max_turns: config_extra.max_turns,
-        max_malformed_tool_call_turns: config_extra.max_malformed_tool_call_turns,
+        max_tool_call_malformed_turns: config_extra.max_tool_call_malformed_turns,
+        max_tool_call_failure_turns: config_extra.max_tool_call_failure_turns,
         system_prompt: config_extra.system_prompt,
         profile: None,
         auto_approve: false,

crates/aionui-ai-agent/src/services/provider_health.rs

@@ -64,7 +64,9 @@ pub struct AionrsResolvedConfig {
     /// Max agentic turns.
     pub max_turns: Option<usize>,
     /// Max repeated malformed tool-call turns before stopping.
-    pub max_malformed_tool_call_turns: Option<usize>,
+    pub max_tool_call_malformed_turns: Option<usize>,
+    /// Max repeated tool-call failure turns before stopping.
+    pub max_tool_call_failure_turns: Option<usize>,
     /// Provider-specific compat overrides.
     pub compat_overrides: AionrsCompatOverrides,
     /// Directory for aionrs session persistence files.
@@ -195,7 +197,8 @@ mod tests {
         assert!(extra.preset_rules.is_none());
         assert_eq!(extra.max_tokens, 8192);
         assert!(extra.max_turns.is_none());
-        assert!(extra.max_malformed_tool_call_turns.is_none());
+        assert!(extra.max_tool_call_malformed_turns.is_none());
+        assert!(extra.max_tool_call_failure_turns.is_none());
     }
 
     #[test]
@@ -204,13 +207,15 @@ mod tests {
             "system_prompt": "You are a helpful assistant.",
             "max_tokens": 4096,
             "max_turns": 10,
-            "max_malformed_tool_call_turns": 2
+            "max_tool_call_malformed_turns": 2,
+            "max_tool_call_failure_turns": 3
         });
         let extra: AionrsBuildExtra = serde_json::from_value(json).unwrap();
         assert_eq!(extra.system_prompt.unwrap(), "You are a helpful assistant.");
         assert_eq!(extra.max_tokens, 4096);
         assert_eq!(extra.max_turns.unwrap(), 10);
-        assert_eq!(extra.max_malformed_tool_call_turns.unwrap(), 2);
+        assert_eq!(extra.max_tool_call_malformed_turns.unwrap(), 2);
+        assert_eq!(extra.max_tool_call_failure_turns.unwrap(), 3);
     }
 
     #[test]

crates/aionui-ai-agent/src/types.rs

@@ -97,7 +97,8 @@ fn make_aionrs_config() -> AionrsResolvedConfig {
         system_prompt: None,
         max_tokens: 4096,
         max_turns: None,
-        max_malformed_tool_call_turns: None,
+        max_tool_call_malformed_turns: None,
+        max_tool_call_failure_turns: None,
         compat_overrides: Default::default(),
         session_directory: std::env::temp_dir().join("aionrs-test-sessions"),
         session_mode: None,