Make it easier to bump the schema version

examples/golibrary/builtintool/main.go

@@ -9,7 +9,7 @@ import (
 	"syscall"
 
 	"github.com/docker/cagent/pkg/agent"
-	latest "github.com/docker/cagent/pkg/config/v3"
+	"github.com/docker/cagent/pkg/config/latest"
 	"github.com/docker/cagent/pkg/environment"
 	"github.com/docker/cagent/pkg/model/provider/openai"
 	"github.com/docker/cagent/pkg/runtime"

examples/golibrary/multi/main.go

@@ -8,7 +8,7 @@ import (
 	"syscall"
 
 	"github.com/docker/cagent/pkg/agent"
-	latest "github.com/docker/cagent/pkg/config/v3"
+	"github.com/docker/cagent/pkg/config/latest"
 	"github.com/docker/cagent/pkg/environment"
 	"github.com/docker/cagent/pkg/model/provider/openai"
 	"github.com/docker/cagent/pkg/runtime"

examples/golibrary/simple/main.go

@@ -8,7 +8,7 @@ import (
 	"syscall"
 
 	"github.com/docker/cagent/pkg/agent"
-	latest "github.com/docker/cagent/pkg/config/v3"
+	"github.com/docker/cagent/pkg/config/latest"
 	"github.com/docker/cagent/pkg/environment"
 	"github.com/docker/cagent/pkg/model/provider/openai"
 	"github.com/docker/cagent/pkg/runtime"

examples/golibrary/stream/main.go

@@ -7,7 +7,7 @@ import (
 	"syscall"
 
 	"github.com/docker/cagent/pkg/agent"
-	latest "github.com/docker/cagent/pkg/config/v3"
+	"github.com/docker/cagent/pkg/config/latest"
 	"github.com/docker/cagent/pkg/environment"
 	"github.com/docker/cagent/pkg/model/provider/openai"
 	"github.com/docker/cagent/pkg/runtime"

examples/golibrary/tool/main.go

@@ -9,7 +9,7 @@ import (
 	"syscall"
 
 	"github.com/docker/cagent/pkg/agent"
-	latest "github.com/docker/cagent/pkg/config/v3"
+	"github.com/docker/cagent/pkg/config/latest"
 	"github.com/docker/cagent/pkg/environment"
 	"github.com/docker/cagent/pkg/model/provider/openai"
 	"github.com/docker/cagent/pkg/runtime"

pkg/acp/registry.go

@@ -5,7 +5,7 @@ import (
 	"os"
 
 	"github.com/docker/cagent/pkg/config"
-	latest "github.com/docker/cagent/pkg/config/v3"
+	"github.com/docker/cagent/pkg/config/latest"
 	"github.com/docker/cagent/pkg/teamloader"
 	"github.com/docker/cagent/pkg/tools"
 )

pkg/agentfile/resolver_test.go

@@ -13,6 +13,7 @@ import (
 
 	"github.com/docker/cagent/pkg/aliases"
 	"github.com/docker/cagent/pkg/cli"
+	"github.com/docker/cagent/pkg/config/latest"
 	"github.com/docker/cagent/pkg/content"
 	"github.com/docker/cagent/pkg/oci"
 )
@@ -489,7 +490,7 @@ func TestResolveAgentFile_OCIRef_HasAVersion(t *testing.T) {
 
 	storedContent, err := os.ReadFile(resolved)
 	require.NoError(t, err)
-	assert.Equal(t, `version: "3"
+	assert.Equal(t, `version: "`+latest.Version+`"
 agents:
   root:
     model: auto

pkg/api/types.go

@@ -4,7 +4,7 @@ import (
 	"time"
 
 	"github.com/docker/cagent/pkg/chat"
-	latest "github.com/docker/cagent/pkg/config/v3"
+	"github.com/docker/cagent/pkg/config/latest"
 	"github.com/docker/cagent/pkg/session"
 )
 

pkg/config/auto.go

@@ -3,7 +3,7 @@ package config
 import (
 	"context"
 
-	latest "github.com/docker/cagent/pkg/config/v3"
+	"github.com/docker/cagent/pkg/config/latest"
 	"github.com/docker/cagent/pkg/environment"
 )
 

pkg/config/config.go

@@ -7,11 +7,7 @@ import (
 
 	"github.com/goccy/go-yaml"
 
-	v0 "github.com/docker/cagent/pkg/config/v0"
-	v1 "github.com/docker/cagent/pkg/config/v1"
-	v2 "github.com/docker/cagent/pkg/config/v2"
-	latest "github.com/docker/cagent/pkg/config/v3" //nolint:staticcheck // This is used everywhere we reference the latest version
-	v3 "github.com/docker/cagent/pkg/config/v3"     //nolint:staticcheck // This is used for migrations to v3
+	"github.com/docker/cagent/pkg/config/latest"
 	"github.com/docker/cagent/pkg/environment"
 	"github.com/docker/cagent/pkg/filesystem"
 )
@@ -76,57 +72,24 @@ func CheckRequiredEnvVars(ctx context.Context, cfg *latest.Config, modelsGateway
 }
 
 func parseCurrentVersion(data []byte, version string) (any, error) {
-	options := []yaml.DecodeOption{yaml.Strict()}
-
-	switch version {
-	case v0.Version:
-		var cfg v0.Config
-		err := yaml.UnmarshalWithOptions(data, &cfg, options...)
-		return cfg, err
-	case v1.Version:
-		var cfg v1.Config
-		err := yaml.UnmarshalWithOptions(data, &cfg, options...)
-		return cfg, err
-	case v2.Version:
-		var cfg v2.Config
-		err := yaml.UnmarshalWithOptions(data, &cfg, options...)
-		return cfg, err
-	case v3.Version:
-		var cfg v3.Config
-		err := yaml.UnmarshalWithOptions(data, &cfg, options...)
-		return cfg, err
-	default:
+	parser, found := Parsers()[version]
+	if !found {
 		return nil, fmt.Errorf("unsupported config version: %v", version)
 	}
+	return parser(data)
 }
 
 func migrateToLatestConfig(c any) (latest.Config, error) {
 	var err error
-	for {
-		if old, ok := c.(v0.Config); ok {
-			c, err = v1.UpgradeFrom(old)
-			if err != nil {
-				return latest.Config{}, err
-			}
-			continue
-		}
-		if old, ok := c.(v1.Config); ok {
-			c, err = v2.UpgradeFrom(old)
-			if err != nil {
-				return latest.Config{}, err
-			}
-			continue
-		}
-		if old, ok := c.(v2.Config); ok {
-			c, err = v3.UpgradeFrom(old)
-			if err != nil {
-				return latest.Config{}, err
-			}
-			continue
-		}
 
-		return c.(latest.Config), nil
+	for _, upgrade := range Upgrades() {
+		c, err = upgrade(c)
+		if err != nil {
+			return latest.Config{}, err
+		}
 	}
+
+	return c.(latest.Config), nil
 }
 
 func validateConfig(cfg *latest.Config) error {

pkg/config/config_test.go

@@ -8,7 +8,7 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	latest "github.com/docker/cagent/pkg/config/v3"
+	"github.com/docker/cagent/pkg/config/latest"
 	"github.com/docker/cagent/pkg/environment"
 )
 

pkg/config/examples_test.go

@@ -11,7 +11,7 @@ import (
 	"github.com/stretchr/testify/require"
 	"github.com/xeipuuv/gojsonschema"
 
-	latest "github.com/docker/cagent/pkg/config/v3"
+	"github.com/docker/cagent/pkg/config/latest"
 	"github.com/docker/cagent/pkg/filesystem"
 	"github.com/docker/cagent/pkg/modelsdev"
 )

pkg/config/gather.go

@@ -7,7 +7,7 @@ import (
 	"sort"
 	"strings"
 
-	latest "github.com/docker/cagent/pkg/config/v3"
+	"github.com/docker/cagent/pkg/config/latest"
 	"github.com/docker/cagent/pkg/environment"
 	"github.com/docker/cagent/pkg/gateway"
 	"github.com/docker/cagent/pkg/model/provider"

pkg/config/latest/parse.go

@@ -0,0 +1,9 @@
+package latest
+
+import "github.com/goccy/go-yaml"
+
+func Parse(data []byte) (Config, error) {
+	var cfg Config
+	err := yaml.UnmarshalWithOptions(data, &cfg, yaml.Strict())
+	return cfg, err
+}

pkg/config/v3/types.go → pkg/config/latest/types.go

@@ -1,4 +1,4 @@
-package v3
+package latest
 
 import (
 	"fmt"

pkg/config/v3/types_test.go → pkg/config/latest/types_test.go

@@ -1,4 +1,4 @@
-package v3
+package latest
 
 import (
 	"testing"

pkg/config/latest/upgrade.go

@@ -0,0 +1,17 @@
+package latest
+
+import (
+	"github.com/docker/cagent/pkg/config/types"
+	previous "github.com/docker/cagent/pkg/config/v2"
+)
+
+func UpgradeIfNeeded(c any) (any, error) {
+	old, ok := c.(previous.Config)
+	if !ok {
+		return c, nil
+	}
+
+	var config Config
+	types.CloneThroughJSON(old, &config)
+	return config, nil
+}

pkg/config/v3/validate.go → pkg/config/latest/validate.go

@@ -1,4 +1,4 @@
-package v3
+package latest
 
 import (
 	"errors"

pkg/config/overrides.go

@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"strings"
 
-	latest "github.com/docker/cagent/pkg/config/v3"
+	"github.com/docker/cagent/pkg/config/latest"
 )
 
 // ApplyModelOverrides applies CLI model overrides to the configuration

pkg/config/v0/parse.go

@@ -0,0 +1,9 @@
+package v0
+
+import "github.com/goccy/go-yaml"
+
+func Parse(data []byte) (Config, error) {
+	var cfg Config
+	err := yaml.UnmarshalWithOptions(data, &cfg, yaml.Strict())
+	return cfg, err
+}

pkg/config/v0/upgrade.go

@@ -0,0 +1,5 @@
+package v0
+
+func UpgradeIfNeeded(old any) (any, error) {
+	return old, nil
+}

pkg/config/v1/parse.go

@@ -0,0 +1,9 @@
+package v1
+
+import "github.com/goccy/go-yaml"
+
+func Parse(data []byte) (Config, error) {
+	var cfg Config
+	err := yaml.UnmarshalWithOptions(data, &cfg, yaml.Strict())
+	return cfg, err
+}

pkg/config/v1/upgrade.go

@@ -2,10 +2,15 @@ package v1
 
 import (
 	"github.com/docker/cagent/pkg/config/types"
-	v0 "github.com/docker/cagent/pkg/config/v0"
+	previous "github.com/docker/cagent/pkg/config/v0"
 )
 
-func UpgradeFrom(old v0.Config) (Config, error) {
+func UpgradeIfNeeded(c any) (any, error) {
+	old, ok := c.(previous.Config)
+	if !ok {
+		return c, nil
+	}
+
 	var config Config
 	types.CloneThroughJSON(old, &config)
 

pkg/config/v2/parse.go

@@ -0,0 +1,9 @@
+package v2
+
+import "github.com/goccy/go-yaml"
+
+func Parse(data []byte) (Config, error) {
+	var cfg Config
+	err := yaml.UnmarshalWithOptions(data, &cfg, yaml.Strict())
+	return cfg, err
+}

pkg/config/v2/upgrade.go

@@ -4,10 +4,15 @@ import (
 	"errors"
 
 	"github.com/docker/cagent/pkg/config/types"
-	v1 "github.com/docker/cagent/pkg/config/v1"
+	previous "github.com/docker/cagent/pkg/config/v1"
 )
 
-func UpgradeFrom(old v1.Config) (Config, error) {
+func UpgradeIfNeeded(c any) (any, error) {
+	old, ok := c.(previous.Config)
+	if !ok {
+		return c, nil
+	}
+
 	if len(old.Env) > 0 {
 		return Config{}, errors.New("top-level Env is not supported anymore")
 	}

pkg/config/versions.go

@@ -0,0 +1,28 @@
+package config
+
+import (
+	"github.com/docker/cagent/pkg/config/latest"
+	v0 "github.com/docker/cagent/pkg/config/v0"
+	v1 "github.com/docker/cagent/pkg/config/v1"
+	v2 "github.com/docker/cagent/pkg/config/v2"
+)
+
+func Parsers() map[string]func([]byte) (any, error) {
+	return map[string]func([]byte) (any, error){
+		v0.Version: func(d []byte) (any, error) { return v0.Parse(d) },
+		v1.Version: func(d []byte) (any, error) { return v1.Parse(d) },
+		v2.Version: func(d []byte) (any, error) { return v2.Parse(d) },
+
+		latest.Version: func(d []byte) (any, error) { return latest.Parse(d) },
+	}
+}
+
+func Upgrades() []func(any) (any, error) {
+	return []func(any) (any, error){
+		v0.UpgradeIfNeeded,
+		v1.UpgradeIfNeeded,
+		v2.UpgradeIfNeeded,
+
+		latest.UpgradeIfNeeded,
+	}
+}

pkg/creator/agent.go

@@ -12,7 +12,7 @@ import (
 
 	"github.com/docker/cagent/pkg/agent"
 	"github.com/docker/cagent/pkg/config"
-	latest "github.com/docker/cagent/pkg/config/v3"
+	"github.com/docker/cagent/pkg/config/latest"
 	"github.com/docker/cagent/pkg/environment"
 	"github.com/docker/cagent/pkg/model/provider/anthropic"
 	"github.com/docker/cagent/pkg/model/provider/options"

pkg/model/provider/anthropic/client.go

@@ -14,7 +14,7 @@ import (
 	"github.com/anthropics/anthropic-sdk-go/packages/param"
 
 	"github.com/docker/cagent/pkg/chat"
-	latest "github.com/docker/cagent/pkg/config/v3"
+	"github.com/docker/cagent/pkg/config/latest"
 	"github.com/docker/cagent/pkg/environment"
 	"github.com/docker/cagent/pkg/httpclient"
 	"github.com/docker/cagent/pkg/model/provider/base"

pkg/model/provider/base/base.go

@@ -1,7 +1,7 @@
 package base
 
 import (
-	latest "github.com/docker/cagent/pkg/config/v3"
+	"github.com/docker/cagent/pkg/config/latest"
 	"github.com/docker/cagent/pkg/environment"
 	"github.com/docker/cagent/pkg/model/provider/options"
 )