Update app root on client gen (#2327)

This is a temporary fix to better support multiple clones of the same
encore app. It will update the app root based on the directory `encore
gen client` is called from rather than falling back to the last dir
`encore run` was executed in.

Author: ekerfelt

cli/cmd/encore/gen.go

@@ -71,10 +71,11 @@ To further narrow down the services to generate, use the '--services' flag.
 			}
 
 			// Determine the app id, either from the argument or from the current directory.
-			var appID string
+			var appID, appRoot string
 			if len(args) == 0 {
+				var err error
 				// First check the encore.app file.
-				appRoot, _, err := cmdutil.MaybeAppRoot()
+				appRoot, _, err = cmdutil.MaybeAppRoot()
 				if err != nil && !errors.Is(err, cmdutil.ErrNoEncoreApp) {
 					fatal(err)
 				} else if appRoot != "" {
@@ -134,6 +135,7 @@ To further narrow down the services to generate, use the '--services' flag.
 				OpenapiExcludePrivateEndpoints: &openAPIExcludePrivateEndpoints,
 				TsSharedTypes:                  &tsSharedTypes,
 				TsClientTarget:                 &tsDefaultClient,
+				AppRoot:                        appRoot,
 			})
 			if err != nil {
 				fatal(err)

cli/daemon/daemon.go

@@ -4,13 +4,13 @@ package daemon
 import (
 	"bytes"
 	"context"
+	"errors"
 	"io"
 	"strings"
 	"sync"
 	"sync/atomic"
 	"time"
 
-	"github.com/cockroachdb/errors"
 	"github.com/golang/protobuf/ptypes/empty"
 	"github.com/rs/zerolog"
 	"github.com/rs/zerolog/log"
@@ -95,13 +95,22 @@ func (s *Server) GenClient(ctx context.Context, params *daemonpb.GenClientReques
 	}
 
 	if envName == "local" {
-		// Determine the app root
-		app, err := s.apps.FindLatestByPlatformOrLocalID(params.AppId)
-		if errors.Is(err, apps.ErrNotFound) {
-			return nil, status.Errorf(codes.FailedPrecondition, "the app %s must be run locally before generating a client for the 'local' environment.",
-				params.AppId)
-		} else if err != nil {
-			return nil, status.Errorf(codes.Internal, "unable to query app info: %v", err)
+		var app *apps.Instance
+		var err error
+		// If the command was called with an app id, find the app instance by id.
+		if params.AppRoot == "" {
+			app, err = s.apps.FindLatestByPlatformOrLocalID(params.AppId)
+			if errors.Is(err, apps.ErrNotFound) {
+				return nil, status.Errorf(codes.FailedPrecondition, "the app %s must be run locally before generating a client for the 'local' environment.",
+					params.AppId)
+			} else if err != nil {
+				return nil, status.Errorf(codes.Internal, "unable to query app info: %v", err)
+			}
+		} else { // Otherwise, track the app by its root directory.
+			app, err = s.apps.Track(params.AppRoot)
+			if err != nil {
+				return nil, status.Errorf(codes.Internal, "unable to query app info: %v", err)
+			}
 		}
 
 		// Get the app metadata

proto/encore/daemon/daemon.pb.go

@@ -345,6 +345,10 @@ message GenClientRequest {
   // an instantiated client with the given target. The target can be e.g.
   // a variable, e.g. "import.meta.env.VITE_CLIENT_TARGET" or a string literal.
   optional string ts_client_target = 11;
+
+  // The root directory of the app to generate a client for.
+  // Included to be able to handle multi clone scenarios.
+  string app_root = 12;
 }
 
 message GenClientResponse {