feat(feature dev): Remove planning phase in favor for new code gen agent (#5534)

## Problem

Us (QSDA) team is launching a new code generation agent.

We have conducted experiments wIth the new code generation agent, we
observed:
- Removing planning phase produces higher quality code
- Removing planning phase has general better user experience and remove
the inconsistency of code gen & plan gen

We have discussed with product that the rollout of new code generation
agent should also include planning phase removal as a whole, without an
A/B testing mechanism nor backward compatible implementation. The
endpoint for plan generation will still exist to support older toolkit
versions.

We plan to release the new code generation agent experience in the week
of September 9th.

Please squash merge this pull request, thank you!

## Solution

- Removed planning phase & refine plan in a typical /dev flow.
- Modified customer facing copies.

Author: willyyhuang

packages/amazonq/.changes/next-release/Removal-3d015711-0caf-4574-b304-524aec6588aa.json

@@ -0,0 +1,4 @@
+{
+	"type": "Removal",
+	"description": "Amazon Q Feature dev: Remove approach generation flow"
+}

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

@@ -61,7 +61,6 @@ describe('session', () => {
 
             const uploadID = '789'
             const tabID = '123'
-            const testApproach = 'test-approach'
             const workspaceFolders = [controllerSetup.workspaceFolder] as CurrentWsFolders
             workspaceFolderUriFsPath = controllerSetup.workspaceFolder.uri.fsPath
             uri = generateVirtualMemoryUri(uploadID, notRejectedFileName)
@@ -76,7 +75,6 @@ describe('session', () => {
 
             const codeGenState = new CodeGenState(
                 testConfig,
-                testApproach,
                 [
                     {
                         zipFilePath: notRejectedFileName,

packages/core/package.nls.json

@@ -272,11 +272,8 @@
     "AWS.amazonq.featureDev.error.prepareRepoFailedError": "Sorry, I ran into an issue while trying to upload your code. Please try again.",
     "AWS.amazonq.featureDev.error.promptRefusalException": "I'm sorry, I can't generate code for your request. Please make sure your message and code files comply with the <a href=\"https://aws.amazon.com/machine-learning/responsible-ai/policy/\">AWS Responsible AI Policy.</a>",
     "AWS.amazonq.featureDev.error.zipFileError": "The zip file is corrupted",
-    "AWS.amazonq.featureDev.error.planIterationLimitError": "Sorry, you've reached the quota for number of iterations on an implementation plan. You can generate code for this task or discuss a new plan. For more information on quotas, see the <a href=\"https://docs.aws.amazon.com/amazonq/latest/qdeveloper-ug/software-dev.html#quotas\">Amazon Q Developer documentation</a>.",
     "AWS.amazonq.featureDev.error.codeIterationLimitError": "Sorry, you've reached the quota for number of iterations on code generation. You can insert this code in your files or discuss a new plan. For more information on quotas, see the <a href=\"https://docs.aws.amazon.com/amazonq/latest/qdeveloper-ug/software-dev.html#quotas\" target=\"_blank\">Amazon Q Developer documentation.</a>",
     "AWS.amazonq.featureDev.error.tabIdNotFoundError": "I'm sorry, I'm having technical difficulties at the moment. Please try again.",
-    "AWS.amazonq.featureDev.error.approachPhase.denyListedError": "I'm sorry, I'm having trouble generating a plan. Please try again.",
-    "AWS.amazonq.featureDev.error.approachPhase.default": "I'm sorry, I ran into an issue while trying to approach the problem. Please try again.",
     "AWS.amazonq.featureDev.error.codeGen.denyListedError": "I'm sorry, I'm having trouble generating your code and can't continue at the moment. Please try again later, and share feedback to help me improve.",
     "AWS.amazonq.featureDev.error.codeGen.default": "I'm sorry, I ran into an issue while trying to generate your code. Please try again.",
     "AWS.amazonq.featureDev.error.codeGen.timeout": "Code generation did not finish within the expected time",
@@ -287,35 +284,34 @@
     "AWS.amazonq.featureDev.error.technicalDifficulties": "I'm sorry, I'm having technical difficulties and can't continue at the moment. Please try again later, and share feedback to help me improve.",
     "AWS.amazonq.featureDev.error.throttling": "I'm sorry, I'm experiencing high demand at the moment and can't generate your code. This attempt won't count toward usage limits. Please try again.",
     "AWS.amazonq.featureDev.error.submitFeedback": "'submitFeedback' command was called programmatically, but its not registered.",
-    "AWS.amazonq.featureDev.error.approachNewTab": "There has been a problem generating an approach. Please open a conversation in a new tab",
-    "AWS.amazonq.featureDev.pillText.awaitMessage": "This may take a few minutes. I will send a notification when it's complete if you navigate away from this panel, but please keep the tab open.",
+    "AWS.amazonq.featureDev.pillText.awaitMessage": "Okay, I'll generate code for that.\n\nThis might take a few minutes. You can navigate away from this chat, but please keep this tab open. I'll notify you when I'm done.",
+    "AWS.amazonq.featureDev.pillText.awaitMessageRetry": "Okay, I'll generate new code.\n\nThis might take a few minutes. You can navigate away from this chat, but please keep this tab open. I'll notify you when I'm done.",
     "AWS.amazonq.featureDev.pillText.modifyDefaultSourceFolder": "Choose another folder in your workspace",
-    "AWS.amazonq.featureDev.pillText.newPlan": "Discuss a new plan",
-    "AWS.amazonq.featureDev.pillText.newTask": "Work on new task",
+    "AWS.amazonq.featureDev.pillText.newTask": "Yes, I have another task",
     "AWS.amazonq.featureDev.pillText.generateCode": "Generate code",
+    "AWS.amazonq.featureDev.pillText.uploadingCode": "Uploading code ...",
+    "AWS.amazonq.featureDev.pillText.contextGatheringCompleted": "Gathering context...",
     "AWS.amazonq.featureDev.pillText.generatingCode": "Generating code ...",
-    "AWS.amazonq.featureDev.pillText.generatingPlan": "Generating plan ...",
     "AWS.amazonq.featureDev.pillText.requestingChanges": "Requesting changes ...",
     "AWS.amazonq.featureDev.pillText.insertCode": "Insert code",
     "AWS.amazonq.featureDev.pillText.sendFeedback": "Send feedback",
     "AWS.amazonq.featureDev.pillText.selectFiles": "Select files for context",
     "AWS.amazonq.featureDev.pillText.retry": "Retry",
     "AWS.amazonq.featureDev.pillText.writeNewPrompt": "Write a new prompt",
     "AWS.amazonq.featureDev.pillText.reauthenticate": "Follow instructions to re-authenticate ...",
-    "AWS.amazonq.featureDev.pillText.closeSession": "Close session",
+    "AWS.amazonq.featureDev.pillText.closeSession": "No, thanks",
     "AWS.amazonq.featureDev.pillText.selectOption": "Select an option above to proceed",
     "AWS.amazonq.featureDev.pillText.unableGenerateChanges": "Unable to generate any file changes",
     "AWS.amazonq.featureDev.pillText.provideFeedback": "Provide feedback to regenerate",
     "AWS.amazonq.featureDev.answer.generateSuggestion": "Would you like to generate a suggestion for this? You’ll review a file diff before inserting into your project.",
-    "AWS.amazonq.featureDev.answer.howPlanCanBeImproved": "How can this plan be improved?",
     "AWS.amazonq.featureDev.answer.qGeneratedCode": "The Amazon Q Developer Agent for software development has generated code for you to review",
-    "AWS.amazonq.featureDev.answer.howCodeCanBeImproved": "How can the code be improved?",
-    "AWS.amazonq.featureDev.answer.approachCreation": "Ok, let me create a plan. This may take a few minutes.",
-    "AWS.amazonq.featureDev.answer.updateCode": "Code has been updated. Would you like to work on another task?",
-    "AWS.amazonq.featureDev.answer.sessionClosed": "Your session is now closed.",
-    "AWS.amazonq.featureDev.answer.newTaskChanges": "What change would you like to make?",
+    "AWS.amazonq.featureDev.answer.howCodeCanBeImproved": "How can I improve the code for your use case?",
+    "AWS.amazonq.featureDev.answer.updateCode": "Okay, I updated your code files. Would you like to work on another task?",
+    "AWS.amazonq.featureDev.answer.sessionClosed": "Okay, I've ended this chat session. You can open a new tab to chat or start another workflow.",
+    "AWS.amazonq.featureDev.answer.newTaskChanges": "What new task would you like to work on?",
     "AWS.amazonq.featureDev.placeholder.chatInputDisabled": "Chat input is disabled",
     "AWS.amazonq.featureDev.placeholder.additionalImprovements": "Provide input on additional improvements",
     "AWS.amazonq.featureDev.placeholder.feedback": "Feedback, comments ...",
-    "AWS.amazonq.featureDev.placeholder.describe": "Describe your task or issue in as much detail as possible"
+    "AWS.amazonq.featureDev.placeholder.describe": "Describe your task or issue in as much detail as possible",
+    "AWS.amazonq.featureDev.placeholder.sessionClosed": "Open a new chat tab to continue"
 }

packages/core/src/amazonq/webview/ui/followUps/generator.ts

@@ -44,7 +44,7 @@ export class FollowUpGenerator {
         switch (tabType) {
             case 'featuredev':
                 return {
-                    text: 'Would you like to follow up with',
+                    text: 'Ask a follow up question',
                     options: [
                         {
                             pillText: 'What are some examples of tasks?',

packages/core/src/amazonq/webview/ui/tabs/constants.ts

@@ -26,9 +26,9 @@ export const TabTypeDataMap: Record<TabType, TabTypeData> = {
         placeholder: 'Describe your task or issue in as much detail as possible',
         welcome: `Hi, I'm the Amazon Q Developer Agent for software development.
 
-I can generate code to implement new functionality across your workspace. We'll start by discussing an implementation plan, and then we can review and regenerate code based on your feedback.
+I can generate code to implement new functionality across your workspace. To get started, describe the task you're trying to accomplish, and I'll generate code. If you want to make changes, you can provide feedback and I'll regenerate code.
 
-To get started, describe the task you are trying to accomplish.`,
+What would you like to work on?`,
     },
     gumby: {
         title: 'Q - Code Transformation',

packages/core/src/amazonqFeatureDev/client/featureDev.ts

@@ -18,17 +18,10 @@ import {
     CodeIterationLimitError,
     ContentLengthError,
     MonthlyConversationLimitError,
-    PlanIterationLimitError,
     UnknownApiError,
 } from '../errors'
-import {
-    ToolkitError,
-    isAwsError,
-    isCodeWhispererStreamingServiceException,
-    getHttpStatusCode,
-} from '../../shared/errors'
+import { ToolkitError, isAwsError } from '../../shared/errors'
 import { getCodewhispererConfig } from '../../codewhisperer/client/codewhisperer'
-import { LLMResponseType } from '../types'
 import { createCodeWhispererChatStreamingClient } from '../../shared/clients/codewhispererChatClient'
 import { getClientId, getOptOutPreference, getOperatingSystem } from '../../shared/telemetry/util'
 import { extensionVersion } from '../../shared/vscode/env'
@@ -55,15 +48,6 @@ export async function createFeatureDevProxyClient(): Promise<FeatureDevProxyClie
     )) as FeatureDevProxyClient
 }
 
-const streamResponseErrors: Record<string, number> = {
-    ValidationException: 400,
-    AccessDeniedException: 403,
-    ResourceNotFoundException: 404,
-    ConflictException: 409,
-    ThrottlingException: 429,
-    InternalServerException: 500,
-}
-
 export class FeatureDevClient {
     public async getClient() {
         // Should not be stored for the whole session.
@@ -132,77 +116,6 @@ export class FeatureDevClient {
             throw new UnknownApiError(e instanceof Error ? e.message : 'Unknown error', 'CreateUploadUrl')
         }
     }
-    public async generatePlan(
-        conversationId: string,
-        uploadId: string,
-        userMessage: string
-    ): Promise<
-        { responseType: 'EMPTY'; approach?: string } | { responseType: 'VALID' | 'INVALID_STATE'; approach: string }
-    > {
-        try {
-            const streamingClient = await createCodeWhispererChatStreamingClient()
-            const params = {
-                workspaceState: {
-                    programmingLanguage: { languageName: 'javascript' },
-                    uploadId,
-                },
-                conversationState: {
-                    currentMessage: { userInputMessage: { content: userMessage } },
-                    chatTriggerType: 'MANUAL',
-                    conversationId,
-                },
-            }
-            getLogger().debug(`Executing generateTaskAssistPlan with %O`, params)
-            const response = await streamingClient.generateTaskAssistPlan(params)
-            getLogger().debug(`${featureName}: Generated plan: %O`, {
-                requestId: response.$metadata.requestId,
-            })
-            let responseType: LLMResponseType = 'EMPTY'
-            if (!response.planningResponseStream) {
-                return { responseType }
-            }
-
-            const assistantResponse: string[] = []
-            for await (const responseItem of response.planningResponseStream) {
-                if (responseItem.error !== undefined) {
-                    throw responseItem.error
-                } else if (responseItem.invalidStateEvent !== undefined) {
-                    getLogger().debug('Received Invalid State Event: %O', responseItem.invalidStateEvent)
-                    assistantResponse.splice(0)
-                    assistantResponse.push(responseItem.invalidStateEvent.message ?? '')
-                    responseType = 'INVALID_STATE'
-                    break
-                } else if (responseItem.assistantResponseEvent !== undefined) {
-                    responseType = 'VALID'
-                    assistantResponse.push(responseItem.assistantResponseEvent.content ?? '')
-                }
-            }
-            return { responseType, approach: assistantResponse.join('') }
-        } catch (e) {
-            if (isCodeWhispererStreamingServiceException(e)) {
-                getLogger().error(
-                    `${featureName}: failed to execute planning: ${e.message} RequestId: ${
-                        e.$metadata.requestId ?? 'unknown'
-                    }`
-                )
-                if (
-                    (e.name === 'ThrottlingException' &&
-                        e.message.includes('limit for number of iterations on an implementation plan')) ||
-                    e.name === 'ServiceQuotaExceededException'
-                ) {
-                    throw new PlanIterationLimitError()
-                }
-                throw new ApiError(
-                    e.message,
-                    'GeneratePlan',
-                    e.name,
-                    getHttpStatusCode(e) ?? streamResponseErrors[e.name] ?? 500
-                )
-            }
-
-            throw new UnknownApiError(e instanceof Error ? e.message : 'Unknown error', 'GeneratePlan')
-        }
-    }
 
     public async startCodeGeneration(conversationId: string, uploadId: string, message: string) {
         try {