fix(amazonq): use isInDirectory utility

Author: avi-alpert

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

@@ -980,12 +980,12 @@ export class ChatController {
         if (Array.isArray(prompts) && prompts.length > 0) {
             triggerPayload.additionalContextLengths = this.telemetryHelper.getContextLengths(prompts)
             for (const prompt of prompts.slice(0, 20)) {
-                let description = prompt.description
                 // Add system prompt for user prompts and workspace rules
                 const contextType = this.telemetryHelper.getContextType(prompt)
-                if (contextType === 'rule' || contextType === 'prompt') {
-                    description = `You must follow the instructions in ${prompt.relativePath}. Below are lines ${prompt.startLine}-${prompt.endLine} of this file:\n`
-                }
+                const description =
+                    contextType === 'rule' || contextType === 'prompt'
+                        ? `You must follow the instructions in ${prompt.relativePath}. Below are lines ${prompt.startLine}-${prompt.endLine} of this file:\n`
+                        : prompt.description
                 const entry = {
                     name: prompt.name.substring(0, aditionalContentNameLimit),
                     description: description.substring(0, aditionalContentNameLimit),

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

@@ -43,6 +43,7 @@ import { getSelectedCustomization } from '../../../codewhisperer/util/customizat
 import { undefinedIfEmpty } from '../../../shared/utilities/textUtilities'
 import { AdditionalContextPrompt } from '../../../amazonq/lsp/types'
 import { getUserPromptsDirectory, promptFileExtension } from '../../constants'
+import { isInDirectory } from '../../../shared/filesystemUtilities'
 
 export function logSendTelemetryEventFailure(error: any) {
     let requestId: string | undefined
@@ -149,9 +150,9 @@ export class CWCTelemetryHelper {
 
     public getContextType(prompt: AdditionalContextPrompt): string {
         if (prompt.filePath.endsWith(promptFileExtension)) {
-            if (prompt.relativePath.startsWith(path.join('.amazonq', 'rules'))) {
+            if (isInDirectory(path.join('.amazonq', 'rules'), prompt.relativePath)) {
                 return 'rule'
-            } else if (prompt.filePath.startsWith(getUserPromptsDirectory())) {
+            } else if (isInDirectory(getUserPromptsDirectory(), prompt.filePath)) {
                 return 'prompt'
             }
         }