Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
173 commits
Select commit Hold shift + click to select a range
703203f
Merge master into feature/agentic-chat
aws-toolkit-automation Mar 19, 2025
aa2b582
Merge master into feature/agentic-chat
aws-toolkit-automation Mar 19, 2025
586f69a
Merge master into feature/agentic-chat
aws-toolkit-automation Mar 19, 2025
77643cf
Added chat history storage to the Q chat for agentic chat
ashishrp-aws Mar 19, 2025
731e940
Revert for model changes in "Added chat history storage to the Q chat…
ashishrp-aws Mar 19, 2025
db0a0d4
Adding model changes for Q Agentic Chat
ashishrp-aws Mar 19, 2025
74e8f8a
Removing origin IDE from converter
ashishrp-aws Mar 19, 2025
9c97159
Merge pull request #6815 from ashishrp-aws/feature/agentic-chat
mr-lee Mar 20, 2025
8e906b2
Merge pull request #6818 from ashishrp-aws/feature/model
mr-lee Mar 20, 2025
5a51146
feat(chat): Add fsRead tool for Amazon Q Agentic Chat (#6829)
tsmithsz Mar 24, 2025
ffd9d7c
feat(chat): Add validate method to fsRead tool
tsmithsz Mar 24, 2025
3fb3d0b
Merge pull request #6840 from tsmithsz/feature/agentic-chat
mr-lee Mar 24, 2025
5015e24
feat(chat): add fsWrite tool create command
ctlai95 Mar 24, 2025
8d6467b
Modifying Agentic chat UX for view code diff and accept/reject files
laileni-aws Mar 25, 2025
567a954
Merge pull request #6842 from ctlai95/fs-write
mr-lee Mar 25, 2025
a27a3e8
feat(chat): add fsWrite tool commands
ctlai95 Mar 25, 2025
2dbe485
feat(chat): Initial Agentic Chat loop Setup (#6844)
ashishrp-aws Mar 25, 2025
20b166e
Addressing comments
laileni-aws Mar 25, 2025
f2d1467
Minor edits
laileni-aws Mar 25, 2025
8822a39
Merge branch 'feature/agentic-chat' into part1
laileni-aws Mar 25, 2025
1fc3fdc
Merge pull request #6847 from ctlai95/fs-write-commands
mr-lee Mar 25, 2025
02478e3
Minor text change
laileni-aws Mar 25, 2025
8392a4c
Merge pull request #6846 from laileni-aws/part1
mr-lee Mar 25, 2025
ef7da20
feat(chat): Add executeBash tool for Amazon Q Agentic Chat
tsmithsz Mar 25, 2025
6269bce
Merge pull request #6848 from tsmithsz/feature/agentic-chat
mr-lee Mar 25, 2025
072c554
Fix for Agentic loop follopwup
ashishrp-aws Mar 26, 2025
3c316e5
Removed console log
ashishrp-aws Mar 26, 2025
49687a7
Merge pull request #6851 from ashishrp-aws/feature/agentic-chat
mr-lee Mar 26, 2025
4dac86b
FolowUp PR to reuse file-click function to who the diff view
laileni-aws Mar 26, 2025
b734c71
Merge branch 'aws:feature/agentic-chat' into feature/agentic-chat
laileni-aws Mar 26, 2025
c5a1466
Minor text changes
laileni-aws Mar 26, 2025
cec844c
Addressing comments
laileni-aws Mar 26, 2025
65112e6
feat(chat): add fsWrite tool to agentic loop
ctlai95 Mar 26, 2025
735de4e
feat(chat): pass workspace folders to IDE context
ctlai95 Mar 26, 2025
34d5ae7
Merge pull request #6852 from laileni-aws/feature/agentic-chat
mr-lee Mar 26, 2025
abd074f
Merge pull request #6853 from ctlai95/fs-write-integrate
mr-lee Mar 26, 2025
00257c4
Merge pull request #6854 from ctlai95/workspace-folders
mr-lee Mar 26, 2025
be6fab5
Merge remote-tracking branch 'aws/master' into HEAD
ctlai95 Mar 26, 2025
1b39420
Merge branch 'feature/agentic-chat' into autoMerge/feature/agentic-chat
ctlai95 Mar 26, 2025
ef4e872
Merge pull request #6824 from aws/autoMerge/feature/agentic-chat
mr-lee Mar 26, 2025
c28123a
Adding execute bash tool setup to the Q Agentic chat
ashishrp-aws Mar 26, 2025
8a75883
Merge pull request #6856 from ashishrp-aws/feature/agentic-chat
mr-lee Mar 26, 2025
9aef910
feat(chat): add tool utils to delegate execution
ctlai95 Mar 26, 2025
4e77958
Merge branch 'feature/agentic-chat' into tool-utils
ctlai95 Mar 26, 2025
d2992c0
revert package.json
ctlai95 Mar 26, 2025
d694803
fix import
ctlai95 Mar 26, 2025
1f3154a
package.json
ctlai95 Mar 26, 2025
62cf377
Merge remote-tracking branch 'aws/master' into HEAD
ctlai95 Mar 26, 2025
82f62df
package.json
ctlai95 Mar 26, 2025
63d5ab5
Merge pull request #6860 from aws/autoMerge/feature/agentic-chat
mr-lee Mar 26, 2025
c52d57c
sync icons
ctlai95 Mar 26, 2025
9a58ab8
Merge branch 'feature/agentic-chat' into tool-utils
ctlai95 Mar 26, 2025
3b2740c
revert package changes
ctlai95 Mar 27, 2025
811869b
feat(chat): Stream executeBash output to chat
tsmithsz Mar 26, 2025
d3cf1a1
fix circular import
ctlai95 Mar 27, 2025
32fa49d
move toolUtils to a separate file
ctlai95 Mar 27, 2025
e3c34ff
revert package changes
ctlai95 Mar 27, 2025
cdbc045
Merge pull request #6864 from tsmithsz/feature/agentic-chat
mr-lee Mar 27, 2025
7fdbd07
Merge branch 'feature/agentic-chat' into tool-utils
ctlai95 Mar 27, 2025
8749cd7
Merge pull request #6863 from ctlai95/tool-utils
mr-lee Mar 27, 2025
70e56bd
feat(chat): use ChatStream to show tool description
ctlai95 Mar 27, 2025
7ece541
Merge pull request #6873 from ctlai95/generic-chat-stream
mr-lee Mar 27, 2025
e3ea894
feat(chat): add confirmation buttons and tool descriptions
ctlai95 Mar 28, 2025
aa76262
Merge pull request #6875 from ctlai95/tool-confirmation
mr-lee Mar 28, 2025
d9620cf
Merge master into feature/agentic-chat
justinmk3 Mar 28, 2025
9c439f6
fix(chat): file links open in other apps
ctlai95 Mar 28, 2025
d5808a9
feat(chat): Add ListDirectory tool
jguoamz Mar 29, 2025
e21e50c
Fix fsRead validation requiring file path, update tool_index.json
jguoamz Mar 29, 2025
1c5c2c1
Fix fsRead test, improve tool description
jguoamz Mar 29, 2025
90b18ed
Update unit tests
jguoamz Mar 29, 2025
953e32e
fix(chat): fsRead doesn't show readRange
ctlai95 Mar 29, 2025
afd3df6
Address comments, change list directory result format
jguoamz Mar 29, 2025
1e747fc
Fix unit test
jguoamz Mar 29, 2025
22a132d
Merge pull request #6888 from jguoamz/listDirectory
mr-lee Mar 29, 2025
b910472
Merge pull request #6889 from ctlai95/print-read-range
mr-lee Mar 29, 2025
ee0a8c4
Merge pull request #6883 from ctlai95/open-file
mr-lee Mar 29, 2025
36fb0eb
Merge remote-tracking branch 'aws/master' into HEAD
ctlai95 Mar 29, 2025
10bb1c7
Merge master into feature/agentic-chat
justinmk3 Mar 31, 2025
eed4803
feat(amazonq): Adding diff view UX for generated files in Agentic cha…
laileni-aws Mar 31, 2025
f4dc301
Merge master into feature/agentic-chat
aws-toolkit-automation Apr 1, 2025
ab8ba5e
Merge master into feature/agentic-chat
aws-toolkit-automation Apr 1, 2025
44a7dbc
fix(chat): preserve context in agentic loop
ctlai95 Apr 1, 2025
7a47e33
feat(chat): Add warning UI for high risk bash command (#6895)
tsmithsz Apr 1, 2025
d57221e
Merge remote-tracking branch 'aws/master' into HEAD
ctlai95 Apr 1, 2025
b2daa78
Merge pull request #6900 from aws/autoMerge/feature/agentic-chat
zixlin7 Apr 1, 2025
62214ee
fix(chat): fix for chat history for multuple tabs and user tool ignor…
ashishrp-aws Apr 1, 2025
462df07
feat(chat): Split commands by additonal operators (#6908)
tsmithsz Apr 2, 2025
3659236
(fix)chat: fix the bash output is not formatted (#6907)
Randall-Jiang Apr 2, 2025
8c875fb
Merge master into feature/agentic-chat
aws-toolkit-automation Apr 2, 2025
289a991
Merge master into feature/agentic-chat
aws-toolkit-automation Apr 2, 2025
640ccb6
Merge master into feature/agentic-chat
aws-toolkit-automation Apr 2, 2025
66da962
fix(chat): Remove userIntent from agentic chat window input (#6916)
jguoamz Apr 2, 2025
9376bd7
feat(chat): group consecutive read tool messages
ctlai95 Apr 3, 2025
718043e
style(chat): increase line height for h1
ctlai95 Apr 3, 2025
a8672fd
fix(chat): Add maxDepth parameter to ListDirectory tool (#6919)
jguoamz Apr 3, 2025
90d3ec0
Merge pull request #6933 from ctlai95/h1-line-height
mr-lee Apr 3, 2025
cc41a7f
feat(amazonq): Add new Preview UX for code diff in agenti chat (#6932)
laileni-aws Apr 4, 2025
f2bfc78
Merge branch 'feature/agentic-chat' into replace-read-messages
ctlai95 Apr 4, 2025
5d63306
Merge pull request #6931 from ctlai95/replace-read-messages
mr-lee Apr 4, 2025
093d5bc
fix(chat): request fails if character limit exceeded (#6938)
ctlai95 Apr 4, 2025
4446831
feat(chat): Adding state Management to stop the response for new user…
ashishrp-aws Apr 4, 2025
122f718
fix(chat): fix for userInputMessage to include all context (#6941)
ashishrp-aws Apr 4, 2025
aefe920
fix(chat): use diff lib to get diffs (#6940)
ctlai95 Apr 4, 2025
a4627c7
refactor(chat): simplify history logic (#6946)
ctlai95 Apr 5, 2025
93a0806
feat(chat): pair programming mode (#6928)
chungjac Apr 5, 2025
69de65c
fix(chat): Change the UI on output console and add spinner for writin…
Randall-Jiang Apr 5, 2025
e358157
Add header for execute shell command
yueny2020 Apr 5, 2025
c77225e
feat(chat): show stop button for agentic loop (#6947)
ctlai95 Apr 6, 2025
1667c94
Merge pull request #6948 from yueny2020/feature/agentic-chat
mr-lee Apr 7, 2025
f216106
Merge remote-tracking branch 'upstream/feature/agentic-chat' into pr-…
tsmithsz Apr 7, 2025
738d818
Fix: Fix failing lint check
tsmithsz Apr 7, 2025
1ca2650
Merge pull request #6914 from aws/autoMerge/feature/agentic-chat
zixlin7 Apr 7, 2025
dfee9f7
fix(chat): agentic chat working stop (#6950)
ashishrp-aws Apr 7, 2025
9ce08d2
fix(amazonq): Fixing bugs for agentic chat (#6952)
laileni-aws Apr 7, 2025
8a20b10
fix(chat): Fix ChatStream error caused by tool error (#6954)
jguoamz Apr 7, 2025
1539b3b
style(chat): make chat more compact (#6956)
ctlai95 Apr 8, 2025
c6d63bc
Merge master into feature/agentic-chat
aws-toolkit-automation Apr 8, 2025
3def040
fix(chat): Remove enforceMaxSize from fsRead (#6957)
jguoamz Apr 8, 2025
c920e68
feat(chat): support multi file write with reject and open diff (#6955)
ctlai95 Apr 8, 2025
7e37569
feat(amazonq): Add conversation persistence to agentic chat (#6965)
tsmithsz Apr 8, 2025
413a3c7
Merge remote-tracking branch 'aws/master' into HEAD
ctlai95 Apr 8, 2025
254e005
Merge master into feature/agentic-chat
justinmk3 Apr 8, 2025
1deeeac
fix(chat): longer responses throwing ECONNRESET (#6969)
ctlai95 Apr 8, 2025
ac5cf3b
feat(chat): Call LLM to get response of shell command rejection (#6966)
yueny2020 Apr 8, 2025
e9cfe3a
fix(chat): only show context on first message (#6967)
ctlai95 Apr 8, 2025
8e00eef
fix(chat): Use shell icon in shell command header (#6974)
yueny2020 Apr 9, 2025
4ad3e92
fix(chat): change warning category and show the currect warning messa…
Randall-Jiang Apr 9, 2025
35ac939
fix(chat): Send back throttling error message
jguoamz Apr 9, 2025
1b81576
fix(chat): Improve diffView UX (#6981)
jguoamz Apr 9, 2025
529da80
fix(feat): add tooltip and set default mode to on (#6983)
Randall-Jiang Apr 9, 2025
ca07d7f
Merge pull request #6984 from jguoamz/throttling
mr-lee Apr 9, 2025
d0a6bc1
fix(chat): disable prompt during loop (#6986)
ctlai95 Apr 10, 2025
9d382e5
fix(chat): handle JSON.parse error gracefully
jguoamz Apr 10, 2025
b6d4754
Merge pull request #6988 from jguoamz/jsonParse
mr-lee Apr 10, 2025
db64637
fix(amazonq): Grouping read tool messages under contextList (#6975)
laileni-aws Apr 10, 2025
c319671
Merge remote-tracking branch 'origin/master' into HEAD
Hweinstock Apr 10, 2025
8ff5e93
Merge master into feature/agentic-chat
justinmk3 Apr 10, 2025
90dfc71
fix(chat): Prune history if it's too large, ignore log window as acti…
jguoamz Apr 10, 2025
2f15484
Merge master into feature/agentic-chat
aws-toolkit-automation Apr 10, 2025
c3d087a
fix(chat): fix shell command execution output markdown block issue (#…
yueny2020 Apr 10, 2025
2a33b10
fix(chat): Reverting PR:6975 (#7000)
laileni-aws Apr 10, 2025
4c6cbfc
fix(chat): Fix toolUse input is missing when parsing fails (#7001)
jguoamz Apr 10, 2025
b1beba3
style(chat): smaller headers, fix no-padding (#7003)
ctlai95 Apr 10, 2025
1ddc2e8
telemetry(chat): agentic chat metrics (#6979)
chungjac Apr 10, 2025
5f8d9e5
Merge master into feature/agentic-chat
aws-toolkit-automation Apr 10, 2025
8b53de4
fix(chat): Add session context for the agentic loop (#7004)
jguoamz Apr 10, 2025
24c4e65
Adding the grep search tool.
grl-wang Apr 8, 2025
2e600fe
feat(chat): add directive messages (#7010)
ctlai95 Apr 10, 2025
4b23600
fix(chat): Set valid tooluse Input when parsing fails (#7011)
jguoamz Apr 10, 2025
4e0659c
feat(chat): Add validation to fileRead, ListDir and ExecBash tools (#…
bywang56 Apr 10, 2025
9e88de6
style(chat): undo padding change (#7012)
ctlai95 Apr 11, 2025
5a44253
fix(chat): Reduce maxToolResponseSize from 800K to 200K, update toolS…
jguoamz Apr 11, 2025
63a28b8
Merge pull request #7013 from jguoamz/toolSize
mr-lee Apr 11, 2025
974e7e4
Merge master into feature/agentic-chat
aws-toolkit-automation Apr 11, 2025
3648ad9
Merge master into feature/agentic-chat
aws-toolkit-automation Apr 11, 2025
68f9468
Merge master into feature/agentic-chat
aws-toolkit-automation Apr 11, 2025
b222e0b
feat(chat): Grouping read and list directory messages UX (#7006)
laileni-aws Apr 11, 2025
5af2aa9
feat(chat): add directive messages (#7010)
ctlai95 Apr 10, 2025
befd211
fix(chat): Set valid tooluse Input when parsing fails (#7011)
jguoamz Apr 10, 2025
c3ab521
feat(chat): Add validation to fileRead, ListDir and ExecBash tools (#…
bywang56 Apr 10, 2025
b352b01
style(chat): undo padding change (#7012)
ctlai95 Apr 11, 2025
4842941
fix(chat): Reduce maxToolResponseSize from 800K to 200K, update toolS…
jguoamz Apr 11, 2025
d02e552
fix(amazonq): "Sign in" does not focus Q panel #7015
justinmk3 Apr 11, 2025
27d84c9
Release 1.58.0
Apr 11, 2025
2a0c0ae
Update version to snapshot version: 1.59.0-SNAPSHOT
Apr 11, 2025
360ce21
fix(childprocess): noisy "memory threshold" logs #7017
justinmk3 Apr 11, 2025
2db1d85
feat(chat): Grouping read and list directory messages UX (#7006)
laileni-aws Apr 11, 2025
02d8d49
Adding the grep search tool.
grl-wang Apr 8, 2025
422ac75
Adding the package.json
grl-wang Apr 10, 2025
7e7c567
Fix the grepSearch.
grl-wang Apr 11, 2025
b5cd5c3
feat(amazonq): Use Chat History DB instead of in-memory store (#6985)
tsmithsz Apr 11, 2025
2bcc168
Merge branch 'chat-1' into agentic-chat
grl-wang Apr 11, 2025
f8004e8
Add the grep search tool.
grl-wang Apr 11, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
125 changes: 97 additions & 28 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 4 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
"skippedTestReport": "ts-node ./scripts/skippedTestReport.ts ./packages/amazonq/test/e2e/"
},
"devDependencies": {
"@aws-toolkits/telemetry": "^1.0.312",
"@aws-toolkits/telemetry": "^1.0.313",
"@playwright/browser-chromium": "^1.43.1",
"@stylistic/eslint-plugin": "^2.11.0",
"@types/he": "^1.2.3",
Expand All @@ -54,7 +54,7 @@
"@vscode/test-electron": "^2.3.8",
"@vscode/test-web": "^0.0.65",
"@vscode/vsce": "^2.19.0",
"eslint": "^8.56.0",
"eslint": "^8.57.0",
"eslint-config-prettier": "^9.1.0",
"eslint-plugin-aws-toolkits": "file:plugins/eslint-plugin-aws-toolkits",
"eslint-plugin-header": "^3.1.1",
Expand All @@ -64,9 +64,10 @@
"husky": "^9.0.7",
"prettier": "^3.3.3",
"prettier-plugin-sh": "^0.14.0",
"pretty-quick": "^4.0.0",
"pretty-quick": "^4.1.1",
"ts-node": "^10.9.1",
"typescript": "^5.0.4",
"vscode-ripgrep": "^1.13.2",
"webpack": "^5.95.0",
"webpack-cli": "^5.1.4",
"webpack-dev-server": "^4.15.2",
Expand Down
5 changes: 5 additions & 0 deletions packages/amazonq/scripts/build/copyFiles.ts
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,11 @@ const tasks: CopyTask[] = [
target: path.join('../../node_modules', 'web-tree-sitter', 'tree-sitter.wasm'),
destination: path.join('src', 'tree-sitter.wasm'),
},
// ripgrep binary
{
target: path.join('../../node_modules', 'vscode-ripgrep', 'bin'),
destination: 'bin/',
},
]

function copy(task: CopyTask): void {
Expand Down
20 changes: 2 additions & 18 deletions packages/amazonq/src/inlineChat/provider/inlineChatProvider.ts
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ import { codeWhispererClient } from 'aws-core-vscode/codewhisperer'
import type { InlineChatEvent } from 'aws-core-vscode/codewhisperer'
import { InlineTask } from '../controller/inlineTask'
import { extractAuthFollowUp } from 'aws-core-vscode/amazonq'
import { defaultContextLengths } from 'aws-core-vscode/codewhispererChat'

export class InlineChatProvider {
private readonly editorContextExtractor: EditorContextExtractor
Expand Down Expand Up @@ -72,24 +73,7 @@ export class InlineChatProvider {
additionalContents: [],
documentReferences: [],
useRelevantDocuments: false,
contextLengths: {
additionalContextLengths: {
fileContextLength: 0,
promptContextLength: 0,
ruleContextLength: 0,
},
truncatedAdditionalContextLengths: {
fileContextLength: 0,
promptContextLength: 0,
ruleContextLength: 0,
},
workspaceContextLength: 0,
truncatedWorkspaceContextLength: 0,
userInputContextLength: 0,
truncatedUserInputContextLength: 0,
focusFileContextLength: 0,
truncatedFocusFileContextLength: 0,
},
contextLengths: defaultContextLengths,
},
triggerID
)
Expand Down
3 changes: 2 additions & 1 deletion packages/core/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -494,7 +494,8 @@
"umd-compat-loader": "^2.1.2",
"vue-loader": "^17.2.2",
"vue-style-loader": "^4.1.3",
"webfont": "^11.2.26"
"webfont": "^11.2.26",
"shlex": "^2.1.2"
},
"dependencies": {
"@amzn/amazon-q-developer-streaming-client": "file:../../src.gen/@amzn/amazon-q-developer-streaming-client",
Expand Down
5 changes: 5 additions & 0 deletions packages/core/package.nls.json
Original file line number Diff line number Diff line change
Expand Up @@ -455,6 +455,11 @@
"AWS.amazonq.doc.pillText.makeChanges": "Make changes",
"AWS.amazonq.inline.invokeChat": "Inline chat",
"AWS.amazonq.opensettings:": "Open settings",
"AWS.amazonq.executeBash.run": "Run",
"AWS.amazonq.executeBash.reject": "Reject",
"AWS.amazonq.chat.directive.pairProgrammingModeOn": "You are using **pair programming mode**: Q can now list files, preview code diffs and allow you to run shell commands.",
"AWS.amazonq.chat.directive.pairProgrammingModeOff": "You turned off **pair programming mode**. Q will not include code diffs or run commands in the chat.",
"AWS.amazonq.chat.directive.runCommandToProceed": "Run the command to proceed.",
"AWS.toolkit.lambda.walkthrough.quickpickTitle": "Application Builder Walkthrough",
"AWS.toolkit.lambda.walkthrough.title": "Get started building your application",
"AWS.toolkit.lambda.walkthrough.description": "Your quick guide to build an application visually, iterate locally, and deploy to the cloud!",
Expand Down
Loading