Add cleanup for Endpoint only (#138)

* Add cleanup for Endpoint only

* code review

* remove duplicated code

* revert

* fix tests

* fix comments

---------

Co-authored-by: Josina Joy <josjoy@microsoft.com>

Author: Josina20

src/Microsoft.Agents.A365.DevTools.Cli/Commands/CleanupCommand.cs

@@ -71,15 +71,18 @@ private static Command CreateBlueprintCleanupCommand(
             new[] { "--verbose", "-v" },
             description: "Enable verbose logging");
 
+        var endpointOnlyOption = new Option<bool>(
+            new[] { "--endpoint-only" },
+            description: "Delete only the messaging endpoint, keep the blueprint application");
+
         command.AddOption(configOption);
         command.AddOption(verboseOption);
+        command.AddOption(endpointOnlyOption);
 
-        command.SetHandler(async (configFile, verbose) =>
+        command.SetHandler(async (configFile, verbose, endpointOnly) =>
         {
             try
             {
-                logger.LogInformation("Starting blueprint cleanup...");
-                
                 var config = await LoadConfigAsync(configFile, logger, configService);
                 if (config == null) return;
 
@@ -89,8 +92,18 @@ private static Command CreateBlueprintCleanupCommand(
                     agentBlueprintService.CustomClientAppId = config.ClientAppId;
                 }
 
+                // If endpoint-only mode, only delete the messaging endpoint
+                if (endpointOnly)
+                {
+                    await ExecuteEndpointOnlyCleanupAsync(logger, config, botConfigurator);
+                    return;
+                }
+
+                // Full blueprint cleanup (original behavior)
+                logger.LogInformation("Starting blueprint cleanup...");
+
                 // Check if there's actually a blueprint to clean up
-                if (string.IsNullOrEmpty(config.AgentBlueprintId))
+                if (string.IsNullOrWhiteSpace(config.AgentBlueprintId))
                 {
                     logger.LogInformation("No blueprint application found to clean up");
                     return;
@@ -127,27 +140,10 @@ private static Command CreateBlueprintCleanupCommand(
                 // Blueprint deleted successfully
                 logger.LogInformation("Agent blueprint application deleted successfully");
 
-                // Handle endpoint deletion if needed
-                if (!string.IsNullOrEmpty(config.BotName))
+                // Handle endpoint deletion if needed using shared helper
+                if (!await DeleteMessagingEndpointAsync(logger, config, botConfigurator))
                 {
-                    // Delete messaging endpoint
-                    logger.LogInformation("Deleting messaging endpoint registration...");
-                    var endpointName = EndpointHelper.GetEndpointName(config.BotName);
-
-                    var endpointDeleted = await botConfigurator.DeleteEndpointWithAgentBlueprintAsync(
-                        endpointName,
-                        config.Location,
-                        config.AgentBlueprintId);
-
-                    if (!endpointDeleted)
-                    {
-                        logger.LogWarning("Failed to delete blueprint messaging endpoint");
-                        return;
-                    }
-                }
-                else
-                {
-                    logger.LogInformation("No blueprint messaging endpoint found in configuration");
+                    return;
                 }
 
                 // Clear configuration after successful blueprint deletion
@@ -167,7 +163,7 @@ private static Command CreateBlueprintCleanupCommand(
             {
                 logger.LogError(ex, "Blueprint cleanup failed");
             }
-        }, configOption, verboseOption);
+        }, configOption, verboseOption, endpointOnlyOption);
 
         return command;
     }
@@ -207,7 +203,7 @@ private static Command CreateAzureCleanupCommand(
                 logger.LogInformation("=========================");
                 logger.LogInformation("    Web App: {WebAppName}", config.WebAppName);
                 logger.LogInformation("    App Service Plan: {PlanName}", config.AppServicePlanName);
-                if (!string.IsNullOrEmpty(config.BotId))
+                if (!string.IsNullOrWhiteSpace(config.BotId))
                     logger.LogInformation("    Azure Bot: {BotId}", config.BotId);
                 logger.LogInformation("    Resource Group: {ResourceGroup}", config.ResourceGroup);
                 logger.LogInformation("");
@@ -308,9 +304,9 @@ private static Command CreateInstanceCleanupCommand(
                 logger.LogInformation("============================");
                 logger.LogInformation("Will delete the following resources:");
 
-                if (!string.IsNullOrEmpty(config.AgenticAppId))
+                if (!string.IsNullOrWhiteSpace(config.AgenticAppId))
                     logger.LogInformation("    Agent Identity Application: {IdentityId}", config.AgenticAppId);
-                if (!string.IsNullOrEmpty(config.AgenticUserId))
+                if (!string.IsNullOrWhiteSpace(config.AgenticUserId))
                     logger.LogInformation("    Agent User: {UserId}", config.AgenticUserId);
                 logger.LogInformation("    Generated configuration file");
                 logger.LogInformation("");
@@ -324,15 +320,15 @@ private static Command CreateInstanceCleanupCommand(
                 }
 
                 // Delete agent identity application
-                if (!string.IsNullOrEmpty(config.AgenticAppId))
+                if (!string.IsNullOrWhiteSpace(config.AgenticAppId))
                 {
                     logger.LogInformation("Deleting agent identity application...");
                     await executor.ExecuteAsync("az", $"ad app delete --id {config.AgenticAppId}", null, true, false, CancellationToken.None);
                     logger.LogInformation("Agent identity application deleted");
                 }
 
                 // Delete agent user
-                if (!string.IsNullOrEmpty(config.AgenticUserId))
+                if (!string.IsNullOrWhiteSpace(config.AgenticUserId))
                 {
                     logger.LogInformation("Deleting agent user...");
                     await executor.ExecuteAsync("az", $"ad user delete --id {config.AgenticUserId}", null, true, false, CancellationToken.None);
@@ -420,19 +416,19 @@ private static async Task ExecuteAllCleanupAsync(
             logger.LogInformation("Complete Cleanup Preview:");
             logger.LogInformation("============================");
             logger.LogInformation("WARNING: ALL RESOURCES WILL BE DELETED:");
-            if (!string.IsNullOrEmpty(config.AgentBlueprintId))
+            if (!string.IsNullOrWhiteSpace(config.AgentBlueprintId))
                 logger.LogInformation("    Blueprint Application: {BlueprintId}", config.AgentBlueprintId);
-            if (!string.IsNullOrEmpty(config.AgenticAppId))
+            if (!string.IsNullOrWhiteSpace(config.AgenticAppId))
                 logger.LogInformation("    Agent Identity Application: {IdentityId}", config.AgenticAppId);
-            if (!string.IsNullOrEmpty(config.AgenticUserId))
+            if (!string.IsNullOrWhiteSpace(config.AgenticUserId))
                 logger.LogInformation("    Agent User: {UserId}", config.AgenticUserId);
-            if (!string.IsNullOrEmpty(config.WebAppName))
+            if (!string.IsNullOrWhiteSpace(config.WebAppName))
                 logger.LogInformation("    Web App: {WebAppName}", config.WebAppName);
-            if (!string.IsNullOrEmpty(config.AppServicePlanName))
+            if (!string.IsNullOrWhiteSpace(config.AppServicePlanName))
                 logger.LogInformation("    App Service Plan: {PlanName}", config.AppServicePlanName);
-            if (!string.IsNullOrEmpty(config.BotName))
+            if (!string.IsNullOrWhiteSpace(config.BotName))
                 logger.LogInformation("    Azure Messaging Endpoint: {BotName}", config.BotName);
-            if (!string.IsNullOrEmpty(config.Location))
+            if (!string.IsNullOrWhiteSpace(config.Location))
                 logger.LogInformation("    Location: {Location}", config.Location);
             logger.LogInformation("    Generated configuration file");
             logger.LogInformation("");
@@ -452,7 +448,7 @@ private static async Task ExecuteAllCleanupAsync(
             logger.LogInformation("Starting complete cleanup...");
 
             // 1. Delete agent blueprint application
-            if (!string.IsNullOrEmpty(config.AgentBlueprintId))
+            if (!string.IsNullOrWhiteSpace(config.AgentBlueprintId))
             {
                 logger.LogInformation("Deleting agent blueprint application...");
                 var deleted = await agentBlueprintService.DeleteAgentBlueprintAsync(
@@ -472,7 +468,7 @@ private static async Task ExecuteAllCleanupAsync(
             }
 
             // 2. Delete agent identity application
-            if (!string.IsNullOrEmpty(config.AgenticAppId))
+            if (!string.IsNullOrWhiteSpace(config.AgenticAppId))
             {
                 logger.LogInformation("Deleting agent identity application...");
 
@@ -493,45 +489,25 @@ private static async Task ExecuteAllCleanupAsync(
             }
 
             // 3. Delete agent user
-            if (!string.IsNullOrEmpty(config.AgenticUserId))
+            if (!string.IsNullOrWhiteSpace(config.AgenticUserId))
             {
                 logger.LogInformation("Deleting agent user...");
                 await executor.ExecuteAsync("az", $"ad user delete --id {config.AgenticUserId}", null, true, false, CancellationToken.None);
                 logger.LogInformation("Agent user deleted");
             }
 
-            // 4. Delete bot messaging endpoint
-            if (!string.IsNullOrEmpty(config.BotName))
+            // 4. Delete bot messaging endpoint using shared helper
+            if (!string.IsNullOrWhiteSpace(config.BotName))
             {
-                logger.LogInformation("Deleting messaging endpoint registration...");
-                if (string.IsNullOrEmpty(config.AgentBlueprintId))
+                var endpointDeleted = await DeleteMessagingEndpointAsync(logger, config, botConfigurator);
+                if (!endpointDeleted)
                 {
-                    logger.LogError("Agent Blueprint ID not found. Agent Blueprint ID is required for deleting endpoint registration.");
                     hasFailures = true;
                 }
-                else
-                {
-                    var endpointName = EndpointHelper.GetEndpointName(config.BotName);
-
-                    var endpointDeleted = await botConfigurator.DeleteEndpointWithAgentBlueprintAsync(
-                        endpointName,
-                        config.Location,
-                        config.AgentBlueprintId);
-
-                    if (endpointDeleted)
-                    {
-                        logger.LogInformation("Messaging endpoint deleted successfully");
-                    }
-                    else
-                    {
-                        logger.LogWarning("Failed to delete messaging endpoint");
-                        hasFailures = true;
-                    }
-                }
             }
 
             // 5. Delete Azure resources (Web App and App Service Plan)
-            if (!string.IsNullOrEmpty(config.WebAppName) && !string.IsNullOrEmpty(config.ResourceGroup))
+            if (!string.IsNullOrWhiteSpace(config.WebAppName) && !string.IsNullOrWhiteSpace(config.ResourceGroup))
             {
                 logger.LogInformation("Deleting Azure resources...");
 
@@ -562,7 +538,7 @@ private static async Task ExecuteAllCleanupAsync(
                 }
 
                 // Delete App Service Plan after web app is gone (with retry for conflicts)
-                if (!string.IsNullOrEmpty(config.AppServicePlanName))
+                if (!string.IsNullOrWhiteSpace(config.AppServicePlanName))
                 {
                     logger.LogInformation("Deleting App Service Plan: {PlanName}...", config.AppServicePlanName);
 
@@ -663,6 +639,107 @@ private static async Task ExecuteAllCleanupAsync(
         }
     }
 
+    /// <summary>
+    /// Shared helper method to delete a messaging endpoint.
+    /// Validates configuration, gets endpoint name, and calls the bot configurator to delete.
+    /// </summary>
+    /// <param name="logger">Logger instance for diagnostic messages</param>
+    /// <param name="config">Configuration containing endpoint and blueprint information</param>
+    /// <param name="botConfigurator">Bot configurator service for endpoint operations</param>
+    /// <returns>True if endpoint was deleted successfully; false otherwise</returns>
+    private static async Task<bool> DeleteMessagingEndpointAsync(
+        ILogger<CleanupCommand> logger,
+        Agent365Config config,
+        IBotConfigurator botConfigurator)
+    {
+        // Check if there's actually an endpoint to clean up
+        if (string.IsNullOrWhiteSpace(config.BotName))
+        {
+            logger.LogInformation("No messaging endpoint found in configuration");
+            return true; // No endpoint to delete = success
+        }
+
+        // Check if blueprint ID exists (required for endpoint deletion)
+        if (string.IsNullOrWhiteSpace(config.AgentBlueprintId))
+        {
+            logger.LogError("Agent Blueprint ID not found. Agent Blueprint ID is required for deleting endpoint registration.");
+            return false;
+        }
+
+        logger.LogInformation("Deleting messaging endpoint registration...");
+        var endpointName = EndpointHelper.GetEndpointName(config.BotName);
+
+        var endpointDeleted = await botConfigurator.DeleteEndpointWithAgentBlueprintAsync(
+            endpointName,
+            config.Location,
+            config.AgentBlueprintId);
+
+        if (endpointDeleted)
+        {
+            logger.LogInformation("Messaging endpoint deleted successfully");
+            return true;
+        }
+        else
+        {
+            logger.LogWarning("Failed to delete messaging endpoint");
+            return false;
+        }
+    }
+
+    /// <summary>
+    /// Executes endpoint-only cleanup - deletes the messaging endpoint while preserving the blueprint application
+    /// </summary>
+    private static async Task ExecuteEndpointOnlyCleanupAsync(
+        ILogger<CleanupCommand> logger,
+        Agent365Config config,
+        IBotConfigurator botConfigurator)
+    {
+        logger.LogInformation("Starting endpoint-only cleanup...");
+        
+        // Check if there's actually an endpoint to clean up
+        if (string.IsNullOrWhiteSpace(config.BotName))
+        {
+            logger.LogInformation("No messaging endpoint found to clean up");
+            return;
+        }
+
+        // Check if blueprint ID exists (required for endpoint deletion)
+        if (string.IsNullOrWhiteSpace(config.AgentBlueprintId))
+        {
+            logger.LogError("Agent Blueprint ID not found. Blueprint ID is required for endpoint deletion.");
+            logger.LogInformation("Please ensure blueprint is configured before attempting endpoint cleanup.");
+            return;
+        }
+
+        logger.LogInformation("");
+        logger.LogInformation("Endpoint Cleanup Preview:");
+        logger.LogInformation("============================");
+        logger.LogInformation("Will delete messaging endpoint:");
+        logger.LogInformation("  Endpoint Name: {BotName}", config.BotName);
+        logger.LogInformation("  Location: {Location}", config.Location);
+        logger.LogInformation("");
+
+        Console.Write("Continue with endpoint cleanup? (y/N): ");
+        var response = Console.ReadLine()?.Trim().ToLowerInvariant();
+        if (response != "y" && response != "yes")
+        {
+            logger.LogInformation("Cleanup cancelled by user");
+            return;
+        }
+
+        // Use shared helper to delete the endpoint
+        var deleted = await DeleteMessagingEndpointAsync(logger, config, botConfigurator);
+        
+        if (!deleted)
+        {
+            return;
+        }
+
+        logger.LogInformation("");
+        logger.LogInformation("Endpoint cleanup completed successfully!");
+        logger.LogInformation("");
+    }
+
     private static async Task<Agent365Config?> LoadConfigAsync(
         FileInfo? configFile,
         ILogger<CleanupCommand> logger,

src/Microsoft.Agents.A365.DevTools.Cli/Commands/SetupSubcommands/BlueprintSubcommand.cs

@@ -174,7 +174,7 @@ await RegisterEndpointAndSyncAsync(
                     logger.LogError(ex, "Endpoint registration failed: {Message}", ex.Message);
                     logger.LogError("");
                     logger.LogError("To resolve this issue:");
-                    logger.LogError("  1. If endpoint already exists, delete it: a365 cleanup azure");
+                    logger.LogError("  1. If endpoint already exists, delete it: a365 cleanup blueprint --endpoint-only");
                     logger.LogError("  2. Verify your messaging endpoint configuration in a365.config.json");
                     logger.LogError("  3. Try registration again: a365 setup blueprint --endpoint-only");
                     Environment.Exit(1);