Merge branch 'feature/q-extension' into feature/cw-proactive-scan

Author: laileni-aws

.changes/next-release/bugfix-f856bca5-5859-47b4-82b0-32ed8e7d2cb0.json

@@ -0,0 +1,4 @@
+{
+  "type" : "bugfix",
+  "description" : "Amazon Q Code Feature Development: Update welcome message and menu item description for /dev command"
+}

plugins/amazonq/mynah-ui/src/mynah-ui/ui/followUps/generator.ts

@@ -47,7 +47,7 @@ export class FollowUpGenerator {
                     text: 'Would you like to follow up with',
                     options: [
                         {
-                            pillText: 'What are some examples?',
+                            pillText: 'What are some examples of tasks?',
                             type: 'DevExamples',
                         },
                     ],

plugins/amazonq/mynah-ui/src/mynah-ui/ui/quickActions/generator.ts

@@ -30,7 +30,7 @@ export class QuickActionGenerator {
                                 command: '/dev',
                                 placeholder: 'Briefly describe a task or issue',
                                 description:
-                                    'Use all project files as context for code suggestions (increases latency).',
+                                    'Plan and implement new functionality across multiple files in your workspace.',
                             },
                         ]
                         : []),

plugins/amazonq/mynah-ui/src/mynah-ui/ui/tabs/generator.ts

@@ -45,11 +45,11 @@ export class TabDataGenerator {
         ],
         [
             'featuredev',
-            `Welcome to /dev. 
+            `Welcome to feature development.
 
-Here I can provide code suggestions across files in your current project.
+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. 
 
-Before I begin generating code, let's agree on an implementation plan. What change would you like to make?
+To get started, describe the task you are trying to accomplish.
 `,
         ],
         [

plugins/core/webview/src/q-ui/components/awsProfileForm.vue

@@ -2,14 +2,6 @@
 <!-- SPDX-License-Identifier: Apache-2.0 -->
 
 <template>
-    <button class="back-button" @click="handleBackButtonClick">
-        <svg width="13" height="11" viewBox="0 0 13 11" fill="none" xmlns="http://www.w3.org/2000/svg">
-            <path
-                d="M4.98667 0.0933332L5.73333 0.786666L1.57333 4.94667H12.0267V5.96H1.57333L5.73333 10.0667L4.98667 10.8133L0.0266666 5.8V5.10667L4.98667 0.0933332Z"
-                fill="#21A2FF"
-            />
-        </svg>
-    </button>
     <div class="title no-bold font-amazon">Profile Name</div>
     <div class="hint font-amazon">The identifier for these credentials</div>
     <input class="iamInput font-amazon" type="text" id="profileName" name="profileName" v-model="profileName"/>
@@ -49,9 +41,6 @@ export default defineComponent({
         async handleContinueClick() {
             this.$emit('login',  new LongLivedIAM(this.profileName, this.accessKey, this.secretKey))
         },
-        handleBackButtonClick() {
-            this.$emit('backToMenu')
-        },
     }
 })
 </script>

plugins/core/webview/src/q-ui/components/login.vue

@@ -9,7 +9,7 @@
             :is-connected="stage === 'CONNECTED'"
         />
 
-        <button v-if="cancellable" class="back-button" @click="handleBackButtonClick" tabindex="-1">
+        <button v-if="stage !== 'START' || cancellable" class="back-button" @click="handleBackButtonClick" tabindex="-1">
             <svg width="24" height="24" viewBox="0 -3 13 16" fill="none" xmlns="http://www.w3.org/2000/svg">
                 <path
                     d="M4.98667 0.0933332L5.73333 0.786666L1.57333 4.94667H12.0267V5.96H1.57333L5.73333 10.0667L4.98667 10.8133L0.0266666 5.8V5.10667L4.98667 0.0933332Z"
@@ -116,7 +116,7 @@ export default defineComponent({
             this.$store.commit('setStage', stage)
         },
         handleBackButtonClick() {
-            if (this.cancellable && this.stage === 'START') {
+            if (this.cancellable) {
                 window.ideApi.postMessage({ command: 'toggleBrowser' })
             }
             this.mutateStage('START')

plugins/core/webview/src/q-ui/components/loginOptions.vue

@@ -34,9 +34,6 @@ export default defineComponent({
         toggleItemSelection(itemId: number) {
             this.selectedLoginOption = itemId
         },
-        handleBackButtonClick() {
-            this.$emit('backToMenu')
-        },
         stageChanged(stage: Stage) {
             this.$emit('stageChanged', stage)
         },

plugins/core/webview/src/q-ui/components/ssoLoginForm.vue

@@ -2,14 +2,6 @@
 <!-- SPDX-License-Identifier: Apache-2.0 -->
 
 <template>
-    <button class="back-button" @click="handleBackButtonClick" tabindex="-1">
-        <svg width="24" height="24" viewBox="0 -3 13 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-            <path
-                d="M4.98667 0.0933332L5.73333 0.786666L1.57333 4.94667H12.0267V5.96H1.57333L5.73333 10.0667L4.98667 10.8133L0.0266666 5.8V5.10667L4.98667 0.0933332Z"
-                fill="#21A2FF"
-            />
-        </svg>
-    </button>
     <div class="font-amazon" @keydown.enter="handleContinueClick">
         <div class="bottom-small-gap">
             <div class="title">Sign in with SSO:</div>
@@ -112,9 +104,6 @@ export default defineComponent({
         handleUrlInput() {
             this.isInputValid = this.startUrl != "" && this.selectedRegion != "";
         },
-        handleBackButtonClick() {
-            this.$emit('backToMenu')
-        },
         async handleContinueClick() {
             if (!this.isInputValid) {
                 return

plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/core/explorer/webview/ToolkitLoginWebview.kt

@@ -196,7 +196,12 @@ class ToolkitWebviewBrowser(val project: Project) : LoginBrowser(project, Toolki
         val regionJson = objectMapper.writeValueAsString(regions)
 
         // TODO: if codecatalyst connection expires, set stage to 'REAUTH'
-        val stage = "START"
+        // TODO: make these strings type safe
+        val stage = if (state.feature == FeatureId.Codecatalyst) {
+            "SSO_FORM"
+        } else {
+            "START"
+        }
 
         val jsonData = """
             {