Skip to content

Commit f216106

Browse files
committed
Merge remote-tracking branch 'upstream/feature/agentic-chat' into pr-6914-merge
2 parents 191c504 + 1667c94 commit f216106

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+3704
-166
lines changed

package-lock.json

Lines changed: 49 additions & 23 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@
6464
"husky": "^9.0.7",
6565
"prettier": "^3.3.3",
6666
"prettier-plugin-sh": "^0.14.0",
67-
"pretty-quick": "^4.0.0",
67+
"pretty-quick": "^4.1.1",
6868
"ts-node": "^10.9.1",
6969
"typescript": "^5.0.4",
7070
"webpack": "^5.95.0",

packages/core/package.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -494,7 +494,8 @@
494494
"umd-compat-loader": "^2.1.2",
495495
"vue-loader": "^17.2.2",
496496
"vue-style-loader": "^4.1.3",
497-
"webfont": "^11.2.26"
497+
"webfont": "^11.2.26",
498+
"shlex": "^2.1.2"
498499
},
499500
"dependencies": {
500501
"@amzn/amazon-q-developer-streaming-client": "file:../../src.gen/@amzn/amazon-q-developer-streaming-client",
@@ -524,7 +525,7 @@
524525
"@aws-sdk/s3-request-presigner": "<3.731.0",
525526
"@aws-sdk/smithy-client": "<3.731.0",
526527
"@aws-sdk/util-arn-parser": "<3.731.0",
527-
"@aws/mynah-ui": "^4.27.0",
528+
"@aws/mynah-ui": "^4.28.0",
528529
"@gerhobbelt/gitignore-parser": "^0.2.0-9",
529530
"@iarna/toml": "^2.2.5",
530531
"@smithy/fetch-http-handler": "^5.0.1",

packages/core/resources/css/amazonq-webview.css

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,3 +15,7 @@ body.vscode-high-contrast:not(.vscode-high-contrast-light) {
1515
--mynah-color-highlight: rgba(0, 137, 255, 0.2);
1616
--mynah-color-highlight-text: rgba(0, 137, 255, 1);
1717
}
18+
19+
body .mynah-card-body h1 {
20+
--mynah-line-height: 1.5rem;
21+
}

packages/core/src/amazonq/webview/ui/apps/baseConnector.ts

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -226,6 +226,15 @@ export abstract class BaseConnector {
226226
})
227227
}
228228

229+
onPromptInputOptionChange = (tabId: string, optionsValues: Record<string, string>): void => {
230+
this.sendMessageToExtension({
231+
command: 'prompt-input-option-change',
232+
optionsValues,
233+
tabType: this.getTabType(),
234+
tabID: tabId,
235+
})
236+
}
237+
229238
requestGenerativeAIAnswer = (tabID: string, messageId: string, payload: ChatPayload): Promise<any> => {
230239
/**
231240
* When a user presses "enter" send an event that indicates

0 commit comments

Comments
 (0)