Merge main into feature/historyV3

.eslintignore

@@ -1,4 +1,2 @@
 **/node_modules/**
-**/out/**
-server/aws-lsp-codewhisperer/src/client/sigv4/codewhisperersigv4client.d.ts
-server/aws-lsp-codewhisperer/src/client/token/codewhispererbearertokenclient.d.ts
+**/out/**

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

@@ -19,7 +19,7 @@ jobs:
             - name: Setup Node.js
               uses: actions/setup-node@v4
               with:
-                  node-version: '20'
+                  node-version: '24'
                   cache: 'npm'
 
             - name: Install dependencies

.github/workflows/create-agentic-github-prerelease.yml

@@ -101,7 +101,7 @@ jobs:
             - name: Setup Node.js
               uses: actions/setup-node@v4
               with:
-                  node-version: '20'
+                  node-version: '24'
                   cache: 'npm'
 
             # To run a ts script to create the manifest

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

@@ -42,7 +42,7 @@ jobs:
             - name: Setup Node.js
               uses: actions/setup-node@v4
               with:
-                  node-version: '20'
+                  node-version: '24'
                   cache: 'npm'
 
             # Needed to format the json file being checked in

.github/workflows/integration-tests.yml

@@ -37,7 +37,7 @@ jobs:
             - name: Set up Node
               uses: actions/setup-node@v4
               with:
-                  node-version: 18
+                  node-version: 24
             - name: Download build artifacts
               uses: actions/download-artifact@v4
               with:

.github/workflows/lsp-ci.yaml

@@ -15,7 +15,7 @@ jobs:
             - name: Set up Node
               uses: actions/setup-node@v3
               with:
-                  node-version: 18
+                  node-version: 24
             - name: Build
               run: |
                   npm ci
@@ -38,7 +38,7 @@ jobs:
             - name: Set up Node
               uses: actions/setup-node@v3
               with:
-                  node-version: 18
+                  node-version: 24
             - name: Build
               run: |
                   npm ci
@@ -63,7 +63,7 @@ jobs:
             - name: Set up Node
               uses: actions/setup-node@v3
               with:
-                  node-version: 18
+                  node-version: 24
             - name: Build
               run: |
                   npm ci
@@ -79,7 +79,7 @@ jobs:
             - name: Set up Node
               uses: actions/setup-node@v3
               with:
-                  node-version: 18
+                  node-version: 24
             - name: Build
               run: |
                   npm ci

.github/workflows/npm-packaging.yaml

@@ -15,7 +15,7 @@ jobs:
             - name: Set up Node
               uses: actions/setup-node@v3
               with:
-                  node-version: 18
+                  node-version: 24
             - name: Install dependencies
               run: npm ci
             - name: Build all monorepo packages

.github/workflows/release-please.yaml

@@ -6,7 +6,7 @@ on:
             - main
 
 permissions:
-    id-token: write # This is required for requesting the JWT (aws-actions/configure-aws-credentials)
+    id-token: write # Required for OIDC authentication with npm
     contents: write # to create release commit (google-github-actions/release-please-action)
     pull-requests: write # to create release PR (google-github-actions/release-please-action)
 
@@ -31,34 +31,14 @@ jobs:
                   persist-credentials: false
               if: ${{ fromJson(steps.release.outputs.releases_created) }}
 
-            - name: Configure AWS Credentials
-              uses: aws-actions/configure-aws-credentials@v4
-              with:
-                  role-to-assume: arn:aws:iam::935785792371:role/GithubNpmPublishAction
-                  role-session-name: language-servers-github
-                  aws-region: us-east-1
-              if: ${{ fromJson(steps.release.outputs.releases_created) }}
-
-            - name: Get npm access token
-              uses: aws-actions/aws-secretsmanager-get-secrets@v2
-              with:
-                  secret-ids: |
-                      npmjs/github_automation
-                  parse-json-secrets: true
-              if: ${{ fromJson(steps.release.outputs.releases_created) }}
-
             - name: Setup Nodejs
               uses: actions/setup-node@v4
               with:
-                  node-version: '20.x'
+                  node-version: '24.x'
                   registry-url: 'https://registry.npmjs.org'
                   scope: '@aws'
               if: ${{ fromJson(steps.release.outputs.releases_created) }}
 
-            - name: Set token
-              run: echo "NODE_AUTH_TOKEN=${{ env.NPMJS_GITHUB_AUTOMATION_TOKEN }}" >> $GITHUB_ENV
-              if: ${{ fromJson(steps.release.outputs.releases_created) }}
-
             - name: Compile and test packages
               run: |
                   npm clean-install

.gitignore

@@ -5,6 +5,8 @@ build
 **/*.tgz
 !core/codewhisperer-streaming/amzn-codewhisperer-streaming-*.tgz
 !core/q-developer-streaming-client/amzn-amazon-q-developer-streaming-client-*.tgz
+!core/codewhisperer-runtime/amzn-codewhisperer-runtime-*.tgz
+!core/codewhisperer/amzn-codewhisperer-*.tgz
 !server/aws-lsp-codewhisperer/types/types-local-indexing-*.tgz
 
 .testresults/**

.prettierignore

@@ -4,7 +4,5 @@ node_modules/
 out/
 **/bin/
 **/obj/
-server/aws-lsp-codewhisperer/src/client/sigv4/codewhisperersigv4client.d.ts
-server/aws-lsp-codewhisperer/src/client/token/codewhispererbearertokenclient.d.ts
 **/*.md
 **/antlr-generated/

.release-please-manifest.json

@@ -1,9 +1,9 @@
 {
-    "chat-client": "0.1.37",
-    "core/aws-lsp-core": "0.0.15",
-    "server/aws-lsp-antlr4": "0.1.19",
-    "server/aws-lsp-codewhisperer": "0.0.82",
-    "server/aws-lsp-json": "0.1.19",
-    "server/aws-lsp-partiql": "0.0.18",
-    "server/aws-lsp-yaml": "0.1.19"
+    "chat-client": "0.1.43",
+    "core/aws-lsp-core": "0.0.18",
+    "server/aws-lsp-antlr4": "0.1.22",
+    "server/aws-lsp-codewhisperer": "0.0.95",
+    "server/aws-lsp-json": "0.1.23",
+    "server/aws-lsp-partiql": "0.0.20",
+    "server/aws-lsp-yaml": "0.1.23"
 }

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

@@ -12,10 +12,10 @@
         "webpack": "webpack"
     },
     "dependencies": {
-        "@aws/language-server-runtimes": "^0.2.129",
+        "@aws/language-server-runtimes": "^0.3.8",
         "@aws/lsp-antlr4": "*",
-        "antlr4-c3": "^3.4.1",
-        "antlr4ng": "^3.0.4"
+        "antlr4-c3": "^3.4.2",
+        "antlr4ng": "^3.0.14"
     },
     "devDependencies": {
         "@types/chai": "^4.3.5",
@@ -26,7 +26,7 @@
         "chai-as-promised": "^7.1.1",
         "mocha": "^11.0.1",
         "ts-loader": "^9.4.4",
-        "ts-lsp-client": "^1.0.3",
+        "ts-lsp-client": "1.0.3",
         "webpack": "^5.94.0",
         "webpack-cli": "^6.0.1"
     }

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

@@ -7,7 +7,7 @@
         "compile": "tsc --build"
     },
     "dependencies": {
-        "@aws/language-server-runtimes": "^0.2.129",
+        "@aws/language-server-runtimes": "^0.3.8",
         "@aws/lsp-buildspec": "^0.0.1"
     }
 }

app/aws-lsp-buildspec-runtimes/src/index.ts

@@ -23,7 +23,8 @@ const props: BuildspecServerProps = {
 }
 
 async function getFileAsync(url: string): Promise<string> {
-    return await httpsUtils.requestContent(url)
+    const response = await httpsUtils.requestContent(url)
+    return response.content
 }
 
 export const server = new BuildspecServer(props)

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

@@ -7,7 +7,7 @@
         "compile": "tsc --build"
     },
     "dependencies": {
-        "@aws/language-server-runtimes": "^0.2.129",
+        "@aws/language-server-runtimes": "^0.3.8",
         "@aws/lsp-cloudformation": "^0.0.1"
     }
 }

app/aws-lsp-cloudformation-runtimes/src/index.ts

@@ -49,7 +49,8 @@ const props: CloudFormationServerProps = {
 }
 
 async function getFileAsync(url: string): Promise<string> {
-    return await httpsUtils.requestContent(url)
+    const response = await httpsUtils.requestContent(url)
+    return response.content
 }
 
 export const server = new CloudFormationServer(props)

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

@@ -23,7 +23,7 @@
         "local-build": "node scripts/local-build.js"
     },
     "dependencies": {
-        "@aws/language-server-runtimes": "^0.2.129",
+        "@aws/language-server-runtimes": "^0.3.8",
         "@aws/lsp-codewhisperer": "*",
         "copyfiles": "^2.4.1",
         "cross-env": "^7.0.3",
@@ -35,6 +35,7 @@
         "process": "^0.11.10",
         "stream-browserify": "^3.0.0",
         "stream-http": "^3.2.0",
+        "url": "^0.11.4",
         "vscode-languageserver": "^9.0.1",
         "wdio": "^6.0.1",
         "webpack-dev-server": "^5.2.0"

app/aws-lsp-codewhisperer-runtimes/scripts/download-node.sh

@@ -6,15 +6,18 @@
 
 set -eo pipefail
 NODE_VERSION="24"
-BASE_URL="https://nodejs.org/download/release/latest-v${NODE_VERSION}.x"
+BASE_URL="https://nodejs.org/download/release/v24.9.0"
 SHASUMS_FILE="SHASUMS256.txt"
 ASSETS_DIR="build/node-assets"
 
 # Download SHASUMS256.txt
 curl -s "$BASE_URL/$SHASUMS_FILE" -o "$SHASUMS_FILE"
 
 # Extract exact Node.js version from any entry in SHASUMS256.txt
-NODE_SEMVER=$(grep -o 'node-v[0-9]*\.[0-9]*\.[0-9]*' SHASUMS256.txt | head -1 | cut -d'v' -f2)
+# NODE_SEMVER=$(grep -o 'node-v[0-9]*\.[0-9]*\.[0-9]*' SHASUMS256.txt | head -1 | cut -d'v' -f2)
+
+# temporarily lock node.js version to 24.9.0 due to https://github.com/nodejs/node/issues/60176
+NODE_SEMVER="24.9.0"
 
 if [ -z "$NODE_SEMVER" ]; then
     echo "Failed to extract Node.js version from SHASUMS256.txt"

app/aws-lsp-codewhisperer-runtimes/scripts/dummy-package.json

@@ -0,0 +1,8 @@
+{
+    "//": [
+        "https://nodejs.org/api/packages.html#determining-module-system",
+        "This file is included with the Flare distribution to serve as the 'nearest parent package.json file' to force Node.js to treat Flare as CommonJS.",
+        "Otherwise, startup may fail when Node.js incorrectly decides to use the ES module loader instead of CJS due to user's home directory structure"
+    ],
+    "type": "commonjs"
+}

app/aws-lsp-codewhisperer-runtimes/scripts/package.sh

@@ -117,6 +117,7 @@ done
 cd ./build/private/bundle
 for config in "${configs[@]}"; do
     cd ${config}
+    cp -r ../../../../scripts/dummy-package.json ./package.json
     zip -r ../../../../$ARCHIVES_DIR/${config}/win-x64/servers.zip .
     zip -r ../../../../$ARCHIVES_DIR/${config}/linux-x64/servers.zip .
     zip -r ../../../../$ARCHIVES_DIR/${config}/mac-x64/servers.zip .

app/aws-lsp-codewhisperer-runtimes/src/agent-standalone.ts

@@ -6,6 +6,8 @@ import {
     CodeWhispererServer,
     QAgenticChatServerProxy,
     QConfigurationServerTokenProxy,
+    TransformConfigurationServerTokenProxy,
+    AtxNetTransformServerTokenProxy,
     QLocalProjectContextServerProxy,
     QNetTransformServerTokenProxy,
     WorkspaceContextServerTokenProxy,
@@ -40,6 +42,9 @@ const props = {
         // LspToolsServer,
         AmazonQServiceServerIAM,
         AmazonQServiceServerToken,
+        // ATX Servers
+        TransformConfigurationServerTokenProxy,
+        AtxNetTransformServerTokenProxy,
     ],
     name: 'AWS CodeWhisperer',
 } as RuntimeProps

app/aws-lsp-codewhisperer-runtimes/src/token-standalone.ts

@@ -4,6 +4,8 @@ import {
     CodeWhispererServerTokenProxy,
     QChatServerTokenProxy,
     QConfigurationServerTokenProxy,
+    TransformConfigurationServerTokenProxy,
+    AtxNetTransformServerTokenProxy,
     QNetTransformServerTokenProxy,
     QLocalProjectContextServerProxy,
     WorkspaceContextServerTokenProxy,
@@ -25,6 +27,9 @@ const props = createTokenRuntimeProps(VERSION, [
     IdentityServer.create,
     QLocalProjectContextServerProxy,
     WorkspaceContextServerTokenProxy,
+
+    TransformConfigurationServerTokenProxy,
+    AtxNetTransformServerTokenProxy as any,
 ])
 
 standalone(props)

app/aws-lsp-codewhisperer-runtimes/src/version.json

@@ -1,3 +1,3 @@
 {
-    "agenticChat": "1.35.0"
+    "agenticChat": "1.49.0"
 }

app/aws-lsp-codewhisperer-runtimes/webpack.config.js

@@ -80,6 +80,7 @@ const webworkerConfig = {
             http: 'stream-http',
             crypto: 'crypto-browserify',
             stream: 'stream-browserify',
+            url: require.resolve('url/'),
             fs: path.resolve(__dirname, 'src/mock-fs.js'),
             child_process: false,
             vm: false,

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

@@ -7,7 +7,7 @@
         "compile": "tsc --build"
     },
     "dependencies": {
-        "@aws/language-server-runtimes": "^0.2.129",
+        "@aws/language-server-runtimes": "^0.3.8",
         "@aws/lsp-identity": "^0.0.1"
     }
 }

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

@@ -11,7 +11,7 @@
         "webpack": "webpack"
     },
     "dependencies": {
-        "@aws/language-server-runtimes": "^0.2.129",
+        "@aws/language-server-runtimes": "^0.3.8",
         "@aws/lsp-json": "*"
     },
     "devDependencies": {
@@ -22,7 +22,7 @@
         "chai-as-promised": "^7.1.1",
         "mocha": "^11.0.1",
         "ts-loader": "^9.4.4",
-        "ts-lsp-client": "^1.0.3",
+        "ts-lsp-client": "1.0.3",
         "webpack": "^5.94.0",
         "webpack-cli": "^6.0.1"
     }