diff --git a/lib/crates/fabro-api/src/serve.rs b/lib/crates/fabro-api/src/serve.rs index 678eac8a2..92a5976d0 100644 --- a/lib/crates/fabro-api/src/serve.rs +++ b/lib/crates/fabro-api/src/serve.rs @@ -15,7 +15,7 @@ use crate::jwt_auth::{AuthMode, AuthStrategy}; use crate::server::build_router; use crate::tls::ClientAuth; use fabro_interview::Interviewer; -use fabro_workflows::backend::AgentApiBackend; +use fabro_workflows::handler::llm::AgentApiBackend; use fabro_workflows::handler::default_registry; use fabro_workflows::sandbox_provider::SandboxProvider; diff --git a/lib/crates/fabro-cli/src/commands/resume.rs b/lib/crates/fabro-cli/src/commands/resume.rs index ca6e5810c..7e20bf1cf 100644 --- a/lib/crates/fabro-cli/src/commands/resume.rs +++ b/lib/crates/fabro-cli/src/commands/resume.rs @@ -10,7 +10,7 @@ use fabro_config::config::FabroConfig; use fabro_interview::{AutoApproveInterviewer, ConsoleInterviewer, Interviewer}; use fabro_model::{Catalog, Provider}; use fabro_util::terminal::Styles; -use fabro_workflows::backend::{AgentApiBackend, AgentCliBackend, BackendRouter}; +use fabro_workflows::handler::llm::{AgentApiBackend, AgentCliBackend, BackendRouter}; use fabro_workflows::checkpoint::Checkpoint; use fabro_workflows::event::{EventEmitter, RunNoticeLevel}; use fabro_workflows::operations::{ diff --git a/lib/crates/fabro-cli/src/commands/run.rs b/lib/crates/fabro-cli/src/commands/run.rs index 4423c0871..633c39e37 100644 --- a/lib/crates/fabro-cli/src/commands/run.rs +++ b/lib/crates/fabro-cli/src/commands/run.rs @@ -15,7 +15,7 @@ use fabro_config::{project as project_config, run as run_config, sandbox as sand use fabro_interview::{AutoApproveInterviewer, ConsoleInterviewer, FileInterviewer, Interviewer}; use fabro_model::{Catalog, FallbackTarget, Provider}; use fabro_util::terminal::Styles; -use fabro_workflows::backend::{AgentApiBackend, AgentCliBackend, BackendRouter}; +use fabro_workflows::handler::llm::{AgentApiBackend, AgentCliBackend, BackendRouter}; use fabro_workflows::checkpoint::Checkpoint; use fabro_workflows::cost::{compute_stage_cost, format_cost}; use fabro_workflows::devcontainer_bridge; diff --git a/lib/crates/fabro-workflows/src/backend/api.rs b/lib/crates/fabro-workflows/src/handler/llm/api.rs similarity index 99% rename from lib/crates/fabro-workflows/src/backend/api.rs rename to lib/crates/fabro-workflows/src/handler/llm/api.rs index 86922d311..19570d93d 100644 --- a/lib/crates/fabro-workflows/src/backend/api.rs +++ b/lib/crates/fabro-workflows/src/handler/llm/api.rs @@ -16,7 +16,7 @@ use crate::context::{Context, WorkflowContext}; use crate::cost::compute_stage_cost; use crate::error::FabroError; use crate::event::WorkflowRunEvent; -use crate::handler::agent::{CodergenBackend, CodergenResult}; +use super::super::agent::{CodergenBackend, CodergenResult}; use crate::outcome::StageUsage; use fabro_graphviz::graph::Node; diff --git a/lib/crates/fabro-workflows/src/backend/cli.rs b/lib/crates/fabro-workflows/src/handler/llm/cli.rs similarity index 99% rename from lib/crates/fabro-workflows/src/backend/cli.rs rename to lib/crates/fabro-workflows/src/handler/llm/cli.rs index aab7bcb22..43043b09a 100644 --- a/lib/crates/fabro-workflows/src/backend/cli.rs +++ b/lib/crates/fabro-workflows/src/handler/llm/cli.rs @@ -11,7 +11,7 @@ use crate::context::Context; use crate::cost::compute_stage_cost; use crate::error::FabroError; use crate::event::{EventEmitter, WorkflowRunEvent}; -use crate::handler::agent::{CodergenBackend, CodergenResult}; +use super::super::agent::{CodergenBackend, CodergenResult}; use crate::outcome::StageUsage; use fabro_graphviz::graph::Node; diff --git a/lib/crates/fabro-workflows/src/backend/mod.rs b/lib/crates/fabro-workflows/src/handler/llm/mod.rs similarity index 100% rename from lib/crates/fabro-workflows/src/backend/mod.rs rename to lib/crates/fabro-workflows/src/handler/llm/mod.rs diff --git a/lib/crates/fabro-workflows/src/handler/mod.rs b/lib/crates/fabro-workflows/src/handler/mod.rs index 0379e3481..98317f52a 100644 --- a/lib/crates/fabro-workflows/src/handler/mod.rs +++ b/lib/crates/fabro-workflows/src/handler/mod.rs @@ -1,5 +1,6 @@ pub mod agent; pub mod command; +pub mod llm; pub mod conditional; pub mod exit; pub mod fan_in; diff --git a/lib/crates/fabro-workflows/src/lib.rs b/lib/crates/fabro-workflows/src/lib.rs index b2be30c67..a612aedf4 100644 --- a/lib/crates/fabro-workflows/src/lib.rs +++ b/lib/crates/fabro-workflows/src/lib.rs @@ -91,7 +91,6 @@ pub fn build_completed_stages( pub mod artifact; pub mod asset_snapshot; pub mod assets; -pub mod backend; pub mod checkpoint; pub mod conclusion; pub mod condition; diff --git a/lib/crates/fabro-workflows/tests/daytona_integration.rs b/lib/crates/fabro-workflows/tests/daytona_integration.rs index 95e769a94..80f0857cf 100644 --- a/lib/crates/fabro-workflows/tests/daytona_integration.rs +++ b/lib/crates/fabro-workflows/tests/daytona_integration.rs @@ -897,7 +897,7 @@ async fn daytona_parallel_git_branching_e2e() { // CLI Backend on Daytona — real CLI tools via exec_command // --------------------------------------------------------------------------- -use fabro_workflows::backend::AgentCliBackend; +use fabro_workflows::handler::llm::AgentCliBackend; use fabro_workflows::handler::agent::{CodergenBackend, CodergenResult}; /// Helper: run a real CLI backend test on Daytona. diff --git a/lib/crates/fabro-workflows/tests/integration.rs b/lib/crates/fabro-workflows/tests/integration.rs index affa10edf..e5b71966f 100644 --- a/lib/crates/fabro-workflows/tests/integration.rs +++ b/lib/crates/fabro-workflows/tests/integration.rs @@ -12,8 +12,8 @@ use fabro_interview::{ }; use fabro_llm::provider::Provider; use fabro_validate::{validate, validate_or_raise, Severity}; -use fabro_workflows::backend::cli::{parse_cli_response, AgentCliBackend, BackendRouter}; -use fabro_workflows::backend::AgentApiBackend; +use fabro_workflows::handler::llm::cli::{parse_cli_response, AgentCliBackend, BackendRouter}; +use fabro_workflows::handler::llm::AgentApiBackend; use fabro_workflows::checkpoint::Checkpoint; use fabro_workflows::context::Context; use fabro_workflows::error::FabroError;