Merge remote-tracking branch 'origin/main' into merge-origin-main-20260420b

# Conflicts:
#	lib/crates/fabro-cli/src/commands/doctor.rs
#	lib/crates/fabro-cli/src/commands/model.rs
#	lib/crates/fabro-cli/src/commands/provider/login.rs
#	lib/crates/fabro-cli/src/commands/repo/init.rs
#	lib/crates/fabro-cli/src/commands/secret/list.rs
#	lib/crates/fabro-cli/src/commands/secret/rm.rs
#	lib/crates/fabro-cli/src/commands/secret/set.rs
#	lib/crates/fabro-cli/src/commands/system/df.rs
#	lib/crates/fabro-cli/src/commands/system/events.rs
#	lib/crates/fabro-cli/src/commands/system/info.rs
#	lib/crates/fabro-cli/src/commands/system/prune.rs
#	lib/crates/fabro-cli/src/commands/version.rs
#	lib/crates/fabro-cli/src/server_client.rs
#	lib/crates/fabro-server/src/csp.rs

Author: brynary

lib/crates/fabro-api/src/lib.rs

@@ -13,4 +13,4 @@
 mod generated {
     include!(concat!(env!("OUT_DIR"), "/codegen.rs"));
 }
-pub use generated::{Client, types};
+pub use generated::{Client as ApiClient, types};

lib/crates/fabro-cli/src/command_context.rs

@@ -9,7 +9,7 @@ use fabro_util::printer::Printer;
 use tokio::sync::OnceCell;
 
 use crate::args::{ServerConnectionArgs, ServerTargetArgs};
-use crate::server_client::ServerStoreClient;
+use crate::server_client::Client;
 use crate::{server_client, user_config};
 
 #[derive(Clone, Debug)]
@@ -35,7 +35,7 @@ pub(crate) struct CommandContext {
     machine_settings: SettingsLayer,
     cli_settings:     CliSettings,
     server_mode:      ServerMode,
-    server:           OnceCell<Arc<ServerStoreClient>>,
+    server:           OnceCell<Arc<Client>>,
 }
 
 impl CommandContext {
@@ -135,7 +135,7 @@ impl CommandContext {
         &self.cli_settings
     }
 
-    pub(crate) async fn server(&self) -> Result<Arc<ServerStoreClient>> {
+    pub(crate) async fn server(&self) -> Result<Arc<Client>> {
         let server_mode = self.server_mode.clone();
         let base_config_path = self.base_config_path.clone();
         let machine_settings = self.machine_settings.clone();

lib/crates/fabro-cli/src/commands/artifact/cp.rs

@@ -11,7 +11,7 @@ use fabro_types::settings::cli::{CliLayer, OutputFormat};
 use fabro_util::printer::Printer;
 
 use crate::args::ArtifactCpArgs;
-use crate::server_client::ServerStoreClient;
+use crate::server_client::Client;
 use crate::shared::{print_json_pretty, split_run_path};
 
 pub(super) async fn cp_command(
@@ -140,7 +140,7 @@ pub(super) async fn cp_command(
 }
 
 async fn write_artifact_file(
-    client: &ServerStoreClient,
+    client: &Client,
     run_id: &fabro_types::RunId,
     entry: &super::ArtifactEntry,
     dest_file: &Path,

lib/crates/fabro-cli/src/commands/artifact/mod.rs

@@ -9,7 +9,7 @@ use fabro_util::printer::Printer;
 
 use crate::args::{ArtifactCommand, ArtifactNamespace, ServerTargetArgs};
 use crate::command_context::CommandContext;
-use crate::server_client::ServerStoreClient;
+use crate::server_client::Client;
 
 #[derive(Clone, Debug, serde::Serialize)]
 pub(super) struct ArtifactEntry {
@@ -29,7 +29,7 @@ pub(super) async fn resolve_artifacts(
     cli: &CliSettings,
     cli_layer: &CliLayer,
     printer: Printer,
-) -> Result<(RunId, ServerStoreClient, Vec<ArtifactEntry>)> {
+) -> Result<(RunId, Client, Vec<ArtifactEntry>)> {
     let ctx = CommandContext::for_target(server, printer, cli.clone(), cli_layer)?;
     let client = ctx.server().await?;
     let run_id = client.resolve_run(run_selector).await?.run_id;

lib/crates/fabro-cli/src/commands/auth/login.rs

@@ -132,7 +132,7 @@ pub(super) async fn login_command(
 #[cfg(unix)]
 async fn fetch_cli_auth_config(target: &ServerTarget) -> Result<types::CliAuthConfig> {
     let (http_client, base_url) = user_config::build_public_http_client(target)?;
-    let client = fabro_api::Client::new_with_client(&base_url, http_client);
+    let client = fabro_api::ApiClient::new_with_client(&base_url, http_client);
     client
         .get_cli_auth_config()
         .send()

lib/crates/fabro-cli/src/commands/doctor.rs

@@ -312,10 +312,7 @@ pub(crate) async fn run_doctor(
         }
     };
 
-    if let Err(err) = server
-        .send_api(|client| async move { client.get_health().send().await })
-        .await
-    {
+    if let Err(err) = server.get_health().await {
         report.sections.push(CheckSection {
             title:  "Server".to_string(),
             checks: vec![CheckResult {
@@ -352,12 +349,8 @@ pub(crate) async fn run_doctor(
         }],
     });
 
-    match server
-        .send_api(|client| async move { client.run_diagnostics().send().await })
-        .await
-    {
-        Ok(response) => {
-            let diagnostics = response.into_inner();
+    match server.run_diagnostics().await {
+        Ok(diagnostics) => {
             report.sections[0]
                 .checks
                 .push(check_version_parity(&diagnostics.version));

lib/crates/fabro-cli/src/commands/install.rs

@@ -1094,19 +1094,17 @@ async fn setup_github_app(
 }
 
 async fn persist_vault_secrets_via_server(
-    client: &fabro_api::Client,
+    client: &server_client::Client,
     secrets: &[CreateSecretRequest],
 ) -> Result<()> {
     for secret in secrets {
         client
-            .create_secret()
-            .body(CreateSecretRequest {
+            .create_secret(CreateSecretRequest {
                 name:        secret.name.clone(),
                 value:       secret.value.clone(),
                 type_:       secret.type_,
                 description: secret.description.clone(),
             })
-            .send()
             .await?;
     }
 
@@ -1117,14 +1115,14 @@ async fn persist_vault_secrets_with(
     storage_dir: &Path,
     secrets: &[CreateSecretRequest],
     server_was_running: bool,
-    connect_api_client: impl for<'a> Fn(&'a Path) -> BoxFuture<'a, Result<fabro_api::Client>>,
+    connect_server: impl for<'a> Fn(&'a Path) -> BoxFuture<'a, Result<server_client::Client>>,
     stop_server: impl for<'a> Fn(&'a Path, Duration) -> BoxFuture<'a, bool>,
 ) -> Result<()> {
     if secrets.is_empty() {
         return Ok(());
     }
 
-    let client = match connect_api_client(storage_dir).await {
+    let client = match connect_server(storage_dir).await {
         Ok(client) => client,
         Err(err) => {
             if !server_was_running {
@@ -1173,7 +1171,7 @@ async fn persist_install_outputs(
         vault_secrets,
         settings_write,
         server_was_running,
-        |path| Box::pin(server_client::connect_api_client(path)),
+        |path| Box::pin(server_client::connect_server(path)),
         |path, timeout| {
             Box::pin(async move { stop::stop_server(path, timeout).await.unwrap_or(false) })
         },
@@ -1303,7 +1301,7 @@ async fn persist_install_outputs_with_settings(
     vault_secrets: &[CreateSecretRequest],
     settings_write: Option<PendingSettingsWrite<'_>>,
     server_was_running: bool,
-    connect_api_client: impl for<'a> Fn(&'a Path) -> BoxFuture<'a, Result<fabro_api::Client>>,
+    connect_server: impl for<'a> Fn(&'a Path) -> BoxFuture<'a, Result<server_client::Client>>,
     stop_server: impl for<'a> Fn(&'a Path, Duration) -> BoxFuture<'a, bool>,
 ) -> Result<()> {
     persist_server_env_secrets(storage_dir, server_env_secrets)?;
@@ -1317,7 +1315,7 @@ async fn persist_install_outputs_with_settings(
         storage_dir,
         vault_secrets,
         server_was_running,
-        connect_api_client,
+        connect_server,
         stop_server,
     )
     .await;
@@ -2486,10 +2484,7 @@ client_id = "client-id"
             &vault_secrets,
             false,
             |_| {
-                let client = fabro_api::Client::new_with_client(
-                    &server.base_url(),
-                    fabro_test::test_http_client(),
-                );
+                let client = server_client::Client::new_no_proxy(&server.base_url()).unwrap();
                 Box::pin(async move { Ok(client) })
             },
             {
@@ -2548,10 +2543,7 @@ client_id = "client-id"
             &vault_secrets,
             true,
             |_| {
-                let client = fabro_api::Client::new_with_client(
-                    &server.base_url(),
-                    fabro_test::test_http_client(),
-                );
+                let client = server_client::Client::new_no_proxy(&server.base_url()).unwrap();
                 Box::pin(async move { Ok(client) })
             },
             {