Merge staging into feature/lambda-get-started

Author: aws-toolkit-automation

packages/amazonq/.changes/next-release/Bug Fix-771c645f-eeea-4da5-b2d2-4315dfad9506.json

@@ -0,0 +1,4 @@
+{
+    "type": "Bug Fix",
+    "description": "fixed device code detection when running auth through tunneled vscode"
+}

packages/core/src/auth/sso/ssoAccessTokenProvider.ts

@@ -38,7 +38,7 @@ import { getIdeProperties, isAmazonQ, isCloud9 } from '../../shared/extensionUti
 import { randomBytes, createHash } from 'crypto'
 import { localize } from '../../shared/utilities/vsCodeUtils'
 import { randomUUID } from '../../shared/crypto'
-import { isRemoteWorkspace, isWebWorkspace } from '../../shared/vscode/env'
+import { getExtRuntimeContext } from '../../shared/vscode/env'
 import { showInputBox } from '../../shared/ui/inputPrompter'
 import { AmazonQPromptSettings, DevSettings, PromptSettings, ToolkitPromptSettings } from '../../shared/settings'
 import { onceChanged } from '../../shared/utilities/functionUtils'
@@ -304,10 +304,10 @@ export abstract class SsoAccessTokenProvider {
              *
              * Since we are unable to serve the final authorization page
              */
-            return isRemoteWorkspace() || isWebWorkspace()
+            return getExtRuntimeContext().extensionHost === 'remote'
         }
     ) {
-        if (DevSettings.instance.get('webAuth', false) && isWebWorkspace()) {
+        if (DevSettings.instance.get('webAuth', false) && getExtRuntimeContext().extensionHost === 'webworker') {
             return new WebAuthorization(profile, cache, oidc, reAuthState)
         }
         if (useDeviceFlow()) {

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

@@ -660,6 +660,7 @@ export class ChatController {
         session.createNewTokenSource()
         try {
             this.messenger.sendInitalStream(tabID, triggerID)
+            this.telemetryHelper.setConversationStreamStartTime(tabID)
             response = await session.chat(request)
             this.telemetryHelper.recordEnterFocusConversation(triggerEvent.tabID)
             this.telemetryHelper.recordStartConversation(triggerEvent, triggerPayload)

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

@@ -65,6 +65,8 @@ export class CWCTelemetryHelper {
     private triggerEventsStorage: TriggerEventsStorage
     private responseStreamStartTime: Map<string, number> = new Map()
     private responseStreamTotalTime: Map<string, number> = new Map()
+    private conversationStreamStartTime: Map<string, number> = new Map()
+    private conversationStreamTotalTime: Map<string, number> = new Map()
     private responseStreamTimeForChunks: Map<string, number[]> = new Map()
     private responseWithProjectContext: Map<string, boolean> = new Map()
 
@@ -447,7 +449,9 @@ export class CWCTelemetryHelper {
                 this.getTimeBetweenChunks(message.tabID, this.responseStreamTimeForChunks)
             ),
             cwsprChatFullResponseLatency: this.responseStreamTotalTime.get(message.tabID) ?? 0,
-            cwsprTimeToFirstDisplay: this.getFirstDisplayTime(tabID, startTime),
+            cwsprChatTimeToFirstDisplay: this.getFirstDisplayTime(tabID, startTime),
+            cwsprChatTimeFirstUsableChunk: this.getFirstUsableChunkTime(message.tabID) ?? 0,
+            cwsprChatFullServerResponseLatency: this.conversationStreamTotalTime.get(message.tabID) ?? 0,
             cwsprChatTimeBetweenDisplays: JSON.stringify(this.getTimeBetweenChunks(tabID, this.displayTimeForChunks)),
             cwsprChatFullDisplayLatency: fullDisplayLatency,
             cwsprChatRequestLength: triggerPayload.message?.length ?? 0,
@@ -549,6 +553,10 @@ export class CWCTelemetryHelper {
         this.responseWithProjectContext.set(messageId, true)
     }
 
+    public setConversationStreamStartTime(tabID: string) {
+        this.conversationStreamStartTime.set(tabID, performance.now())
+    }
+
     private getResponseStreamTimeToFirstChunk(tabID: string): number {
         const chunkTimes = this.responseStreamTimeForChunks.get(tabID) ?? [0, 0]
         if (chunkTimes.length === 1) {
@@ -568,6 +576,13 @@ export class CWCTelemetryHelper {
         return Math.round(chunkTimes[0] - startTime)
     }
 
+    private getFirstUsableChunkTime(tabID: string) {
+        const startTime = this.conversationStreamStartTime.get(tabID) ?? 0
+        const chunkTimes = this.responseStreamTimeForChunks.get(tabID) ?? [0, 0]
+        // first chunk is the start time, we use the second because thats the first actual usable chunk time
+        return Math.round(chunkTimes[1] - startTime)
+    }
+
     private getTimeBetweenChunks(tabID: string, chunks: Map<string, number[]>): number[] {
         try {
             const chunkDeltaTimes: number[] = []
@@ -584,8 +599,13 @@ export class CWCTelemetryHelper {
     }
 
     public setResponseStreamTotalTime(tabID: string) {
-        const totalTime = performance.now() - (this.responseStreamStartTime.get(tabID) ?? 0)
-        this.responseStreamTotalTime.set(tabID, Math.round(totalTime))
+        // time from when the requests started streaming until the end of the stream
+        const totalStreamingTime = performance.now() - (this.responseStreamStartTime.get(tabID) ?? 0)
+        this.responseStreamTotalTime.set(tabID, Math.round(totalStreamingTime))
+
+        // time from the initial server request, including creating the conversation id, until the end of the stream
+        const totalConversationTime = performance.now() - (this.conversationStreamStartTime.get(tabID) ?? 0)
+        this.conversationStreamTotalTime.set(tabID, Math.round(totalConversationTime))
     }
 
     public getConversationId(tabID: string): string | undefined {

packages/core/src/shared/telemetry/vscodeTelemetry.json

@@ -157,7 +157,7 @@
         {
             "name": "cwsprChatTimeToFirstChunk",
             "type": "int",
-            "description": "The time between the initial server request and when we got back the first usable result"
+            "description": "The time between when the conversation id was created and when we got back the first usable result"
         },
         {
             "name": "cwsprChatTimeBetweenChunks",
@@ -167,10 +167,20 @@
         {
             "name": "cwsprChatFullResponseLatency",
             "type": "int",
-            "description": "The time between the initial server request and the final response from the server"
+            "description": "The time between when the conversation id was created and the final response from the server was received"
         },
         {
-            "name": "cwsprTimeToFirstDisplay",
+            "name": "cwsprChatTimeFirstUsableChunk",
+            "type": "int",
+            "description": "The time between the initial server request, including creating the conversation id, and the first usable result"
+        },
+        {
+            "name": "cwsprChatFullServerResponseLatency",
+            "type": "int",
+            "description": "The time between the initial server request, including creating the conversation id, and the final response from the server"
+        },
+        {
+            "name": "cwsprChatTimeToFirstDisplay",
             "type": "int",
             "description": "The time between the user pressing enter and when the first chunk of data is displayed to the user"
         },
@@ -753,7 +763,13 @@
                     "type": "cwsprChatFullResponseLatency"
                 },
                 {
-                    "type": "cwsprTimeToFirstDisplay"
+                    "type": "cwsprChatTimeFirstUsableChunk"
+                },
+                {
+                    "type": "cwsprChatFullServerResponseLatency"
+                },
+                {
+                    "type": "cwsprChatTimeToFirstDisplay"
                 },
                 {
                     "type": "cwsprChatFullDisplayLatency"

packages/core/src/shared/vscode/env.ts

@@ -10,7 +10,7 @@ import * as os from 'os'
 import { getLogger } from '../logger'
 import { onceChanged } from '../utilities/functionUtils'
 import { ChildProcess } from '../utilities/processUtils'
-import { isWeb } from '../extensionGlobals'
+import globals, { isWeb } from '../extensionGlobals'
 
 /**
  * Returns true if the current build is running on CI (build server).
@@ -138,8 +138,33 @@ export function isWin(): boolean {
     return process.platform === 'win32'
 }
 
-export function isWebWorkspace(): boolean {
-    return vscode.env.uiKind === vscode.UIKind.Web
+const UIKind = {
+    [vscode.UIKind.Desktop]: 'desktop',
+    [vscode.UIKind.Web]: 'web',
+} as const
+export type ExtensionHostUI = (typeof UIKind)[keyof typeof UIKind]
+export type ExtensionHostLocation = 'local' | 'remote' | 'webworker'
+
+/**
+ * Detects where the ui and the extension host are running
+ */
+export function getExtRuntimeContext(): {
+    ui: ExtensionHostUI
+    extensionHost: ExtensionHostLocation
+} {
+    const extensionHost =
+        // taken from https://github.com/microsoft/vscode/blob/7c9e4bb23992c63f20cd86bbe7a52a3aa4bed89d/extensions/github-authentication/src/githubServer.ts#L121 to help determine which auth flows
+        // should be used
+        typeof navigator === 'undefined'
+            ? globals.context.extension.extensionKind === vscode.ExtensionKind.UI
+                ? 'local'
+                : 'remote'
+            : 'webworker'
+
+    return {
+        ui: UIKind[vscode.env.uiKind],
+        extensionHost,
+    }
 }
 
 export function getCodeCatalystProjectName(): string | undefined {

packages/toolkit/.changes/next-release/Bug Fix-9c15d2c5-6b28-42ae-b068-f71821acf62a.json

@@ -0,0 +1,4 @@
+{
+    "type": "Bug Fix",
+    "description": "fixed device code detection when running auth through tunneled vscode"
+}