Merge branch 'aws:master' into code-review-tool

singhAws · web-flow · commit 3ad78a745432 · 2025-07-29T10:01:13.000-07:00
diff --git a/packages/amazonq/package.json b/packages/amazonq/package.json
@@ -524,22 +524,17 @@
                     "command": "aws.amazonq.walkthrough.show",
                     "group": "1_help@1"
                 },
-                {
-                    "command": "aws.amazonq.exploreAgents",
-                    "when": "!aws.isSageMaker",
-                    "group": "1_help@2"
-                },
                 {
                     "command": "aws.amazonq.github",
-                    "group": "1_help@3"
+                    "group": "1_help@2"
                 },
                 {
                     "command": "aws.amazonq.aboutExtension",
-                    "group": "1_help@4"
+                    "group": "1_help@3"
                 },
                 {
                     "command": "aws.amazonq.viewLogs",
-                    "group": "1_help@5"
+                    "group": "1_help@4"
                 }
             ],
             "aws.amazonq.submenu.securityIssueMoreActions": [
@@ -846,12 +841,6 @@
                 "title": "%AWS.amazonq.openChat%",
                 "category": "%AWS.amazonq.title%"
             },
-            {
-                "command": "aws.amazonq.exploreAgents",
-                "title": "%AWS.amazonq.exploreAgents%",
-                "category": "%AWS.amazonq.title%",
-                "enablement": "aws.codewhisperer.connected && !aws.isSageMaker"
-            },
             {
                 "command": "aws.amazonq.walkthrough.show",
                 "title": "%AWS.amazonq.welcomeWalkthrough%"
diff --git a/packages/amazonq/src/lsp/chat/messages.ts b/packages/amazonq/src/lsp/chat/messages.ts
@@ -97,7 +97,7 @@ import {
     ViewDiffMessage,
     referenceLogText,
 } from 'aws-core-vscode/amazonq'
-import { telemetry, TelemetryBase } from 'aws-core-vscode/telemetry'
+import { telemetry } from 'aws-core-vscode/telemetry'
 import { isValidResponseError } from './error'
 import { decryptResponse, encryptRequest } from '../encryption'
 import { getCursorState } from '../utils'
@@ -144,10 +144,13 @@ export function registerLanguageServerEventListener(languageClient: LanguageClie
     // This passes through metric data from LSP events to Toolkit telemetry with all fields from the LSP server
     languageClient.onTelemetry((e) => {
         const telemetryName: string = e.name
-
-        if (telemetryName in telemetry) {
-            languageClient.info(`[VSCode Telemetry] Emitting ${telemetryName} telemetry: ${JSON.stringify(e.data)}`)
-            telemetry[telemetryName as keyof TelemetryBase].emit(e.data)
+        languageClient.info(`[VSCode Telemetry] Emitting ${telemetryName} telemetry: ${JSON.stringify(e.data)}`)
+        try {
+            // Flare is now the source of truth for metrics instead of depending on each IDE client and toolkit-common
+            const metric = (telemetry as any).getMetric(telemetryName)
+            metric?.emit(e.data)
+        } catch (error) {
+            languageClient.warn(`[VSCode Telemetry] Failed to emit ${telemetryName}: ${error}`)
         }
     })
 }
diff --git a/packages/amazonq/src/lsp/client.ts b/packages/amazonq/src/lsp/client.ts
@@ -185,7 +185,7 @@ export async function startLanguageServer(
                     window: {
                         notifications: true,
                         showSaveFileDialog: true,
-                        showLogs: true,
+                        showLogs: isSageMaker() ? false : true,
                     },
                     textDocument: {
                         inlineCompletionWithReferences: textDocSection,
diff --git a/packages/amazonq/test/e2e/amazonq/explore.test.ts b/packages/amazonq/test/e2e/amazonq/explore.test.ts
diff --git a/packages/core/package.nls.json b/packages/core/package.nls.json
@@ -354,7 +354,6 @@
     "AWS.amazonq.security": "Code Issues",
     "AWS.amazonq.login": "Login",
     "AWS.amazonq.learnMore": "Learn More About Amazon Q",
-    "AWS.amazonq.exploreAgents": "Explore Agent Capabilities",
     "AWS.amazonq.welcomeWalkthrough": "Welcome Walkthrough",
     "AWS.amazonq.codewhisperer.title": "Amazon Q",
     "AWS.amazonq.toggleCodeSuggestion": "Toggle Auto-Suggestions",
diff --git a/packages/core/src/amazonq/webview/ui/apps/amazonqCommonsConnector.ts b/packages/core/src/amazonq/webview/ui/apps/amazonqCommonsConnector.ts
@@ -33,14 +33,12 @@ export interface CodeReference {
 export class Connector {
     private readonly sendMessageToExtension
     private readonly onWelcomeFollowUpClicked
-    private readonly onNewTab
     private readonly handleCommand
     private readonly sendStaticMessage
 
     constructor(props: ConnectorProps) {
         this.sendMessageToExtension = props.sendMessageToExtension
         this.onWelcomeFollowUpClicked = props.onWelcomeFollowUpClicked
-        this.onNewTab = props.onNewTab
         this.handleCommand = props.handleCommand
         this.sendStaticMessage = props.sendStaticMessages
     }
@@ -61,10 +59,7 @@ export class Connector {
     }
 
     handleMessageReceive = async (messageData: any): Promise<void> => {
-        if (messageData.command === 'showExploreAgentsView') {
-            this.onNewTab('agentWalkthrough')
-            return
-        } else if (messageData.command === 'review') {
+        if (messageData.command === 'review') {
             // tabID does not exist when calling from QuickAction Menu bar
             this.handleCommand({ command: '/review' }, '')
             return
diff --git a/packages/core/src/amazonq/webview/ui/connector.ts b/packages/core/src/amazonq/webview/ui/connector.ts
@@ -596,10 +596,6 @@ export class Connector {
                     this.cwChatConnector.onCustomFormAction(tabId, action)
                 }
                 break
-            case 'agentWalkthrough': {
-                this.amazonqCommonsConnector.onCustomFormAction(tabId, action)
-                break
-            }
         }
     }
 }
diff --git a/packages/core/src/amazonq/webview/ui/main.ts b/packages/core/src/amazonq/webview/ui/main.ts
@@ -32,7 +32,6 @@ import { DiffTreeFileInfo } from './diffTree/types'
 import { FeatureContext } from '../../../shared/featureConfig'
 import { tryNewMap } from '../../util/functionUtils'
 import { welcomeScreenTabData } from './walkthrough/welcome'
-import { agentWalkthroughDataModel } from './walkthrough/agent'
 import { createClickTelemetry, createOpenAgentTelemetry } from './telemetry/actions'
 import { disclaimerAcknowledgeButtonId, disclaimerCard } from './texts/disclaimer'
 import { DetailedListSheetProps } from '@aws/mynah-ui/dist/components/detailed-list/detailed-list-sheet'
@@ -783,19 +782,6 @@ export class WebviewUIHandler {
                         this.postMessage(createClickTelemetry('amazonq-welcome-quick-start-button'))
                         return
                     }
-                    case 'explore': {
-                        const newTabId = this.mynahUI?.updateStore('', agentWalkthroughDataModel)
-                        if (newTabId === undefined) {
-                            this.mynahUI?.notify({
-                                content: uiComponentsTexts.noMoreTabsTooltip,
-                                type: NotificationType.WARNING,
-                            })
-                            return
-                        }
-                        this.tabsStorage.updateTabTypeFromUnknown(newTabId, 'agentWalkthrough')
-                        this.postMessage(createClickTelemetry('amazonq-welcome-explore-button'))
-                        return
-                    }
                     default: {
                         this.connector?.onCustomFormAction(tabId, messageId, action, eventId)
                         return
diff --git a/packages/core/src/amazonq/webview/ui/quickActions/generator.ts b/packages/core/src/amazonq/webview/ui/quickActions/generator.ts
@@ -25,11 +25,6 @@ export class QuickActionGenerator {
     }
 
     public generateForTab(tabType: TabType): QuickActionCommandGroup[] {
-        // agentWalkthrough is static and doesn't have any quick actions
-        if (tabType === 'agentWalkthrough') {
-            return []
-        }
-
         // TODO: Update acc to UX
         const quickActionCommands = [
             {
@@ -101,7 +96,7 @@ export class QuickActionGenerator {
         ].filter((section) => section.commands.length > 0)
 
         const commandUnavailability: Record<
-            Exclude<TabType, 'agentWalkthrough'>,
+            Exclude<TabType, []>,
             {
                 description: string
                 unavailableItems: string[]
diff --git a/packages/core/src/amazonq/webview/ui/storages/tabsStorage.ts b/packages/core/src/amazonq/webview/ui/storages/tabsStorage.ts
@@ -4,7 +4,7 @@
  */
 
 export type TabStatus = 'free' | 'busy' | 'dead'
-const TabTypes = ['cwc', 'gumby', 'review', 'agentWalkthrough', 'welcome', 'unknown'] as const
+const TabTypes = ['cwc', 'gumby', 'review', 'welcome', 'unknown'] as const
 export type TabType = (typeof TabTypes)[number]
 export function isTabType(value: string): value is TabType {
     return (TabTypes as readonly string[]).includes(value)
diff --git a/packages/core/src/amazonq/webview/ui/tabs/constants.ts b/packages/core/src/amazonq/webview/ui/tabs/constants.ts
@@ -44,7 +44,7 @@ export const commonTabData: TabTypeData = {
     contextCommands: [workspaceCommand],
 }
 
-export const TabTypeDataMap: Record<Exclude<TabType, 'agentWalkthrough' | 'welcome'>, TabTypeData> = {
+export const TabTypeDataMap: Record<Exclude<TabType, 'welcome'>, TabTypeData> = {
     unknown: commonTabData,
     cwc: commonTabData,
     gumby: {
diff --git a/packages/core/src/amazonq/webview/ui/tabs/generator.ts b/packages/core/src/amazonq/webview/ui/tabs/generator.ts
@@ -8,7 +8,6 @@ import { TabType } from '../storages/tabsStorage'
 import { FollowUpGenerator } from '../followUps/generator'
 import { QuickActionGenerator } from '../quickActions/generator'
 import { qChatIntroMessageForSMUS, TabTypeDataMap } from './constants'
-import { agentWalkthroughDataModel } from '../walkthrough/agent'
 import { FeatureContext } from '../../../../shared/featureConfig'
 import { RegionProfile } from '../../../../codewhisperer/models/model'
 
@@ -43,10 +42,6 @@ export class TabDataGenerator {
         taskName?: string,
         isSMUS?: boolean
     ): MynahUIDataModel {
-        if (tabType === 'agentWalkthrough') {
-            return agentWalkthroughDataModel
-        }
-
         if (tabType === 'welcome') {
             return {}
         }
@@ -86,7 +81,7 @@ export class TabDataGenerator {
     }
 
     private getContextCommands(tabType: TabType): QuickActionCommandGroup[] | undefined {
-        if (tabType === 'agentWalkthrough' || tabType === 'welcome') {
+        if (tabType === 'welcome') {
             return
         }
 
diff --git a/packages/core/src/amazonq/webview/ui/walkthrough/agent.ts b/packages/core/src/amazonq/webview/ui/walkthrough/agent.ts
diff --git a/packages/core/src/codewhisperer/activation.ts b/packages/core/src/codewhisperer/activation.ts
diff --git a/packages/core/src/codewhisperer/commands/basicCommands.ts b/packages/core/src/codewhisperer/commands/basicCommands.ts
diff --git a/packages/core/src/shared/vscode/env.ts b/packages/core/src/shared/vscode/env.ts

Original file line number	Diff line number	Diff line change
`@@ -596,10 +596,6 @@ export class Connector {`
`596`	`596`	`this.cwChatConnector.onCustomFormAction(tabId, action)`
`597`	`597`	`}`
`598`	`598`	`break`
`599`		`- case 'agentWalkthrough': {`
`600`		`- this.amazonqCommonsConnector.onCustomFormAction(tabId, action)`
`601`		`- break`
`602`		`- }`
`603`	`599`	`}`
`604`	`600`	`}`
`605`	`601`	`}`
Original file line number	Diff line number	Diff line change
`@@ -25,11 +25,6 @@ export class QuickActionGenerator {`
`25`	`25`	`}`
`26`	`26`
`27`	`27`	`public generateForTab(tabType: TabType): QuickActionCommandGroup[] {`
`28`		`- // agentWalkthrough is static and doesn't have any quick actions`
`29`		`- if (tabType === 'agentWalkthrough') {`
`30`		`- return []`
`31`		`- }`
`32`		`-`
`33`	`28`	`// TODO: Update acc to UX`
`34`	`29`	`const quickActionCommands = [`
`35`	`30`	`{`
`@@ -101,7 +96,7 @@ export class QuickActionGenerator {`
`101`	`96`	`].filter((section) => section.commands.length > 0)`
`102`	`97`
`103`	`98`	`const commandUnavailability: Record<`
`104`		`- Exclude<TabType, 'agentWalkthrough'>,`
	`99`	`+ Exclude<TabType, []>,`
`105`	`100`	`{`
`106`	`101`	`description: string`
`107`	`102`	`unavailableItems: string[]`