fix: Forward slash shown in rules list in multi-root workspaces on windows (aws#1855)

* fix: forward slash shown in rules list windows muti root workspace

* fix: switch map to some

* test: add unit tests

* fix: send "thinking" in assistant response for pinned context

Author: avi-alpert

server/aws-lsp-codewhisperer/src/language-server/agenticChat/agenticChatController.ts

@@ -715,9 +715,12 @@ export class AgenticChatController implements ChatHandlers {
                 params.tabId,
                 params.context
             )
-            // Add active file to context list if it exists
+            // Add active file to context list if it's not already there
             const activeFile =
-                triggerContext.text && triggerContext.relativeFilePath && triggerContext.activeFilePath
+                triggerContext.text &&
+                triggerContext.relativeFilePath &&
+                triggerContext.activeFilePath &&
+                !additionalContext.some(item => item.path === triggerContext.activeFilePath)
                     ? [
                           {
                               name: path.basename(triggerContext.relativeFilePath),

server/aws-lsp-codewhisperer/src/language-server/agenticChat/context/additionalContextProvider.test.ts

@@ -531,7 +531,7 @@ describe('AdditionalContextProvider', () => {
                 assert.strictEqual(result.length, 2)
                 assert.strictEqual(result[0].userInputMessage?.content?.includes('<promptInstruction>'), true)
                 assert.strictEqual(result[0].userInputMessage?.content?.includes('Follow this rule'), true)
-                assert.strictEqual(result[1].assistantResponseMessage?.content, '')
+                assert.strictEqual(result[1].assistantResponseMessage?.content, 'Thinking...')
             })
 
             it('should convert file context to fileContext XML', async () => {
@@ -615,4 +615,78 @@ describe('AdditionalContextProvider', () => {
             })
         })
     })
+
+    describe('convertRulesToRulesFolders', () => {
+        it('should convert workspace rules to folders structure', () => {
+            sinon.stub(workspaceUtils, 'getWorkspaceFolderPaths').returns(['/workspace'])
+
+            // Configure the getRules stub to return a specific value
+            ;(chatHistoryDb.getRules as sinon.SinonStub).returns({
+                folders: {}, // Empty folders state (default all active)
+                rules: {}, // Empty rules state (default all active)
+            })
+
+            const workspaceRules = [
+                {
+                    workspaceFolder: '/workspace',
+                    type: 'file' as any,
+                    relativePath: '.amazonq/rules/rule1.md',
+                    id: '/workspace/.amazonq/rules/rule1.md',
+                },
+                {
+                    workspaceFolder: '/workspace',
+                    type: 'file' as any,
+                    relativePath: '.amazonq/rules/rule2.md',
+                    id: '/workspace/.amazonq/rules/rule2.md',
+                },
+            ]
+
+            const result = provider.convertRulesToRulesFolders(workspaceRules, 'tab1')
+
+            assert.strictEqual(result.length, 1)
+            assert.strictEqual(result[0].folderName, '.amazonq/rules')
+            assert.strictEqual(result[0].active, true)
+            assert.strictEqual(result[0].rules.length, 2)
+            assert.strictEqual(result[0].rules[0].name, 'rule1')
+            assert.strictEqual(result[0].rules[1].name, 'rule2')
+        })
+
+        it('should handle rules with explicit active/inactive states', () => {
+            sinon.stub(workspaceUtils, 'getWorkspaceFolderPaths').returns(['/workspace'])
+
+            // Configure the getRules stub to return specific active/inactive states
+            ;(chatHistoryDb.getRules as sinon.SinonStub).returns({
+                folders: {
+                    '.amazonq/rules': false, // This folder is explicitly inactive
+                },
+                rules: {
+                    '/workspace/.amazonq/rules/rule1.md': true, // This rule is explicitly active
+                    '/workspace/.amazonq/rules/rule2.md': false, // This rule is explicitly inactive
+                },
+            })
+
+            const workspaceRules = [
+                {
+                    workspaceFolder: '/workspace',
+                    type: 'file' as any,
+                    relativePath: '.amazonq/rules/rule1.md',
+                    id: '/workspace/.amazonq/rules/rule1.md',
+                },
+                {
+                    workspaceFolder: '/workspace',
+                    type: 'file' as any,
+                    relativePath: '.amazonq/rules/rule2.md',
+                    id: '/workspace/.amazonq/rules/rule2.md',
+                },
+            ]
+
+            const result = provider.convertRulesToRulesFolders(workspaceRules, 'tab1')
+
+            assert.strictEqual(result.length, 1)
+            assert.strictEqual(result[0].folderName, '.amazonq/rules')
+            assert.strictEqual(result[0].active, 'indeterminate') // Should be indeterminate since rules have mixed states
+            assert.strictEqual(result[0].rules[0].active, true) // Explicitly set to true
+            assert.strictEqual(result[0].rules[1].active, false) // Explicitly set to false
+        })
+    })
 })

server/aws-lsp-codewhisperer/src/language-server/agenticChat/context/additionalContextProvider.ts

@@ -177,7 +177,8 @@ export class AdditionalContextProvider {
         if (prompt.filePath.endsWith(promptFileExtension)) {
             if (
                 pathUtils.isInDirectory(path.join('.amazonq', 'rules'), prompt.relativePath) ||
-                path.basename(prompt.relativePath) === 'AmazonQ.md'
+                path.basename(prompt.relativePath) === 'AmazonQ.md' ||
+                path.basename(prompt.relativePath) === 'README.md'
             ) {
                 return 'rule'
             } else if (pathUtils.isInDirectory(getUserPromptsDirectory(), prompt.filePath)) {
@@ -589,7 +590,7 @@ export class AdditionalContextProvider {
         this.sendPinnedContext(params.tabId)
     }
 
-    private convertRulesToRulesFolders(workspaceRules: ContextCommandItem[], tabId: string): RulesFolder[] {
+    convertRulesToRulesFolders(workspaceRules: ContextCommandItem[], tabId: string): RulesFolder[] {
         // Check if there's only one workspace folder
         const workspaceFolders = workspaceUtils.getWorkspaceFolderPaths(this.features.workspace)
         const isSingleWorkspace = workspaceFolders.length <= 1
@@ -616,7 +617,11 @@ export class AdditionalContextProvider {
                 // Root files will use the workspace folder name
                 // Subdir files will use workspace folder name + subdir
                 const workspaceFolderName = path.basename(rule.workspaceFolder)
-                folderName = dirPath === '.' ? workspaceFolderName : `${workspaceFolderName}/${dirPath}`
+                folderName =
+                    dirPath === '.'
+                        ? workspaceFolderName
+                        : // Escape backslashes since folderName is displayed in innerHTML
+                          path.join(workspaceFolderName, dirPath).replace(/\\/g, '\\\\')
             }
 
             // Get or create the folder's rule list
@@ -760,7 +765,7 @@ export class AdditionalContextProvider {
         // Create fake assistant response
         const assistantMessage: ChatMessage = {
             assistantResponseMessage: {
-                content: '',
+                content: 'Thinking...',
             },
         }