Merge feature/beta into autoMerge/feature/beta

Author: laileni-aws

chat-client/src/client/mynahUi.ts

@@ -1411,6 +1411,7 @@ export const createMynahUi = (
                       ? { 'insert-to-cursor': null }
                       : undefined,
             ...(shouldMute ? { muted: true } : {}),
+            modifiedFilesTracker: message.modifiedFilesTracker,
         }
     }
 

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

@@ -495,6 +495,11 @@ export class AgenticChatController implements ChatHandlers {
         const fileList = cachedToolUse.chatResult?.header?.fileList
         const button = cachedToolUse.chatResult?.header?.buttons?.filter(button => button.id !== BUTTON_UNDO_CHANGES)
 
+        const updatedModifiedFilesTracker = {
+            ...cachedToolUse.chatResult?.modifiedFilesTracker,
+            removeFile: true,
+        }
+
         const updatedHeader = {
             ...cachedToolUse.chatResult?.header,
             buttons: button,
@@ -531,6 +536,7 @@ export class AgenticChatController implements ChatHandlers {
                     {
                         ...cachedToolUse.chatResult,
                         header: updatedHeader,
+                        modifiedFilesTracker: updatedModifiedFilesTracker,
                     },
                 ],
             },
@@ -2547,6 +2553,9 @@ export class AgenticChatController implements ChatHandlers {
                     keepCardAfterClick: false,
                 },
             ],
+            modifiedFilesTracker: {
+                title: 'Following files were modified : ',
+            },
         })
         session.currentUndoAllId = undefined
     }
@@ -3197,6 +3206,9 @@ export class AgenticChatController implements ChatHandlers {
                 },
                 buttons: [{ id: BUTTON_UNDO_CHANGES, text: 'Undo', icon: 'undo' }],
             },
+            modifiedFilesTracker: {
+                title: 'Following files were modified : ',
+            },
         }
     }
 

server/aws-lsp-codewhisperer/src/language-server/localProjectContext/localProjectContextServer.ts

@@ -166,8 +166,14 @@ export const LocalProjectContextServer =
             try {
                 localProjectContextEnabled = updatedConfig.projectContext?.enableLocalIndexing === true
                 if (process.env.DISABLE_INDEXING_LIBRARY === 'true') {
-                    logging.log('Skipping local project context initialization')
+                    logging.log('Skipping local project context initialization due to DISABLE_INDEXING_LIBRARY=true')
                     localProjectContextEnabled = false
+                    // Ensure instance is set even when disabled
+                    LocalProjectContextController.createFallbackInstance(
+                        'vscode',
+                        workspace.getAllWorkspaceFolders() || [],
+                        logging
+                    )
                 } else {
                     logging.log(
                         `Setting project context indexing enabled to ${updatedConfig.projectContext?.enableLocalIndexing}`
@@ -183,7 +189,13 @@ export const LocalProjectContextServer =
                     })
                 }
             } catch (error) {
-                logging.error(`Error handling configuration change: ${error}`)
+                logging.error(`Error handling configuration change: ${error}. Creating fallback instance.`)
+                // Create fallback instance if initialization fails
+                LocalProjectContextController.createFallbackInstance(
+                    'vscode',
+                    workspace.getAllWorkspaceFolders() || [],
+                    logging
+                )
             }
         }
 

server/aws-lsp-codewhisperer/src/shared/localProjectContextController.ts

@@ -101,6 +101,19 @@ export class LocalProjectContextController {
         }
     }
 
+    public static createFallbackInstance(
+        clientName: string,
+        workspaceFolders: WorkspaceFolder[],
+        logging: Logging
+    ): LocalProjectContextController {
+        if (!this.instance) {
+            const fallbackInstance = new LocalProjectContextController(clientName, workspaceFolders, logging)
+            this.instance = fallbackInstance
+            logging.warn('Created fallback LocalProjectContextController instance without vector library')
+        }
+        return this.instance
+    }
+
     public async init({
         vectorLib,
         ignoreFilePatterns = [],
@@ -159,22 +172,32 @@ export class LocalProjectContextController {
 
             // initialize vecLib and index if needed
             const libraryPath = this.getVectorLibraryPath()
-            const vecLib = vectorLib ?? (await eval(`import("${libraryPath}")`))
-            if (vecLib) {
-                this._vecLib = await vecLib.start(LIBRARY_DIR, this.clientName, this.indexCacheDirPath)
-                if (enableIndexing) {
-                    this.buildIndex('all').catch(e => {
-                        this.log.error(`Error building index on init with indexing enabled: ${e}`)
-                    })
+            try {
+                const vecLib = vectorLib ?? (await eval(`import("${libraryPath}")`))
+                if (vecLib) {
+                    this._vecLib = await vecLib.start(LIBRARY_DIR, this.clientName, this.indexCacheDirPath)
+                    if (enableIndexing) {
+                        this.buildIndex('all').catch(e => {
+                            this.log.error(`Error building index on init with indexing enabled: ${e}`)
+                        })
+                    } else {
+                        this.buildIndex('default').catch(e => {
+                            this.log.error(`Error building index on init with indexing disabled: ${e}`)
+                        })
+                    }
+                    this._isIndexingEnabled = enableIndexing
                 } else {
-                    this.buildIndex('default').catch(e => {
-                        this.log.error(`Error building index on init with indexing disabled: ${e}`)
-                    })
+                    this.log.warn(`Vector library could not be imported from: ${libraryPath}`)
                 }
+            } catch (importError) {
+                this.log.warn(
+                    `Failed to import vector library from ${libraryPath}: ${importError}. Local indexing will be disabled.`
+                )
+            }
+
+            // Always set the instance, even if vector library failed to load
+            if (!LocalProjectContextController.instance) {
                 LocalProjectContextController.instance = this
-                this._isIndexingEnabled = enableIndexing
-            } else {
-                this.log.warn(`Vector library could not be imported from: ${libraryPath}`)
             }
         } catch (error) {
             this.log.error('Vector library failed to initialize:' + error)