Skip to content

Commit 0f05b3f

Browse files
rlirli
authored
Merge branch 'feature/q-lsp-chat' into rli/isolate-browser
2 parents 08a6937 + 05d079f commit 0f05b3f

File tree

7 files changed

+38
-2
lines changed

7 files changed

+38
-2
lines changed

‎.changes/next-release/bugfix-7e09465d-6cb8-4180-9131-7ec6543db20c.json‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
{
2+
"type" : "bugfix",
3+
"description" : "increase /review timeout"
4+
}

‎plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/webview/Browser.kt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -127,6 +127,7 @@ class Browser(parent: Disposable, private val webUri: URI, val project: Project)
127127
}
128128
},
129129
{
130+
agenticMode: true,
130131
quickActionCommands: $quickActionConfig,
131132
disclaimerAcknowledged: ${MeetQSettings.getInstance().disclaimerAcknowledged},
132133
pairProgrammingAcknowledged: ${!MeetQSettings.getInstance().amazonQChatPairProgramming}

‎plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/webview/BrowserConnector.kt‎

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,8 @@ import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.Butto
3737
import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.ButtonClickResult
3838
import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.CHAT_BUTTON_CLICK
3939
import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.CHAT_COPY_CODE_TO_CLIPBOARD
40+
import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.CHAT_CREATE_PROMPT
41+
import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.CHAT_DISCLAIMER_ACKNOWLEDGED
4042
import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.CHAT_FEEDBACK
4143
import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.CHAT_FILE_CLICK
4244
import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.CHAT_FOLLOW_UP_CLICK
@@ -56,6 +58,8 @@ import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.ChatP
5658
import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.ChatReadyNotification
5759
import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.CopyCodeToClipboardNotification
5860
import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.CopyCodeToClipboardParams
61+
import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.CreatePromptNotification
62+
import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.CreatePromptParams
5963
import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.CursorState
6064
import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.EncryptedChatParams
6165
import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.EncryptedQuickActionChatParams
@@ -108,7 +112,7 @@ class BrowserConnector(
108112
.onEach { json ->
109113
val node = serializer.toNode(json)
110114
when (node.command) {
111-
"disclaimer-acknowledged" -> {
115+
CHAT_DISCLAIMER_ACKNOWLEDGED -> {
112116
MeetQSettings.getInstance().disclaimerAcknowledged = true
113117
}
114118

@@ -334,6 +338,13 @@ class BrowserConnector(
334338
server.copyCodeToClipboard(params)
335339
}
336340
}
341+
342+
CHAT_CREATE_PROMPT -> {
343+
handleChatNotification<CreatePromptNotification, CreatePromptParams>(node) {
344+
server, params ->
345+
server.createPrompt(params)
346+
}
347+
}
337348
}
338349
}
339350

‎plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/util/CodeWhispererConstants.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ object CodeWhispererConstants {
6767
// Code scan feature constants
6868
val ISSUE_HIGHLIGHT_TEXT_ATTRIBUTES = TextAttributes(null, null, JBColor.YELLOW, EffectType.WAVE_UNDERSCORE, Font.PLAIN)
6969
const val CODE_SCAN_ISSUE_TITLE_MAX_LENGTH = 60
70-
const val DEFAULT_CODE_SCAN_TIMEOUT_IN_SECONDS: Long = 60 * 10 // 10 minutes
70+
const val DEFAULT_CODE_SCAN_TIMEOUT_IN_SECONDS: Long = 60 * 15 // 15 minutes
7171
const val DEFAULT_PAYLOAD_LIMIT_IN_BYTES: Long = 1 * 1024 * 1024 * 1024 // 1GB
7272
const val CODE_SCAN_POLLING_INTERVAL_IN_SECONDS: Long = 1
7373
const val FILE_SCAN_INITIAL_POLLING_INTERVAL_IN_SECONDS: Long = 10

‎plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/lsp/AmazonQLanguageServer.kt‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.Butto
1414
import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.ButtonClickResult
1515
import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.CHAT_BUTTON_CLICK
1616
import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.CHAT_COPY_CODE_TO_CLIPBOARD_NOTIFICATION
17+
import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.CHAT_CREATE_PROMPT
1718
import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.CHAT_FEEDBACK
1819
import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.CHAT_FILE_CLICK
1920
import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.CHAT_FOLLOW_UP_CLICK
@@ -27,6 +28,7 @@ import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.CHAT_
2728
import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.CHAT_TAB_CHANGE
2829
import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.CHAT_TAB_REMOVE
2930
import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.CopyCodeToClipboardParams
31+
import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.CreatePromptParams
3032
import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.EncryptedChatParams
3133
import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.EncryptedQuickActionChatParams
3234
import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.FeedbackParams
@@ -111,4 +113,7 @@ interface AmazonQLanguageServer : LanguageServer {
111113

112114
@JsonRequest(CHAT_BUTTON_CLICK)
113115
fun buttonClick(params: ButtonClickParams): CompletableFuture<ButtonClickResult>
116+
117+
@JsonNotification(CHAT_CREATE_PROMPT)
118+
fun createPrompt(params: CreatePromptParams): CompletableFuture<Unit>
114119
}

‎plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/lsp/model/aws/chat/CreatePromptParams.kt‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
// Copyright 2025 Amazon.com, Inc. or its affiliates. All Rights Reserved.
2+
// SPDX-License-Identifier: Apache-2.0
3+
4+
package software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat
5+
6+
data class CreatePromptParams(
7+
val promptName: String,
8+
)
9+
10+
data class CreatePromptNotification(
11+
override val command: String,
12+
override val params: CreatePromptParams,
13+
) : ChatNotification<CreatePromptParams>

‎plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/lsp/model/aws/chat/FlareChatCommands.kt‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,9 @@ const val CHAT_TAB_CHANGE = "aws/chat/tabChange"
1919
const val CHAT_TAB_REMOVE = "aws/chat/tabRemove"
2020
const val CHAT_OPEN_TAB = "aws/chat/openTab"
2121
const val CHAT_BUTTON_CLICK = "aws/chat/buttonClick"
22+
const val CHAT_DISCLAIMER_ACKNOWLEDGED = "disclaimerAcknowledged"
2223
const val CHAT_COPY_CODE_TO_CLIPBOARD = "copyToClipboard"
2324
const val CHAT_COPY_CODE_TO_CLIPBOARD_NOTIFICATION = "aws/chat/copyCodeToClipboard"
2425
const val CHAT_INSERT_TO_CURSOR = "insertToCursorPosition"
2526
const val CHAT_INSERT_TO_CURSOR_NOTIFICATION = "aws/chat/insertToCursorPosition"
27+
const val CHAT_CREATE_PROMPT = "aws/chat/createPrompt"

0 commit comments

Comments
 (0)