address copilot comments

Author: blva

src/tools/atlas/connect/connectCluster.ts

@@ -310,9 +310,19 @@ export class ConnectClusterTool extends AtlasToolBase {
         result: CallToolResult,
         args: Parameters<ToolCallback<typeof this.argsShape>>
     ): ConnectionMetadata {
+        const parentMetadata = super.resolveTelemetryMetadata(result, ...args);
+        const connectionMetadata = this.getConnectionInfoMetadata();
+        // Explicitly merge, preferring parentMetadata for known overlapping keys (project_id, org_id)
+        // since parent has more complete information from tool arguments
+        const { project_id, org_id, ...restConnectionMetadata } = connectionMetadata;
+        const finalProjectId = parentMetadata.project_id ?? project_id;
+        const finalOrgId = parentMetadata.org_id ?? org_id;
         return {
-            ...super.resolveTelemetryMetadata(result, ...args),
-            ...this.getConnectionInfoMetadata(),
+            ...parentMetadata,
+            ...restConnectionMetadata,
+            // Only include project_id and org_id if they are defined
+            ...(finalProjectId !== undefined && { project_id: finalProjectId }),
+            ...(finalOrgId !== undefined && { org_id: finalOrgId }),
         };
     }
 }

src/tools/atlasLocal/connect/connectDeployment.ts

@@ -37,9 +37,19 @@ export class ConnectDeploymentTool extends AtlasLocalToolBase {
     }
 
     protected override resolveTelemetryMetadata(result: CallToolResult): ConnectionMetadata {
+        const parentMetadata = super.resolveTelemetryMetadata(result);
+        const connectionMetadata = this.getConnectionInfoMetadata();
+        // Explicitly merge, preferring parentMetadata for known overlapping keys (project_id, org_id)
+        // since parent has deployment-specific information
+        const { project_id, org_id, ...restConnectionMetadata } = connectionMetadata;
+        const finalProjectId = parentMetadata.project_id ?? project_id;
+        const finalOrgId = parentMetadata.org_id ?? org_id;
         return {
-            ...super.resolveTelemetryMetadata(result),
-            ...this.getConnectionInfoMetadata(),
+            ...parentMetadata,
+            ...restConnectionMetadata,
+            // Only include project_id and org_id if they are defined
+            ...(finalProjectId !== undefined && { project_id: finalProjectId }),
+            ...(finalOrgId !== undefined && { org_id: finalOrgId }),
         };
     }
 }