refactor(amazonq): refactor doc and featureDev SessionState

Author: siakmun-aws

packages/core/src/amazonqFeatureCommon/client/client.ts renamed to packages/core/src/amazonq/client/client.ts

@@ -5,7 +5,7 @@
 
 import { ServiceOptions } from '../../shared'
 
-export abstract class Client {
+export abstract class FeatureClient {
     public abstract getClient(options?: Partial<ServiceOptions>): Promise<any>
 
     public abstract createConversation(): Promise<string>

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 '../../../amazonqFeatureCommon/types'
+import { DeletedFileInfo, NewFileInfo } from '../../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 '../../../amazonqFeatureCommon/types'
+import { DeletedFileInfo, NewFileInfo } from '../../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 '../../../amazonqFeatureCommon/types'
+import { CurrentWsFolders } from '../../types'
 
 export interface SessionConfig {
     // The paths on disk to where the source code lives

packages/core/src/amazonqFeatureCommon/constants.ts renamed to packages/core/src/amazonq/constants.ts

@@ -66,3 +66,5 @@ export function createMynahUI(
 }
 
 export * from './commons/types'
+export * from './types'
+export * from './constants'

packages/core/src/amazonq/index.ts

@@ -9,7 +9,7 @@ import globals from '../../shared/extensionGlobals'
 import { getLogger } from '../../shared/logger'
 import { telemetry } from '../../shared/telemetry/telemetry'
 import { VirtualFileSystem } from '../../shared/virtualFilesystem'
-import { CodeReference, UploadHistory } from '../../amazonq/webview/ui/connector'
+import { CodeReference, UploadHistory } from '../webview/ui/connector'
 import { AuthUtil } from '../../codewhisperer/util/authUtil'
 import { randomUUID } from '../../shared/crypto'
 import { i18n } from '../../shared/i18n-helper'
@@ -185,7 +185,30 @@ export abstract class BasePrepareCodeGenState implements SessionState {
         this.config.workspaceRoots = [workspaceRoot]
     }
 
-    protected abstract createNextState(config: SessionStateConfig): SessionState
+    protected createNextState(
+        config: SessionStateConfig,
+        StateClass?: new (
+            config: SessionStateConfig,
+            filePaths: NewFileInfo[],
+            deletedFiles: DeletedFileInfo[],
+            references: CodeReference[],
+            tabID: string,
+            currentIteration: number,
+            uploadHistory: UploadHistory,
+            codeGenerationRemainingIterationCount?: number,
+            codeGenerationTotalIterationCount?: number
+        ) => SessionState
+    ): SessionState {
+        return new StateClass!(
+            config,
+            this.filePaths,
+            this.deletedFiles,
+            this.references,
+            this.tabID,
+            this.currentIteration,
+            this.uploadHistory
+        )
+    }
 
     async interact(action: SessionStateAction): Promise<SessionStateInteraction> {
         const uploadId = await telemetry.amazonq_createUpload.run(async (span) => {
@@ -226,6 +249,19 @@ export interface CodeGenerationParams {
     workspaceFolders: CurrentWsFolders
 }
 
+export interface CreateNextStateParams {
+    filePaths: NewFileInfo[]
+    deletedFiles: DeletedFileInfo[]
+    references: CodeReference[]
+    currentIteration: number
+    remainingIterations?: number
+    totalIterations?: number
+    uploadHistory: UploadHistory
+    tokenSource: vscode.CancellationTokenSource
+    currentCodeGenerationId?: string
+    codeGenerationId?: string
+}
+
 export abstract class BaseCodeGenState extends CodeGenBase implements SessionState {
     constructor(
         config: SessionStateConfig,
@@ -241,21 +277,39 @@ export abstract class BaseCodeGenState extends CodeGenBase implements SessionSta
         super(config, tabID)
     }
 
-    protected abstract createNextState(
+    protected createNextState(
         config: SessionStateConfig,
-        params: {
-            filePaths: NewFileInfo[]
-            deletedFiles: DeletedFileInfo[]
-            references: CodeReference[]
-            currentIteration: number
-            remainingIterations?: number
-            totalIterations?: number
-            uploadHistory: UploadHistory
-            tokenSource: vscode.CancellationTokenSource
-            currentCodeGenerationId?: string
+        params: CreateNextStateParams,
+        StateClass?: new (
+            config: SessionStateConfig,
+            filePaths: NewFileInfo[],
+            deletedFiles: DeletedFileInfo[],
+            references: CodeReference[],
+            tabID: string,
+            currentIteration: number,
+            remainingIterations?: number,
+            totalIterations?: number,
+            uploadHistory?: UploadHistory,
+            tokenSource?: vscode.CancellationTokenSource,
+            currentCodeGenerationId?: string,
             codeGenerationId?: string
-        }
-    ): SessionState
+        ) => SessionState
+    ): SessionState {
+        return new StateClass!(
+            config,
+            params.filePaths,
+            params.deletedFiles,
+            params.references,
+            this.tabID,
+            params.currentIteration,
+            params.remainingIterations,
+            params.totalIterations,
+            params.uploadHistory,
+            params.tokenSource,
+            params.currentCodeGenerationId,
+            params.codeGenerationId
+        )
+    }
 
     async interact(action: SessionStateAction): Promise<SessionStateInteraction> {
         return telemetry.amazonq_codeGenerationInvoke.run(async (span) => {

packages/core/src/amazonqFeatureCommon/session/sessionState.ts renamed to packages/core/src/amazonq/session/sessionState.ts

@@ -6,10 +6,10 @@
 import * as vscode from 'vscode'
 import { VirtualFileSystem } from '../shared/virtualFilesystem'
 import type { CancellationTokenSource } from 'vscode'
-import { CodeReference, UploadHistory } from '../amazonq/webview/ui/connector'
-import { DiffTreeFileInfo } from '../amazonq/webview/ui/diffTree/types'
-import { Messenger } from '../amazonq/commons/connector/baseMessenger'
-import { Client } from './client/client'
+import { CodeReference, UploadHistory } from './webview/ui/connector'
+import { DiffTreeFileInfo } from './webview/ui/diffTree/types'
+import { Messenger } from './commons/connector/baseMessenger'
+import { FeatureClient } from './client/client'
 import { TelemetryHelper } from './util/telemetryHelper'
 
 export type Interaction = {
@@ -70,7 +70,7 @@ export interface SessionStateConfig {
     workspaceRoots: string[]
     workspaceFolders: CurrentWsFolders
     conversationId: string
-    proxyClient: Client
+    proxyClient: FeatureClient
     uploadId: string
     currentCodeGenerationId?: string
 }

packages/core/src/amazonqFeatureCommon/types.ts renamed to packages/core/src/amazonq/types.ts

@@ -12,7 +12,7 @@ import { ContentLengthError, PrepareRepoFailedError } from '../../amazonqFeature
 import { getLogger } from '../../shared/logger/logger'
 import { maxFileSizeBytes } from '../../amazonqFeatureDev/limits'
 import { createHash } from 'crypto'
-import { CurrentWsFolders, DeletedFileInfo, NewFileInfo, NewFileZipContents } from '../../amazonqFeatureCommon/types'
+import { CurrentWsFolders, DeletedFileInfo, NewFileInfo, NewFileZipContents } from '../types'
 import { hasCode, ToolkitError } from '../../shared/errors'
 import { AmazonqCreateUpload, Span, telemetry as amznTelemetry, telemetry } from '../../shared/telemetry/telemetry'
 import { TelemetryHelper } from './telemetryHelper'