diff --git a/lib/crates/fabro-cli/src/commands/graph.rs b/lib/crates/fabro-cli/src/commands/graph.rs
index dbfae41fc..1c046d311 100644
--- a/lib/crates/fabro-cli/src/commands/graph.rs
+++ b/lib/crates/fabro-cli/src/commands/graph.rs
@@ -12,13 +12,13 @@ use std::io::Write;
 use anyhow::{Context, bail};
 use fabro_api::types;
 use fabro_config::user::active_settings_path;
+use fabro_manifest::{ManifestBuildInput, build_run_manifest};
 use fabro_util::terminal::Styles;
 use tracing::debug;
 
 use crate::args::{GraphArgs, GraphDirection, GraphOutputFormat};
 use crate::command_context::CommandContext;
 use crate::commands::run::output::api_diagnostics_to_local;
-use crate::manifest_builder::{ManifestBuildInput, build_run_manifest};
 use crate::shared::{absolute_or_current, print_diagnostics, print_json_pretty, relative_path};
 
 pub(crate) async fn run(
diff --git a/lib/crates/fabro-cli/src/commands/preflight.rs b/lib/crates/fabro-cli/src/commands/preflight.rs
index a3d1dbdf6..f51c508ad 100644
--- a/lib/crates/fabro-cli/src/commands/preflight.rs
+++ b/lib/crates/fabro-cli/src/commands/preflight.rs
@@ -1,5 +1,6 @@
 use anyhow::bail;
 use fabro_config::user::active_settings_path;
+use fabro_manifest::{ManifestBuildInput, build_run_manifest};
 use fabro_util::terminal::Styles;
 
 use crate::args::PreflightArgs;
@@ -8,7 +9,7 @@ use crate::commands::run::output::{
     api_check_report_to_local, api_diagnostics_to_local, print_workflow_summary,
 };
 use crate::commands::run::overrides::preflight_args_overrides;
-use crate::manifest_builder::{ManifestBuildInput, build_run_manifest, preflight_manifest_args};
+use crate::manifest_args::preflight_manifest_args;
 use crate::shared::{cyan_spinner, print_json_pretty};
 
 pub(crate) async fn execute(
diff --git a/lib/crates/fabro-cli/src/commands/run/create.rs b/lib/crates/fabro-cli/src/commands/run/create.rs
index c56a89024..bcbac4a8c 100644
--- a/lib/crates/fabro-cli/src/commands/run/create.rs
+++ b/lib/crates/fabro-cli/src/commands/run/create.rs
@@ -1,6 +1,7 @@
 use anyhow::{Context as _, bail};
 use fabro_config::RunLayer;
 use fabro_config::user::active_settings_path;
+use fabro_manifest::{ManifestBuildInput, build_run_manifest};
 use fabro_server::manifest_validation;
 use fabro_types::RunId;
 use fabro_util::terminal::Styles;
@@ -9,7 +10,7 @@ use super::output::{api_diagnostics_to_local, print_workflow_summary};
 use super::overrides::run_args_overrides;
 use crate::args::RunArgs;
 use crate::command_context::CommandContext;
-use crate::manifest_builder::{ManifestBuildInput, build_run_manifest, run_manifest_args};
+use crate::manifest_args::run_manifest_args;
 
 pub(crate) struct CreatedRun {
     pub(crate) run_id: RunId,
diff --git a/lib/crates/fabro-cli/src/commands/validate.rs b/lib/crates/fabro-cli/src/commands/validate.rs
index 74495fadf..d607c4b2c 100644
--- a/lib/crates/fabro-cli/src/commands/validate.rs
+++ b/lib/crates/fabro-cli/src/commands/validate.rs
@@ -1,13 +1,13 @@
 use anyhow::bail;
 use fabro_config::RunLayer;
 use fabro_config::user::active_settings_path;
+use fabro_manifest::{ManifestBuildInput, build_run_manifest};
 use fabro_server::manifest_validation;
 use fabro_util::terminal::Styles;
 
 use crate::args::ValidateArgs;
 use crate::command_context::CommandContext;
 use crate::commands::run::output::api_diagnostics_to_local;
-use crate::manifest_builder::{ManifestBuildInput, build_run_manifest};
 use crate::shared::{print_diagnostics, print_json_pretty, relative_path};
 
 pub(crate) fn run(
diff --git a/lib/crates/fabro-cli/src/lib.rs b/lib/crates/fabro-cli/src/lib.rs
deleted file mode 100644
index 34a4cfc3f..000000000
--- a/lib/crates/fabro-cli/src/lib.rs
+++ /dev/null
@@ -1,9 +0,0 @@
-#![expect(
-    dead_code,
-    reason = "the library exports manifest builder helpers while the binary owns most CLI dispatch"
-)]
-
-mod args;
-mod manifest_builder;
-
-pub use manifest_builder::{BuiltManifest, ManifestBuildInput, build_run_manifest};
diff --git a/lib/crates/fabro-cli/src/main.rs b/lib/crates/fabro-cli/src/main.rs
index f0e00b997..43f39ad80 100644
--- a/lib/crates/fabro-cli/src/main.rs
+++ b/lib/crates/fabro-cli/src/main.rs
@@ -10,11 +10,7 @@ mod gh;
 mod landing;
 mod local_server;
 mod logging;
-#[allow(
-    unreachable_pub,
-    reason = "The library exports manifest builder helpers for tests; the binary includes the same module privately."
-)]
-mod manifest_builder;
+mod manifest_args;
 mod server_client;
 mod server_runs;
 mod shared;
@@ -1199,7 +1195,7 @@ destination = "{destination}"
             .expect("should parse");
         match *cli.command.unwrap() {
             Commands::RunCmd(RunCommands::Run(args)) => {
-                let manifest_args = manifest_builder::run_manifest_args(&args)
+                let manifest_args = manifest_args::run_manifest_args(&args)
                     .expect("input-only args should be retained");
                 assert_eq!(manifest_args.input, vec!["foo=bar"]);
             }
diff --git a/lib/crates/fabro-cli/src/manifest_builder.rs b/lib/crates/fabro-cli/src/manifest_args.rs
similarity index 90%
rename from lib/crates/fabro-cli/src/manifest_builder.rs
rename to lib/crates/fabro-cli/src/manifest_args.rs
index fe03bd5b1..48fc1dbab 100644
--- a/lib/crates/fabro-cli/src/manifest_builder.rs
+++ b/lib/crates/fabro-cli/src/manifest_args.rs
@@ -1,6 +1,4 @@
 use fabro_api::types;
-#[allow(unused_imports, reason = "fabro-cli public lib re-exports this type")]
-pub use fabro_manifest::{BuiltManifest, ManifestBuildInput, build_run_manifest};
 
 use crate::args::{PreflightArgs, RunArgs};
 
diff --git a/lib/crates/fabro-cli/tests/manifest_path_round_trip.rs b/lib/crates/fabro-cli/tests/manifest_path_round_trip.rs
index 9cf4c50f8..d94f95221 100644
--- a/lib/crates/fabro-cli/tests/manifest_path_round_trip.rs
+++ b/lib/crates/fabro-cli/tests/manifest_path_round_trip.rs
@@ -5,7 +5,7 @@
 
 use std::path::PathBuf;
 
-use fabro_cli::{ManifestBuildInput, build_run_manifest};
+use fabro_manifest::{ManifestBuildInput, build_run_manifest};
 use fabro_workflow::ManifestPath;
 
 #[test]