diff --git a/crates/builderlab-auth/src/org_routing.rs b/crates/builderlab-auth/src/org_routing.rs index 279ecd8..f1a4849 100644 --- a/crates/builderlab-auth/src/org_routing.rs +++ b/crates/builderlab-auth/src/org_routing.rs @@ -44,7 +44,7 @@ pub fn resolve_org_kgoose_base_url( } else { format!("https://{base_url}") }; - let mut url = Url::parse(&absolute).context("kGoose base URL must be absolute")?; + let mut url = Url::parse(&absolute).context("server URL must be absolute")?; match url.host() { Some(Host::Domain(host)) if should_route_org_host(host) => { let routed_host = if host.starts_with(&format!("{org}.")) { @@ -53,10 +53,10 @@ pub fn resolve_org_kgoose_base_url( format!("{org}.{host}") }; url.set_host(Some(&routed_host)) - .map_err(|_| anyhow::anyhow!("failed to route kGoose base URL for org"))?; + .map_err(|_| anyhow::anyhow!("failed to route server URL for org"))?; } Some(Host::Domain(_)) | Some(Host::Ipv4(_)) | Some(Host::Ipv6(_)) => {} - None => anyhow::bail!("kGoose base URL must include a host"), + None => anyhow::bail!("server URL must include a host"), } Ok(url.as_str().trim_end_matches('/').to_string()) } diff --git a/src/bl/skills.rs b/src/bl/skills.rs index 3abfc53..fe55190 100644 --- a/src/bl/skills.rs +++ b/src/bl/skills.rs @@ -453,7 +453,7 @@ pub fn skills_global_args(command: Command) -> Command { .hide(true) .env(super::skills_config::KGOOSE_SERVICE_PATH_ENV_VAR) .value_name("PATH") - .help("Path prefix for kgoose endpoints. [default: /cash-app/goose]"), + .help("Path prefix for service endpoints. [default: /cash-app/goose]"), ) } @@ -579,8 +579,8 @@ fn auth_status(config: &SkillsConfig) -> Result<()> { if !config.json { println!("BuilderLab CLI auth"); println!(" profile: {}", config.profile); - println!(" kgoose base: {}", config.kgoose_base_url); - println!(" kgoose service path: {}", config.kgoose_service_path); + println!(" server URL: {}", config.kgoose_base_url); + println!(" service path: {}", config.kgoose_service_path); println!(" authenticated: no"); return Ok(()); } @@ -598,8 +598,8 @@ fn auth_status(config: &SkillsConfig) -> Result<()> { let workspace_name = terminal_safe_text(workspace_name); println!("BuilderLab CLI auth"); println!(" profile: {}", config.profile); - println!(" kgoose base: {}", config.kgoose_base_url); - println!(" kgoose service path: {}", config.kgoose_service_path); + println!(" server URL: {}", config.kgoose_base_url); + println!(" service path: {}", config.kgoose_service_path); println!(" authenticated: yes"); println!(" workspace: {workspace_name}"); if let Some(expires_at) = &me.expires_at { @@ -633,8 +633,8 @@ fn auth_login_browser(config: &SkillsConfig) -> Result<()> { .style .success("BuilderLab CLI auth browser login succeeded"), } - println!(" kgoose base: {}", summary.kgoose_base_url); - println!(" kgoose service path: {}", summary.kgoose_service_path); + println!(" server URL: {}", summary.kgoose_base_url); + println!(" service path: {}", summary.kgoose_service_path); println!(" storage: {}", summary.storage); println!( " workspace: {}", @@ -707,8 +707,8 @@ fn auth_logout_browser(config: &SkillsConfig) -> Result<()> { config.style.warn(&warning); } println!(" profile: {}", config.profile); - println!(" kgoose base: {}", config.kgoose_base_url); - println!(" kgoose service path: {}", config.kgoose_service_path); + println!(" server URL: {}", config.kgoose_base_url); + println!(" service path: {}", config.kgoose_service_path); println!(" storage: {}", storage.kind()); Ok(()) } @@ -1552,8 +1552,8 @@ fn doctor(config: &SkillsConfig, matches: &ArgMatches) -> Result<()> { println!("BuilderLab skills doctor"); println!(" profile: {}", config.profile); println!(" local dev: {}", yes_no(config.local_dev)); - println!(" kgoose base: {}", config.kgoose_base_url); - println!(" kgoose service path: {}", config.kgoose_service_path); + println!(" server URL: {}", config.kgoose_base_url); + println!(" service path: {}", config.kgoose_service_path); println!(" config: {}", config.config_path.display()); println!(" bl home: {}", config.bl_home.display()); println!(" skills home: {}", config.skills_home.display()); diff --git a/src/cli.rs b/src/cli.rs index a02c068..10cc276 100644 --- a/src/cli.rs +++ b/src/cli.rs @@ -13,7 +13,7 @@ use crate::runtime::{LoadedExtension, ParameterKind, RuntimeTool, ScalarKind, To pub const ROOT_COMMAND_NAME: &str = "agent-tools"; pub const ROOT_BIN_NAME: &str = "sq agent-tools"; -pub const ROOT_SUMMARY: &str = "Discover auth-backed tool extensions exposed through kGoose"; +pub const ROOT_SUMMARY: &str = "Discover auth-backed tool extensions"; pub const TOOLS_COMMAND_NAME: &str = "tools"; pub const BL_TOOLS_BIN_NAME: &str = "bl tools"; pub const APPKIT_COMMAND_NAME: &str = "appkit"; @@ -361,7 +361,7 @@ fn global_args() -> Vec { .hide(true) .env("KGOOSE_BASE_URL") .value_name("URL") - .help("Base URL for the kgoose service. [default: prod, use https://kgoose.stage.sqprod.co for staging]") + .help("Base URL for the tools service.") .value_hint(ValueHint::Url), Arg::new("playpen") .long("playpen") @@ -370,14 +370,14 @@ fn global_args() -> Vec { .hide(true) .env("KGOOSE_PLAYPEN") .value_name("NAME") - .help("Route the kgoose service with `Baggage: kgoose-playpen=`."), + .help("Route tools requests to a playpen."), Arg::new("kgoose-service-path") .long("kgoose-service-path") .global(true) .hide(true) .env(KGOOSE_SERVICE_PATH_ENV_VAR) .value_name("PATH") - .help("Path prefix for kgoose endpoints. [default: /cash-app/goose]"), + .help("Path prefix for service endpoints. [default: /cash-app/goose]"), Arg::new("goosemcp-playpen") .long("goosemcp-playpen") .global(true) diff --git a/src/kgoose.rs b/src/kgoose.rs index b9d0e1f..ab59717 100644 --- a/src/kgoose.rs +++ b/src/kgoose.rs @@ -145,7 +145,7 @@ impl HttpKgooseClient { // Note: Cloudflare returns 200 OK with an HTML login page, not an error status if final_url.contains("cloudflareaccess.com") { anyhow::bail!( - "Cannot connect to kgoose - received Cloudflare Access redirect.\n\ + "Cannot connect to the tools service - received Cloudflare Access redirect.\n\ This usually means you need to connect to the corporate VPN (WARP).\n\ Please enable WARP and try again." ); @@ -252,7 +252,7 @@ fn debug_enabled() -> bool { fn debug_log(message: String) { if debug_enabled() { - eprintln!("{KGOOSE_DEBUG_ENV_VAR}: {message}"); + eprintln!("tools: {message}"); } }