refactor(amazonq): refactor doc and featureDev SessionState

Author: siakmun-aws

packages/amazonq/test/unit/amazonqFeatureDev/session/session.test.ts

@@ -18,7 +18,12 @@ import {
     sessionWriteFile,
     assertTelemetry,
 } from 'aws-core-vscode/test'
-import { CurrentWsFolders, CodeGenState, FeatureDevClient, featureDevScheme } from 'aws-core-vscode/amazonqFeatureDev'
+import {
+    CurrentWsFolders,
+    FeatureDevClient,
+    featureDevScheme,
+    FeatureDevCodeGenState,
+} from 'aws-core-vscode/amazonqFeatureDev'
 import { Messenger } from 'aws-core-vscode/amazonq'
 import path from 'path'
 import { fs } from 'aws-core-vscode/shared'
@@ -74,7 +79,7 @@ describe('session', () => {
                 workspaceFolders,
             }
 
-            const codeGenState = new CodeGenState(
+            const codeGenState = new FeatureDevCodeGenState(
                 testConfig,
                 [
                     {

packages/core/src/amazonq/commons/connector/baseMessenger.ts

@@ -27,7 +27,7 @@ import {
 } from './connectorMessages'
 import { FollowUpTypes } from '../types'
 import { messageWithConversationId } from '../../../amazonqFeatureDev/userFacingText'
-import { DeletedFileInfo, NewFileInfo } from '../../../amazonqFeatureDev/types'
+import { DeletedFileInfo, NewFileInfo } from '../../../amazonqFeatureCommon/types'
 
 export class Messenger {
     public constructor(

packages/core/src/amazonq/commons/connector/connectorMessages.ts

@@ -8,7 +8,7 @@ import { MessagePublisher } from '../../messages/messagePublisher'
 import { CodeReference } from '../../webview/ui/connector'
 import { ChatItemAction, ProgressField, SourceLink } from '@aws/mynah-ui'
 import { ChatItemType } from '../model'
-import { DeletedFileInfo, NewFileInfo } from '../../../amazonqFeatureDev/types'
+import { DeletedFileInfo, NewFileInfo } from '../../../amazonqFeatureCommon/types'
 import { licenseText } from '../../../amazonqFeatureDev/constants'
 
 class UiMessage {

packages/core/src/amazonq/commons/session/sessionConfigFactory.ts

@@ -6,7 +6,7 @@
 import * as vscode from 'vscode'
 import { WorkspaceFolderNotFoundError } from '../../../amazonqFeatureDev/errors'
 import { VirtualFileSystem, VirtualMemoryFile } from '../../../shared'
-import { CurrentWsFolders } from '../../../amazonqFeatureDev/types'
+import { CurrentWsFolders } from '../../../amazonqFeatureCommon/types'
 
 export interface SessionConfig {
     // The paths on disk to where the source code lives

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

@@ -40,7 +40,7 @@ import {
     getWorkspaceRelativePath,
     isMultiRootWorkspace,
 } from '../../../shared/utilities/workspaceUtils'
-import { getPathsFromZipFilePath } from '../../../amazonqFeatureDev/util/files'
+import { getPathsFromZipFilePath } from '../../../amazonqFeatureCommon/util/files'
 import { FollowUpTypes } from '../../../amazonq/commons/types'
 import { DocGenerationTask } from '../docGenerationTask'
 

packages/core/src/amazonqDoc/session/session.ts

@@ -5,15 +5,15 @@
 
 import { featureName, Mode } from '../constants'
 import { DeletedFileInfo, Interaction, NewFileInfo, SessionState, SessionStateConfig } from '../types'
-import { PrepareCodeGenState } from './sessionState'
+import { DocPrepareCodeGenState } from './sessionState'
 import { telemetry } from '../../shared/telemetry/telemetry'
 import { extensionVersion, fs, getLogger, globals } from '../../shared'
 import { AuthUtil } from '../../codewhisperer/util/authUtil'
 import { SessionConfig } from '../../amazonq/commons/session/sessionConfigFactory'
 import { ReferenceLogViewProvider } from '../../codewhisperer'
 import path from 'path'
 import { FeatureDevClient } from '../../amazonqFeatureDev/client/featureDev'
-import { TelemetryHelper } from '../../amazonqFeatureDev/util/telemetryHelper'
+import { TelemetryHelper } from '../../amazonqFeatureCommon/util/telemetryHelper'
 import { ConversationNotStartedState } from '../../amazonqFeatureDev/session/sessionState'
 import { logWithConversationId } from '../../amazonqFeatureDev/userFacingText'
 import { ConversationIdNotFoundError } from '../../amazonqFeatureDev/errors'
@@ -86,7 +86,7 @@ export class Session {
             span.record({ amazonqConversationId: this._conversationId, credentialStartUrl: AuthUtil.instance.startUrl })
         })
 
-        this._state = new PrepareCodeGenState(
+        this._state = new DocPrepareCodeGenState(
             {
                 ...this.getSessionStateConfig(),
                 conversationId: this.conversationId,