Simplify env management

cmd/root/api.go

@@ -9,7 +9,7 @@ import (
 	"github.com/spf13/cobra"
 
 	"github.com/docker/cagent/internal/telemetry"
-	latest "github.com/docker/cagent/pkg/config/v1"
+	"github.com/docker/cagent/pkg/config"
 	"github.com/docker/cagent/pkg/server"
 	"github.com/docker/cagent/pkg/session"
 	"github.com/docker/cagent/pkg/teamloader"
@@ -18,7 +18,7 @@ import (
 var (
 	listenAddr string
 	sessionDb  string
-	runConfig  latest.RuntimeConfig
+	runConfig  config.RuntimeConfig
 )
 
 // NewApiCmd creates a new api command

cmd/root/gateway_test.go

@@ -3,11 +3,10 @@ package root
 import (
 	"testing"
 
+	"github.com/docker/cagent/pkg/config"
 	"github.com/spf13/cobra"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-
-	latest "github.com/docker/cagent/pkg/config/v1"
 )
 
 func TestGatewayLogic(t *testing.T) {
@@ -152,7 +151,7 @@ func TestGatewayLogic(t *testing.T) {
 			}
 
 			// Reset global variables
-			runConfig = latest.RuntimeConfig{}
+			runConfig = config.RuntimeConfig{}
 			gwConfig = gatewayConfig{}
 
 			// Create a test command with gateway flags

examples/42.yaml

@@ -1,5 +1,5 @@
 #!/usr/bin/env cagent run
-version: "1"
+version: "2"
 
 agents:
   root:

examples/airbnb.yaml

@@ -1,5 +1,5 @@
 #!/usr/bin/env cagent run
-version: "1"
+version: "2"
 
 agents:
   root:

examples/alloy.yaml

@@ -1,5 +1,5 @@
 #!/usr/bin/env cagent run
-version: "1"
+version: "2"
 
 agents:
   root:

examples/basic_agent.yaml

@@ -1,5 +1,5 @@
 #!/usr/bin/env cagent run
-version: "1"
+version: "2"
 
 agents:
   root:

examples/bio.yaml

@@ -1,5 +1,5 @@
 #!/usr/bin/env cagent run
-version: "1"
+version: "2"
 
 agents:
   root:

examples/blog.yaml

@@ -1,5 +1,5 @@
 #!/usr/bin/env cagent run
-version: "1"
+version: "2"
 
 agents:
   root:

examples/code.yaml

@@ -1,5 +1,5 @@
 #!/usr/bin/env cagent run
-version: "1"
+version: "2"
 
 agents:
   root:

examples/contradict.yaml

@@ -1,5 +1,5 @@
 #!/usr/bin/env cagent run
-version: "1"
+version: "2"
 
 agents:
   root:

examples/dev-team.yaml

@@ -1,5 +1,5 @@
 #!/usr/bin/env cagent run
-version: "1"
+version: "2"
 
 models:
   model:

examples/dhi/dhi.yaml

@@ -1,5 +1,5 @@
 #!/usr/bin/env cagent run
-version: "1"
+version: "2"
 
 agents:
   root:

examples/diag.yaml

@@ -1,5 +1,5 @@
 #!/usr/bin/env cagent run
-version: "1"
+version: "2"
 
 agents:
   root:

examples/dmr.yaml

@@ -1,5 +1,5 @@
 #!/usr/bin/env cagent run
-version: "1"
+version: "2"
 
 agents:
   root:

examples/doc_generator.yaml

@@ -1,5 +1,5 @@
 #!/usr/bin/env cagent run
-version: "1"
+version: "2"
 
 agents:
   root:

examples/echo-agent.yaml

@@ -1,5 +1,5 @@
 #!/usr/bin/env cagent run
-version: "1"
+version: "2"
 
 metadata:
   readme: |

examples/finance.yaml

@@ -1,5 +1,5 @@
 #!/usr/bin/env cagent run
-version: "1"
+version: "2"
 
 agents:
   root:

examples/github.yaml

@@ -1,5 +1,5 @@
 #!/usr/bin/env cagent run
-version: "1"
+version: "2"
 
 agents:
   root:

examples/github_issue_manager.yaml

@@ -1,4 +1,4 @@
-version: "1"
+version: "2"
 
 models:
   claude:

examples/go_packages.yml

@@ -1,5 +1,5 @@
 #!/usr/bin/env cagent run
-version: "1"
+version: "2"
 
 agents:
   root:

examples/golibrary/builtintool/main.go

@@ -6,7 +6,7 @@ import (
 	"log"
 
 	"github.com/docker/cagent/pkg/agent"
-	latest "github.com/docker/cagent/pkg/config/v1"
+	latest "github.com/docker/cagent/pkg/config/v2"
 	"github.com/docker/cagent/pkg/environment"
 	"github.com/docker/cagent/pkg/model/provider/openai"
 	"github.com/docker/cagent/pkg/runtime"
@@ -24,7 +24,7 @@ func main() {
 			Provider: "openai",
 			Model:    "gpt-4o",
 		},
-		environment.NewDefaultProvider(),
+		environment.NewDefaultProvider(ctx),
 	)
 	if err != nil {
 		log.Fatal(err)

examples/golibrary/multi/main.go

@@ -6,7 +6,7 @@ import (
 	"log"
 
 	"github.com/docker/cagent/pkg/agent"
-	latest "github.com/docker/cagent/pkg/config/v1"
+	latest "github.com/docker/cagent/pkg/config/v2"
 	"github.com/docker/cagent/pkg/environment"
 	"github.com/docker/cagent/pkg/model/provider/openai"
 	"github.com/docker/cagent/pkg/runtime"
@@ -24,7 +24,7 @@ func main() {
 			Provider: "openai",
 			Model:    "gpt-4o",
 		},
-		environment.NewDefaultProvider())
+		environment.NewDefaultProvider(ctx))
 	if err != nil {
 		log.Fatal(err)
 	}

examples/golibrary/simple/main.go

@@ -6,7 +6,7 @@ import (
 	"log"
 
 	"github.com/docker/cagent/pkg/agent"
-	latest "github.com/docker/cagent/pkg/config/v1"
+	latest "github.com/docker/cagent/pkg/config/v2"
 	"github.com/docker/cagent/pkg/environment"
 	"github.com/docker/cagent/pkg/model/provider/openai"
 	"github.com/docker/cagent/pkg/runtime"
@@ -23,7 +23,7 @@ func main() {
 			Provider: "openai",
 			Model:    "gpt-4o",
 		},
-		environment.NewDefaultProvider(),
+		environment.NewDefaultProvider(ctx),
 	)
 	if err != nil {
 		log.Fatal(err)

examples/golibrary/tool/main.go

@@ -7,7 +7,7 @@ import (
 	"log"
 
 	"github.com/docker/cagent/pkg/agent"
-	latest "github.com/docker/cagent/pkg/config/v1"
+	latest "github.com/docker/cagent/pkg/config/v2"
 	"github.com/docker/cagent/pkg/environment"
 	"github.com/docker/cagent/pkg/model/provider/openai"
 	"github.com/docker/cagent/pkg/runtime"
@@ -43,7 +43,7 @@ func main() {
 			Provider: "openai",
 			Model:    "gpt-4o",
 		},
-		environment.NewDefaultProvider(),
+		environment.NewDefaultProvider(ctx),
 	)
 	if err != nil {
 		log.Fatal(err)

examples/gopher.yaml

@@ -1,5 +1,5 @@
 #!/usr/bin/env cagent run
-version: "1"
+version: "2"
 
 agents:
   root:

examples/haiku.yaml

@@ -1,5 +1,5 @@
 #!/usr/bin/env cagent exec
-version: "1"
+version: "2"
 
 agents:
   root:

examples/image_text_extractor.yaml

@@ -1,4 +1,4 @@
-version: "1"
+version: "2"
 
 models:
   gpt4_vision:

examples/mcp_generator.yaml

@@ -1,5 +1,5 @@
 #!/usr/bin/env cagent run
-version: "1"
+version: "2"
 
 agents:
   root:

examples/mem.yaml

@@ -1,5 +1,5 @@
 #!/usr/bin/env cagent run
-version: "1"
+version: "2"
 
 agents:
   root:

examples/moby.yaml

@@ -1,5 +1,5 @@
 #!/usr/bin/env cagent run
-version: "1"
+version: "2"
 
 agents:
   root:

examples/multi-code.yaml

@@ -1,5 +1,5 @@
 #!/usr/bin/env cagent run
-version: "1"
+version: "2"
 
 agents:
   root:

examples/pirate.yaml

@@ -1,5 +1,5 @@
 #!/usr/bin/env cagent run
-version: "1"
+version: "2"
 
 agents:
   root:

examples/professional/professional_writing_agent.yaml

@@ -1,4 +1,4 @@
-version: "1"
+version: "2"
 
 models:
   claude:

examples/pythonist.yaml

@@ -1,5 +1,5 @@
 #!/usr/bin/env cagent run
-version: "1"
+version: "2"
 
 agents:
   root:

examples/review.yaml

@@ -1,5 +1,5 @@
 #!/usr/bin/env cagent run
-version: "1"
+version: "2"
 
 agents:
   root:

examples/shared-todo.yaml

@@ -1,5 +1,5 @@
 #!/usr/bin/env cagent run
-version: "1"
+version: "2"
 
 agents:
   root:

examples/shell.yaml

@@ -1,5 +1,5 @@
 #!/usr/bin/env cagent run
-version: "1"
+version: "2"
 
 agents:
   root:

examples/silvia.yaml

@@ -1,5 +1,5 @@
 #!/usr/bin/env cagent run
-version: "1"
+version: "2"
 
 agents:
   root:

examples/todo.yaml

@@ -1,5 +1,5 @@
 #!/usr/bin/env cagent run
-version: "1"
+version: "2"
 
 agents:
   root:

examples/writer.yaml

@@ -1,5 +1,5 @@
 #!/usr/bin/env cagent run
-version: "1"
+version: "2"
 
 agents:
   root:

golang_developer.yaml

@@ -1,5 +1,5 @@
 #!/usr/bin/env cagent run
-version: "1"
+version: "2"
 
 agents:
   root: