Merge master into feature/q-utg

Author: aws-toolkit-automation

packages/core/src/codewhispererChat/controllers/chat/controller.ts

@@ -881,23 +881,23 @@ export class ChatController {
     /**
      * @returns A Uri array of prompt files in each workspace root's .amazonq/rules directory
      */
-    private async collectWorkspaceRules(): Promise<vscode.Uri[]> {
-        const rulesFiles: vscode.Uri[] = []
+    private async collectWorkspaceRules(): Promise<string[]> {
+        const rulesFiles: string[] = []
 
         if (!vscode.workspace.workspaceFolders) {
             return rulesFiles
         }
 
         for (const folder of vscode.workspace.workspaceFolders) {
-            const rulesPath = vscode.Uri.joinPath(folder.uri, '.amazonq', 'rules')
+            const rulesPath = path.join(folder.uri.fsPath, '.amazonq', 'rules')
             const folderExists = await fs.exists(rulesPath)
 
             if (folderExists) {
                 const entries = await fs.readdir(rulesPath)
 
                 for (const [name, type] of entries) {
                     if (type === vscode.FileType.File && name.endsWith(promptFileExtension)) {
-                        rulesFiles.push(vscode.Uri.joinPath(rulesPath, name))
+                        rulesFiles.push(path.join(rulesPath, name))
                     }
                 }
             }
@@ -918,11 +918,12 @@ export class ChatController {
         if (workspaceRules.length > 0) {
             contextCommands.push(
                 ...workspaceRules.map((rule) => {
-                    const workspaceFolderPath = vscode.workspace.getWorkspaceFolder(rule)?.uri?.path || ''
+                    const workspaceFolderPath =
+                        vscode.workspace.getWorkspaceFolder(vscode.Uri.parse(rule))?.uri?.path || ''
                     return {
                         workspaceFolder: workspaceFolderPath,
                         type: 'file' as ContextCommandItemType,
-                        relativePath: path.relative(workspaceFolderPath, rule.path),
+                        relativePath: path.relative(workspaceFolderPath, rule),
                     }
                 })
             )

packages/core/src/codewhispererChat/controllers/chat/telemetryHelper.ts

@@ -2,6 +2,7 @@
  * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
+import * as path from 'path'
 import { UserIntent } from '@amzn/codewhisperer-streaming'
 import {
     AmazonqAddMessage,
@@ -147,7 +148,7 @@ export class CWCTelemetryHelper {
     }
 
     public getContextType(prompt: AdditionalContextPrompt): string {
-        if (prompt.relativePath.startsWith('.amazonq/rules')) {
+        if (prompt.relativePath.startsWith(path.join('.amazonq', 'rules'))) {
             return 'rule'
         } else if (prompt.filePath.startsWith(getUserPromptsDirectory())) {
             return 'prompt'