Testing master branch

Author: siakmun-aws

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

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

packages/core/src/amazonq/client/client.ts

@@ -24,8 +24,9 @@ import {
     UpdatePlaceholderMessage,
     UpdatePromptProgressMessage,
 } from './connectorMessages'
-import { DeletedFileInfo, FollowUpTypes, NewFileInfo } from '../types'
+import { FollowUpTypes } from '../types'
 import { messageWithConversationId } from '../../../amazonqFeatureDev/userFacingText'
+import { DeletedFileInfo, NewFileInfo } from '../../../amazonqFeatureDev/types'
 import { FeatureAuthState } from '../../../codewhisperer/util/authUtil'
 
 export class Messenger {

packages/core/src/amazonq/commons/connector/baseMessenger.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 '../types'
+import { DeletedFileInfo, NewFileInfo } from '../../../amazonqFeatureDev/types'
 import { licenseText } from '../../../amazonqFeatureDev/constants'
 
 class UiMessage {

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

@@ -5,7 +5,7 @@
 
 import * as vscode from 'vscode'
 import { WorkspaceFolderNotFoundError } from '../../../amazonqFeatureDev/errors'
-import { CurrentWsFolders } from '../types'
+import { CurrentWsFolders } from '../../../amazonqFeatureDev/types'
 import { VirtualFileSystem } from '../../../shared/virtualFilesystem'
 import { VirtualMemoryFile } from '../../../shared/virtualMemoryFile'
 

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

@@ -3,15 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import * as vscode from 'vscode'
-import { VirtualFileSystem } from '../../shared/virtualFilesystem'
-import type { CancellationTokenSource } from 'vscode'
-import { CodeReference, UploadHistory } from '../webview/ui/connector'
-import { DiffTreeFileInfo } from '../webview/ui/diffTree/types'
-import { Messenger } from './connector/baseMessenger'
-import { FeatureClient } from '../client/client'
-import { TelemetryHelper } from '../util/telemetryHelper'
-
 export enum FollowUpTypes {
     // UnitTestGeneration
     ViewDiff = 'ViewDiff',
@@ -48,119 +39,3 @@ export enum FollowUpTypes {
     ProceedFolderSelection = 'ProceedFolderSelection',
     CancelFolderSelection = 'CancelFolderSelection',
 }
-
-export type Interaction = {
-    // content to be sent back to the chat UI
-    content?: string
-    responseType?: LLMResponseType
-}
-
-export interface SessionStateInteraction {
-    nextState: SessionState | Omit<SessionState, 'uploadId'> | undefined
-    interaction: Interaction
-    currentCodeGenerationId?: string
-}
-
-export enum Intent {
-    DEV = 'DEV',
-    DOC = 'DOC',
-}
-
-export enum DevPhase {
-    INIT = 'Init',
-    APPROACH = 'Approach',
-    CODEGEN = 'Codegen',
-}
-
-export enum CodeGenerationStatus {
-    COMPLETE = 'Complete',
-    PREDICT_READY = 'predict-ready',
-    IN_PROGRESS = 'InProgress',
-    PREDICT_FAILED = 'predict-failed',
-    DEBATE_FAILED = 'debate-failed',
-    FAILED = 'Failed',
-}
-
-export type SessionStatePhase = DevPhase.INIT | DevPhase.CODEGEN
-
-export type CurrentWsFolders = [vscode.WorkspaceFolder, ...vscode.WorkspaceFolder[]]
-
-export interface SessionState {
-    readonly filePaths?: NewFileInfo[]
-    readonly deletedFiles?: DeletedFileInfo[]
-    readonly references?: CodeReference[]
-    readonly phase?: SessionStatePhase
-    readonly uploadId: string
-    readonly currentIteration?: number
-    currentCodeGenerationId?: string
-    tokenSource?: CancellationTokenSource
-    readonly codeGenerationId?: string
-    readonly tabID: string
-    interact(action: SessionStateAction): Promise<SessionStateInteraction>
-    updateWorkspaceRoot?: (workspaceRoot: string) => void
-    codeGenerationRemainingIterationCount?: number
-    codeGenerationTotalIterationCount?: number
-    uploadHistory?: UploadHistory
-}
-
-export interface SessionStateConfig {
-    workspaceRoots: string[]
-    workspaceFolders: CurrentWsFolders
-    conversationId: string
-    proxyClient: FeatureClient
-    uploadId: string
-    currentCodeGenerationId?: string
-}
-
-export interface SessionStateAction {
-    task: string
-    msg: string
-    messenger: Messenger
-    fs: VirtualFileSystem
-    telemetry: TelemetryHelper
-    uploadHistory?: UploadHistory
-    tokenSource?: CancellationTokenSource
-}
-
-export type NewFileZipContents = { zipFilePath: string; fileContent: string }
-export type NewFileInfo = DiffTreeFileInfo &
-    NewFileZipContents & {
-        virtualMemoryUri: vscode.Uri
-        workspaceFolder: vscode.WorkspaceFolder
-    }
-
-export type DeletedFileInfo = DiffTreeFileInfo & {
-    workspaceFolder: vscode.WorkspaceFolder
-}
-
-export interface SessionInfo {
-    // TODO, if it had a summarized name that was better for the UI
-    name?: string
-    history: string[]
-}
-
-export interface SessionStorage {
-    [key: string]: SessionInfo
-}
-
-export type LLMResponseType = 'EMPTY' | 'INVALID_STATE' | 'VALID'
-
-export interface UpdateFilesPathsParams {
-    tabID: string
-    filePaths: NewFileInfo[]
-    deletedFiles: DeletedFileInfo[]
-    messageId: string
-    disableFileActions?: boolean
-}
-
-export enum MetricDataOperationName {
-    StartCodeGeneration = 'StartCodeGeneration',
-    EndCodeGeneration = 'EndCodeGeneration',
-}
-
-export enum MetricDataResult {
-    Success = 'Success',
-    Fault = 'Fault',
-    Error = 'Error',
-    LlmFailure = 'LLMFailure',
-}