Merge branch 'main' into ai_gen

leigaol · web-flow · commit 1c5ad057ee2b · 2025-01-15T14:33:44.000-08:00
diff --git a/.changes/next-release/bugfix-693e3f08-15f7-4453-b304-e473c58bf46b.json b/.changes/next-release/bugfix-693e3f08-15f7-4453-b304-e473c58bf46b.json
@@ -0,0 +1,4 @@
+{
+  "type" : "bugfix",
+  "description" : "Amazon Q /dev: Remove hard-coded limits and instead rely server-side data to communicate number of code generations remaining"
+}
diff --git a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqCodeTest/CodeWhispererUTGChatManager.kt b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqCodeTest/CodeWhispererUTGChatManager.kt
@@ -524,6 +524,8 @@ class CodeWhispererUTGChatManager(val project: Project, private val cs: Coroutin
             try {
                 launchTestGenFlow(prompt, codeTestChatHelper, previousIterationContext, selectionRange)
             } catch (e: Exception) {
+                // reset number of unitTestGenerated to null
+                session.numberOfUnitTestCasesGenerated = null
                 // Add an answer for displaying error message
                 val errorMessage = when {
                     e is CodeTestException &&
diff --git a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqCodeTest/controller/CodeTestChatController.kt b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqCodeTest/controller/CodeTestChatController.kt
@@ -9,7 +9,6 @@ import com.intellij.diff.DiffManagerEx
 import com.intellij.diff.requests.SimpleDiffRequest
 import com.intellij.ide.BrowserUtil
 import com.intellij.openapi.application.ApplicationManager
-import com.intellij.openapi.fileEditor.FileDocumentManager
 import com.intellij.openapi.fileEditor.FileEditorManager
 import com.intellij.openapi.project.Project
 import com.intellij.openapi.project.guessProjectDir
@@ -475,16 +474,14 @@ class CodeTestChatController(
                     )
                     session.openedDiffFile = FileEditorManager.getInstance(context.project).selectedEditor?.file
                     ApplicationManager.getApplication().runReadAction {
-                        generatedFileContent = getFileContentAtTestFilePath(
-                            session.projectRoot,
-                            session.testFileRelativePathToProjectRoot
-                        )
-                        val selectedFile = FileEditorManager.getInstance(context.project).selectedEditor?.file
-                        selectedFileContent = selectedFile?.let {
-                            FileDocumentManager.getInstance().getDocument(it)?.text
-                        }.orEmpty()
+                        generatedFileContent = getGeneratedFileContent(session)
                     }
 
+                    selectedFileContent = getFileContentAtTestFilePath(
+                        session.projectRoot,
+                        session.testFileRelativePathToProjectRoot,
+                    )
+
                     // Line difference calculation: linesOfCodeGenerated = number of lines in generated test file - number of lines in original test file
                     numberOfLinesGenerated = generatedFileContent.lines().size
                     numberOfLinesSelected = selectedFileContent.lines().size
@@ -1072,6 +1069,12 @@ class CodeTestChatController(
         }
     }
 
+    // Return generated test file content
+    private fun getGeneratedFileContent(session: Session): String {
+        val generateFileContent = session.generatedTestDiffs[session.testFileRelativePathToProjectRoot].toString()
+        return generateFileContent
+    }
+
     /*
      If shortAnswer has buildCommand, use it, if it doesn't hardcode it according to the user type(internal or not)
     private fun getBuildCommand(tabId: String): String {
diff --git a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqFeatureDev/controller/FeatureDevControllerExtensions.kt b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqFeatureDev/controller/FeatureDevControllerExtensions.kt
@@ -28,7 +28,6 @@ import software.aws.toolkits.jetbrains.services.amazonqFeatureDev.session.Delete
 import software.aws.toolkits.jetbrains.services.amazonqFeatureDev.session.NewFileZipInfo
 import software.aws.toolkits.jetbrains.services.amazonqFeatureDev.session.PrepareCodeGenerationState
 import software.aws.toolkits.jetbrains.services.amazonqFeatureDev.session.Session
-import software.aws.toolkits.jetbrains.services.amazonqFeatureDev.session.SessionState
 import software.aws.toolkits.jetbrains.services.amazonqFeatureDev.util.CancellationTokenSource
 import software.aws.toolkits.jetbrains.services.amazonqFeatureDev.util.InsertAction
 import software.aws.toolkits.jetbrains.services.amazonqFeatureDev.util.getFollowUpOptions
@@ -64,7 +63,7 @@ suspend fun FeatureDevController.onCodeGeneration(
         var totalIterations: Int? = state.codeGenerationTotalIterationCount
 
         if (state.token?.token?.isCancellationRequested() == true) {
-            disposeToken(state, messenger, tabId, state.currentIteration?.let { CODE_GENERATION_RETRY_LIMIT.minus(it) }, CODE_GENERATION_RETRY_LIMIT)
+            disposeToken(messenger, tabId, state.codeGenerationRemainingIterationCount, state.codeGenerationTotalIterationCount)
             return
         }
 
@@ -96,7 +95,7 @@ suspend fun FeatureDevController.onCodeGeneration(
         }
 
         if (state.token?.token?.isCancellationRequested() == true) {
-            disposeToken(state, messenger, tabId, state.currentIteration?.let { CODE_GENERATION_RETRY_LIMIT.minus(it) }, CODE_GENERATION_RETRY_LIMIT)
+            disposeToken(messenger, tabId, state.codeGenerationRemainingIterationCount, state.codeGenerationTotalIterationCount)
             return
         }
 
@@ -133,14 +132,20 @@ suspend fun FeatureDevController.onCodeGeneration(
                 tabId = tabId,
                 messageType = FeatureDevMessageType.Answer,
                 message =
-                if (remainingIterations == 0) {
-                    message("amazonqFeatureDev.code_generation.iteration_zero")
-                } else {
+                if (remainingIterations > 2) {
+                    message("amazonqFeatureDev.code_generation.iteration_counts_ask_to_add_code_or_feedback")
+                } else if (remainingIterations > 0) {
                     message(
                         "amazonqFeatureDev.code_generation.iteration_counts",
                         remainingIterations,
                         totalIterations,
                     )
+                } else {
+                    message(
+                        "amazonqFeatureDev.code_generation.iteration_counts_ask_to_add_code",
+                        remainingIterations,
+                        totalIterations,
+                    )
                 },
             )
         }
@@ -196,7 +201,6 @@ suspend fun FeatureDevController.onCodeGeneration(
 }
 
 private suspend fun disposeToken(
-    state: SessionState,
     messenger: MessagePublisher,
     tabId: String,
     remainingIterations: Int?,
@@ -234,16 +238,25 @@ private suspend fun disposeToken(
         return
     }
 
-    messenger.sendAnswer(
-        tabId = tabId,
-        messageType = FeatureDevMessageType.Answer,
-        message =
-        message(
-            "amazonqFeatureDev.code_generation.stopped_code_generation",
-            remainingIterations ?: state.currentIteration?.let { CODE_GENERATION_RETRY_LIMIT - it } as Any,
-            totalIterations ?: CODE_GENERATION_RETRY_LIMIT,
-        ),
-    )
+    if (remainingIterations !== null && totalIterations !== null && remainingIterations <= 2) {
+        messenger.sendAnswer(
+            tabId = tabId,
+            messageType = FeatureDevMessageType.Answer,
+            message =
+            message(
+                "amazonqFeatureDev.code_generation.stopped_code_generation",
+                remainingIterations,
+                totalIterations,
+            ),
+        )
+    } else {
+        messenger.sendAnswer(
+            tabId = tabId,
+            messageType = FeatureDevMessageType.Answer,
+            message =
+            message("amazonqFeatureDev.code_generation.stopped_code_generation_no_iteration_count_display"),
+        )
+    }
 
     messenger.sendChatInputEnabledMessage(tabId = tabId, enabled = true)
 
diff --git a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqFeatureDev/session/CodeGenerationState.kt b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqFeatureDev/session/CodeGenerationState.kt
@@ -84,6 +84,12 @@ class CodeGenerationState(
             numberOfFilesGenerated = codeGenerationResult.newFiles.size
             codeGenerationRemainingIterationCount = codeGenerationResult.codeGenerationRemainingIterationCount
             codeGenerationTotalIterationCount = codeGenerationResult.codeGenerationTotalIterationCount
+            currentIteration =
+                if (codeGenerationRemainingIterationCount != null && codeGenerationTotalIterationCount != null) {
+                    codeGenerationTotalIterationCount?.let { total -> codeGenerationRemainingIterationCount?.let { remaining -> total - remaining } }
+                } else {
+                    currentIteration?.plus(1)
+                }
 
             runCatching {
                 var insertedLines = 0
@@ -128,7 +134,7 @@ class CodeGenerationState(
                     filePaths = codeGenerationResult.newFiles,
                     deletedFiles = codeGenerationResult.deletedFiles,
                     references = codeGenerationResult.references,
-                    currentIteration = currentIteration?.plus(1),
+                    currentIteration = currentIteration,
                     uploadId = uploadId,
                     messenger = messenger,
                     codeGenerationRemainingIterationCount = codeGenerationRemainingIterationCount,
@@ -182,17 +188,22 @@ private suspend fun CodeGenerationState.generateCode(
 ): CodeGenerationResult {
     val pollCount = 360
     val requestDelay = 5000L
+    var codeGenerationRemainingIterationCount: Int? = null
+    var codeGenerationTotalIterationCount: Int? = null
 
     repeat(pollCount) {
         if (token?.token?.isCancellationRequested() == true) {
-            return CodeGenerationResult(emptyList(), emptyList(), emptyList())
+            return CodeGenerationResult(emptyList(), emptyList(), emptyList(), codeGenerationRemainingIterationCount, codeGenerationTotalIterationCount)
         }
         val codeGenerationResultState =
             config.featureDevService.getTaskAssistCodeGeneration(
                 conversationId = config.conversationId,
                 codeGenerationId = codeGenerationId,
             )
 
+        codeGenerationRemainingIterationCount = codeGenerationResultState.codeGenerationRemainingIterationCount()
+        codeGenerationTotalIterationCount = codeGenerationResultState.codeGenerationTotalIterationCount()
+
         when (codeGenerationResultState.codeGenerationStatus().status()) {
             CodeGenerationWorkflowStatus.COMPLETE -> {
                 val codeGenerationStreamResult =
@@ -207,8 +218,8 @@ private suspend fun CodeGenerationState.generateCode(
                     newFiles = newFileInfo,
                     deletedFiles = deletedFileInfo,
                     references = codeGenerationStreamResult.references,
-                    codeGenerationRemainingIterationCount = codeGenerationResultState.codeGenerationRemainingIterationCount(),
-                    codeGenerationTotalIterationCount = codeGenerationResultState.codeGenerationTotalIterationCount(),
+                    codeGenerationRemainingIterationCount = codeGenerationRemainingIterationCount,
+                    codeGenerationTotalIterationCount = codeGenerationTotalIterationCount,
                 )
             }
             CodeGenerationWorkflowStatus.IN_PROGRESS -> {
@@ -252,7 +263,7 @@ private suspend fun CodeGenerationState.generateCode(
         }
     }
 
-    return CodeGenerationResult(emptyList(), emptyList(), emptyList())
+    return CodeGenerationResult(emptyList(), emptyList(), emptyList(), codeGenerationRemainingIterationCount, codeGenerationTotalIterationCount)
 }
 
 fun registerNewFiles(newFileContents: Map<String, String>): List<NewFileZipInfo> =
diff --git a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqFeatureDev/session/ConversationNotStartedState.kt b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqFeatureDev/session/ConversationNotStartedState.kt
@@ -9,8 +9,8 @@ class ConversationNotStartedState(
     override var approach: String,
     override val tabID: String,
     override var token: CancellationTokenSource?,
-    override var codeGenerationRemainingIterationCount: Int?,
-    override var codeGenerationTotalIterationCount: Int?,
+    override var codeGenerationRemainingIterationCount: Int? = null,
+    override var codeGenerationTotalIterationCount: Int? = null,
     override var currentIteration: Int?,
     override var diffMetricsProcessed: DiffMetricsProcessed,
 ) : SessionState {
diff --git a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqFeatureDev/session/Session.kt b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqFeatureDev/session/Session.kt
@@ -55,8 +55,6 @@ class Session(val tabID: String, val project: Project) {
             approach = "",
             tabID = tabID,
             token = null,
-            codeGenerationRemainingIterationCount = 0,
-            codeGenerationTotalIterationCount = CODE_GENERATION_RETRY_LIMIT,
             currentIteration = 0,
             diffMetricsProcessed = DiffMetricsProcessed(HashSet(), HashSet())
         )
diff --git a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/cwc/editor/context/focusArea/FocusAreaContextExtractor.kt b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/cwc/editor/context/focusArea/FocusAreaContextExtractor.kt
@@ -180,7 +180,7 @@ class FocusAreaContextExtractor(private val fqnWebviewAdapter: FqnWebviewAdapter
         val startOffset = 0.coerceAtLeast(offset - halfMaxCharacters)
         val endOffset = fileText.length.coerceAtMost(offset + halfMaxCharacters)
 
-        // Adjust the start and end offsets if necessary to ensure a total of 10k characters
+        // Adjust the start and end offsets if necessary to ensure a total of 40k characters
         val excessCharacters = maxCharacters - (endOffset - startOffset)
         val adjustedStartOffset = 0.coerceAtLeast(startOffset - excessCharacters)
         val adjustedEndOffset = fileText.length.coerceAtMost(endOffset + excessCharacters)
@@ -198,7 +198,7 @@ class FocusAreaContextExtractor(private val fqnWebviewAdapter: FqnWebviewAdapter
     }
 
     companion object {
-        const val MAX_LENGTH = 10000
+        const val MAX_LENGTH = 40000
     }
 }
 
diff --git a/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/CodeModernizerManager.kt b/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/CodeModernizerManager.kt
@@ -164,6 +164,7 @@ class CodeModernizerManager(private val project: Project) : PersistentStateCompo
                 return if (javaModules.isNotEmpty()) {
                     ValidationResult(
                         true,
+                        metadata = "found ${javaModules.size} modules with SQL"
                     )
                 } else {
                     ValidationResult(
diff --git a/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/CodeTransformTelemetryManager.kt b/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/CodeTransformTelemetryManager.kt
@@ -58,6 +58,7 @@ class CodeTransformTelemetryManager(private val project: Project) {
             codeTransformPreValidationError = validationError,
             codeTransformBuildSystem = validationResult.buildSystem,
             codeTransformSessionId = sessionId,
+            codeTransformMetadata = validationResult.metadata,
             result = if (validationResult.valid) Result.Succeeded else Result.Failed,
             reason = if (validationResult.valid) null else validationResult.invalidTelemetryReason.additionalInfo,
         )
diff --git a/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/model/ValidationResult.kt b/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/model/ValidationResult.kt
@@ -6,10 +6,12 @@ package software.aws.toolkits.jetbrains.services.codemodernizer.model
 import com.intellij.openapi.vfs.VirtualFile
 import software.aws.toolkits.telemetry.CodeTransformBuildSystem
 
+// TODO: combine a lot of these fields into the 'metadata' field
 data class ValidationResult(
     val valid: Boolean,
     val invalidTelemetryReason: InvalidTelemetryReason = InvalidTelemetryReason(),
     val validatedBuildFiles: List<VirtualFile> = emptyList(),
     val buildSystem: CodeTransformBuildSystem = CodeTransformBuildSystem.Unknown,
     val buildSystemVersion: String = "",
+    val metadata: String? = null,
 )
diff --git a/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/utils/CodeTransformModuleUtils.kt b/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/utils/CodeTransformModuleUtils.kt
@@ -44,9 +44,8 @@ fun Module.tryGetJdkLanguageLevelJdk(): JavaSdkVersion? {
 // search for Strings that indicate embedded Oracle SQL statements are present
 fun containsSQL(contentRoot: VirtualFile): Boolean {
     val patterns = listOf(
-        "oracle.jdbc.OracleDriver",
-        "jdbc:oracle:thin:@",
-        "jdbc:oracle:oci:@",
+        "oracle.jdbc.",
+        "jdbc:oracle:",
         "jdbc:odbc:",
     )
 
diff --git a/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/codescan/sessionconfig/CodeScanSessionConfig.kt b/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/codescan/sessionconfig/CodeScanSessionConfig.kt
@@ -31,6 +31,7 @@ import software.aws.toolkits.jetbrains.services.codewhisperer.codescan.utils.Ama
 import software.aws.toolkits.jetbrains.services.codewhisperer.language.CodeWhispererProgrammingLanguage
 import software.aws.toolkits.jetbrains.services.codewhisperer.language.languages.CodeWhispererUnknownLanguage
 import software.aws.toolkits.jetbrains.services.codewhisperer.language.programmingLanguage
+import software.aws.toolkits.jetbrains.services.codewhisperer.telemetry.CodeWhispererTelemetryService
 import software.aws.toolkits.jetbrains.services.codewhisperer.util.CodeWhispererConstants.CODE_SCAN_CREATE_PAYLOAD_TIMEOUT_IN_SECONDS
 import software.aws.toolkits.jetbrains.services.codewhisperer.util.CodeWhispererConstants.CodeAnalysisScope
 import software.aws.toolkits.jetbrains.services.codewhisperer.util.CodeWhispererConstants.DEFAULT_CODE_SCAN_TIMEOUT_IN_SECONDS
@@ -195,6 +196,9 @@ class CodeScanSessionConfig(
         files.forEach { file ->
             try {
                 val relativePath = "${project.name}/${file.relativeTo(projectRoot.toNioPath())}"
+                if (relativePath.contains("../") || relativePath.contains("..\\")) {
+                    CodeWhispererTelemetryService.getInstance().sendInvalidZipEvent(file, projectRoot.toNioPath(), relativePath)
+                }
                 LOG.debug { "Selected file for truncation: $file" }
                 it.putNextEntry(relativePath.toString(), file)
             } catch (e: Exception) {
diff --git a/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/telemetry/CodeWhispererTelemetryService.kt b/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/telemetry/CodeWhispererTelemetryService.kt
@@ -51,9 +51,11 @@ import software.aws.toolkits.telemetry.Component
 import software.aws.toolkits.telemetry.CredentialSourceId
 import software.aws.toolkits.telemetry.MetricResult
 import software.aws.toolkits.telemetry.Result
+import java.nio.file.Path
 import java.time.Duration
 import java.time.Instant
 import java.util.Queue
+import kotlin.io.path.pathString
 
 @Service
 class CodeWhispererTelemetryService {
@@ -609,6 +611,14 @@ class CodeWhispererTelemetryService {
         assert(ApplicationManager.getApplication().isUnitTestMode)
         return this.previousUserTriggerDecisions
     }
+
+    fun sendInvalidZipEvent(filePath: Path, projectRoot: Path, relativePath: String) {
+        CodewhispererTelemetry.invalidZip(
+            filePath = filePath.pathString,
+            workspaceRoot = projectRoot.pathString,
+            relativePath = relativePath
+        )
+    }
 }
 
 fun isTelemetryEnabled(): Boolean = AwsSettings.getInstance().isTelemetryEnabled
diff --git a/plugins/core/jetbrains-community/resources/telemetryOverride.json b/plugins/core/jetbrains-community/resources/telemetryOverride.json
@@ -177,6 +177,21 @@
                 "reloaded"
             ],
             "description": "Toolkit run state."
+        },
+        {
+            "name": "filePath",
+            "type": "string",
+            "description": "The path of the file"
+        },
+        {
+            "name": "workspaceRoot",
+            "type": "string",
+            "description": "The path of the project root"
+        },
+        {
+            "name": "relativePath",
+            "type": "string",
+            "description": "The relative path of the file"
         }
     ],
     "metrics": [
@@ -530,6 +545,24 @@
                 }
             ],
             "passive": true
+        },
+        {
+            "name": "codewhisperer_invalidZip",
+            "description": "Invalid zip file",
+            "metadata": [
+                {
+                    "type": "filePath",
+                    "required": true
+                },
+                {
+                    "type": "workspaceRoot",
+                    "required": true
+                },
+                {
+                    "type": "relativePath",
+                    "required": true
+                }
+            ]
         }
     ]
 }
diff --git a/plugins/core/resources/resources/software/aws/toolkits/resources/MessagesBundle.properties b/plugins/core/resources/resources/software/aws/toolkits/resources/MessagesBundle.properties

-Original file line number
+Diff line change
@@ @@ -0,0 +1,4 @@ @@
 +{
 +  "type" : "bugfix",
 +  "description" : "Amazon Q /dev: Remove hard-coded limits and instead rely server-side data to communicate number of code generations remaining"
 +}
Original file line number	Diff line number	Diff line change
`@@ -55,8 +55,6 @@ class Session(val tabID: String, val project: Project) {`
`55`	`55`	`approach = "",`
`56`	`56`	`tabID = tabID,`
`57`	`57`	`token = null,`
`58`		`- codeGenerationRemainingIterationCount = 0,`
`59`		`- codeGenerationTotalIterationCount = CODE_GENERATION_RETRY_LIMIT,`
`60`	`58`	`currentIteration = 0,`
`61`	`59`	`diffMetricsProcessed = DiffMetricsProcessed(HashSet(), HashSet())`
`62`	`60`	`)`
Original file line number	Diff line number	Diff line change
`@@ -180,7 +180,7 @@ class FocusAreaContextExtractor(private val fqnWebviewAdapter: FqnWebviewAdapter`
`180`	`180`	`val startOffset = 0.coerceAtLeast(offset - halfMaxCharacters)`
`181`	`181`	`val endOffset = fileText.length.coerceAtMost(offset + halfMaxCharacters)`
`182`	`182`
`183`		`- // Adjust the start and end offsets if necessary to ensure a total of 10k characters`
	`183`	`+ // Adjust the start and end offsets if necessary to ensure a total of 40k characters`
`184`	`184`	`val excessCharacters = maxCharacters - (endOffset - startOffset)`
`185`	`185`	`val adjustedStartOffset = 0.coerceAtLeast(startOffset - excessCharacters)`
`186`	`186`	`val adjustedEndOffset = fileText.length.coerceAtMost(endOffset + excessCharacters)`
`@@ -198,7 +198,7 @@ class FocusAreaContextExtractor(private val fqnWebviewAdapter: FqnWebviewAdapter`
`198`	`198`	`}`
`199`	`199`
`200`	`200`	`companion object {`
`201`		`- const val MAX_LENGTH = 10000`
	`201`	`+ const val MAX_LENGTH = 40000`
`202`	`202`	`}`
`203`	`203`	`}`
`204`	`204`
Original file line number	Diff line number	Diff line change
`@@ -164,6 +164,7 @@ class CodeModernizerManager(private val project: Project) : PersistentStateCompo`
`164`	`164`	`return if (javaModules.isNotEmpty()) {`
`165`	`165`	`ValidationResult(`
`166`	`166`	`true,`
	`167`	`+ metadata = "found ${javaModules.size} modules with SQL"`
`167`	`168`	`)`
`168`	`169`	`} else {`
`169`	`170`	`ValidationResult(`
Original file line number	Diff line number	Diff line change
`@@ -58,6 +58,7 @@ class CodeTransformTelemetryManager(private val project: Project) {`
`58`	`58`	`codeTransformPreValidationError = validationError,`
`59`	`59`	`codeTransformBuildSystem = validationResult.buildSystem,`
`60`	`60`	`codeTransformSessionId = sessionId,`
	`61`	`+ codeTransformMetadata = validationResult.metadata,`
`61`	`62`	`result = if (validationResult.valid) Result.Succeeded else Result.Failed,`
`62`	`63`	`reason = if (validationResult.valid) null else validationResult.invalidTelemetryReason.additionalInfo,`
`63`	`64`	`)`