Merge branch 'feature/agentic-chat' into fsReadFix

Author: jguoamz

packages/amazonq/.changes/next-release/Bug Fix-42b2c2f0-e40e-4f97-842b-cb7ead1a010b.json

@@ -0,0 +1,4 @@
+{
+	"type": "Bug Fix",
+	"description": "Code fix line number or file is sometimes not accurate"
+}

packages/core/src/amazonq/webview/ui/apps/cwChatConnector.ts

@@ -285,19 +285,18 @@ export class Connector extends BaseConnector {
         }
 
         if (messageData.type === 'customFormActionMessage') {
-            this.onCustomFormAction(messageData.tabID, messageData.messageId, messageData.action)
+            this.onCustomFormAction(messageData.tabID, messageData.messageId, messageData.action, messageData.triggerId)
             return
         }
 
         if (messageData.type === 'asyncEventProgressMessage') {
-            const enableStopAction = false
             const isPromptInputDisabled = true
             this.onAsyncEventProgress(
                 messageData.tabID,
                 messageData.inProgress,
                 messageData.message ?? undefined,
                 messageData.messageId ?? undefined,
-                enableStopAction,
+                messageData.inProgress,
                 isPromptInputDisabled
             )
             return
@@ -335,7 +334,8 @@ export class Connector extends BaseConnector {
             id: string
             text?: string | undefined
             formItemValues?: Record<string, string> | undefined
-        }
+        },
+        triggerId: string
     ) {
         if (action === undefined) {
             return
@@ -351,6 +351,7 @@ export class Connector extends BaseConnector {
             formSelectedValues: action.formItemValues,
             tabType: this.getTabType(),
             tabID: tabId,
+            triggerId: triggerId,
         })
 
         if (

packages/core/src/amazonq/webview/ui/connector.ts

@@ -744,7 +744,7 @@ export class Connector {
                         tabType: 'cwc',
                     })
                 } else {
-                    this.cwChatConnector.onCustomFormAction(tabId, messageId ?? '', action)
+                    this.cwChatConnector.onCustomFormAction(tabId, messageId ?? '', action, messageId ?? '')
                 }
                 break
             case 'agentWalkthrough': {

packages/core/src/amazonq/webview/ui/main.ts

@@ -719,6 +719,13 @@ export const createMynahUI = (
                 return
             }
 
+            // For new user prompt stopping chat with UI changes
+            mynahUI.updateStore(tabID, {
+                loadingChat: false,
+                promptInputDisabledState: false,
+            })
+            connector.onStopChatResponse(tabID)
+
             const tabType = tabsStorage.getTab(tabID)?.type
             if (tabType === 'featuredev') {
                 mynahUI.addChatItem(tabID, {

packages/core/src/codewhisperer/commands/startCodeFixGeneration.ts

@@ -20,6 +20,7 @@ import { TelemetryHelper } from '../util/telemetryHelper'
 import { tempDirPath } from '../../shared/filesystemUtilities'
 import { CodeWhispererSettings } from '../util/codewhispererSettings'
 import { AuthUtil } from '../util/authUtil'
+import { saveDocumentIfDirty } from '../../shared/utilities/textDocumentUtilities'
 
 export async function startCodeFixGeneration(
     client: DefaultCodeWhispererClient,
@@ -44,6 +45,9 @@ export async function startCodeFixGeneration(
          * Step 1: Generate zip
          */
         throwIfCancelled()
+
+        // Save the file if it has unsaved changes to ensure the latest content is included in the zip
+        await saveDocumentIfDirty(filePath)
         const admZip = new AdmZip()
         admZip.addLocalFile(filePath)
 

packages/core/src/codewhisperer/service/securityIssueProvider.ts

@@ -48,10 +48,11 @@ export class SecurityIssueProvider {
                     .filter((issue) => {
                         const range = new vscode.Range(
                             issue.startLine,
-                            event.document.lineAt(issue.startLine)?.range.start.character ?? 0,
-                            issue.endLine,
-                            event.document.lineAt(issue.endLine - 1)?.range.end.character ?? 0
+                            0,
+                            issue.startLine === issue.endLine ? issue.endLine + 1 : issue.endLine,
+                            0
                         )
+
                         const intersection = changedRange.intersection(range)
                         return !(intersection && (/\S/.test(changedText) || changedText === ''))
                     })

packages/core/src/codewhispererChat/clients/chat/v0/chat.ts

@@ -16,16 +16,16 @@ import { createQDeveloperStreamingClient } from '../../../../shared/clients/qDev
 import { UserWrittenCodeTracker } from '../../../../codewhisperer/tracker/userWrittenCodeTracker'
 import { DocumentReference, PromptMessage } from '../../../controllers/chat/model'
 import { FsWriteBackup } from '../../../../codewhispererChat/tools/fsWrite'
+import { randomUUID } from '../../../../shared/crypto'
+import { getLogger } from '../../../../shared/logger/logger'
 
 export type ToolUseWithError = {
     toolUse: ToolUse
     error: Error | undefined
 }
-import { getLogger } from '../../../../shared/logger/logger'
-import { randomUUID } from '../../../../shared/crypto'
 
 export class ChatSession {
-    private sessionId?: string
+    private sessionId: string
     /**
      * _readFiles = list of files read from the project to gather context before generating response.
      * _showDiffOnFileWrite = Controls whether to show diff view (true) or file context view (false) to the user
@@ -39,6 +39,8 @@ export class ChatSession {
     private _context: PromptMessage['context']
     private _pairProgrammingModeOn: boolean = true
     private _fsWriteBackups: Map<string, FsWriteBackup> = new Map()
+    private _agenticLoopInProgress: boolean = false
+
     /**
      * True if messages from local history have been sent to session.
      */
@@ -50,7 +52,7 @@ export class ChatSession {
     // TODO: doesn't handle the edge case when two files share the same relativePath string but from different root
     // e.g. root_a/file1 vs root_b/file1
     relativePathToWorkspaceRoot: Map<string, string> = new Map()
-    public get sessionIdentifier(): string | undefined {
+    public get sessionIdentifier(): string {
         return this.sessionId
     }
     public get messageIdToUpdate(): string | undefined {
@@ -69,6 +71,33 @@ export class ChatSession {
         this._messageIdToUpdateListDirectory = messageId
     }
 
+    public get agenticLoopInProgress(): boolean {
+        return this._agenticLoopInProgress
+    }
+
+    public setAgenticLoopInProgress(value: boolean) {
+        // When setting agenticLoop to false (ending the loop), dispose the current token source
+        if (this._agenticLoopInProgress === true && value === false) {
+            this.disposeTokenSource()
+            // Create a new token source for future operations
+            this.createNewTokenSource()
+        }
+        this._agenticLoopInProgress = value
+    }
+
+    /**
+     * Safely disposes the current token source if it exists
+     */
+    disposeTokenSource() {
+        if (this.tokenSource) {
+            try {
+                this.tokenSource.dispose()
+            } catch (error) {
+                getLogger().debug(`Error disposing token source: ${error}`)
+            }
+        }
+    }
+
     public get pairProgrammingModeOn(): boolean {
         return this._pairProgrammingModeOn
     }
@@ -105,13 +134,14 @@ export class ChatSession {
 
     constructor() {
         this.createNewTokenSource()
+        this.sessionId = randomUUID()
     }
 
     createNewTokenSource() {
         this.tokenSource = new vscode.CancellationTokenSource()
     }
 
-    public setSessionID(id?: string) {
+    public setSessionID(id: string) {
         this.sessionId = id
     }
     public get readFiles(): DocumentReference[] {
@@ -148,14 +178,6 @@ export class ChatSession {
             )
         }
 
-        const responseStream = response.sendMessageResponse
-        for await (const event of responseStream) {
-            if ('messageMetadataEvent' in event) {
-                this.sessionId = event.messageMetadataEvent?.conversationId
-                break
-            }
-        }
-
         UserWrittenCodeTracker.instance.onQFeatureInvoked()
         return response
     }
@@ -170,12 +192,6 @@ export class ChatSession {
             )
         }
 
-        this.sessionId = response.conversationId
-        if (this.sessionId?.length === 0) {
-            getLogger().debug(`Session ID: ${this.sessionId} is empty. Generating random UUID`)
-            this.sessionId = randomUUID()
-        }
-
         UserWrittenCodeTracker.instance.onQFeatureInvoked()
 
         return response