refactor: cleanup feature dev imports in transform (#5395)

Author: jpinkney-aws

packages/core/src/amazonq/commons/model.ts

@@ -0,0 +1,15 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+// Currently importing ChatItemType in Mynah UI from the vscode side causes an error
+// TODO remove this once the import stops failing
+export type ChatItemType =
+    | 'prompt'
+    | 'system-prompt'
+    | 'ai-prompt'
+    | 'answer'
+    | 'answer-stream'
+    | 'answer-part'
+    | 'code-result'

packages/core/src/amazonqFeatureDev/models.ts

@@ -3,17 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-// Currently importing ChatItemType in Mynah UI from the vscode side causes an error
-// TODO remove this once the import stops failing
-export type ChatItemType =
-    | 'prompt'
-    | 'system-prompt'
-    | 'ai-prompt'
-    | 'answer'
-    | 'answer-stream'
-    | 'answer-part'
-    | 'code-result'
-
 export interface IManifestFile {
     pomArtifactId: string
     pomFolderName: string

packages/core/src/amazonqFeatureDev/views/connector/connector.ts

@@ -7,9 +7,9 @@ import { AuthFollowUpType } from '../../../amazonq/auth/model'
 import { MessagePublisher } from '../../../amazonq/messages/messagePublisher'
 import { CodeReference } from '../../../amazonq/webview/ui/connector'
 import { featureDevChat, licenseText } from '../../constants'
-import { ChatItemType } from '../../models'
 import { ChatItemAction, SourceLink } from '@aws/mynah-ui'
 import { DeletedFileInfo, NewFileInfo } from '../../types'
+import { ChatItemType } from '../../../amazonq/commons/model'
 
 class UiMessage {
     readonly time: number = Date.now()

packages/core/src/amazonqGumby/app.ts

@@ -39,17 +39,14 @@ export function init(appContext: AmazonQAppInitContext) {
 
     new GumbyController(gumbyChatControllerEventEmitters, messenger, appContext.onDidChangeAmazonQVisibility.event)
 
-    const featureDevChatUIInputEventEmitter = new vscode.EventEmitter<any>()
+    const gumbyChatUIInputEventEmitter = new vscode.EventEmitter<any>()
 
     new UIMessageListener({
         chatControllerEventEmitters: gumbyChatControllerEventEmitters,
-        webViewMessageListener: new MessageListener<any>(featureDevChatUIInputEventEmitter),
+        webViewMessageListener: new MessageListener<any>(gumbyChatUIInputEventEmitter),
     })
 
-    appContext.registerWebViewToAppMessagePublisher(
-        new MessagePublisher<any>(featureDevChatUIInputEventEmitter),
-        'gumby'
-    )
+    appContext.registerWebViewToAppMessagePublisher(new MessagePublisher<any>(gumbyChatUIInputEventEmitter), 'gumby')
 
     const debouncedEvent = debounce(async () => {
         const authenticated = (await AuthUtil.instance.getChatAuthState()).amazonQ === 'connected'

packages/core/src/amazonqGumby/chat/controller/messenger/messenger.ts

@@ -9,7 +9,6 @@
  */
 
 import { AuthFollowUpType, AuthMessageDataMap } from '../../../../amazonq/auth/model'
-import { ChatItemType } from '../../../../amazonqFeatureDev/models'
 import { JDKVersion, TransformationCandidateProject, transformByQState } from '../../../../codewhisperer/models/model'
 import { FeatureAuthState } from '../../../../codewhisperer/util/authUtil'
 import * as CodeWhispererConstants from '../../../../codewhisperer/models/constants'
@@ -28,6 +27,7 @@ import {
 import { ChatItemButton, ChatItemFormItem } from '@aws/mynah-ui/dist/static'
 import MessengerUtils, { ButtonActions } from './messengerUtils'
 import DependencyVersions from '../../../models/dependencies'
+import { ChatItemType } from '../../../../amazonq/commons/model'
 
 export type StaticTextResponseType =
     | 'transform'

packages/core/src/amazonqGumby/chat/views/connector/connector.ts

@@ -6,9 +6,9 @@
 import { gumbyChat } from '../../../models/constants'
 import { AuthFollowUpType } from '../../../../amazonq/auth/model'
 import { MessagePublisher } from '../../../../amazonq/messages/messagePublisher'
-import { ChatItemType } from '../../../../amazonqFeatureDev/models'
 import { ChatItemButton, ChatItemFormItem } from '@aws/mynah-ui/dist/static'
 import { GumbyCommands } from '../../controller/messenger/messengerUtils'
+import { ChatItemType } from '../../../../amazonq/commons/model'
 
 export type GumbyMessageType =
     | 'errorMessage'
@@ -72,7 +72,7 @@ export class AuthenticationUpdateMessage {
     readonly type: GumbyMessageType = 'authenticationUpdateMessage'
 
     constructor(
-        readonly featureDevEnabled: boolean,
+        readonly gumbyEnabled: boolean,
         readonly authenticatingTabIDs: string[]
     ) {}
 }