refactor(config): centralize default API address handling

Author: RussellLuo

cli/http_client.go

@@ -13,6 +13,7 @@ import (
 	"text/tabwriter"
 
 	"csgclaw/internal/agent"
+	"csgclaw/internal/config"
 	"csgclaw/internal/im"
 )
 
@@ -28,7 +29,7 @@ type APIClient struct {
 
 func NewAPIClient(endpoint, token string, client HTTPClient) *APIClient {
 	if endpoint == "" {
-		endpoint = "http://127.0.0.1:18080"
+		endpoint = config.DefaultAPIBaseURL()
 	}
 	return &APIClient{
 		endpoint: strings.TrimRight(endpoint, "/"),

cli/onboard.go

@@ -38,7 +38,7 @@ func (a *App) runOnboard(args []string, globals GlobalOptions) error {
 	if !hasExistingConfig {
 		cfg = config.Config{
 			Server: config.ServerConfig{
-				ListenAddr:  config.DefaultListenAddr,
+				ListenAddr:  config.DefaultListenAddr(),
 				AccessToken: config.DefaultAccessToken,
 			},
 			Bootstrap: config.BootstrapConfig{

cli/serve.go

@@ -290,15 +290,12 @@ func apiBaseURL(server config.ServerConfig) string {
 		return strings.TrimRight(server.AdvertiseBaseURL, "/")
 	}
 
-	host := "127.0.0.1"
-	port := "18080"
+	port := config.ListenPort(server.ListenAddr)
 	if server.ListenAddr == "" {
-		return "http://127.0.0.1:18080"
+		return config.DefaultAPIBaseURL()
 	}
-	if parsedHost, parsedPort, err := net.SplitHostPort(server.ListenAddr); err == nil {
-		if parsedPort != "" {
-			port = parsedPort
-		}
+	host := "127.0.0.1"
+	if parsedHost, _, err := net.SplitHostPort(server.ListenAddr); err == nil {
 		if parsedHost != "" && parsedHost != "0.0.0.0" && parsedHost != "::" {
 			host = parsedHost
 		}

cli/serve_test.go

@@ -77,6 +77,13 @@ func TestAPIBaseURLPrefersAdvertiseBaseURL(t *testing.T) {
 	}
 }
 
+func TestAPIBaseURLFallsBackToSharedDefault(t *testing.T) {
+	got := apiBaseURL(config.ServerConfig{})
+	if got != config.DefaultAPIBaseURL() {
+		t.Fatalf("apiBaseURL() = %q, want %q", got, config.DefaultAPIBaseURL())
+	}
+}
+
 func TestValidateModelConfigRequiresOnboardWhenIncomplete(t *testing.T) {
 	err := validateModelConfig(config.Config{})
 	if err == nil {

internal/agent/manager_config.go

@@ -128,12 +128,7 @@ func updateCSGClawChannel(cfg map[string]any, botID string, server config.Server
 }
 
 func resolveManagerBaseURL(server config.ServerConfig) string {
-	port := "18080"
-	if server.ListenAddr != "" {
-		if _, resolvedPort, err := net.SplitHostPort(server.ListenAddr); err == nil && resolvedPort != "" {
-			port = resolvedPort
-		}
-	}
+	port := config.ListenPort(server.ListenAddr)
 	if ip := localIPv4Resolver(); ip != "" {
 		return fmt.Sprintf("http://%s:%s", ip, port)
 	}

internal/config/config.go

@@ -4,6 +4,7 @@ import (
 	"bufio"
 	"errors"
 	"fmt"
+	"net"
 	"os"
 	"path/filepath"
 	"strings"
@@ -39,11 +40,31 @@ const (
 	AgentsDirName      = "agents"
 	IMDirName          = "im"
 
-	DefaultListenAddr   = "0.0.0.0:18080"
+	DefaultHTTPPort     = "18080"
 	DefaultAccessToken  = "your_access_token"
 	DefaultManagerImage = "ghcr.io/russellluo/picoclaw:2026.4.8.1"
 )
 
+func DefaultListenAddr() string {
+	return net.JoinHostPort("0.0.0.0", DefaultHTTPPort)
+}
+
+func DefaultAPIBaseURL() string {
+	return "http://" + net.JoinHostPort("127.0.0.1", DefaultHTTPPort)
+}
+
+func ListenPort(listenAddr string) string {
+	if listenAddr == "" {
+		return DefaultHTTPPort
+	}
+
+	_, port, err := net.SplitHostPort(listenAddr)
+	if err != nil || port == "" {
+		return DefaultHTTPPort
+	}
+	return port
+}
+
 func (c ModelConfig) MissingFields() []string {
 	var missing []string
 	if strings.TrimSpace(c.BaseURL) == "" {
@@ -174,7 +195,7 @@ func Load(path string) (Config, error) {
 	}
 
 	if cfg.Server.ListenAddr == "" {
-		cfg.Server.ListenAddr = DefaultListenAddr
+		cfg.Server.ListenAddr = DefaultListenAddr()
 	}
 	if cfg.Bootstrap.ManagerImage == "" {
 		cfg.Bootstrap.ManagerImage = DefaultManagerImage