fix: maintain connections after a connection move. clusterId and treeId are now separate

.github/copilot-instructions.md

@@ -92,6 +92,43 @@ src/commands/yourCommand/
 - Use VS Code's secure storage for credentials
 - Validate all user inputs
 
+## Cluster ID Architecture (Dual ID Pattern)
+
+> ⚠️ **CRITICAL**: Using the wrong ID causes silent bugs that only appear when users move connections between folders.
+
+Cluster models have **two distinct ID properties** with different purposes:
+
+| Property    | Purpose                          | Stable?                   | Use For                             |
+| ----------- | -------------------------------- | ------------------------- | ----------------------------------- |
+| `treeId`    | VS Code TreeView element path    | ❌ Changes on folder move | `this.id`, child item paths         |
+| `clusterId` | Cache key (credentials, clients) | ✅ Always stable          | `CredentialCache`, `ClustersClient` |
+
+### Quick Reference
+
+```typescript
+// ✅ Tree element identification
+this.id = cluster.treeId;
+
+// ✅ Cache operations - ALWAYS use clusterId
+CredentialCache.hasCredentials(cluster.clusterId);
+ClustersClient.getClient(cluster.clusterId);
+
+// ❌ WRONG - breaks when connection moves to a folder
+CredentialCache.hasCredentials(this.id); // BUG!
+```
+
+### Model Types
+
+- **`ConnectionClusterModel`** - Connections View (has `storageId`)
+- **`AzureClusterModel`** - Azure/Discovery Views (has `azureResourceId`)
+- **`BaseClusterModel`** - Shared interface (use for generic code)
+
+For Discovery View, both `treeId` and `clusterId` are sanitized (all `/` replaced with `_`). The original Azure Resource ID is stored in `AzureClusterModel.azureResourceId` for Azure API calls.
+
+> 💡 **Extensibility**: If adding a non-Azure discovery source (e.g., AWS, GCP), consider creating a new model type (e.g., `AwsClusterModel`) extending `BaseClusterModel` with source-specific metadata.
+
+See `src/tree/models/BaseClusterModel.ts` and `docs/analysis/08-cluster-model-simplification-plan.md` for details.
+
 ## Additional Patterns
 
 For detailed patterns, see:

l10n/bundle.l10n.json

@@ -92,6 +92,7 @@
   "{0} replaced": "{0} replaced",
   "{0} skipped": "{0} skipped",
   "{0} subfolders": "{0} subfolders",
+  "{0} task(s) are using connections being moved. Check the Output panel for details.": "{0} task(s) are using connections being moved. Check the Output panel for details.",
   "{0} task(s) are using connections in this folder. Check the Output panel for details.": "{0} task(s) are using connections in this folder. Check the Output panel for details.",
   "{0} tenants available ({1} signed in)": "{0} tenants available ({1} signed in)",
   "{0} was stopped": "{0} was stopped",
@@ -212,10 +213,11 @@
   "Cannot {0}": "Cannot {0}",
   "Cannot copy collection to itself": "Cannot copy collection to itself",
   "Cannot delete folder \"{0}\". The following {1} task(s) are using connections within this folder:": "Cannot delete folder \"{0}\". The following {1} task(s) are using connections within this folder:",
+  "Cannot move {0} {1}. The following {2} task(s) are using connections being moved:": "Cannot move {0} {1}. The following {2} task(s) are using connections being moved:",
   "Cannot start task in state: {0}": "Cannot start task in state: {0}",
   "Change page size": "Change page size",
   "Changelog": "Changelog",
-  "Checking for naming conflicts…": "Checking for naming conflicts…",
+  "Checking for conflicts…": "Checking for conflicts…",
   "Choose a cluster…": "Choose a cluster…",
   "Choose a different folder": "Choose a different folder",
   "Choose a RU cluster…": "Choose a RU cluster…",
@@ -338,6 +340,7 @@
   "detailed execution analysis": "detailed execution analysis",
   "Disable TLS/SSL (Not recommended)": "Disable TLS/SSL (Not recommended)",
   "Disable TLS/SSL checks when connecting.": "Disable TLS/SSL checks when connecting.",
+  "Discovery plugin error: clusterId \"{0}\" must start with provider ID \"{1}\". Plugin \"{2}\" must prefix clusterId with its provider ID.": "Discovery plugin error: clusterId \"{0}\" must start with provider ID \"{1}\". Plugin \"{2}\" must prefix clusterId with its provider ID.",
   "Do not rely on case to distinguish between databases. For example, you cannot use two databases with names like, salesData and SalesData.": "Do not rely on case to distinguish between databases. For example, you cannot use two databases with names like, salesData and SalesData.",
   "Do not save credentials.": "Do not save credentials.",
   "Do you want to include the password in the connection string?": "Do you want to include the password in the connection string?",
@@ -600,6 +603,8 @@
   "Invalid sort syntax: {0}. Please use valid JSON, for example: { \"fieldName\": 1 }": "Invalid sort syntax: {0}. Please use valid JSON, for example: { \"fieldName\": 1 }",
   "It could be better": "It could be better",
   "It looks like there aren't any other folders to move these items into.\nYou might want to create a new folder first.\n\nNote: You can't move items between 'DocumentDB Local' and regular connections.": "It looks like there aren't any other folders to move these items into.\nYou might want to create a new folder first.\n\nNote: You can't move items between 'DocumentDB Local' and regular connections.",
+  "item": "item",
+  "items": "items",
   "JSON View": "JSON View",
   "Keep-alive timeout exceeded": "Keep-alive timeout exceeded",
   "Keep-alive timeout exceeded: stream has been running for {0} seconds (limit: {1} seconds)": "Keep-alive timeout exceeded: stream has been running for {0} seconds (limit: {1} seconds)",
@@ -678,7 +683,7 @@
   "No collection selected.": "No collection selected.",
   "No commands found in this document.": "No commands found in this document.",
   "No Connectivity": "No Connectivity",
-  "No credentials found for id {credentialId}": "No credentials found for id {credentialId}",
+  "No credentials found for id {clusterId}": "No credentials found for id {clusterId}",
   "No credentials found for the selected cluster.": "No credentials found for the selected cluster.",
   "No folder selected.": "No folder selected.",
   "No index changes needed at this time.": "No index changes needed at this time.",

src/commands/chooseDataMigrationExtension/chooseDataMigrationExtension.ts

@@ -109,13 +109,13 @@ export async function chooseDataMigrationExtension(context: IActionContext, node
                 // We should allow whitelisting extensions trusted by the user to avoid repeated prompts.
                 // This could be done on our own but available for the user to edit in settings.
                 const parsedCS_WithCredentials = new DocumentDBConnectionString(credentials.connectionString);
-                parsedCS_WithCredentials.username = CredentialCache.getConnectionUser(node.cluster.id) ?? '';
-                parsedCS_WithCredentials.password = CredentialCache.getConnectionPassword(node.cluster.id) ?? '';
+                parsedCS_WithCredentials.username = CredentialCache.getConnectionUser(node.cluster.clusterId) ?? '';
+                parsedCS_WithCredentials.password = CredentialCache.getConnectionPassword(node.cluster.clusterId) ?? '';
 
                 const options = {
                     connectionString: parsedCS_WithCredentials.toString(),
                     extendedProperties: {
-                        clusterId: node.cluster.id,
+                        clusterId: node.cluster.clusterId,
                     },
                 };
 
@@ -207,7 +207,7 @@ export async function chooseDataMigrationExtension(context: IActionContext, node
  * @returns Promise<boolean> - true if authentication succeeded, false otherwise
  */
 async function ensureAuthentication(_context: IActionContext, _node: ClusterItemBase): Promise<boolean> {
-    if (CredentialCache.hasCredentials(_node.cluster.id)) {
+    if (CredentialCache.hasCredentials(_node.cluster.clusterId)) {
         return Promise.resolve(true); // Credentials already exist, no need to authenticate again
     }
 

src/commands/connections-view/deleteFolder/VerifyStep.ts → src/commands/connections-view/deleteFolder/VerifyNoConflictsStep.ts

@@ -5,21 +5,15 @@
 
 import { AzureWizardPromptStep, UserCancelledError, type IAzureQuickPickItem } from '@microsoft/vscode-azext-utils';
 import * as l10n from '@vscode/l10n';
-import { ext } from '../../../extensionVariables';
 import { ConnectionStorageService, ItemType } from '../../../services/connectionStorageService';
-import { TaskService } from '../../../services/taskService/taskService';
+import {
+    enumerateConnectionsInFolder,
+    findConflictingTasks,
+    logTaskConflicts,
+    VerificationCompleteError,
+} from '../verificationUtils';
 import { type DeleteFolderWizardContext } from './DeleteFolderWizardContext';
 
-/**
- * Custom error to signal that conflict verification completed with no conflicts
- */
-class VerificationCompleteError extends Error {
-    constructor() {
-        super('Conflict verification completed successfully');
-        this.name = 'VerificationCompleteError';
-    }
-}
-
 type ConflictAction = 'exit';
 
 /**
@@ -31,7 +25,7 @@ type ConflictAction = 'exit';
  * If conflicts are found, the user is informed and can only exit.
  * Uses a loading UI while checking.
  */
-export class VerifyStep extends AzureWizardPromptStep<DeleteFolderWizardContext> {
+export class VerifyNoConflictsStep extends AzureWizardPromptStep<DeleteFolderWizardContext> {
     public async prompt(context: DeleteFolderWizardContext): Promise<void> {
         try {
             // Use QuickPick with loading state while verifying
@@ -61,40 +55,15 @@ export class VerifyStep extends AzureWizardPromptStep<DeleteFolderWizardContext>
      * If conflicts: returns options for user to exit.
      */
     private async verifyAndCount(context: DeleteFolderWizardContext): Promise<IAzureQuickPickItem<ConflictAction>[]> {
-        context.conflictingTasks = [];
-
         // Count all folders and connections that will be deleted
         const counts = await this.countDescendants(context, context.folderItem.storageId);
         context.foldersToDelete = counts.folders + 1; // +1 for the folder itself
         context.connectionsToDelete = counts.connections;
 
-        // Get all resources used by active tasks
-        const allUsedResources = TaskService.getAllUsedResources();
-
-        // The folder's tree ID serves as a prefix for all connections within it
-        // Connection tree IDs follow the pattern: parentTreeId/storageId
-        // So any connection in this folder will have an ID starting with folderItem.id + "/"
-        const folderTreeIdPrefix = context.folderItem.id + '/';
-
-        // Check each task's resources to see if any connectionId starts with our folder prefix
-        for (const { task, resources } of allUsedResources) {
-            for (const resource of resources) {
-                if (resource.connectionId && resource.connectionId.startsWith(folderTreeIdPrefix)) {
-                    context.conflictingTasks.push(task);
-                    break; // Only need to add task once, even if it uses multiple connections in the folder
-                }
-            }
-        }
-
-        // De-duplicate tasks (in case the same task was added multiple times)
-        const uniqueTaskIds = new Set<string>();
-        context.conflictingTasks = context.conflictingTasks.filter((task) => {
-            if (uniqueTaskIds.has(task.taskId)) {
-                return false;
-            }
-            uniqueTaskIds.add(task.taskId);
-            return true;
-        });
+        // Enumerate all connection IDs within the folder for conflict checking
+        // This uses storageIds (clusterIds) which are stable identifiers used by tasks
+        const connectionIds = await enumerateConnectionsInFolder(context.folderItem.storageId, context.connectionType);
+        context.conflictingTasks = findConflictingTasks(connectionIds);
 
         // If no conflicts, signal completion and proceed
         if (context.conflictingTasks.length === 0) {
@@ -103,19 +72,14 @@ export class VerifyStep extends AzureWizardPromptStep<DeleteFolderWizardContext>
 
         // Conflicts found - log details to output channel
         const conflictCount = context.conflictingTasks.length;
-
-        ext.outputChannel.appendLog(
+        logTaskConflicts(
             l10n.t(
                 'Cannot delete folder "{0}". The following {1} task(s) are using connections within this folder:',
                 context.folderItem.name,
                 conflictCount.toString(),
             ),
+            context.conflictingTasks,
         );
-        for (const task of context.conflictingTasks) {
-            ext.outputChannel.appendLog(` • ${task.taskName} (${task.taskType})`);
-        }
-        ext.outputChannel.appendLog(l10n.t('Please stop these tasks first before proceeding.'));
-        ext.outputChannel.show();
 
         // Return option for user - can only cancel
         return [