compose: with existing infra

cli/azd/internal/vsrpc/environment_service_refresh.go

@@ -88,7 +88,7 @@ func (s *environmentService) refreshEnvironmentAsync(
 
 	_ = observer.OnNext(ctx, newInfoProgressMessage("Loading latest deployment information"))
 
-	deployment, err := bicepProvider.LastDeployment(ctx)
+	deployment, err := bicepProvider.LastRootDeployment(ctx)
 	if err != nil {
 		log.Printf("failed to get latest deployment result: %v", err)
 	} else {

cli/azd/pkg/azapi/resource_service.go

@@ -2,8 +2,11 @@ package azapi
 
 import (
 	"context"
+	"errors"
 	"fmt"
+	"slices"
 
+	"github.com/Azure/azure-sdk-for-go/sdk/azcore"
 	"github.com/Azure/azure-sdk-for-go/sdk/azcore/arm"
 	"github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/resources/armresources"
 	"github.com/azure/azure-dev/cli/azd/pkg/account"
@@ -194,6 +197,11 @@ func (rs *ResourceService) DeleteResourceGroup(ctx context.Context, subscription
 	}
 
 	poller, err := client.BeginDelete(ctx, resourceGroupName, nil)
+	var respErr *azcore.ResponseError
+	if errors.As(err, &respErr) && respErr.StatusCode == 404 { // Resource group is already deleted
+		return nil
+	}
+
 	if err != nil {
 		return fmt.Errorf("beginning resource group deletion: %w", err)
 	}
@@ -259,12 +267,16 @@ func GroupByResourceGroup(resources []*armresources.ResourceReference) (map[stri
 
 		resourceType := resourceId.ResourceType.String()
 		if resourceType != string(AzureResourceTypeResourceGroup) {
-			groupResources = append(groupResources, &Resource{
-				Id:       *resource.ID,
-				Name:     resourceId.Name,
-				Type:     resourceType,
-				Location: resourceId.Location,
-			})
+			if !slices.ContainsFunc(groupResources, func(r *Resource) bool {
+				return r.Id == *resource.ID
+			}) {
+				groupResources = append(groupResources, &Resource{
+					Id:       *resource.ID,
+					Name:     resourceId.Name,
+					Type:     resourceType,
+					Location: resourceId.Location,
+				})
+			}
 		}
 
 		resourceMap[resourceId.ResourceGroupName] = groupResources

cli/azd/pkg/azure/tags.go

@@ -7,6 +7,11 @@ const (
 	// TagKeyAzdEnvName is the name of the key in the tags map of a resource
 	// used to store the azd environment a resource is associated with.
 	TagKeyAzdEnvName = "azd-env-name"
+
+	// TagKeyAzdModuleName is the name of the key in the tags map of a resource
+	// used to store the Bicep module a resource is associated with.
+	TagKeyAzdModuleName = "azd-module-name"
+
 	/* #nosec G101 - Potential hardcoded credentials - false positive */
 	// TagKeyAzdDeploymentStateParamHashName is the name of the key in the tags map of a deployment
 	// used to store the parameters hash.

cli/azd/pkg/devcenter/provision_provider.go

@@ -475,7 +475,8 @@ func (p *ProvisionProvider) pollForProgress(ctx context.Context, deployment infr
 	}
 
 	// Report incremental progress
-	progressDisplay := p.deploymentManager.ProgressDisplay(deployment)
+	demoMode, _ := strconv.ParseBool(os.Getenv("AZD_DEMO_MODE"))
+	progressDisplay := p.deploymentManager.ProgressDisplay(demoMode, 1)
 
 	initialDelay := 3 * time.Second
 	regularDelay := 10 * time.Second
@@ -488,7 +489,7 @@ func (p *ProvisionProvider) pollForProgress(ctx context.Context, deployment infr
 			timer.Stop()
 			return
 		case <-timer.C:
-			if err := progressDisplay.ReportProgress(ctx, &queryStartTime); err != nil {
+			if err := progressDisplay.ReportProgress(ctx, deployment, &queryStartTime); err != nil {
 				// We don't want to fail the whole deployment if a progress reporting error occurs
 				log.Printf("error while reporting progress: %s", err.Error())
 			}

cli/azd/pkg/infra/deployment_manager.go

@@ -4,6 +4,7 @@ import (
 	"context"
 	"errors"
 	"fmt"
+	"log"
 	"slices"
 	"strings"
 
@@ -47,8 +48,8 @@ func (dm *DeploymentManager) CalculateTemplateHash(
 	return dm.deploymentService.CalculateTemplateHash(ctx, subscriptionId, template)
 }
 
-func (dm *DeploymentManager) ProgressDisplay(deployment Deployment) *ProvisioningProgressDisplay {
-	return NewProvisioningProgressDisplay(dm.resourceManager, dm.console, deployment)
+func (dm *DeploymentManager) ProgressDisplay(demoMode bool, totalDeployments int) *ProvisioningProgressDisplay {
+	return NewProvisioningProgressDisplay(dm.resourceManager, dm.console, demoMode, totalDeployments)
 }
 
 func (dm *DeploymentManager) SubscriptionScope(subscriptionId string, location string) *SubscriptionScope {
@@ -77,6 +78,7 @@ func (dm *DeploymentManager) CompletedDeployments(
 	ctx context.Context,
 	scope Scope,
 	envName string,
+	moduleName string,
 	hint string,
 ) ([]*azapi.ResourceDeployment, error) {
 	deployments, err := scope.ListDeployments(ctx)
@@ -94,7 +96,8 @@ func (dm *DeploymentManager) CompletedDeployments(
 	}
 
 	// Environment matching strategy
-	// 1. Deployment with azd tagged env name
+	// 1. Deployment with azd tagged env name + module name
+	// 1.1 Deployment with azd tagged env name (legacy)
 	// 2. Exact match on environment name to deployment name (old azd strategy)
 	// 3. Multiple matching names based on specified hint (show user prompt)
 	matchingDeployments := []*azapi.ResourceDeployment{}
@@ -106,8 +109,23 @@ func (dm *DeploymentManager) CompletedDeployments(
 			continue
 		}
 
-		// Match on current azd strategy (tags) or old azd strategy (deployment name)
-		if v, has := deployment.Tags[azure.TagKeyAzdEnvName]; has && *v == envName || deployment.Name == envName {
+		// Match on current azd strategy (tags)
+		if v, has := deployment.Tags[azure.TagKeyAzdEnvName]; has && *v == envName {
+			moduleVal, hasModuleTag := deployment.Tags[azure.TagKeyAzdModuleName]
+			if hasModuleTag && *moduleVal == moduleName {
+				log.Printf("completedDeployments: matched deployment '%s' using moduleName: %s", deployment.Name, moduleName)
+				return []*azapi.ResourceDeployment{deployment}, nil
+			}
+
+			// LEGACY: the deployment is of an old format (no module tag), return the deployment based only on env tag
+			if !hasModuleTag {
+				log.Printf("completedDeployments: matched deployment '%s' using envName", deployment.Name)
+				return []*azapi.ResourceDeployment{deployment}, nil
+			}
+		}
+
+		// LEGACY: match on deployment name
+		if deployment.Name == envName {
 			return []*azapi.ResourceDeployment{deployment}, nil
 		}