Skip to content

NEP prefetch wip #7411

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 168 commits into
base: floralph/nep-flare
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
168 commits
Select commit Hold shift + click to select a range
9b13c5f
fix(tests): "rejected promise not handled" (#7403)
justinmk3 May 30, 2025
d41e749
ci: only publish amazonq as "latest" release #7408
justinmk3 May 30, 2025
12eece1
feat(lsp): forward chatOptionsUpdate to ui (#7397)
ctlai95 May 30, 2025
6e69d40
telemetry: avoid PII in openUrl metric
justinmk3 May 14, 2025
f9fce59
fix(lsp): handle ShowDocumentParams.external
justinmk3 May 13, 2025
14df48d
fix(amazonq): Revert "feat(amazonq): add the mcp field to client capa…
yueny2020 Jun 2, 2025
25ec061
Merge #7415 from justinmk3/fixes
justinmk3 Jun 3, 2025
0999e72
fix(amazonq): Revert "feat(amazonq): add the mcp field to client capa…
yueny2020 Jun 3, 2025
02a89c5
telemetry(amazonq): bumping up telemetry version to 1.0.323 (#7424)
laileni-aws Jun 4, 2025
3a9aca9
fix(amazonq): minor text update (#7420)
dhasani23 Jun 4, 2025
a7d939e
Release 1.71.0
Jun 4, 2025
d712ffd
Release 3.64.0
Jun 4, 2025
6c88e44
fix(amazonq): Add proxy configuration support with SSL Cert Validation
tsmithsz Jun 4, 2025
a78564a
Update version to snapshot version: 1.72.0-SNAPSHOT
Jun 6, 2025
1126c70
Update version to snapshot version: 3.65.0-SNAPSHOT
Jun 6, 2025
7e6786b
Merge release into master
Jun 6, 2025
62d50d9
feat(amazonq): Bundle LSP with the extension as fallback. (#7421)
leigaol Jun 6, 2025
523fc16
fix(amazonq): Add proxy configuration support with SSL Cert Validation
tsmithsz Jun 4, 2025
cdf1c2d
Merge pull request #7426 from tsmithsz/fix-proxy
tsmithsz Jun 6, 2025
bd3bf40
feat(amazonq): paid tier
justinmk3 May 6, 2025
50a4183
remove account-id input
justinmk3 May 23, 2025
d8d08e2
Merge #7379 feat(amazonq): paid tier
justinmk3 Jun 9, 2025
0458325
feat(amazonq): add MCP server support (#7451)
chungjac Jun 9, 2025
6e29cea
revert: revert to "feat(amazonq): add MCP server support (#7451)" (#7…
ashishrp-aws Jun 10, 2025
450c28a
Merge pull request #7460 from dhasani23/enablePAW
dhasani23 Jun 10, 2025
ef96302
fix(paidtier): don't show "Manage Subscription" for IdC user #7467
justinmk3 Jun 11, 2025
216e767
Release 1.72.0
Jun 11, 2025
3c6a204
Update version to snapshot version: 1.73.0-SNAPSHOT
Jun 11, 2025
c462e03
feat(amazonq): add MCP server support (#7468)
chungjac Jun 11, 2025
b7951d3
Release 1.73.0
Jun 11, 2025
4d44255
Update version to snapshot version: 1.74.0-SNAPSHOT
Jun 12, 2025
ec58764
fix(amazonq): bundle flare version comparison using numbers (#7479)
leigaol Jun 12, 2025
38bdc46
Release 1.74.0
Jun 12, 2025
497e091
Update version to snapshot version: 1.75.0-SNAPSHOT
Jun 12, 2025
8097bc1
fix(amazonq): Fixing issue with unable to get local issuer certificat…
laileni-aws Jun 13, 2025
0d205c5
Release 3.65.0
Jun 13, 2025
86f3063
Update version to snapshot version: 3.66.0-SNAPSHOT
Jun 13, 2025
a303e3e
Release 1.75.0
Jun 13, 2025
655ceda
Update version to snapshot version: 1.76.0-SNAPSHOT
Jun 13, 2025
03e1d8e
feat: enable model selection from serverCapabilities
ctlai95 Jun 13, 2025
0b8edb3
Merge pull request #7488 from ctlai95/model-selection-feature-flag
XiaoxuanLu Jun 13, 2025
2a1242d
fix(amazonq): only show lines of code (#7489)
dhasani23 Jun 16, 2025
8cbe56d
Merge master into feature/model-selection
aws-toolkit-automation Jun 16, 2025
7bd8e22
add change log
zuoyaofu Jun 16, 2025
dd6a2c8
feat(amazonq): support pinned context (#7493)
avi-alpert Jun 16, 2025
e05ce3e
Merge master into feature/model-selection
aws-toolkit-automation Jun 16, 2025
11efb52
Merge pull request #7498 from zuoyaofu/model-sel
XiaoxuanLu Jun 16, 2025
85d3e7e
Merge pull request #7497 from aws/feature/model-selection
XiaoxuanLu Jun 16, 2025
1dcbe45
deps: bump @aws-toolkits/telemetry to 1.0.324
chungjac Jun 17, 2025
0ac4ae5
Merge pull request #7506 from chungjac/bump
Randall-Jiang Jun 17, 2025
ceaa671
fix(amazonq): update text for STV2 feature
Jun 17, 2025
478b657
typo
Jun 17, 2025
79a6364
set env variables using IDE settings
samgst-amazon Jun 17, 2025
5199f38
Merge pull request #7509 from dhasani23/stv2Text
Randall-Jiang Jun 17, 2025
1ac761f
handle certs
samgst-amazon Jun 17, 2025
6247d8d
docs(amazonq): add changelog for pinned context
avi-alpert Jun 18, 2025
fcbc5b0
use tls instead
samgst-amazon Jun 18, 2025
cbdb71f
Merge pull request #7514 from avi-alpert/aalpert/changelog-pinned
Randall-Jiang Jun 18, 2025
57285a8
Release 1.76.0
Jun 18, 2025
ad1fe20
Release 3.66.0
Jun 18, 2025
006e55d
hack to make this build
samgst-amazon Jun 18, 2025
8bb0e3e
fix import
samgst-amazon Jun 18, 2025
736eb09
Update version to snapshot version: 3.67.0-SNAPSHOT
Jun 18, 2025
6cb1af0
Update version to snapshot version: 1.77.0-SNAPSHOT
Jun 18, 2025
0819eb3
Merge release into master
Jun 18, 2025
37f1429
Release 1.77.0
Jun 18, 2025
b8ffaa4
Update version to snapshot version: 1.78.0-SNAPSHOT
Jun 18, 2025
c88bfde
ci: use windows-latest image for github CI (#7508)
chungjac Jun 18, 2025
f6083b8
get system certs
samgst-amazon Jun 18, 2025
b3a1f77
fix import
samgst-amazon Jun 18, 2025
d8548fc
docs(amazonq): Improved the local LSP setup documentation with more i…
abhraina-aws Jun 18, 2025
b9a5a94
feat(amazonq): Move inline completion to Flare (#7480)
leigaol Jun 18, 2025
6b3adec
no nesting try-catch
samgst-amazon Jun 18, 2025
d8005c7
fix(amazonq): increase node memory size to 8G
yueny2020 Jun 19, 2025
a73ba2b
Merge pull request #7528 from yueny2020/nodememory
yueny2020 Jun 19, 2025
76effe0
fix(accessanalyzer): update cfn-policy-validator and tf-policy-valida…
hbendapu Jun 19, 2025
89903fe
fix(amazonq): chatOptions are missing in q chat (#7520)
laileni-aws Jun 19, 2025
27a5a68
remove extra newline
samgst-amazon Jun 19, 2025
cdc6f84
fix(amazonq): adding new changelog for #7520 (#7530)
laileni-aws Jun 19, 2025
3774910
fix(amazonq): Q opens the history tabs automatically after plugin lau…
laileni-aws Jun 20, 2025
87a9771
Release 1.78.0
Jun 20, 2025
5800ac5
actually we do need the newline
samgst-amazon Jun 20, 2025
ad2164b
Merge pull request #7505 from aws/samgst/proxy-ca-fix
samgst-amazon Jun 21, 2025
7343511
migrate process env proxy settings to proxyUtil.ts
samgst-amazon Jun 23, 2025
7b6252f
remove env merging from createServerOptions
samgst-amazon Jun 23, 2025
ebfbc66
No need to set CA certs when SSL verification is disabled
samgst-amazon Jun 23, 2025
d0ecc4e
Update version to snapshot version: 1.79.0-SNAPSHOT
Jun 23, 2025
fd936e4
Merge release into master
Jun 23, 2025
bee6b9a
fix(amazonq): add jitter for validation call of profiles (#7534)
Will-ShaoHua Jun 24, 2025
771fae8
fix(stepfunctions): Add document URI check for save telemetry and ena…
l0minous Jun 24, 2025
f1dc9b8
feat(amazonq): enable client-side build (#7226)
dhasani23 Jun 24, 2025
3e41c83
changelog
samgst-amazon Jun 24, 2025
696e143
missing await
samgst-amazon Jun 24, 2025
eaf969c
fix(amazonq): migrate process.env proxy setting handling to proxyUtil.ts
samgst-amazon Jun 24, 2025
f5cf3bd
fix(amazonq): fix for amazon q app initialization failure on sagemaker
ashishrp-aws Jun 25, 2025
b3ad9a8
Merge branch 'aws:master' into fix/sagemaker
ashishrp-aws Jun 25, 2025
cac600f
fix(amazonq): minor text update (#7554)
dhasani23 Jun 25, 2025
053a5bd
fix(amazonq): fix to move isSagemaker to env
ashishrp-aws Jun 25, 2025
1ab1ad2
Merge pull request #7551 from ashishrp-aws/fix/sagemaker
ashishrp-aws Jun 25, 2025
05c57ff
Release 1.79.0
Jun 25, 2025
787a3bc
Release 3.67.0
Jun 25, 2025
926b86a
Update version to snapshot version: 3.68.0-SNAPSHOT
Jun 25, 2025
fd252bb
Update version to snapshot version: 1.80.0-SNAPSHOT
Jun 25, 2025
46766be
Merge release into master
Jun 25, 2025
00d7c13
fix(amazonq): Re-enable experimental proxy support
tsmithsz Jun 25, 2025
6ad3234
fix: connect chat history to VSCode workspace file
jngyuamz Jun 25, 2025
0b76f7f
Merge pull request #7556 from tsmithsz/fix-amazonq-proxy
tsmithsz Jun 25, 2025
7a5cbd3
fix(amazonq): Remove setSystemCertificates from proxyUtil
tsmithsz Jun 25, 2025
e07833d
refactor(stepfunctions): migrate to sdkv3 (#7560)
zelzhou Jun 27, 2025
dfa7e51
fix(amazonq): Remove incompatible Node 18 flag
tsmithsz Jun 27, 2025
9616260
Merge pull request #7568 from tsmithsz/remove-flag
tsmithsz Jun 27, 2025
1d597bd
fix: onDidSaveTextDocument notification method name
jngyuamz Jun 27, 2025
9bd9d99
feat(amazonq): Add next edit suggestion (#7555)
floralph Jun 30, 2025
271f592
fix(amazonq): update cursor tracking based on autotrigger setting
floralph Jun 30, 2025
92b7fa7
fix: duplicated onDidSaveTextDocument notification
jngyuamz Jun 30, 2025
699e00e
fix(amazonq): handling of CodeSuggestionState in tests
floralph Jun 30, 2025
bfdb0eb
Merge pull request #7585 from aws/floralph/cursor-manager-track-autot…
floralph Jun 30, 2025
40adfc7
fix: removing logic to calculate addedCharacterCount and deletedChara…
atonaamz Jun 30, 2025
fa6d9c9
fix: remove the depedency of the CDN js script.
grl-wang Jun 30, 2025
8d1020f
Merge pull request #7559 from jngyuamz/workspace-history
jngyuamz Jul 1, 2025
496e076
fix(amazonq): emit metric (#7584)
dhasani23 Jul 1, 2025
d33bc14
Merge pull request #7587 from grl-wang/fix-vue-js-dependency
grl-wang Jul 1, 2025
6c63166
fix(amazonq): save previously-used JDK path
Jul 1, 2025
4a1b444
feat: trigger inline suggestion via acceptance for EDITS
atonaamz Jul 1, 2025
77259e1
feat(amazonq): trigger inline suggestion via acceptance for EDITS
atonaamz Jul 1, 2025
8fbea5a
Release 1.80.0
Jul 1, 2025
3415025
fix(amazonq): do not trigger inline completion when user delete code …
leigaol Jul 2, 2025
5278365
Update version to snapshot version: 1.81.0-SNAPSHOT
Jul 2, 2025
74ac902
Merge release into master
Jul 2, 2025
0c00b01
Release 1.81.0
Jul 2, 2025
5d48d08
Update version to snapshot version: 1.82.0-SNAPSHOT
Jul 3, 2025
d81c0a6
feat(lambda): Merging Feature/lambda console2 ide to staging branch. …
laileni-aws Jul 3, 2025
bea4abc
fix(amazonq): skip matching with previous suggestions for EDITS
atonaamz Jul 2, 2025
4edc815
feat(sagemaker): Merging Feature/sagemaker connect to master (#7607)
laileni-aws Jul 3, 2025
c942e7f
Release 3.68.0
Jul 3, 2025
77472f5
fix(amazonq): Prompt re-authenticate if auto trigger failed with expi…
leigaol Jul 3, 2025
7f62ee4
fix(amazonq): skip matching with previous suggestions for EDITS
atonaamz Jul 3, 2025
44e72a7
Update version to snapshot version: 3.69.0-SNAPSHOT
Jul 3, 2025
7b161da
Merge release into master
Jul 3, 2025
bce4397
fix(amazonq): remove jitter for validation call of profiles
tsmithsz Jul 7, 2025
2cc1a26
Merge pull request #7615 from tsmithsz/remove-jitter
tsmithsz Jul 7, 2025
e7c78d8
Release 1.82.0
Jul 7, 2025
e94762b
Update version to snapshot version: 1.83.0-SNAPSHOT
Jul 7, 2025
c76fcc3
Merge pull request #7558 from tsmithsz/fix-amazonq-proxy-certificates
tsmithsz Jul 7, 2025
6eb46a2
Merge pull request #7593 from dhasani23/saveJdk
ashishrp-aws Jul 7, 2025
4674d76
feat(amazonq): passing partialResultToken for the next trigger if use…
atonaamz Jul 3, 2025
7cacad2
fix(amazonq): Adding modelSelection feature flag (#7598)
laileni-aws Jul 7, 2025
14242d6
fix(lambda): checking if folder exists (#6899)
Vandita2020 Jul 7, 2025
a98330d
feat(amazonq): passing partialResultToken for the next trigger if use…
atonaamz Jul 7, 2025
815eada
feat(amazonq): feature flag for / agents migration to agentic chat (#…
Randall-Jiang Jul 8, 2025
7c8764c
fix(amazonq): nep path asynchronous ops are not awaited (#7619)
Will-ShaoHua Jul 8, 2025
01850cd
fix(amazonq): deprecate Q inline suggestion thinking message UI (#7617)
Will-ShaoHua Jul 8, 2025
c4f99f3
feat(amazonq): adding isInlineEdit to LogInlineCompletionSessionResul…
atonaamz Jul 8, 2025
d2e5518
feat(amazonq): adding isInlineEdit to LogInlineCompletionSessionResul…
atonaamz Jul 8, 2025
c4110ad
feat(amazonq): support select images as context (#7533)
yzhangok Jul 9, 2025
8e870bf
Merge pull request #7573 from jngyuamz/fix-did-save
jngyuamz Jul 9, 2025
b7cfb0f
Release 1.83.0
Jul 9, 2025
25bc738
docs(amazonq): add instructions for language-server-runtimes setup an…
liramon1 Jul 9, 2025
735785a
fix(amazonq): improve feedback experience and min char limit
abhraina-aws Jul 10, 2025
1b7d035
Update version to snapshot version: 1.84.0-SNAPSHOT
Jul 10, 2025
0d5ead9
fix(amazonq): improve feedback experience and min char limit #7628
abhraina-aws Jul 10, 2025
97bef44
Merge pull request #7626 from liramon/flare-lsp-docs
liramon1 Jul 10, 2025
89a455c
feat(amazonq): send ide diagnostics for inline completions (#7561)
liumofei-amazon Jul 10, 2025
e0d2cbf
fix(amazonq): not allow generate completion request go through if Q i…
Will-ShaoHua Jul 11, 2025
eb3ceee
config(amazonq): nep only auto trigger on acceptance if there is next…
Will-ShaoHua Jul 11, 2025
fc01eb4
dev language server setup
Will-ShaoHua Jul 11, 2025
6052c3a
chore(amazonq): logging
Will-ShaoHua Jul 11, 2025
3eef02a
a
Will-ShaoHua Jul 11, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion .github/workflows/node.js.yml
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,7 @@ jobs:
windows:
needs: lint-commits
name: test Windows
runs-on: windows-2019
runs-on: windows-latest
strategy:
fail-fast: false
matrix:
Expand Down
3 changes: 3 additions & 0 deletions aws-toolkit-vscode.code-workspace
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,9 @@
{
"path": "packages/amazonq",
},
{
"path": "../language-servers",
},
],
"settings": {
"typescript.tsdk": "node_modules/typescript/lib",
Expand Down
5 changes: 4 additions & 1 deletion buildspec/release/50githubrelease.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,10 +36,13 @@ phases:
- echo "posting $VERSION with sha384 hash $HASH to GitHub"
- PKG_DISPLAY_NAME=$(grep -m 1 displayName packages/${TARGET_EXTENSION}/package.json | grep -o '[a-zA-z][^\"]\+' | tail -n1)
- RELEASE_MESSAGE="${PKG_DISPLAY_NAME} for VS Code $VERSION"
# Only set amazonq as "latest" release. This ensures https://api.github.com/repos/aws/aws-toolkit-vscode/releases/latest
# consistently points to the amazonq artifact, instead of being "random".
- LATEST="$([ "$TARGET_EXTENSION" = amazonq ] && echo '--latest' || echo '--latest=false' )"
- |
if [ "$STAGE" = "prod" ]; then
# note: the tag arg passed here should match what is in 10changeversion.yml
gh release create --repo $REPO --title "$PKG_DISPLAY_NAME $VERSION" --notes "$RELEASE_MESSAGE" -- "${TARGET_EXTENSION}/v${VERSION}" "$UPLOAD_TARGET" "$HASH_UPLOAD_TARGET"
gh release create "$LATEST" --repo $REPO --title "$PKG_DISPLAY_NAME $VERSION" --notes "$RELEASE_MESSAGE" -- "${TARGET_EXTENSION}/v${VERSION}" "$UPLOAD_TARGET" "$HASH_UPLOAD_TARGET"
else
echo "SKIPPED (stage=${STAGE}): 'gh release create --repo $REPO'"
fi
46 changes: 41 additions & 5 deletions docs/lsp.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,9 @@ sequenceDiagram
```

## Language Server Debugging
If you want to connect a local version of language-servers to aws-toolkit-vscode, follow these steps:

1. Clone https://github.com/aws/language-servers.git and set it up in the same workspace as this project by cmd+shift+p and "add folder to workspace" and selecting the language-servers folder that you just cloned. Your VS code folder structure should look like below.


1. Clone https://github.com/aws/language-servers.git and set it up in the same workspace as this project by cmd+shift+p and "add folder to workspace" and selecting the language-servers folder that you just cloned. Your VS code folder structure should look like below.

```
/aws-toolkit-vscode
Expand All @@ -45,7 +44,7 @@ sequenceDiagram
npm run package
```
to get the project setup
3. Enable the lsp experiment:
3. You need to open VScode user settings (Cmd+Shift+P and Search "Open User Settings (JSON)") and add the lines below at the bottom of the settings to enable the lsp experiment:
```
"aws.experiments": {
"amazonqLSP": true,
Expand All @@ -54,9 +53,46 @@ sequenceDiagram
}
```
4. Uncomment the `__AMAZONQLSP_PATH` and `__AMAZONQLSP_UI` variables in the `amazonq/.vscode/launch.json` extension configuration
5. Use the `Launch LSP with Debugging` configuration and set breakpoints in VSCode or the language server
5. Use the `Launch LSP with Debugging` configuration and set breakpoints in VSCode or the language server, Once you run "Launch LSP with Debugging" a new window should start, wait for the plugin to show up there. Then go to the run menu again and run "Attach to Language Server (amazonq)" after this you should be able to add breakpoints in the LSP code.
6. (Optional): Enable `"amazonq.trace.server": "on"` or `"amazonq.trace.server": "verbose"` in your VSCode settings to view detailed log messages sent to/from the language server. These log messages will show up in the "Amazon Q Language Server" output channel

### Breakpoints Work-Around
If the breakpoints in your language-servers project remain greyed out and do not trigger when you run `Launch LSP with Debugging`, your debugger may be attaching to the language server before it has launched. You can follow the work-around below to avoid this problem. If anyone fixes this issue, please remove this section.
1. Set your breakpoints and click `Launch LSP with Debugging`
2. Once the debugging session has started, click `Launch LSP with Debugging` again, then `Cancel` on any pop-ups that appear
3. On the debug panel, click `Attach to Language Server (amazonq)` next to the red stop button
4. Click `Launch LSP with Debugging` again, then `Cancel` on any pop-ups that appear

## Language Server Runtimes Debugging
If you want to connect a local version of language-server-runtimes to aws-toolkit-vscode, follow these steps:

1. Clone https://github.com/aws/language-server-runtimes.git and set it up in the same workspace as this project by cmd+shift+p and "add folder to workspace" and selecting the language-server-runtimes folder that you just cloned. Your VS code folder structure should look like below.

```
/aws-toolkit-vscode
/toolkit
/core
/amazonq
/language-server-runtimes
```
2. Inside of the language-server-runtimes project run:
```
npm install
npm run compile
cd runtimes
npm run prepub
cd out
npm link
cd ../../types
npm link
```
If you get an error running `npm run prepub`, you can instead run `npm run prepub:copyFiles` to skip cleaning and testing.
3. Inside of aws-toolkit-vscode run:
```
npm install
npm link @aws/language-server-runtimes @aws/language-server-runtimes-types
```

## Amazon Q Inline Activation

- In order to get inline completion working you must open a supported file type defined in CodewhispererInlineCompletionLanguages in `packages/amazonq/src/app/inline/completion.ts`
Loading
Loading