fix(cli): canonicalize default gateway identity

This commit is contained in:
Xubin Ren
2026-08-17 20:56:10 +08:00
parent b8333a2d7e
commit a700697583
4 changed files with 70 additions and 10 deletions
+13 -4
View File
@@ -36,6 +36,15 @@ GatewayServiceFactory = Callable[[], Any]
WebUIBundlePreparer = Callable[[Config, BuildMode], None]
def _resolved_config_selector(config: str | None) -> Path:
"""Return the one canonical config identity used by every local client."""
if config:
return Path(config).expanduser().resolve(strict=False)
from nanobot.config.loader import get_config_path
return get_config_path().resolve(strict=False)
def create_gateway_app(
*,
console: Console,
@@ -73,12 +82,12 @@ def create_gateway_app(
def runtime_for_instance(*, workspace: str | None = None, config: str | None = None):
if runtime_factory is not None:
return runtime_factory(workspace=workspace, config=config)
config_path = str(Path(config).expanduser().resolve(strict=False)) if config else None
resolved_config = _resolved_config_selector(config)
config_path = str(resolved_config)
workspace_path = str(Path(workspace).expanduser().resolve(strict=False)) if workspace else None
data_dir = Path(config_path).parent if config_path else None
return GatewayRuntime(
paths=GatewayRuntimePaths.for_instance(
data_dir=data_dir,
data_dir=resolved_config.parent,
workspace=workspace_path,
config_path=config_path,
)
@@ -101,7 +110,7 @@ def create_gateway_app(
loaded_config: Config | None = None,
) -> GatewayStartOptions:
cfg = loaded_config or load_runtime_config(config, workspace)
resolved_config = str(Path(config).expanduser().resolve()) if config else None
resolved_config = str(_resolved_config_selector(config)) if config else None
resolved_workspace = str(Path(workspace).expanduser().resolve(strict=False)) if workspace else None
return GatewayStartOptions(
port=port if port is not None else cfg.gateway.port,
+15 -5
View File
@@ -384,16 +384,26 @@ def _print_foreground_port_conflict(
gateway_host: str,
gateway_port: int,
) -> None:
console.print(
"[red]Error: nanobot cannot start because one of its local ports is already in use.[/red]"
)
console.print(f" WebUI: [cyan]{webui_url}[/cyan]")
gateway_running = _gateway_health_ready(gateway_host, gateway_port)
if gateway_running:
console.print(
"[yellow]A nanobot gateway is already running for this local instance.[/yellow]"
)
else:
console.print(
"[red]Error: nanobot cannot start because one of its local ports "
"is already in use.[/red]"
)
console.print(f" WebUI: [cyan]{_webui_display_url(webui_url)}[/cyan]")
console.print(
f" Gateway health: "
f"[cyan]http://{_host_for_local_browser(gateway_host)}:{gateway_port}/health[/cyan]"
)
console.print()
console.print("If this is an existing nanobot instance, use it or stop it first:")
if gateway_running:
console.print("Use the existing instance, or stop it first:")
else:
console.print("If this is an existing nanobot instance, use it or stop it first:")
console.print(" [cyan]nanobot gateway status[/cyan]")
console.print(" [cyan]nanobot gateway stop[/cyan]")
console.print(