Add unified models UI and Rig Bedrock runtime

app/src/ai/blocklist/controller.rs

@@ -4346,6 +4346,7 @@ impl BlocklistAIController {
             secret_access_key: settings.bedrock_secret_access_key.value().clone(),
             session_token: None,
             cross_region_inference: *settings.bedrock_cross_region_inference.value(),
+            use_rig: false,
         };
 
         if let ::ai::api_keys::AwsCredentialsState::Loaded { credentials, .. } =
@@ -4431,6 +4432,9 @@ impl BlocklistAIController {
                         .iter()
                         .map(|p| match p {
                             ContentPart::Text(t) => t.clone(),
+                            ContentPart::Reasoning { text, .. } => {
+                                format!("[Reasoning] {text}")
+                            }
                             ContentPart::Image { .. } => "[Image attachment]".to_string(),
                             ContentPart::ToolUse { name, input, .. } => {
                                 format!("[Tool: {}] {}", name, input)
@@ -4540,6 +4544,9 @@ impl BlocklistAIController {
                                                 .iter()
                                                 .map(|p| match p {
                                                     ContentPart::Text(t) => (t.len() / 4) as u32,
+                                                    ContentPart::Reasoning { text, .. } => {
+                                                        (text.len() / 4) as u32
+                                                    }
                                                     ContentPart::Image { .. } => 1_600,
                                                     ContentPart::ToolUse { input, .. } => {
                                                         (input.to_string().len() / 4) as u32

app/src/ai/blocklist/controller/response_stream.rs

@@ -243,15 +243,33 @@ impl ResponseStream {
         // Fall back to Bedrock
         if *settings.bedrock_enabled.value() {
             let auth_method = *settings.bedrock_auth_method.value();
+            let region = settings.bedrock_region.value().clone();
+            let cross_region_inference = *settings.bedrock_cross_region_inference.value();
+            let mut use_rig = crate::ai::bedrock::models::configured_model_uses_rig(
+                model_id,
+                settings.bedrock_models.value(),
+                &region,
+                cross_region_inference,
+            );
+            if use_rig
+                && crate::ai::bedrock::external_config::ExternalBedrockConfig::load()
+                    .enable_prompt_caching_1h
+            {
+                log::warn!(
+                    "[rig/bedrock] Using the compatibility runtime because Rig does not yet expose Bedrock's one-hour cache TTL"
+                );
+                use_rig = false;
+            }
             let api_key_manager = ::ai::api_keys::ApiKeyManager::as_ref(ctx);
             let mut config = BedrockClientConfig {
                 auth_method,
                 profile: settings.bedrock_profile.value().clone(),
-                region: settings.bedrock_region.value().clone(),
+                region,
                 access_key_id: settings.bedrock_access_key_id.value().clone(),
                 secret_access_key: settings.bedrock_secret_access_key.value().clone(),
                 session_token: None,
-                cross_region_inference: *settings.bedrock_cross_region_inference.value(),
+                cross_region_inference,
+                use_rig,
             };
 
             if let ::ai::api_keys::AwsCredentialsState::Loaded { credentials, .. } =

app/src/ai/blocklist/usage/context_window_view.rs

@@ -45,6 +45,7 @@ impl View for ContextWindowView {
                     .iter()
                     .map(|p| match p {
                         ContentPart::Text(t) => t.len(),
+                        ContentPart::Reasoning { text, .. } => text.len(),
                         ContentPart::Image { .. } => 6_400,
                         ContentPart::ToolUse { input, .. } => input.to_string().len(),
                         ContentPart::ToolResult { content, .. } => content.len(),
@@ -112,6 +113,14 @@ impl View for ContextWindowView {
                             ContentPart::Text(t) => {
                                 out.push_str(&format!("[Part {} Text] {}\n", pi, t));
                             }
+                            ContentPart::Reasoning { text, signature } => {
+                                out.push_str(&format!(
+                                    "[Part {} Reasoning] signed={}\n{}\n",
+                                    pi,
+                                    signature.is_some(),
+                                    text
+                                ));
+                            }
                             ContentPart::Image { data, mime_type } => {
                                 out.push_str(&format!(
                                     "[Part {} Image] mime_type={}, bytes={}\n",