Skip to content

Commit 433d9ca

Browse files
laileni-awsWill-ShaoHuaabhraina-awsBlakeLazarineblakelaz-amazon
authored
fix: Merge from main (#2169)
* refactor: split edit from completion code path (#2058) * feat(amazonq): add two more tips for the did you know section (#2063) * fix(amazonq): make display findings tool run more often (#2067) Co-authored-by: Blake Lazarine <[email protected]> * fix(amazonq): fix to add disable/enable feature back to mcp servers (#2052) * fix(amazonq): fix to add disable/enable feature back to mcp servers * fix(amazonq): fix to add unit tests * fix: fix to add unit test coverage for mcpUtils * feat(amazonq): enable sonnet 4 for fra region (#2069) * chore(release): release packages from branch main (#2050) Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * fix(amazonq): emit failed status for amazonq_invokeLLM (#2071) * chore: generate completion log string (#2072) * fix(amazonq): fix fallout of #2051 (#2057) * fix(amazonq): fix fallout of #2051 avoid buggy global states * fix(amazonq): fix tests fix should report UTD test case * chore: merge agentic version 1.26.0 (#2076) * Bump agentic version: 1.26.0 * chore: format version json --------- Co-authored-by: aws-toolkit-automation <> * fix(amazonq): bundle corect registry.node for windows (#2061) * chore: bump runtimes to 0.2.123 (#2082) * fix: remove edit cache logic (#2079) * fix(amazonq): add fallback classpath generation (#2077) * fix(amazonq): skips continuous monitoring when WCS sees workspace as idle (#2066) * fix(amazonq): skips continuous monitoring when WCS sees workspace as idle * fix(amazonq): skips creating remote workspace at the start --------- Co-authored-by: Jiatong Li <[email protected]> * fix: sessionManager misused because there are 2 types of manager now (#2090) * chore: mapping adt plugin to abap to let inline suggestion work (#2085) * chore: support inline suggestion in adt plugin for eclipse * fix: add import URI * chore: add detailed error description for uri is empty for language id * feat(amazonq): read tool ui revamp * feat(amazonq): read tool message revamp (#2049) * feat(amazonq): read tool message revamp * fix tests * feat: file search ui (#2078) * feat: file search ui * fix tests * fix integration tests * remove unnecessary type check * fix: use quotes instead of backticks * fix: creating a new sesion for Edits trigger with next token (#2094) * chore: bump @aws/mynah-ui to 4.36.4 (#2096) * fix(amazonq): leverage lcs to find the chars added and removed (#2092) * fix: update client name to support Sagemaker AI origin for agentic chat (#2093) Co-authored-by: chungjac <[email protected]> * chore(release): release packages from branch main (#2073) Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * chore: format version.json after incrementing (#2068) * chore: merge agentic version 1.27.0 (#2107) * Bump agentic version: 1.27.0 * Revert "feat(amazonq): read tool ui revamp" This reverts commit c65428b. * fix: the style in version json (#2106) --------- Co-authored-by: aws-toolkit-automation <> Co-authored-by: Tai Lai <[email protected]> Co-authored-by: Christopher Christou <[email protected]> * fix(amazonq): persist mcp configs in agent json on start-up (#2112) * feat(amazonq): added mcp admin level configuration with GetProfile (#2000) * feat(amazonq): added mcp admin level configuration with GetProfile * feat(amazonq): added UX message for mcp admin control * test: add unit tests for ProfileStatusMonitor static functionality * test: add comprehensive unit tests for MCP admin control features * fix: fix to wait for serviceManager is initialzied to initialize mcp managers * fix: fix for unit test failures * fix: fix for UI changes * fix(amazonq): fix to to rename mcp enabled function and max time limit of 10 seconds * fix: fix to add async initialization for mcp manager * fix: fix to move action buttons to mcpEventHandler for listMcpServers * fix: added try and catch block for mcp initialization * fix: fix for merge conflicts * fix: fix for test failure * fix: remove the unnecessary feature flag * fix: fix for mynah test failure * fix: fix to retry function to common util * fix: fix to add retryUtils * fix: Use file context override in the inline completion params for Jupyter Notebook (#2114) * feat(amazonq): read tool ui revamp (#2113) (#2121) * feat(amazonq): read tool ui revamp * feat(amazonq): read tool message revamp (#2049) * feat(amazonq): read tool message revamp * fix tests * feat: file search ui (#2078) * feat: file search ui * fix tests * fix integration tests * remove unnecessary type check * fix: use quotes instead of backticks * fix header update issue * fix integration test * refactor: improve generateCompletion logging format (#2125) * fix(amazonq): handle case where multiple rules are provided with the same name (#2118) * fix(amazonq): handle case where multiple rules are provided with the same name * fix(amazonq): add unit test for duplicate custom guidelines * fix(amazonq): add unit test for processToolUses * fix(amazonq): set context type for AmazonQ.md to rule * fix(amazonq): add README.md back as rule context type --------- Co-authored-by: Blake Lazarine <[email protected]> * perf: remove edit completion retry mechanism on document change (#2124) * ci: remove need for custom PAT for release branch workflow (#2126) The token from GitHub Actions is sufficient * fix: proper path handling for additional context (#2129) * fix: proper pathing for additonal context * fix: update existing tests to also mock path.join() * fix(amazonq): fix regression of mcp config in agent config (#2101) * fix(amazonq): update process-permission-updates to be the same as previous behavior * fix(chat-client): update package.json chat-client to prod * fix(amazonq): retain mcp permissions after disable/enable server * fix: dont call initOneServer on Built-in * fix: deny permission does not persist after restart IDE --------- Co-authored-by: Boyu <[email protected]> * feat: remove project type validation from LSP layer (#2103) * feat: remove project type validation from LSP layer * refactor: remove unused validation functions from LSP layer * fix: fix for button text and remove profilearn caching (#2137) * chore: bump runtimes to 0.2.126 (#2138) * fix: fix to add disk caching for mcp admin state (#2139) * fix: fix to add disk caching for mcp admin state * fix: fix to add logging * fix: fix to initialize mcpManager in any case and discover servers based on mcpState * fix: fix for unit test failure * refactor: cleanup old nep code path which is no longered being used in codewhispererServer.ts (#2141) * fix(amazonq): add server side control for WCS features (#2128) Co-authored-by: Jiatong Li <[email protected]> * chore: update STE userContext version metadata (#2142) * fix: fix to turn on and off MCP servers incase of error based on last state (#2143) Co-authored-by: Laxman Reddy <[email protected]> * fix: empty userTriggerDecision not being sent for NEP code path (#2140) * refactor: clean up old NEP code path which is no longer used * fix: empty userTriggerDecision not being sent for NEP code path * test: disable telemetry test temporarily * fix: patch * revert: a * revert: a * chore(release): release packages from branch main (#2117) * fix(amazonq): don't let flare send discard for the still valid suggestion in JB (#2145) * fix(amazonq): don't let flare send discard for the still valid suggestion in JB if a valid sessionId is returned back to JB, JB will eventually send a decision for it, but when user types a character to reject the current suggestion, on JB side it will 1) send reject for the current one 2) send a new trigger for the latest context. 2) will happen before 1) which will discard the current active session on flare's end. We don't want flare to do that for JB. * fix(amazonq): createSession doesn't need to close the previous session it should be handled together with telemetry reporting * fix(amazonq): fix test * fix(amazonq): test fix attempt * fix(amazonq): test fix attempt * chore(release): release packages from branch main (#2149) Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * chore: merge agentic version 1.29.0 (#2151) * chore: bump agentic version: 1.29.0 * chore: empty commit to start Github Action (#2150) --------- Co-authored-by: aws-toolkit-automation <> * feat: add basic OAuth client for remote MCP (#2136) * feat: add basic mcp oauth client * fix: relax condition for triggering oauth flow; add resilience checks for as availability * feat: add unit test for auth client * fix: multiple fixes for remote mcp error and timeout * fix: adding streakTracker to track streakLength across Completions and Edits (#2147) * feat: disable pkce flow during plugin load (#2153) * chore: bump runtimes to 0.2.127 (#2156) * fix: multiple fixes on auth flow edge cases (#2155) * feat: update MCP manager and utilities (#2158) Co-authored-by: Boyu <[email protected]> * fix(amazonq): disable typewriter animation (#2160) * ci: generation of builds action can be triggered manually (#2157) Co-authored-by: Laxman Reddy <[email protected]> * fix(amazonq): fix for mcp servers operations to edit server config only (#2165) * fix(amazonq): fix for mcp servers operations to edit server specific config * fix(amazonq): additional mcp server config fixes * fix: resolve test failures * fix: update MCP manager configuration * fix: allow ci to run on release branches (#2159) Currently release/agentic/* branches used in our release process have rules that require CI to be run. However the corresponding workflows do not actually trigger for release branches. This change ensures no manual overrides are required in the release process and CI mapped with the branch actually runs. * Updating the model of listAvailableModels (#2064) * fix(amazonq): fix flickering issue for model selection dropdown and agenticCoding toggle (#2065) * fix(amazonq): fix flickering issue for modelId and agenticCoding * fix(amazonq): Fixing flaky tests * feat(amazonq): Fetching models from backend and adding cache implementation. (#2075) * fix: removing and refactoring legacy code before implementing model selection * feat(amazonq): adding cache implementation and fetching models from listAvailableModels api * feat(amazonq): adding selected model in error case * feat(amazonq): adding test cases * fix: addressing comments * fix: fixing test cases and adding modelName to models * fix: minor edits * fix: minor edits * fix: minor modifications in logs * fix: adding default model if api throws any errors * fix: refactoring code * fix: Improve model selection fallback logic when user's preferred model is unavailable (#2089) * fix: if user preferred model does not exist, fall back to default model * fix: minor test changes * fix: to support backward compatibility for vs and eclipse, adding back modelSelection in chat-client (#2095) * fix: check available models from backend before selecting default model from fallback models (#2102) * feat(amazonq): use model display names (#2123) * fix: cached model list should be invalidated on sign out (#2131) * fix: cached model list should be invalidated on sign out * fix test * avoid throwing error * fix: adding default modelId and setting cache ttl to 30 minutes (#2161) * fix: adding defaultmodelId and setting cache ttl to 30 minutes * fix: fixing tests * fix: updating comments * fix: lint issue while resolving merge conflicts --------- Co-authored-by: Will Lo <[email protected]> Co-authored-by: abhraina-aws <[email protected]> Co-authored-by: BlakeLazarine <[email protected]> Co-authored-by: Blake Lazarine <[email protected]> Co-authored-by: invictus <[email protected]> Co-authored-by: Tai Lai <[email protected]> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Na Yue <[email protected]> Co-authored-by: andrewyuq <[email protected]> Co-authored-by: Sherry Lu <[email protected]> Co-authored-by: tsmithsz <[email protected]> Co-authored-by: liumofei-amazon <[email protected]> Co-authored-by: Jiatong Li <[email protected]> Co-authored-by: Jiatong Li <[email protected]> Co-authored-by: atontb <[email protected]> Co-authored-by: Jayakrishna P <[email protected]> Co-authored-by: chungjac <[email protected]> Co-authored-by: Christopher Christou <[email protected]> Co-authored-by: Tai Lai <[email protected]> Co-authored-by: Dung Dong <[email protected]> Co-authored-by: Lei Gao <[email protected]> Co-authored-by: Richard Li <[email protected]> Co-authored-by: Boyu <[email protected]> Co-authored-by: Rajanna-Karthik <[email protected]> Co-authored-by: manodnyab <[email protected]> Co-authored-by: Shruti Sinha <[email protected]>
1 parent 447f6cb commit 433d9ca

File tree

115 files changed

+5309
-1527
lines changed

Some content is hidden

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

115 files changed

+5309
-1527
lines changed

.github/workflows/create-agent-standalone.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,12 @@ name: Create agent-standalone bundles
33
on:
44
push:
55
branches: [main, feature/*, release/agentic/*]
6+
workflow_dispatch:
67

78
jobs:
89
build:
910
runs-on: ubuntu-latest
11+
if: github.event_name == 'push' || github.actor_id == github.repository_owner_id
1012

1113
steps:
1214
- name: Checkout repository

.github/workflows/create-release-candidate-branch.yml

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -28,14 +28,15 @@ jobs:
2828
setupRcBranch:
2929
name: Set up a Release Candidate Branch
3030
runs-on: ubuntu-latest
31+
permissions:
32+
contents: write
3133

3234
steps:
3335
- name: Sync code
3436
uses: actions/checkout@v4
3537
with:
3638
ref: ${{ inputs.commitId }}
37-
# Use RELEASE_CANDIDATE_BRANCH_CREATION_PAT to ensure workflow triggering works
38-
token: ${{ secrets.RELEASE_CANDIDATE_BRANCH_CREATION_PAT }}
39+
token: ${{ secrets.GITHUB_TOKEN }}
3940
persist-credentials: true
4041

4142
- name: Setup Node.js
@@ -44,6 +45,10 @@ jobs:
4445
node-version: '20'
4546
cache: 'npm'
4647

48+
# Needed to format the json file being checked in
49+
- name: Install dependencies
50+
run: npm ci
51+
4752
- name: Calculate Release Version
4853
id: release-version
4954
env:
@@ -87,6 +92,9 @@ jobs:
8792
8893
git add "$VERSION_FILE"
8994
95+
# Ensure the file does not cause issues when merged to main
96+
npm run format-staged
97+
9098
- name: Create Release Candidate Branch
9199
id: release-branch
92100
env:
@@ -102,15 +110,8 @@ jobs:
102110
env:
103111
BRANCH_NAME: ${{ steps.release-branch.outputs.BRANCH_NAME }}
104112
RELEASE_VERSION: ${{ steps.release-version.outputs.RELEASE_VERSION }}
105-
# We use the toolkit-automation account, basically something that
106-
# isn't the default GitHub Token, because you cannot chain actions with that.
107-
# In our case, after pushing a commit (below), we want create-agent-standalone.yml
108-
# to start automatically.
109-
REPO_PAT: ${{ secrets.RELEASE_CANDIDATE_BRANCH_CREATION_PAT }}
110113
run: |
111114
git config --global user.email "<>"
112115
git config --global user.name "aws-toolkit-automation"
113-
# Configure git to use the PAT token for authentication
114-
git remote set-url origin "https://x-access-token:${REPO_PAT}@github.com/${{ github.repository }}.git"
115-
git commit -m "Bump agentic version: $RELEASE_VERSION"
116+
git commit --no-verify -m "chore: bump agentic version: $RELEASE_VERSION"
116117
git push --set-upstream origin "$BRANCH_NAME"

.github/workflows/lsp-ci.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
name: Language Server CI
22
on:
33
push:
4-
branches: [main, dev, feature/*]
4+
branches: [main, dev, feature/*, release/agentic/*]
55
pull_request:
6-
branches: [main, dev, feature/*]
6+
branches: [main, dev, feature/*, release/agentic/*]
77

88
jobs:
99
test:

.github/workflows/npm-packaging.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
name: NPM Packaging
22
on:
33
push:
4-
branches: [main, dev, feature/*]
4+
branches: [main, dev, feature/*, release/agentic/*]
55
pull_request:
6-
branches: [main, dev, feature/*]
6+
branches: [main, dev, feature/*, release/agentic/*]
77

88
jobs:
99
build:

.release-please-manifest.json

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
{
2-
"chat-client": "0.1.30",
3-
"core/aws-lsp-core": "0.0.13",
4-
"server/aws-lsp-antlr4": "0.1.17",
5-
"server/aws-lsp-codewhisperer": "0.0.71",
6-
"server/aws-lsp-json": "0.1.17",
7-
"server/aws-lsp-partiql": "0.0.16",
8-
"server/aws-lsp-yaml": "0.1.17"
2+
"chat-client": "0.1.33",
3+
"core/aws-lsp-core": "0.0.14",
4+
"server/aws-lsp-antlr4": "0.1.18",
5+
"server/aws-lsp-codewhisperer": "0.0.75",
6+
"server/aws-lsp-json": "0.1.18",
7+
"server/aws-lsp-partiql": "0.0.17",
8+
"server/aws-lsp-yaml": "0.1.18"
99
}

app/aws-lsp-antlr4-runtimes/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
"webpack": "webpack"
1313
},
1414
"dependencies": {
15-
"@aws/language-server-runtimes": "^0.2.121",
15+
"@aws/language-server-runtimes": "^0.2.127",
1616
"@aws/lsp-antlr4": "*",
1717
"antlr4-c3": "^3.4.1",
1818
"antlr4ng": "^3.0.4"

app/aws-lsp-buildspec-runtimes/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"compile": "tsc --build"
88
},
99
"dependencies": {
10-
"@aws/language-server-runtimes": "^0.2.121",
10+
"@aws/language-server-runtimes": "^0.2.127",
1111
"@aws/lsp-buildspec": "^0.0.1"
1212
}
1313
}

app/aws-lsp-cloudformation-runtimes/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"compile": "tsc --build"
88
},
99
"dependencies": {
10-
"@aws/language-server-runtimes": "^0.2.121",
10+
"@aws/language-server-runtimes": "^0.2.127",
1111
"@aws/lsp-cloudformation": "^0.0.1"
1212
}
1313
}

app/aws-lsp-codewhisperer-runtimes/README.md

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,17 @@ The server is managed via scripts/dev-server.js, which ensures:
7676

7777
**NOTE**: Tests are currently disabled for Windows as we currently face issues with automatically shutting down devserver and cleaning resources after tests are executed.
7878

79+
## Binary Dependencies
80+
81+
### registry.node
82+
The file `_bundle-assets/registry-js/win32-x64/registry.node` is a precompiled binary downloaded from the [registry-js](https://github.com/desktop/registry-js) project.
83+
84+
- **Current version**: v1.16.1 (released May 21, 2024)
85+
- **Source**: https://github.com/desktop/registry-js/releases
86+
- **Purpose**: Provides Windows registry access functionality
87+
88+
**To update**: Download the latest `registry.node` binary for win32-x64 from the registry-js releases page and replace the existing file.
89+
7990
#### Tests configuration
8091
- Test settings are defined in `wdio.conf.ts`
8192
- The actual test implementation is in the `test/e2e` folder
Binary file not shown.

0 commit comments

Comments
 (0)