fix: suggest to check logs if no services are found

src/cmd/cli/command/compose.go

@@ -595,7 +595,7 @@ func makeComposePsCmd() *cobra.Command {
 				return err
 			}
 
-			if err := cli.GetServices(cmd.Context(), projectName, provider, long); err != nil {
+			if err := cli.PrintServices(cmd.Context(), projectName, provider, long); err != nil {
 				if errNoServices := new(cli.ErrNoServices); !errors.As(err, errNoServices) {
 					return err
 				}

src/cmd/cli/command/globals.go

@@ -277,7 +277,6 @@ in the file conflict with existing shell environment variables. If conflicts are
 found, it warns the user that the shell environment variable will take precedence.
 */
 func checkEnvConflicts(stackName string) error {
-
 	path, err := filepath.Abs(filepath.Join(stacks.Directory, stackName))
 	if err != nil {
 		return err

src/cmd/cli/command/globals_test.go

@@ -424,7 +424,6 @@ AWS_REGION="us-east-1"`,
 
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-
 			prevTerm := term.DefaultTerm
 			var stdout, stderr bytes.Buffer
 			term.DefaultTerm = term.NewTerm(os.Stdin, &stdout, &stderr)

src/pkg/agent/tools/default_tool_cli.go

@@ -11,7 +11,6 @@ import (
 	cliClient "github.com/DefangLabs/defang/src/pkg/cli/client"
 	"github.com/DefangLabs/defang/src/pkg/cli/compose"
 	"github.com/DefangLabs/defang/src/pkg/login"
-	"github.com/DefangLabs/defang/src/pkg/mcp/deployment_info"
 	"github.com/DefangLabs/defang/src/pkg/modes"
 	"github.com/DefangLabs/defang/src/pkg/term"
 	defangv1 "github.com/DefangLabs/defang/src/protos/io/defang/v1"
@@ -70,8 +69,17 @@ func (DefaultToolCLI) ConfigDelete(ctx context.Context, projectName string, prov
 	return cli.ConfigDelete(ctx, projectName, provider, name)
 }
 
-func (DefaultToolCLI) GetServices(ctx context.Context, projectName string, provider cliClient.Provider) ([]deployment_info.Service, error) {
-	return deployment_info.GetServices(ctx, projectName, provider)
+func (DefaultToolCLI) GetServices(ctx context.Context, projectName string, provider cliClient.Provider) ([]*cli.Service, error) {
+	servicesResponse, err := cli.GetServices(ctx, projectName, provider)
+	if err != nil {
+		return nil, err
+	}
+
+	term.Debug("Checking service health...")
+	cli.UpdateServiceStates(ctx, servicesResponse.Services)
+
+	si, _, err := cli.GetServiceStatesAndEndpoints(servicesResponse.Services)
+	return si, err
 }
 
 func (DefaultToolCLI) PrintEstimate(mode modes.Mode, estimate *defangv1.EstimateResponse) string {

src/pkg/agent/tools/interfaces.go

@@ -6,10 +6,8 @@ import (
 	"time"
 
 	"github.com/DefangLabs/defang/src/pkg/cli"
-	cliTypes "github.com/DefangLabs/defang/src/pkg/cli"
 	cliClient "github.com/DefangLabs/defang/src/pkg/cli/client"
 	"github.com/DefangLabs/defang/src/pkg/cli/compose"
-	"github.com/DefangLabs/defang/src/pkg/mcp/deployment_info"
 	"github.com/DefangLabs/defang/src/pkg/modes"
 	defangv1 "github.com/DefangLabs/defang/src/protos/io/defang/v1"
 )
@@ -23,14 +21,14 @@ type CLIInterface interface {
 	Connect(ctx context.Context, cluster string) (*cliClient.GrpcClient, error)
 	CreatePlaygroundProvider(client *cliClient.GrpcClient) cliClient.Provider
 	GenerateAuthURL(authPort int) string
-	GetServices(ctx context.Context, projectName string, provider cliClient.Provider) ([]deployment_info.Service, error)
+	GetServices(ctx context.Context, projectName string, provider cliClient.Provider) ([]*cli.Service, error)
 	InteractiveLoginMCP(ctx context.Context, client *cliClient.GrpcClient, cluster string, mcpClient string) error
 	ListConfig(ctx context.Context, provider cliClient.Provider, projectName string) (*defangv1.Secrets, error)
 	LoadProject(ctx context.Context, loader cliClient.Loader) (*compose.Project, error)
 	LoadProjectNameWithFallback(ctx context.Context, loader cliClient.Loader, provider cliClient.Provider) (string, error)
 	NewProvider(ctx context.Context, providerId cliClient.ProviderID, client cliClient.FabricClient, stack string) cliClient.Provider
 	PrintEstimate(mode modes.Mode, estimate *defangv1.EstimateResponse) string
 	RunEstimate(ctx context.Context, project *compose.Project, client *cliClient.GrpcClient, provider cliClient.Provider, providerId cliClient.ProviderID, region string, mode modes.Mode) (*defangv1.EstimateResponse, error)
-	Tail(ctx context.Context, provider cliClient.Provider, projectName string, options cliTypes.TailOptions) error
-	TailAndMonitor(ctx context.Context, project *compose.Project, provider cliClient.Provider, waitTimeout time.Duration, options cliTypes.TailOptions) (cli.ServiceStates, error)
+	Tail(ctx context.Context, provider cliClient.Provider, projectName string, options cli.TailOptions) error
+	TailAndMonitor(ctx context.Context, project *compose.Project, provider cliClient.Provider, waitTimeout time.Duration, options cli.TailOptions) (cli.ServiceStates, error)
 }

src/pkg/agent/tools/logs.go

@@ -78,7 +78,6 @@ func HandleLogsTool(ctx context.Context, loader cliClient.ProjectLoader, params
 	})
 
 	if err != nil {
-		err = fmt.Errorf("failed to fetch logs: %w", err)
 		term.Error("Failed to fetch logs", "error", err)
 		return "", fmt.Errorf("failed to fetch logs: %w", err)
 	}

src/pkg/agent/tools/services.go

@@ -45,7 +45,7 @@ func HandleServicesTool(ctx context.Context, loader cliClient.ProjectLoader, cli
 	if err != nil {
 		var noServicesErr defangcli.ErrNoServices
 		if errors.As(err, &noServicesErr) {
-			return fmt.Sprintf("no services found for the specified project %q", projectName), nil
+			return noServicesErr.Error(), nil
 		}
 		if connect.CodeOf(err) == connect.CodeNotFound && strings.Contains(err.Error(), "is not deployed in Playground") {
 			return fmt.Sprintf("project %s is not deployed in Playground", projectName), nil

src/pkg/agent/tools/services_test.go

@@ -7,11 +7,10 @@ import (
 	"testing"
 	"time"
 
-	defangcli "github.com/DefangLabs/defang/src/pkg/cli"
+	"github.com/DefangLabs/defang/src/pkg/cli"
 	"github.com/DefangLabs/defang/src/pkg/cli/client"
 	"github.com/DefangLabs/defang/src/pkg/cli/compose"
 	"github.com/DefangLabs/defang/src/pkg/elicitations"
-	"github.com/DefangLabs/defang/src/pkg/mcp/deployment_info"
 	"github.com/DefangLabs/defang/src/pkg/modes"
 	defangv1 "github.com/DefangLabs/defang/src/protos/io/defang/v1"
 	"github.com/bufbuild/connect-go"
@@ -29,7 +28,7 @@ type MockCLI struct {
 	MockProjectName                  string
 
 	GetServicesError    error
-	MockServices        []deployment_info.Service
+	MockServices        []*cli.Service
 	GetServicesCalled   bool
 	GetServicesProject  string
 	GetServicesProvider client.Provider
@@ -56,7 +55,7 @@ func (m *MockCLI) LoadProjectNameWithFallback(ctx context.Context, loader client
 	return "default-project", nil
 }
 
-func (m *MockCLI) GetServices(ctx context.Context, projectName string, provider client.Provider) ([]deployment_info.Service, error) {
+func (m *MockCLI) GetServices(ctx context.Context, projectName string, provider client.Provider) ([]*cli.Service, error) {
 	m.GetServicesCalled = true
 	m.GetServicesProject = projectName
 	m.GetServicesProvider = provider
@@ -70,7 +69,7 @@ func (m *MockCLI) ComposeDown(ctx context.Context, projectName string, client *c
 	return "", nil
 }
 
-func (m *MockCLI) ComposeUp(ctx context.Context, client *client.GrpcClient, provider client.Provider, params defangcli.ComposeUpParams) (*defangv1.DeployResponse, *compose.Project, error) {
+func (m *MockCLI) ComposeUp(ctx context.Context, client *client.GrpcClient, provider client.Provider, params cli.ComposeUpParams) (*defangv1.DeployResponse, *compose.Project, error) {
 	return nil, nil, nil
 }
 
@@ -110,11 +109,11 @@ func (m *MockCLI) RunEstimate(ctx context.Context, project *compose.Project, cli
 	return nil, nil
 }
 
-func (m *MockCLI) Tail(ctx context.Context, provider client.Provider, projectName string, options defangcli.TailOptions) error {
+func (m *MockCLI) Tail(ctx context.Context, provider client.Provider, projectName string, options cli.TailOptions) error {
 	return nil
 }
 
-func (m *MockCLI) TailAndMonitor(ctx context.Context, project *compose.Project, provider client.Provider, waitTimeout time.Duration, options defangcli.TailOptions) (defangcli.ServiceStates, error) {
+func (m *MockCLI) TailAndMonitor(ctx context.Context, project *compose.Project, provider client.Provider, waitTimeout time.Duration, options cli.TailOptions) (cli.ServiceStates, error) {
 	return nil, nil
 }
 
@@ -195,10 +194,10 @@ func TestHandleServicesToolWithMockCLI(t *testing.T) {
 				MockClient:       &client.GrpcClient{},
 				MockProvider:     &client.PlaygroundProvider{},
 				MockProjectName:  "test-project",
-				GetServicesError: defangcli.ErrNoServices{ProjectName: "test-project"},
+				GetServicesError: cli.ErrNoServices{ProjectName: "test-project"},
 			},
 			expectedError:       false, // Returns successful result with message
-			resultTextContains:  "no services found for the specified project",
+			resultTextContains:  "no services found in project",
 			expectedGetServices: true,
 			expectedProjectName: "test-project",
 		},
@@ -238,13 +237,12 @@ func TestHandleServicesToolWithMockCLI(t *testing.T) {
 				MockClient:      &client.GrpcClient{},
 				MockProvider:    &client.PlaygroundProvider{},
 				MockProjectName: "test-project",
-				MockServices: []deployment_info.Service{
+				MockServices: []*cli.Service{
 					{
-						Service:      "test-service",
-						DeploymentId: "test-deployment",
-						PublicFqdn:   "test.example.com",
-						PrivateFqdn:  "test.internal",
-						Status:       "running",
+						Service:    "test-service",
+						Deployment: "test-deployment",
+						Fqdn:       "test.example.com",
+						Status:     "running",
 					},
 				},
 			},

src/pkg/cli/client/byoc/aws/byoc.go

@@ -491,9 +491,7 @@ func (b *ByocAws) GetProjectUpdate(ctx context.Context, projectName string) (*de
 	}
 
 	s3Client := s3.NewFromConfig(cfg)
-	// Path to the state file, Defined at: https://github.com/DefangLabs/defang-mvp/blob/main/pulumi/cd/aws/byoc.ts#L104
-	pkg.Ensure(projectName != "", "ProjectName not set")
-	path := fmt.Sprintf("projects/%s/%s/project.pb", projectName, b.PulumiStack)
+	path := b.GetProjectUpdatePath(projectName)
 
 	term.Debug("Getting services from bucket:", bucketName, path)
 	getObjectOutput, err := s3Client.GetObject(ctx, &s3.GetObjectInput{

src/pkg/cli/client/byoc/baseclient.go

@@ -291,3 +291,9 @@ func (b ByocBaseClient) GetPrivateFqdn(projectName string, fqn string) string {
 	safeFqn := dns.SafeLabel(fqn)
 	return fmt.Sprintf("%s.%s", safeFqn, GetPrivateDomain(projectName)) // TODO: consider merging this with ServicePrivateDNS
 }
+
+func (b ByocBaseClient) GetProjectUpdatePath(projectName string) string {
+	// Path to the state file, Defined at: https://github.com/DefangLabs/defang-mvp/blob/main/pulumi/cd/aws/byoc.ts#L104
+	pkg.Ensure(projectName != "", "ProjectName not set")
+	return fmt.Sprintf("projects/%s/%s/project.pb", projectName, b.PulumiStack)
+}

src/pkg/cli/client/byoc/do/byoc.go

@@ -96,7 +96,7 @@ func (b *ByocDo) GetProjectUpdate(ctx context.Context, projectName string) (*def
 		return nil, nil // no services yet
 	}
 
-	path := fmt.Sprintf("projects/%s/%s/project.pb", projectName, b.PulumiStack)
+	path := b.GetProjectUpdatePath(projectName)
 	getObjectOutput, err := s3client.GetObject(ctx, &s3.GetObjectInput{
 		Bucket: &bucketName,
 		Key:    &path,

src/pkg/cli/client/byoc/gcp/byoc.go

@@ -957,8 +957,7 @@ func (b *ByocGcp) GetProjectUpdate(ctx context.Context, projectName string) (*de
 		return nil, errors.New("no defang cd bucket found")
 	}
 
-	// Path to the state file, Defined at: https://github.com/DefangLabs/defang-mvp/blob/main/pulumi/cd/byoc/aws/index.ts#L89
-	path := fmt.Sprintf("projects/%s/%s/project.pb", projectName, b.PulumiStack)
+	path := b.GetProjectUpdatePath(projectName)
 
 	// Current user might not have object viewer access to the bucket, use the upload service account to get the object
 	uploadSA := b.driver.GetServiceAccountEmail(DefangUploadServiceAccountName)

src/pkg/cli/deploymentinfo.go

@@ -5,7 +5,7 @@ import (
 	defangv1 "github.com/DefangLabs/defang/src/protos/io/defang/v1"
 )
 
-type printService struct {
+type Service struct {
 	Deployment string
 	Endpoint   string
 	Service    string
@@ -14,8 +14,8 @@ type printService struct {
 	Fqdn       string
 }
 
-func PrintServiceStatesAndEndpoints(serviceInfos []*defangv1.ServiceInfo) error {
-	var serviceTableItems []*printService
+func GetServiceStatesAndEndpoints(serviceInfos []*defangv1.ServiceInfo) ([]*Service, bool, error) {
+	var serviceTableItems []*Service
 
 	// showDomainNameColumn := false
 	showCertGenerateHint := false
@@ -38,7 +38,7 @@ func PrintServiceStatesAndEndpoints(serviceInfos []*defangv1.ServiceInfo) error
 			domainname = serviceInfo.PrivateFqdn
 		}
 
-		ps := &printService{
+		ps := &Service{
 			Deployment: serviceInfo.Etag,
 			Service:    serviceInfo.Service.Name,
 			State:      serviceInfo.State,
@@ -49,12 +49,21 @@ func PrintServiceStatesAndEndpoints(serviceInfos []*defangv1.ServiceInfo) error
 		serviceTableItems = append(serviceTableItems, ps)
 	}
 
+	return serviceTableItems, showCertGenerateHint, nil
+}
+
+func PrintServiceStatesAndEndpoints(serviceInfos []*defangv1.ServiceInfo) error {
+	services, showCertGenerateHint, err := GetServiceStatesAndEndpoints(serviceInfos)
+	if err != nil {
+		return err
+	}
+
 	attrs := []string{"Service", "Deployment", "State", "Fqdn", "Endpoint", "Status"}
 	// if showDomainNameColumn {
 	// 	attrs = append(attrs, "DomainName")
 	// }
 
-	err := term.Table(serviceTableItems, attrs...)
+	err = term.Table(services, attrs...)
 	if err != nil {
 		return err
 	}