rebase

Author: siakmun-aws

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

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

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

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

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

@@ -7,7 +7,7 @@ import request, { RequestError } from '../../shared/request'
 import { getLogger } from '../../shared/logger/logger'
 import { featureName } from '../../amazonqFeatureDev/constants'
 
-import { UploadCodeError, UploadURLExpired } from '../errors'
+import { UploadCodeError, UploadURLExpired } from '../../amazonqFeatureDev/errors'
 import { ToolkitError } from '../../shared/errors'
 import { i18n } from '../../shared/i18n-helper'