diff --git a/cmd/dagger/cmd/common.go b/cmd/dagger/cmd/common.go
index 79a06f6a..21de7181 100644
--- a/cmd/dagger/cmd/common.go
+++ b/cmd/dagger/cmd/common.go
@@ -8,22 +8,14 @@ import (
 
 	"dagger.io/go/dagger"
 	"github.com/rs/zerolog/log"
-	"github.com/spf13/cobra"
+	"github.com/spf13/viper"
 )
 
 // getRouteName returns the selected route name (based on explicit CLI selection or current work dir)
-func getRouteName(ctx context.Context, cmd *cobra.Command) string {
+func getRouteName(ctx context.Context) string {
 	lg := log.Ctx(ctx)
 
-	routeName, err := cmd.Flags().GetString("route")
-	if err != nil {
-		lg.
-			Fatal().
-			Err(err).
-			Str("flag", "route").
-			Msg("unable to resolve flag")
-	}
-
+	routeName := viper.GetString("route")
 	if routeName != "" {
 		return routeName
 	}
diff --git a/cmd/dagger/cmd/compute.go b/cmd/dagger/cmd/compute.go
index af298b4b..6867cfb0 100644
--- a/cmd/dagger/cmd/compute.go
+++ b/cmd/dagger/cmd/compute.go
@@ -31,7 +31,7 @@ var computeCmd = &cobra.Command{
 		lg := logger.New()
 		ctx := lg.WithContext(cmd.Context())
 
-		name := getRouteName(ctx, cmd)
+		name := getRouteName(ctx)
 		st := &dagger.RouteState{
 			ID:           uuid.New().String(),
 			Name:         name,
diff --git a/cmd/dagger/cmd/down.go b/cmd/dagger/cmd/down.go
index 495ec6cd..a81c92a2 100644
--- a/cmd/dagger/cmd/down.go
+++ b/cmd/dagger/cmd/down.go
@@ -25,7 +25,7 @@ var downCmd = &cobra.Command{
 		ctx := lg.WithContext(cmd.Context())
 		store := dagger.DefaultStore()
 
-		routeName := getRouteName(ctx, cmd)
+		routeName := getRouteName(ctx)
 		route, err := store.LookupRoute(ctx, routeName, nil)
 		if err != nil {
 			lg.
diff --git a/cmd/dagger/cmd/new.go b/cmd/dagger/cmd/new.go
index fadcb896..20481b6d 100644
--- a/cmd/dagger/cmd/new.go
+++ b/cmd/dagger/cmd/new.go
@@ -24,16 +24,9 @@ var newCmd = &cobra.Command{
 		ctx := lg.WithContext(cmd.Context())
 		store := dagger.DefaultStore()
 
-		upRouteFlag, err := cmd.Flags().GetBool("up")
-		if err != nil {
-			lg.
-				Fatal().
-				Err(err).
-				Str("flag", "up").
-				Msg("unable to resolve flag")
-		}
+		upRouteFlag := viper.GetBool("up")
 
-		routeName := getRouteName(ctx, cmd)
+		routeName := getRouteName(ctx)
 
 		// TODO: Implement options: --layout-*, --setup
 		route, err := store.CreateRoute(ctx, routeName, nil)
diff --git a/cmd/dagger/cmd/query.go b/cmd/dagger/cmd/query.go
index 7fedf29a..ede5b140 100644
--- a/cmd/dagger/cmd/query.go
+++ b/cmd/dagger/cmd/query.go
@@ -26,7 +26,7 @@ var queryCmd = &cobra.Command{
 		ctx := lg.WithContext(cmd.Context())
 		store := dagger.DefaultStore()
 
-		routeName := getRouteName(ctx, cmd)
+		routeName := getRouteName(ctx)
 		route, err := store.LookupRoute(ctx, routeName, nil)
 		if err != nil {
 			lg.
diff --git a/cmd/dagger/cmd/up.go b/cmd/dagger/cmd/up.go
index 8186d725..b710658d 100644
--- a/cmd/dagger/cmd/up.go
+++ b/cmd/dagger/cmd/up.go
@@ -25,7 +25,7 @@ var upCmd = &cobra.Command{
 		ctx := lg.WithContext(cmd.Context())
 		store := dagger.DefaultStore()
 
-		routeName := getRouteName(ctx, cmd)
+		routeName := getRouteName(ctx)
 		route, err := store.LookupRoute(ctx, routeName, nil)
 		if err != nil {
 			lg.