diff --git a/app/src/ai/aws_credentials.rs b/app/src/ai/aws_credentials.rs index eba0008102d..f5549ad8acc 100644 --- a/app/src/ai/aws_credentials.rs +++ b/app/src/ai/aws_credentials.rs @@ -9,7 +9,6 @@ use futures::channel::oneshot::channel; use futures::future::BoxFuture; use tokio::sync::Mutex; use vec1::vec1; -use warp_errors::report_error; use warp_managed_secrets::client::IdentityTokenOptions; use warp_managed_secrets::ManagedSecretManager; use warpui::{ModelContext, ModelHandle, SingletonEntity}; @@ -365,8 +364,7 @@ fn refresh_aws_credentials_oidc( .as_service_error() .map(|e| e.to_string()) .unwrap_or_else(|| err.to_string()); - report_error!(anyhow::Error::new(err) - .context("Bedrock OIDC: STS AssumeRoleWithWebIdentity SDK error")); + log::warn!("Bedrock OIDC: STS AssumeRoleWithWebIdentity SDK error: {err}"); anyhow::anyhow!("STS AssumeRoleWithWebIdentity failed: {detail}") })? .credentials @@ -393,7 +391,7 @@ fn refresh_aws_credentials_oidc( } Err(e) => { let message = e.to_string(); - report_error!(e.context("Bedrock OIDC: failed to load credentials")); + log::warn!("Bedrock OIDC: failed to load credentials: {e:#}"); ( AwsCredentialsState::Failed { message: message.clone(), diff --git a/app/src/ai/bedrock_credentials.rs b/app/src/ai/bedrock_credentials.rs index 31fc2e07912..31c23710fc2 100644 --- a/app/src/ai/bedrock_credentials.rs +++ b/app/src/ai/bedrock_credentials.rs @@ -14,7 +14,6 @@ use std::time::{Duration, SystemTime}; use ai::api_keys::{ApiKeyManager, AwsCredentials, AwsCredentialsState}; use anyhow::{Context as _, Result}; use vec1::vec1; -use warp_errors::report_error; use warp_managed_secrets::client::IdentityTokenOptions; use warp_managed_secrets::ManagedSecretManager; use warpui::{ModelSpawner, SingletonEntity}; @@ -77,8 +76,7 @@ async fn try_refresh( .as_service_error() .map(|e| e.to_string()) .unwrap_or_else(|| err.to_string()); - report_error!(anyhow::Error::new(err) - .context("Bedrock OIDC refresh: STS AssumeRoleWithWebIdentity error")); + log::warn!("Bedrock OIDC refresh: STS AssumeRoleWithWebIdentity error: {err}"); anyhow::anyhow!("STS AssumeRoleWithWebIdentity failed: {detail}") })? .credentials diff --git a/app/src/ai/geap_credentials.rs b/app/src/ai/geap_credentials.rs index 0ba3e9d6fab..6943050d443 100644 --- a/app/src/ai/geap_credentials.rs +++ b/app/src/ai/geap_credentials.rs @@ -7,7 +7,6 @@ use ai::api_keys::{ use serde::{Deserialize, Serialize}; use vec1::vec1; use warp_core::features::FeatureFlag; -use warp_errors::report_error; use warp_managed_secrets::client::{IdentityTokenOptions, TaskIdentityToken}; use warp_managed_secrets::ManagedSecretManager; use warpui::r#async::Timer; @@ -317,7 +316,7 @@ fn apply_geap_mint_result( schedule_geap_token_refresh(manager, ctx); } Err(err) => { - report_error!("GEAP: credential mint failed", extra: { "error" => ?err }); + log::warn!("GEAP: credential mint failed: {err:?}"); match previous { // A failed background re-mint keeps the previous token — even // near/past expiry (Google remains the authority on validity; diff --git a/app/src/ai/mcp/mod.rs b/app/src/ai/mcp/mod.rs index a6daad2c13e..17d20bb14d3 100644 --- a/app/src/ai/mcp/mod.rs +++ b/app/src/ai/mcp/mod.rs @@ -462,8 +462,9 @@ impl MCPServerExt for MCPServer { apply_values(&mut cli_server.static_env_vars, &env_vars); } Err(error) => { - report_error!(anyhow::Error::new(error) - .context("Could not read MCP server environment variables from sqlite")); + log::warn!( + "Could not read MCP server environment variables from sqlite: {error:#}" + ); } } } diff --git a/app/src/ai/mcp/templatable_manager/native.rs b/app/src/ai/mcp/templatable_manager/native.rs index 048d95c83d8..162bbdf631f 100644 --- a/app/src/ai/mcp/templatable_manager/native.rs +++ b/app/src/ai/mcp/templatable_manager/native.rs @@ -682,9 +682,9 @@ impl TemplatableMCPServerManager { running, }; if let Err(err) = sender.send(event) { - report_error!(anyhow::Error::new(err).context( - "Failed to save TemplatableMCPServerInstallation running status to database" - )); + log::warn!( + "Failed to save TemplatableMCPServerInstallation running status to database: {err:#}" + ); } } @@ -1187,8 +1187,7 @@ impl TemplatableMCPServerManager { mcp_server_installation: mcp_server_installation.clone(), }; if let Err(err) = sender.send(event) { - report_error!(anyhow::Error::new(err) - .context("Failed to save TemplatableMCPServerInstallation to database")); + log::warn!("Failed to save TemplatableMCPServerInstallation to database: {err:#}"); } } @@ -1271,8 +1270,7 @@ impl TemplatableMCPServerManager { installation_uuids: installation_uuids.clone(), }; if let Err(err) = sender.send(event) { - report_error!(anyhow::Error::new(err) - .context("Failed to delete installations from local database")); + log::warn!("Failed to delete installations from local database: {err:#}"); } } @@ -1350,9 +1348,8 @@ impl TemplatableMCPServerManager { updates: Vec, ) -> Vec { let Some(installation) = self.get_installed_server(&installation_uuid) else { - report_error!( - "Could not find installed server", - extra: { "installation_uuid" => %installation_uuid } + log::warn!( + "Could not find installed server for deduplication (installation_uuid={installation_uuid})" ); return updates.to_vec(); }; @@ -1614,8 +1611,9 @@ impl TemplatableMCPServerManager { ctx ); } - Err(e) => report_error!(anyhow::Error::new(e) - .context("Failed to convert legacy MCP server to templatable")), + Err(e) => { + log::warn!("Failed to convert legacy MCP server to templatable: {e:#}"); + } } } } diff --git a/crates/mcp/src/oauth.rs b/crates/mcp/src/oauth.rs index 8d54745d0f5..812bcd3ad3f 100644 --- a/crates/mcp/src/oauth.rs +++ b/crates/mcp/src/oauth.rs @@ -453,8 +453,7 @@ pub fn write_to_secure_storage( match serde_json::to_string(credentials) { Ok(json) => { if let Err(err) = app.secure_storage().write_value(key, &json) { - report_error!(anyhow::Error::new(err) - .context("Failed to write MCP credentials to secure storage")); + log::warn!("Failed to write MCP credentials to secure storage: {err:#}"); } } Err(err) => { diff --git a/crates/mcp/src/runtime.rs b/crates/mcp/src/runtime.rs index 5841e06d7f0..e2aa48b4bca 100644 --- a/crates/mcp/src/runtime.rs +++ b/crates/mcp/src/runtime.rs @@ -16,7 +16,6 @@ use rmcp::ServiceExt as _; use simple_logger::SimpleLogger; use tokio::io::AsyncBufReadExt as _; use uuid::Uuid; -use warp_errors::report_error; use super::TemplatableMCPServerInfo; @@ -193,9 +192,7 @@ pub async fn spawn_server( Ok(_) => logger.log(format!("[info] MCP [pid: {pid}] stderr: {buf}")), // Failed to read from the child process's stderr. Err(e) => { - report_error!( - anyhow::Error::new(e).context("Failed to read stderr") - ); + log::warn!("Failed to read MCP child stderr: {e:#}"); return; } }