Skip to content

Remove backend naming from CLI messages #24

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
torstenrudolf merged 2 commits into from
Oct 16, 2026
Merged

Remove backend naming from CLI messages #24

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
60ff898
fix: remove backend name from tools help
torstenrudolf Oct 16, 2026
0c14b48
fix: use service-neutral wording in CLI messages
torstenrudolf Oct 16, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions crates/builderlab-auth/src/org_routing.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}.")) {
Expand All @@ -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())
}
Expand Down
22 changes: 11 additions & 11 deletions src/bl/skills.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]"),
)
}

Expand Down Expand Up @@ -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(());
}
Expand All @@ -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 {
Expand Down Expand Up @@ -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: {}",
Expand Down Expand Up @@ -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(())
}
Expand Down Expand Up @@ -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());
Expand Down
8 changes: 4 additions & 4 deletions src/cli.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down Expand Up @@ -361,7 +361,7 @@ fn global_args() -> Vec<Arg> {
.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")
Expand All @@ -370,14 +370,14 @@ fn global_args() -> Vec<Arg> {
.hide(true)
.env("KGOOSE_PLAYPEN")
.value_name("NAME")
.help("Route the kgoose service with `Baggage: kgoose-playpen=<name>`."),
.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)
Expand Down
4 changes: 2 additions & 2 deletions src/kgoose.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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."
);
Expand Down Expand Up @@ -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}");
}
}

Expand Down
Loading