diff --git a/app/src/ai/agent_sdk/driver.rs b/app/src/ai/agent_sdk/driver.rs index 7332ec80ee2..30823d5e6e3 100644 --- a/app/src/ai/agent_sdk/driver.rs +++ b/app/src/ai/agent_sdk/driver.rs @@ -878,7 +878,7 @@ impl AgentDriver { .await .context("Failed to update agent task state to InProgress") { - report_error!(e); + log::error!("Failed to update agent task state to InProgress: {e:#}"); } } // Primary: WARP_SANDBOX_DEADLINE client-side timer. @@ -1032,7 +1032,7 @@ impl AgentDriver { Self::run_snapshot_upload(&foreground).await; if tx.send(result).is_err() { - report_error!("Caller did not wait for agent driver to finish"); + log::warn!("Caller did not wait for agent driver to finish"); } Self::cleanup(foreground).await; @@ -3010,7 +3010,7 @@ impl AgentDriver { .await .context("Failed to clean up harness runtime state") { - report_error!(err); + log::warn!("Failed to clean up harness runtime state: {err:#}"); } // A runtime failure detected mid-run takes precedence over the @@ -3940,9 +3940,7 @@ pub(super) async fn report_driver_error( .update_agent_task(task_id, Some(state), None, None, Some(status_update)) .await { - report_error!( - anyhow!(e).context(format!("Failed to report driver error for task {task_id}")) - ); + log::error!("Failed to report driver error for task {task_id}: {e:#}"); } } diff --git a/app/src/ai/agent_sdk/driver/harness/claude_code.rs b/app/src/ai/agent_sdk/driver/harness/claude_code.rs index c7ea08bc7cf..24b96b24111 100644 --- a/app/src/ai/agent_sdk/driver/harness/claude_code.rs +++ b/app/src/ai/agent_sdk/driver/harness/claude_code.rs @@ -57,7 +57,6 @@ use parent_bridge::{MessageBridge, MessageBridgeCleanupDisposition}; use shell_words::quote as shell_quote; #[cfg(test)] use wake_driver::{ClaudeWakeRemoteContext, CLAUDE_WAKE_PROMPT_FILE_NAME}; -use warp_errors::report_error; #[cfg(test)] use super::super::OZ_MESSAGE_LISTENER_STATE_ROOT_ENV; @@ -461,7 +460,7 @@ impl HarnessRunner for ClaudeHarnessRunner { .create_external_conversation(CLAUDE_CODE_FORMAT) .await .map_err(|e| { - report_error!(&e); + log::error!("Failed to create external conversation: {e:#}"); AgentDriverError::ConfigBuildFailed(e) }) }) diff --git a/app/src/ai/agent_sdk/driver/harness/codex.rs b/app/src/ai/agent_sdk/driver/harness/codex.rs index 136c3b20f0d..de6eef4781a 100644 --- a/app/src/ai/agent_sdk/driver/harness/codex.rs +++ b/app/src/ai/agent_sdk/driver/harness/codex.rs @@ -13,7 +13,6 @@ use tempfile::NamedTempFile; use uuid::Uuid; use warp_cli::agent::Harness; use warp_core::features::FeatureFlag; -use warp_errors::report_error; use warp_managed_secrets::ManagedSecretValue; use warpui::{ModelHandle, ModelSpawner, SingletonEntity}; @@ -326,7 +325,7 @@ impl HarnessRunner for CodexHarnessRunner { .create_external_conversation(CODEX_CLI_FORMAT) .await .map_err(|e| { - report_error!(&e); + log::error!("Failed to create external conversation: {e:#}"); AgentDriverError::ConfigBuildFailed(e) }) }) diff --git a/app/src/ai/agent_sdk/driver/harness/gemini.rs b/app/src/ai/agent_sdk/driver/harness/gemini.rs index d38028716c0..4c7a19e3eb5 100644 --- a/app/src/ai/agent_sdk/driver/harness/gemini.rs +++ b/app/src/ai/agent_sdk/driver/harness/gemini.rs @@ -10,7 +10,6 @@ use serde::{Deserialize, Serialize}; use serde_json::{Map, Value}; use tempfile::NamedTempFile; use warp_cli::agent::Harness; -use warp_errors::report_error; use warp_managed_secrets::ManagedSecretValue; use warpui::{ModelHandle, ModelSpawner}; @@ -167,7 +166,7 @@ impl HarnessRunner for GeminiHarnessRunner { .create_external_conversation(GEMINI_CLI_FORMAT) .await .map_err(|e| { - report_error!(&e); + log::error!("Failed to create external conversation: {e:#}"); AgentDriverError::ConfigBuildFailed(e) }) }) diff --git a/app/src/ai/agent_sdk/driver/snapshot.rs b/app/src/ai/agent_sdk/driver/snapshot.rs index d12efdd876f..681ac5c553d 100644 --- a/app/src/ai/agent_sdk/driver/snapshot.rs +++ b/app/src/ai/agent_sdk/driver/snapshot.rs @@ -145,10 +145,7 @@ pub(super) async fn run_declarations_script( }; let script_path = PathBuf::from(script_path); if !script_path.exists() { - report_error!( - "Snapshot declarations script not found; skipping", - extra: { "script_path" => %script_path.display(), "task_id" => %task_id } - ); + log::warn!("Snapshot declarations script not found; skipping"); return; } @@ -173,21 +170,11 @@ pub(super) async fn run_declarations_script( let output = match command.output().with_timeout(script_timeout).await { Ok(Ok(output)) => output, Ok(Err(e)) => { - report_error!( - anyhow::Error::new(e).context("Failed to spawn snapshot declarations script"), - extra: { "script_path" => %script_path.display(), "task_id" => %task_id } - ); + log::error!("Failed to spawn snapshot declarations script: {e:#}"); return; } Err(_) => { - report_error!( - "Snapshot declarations script timed out", - extra: { - "script_path" => %script_path.display(), - "timeout" => ?script_timeout, - "task_id" => %task_id - } - ); + log::warn!("Snapshot declarations script timed out"); return; } }; @@ -195,14 +182,7 @@ pub(super) async fn run_declarations_script( if !output.status.success() { let stderr = String::from_utf8_lossy(&output.stderr); log::error!("Snapshot declarations script stderr: {stderr}"); - report_error!( - "Snapshot declarations script exited with non-zero status", - extra: { - "script_path" => %script_path.display(), - "status" => %output.status, - "task_id" => %task_id - } - ); + log::error!("Snapshot declarations script exited with non-zero status"); } } diff --git a/app/src/ai/agent_sdk/federate.rs b/app/src/ai/agent_sdk/federate.rs index c9282d7d201..1e280054790 100644 --- a/app/src/ai/agent_sdk/federate.rs +++ b/app/src/ai/agent_sdk/federate.rs @@ -1,12 +1,11 @@ use std::process; -use anyhow::{anyhow, Result}; +use anyhow::Result; use serde_json::json; use warp_cli::agent::OutputFormat; use warp_cli::federate::{FederateCommand, IssueGcpTokenArgs, IssueTokenArgs}; use warp_cli::GlobalOptions; use warp_core::features::FeatureFlag; -use warp_errors::report_error; use warp_managed_secrets::ManagedSecretManager; use warpui::platform::TerminationMode; use warpui::{AppContext, SingletonEntity as _}; @@ -103,11 +102,10 @@ fn issue_gcp_token(ctx: &mut AppContext, args: IssueGcpTokenArgs) -> Result<()> let output = serde_json::to_string(&token).expect("gcp token output should serialize"); - // If we can't cache the token, report an error but don't fail the command. + // If we can't cache the token, log an error but don't fail the command. if let Some(output_path) = output_file { if let Err(err) = std::fs::write(&output_path, &output) { - report_error!(anyhow!(err) - .context(format!("Error writing GCP token to {output_path}"))); + log::error!("Error writing GCP token to {output_path}: {err:#}"); } } diff --git a/app/src/ai/agent_sdk/mod.rs b/app/src/ai/agent_sdk/mod.rs index 77c0120af8f..7d570e05996 100644 --- a/app/src/ai/agent_sdk/mod.rs +++ b/app/src/ai/agent_sdk/mod.rs @@ -34,7 +34,6 @@ use warp_cli::share::ShareRequest; use warp_cli::task::{MessageCommand, TaskCommand}; use warp_cli::{CliCommand, GlobalOptions, OZ_HARNESS_ENV}; use warp_core::features::FeatureFlag; -use warp_errors::report_error; use warp_graphql::object_permissions::OwnerType; use warp_isolation_platform::IsolationPlatformError; #[cfg(not(target_family = "wasm"))] @@ -1148,7 +1147,7 @@ impl AgentDriverRunner { Some(id) } Err(e) => { - report_error!(e); + log::error!("Failed to create task: {e:#}"); // Continue without a task_id rather than failing entirely None } @@ -1193,7 +1192,7 @@ impl AgentDriverRunner { let parsed_task_id = match task_id_str.parse().context("Failed to parse task ID") { Ok(id) => Some(id), Err(e) => { - report_error!(e); + log::warn!("Failed to parse task ID: {e:#}"); None } }; @@ -1435,10 +1434,7 @@ impl AgentDriverRunner { let environment = foreground .spawn(move |_, ctx| -> Result<_, AgentDriverError> { let server_id = ServerId::try_from(environment_id.as_str()).map_err(|_| { - report_error!( - "Invalid environment ID", - extra: { "environment_id" => %environment_id } - ); + log::warn!("Invalid environment ID"); AgentDriver::log_valid_environments(ctx); AgentDriverError::EnvironmentNotFound(environment_id.clone()) })?; @@ -1446,10 +1442,7 @@ impl AgentDriverRunner { CloudAmbientAgentEnvironment::get_by_id(&sync_id, ctx) .ok_or_else(|| { - report_error!( - "Environment not found with ID", - extra: { "environment_id" => %environment_id } - ); + log::warn!("Environment not found with ID"); AgentDriver::log_valid_environments(ctx); AgentDriverError::EnvironmentNotFound(environment_id) })