Merge branch 'master' into debug_feedback

Author: roger-zhangg

package-lock.json

@@ -0,0 +1,10 @@
+{
+	"date": "2025-09-19",
+	"version": "1.95.0",
+	"entries": [
+		{
+			"type": "Bug Fix",
+			"description": "Amazon Q automatically refreshes expired IAM Credentials in Sagemaker instances"
+		}
+	]
+}

packages/amazonq/.changes/1.95.0.json

@@ -0,0 +1,10 @@
+{
+	"date": "2025-09-25",
+	"version": "1.96.0",
+	"entries": [
+		{
+			"type": "Bug Fix",
+			"description": "Amazon Q support web/container environments running Ubuntu/Linux, even when the host machine is Amazon Linux 2."
+		}
+	]
+}

packages/amazonq/.changes/1.96.0.json

@@ -1,3 +1,11 @@
+## 1.96.0 2025-09-25
+
+- **Bug Fix** Amazon Q support web/container environments running Ubuntu/Linux, even when the host machine is Amazon Linux 2.
+
+## 1.95.0 2025-09-19
+
+- **Bug Fix** Amazon Q automatically refreshes expired IAM Credentials in Sagemaker instances
+
 ## 1.94.0 2025-09-11
 
 - Miscellaneous non-user-facing changes

packages/amazonq/.changes/next-release/Bug Fix-da0e805d-faab-4274-b37a-943c7263e42b.json

@@ -2,7 +2,7 @@
     "name": "amazon-q-vscode",
     "displayName": "Amazon Q",
     "description": "The most capable generative AI–powered assistant for software development.",
-    "version": "1.95.0-SNAPSHOT",
+    "version": "1.97.0-SNAPSHOT",
     "extensionKind": [
         "workspace"
     ],
@@ -593,12 +593,6 @@
                 "category": "%AWS.amazonq.title%",
                 "enablement": "aws.codewhisperer.connected"
             },
-            {
-                "command": "aws.amazonq.security.scan-statusbar",
-                "title": "%AWS.command.amazonq.security.scan%",
-                "category": "%AWS.amazonq.title%",
-                "enablement": "aws.codewhisperer.connected && !aws.isSageMaker"
-            },
             {
                 "command": "aws.amazonq.refactorCode",
                 "title": "%AWS.command.amazonq.refactorCode%",

packages/amazonq/CHANGELOG.md

@@ -98,10 +98,10 @@ export async function activate(languageClient: LanguageClient) {
 
                 if (vsCodeState.lastUserModificationTime) {
                     TelemetryHelper.instance.setTimeSinceLastModification(
-                        performance.now() - vsCodeState.lastUserModificationTime
+                        Date.now() - vsCodeState.lastUserModificationTime
                     )
                 }
-                vsCodeState.lastUserModificationTime = performance.now()
+                vsCodeState.lastUserModificationTime = Date.now()
                 /**
                  * Important:  Doing this sleep(10) is to make sure
                  * 1. this event is processed by vs code first

packages/amazonq/package.json

@@ -115,7 +115,7 @@ export class InlineCompletionManager implements Disposable {
                 const startLine = position.line
                 // TODO: also log the seen state for other suggestions in session
                 // Calculate timing metrics before diagnostic delay
-                const totalSessionDisplayTime = performance.now() - requestStartTime
+                const totalSessionDisplayTime = Date.now() - requestStartTime
                 await sleep(500)
                 const diagnosticDiff = getDiagnosticsDifferences(
                     this.sessionManager.getActiveSession()?.diagnosticsBeforeAccept,
@@ -175,7 +175,7 @@ export class InlineCompletionManager implements Disposable {
                     return
                 }
                 const requestStartTime = session.requestStartTime
-                const totalSessionDisplayTime = performance.now() - requestStartTime
+                const totalSessionDisplayTime = Date.now() - requestStartTime
                 await commands.executeCommand('editor.action.inlineSuggest.hide')
                 // TODO: also log the seen state for other suggestions in session
                 this.disposable.dispose()
@@ -249,7 +249,7 @@ export class AmazonQInlineCompletionItemProvider implements InlineCompletionItem
         // Use VS Code command to check if inline suggestion is actually visible on screen
         // This command only executes when inlineSuggestionVisible context is true
         await vscode.commands.executeCommand('aws.amazonq.checkInlineSuggestionVisibility')
-        const isInlineSuggestionVisible = performance.now() - session.lastVisibleTime < 50
+        const isInlineSuggestionVisible = Date.now() - session.lastVisibleTime < 50
         return isInlineSuggestionVisible
     }
 
@@ -278,7 +278,7 @@ export class AmazonQInlineCompletionItemProvider implements InlineCompletionItem
                 sessionId: session.sessionId,
                 completionSessionResult,
                 firstCompletionDisplayLatency: session.firstCompletionDisplayLatency,
-                totalSessionDisplayTime: performance.now() - session.requestStartTime,
+                totalSessionDisplayTime: Date.now() - session.requestStartTime,
             }
             this.languageClient.sendNotification(this.logSessionResultMessageName, params)
         }
@@ -309,7 +309,7 @@ export class AmazonQInlineCompletionItemProvider implements InlineCompletionItem
         // when hitting other keystrokes, the context.triggerKind is Automatic (1)
         // we only mark option + C as manual trigger
         // this is a workaround since the inlineSuggest.trigger command take no params
-        const isAutoTrigger = performance.now() - vsCodeState.lastManualTriggerTime > 50
+        const isAutoTrigger = Date.now() - vsCodeState.lastManualTriggerTime > 50
         if (isAutoTrigger && !CodeSuggestionsState.instance.isSuggestionsEnabled()) {
             // return early when suggestions are disabled with auto trigger
             return []
@@ -318,9 +318,9 @@ export class AmazonQInlineCompletionItemProvider implements InlineCompletionItem
         // yield event loop to let the document listen catch updates
         await sleep(1)
 
-        let logstr = `GenerateCompletion metadata:\\n`
+        let logstr = `GenerateCompletion activity:\\n`
         try {
-            const t0 = performance.now()
+            const t0 = Date.now()
             vsCodeState.isRecommendationsActive = true
             // handling previous session
             const prevSession = this.sessionManager.getActiveSession()
@@ -365,7 +365,7 @@ export class AmazonQInlineCompletionItemProvider implements InlineCompletionItem
                 // re-use previous suggestions as long as new typed prefix matches
                 if (prevItemMatchingPrefix.length > 0) {
                     logstr += `- not call LSP and reuse previous suggestions that match user typed characters
-                    - duration between trigger to completion suggestion is displayed ${performance.now() - t0}`
+                    - duration between trigger to completion suggestion is displayed ${Date.now() - t0}`
                     void this.checkWhetherInlineCompletionWasShown()
                     return prevItemMatchingPrefix
                 }
@@ -381,7 +381,7 @@ export class AmazonQInlineCompletionItemProvider implements InlineCompletionItem
                         },
                     },
                     firstCompletionDisplayLatency: prevSession.firstCompletionDisplayLatency,
-                    totalSessionDisplayTime: performance.now() - prevSession.requestStartTime,
+                    totalSessionDisplayTime: Date.now() - prevSession.requestStartTime,
                 }
                 this.languageClient.sendNotification(this.logSessionResultMessageName, params)
                 this.sessionManager.clear()
@@ -396,7 +396,7 @@ export class AmazonQInlineCompletionItemProvider implements InlineCompletionItem
             TelemetryHelper.instance.setInvokeSuggestionStartTime()
             TelemetryHelper.instance.setTriggerType(context.triggerKind)
 
-            const t1 = performance.now()
+            const t1 = Date.now()
 
             await this.recommendationService.getAllRecommendations(
                 this.languageClient,
@@ -418,7 +418,7 @@ export class AmazonQInlineCompletionItemProvider implements InlineCompletionItem
             // eslint-disable-next-line @typescript-eslint/no-base-to-string
             const itemLog = items[0] ? `${items[0].insertText.toString()}` : `no suggestion`
 
-            const t2 = performance.now()
+            const t2 = Date.now()
 
             logstr += `- number of suggestions: ${items.length}
 - sessionId: ${this.sessionManager.getActiveSession()?.sessionId}
@@ -468,7 +468,7 @@ ${itemLog}
                 const lastDocumentChange = this.documentEventListener.getLastDocumentChangeEvent(document.uri.fsPath)
                 if (
                     lastDocumentChange &&
-                    performance.now() - lastDocumentChange.timestamp < CodeWhispererConstants.inlineSuggestionShowDelay
+                    Date.now() - lastDocumentChange.timestamp < CodeWhispererConstants.inlineSuggestionShowDelay
                 ) {
                     await sleep(CodeWhispererConstants.showRecommendationTimerPollPeriod)
                 } else {
@@ -486,7 +486,7 @@ ${itemLog}
                     // Check if Next Edit Prediction feature flag is enabled
                     if (Experiments.instance.get('amazonqLSPNEP', true)) {
                         await showEdits(item, editor, session, this.languageClient, this)
-                        logstr += `- duration between trigger to edits suggestion is displayed: ${performance.now() - t0}ms`
+                        logstr += `- duration between trigger to edits suggestion is displayed: ${Date.now() - t0}ms`
                     }
                     return []
                 }
@@ -530,7 +530,7 @@ ${itemLog}
 
             this.sessionManager.updateCodeReferenceAndImports()
             // suggestions returned here will be displayed on screen
-            logstr += `- duration between trigger to completion suggestion is displayed: ${performance.now() - t0}ms`
+            logstr += `- duration between trigger to completion suggestion is displayed: ${Date.now() - t0}ms`
             void this.checkWhetherInlineCompletionWasShown()
             return itemsMatchingTypeahead as InlineCompletionItem[]
         } catch (e) {

packages/amazonq/src/app/inline/activation.ts

@@ -20,7 +20,7 @@ export class DocumentEventListener {
                 if (this.lastDocumentChangeEventMap.size > this._maxDocument) {
                     this.lastDocumentChangeEventMap.clear()
                 }
-                this.lastDocumentChangeEventMap.set(e.document.uri.fsPath, { event: e, timestamp: performance.now() })
+                this.lastDocumentChangeEventMap.set(e.document.uri.fsPath, { event: e, timestamp: Date.now() })
                 // The VS Code provideInlineCompletionCallback may not trigger when Enter is pressed, especially in Python files
                 // manually make this trigger. In case of duplicate, the provideInlineCompletionCallback is already debounced
                 if (this.isEnter(e) && vscode.window.activeTextEditor) {
@@ -37,7 +37,7 @@ export class DocumentEventListener {
             const eventTime = result.timestamp
             const isDelete =
                 (event && event.contentChanges.length === 1 && event.contentChanges[0].text === '') || false
-            const timeDiff = Math.abs(performance.now() - eventTime)
+            const timeDiff = Math.abs(Date.now() - eventTime)
             return timeDiff < 500 && isDelete
         }
         return false

packages/amazonq/src/app/inline/completion.ts

@@ -8,12 +8,12 @@
  */
 export class EditSuggestionState {
     private static isEditSuggestionCurrentlyActive = false
-    private static displayStartTime = performance.now()
+    private static displayStartTime = Date.now()
 
     static setEditSuggestionActive(active: boolean): void {
         this.isEditSuggestionCurrentlyActive = active
         if (active) {
-            this.displayStartTime = performance.now()
+            this.displayStartTime = Date.now()
         }
     }
 
@@ -22,6 +22,6 @@ export class EditSuggestionState {
     }
 
     static isEditSuggestionDisplayingOverOneSecond(): boolean {
-        return this.isEditSuggestionActive() && performance.now() - this.displayStartTime > 1000
+        return this.isEditSuggestionActive() && Date.now() - this.displayStartTime > 1000
     }
 }