refactor(amazonq): refactor doc and featureDev SessionState

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

@@ -18,13 +18,8 @@ import {
     sessionWriteFile,
     assertTelemetry,
 } from 'aws-core-vscode/test'
-import {
-    CurrentWsFolders,
-    FeatureDevClient,
-    featureDevScheme,
-    FeatureDevCodeGenState,
-} from 'aws-core-vscode/amazonqFeatureDev'
-import { Messenger } from 'aws-core-vscode/amazonq'
+import { FeatureDevClient, featureDevScheme, FeatureDevCodeGenState } from 'aws-core-vscode/amazonqFeatureDev'
+import { Messenger, CurrentWsFolders } from 'aws-core-vscode/amazonq'
 import path from 'path'
 import { fs } from 'aws-core-vscode/shared'
 

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

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

@@ -3,6 +3,15 @@
  * 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',
@@ -36,3 +45,119 @@ 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',
+}

packages/core/src/amazonq/index.ts

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

packages/core/src/amazonq/session/sessionState.ts

@@ -24,7 +24,7 @@ import {
     SessionStateConfig,
     SessionStateInteraction,
     SessionStatePhase,
-} from '../types'
+} from '../commons/types'
 import { prepareRepoData, getDeletedFileInfos, registerNewFiles } from '../util/files'
 import { uploadCode } from '../util/upload'
 

packages/core/src/amazonq/util/files.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 '../types'
+import { CurrentWsFolders, DeletedFileInfo, NewFileInfo, NewFileZipContents } from '../commons/types'
 import { hasCode, ToolkitError } from '../../shared/errors'
 import { AmazonqCreateUpload, Span, telemetry as amznTelemetry, telemetry } from '../../shared/telemetry/telemetry'
 import { TelemetryHelper } from './telemetryHelper'

packages/core/src/amazonq/util/telemetryHelper.ts

@@ -6,7 +6,7 @@
 import { globals } from '../../shared'
 import { getLogger } from '../../shared/logger/logger'
 import { AmazonqApproachInvoke, AmazonqCodeGenerationInvoke, Span } from '../../shared/telemetry/telemetry'
-import { LLMResponseType } from '../types'
+import { LLMResponseType } from '../commons/types'
 
 export class TelemetryHelper {
     public generateApproachIteration: number

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

@@ -9,7 +9,6 @@ import { DocGenerationStep, docScheme, getFileSummaryPercentage, Mode } from '..
 import { i18n } from '../../shared/i18n-helper'
 
 import { NewFileInfo, SessionState, SessionStateAction, SessionStateConfig } from '../types'
-import { Intent } from '../../amazonqFeatureDev'
 import {
     ContentLengthError,
     DocServiceError,
@@ -23,6 +22,7 @@ import {
 } from '../errors'
 import { DocMessenger } from '../messenger'
 import { BaseCodeGenState, BasePrepareCodeGenState, CreateNextStateParams } from '../../amazonq/session/sessionState'
+import { Intent } from '../../amazonq/commons/types'
 
 export class DocCodeGenState extends BaseCodeGenState {
     protected handleProgress(messenger: DocMessenger, detail?: string): void {

packages/core/src/amazonqDoc/types.ts

@@ -20,7 +20,7 @@ import {
     SessionState as FeatureDevSessionState,
     SessionStateAction as FeatureDevSessionStateAction,
     SessionStateInteraction as FeatureDevSessionStateInteraction,
-} from '../amazonq/types'
+} from '../amazonq/commons/types'
 
 import { Mode } from './constants'
 import { DocMessenger } from './messenger'

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

@@ -36,7 +36,7 @@ import {
     MetricDataOperationName,
     MetricDataResult,
     type NewFileInfo,
-} from '../../../amazonq'
+} from '../../../amazonq/commons/types'
 import { AuthUtil } from '../../../codewhisperer/util/authUtil'
 import { AuthController } from '../../../amazonq/auth/controller'
 import { getLogger } from '../../../shared/logger'

packages/core/src/amazonqFeatureDev/index.ts

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-export * from '../amazonq/types'
+// export * from '../amazonq/commons/types'
 export * from './userFacingText'
 export * from './errors'
 export * from './session/sessionState'