Merge master into feature/standalone

Author: justinmk3

.changes/next-release/Bug Fix-a1567f38-b9c9-460b-94ea-66ff50ea9f73.json

@@ -0,0 +1,4 @@
+{
+	"type": "Bug Fix",
+	"description": "Amazon Q Code Transform: Handle whitespaces in manually entered JAVA_HOME"
+}

.changes/next-release/Feature-a5f37aec-e586-4057-9834-7d58c55c5695.json

@@ -0,0 +1,4 @@
+{
+	"type": "Feature",
+	"description": "Support extended CodeWhisperer session durations when using CodeCatalyst on the same SSO connection"
+}

.github/CODEOWNERS

@@ -1,5 +1,5 @@
 * @aws/aws-ides-team
 packages/core/src/codewhisperer/ @aws/codewhisperer-team
 packages/core/src/amazonqFeatureDev/ @aws/earlybird
-packages/core/src/codewhispererChat/ @aws/aws-mynah
-packages/core/src/amazonq/ @aws/aws-mynah
+packages/core/src/codewhispererChat/ @aws/dexp
+packages/core/src/amazonq/ @aws/dexp

package-lock.json

@@ -204,6 +204,10 @@
                         "remoteConnected": {
                             "type": "boolean",
                             "default": false
+                        },
+                        "codeCatalystConnectionExpired": {
+                            "type": "boolean",
+                            "default": false
                         }
                     },
                     "additionalProperties": false
@@ -3929,7 +3933,7 @@
     },
     "devDependencies": {
         "@aws-sdk/types": "^3.13.1",
-        "@aws-toolkits/telemetry": "^1.0.196",
+        "@aws-toolkits/telemetry": "^1.0.201",
         "@aws/fully-qualified-names": "^2.1.4",
         "@cspotcode/source-map-support": "^0.8.1",
         "@sinonjs/fake-timers": "^10.0.2",

packages/core/package.json

@@ -5,17 +5,17 @@
 
 import * as vscode from 'vscode'
 import { Commands } from '../shared/vscode/commands2'
-import { TransformationHubViewProvider } from '../codewhisperer/service/transformationHubViewProvider'
+import { TransformationHubViewProvider } from '../codewhisperer/service/transformByQ/transformationHubViewProvider'
 import { ExtContext } from '../shared/extensions'
 import { stopTransformByQ } from '../codewhisperer/commands/startTransformByQ'
 import { transformByQState } from '../codewhisperer/models/model'
 import * as CodeWhispererConstants from '../codewhisperer/models/constants'
-import { ProposedTransformationExplorer } from '../codewhisperer/service/transformationResultsViewProvider'
+import { ProposedTransformationExplorer } from '../codewhisperer/service/transformByQ/transformationResultsViewProvider'
 import { codeTransformTelemetryState } from './telemetry/codeTransformTelemetryState'
 import { telemetry } from '../shared/telemetry/telemetry'
 import { CancelActionPositions } from './telemetry/codeTransformTelemetry'
 import { AuthUtil } from '../codewhisperer/util/authUtil'
-import { validateAndLogProjectDetails } from '../codewhisperer/service/transformByQHandler'
+import { validateAndLogProjectDetails } from '../codewhisperer/service/transformByQ/transformProjectValidationHandler'
 
 export async function activate(context: ExtContext) {
     void vscode.commands.executeCommand('setContext', 'gumby.wasQCodeTransformationUsed', false)

packages/core/src/amazonqGumby/activation.ts

@@ -5,11 +5,12 @@
  * This class is responsible for responding to UI events by calling
  * the Gumby extension.
  */
-
+import fs from 'fs'
+import path from 'path'
+import * as vscode from 'vscode'
 import { GumbyNamedMessages, Messenger } from './messenger/messenger'
 import { AuthController } from '../../../amazonq/auth/controller'
 import { ChatSessionManager } from '../storages/chatSession'
-import * as vscode from 'vscode'
 import { ConversationState, Session } from '../session/session'
 import { getLogger } from '../../../shared/logger'
 import { featureName } from '../../models/constants'
@@ -22,14 +23,15 @@ import {
     stopTransformByQ,
     validateCanCompileProject,
 } from '../../../codewhisperer/commands/startTransformByQ'
-import { JDKVersion, transformByQState } from '../../../codewhisperer/models/model'
+import { JDKVersion, TransformationCandidateProject, transformByQState } from '../../../codewhisperer/models/model'
 import { JavaHomeNotSetError, NoJavaProjectsFoundError, NoMavenJavaProjectsFoundError } from '../../errors'
 import MessengerUtils, { ButtonActions, GumbyCommands } from './messenger/messengerUtils'
-import { TransformationCandidateProject } from '../../../codewhisperer/service/transformByQHandler'
 import { CancelActionPositions } from '../../telemetry/codeTransformTelemetry'
-import fs from 'fs'
-import path from 'path'
 import { openUrl } from '../../../shared/utilities/vsCodeUtils'
+import { telemetry } from '../../../shared/telemetry/telemetry'
+import { MetadataResult } from '../../../shared/telemetry/telemetryClient'
+import { codeTransformTelemetryState } from '../../telemetry/codeTransformTelemetryState'
+import { getAuthType } from '../../../codewhisperer/service/transformByQ/transformApiHandler'
 
 // These events can be interactions within the chat,
 // or elsewhere in the IDE
@@ -227,9 +229,14 @@ export class GumbyController {
         }
     }
 
-    // Any given project could have multiple candidate projects to transform --
-    // The user gets prompted to pick a specific one
+    // prompt user to pick project and specify source JDK version
     private async initiateTransformationOnProject(message: any) {
+        const authType = await getAuthType()
+        telemetry.codeTransform_jobIsStartedFromChatPrompt.emit({
+            codeTransformSessionId: codeTransformTelemetryState.getSessionId(),
+            credentialSourceId: authType,
+            result: MetadataResult.Pass,
+        })
         const pathToProject: string = message.formSelectedValues['GumbyTransformProjectForm']
         const toJDKVersion: JDKVersion = message.formSelectedValues['GumbyTransformJdkToForm']
         const fromJDKVersion: JDKVersion = message.formSelectedValues['GumbyTransformJdkFromForm']
@@ -335,11 +342,18 @@ export class GumbyController {
     }
 }
 
+/**
+ * Examples:
+ * ```
+ * extractPath("./some/path/here") => "C:/some/root/some/path/here"
+ * extractPath("C:/some/nonexistent/path/here") => undefined
+ * extractPath("C:/some/filepath/.txt") => undefined
+ * ```
+ *
+ * @param text
+ * @returns the absolute path if path points to existing folder, otherwise undefined
+ */
 function extractPath(text: string): string | undefined {
-    const words = text.split(/\s+/) // Split text into words by whitespace
-
-    // Filter words that are formatted like paths and do exist as local directories
-    const paths = words.find(word => fs.existsSync(word) && fs.lstatSync(word).isDirectory())
-
-    return paths
+    const resolvedPath = path.resolve(text)
+    return fs.existsSync(resolvedPath) && fs.lstatSync(resolvedPath).isDirectory() ? resolvedPath : undefined
 }

packages/core/src/amazonqGumby/chat/controller/controller.ts

@@ -10,7 +10,7 @@
 
 import { AuthFollowUpType, expiredText, enableQText, reauthenticateText } from '../../../../amazonq/auth/model'
 import { ChatItemType } from '../../../../amazonqFeatureDev/models'
-import { JDKVersion } from '../../../../codewhisperer/models/model'
+import { JDKVersion, TransformationCandidateProject } from '../../../../codewhisperer/models/model'
 import { FeatureAuthState } from '../../../../codewhisperer/util/authUtil'
 import {
     AppToWebViewMessageDispatcher,
@@ -26,7 +26,6 @@ import {
 } from '../../views/connector/connector'
 import { ChatItemButton, ChatItemFormItem } from '@aws/mynah-ui/dist/static'
 import MessengerUtils, { ButtonActions } from './messengerUtils'
-import { TransformationCandidateProject } from '../../../../codewhisperer/service/transformByQHandler'
 
 export type StaticTextResponseType =
     | 'transform'

packages/core/src/amazonqGumby/chat/controller/messenger/messenger.ts

@@ -7,7 +7,7 @@
 export const enterJavaHomeMessage = 'Enter the path to JDK '
 
 export const windowsJavaHomeHelpMessage =
-    'To find the JAVA_HOME path, run the following command in a new IDE terminal: `cd C:ProgramFilesJava` and then `dir`. If you see your JDK version, run `cd JDK<version>` and then `cd` to show the path.'
+    'To find the JAVA_HOME path, run the following command in a new IDE terminal: `cd "C:\\Program Files\\Java" && dir`. If you see your JDK version, run `cd <version>` and then `cd` to show the path.'
 
 export const nonWindowsJava8HomeHelpMessage =
     'To find the JAVA_HOME path, run the following command in a new IDE terminal:  `/usr/libexec/java_home -v 1.8`'

packages/core/src/amazonqGumby/chat/controller/messenger/stringConstants.ts

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { TransformationCandidateProject } from '../../../codewhisperer/service/transformByQHandler'
+import { TransformationCandidateProject } from '../../../codewhisperer/models/model'
 
 export enum ConversationState {
     IDLE,