Add toggle for basic vs pair programming mode

manodnyab · manodnyab · commit 094ad8e78936 · 2025-04-22T23:04:32.000-07:00
diff --git a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/webview/Browser.kt b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/webview/Browser.kt
@@ -128,8 +128,12 @@ class Browser(parent: Disposable, private val webUri: URI, val project: Project)
                         }, 
                         {
                         quickActionCommands: $quickActionConfig,
-                        disclaimerAcknowledged: ${MeetQSettings.getInstance().disclaimerAcknowledged}
-                        }
+                        disclaimerAcknowledged: ${MeetQSettings.getInstance().disclaimerAcknowledged},
+                        pairProgrammingAcknowledged: ${!MeetQSettings.getInstance().amazonQChatPairProgramming}
+                        },
+                        null,
+                        {}
+                     
                     );
                 }
             </script>        
diff --git a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/webview/BrowserConnector.kt b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/webview/BrowserConnector.kt
@@ -30,6 +30,7 @@ import software.aws.toolkits.jetbrains.services.amazonq.lsp.flareChat.ChatCommun
 import software.aws.toolkits.jetbrains.services.amazonq.lsp.flareChat.getTextDocumentIdentifier
 import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.CHAT_INFO_LINK_CLICK
 import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.CHAT_LINK_CLICK
+import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.CHAT_PROMPT_OPTION_ACKNOWLEDGED
 import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.CHAT_QUICK_ACTION
 import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.CHAT_SOURCE_LINK_CLICK
 import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.ChatNotification
@@ -42,6 +43,9 @@ import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.InfoL
 import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.InfoLinkClickParams
 import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.LinkClickNotification
 import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.LinkClickParams
+import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.PROMPT_INPUT_OPTIONS_CHANGE
+import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.PromptInputOptionChangeNotification
+import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.PromptInputOptionChangeParams
 import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.QuickChatActionRequest
 import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.SEND_CHAT_COMMAND_PROMPT
 import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.SendChatPromptRequest
@@ -232,6 +236,20 @@ class BrowserConnector(
                     server.sourceLinkClick(params)
                 }
             }
+
+            PROMPT_INPUT_OPTIONS_CHANGE -> {
+                handleChatNotification<PromptInputOptionChangeNotification, PromptInputOptionChangeParams>(node) {
+                        server, params ->
+                    server.promptInputOptionsChange(params)
+                }
+            }
+
+            CHAT_PROMPT_OPTION_ACKNOWLEDGED -> {
+                val acknowledgedMessage = node.get("params").get("messageId")
+                if (acknowledgedMessage.asText() == "programmerModeCardId") {
+                    MeetQSettings.getInstance().amazonQChatPairProgramming = false
+                }
+            }
         }
     }
 
diff --git a/plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/lsp/AmazonQLanguageServer.kt b/plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/lsp/AmazonQLanguageServer.kt
@@ -18,6 +18,8 @@ import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.Encry
 import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.EncryptedQuickActionChatParams
 import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.InfoLinkClickParams
 import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.LinkClickParams
+import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.PROMPT_INPUT_OPTIONS_CHANGE
+import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.PromptInputOptionChangeParams
 import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.SEND_CHAT_COMMAND_PROMPT
 import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.SourceLinkClickParams
 import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.credentials.UpdateCredentialsPayload
@@ -58,4 +60,7 @@ interface AmazonQLanguageServer : LanguageServer {
 
     @JsonNotification(CHAT_SOURCE_LINK_CLICK)
     fun sourceLinkClick(params: SourceLinkClickParams): CompletableFuture<Unit>
+
+    @JsonNotification(PROMPT_INPUT_OPTIONS_CHANGE)
+    fun promptInputOptionsChange(params: PromptInputOptionChangeParams): CompletableFuture<Unit>
 }
diff --git a/plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/lsp/artifacts/ArtifactManager.kt b/plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/lsp/artifacts/ArtifactManager.kt
@@ -32,7 +32,7 @@ class ArtifactManager(
 
     companion object {
         private val DEFAULT_VERSION_RANGE = SupportedManifestVersionRange(
-            startVersion = SemVer("1.0.0", 1, 0, 0),
+            startVersion = SemVer("0.0.0", 0, 0, 0),
             endVersion = SemVer("2.0.0", 2, 0, 0)
         )
         private val logger = getLogger<ArtifactManager>()
diff --git a/plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/lsp/model/aws/chat/FlareChatCommands.kt b/plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/lsp/model/aws/chat/FlareChatCommands.kt
@@ -8,3 +8,5 @@ const val CHAT_QUICK_ACTION = "aws/chat/sendChatQuickAction"
 const val CHAT_LINK_CLICK = "aws/chat/linkClick"
 const val CHAT_INFO_LINK_CLICK = "aws/chat/infoLinkClick"
 const val CHAT_SOURCE_LINK_CLICK = "aws/chat/sourceLinkClick"
+const val PROMPT_INPUT_OPTIONS_CHANGE = "aws/chat/promptInputOptionChange"
+const val CHAT_PROMPT_OPTION_ACKNOWLEDGED = "chatPromptOptionAcknowledged"
diff --git a/plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/lsp/model/aws/chat/PromptInputOptionChangeParams.kt b/plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/lsp/model/aws/chat/PromptInputOptionChangeParams.kt
@@ -0,0 +1,15 @@
+// Copyright 2025 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+package software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat
+
+data class PromptInputOptionChangeParams(
+    val tabId: String,
+    val optionsValues: Map<String, String>,
+    val eventId: String? = null,
+)
+
+data class PromptInputOptionChangeNotification(
+    override val command: String,
+    override val params: PromptInputOptionChangeParams,
+) : ChatNotification<PromptInputOptionChangeParams>
diff --git a/plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/settings/MeetQSettings.kt b/plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/settings/MeetQSettings.kt
@@ -38,6 +38,12 @@ class MeetQSettings : PersistentStateComponent<MeetQSettingsConfiguration> {
             state.disclaimerAcknowledged = value
         }
 
+    var amazonQChatPairProgramming: Boolean
+        get() = state.amazonQChatPairProgramming
+        set(value) {
+            state.amazonQChatPairProgramming = value
+        }
+
     companion object {
         fun getInstance(): MeetQSettings = service()
     }
@@ -46,4 +52,5 @@ data class MeetQSettingsConfiguration(
     var shouldDisplayPage: Boolean = true,
     var reinvent2024OnboardingCount: Int = 0,
     var disclaimerAcknowledged: Boolean = false,
+    var amazonQChatPairProgramming: Boolean = false,
 )

Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ class ArtifactManager(`
`32`	`32`
`33`	`33`	`companion object {`
`34`	`34`	`private val DEFAULT_VERSION_RANGE = SupportedManifestVersionRange(`
`35`		`- startVersion = SemVer("1.0.0", 1, 0, 0),`
	`35`	`+ startVersion = SemVer("0.0.0", 0, 0, 0),`
`36`	`36`	`endVersion = SemVer("2.0.0", 2, 0, 0)`
`37`	`37`	`)`
`38`	`38`	`private val logger = getLogger<ArtifactManager>()`
Original file line number	Diff line number	Diff line change
`@@ -38,6 +38,12 @@ class MeetQSettings : PersistentStateComponent<MeetQSettingsConfiguration> {`
`38`	`38`	`state.disclaimerAcknowledged = value`
`39`	`39`	`}`
`40`	`40`
	`41`	`+ var amazonQChatPairProgramming: Boolean`
	`42`	`+ get() = state.amazonQChatPairProgramming`
	`43`	`+ set(value) {`
	`44`	`+ state.amazonQChatPairProgramming = value`
	`45`	`+ }`
	`46`	`+`
`41`	`47`	`companion object {`
`42`	`48`	`fun getInstance(): MeetQSettings = service()`
`43`	`49`	`}`
`@@ -46,4 +52,5 @@ data class MeetQSettingsConfiguration(`
`46`	`52`	`var shouldDisplayPage: Boolean = true,`
`47`	`53`	`var reinvent2024OnboardingCount: Int = 0,`
`48`	`54`	`var disclaimerAcknowledged: Boolean = false,`
	`55`	`+ var amazonQChatPairProgramming: Boolean = false,`
`49`	`56`	`)`