Skip to content

Commit 6da36fc

Browse files
committed
Merge branch 'main' into mergeMain-new
2 parents a1d43e4 + b885869 commit 6da36fc

14 files changed

+1679
-8
lines changed

.release-please-manifest.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"chat-client": "0.1.2",
33
"core/aws-lsp-core": "0.0.2",
44
"server/aws-lsp-antlr4": "0.1.2",
5-
"server/aws-lsp-codewhisperer": "0.0.29",
5+
"server/aws-lsp-codewhisperer": "0.0.30",
66
"server/aws-lsp-json": "0.1.2",
77
"server/aws-lsp-partiql": "0.0.6",
88
"server/aws-lsp-yaml": "0.1.2"
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
import { standalone } from '@aws/language-server-runtimes/runtimes'
2+
import { RuntimeProps } from '@aws/language-server-runtimes/runtimes/runtime'
3+
import {
4+
CodeWhispererSecurityScanServerTokenProxy,
5+
CodeWhispererServerTokenProxy,
6+
QAgenticChatServerProxy,
7+
QConfigurationServerTokenProxy,
8+
QNetTransformServerTokenProxy,
9+
} from '@aws/lsp-codewhisperer/out/language-server/proxy-server'
10+
import { IdentityServer } from '@aws/lsp-identity'
11+
12+
const MAJOR = 0
13+
const MINOR = 1
14+
const PATCH = 0
15+
const VERSION = `${MAJOR}.${MINOR}.${PATCH}`
16+
17+
const props: RuntimeProps = {
18+
version: VERSION,
19+
servers: [
20+
CodeWhispererServerTokenProxy,
21+
CodeWhispererSecurityScanServerTokenProxy,
22+
QConfigurationServerTokenProxy,
23+
QNetTransformServerTokenProxy,
24+
QAgenticChatServerProxy,
25+
IdentityServer.create,
26+
],
27+
name: 'AWS CodeWhisperer',
28+
}
29+
standalone(props)

package-lock.json

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

release-please-config.json

+1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
{
22
"bootstrap-sha": "ea570718da2b32b552b4308de1b4b3c2ee444b2b",
3+
"last-release-sha": "307f5a961ebcaa0dfd86edca85a8374f797163ed",
34
"bump-minor-pre-major": true,
45
"bump-patch-for-minor-pre-major": true,
56
"always-link-local": false,

server/aws-lsp-codewhisperer/CHANGELOG.md

+14
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,19 @@
11
# Changelog
22

3+
## [0.0.30](https://github.com/aws/language-servers/compare/lsp-codewhisperer/v0.0.29...lsp-codewhisperer/v0.0.30) (2025-03-27)
4+
5+
6+
### Features
7+
8+
* copied test files and added README to clarify purpose of this folder ([6a18e55](https://github.com/aws/language-servers/commit/6a18e55a1392aa9e68a202a8ca6f1a8b5c55bb4b))
9+
* create copy of chat server and controller to use in agentic chat ([035b30e](https://github.com/aws/language-servers/commit/035b30ec98b85faad5696034e56dbafef67e7f79))
10+
11+
12+
### Bug Fixes
13+
14+
* **amazonq:** select corrert Service manager mode in completion server factory ([8041934](https://github.com/aws/language-servers/commit/8041934de1021cfe570fc2686e4000749fe297a6))
15+
* **amazonq:** use relative path of document with chat params ([#867](https://github.com/aws/language-servers/issues/867)) ([fbc667e](https://github.com/aws/language-servers/commit/fbc667e44767ca8ddcb743b9377bf1331a27fb29))
16+
317
## [0.0.29](https://github.com/aws/language-servers/compare/lsp-codewhisperer/v0.0.28...lsp-codewhisperer/v0.0.29) (2025-03-26)
418

519

server/aws-lsp-codewhisperer/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@aws/lsp-codewhisperer",
3-
"version": "0.0.29",
3+
"version": "0.0.30",
44
"description": "CodeWhisperer Language Server",
55
"main": "out/index.js",
66
"repository": {
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
export * from './language-server/codeWhispererSecurityScanServer'
22
export * from './language-server/codeWhispererServer'
33
export * from './language-server/qChatServer'
4+
export * as QAgenticChatServer from './language-server/agenticChat/qAgenticChatServer'
45
export * from './language-server/proxy-server'
56
export * from './language-server/netTransformServer'
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
# Agentic Chat Server
2+
This folder is meant to devlop the agentic chat server separately from the existing `qChatServer`. All changes in this folder are meant to override the behavior in `qChatServer` or any of the supporting components in the `../chat/` folder.
3+
4+
Do not make changes to the `../chat/` folder directly unless it is clear that these won't break existing functionality. If changes are needed in any of those components, they can be copied over to this folder to modify.
5+
6+
The end state is that the changes in this agentic chat server be merged back into the `qChatServer` and the `../chat/` folder. The reason we don't want to create a feature branch for this work is both chat servers can be used interchangeably behind e.g., a feature flag, until one completely replaces the other.

0 commit comments

Comments
 (0)