Remove feature dev plan generation phase (#4844)

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.

Author: willyyhuang

.changes/next-release/removal-14da4406-6839-4c23-a82e-df9ad486c446.json

@@ -0,0 +1,4 @@
+{
+  "type" : "removal",
+  "description" : "Amazon Q Feature dev: Improve quality and UX by removing approach generation flow"
+}

plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqFeatureDev/FeatureDevConstants.kt

@@ -7,10 +7,7 @@ const val FEATURE_EVALUATION_PRODUCT_NAME = "FeatureDev"
 
 const val FEATURE_NAME = "Amazon Q Developer Agent for software development"
 
-// Max number of times a user can attempt to retry an approach request if it fails
-const val APPROACH_RETRY_LIMIT = 3
-
-// Max number of times a user can attempt to retry a codegeneration request if it fails
+// Max number of times a user can attempt to retry a code generation request if it fails
 const val CODE_GENERATION_RETRY_LIMIT = 3
 
 // The default retry limit used when the session could not be found

plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqFeatureDev/FeatureDevExceptions.kt

@@ -12,8 +12,6 @@ class ContentLengthError(override val message: String, override val cause: Throw
 
 class ZipFileError(override val message: String, override val cause: Throwable?) : RuntimeException()
 
-class PlanIterationLimitError(override val message: String, override val cause: Throwable?) : RuntimeException()
-
 class CodeIterationLimitError(override val message: String, override val cause: Throwable?) : RuntimeException()
 
 class MonthlyConversationLimitError(override val message: String, override val cause: Throwable?) : RuntimeException()
@@ -27,9 +25,6 @@ internal fun codeGenerationFailedError(): Nothing =
 internal fun uploadCodeError(): Nothing =
     throw FeatureDevException(message("amazonqFeatureDev.exception.upload_code"))
 
-internal fun userMessageNotFound(): Nothing =
-    throw FeatureDevException(message("amazonqFeatureDev.exception.message_not_found"))
-
 internal fun conversationIdNotFound(): Nothing =
     throw FeatureDevException(message("amazonqFeatureDev.exception.conversation_not_found"))
 

plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqFeatureDev/clients/FeatureDevClient.kt

@@ -7,7 +7,6 @@ import com.intellij.openapi.components.Service
 import com.intellij.openapi.components.service
 import com.intellij.openapi.project.Project
 import com.intellij.openapi.util.SystemInfo
-import kotlinx.coroutines.future.await
 import software.amazon.awssdk.services.codewhispererruntime.CodeWhispererRuntimeClient
 import software.amazon.awssdk.services.codewhispererruntime.model.ArtifactType
 import software.amazon.awssdk.services.codewhispererruntime.model.ContentChecksumType
@@ -24,16 +23,7 @@ import software.amazon.awssdk.services.codewhispererruntime.model.TaskAssistPlan
 import software.amazon.awssdk.services.codewhispererruntime.model.UploadContext
 import software.amazon.awssdk.services.codewhispererruntime.model.UploadIntent
 import software.amazon.awssdk.services.codewhispererruntime.model.UserContext
-import software.amazon.awssdk.services.codewhispererstreaming.CodeWhispererStreamingAsyncClient
-import software.amazon.awssdk.services.codewhispererstreaming.model.ChatMessage
-import software.amazon.awssdk.services.codewhispererstreaming.model.ChatTriggerType
-import software.amazon.awssdk.services.codewhispererstreaming.model.ConversationState
 import software.amazon.awssdk.services.codewhispererstreaming.model.ExportIntent
-import software.amazon.awssdk.services.codewhispererstreaming.model.GenerateTaskAssistPlanRequest
-import software.amazon.awssdk.services.codewhispererstreaming.model.GenerateTaskAssistPlanResponseHandler
-import software.amazon.awssdk.services.codewhispererstreaming.model.ProgrammingLanguage
-import software.amazon.awssdk.services.codewhispererstreaming.model.UserInputMessage
-import software.amazon.awssdk.services.codewhispererstreaming.model.WorkspaceState
 import software.aws.toolkits.core.utils.error
 import software.aws.toolkits.core.utils.getLogger
 import software.aws.toolkits.core.utils.info
@@ -62,7 +52,7 @@ class FeatureDevClient(private val project: Project) {
             when {
                 SystemInfo.isWindows -> OperatingSystem.WINDOWS
                 SystemInfo.isMac -> OperatingSystem.MAC
-                // For now, categorize everything else as "Linux" (Linux/FreeBSD/Solaris/etc)
+                // For now, categorize everything else as "Linux" (Linux/FreeBSD/Solaris/etc.)
                 else -> OperatingSystem.LINUX
             }
 
@@ -80,8 +70,6 @@ class FeatureDevClient(private val project: Project) {
 
     private fun bearerClient() = connection().getConnectionSettings().awsClient<CodeWhispererRuntimeClient>()
 
-    private fun streamingBearerClient() = connection().getConnectionSettings().awsClient<CodeWhispererStreamingAsyncClient>()
-
     private val amazonQStreamingClient
         get() = AmazonQStreamingClient.getInstance(project)
 
@@ -117,54 +105,6 @@ class FeatureDevClient(private val project: Project) {
                 )
         }
 
-    suspend fun generateTaskAssistPlan(conversationId: String, uploadId: String, userMessage: String): GenerateTaskAssistPlanResult {
-        val assistantResponse = mutableListOf<String>()
-        var succeededPlanning = true
-
-        val result = streamingBearerClient().generateTaskAssistPlan(
-            GenerateTaskAssistPlanRequest.builder()
-                .conversationState(
-                    ConversationState.builder()
-                        .currentMessage(
-                            ChatMessage.fromUserInputMessage(
-                                UserInputMessage.builder()
-                                    .content(userMessage)
-                                    .build()
-                            )
-                        )
-                        .chatTriggerType(ChatTriggerType.MANUAL)
-                        .conversationId(conversationId)
-                        .build()
-                )
-                .workspaceState(
-                    WorkspaceState.builder()
-                        .programmingLanguage(
-                            ProgrammingLanguage.builder()
-                                .languageName("javascript")
-                                .build()
-                        )
-                        .uploadId(uploadId)
-                        .build()
-                )
-                .build(),
-            GenerateTaskAssistPlanResponseHandler.builder().subscriber(
-                GenerateTaskAssistPlanResponseHandler.Visitor.builder()
-                    .onAssistantResponseEvent {
-                        assistantResponse.add(it.content())
-                    }.onInvalidStateEvent {
-                        assistantResponse.clear()
-                        assistantResponse.add(it.message())
-                        succeededPlanning = false
-                    }
-                    .build()
-            )
-                .build()
-        )
-
-        result.await()
-        return GenerateTaskAssistPlanResult(approach = assistantResponse.joinToString(" "), succeededPlanning = succeededPlanning)
-    }
-
     fun startTaskAssistCodeGeneration(conversationId: String, uploadId: String, userMessage: String): StartTaskAssistCodeGenerationResponse = bearerClient()
         .startTaskAssistCodeGeneration {
                 request ->