Move GetUserSettings() from pkg/config to pkg/userconfig as Get()

The function only wraps userconfig.Load() + cfg.GetSettings(), so it belongs
in pkg/userconfig rather than pkg/config which is about agent configuration
resolution. Renamed to Get() since the package name already provides context.

Assisted-By: cagent

Author: dgageot

cmd/root/run.go

@@ -24,6 +24,7 @@ import (
 	"github.com/docker/cagent/pkg/teamloader"
 	"github.com/docker/cagent/pkg/telemetry"
 	"github.com/docker/cagent/pkg/tui/styles"
+	"github.com/docker/cagent/pkg/userconfig"
 )
 
 type runExecFlags struct {
@@ -160,7 +161,7 @@ func (f *runExecFlags) runOrExec(ctx context.Context, out *cli.Printer, args []s
 
 	// Apply global user settings first (lowest priority)
 	// User settings only apply if the flag wasn't explicitly set by the user
-	userSettings := config.GetUserSettings()
+	userSettings := userconfig.Get()
 	if userSettings.HideToolResults && !f.hideToolResults {
 		f.hideToolResults = true
 		slog.Debug("Applying user settings", "hide_tool_results", true)
@@ -493,7 +494,7 @@ func (f *runExecFlags) handleRunMode(ctx context.Context, rt runtime.Runtime, se
 func applyTheme() {
 	// Resolve theme from user config > built-in default
 	themeRef := styles.DefaultThemeRef
-	if userSettings := config.GetUserSettings(); userSettings.Theme != "" {
+	if userSettings := userconfig.Get(); userSettings.Theme != "" {
 		themeRef = userSettings.Theme
 	}
 

pkg/config/resolve.go

@@ -53,16 +53,6 @@ func ResolveAlias(agentFilename string) *userconfig.Alias {
 	return alias
 }
 
-// GetUserSettings returns the global user settings from the config file.
-// Returns an empty Settings if the config file doesn't exist or has no settings.
-func GetUserSettings() *userconfig.Settings {
-	cfg, err := userconfig.Load()
-	if err != nil {
-		return &userconfig.Settings{}
-	}
-	return cfg.GetSettings()
-}
-
 // ResolveSources resolves an agent file reference (local file, URL, or OCI image) to sources.
 // If envProvider is non-nil, it will be used to look up GITHUB_TOKEN for authentication
 // when fetching from GitHub URLs.

pkg/config/resolve_test.go

@@ -619,31 +619,3 @@ func TestResolveAlias_WithAllOptions(t *testing.T) {
 	assert.Equal(t, "anthropic/claude-sonnet-4-0", alias.Model)
 	assert.True(t, alias.HideToolResults)
 }
-
-func TestGetUserSettings_Empty(t *testing.T) {
-	home := t.TempDir()
-	t.Setenv("HOME", home)
-
-	// No config file exists
-	settings := GetUserSettings()
-	require.NotNil(t, settings)
-	assert.False(t, settings.HideToolResults)
-}
-
-func TestGetUserSettings_WithHideToolResults(t *testing.T) {
-	home := t.TempDir()
-	t.Setenv("HOME", home)
-
-	// Set up config with settings
-	cfg, err := userconfig.Load()
-	require.NoError(t, err)
-	cfg.Settings = &userconfig.Settings{
-		HideToolResults: true,
-	}
-	require.NoError(t, cfg.Save())
-
-	// Get settings
-	settings := GetUserSettings()
-	require.NotNil(t, settings)
-	assert.True(t, settings.HideToolResults)
-}

pkg/userconfig/userconfig.go

@@ -278,3 +278,13 @@ func (c *Config) GetSettings() *Settings {
 	}
 	return c.Settings
 }
+
+// Get returns the global user settings from the config file.
+// Returns an empty Settings if the config file doesn't exist or has no settings.
+func Get() *Settings {
+	cfg, err := Load()
+	if err != nil {
+		return &Settings{}
+	}
+	return cfg.GetSettings()
+}

pkg/userconfig/userconfig_test.go

@@ -782,3 +782,31 @@ func TestConfig_DefaultModel_SaveAndLoad(t *testing.T) {
 	require.NotNil(t, loaded.DefaultModel.ThinkingBudget)
 	assert.Equal(t, 10000, loaded.DefaultModel.ThinkingBudget.Tokens)
 }
+
+func TestGet_Empty(t *testing.T) {
+	home := t.TempDir()
+	t.Setenv("HOME", home)
+
+	// No config file exists
+	settings := Get()
+	require.NotNil(t, settings)
+	assert.False(t, settings.HideToolResults)
+}
+
+func TestGet_WithHideToolResults(t *testing.T) {
+	home := t.TempDir()
+	t.Setenv("HOME", home)
+
+	// Set up config with settings
+	cfg, err := Load()
+	require.NoError(t, err)
+	cfg.Settings = &Settings{
+		HideToolResults: true,
+	}
+	require.NoError(t, cfg.Save())
+
+	// Get settings
+	settings := Get()
+	require.NotNil(t, settings)
+	assert.True(t, settings.HideToolResults)
+}