fix: refresh prompt list when project prompt is added (#16)

* fix: refresh prompt list when project prompt is added

* fix: validate length and size of additionalContents

* fix: truncate additionalContents based on api validation limits

* fix: move constants

Author: avi-alpert

packages/core/src/amazonq/lsp/lspController.ts

@@ -61,7 +61,7 @@ export interface Manifest {
         targets: Target[]
     }[]
 }
-const manifestUrl = 'https://ducvaeoffl85c.cloudfront.net/manifest-0.1.39.json'
+const manifestUrl = 'https://aws-toolkit-language-servers.amazonaws.com/q-context/manifest.json'
 // this LSP client in Q extension is only going to work with these LSP server versions
 const supportedLspServerVersions = ['0.1.39']
 

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

@@ -121,6 +121,12 @@ export interface ChatControllerMessageListeners {
     readonly processFileClick: MessageListener<FileClick>
 }
 
+const promptFileExtension = '.prompt'
+
+const additionalContentInnerContextLimit = 8192
+
+const aditionalContentNameLimit = 1024
+
 export class ChatController {
     private readonly sessionStorage: ChatSessionStorage
     private readonly triggerEventsStorage: TriggerEventsStorage
@@ -450,55 +456,31 @@ export class ChatController {
                 commands: [{ command: commandName, description: commandDescription }],
             })
         }
-
-        const lspClientReady = await LspClient.instance.waitUntilReady()
-        if (!lspClientReady) {
-            return
-        }
-        const contextCommandItems = await LspClient.instance.getContextCommandItems()
-        const folderCmd: QuickActionCommand = contextCommand[0].commands?.[1]
-        const filesCmd: QuickActionCommand = contextCommand[0].commands?.[2]
         const promptsCmd: QuickActionCommand = contextCommand[0].commands?.[3]
 
-        for (const contextCommandItem of contextCommandItems) {
-            const wsFolderName = path.basename(contextCommandItem.workspaceFolder)
-            if (contextCommandItem.type === 'file') {
-                filesCmd.children?.[0].commands.push({
-                    command: path.basename(contextCommandItem.relativePath),
-                    description: path.join(wsFolderName, contextCommandItem.relativePath),
-                    route: [contextCommandItem.workspaceFolder, contextCommandItem.relativePath],
-                    icon: 'file' as MynahIconsType,
-                })
+        // Check .aws/prompts for prompt files in workspace
+        const workspacePromptFiles = await vscode.workspace.findFiles(`.aws/prompts/*${promptFileExtension}`)
 
-                // If file is a .prompt type, add to prompts list
-                if (contextCommandItem.relativePath.endsWith('.prompt')) {
-                    promptsCmd.children?.[0].commands.push({
-                        command: path.basename(contextCommandItem.relativePath, '.prompt'),
-                        route: [contextCommandItem.workspaceFolder, contextCommandItem.relativePath],
-                        icon: 'magic' as MynahIconsType,
-                    })
-                }
-            } else {
-                folderCmd.children?.[0].commands.push({
-                    command: path.basename(contextCommandItem.relativePath),
-                    description: path.join(wsFolderName, contextCommandItem.relativePath),
-                    route: [contextCommandItem.workspaceFolder, contextCommandItem.relativePath],
-                    icon: 'folder' as MynahIconsType,
-                })
-            }
+        if (workspacePromptFiles.length > 0) {
+            promptsCmd.children?.[0].commands.push(
+                ...workspacePromptFiles.map((file) => ({
+                    command: path.basename(file.path, promptFileExtension),
+                    icon: 'magic' as MynahIconsType,
+                    route: [path.dirname(file.path), path.basename(file.path)],
+                }))
+            )
         }
-
-        // Check ~/.aws/prompts for saved prompts
+        // Check ~/.aws/prompts for global prompt files
         try {
             const systemPromptsDirectory = path.join(fs.getUserHomeDir(), '.aws', 'prompts')
             const directoryExists = await fs.exists(systemPromptsDirectory)
             if (directoryExists) {
                 const systemPromptFiles = await fs.readdir(systemPromptsDirectory)
                 promptsCmd.children?.[0].commands.push(
                     ...systemPromptFiles
-                        .filter(([name]) => name.endsWith('.prompt'))
+                        .filter(([name]) => name.endsWith(promptFileExtension))
                         .map(([name]) => ({
-                            command: name.replace(/\.prompt$/, ''),
+                            command: path.basename(name, promptFileExtension),
                             icon: 'magic' as MynahIconsType,
                             route: [systemPromptsDirectory, name],
                         }))
@@ -511,6 +493,32 @@ export class ChatController {
         // Add create prompt button to the bottom of the prompts list
         promptsCmd.children?.[0].commands.push({ command: createPromptCommand, icon: 'list-add' as MynahIconsType })
 
+        const lspClientReady = await LspClient.instance.waitUntilReady()
+        if (lspClientReady) {
+            const contextCommandItems = await LspClient.instance.getContextCommandItems()
+            const folderCmd: QuickActionCommand = contextCommand[0].commands?.[1]
+            const filesCmd: QuickActionCommand = contextCommand[0].commands?.[2]
+
+            for (const contextCommandItem of contextCommandItems) {
+                const wsFolderName = path.basename(contextCommandItem.workspaceFolder)
+                if (contextCommandItem.type === 'file') {
+                    filesCmd.children?.[0].commands.push({
+                        command: path.basename(contextCommandItem.relativePath),
+                        description: path.join(wsFolderName, contextCommandItem.relativePath),
+                        route: [contextCommandItem.workspaceFolder, contextCommandItem.relativePath],
+                        icon: 'file' as MynahIconsType,
+                    })
+                } else {
+                    folderCmd.children?.[0].commands.push({
+                        command: path.basename(contextCommandItem.relativePath),
+                        description: path.join(wsFolderName, contextCommandItem.relativePath),
+                        route: [contextCommandItem.workspaceFolder, contextCommandItem.relativePath],
+                        icon: 'folder' as MynahIconsType,
+                    })
+                }
+            }
+        }
+
         this.messenger.sendContextCommandData(contextCommand)
     }
 
@@ -532,7 +540,7 @@ export class ChatController {
                     title: 'Save globally for all projects?',
                     mandatory: true,
                     value: 'system',
-                    description: 'If yes is selected, .prompt file will be saved in ~/.aws/prompts.',
+                    description: `If yes is selected, ${promptFileExtension} file will be saved in ~/.aws/prompts.`,
                     options: [
                         { value: 'project', label: 'No' },
                         { value: 'system', label: 'Yes' },
@@ -566,7 +574,10 @@ export class ChatController {
                 }
 
                 const title = message.action.formItemValues?.['prompt-name']
-                const newFilePath = path.join(promptsDirectory, title ? `${title}.prompt` : 'default.prompt')
+                const newFilePath = path.join(
+                    promptsDirectory,
+                    title ? `${title}${promptFileExtension}` : `default${promptFileExtension}`
+                )
                 const newFileContent = new Uint8Array(Buffer.from(''))
                 await fs.writeFile(newFilePath, newFileContent)
                 const newFileDoc = await vscode.workspace.openTextDocument(newFilePath)
@@ -878,11 +889,14 @@ export class ChatController {
         if (prompts.length > 0) {
             triggerPayload.additionalContents = []
             for (const prompt of prompts) {
-                triggerPayload.additionalContents.push({
-                    name: prompt.name,
-                    description: prompt.description,
-                    innerContext: prompt.content,
-                })
+                // Todo: add mechanism for sorting/prioritization of additional context
+                if (triggerPayload.additionalContents.length < 20) {
+                    triggerPayload.additionalContents.push({
+                        name: prompt.name.substring(0, aditionalContentNameLimit),
+                        description: prompt.description.substring(0, aditionalContentNameLimit),
+                        innerContext: prompt.content.substring(0, additionalContentInnerContextLimit),
+                    })
+                }
             }
             getLogger().info(
                 `Retrieved chunks of additional context count: ${triggerPayload.additionalContents.length} `