Second attempt to resolve conflicts between feature/subscription and main (#1998)

Problem
Feature branch continues to report merge conflicts despite attempts to resolve it.

Solution
Try touching the affected files instead of collapsing the conflicts into a no-op commit.

Author: awschristou

chat-client/src/client/chat.ts

@@ -111,6 +111,7 @@ import {
     SUBSCRIPTION_DETAILS_NOTIFICATION_METHOD,
     SubscriptionDetailsParams,
 } from '@aws/language-server-runtimes-types'
+
 import { ConfigTexts, MynahUIDataModel, MynahUITabStoreModel } from '@aws/mynah-ui'
 import { ServerMessage, TELEMETRY, TelemetryParams } from '../contracts/serverContracts'
 import { Messager, OutboundChatApi } from './messager'

chat-client/src/client/mynahUi.ts

@@ -40,6 +40,7 @@ import {
     ExecuteShellCommandParams,
     SubscriptionDetailsParams,
 } from '@aws/language-server-runtimes-types'
+
 import {
     ChatItem,
     ChatItemType,

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

@@ -64,8 +64,8 @@ export const QAgenticChatServer =
             const shortcutEnabled = enableShortcut(params)
 
             const subscriptionDetailsEnabled = isSubscriptionDetailsEnabled(params)
-
             const supportedExecutionCommands: string[] = ['aws/chat/manageSubscription']
+
             if (subscriptionDetailsEnabled) {
                 supportedExecutionCommands.push(SUBSCRIPTION_SHOW_COMMAND_METHOD)
             }

server/aws-lsp-codewhisperer/src/language-server/configuration/qConfigurationServer.ts

@@ -34,7 +34,7 @@ interface QConfigurationSections {
     developerProfiles?: AmazonQDeveloperProfile[]
 }
 
-// Feature flag interface for client capabilities
+// Feature flag interface for client capabilities.
 export interface QClientCapabilities {
     developerProfiles?: boolean
     customizationsWithMetadata?: boolean