Merge branch 'main' into optimize-auth-record-export

Author: bwateratmsft

package-lock.json

@@ -944,7 +944,7 @@
     "dependencies": {
         "@azure/arm-resources": "^5.2.0",
         "@azure/arm-resources-profile-2020-09-01-hybrid": "^2.1.0",
-        "@microsoft/vscode-azext-azureauth": "^5.1.0",
+        "@microsoft/vscode-azext-azureauth": "^5.1.1",
         "@microsoft/vscode-azext-azureutils": "^4.0.0",
         "@microsoft/vscode-azext-utils": "^4.0.0",
         "buffer": "^6.0.3",

package.json

@@ -20,7 +20,7 @@ export async function askAgentAboutActivityLog(context: IActionContext, item?: A
     } else {
         const treeItems: TreeDataItem[] = await ext.activityLogTree.getChildren() ?? [];
 
-        if (treeItems.length > 1) {
+        if (treeItems.length) {
             const selectedItems = await context.ui.showQuickPick(
                 treeItems.map(item => {
                     return {

src/chat/askAgentAboutActivityLog/askAgentAboutActivityLog.ts

@@ -38,6 +38,7 @@ export class GetAzureActivityLog implements AzExtLMTool<void> {
 
         return new vscode.LanguageModelToolResult([
             new vscode.LanguageModelTextPart('When explaining data from activity items, prefer explaining the data more conversationally rather than re-providing the raw json data.'),
+            new vscode.LanguageModelTextPart('The activities provided are in chronological order.'),
             ...selectedActivityItems.map(item => new vscode.LanguageModelTextPart(JSON.stringify(item))),
         ]);
     }

src/chat/tools/GetAzureActivityLog/GetAzureActivityLog.ts

@@ -55,20 +55,20 @@ export abstract class ResourceTreeDataProviderBase extends vscode.Disposable imp
         } else {
             if (!this.subscriptionProvider) {
                 this.subscriptionProvider = await ext.subscriptionProviderFactory();
-            }
 
-            if (!inCloudShell()) {
-                // Only outside of Cloud Shell will we monitor for ongoing session changes
-                // Inside we must avoid due to https://github.com/microsoft/vscode-dev/issues/1334
-                const one = this.subscriptionProvider.onDidSignIn(() => {
-                    this.notifyTreeDataChanged();
-                });
+                if (!inCloudShell()) {
+                    // Only outside of Cloud Shell will we monitor for ongoing session changes
+                    // Inside we must avoid due to https://github.com/microsoft/vscode-dev/issues/1334
+                    const one = this.subscriptionProvider.onDidSignIn(() => {
+                        this.notifyTreeDataChanged();
+                    });
 
-                const two = this.subscriptionProvider.onDidSignOut(() => {
-                    this.notifyTreeDataChanged();
-                });
+                    const two = this.subscriptionProvider.onDidSignOut(() => {
+                        this.notifyTreeDataChanged();
+                    });
 
-                this.statusSubscription = vscode.Disposable.from(one, two);
+                    this.statusSubscription = vscode.Disposable.from(one, two);
+                }
             }
 
             return this.subscriptionProvider;