diff --git a/app/aws-lsp-antlr4-runtimes/package.json b/app/aws-lsp-antlr4-runtimes/package.json
index bf7cf47bf1..4289cec4b1 100644
--- a/app/aws-lsp-antlr4-runtimes/package.json
+++ b/app/aws-lsp-antlr4-runtimes/package.json
@@ -12,7 +12,7 @@
         "webpack": "webpack"
     },
     "dependencies": {
-        "@aws/language-server-runtimes": "^0.2.123",
+        "@aws/language-server-runtimes": "^0.2.125",
         "@aws/lsp-antlr4": "*",
         "antlr4-c3": "^3.4.1",
         "antlr4ng": "^3.0.4"
diff --git a/app/aws-lsp-buildspec-runtimes/package.json b/app/aws-lsp-buildspec-runtimes/package.json
index b9c36946b2..700afb3e7f 100644
--- a/app/aws-lsp-buildspec-runtimes/package.json
+++ b/app/aws-lsp-buildspec-runtimes/package.json
@@ -7,7 +7,7 @@
         "compile": "tsc --build"
     },
     "dependencies": {
-        "@aws/language-server-runtimes": "^0.2.123",
+        "@aws/language-server-runtimes": "^0.2.125",
         "@aws/lsp-buildspec": "^0.0.1"
     }
 }
diff --git a/app/aws-lsp-cloudformation-runtimes/package.json b/app/aws-lsp-cloudformation-runtimes/package.json
index a88386db4e..5cc04150cb 100644
--- a/app/aws-lsp-cloudformation-runtimes/package.json
+++ b/app/aws-lsp-cloudformation-runtimes/package.json
@@ -7,7 +7,7 @@
         "compile": "tsc --build"
     },
     "dependencies": {
-        "@aws/language-server-runtimes": "^0.2.123",
+        "@aws/language-server-runtimes": "^0.2.125",
         "@aws/lsp-cloudformation": "^0.0.1"
     }
 }
diff --git a/app/aws-lsp-codewhisperer-runtimes/package.json b/app/aws-lsp-codewhisperer-runtimes/package.json
index 487d2c5b1a..fc31e64589 100644
--- a/app/aws-lsp-codewhisperer-runtimes/package.json
+++ b/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.123",
+        "@aws/language-server-runtimes": "^0.2.125",
         "@aws/lsp-codewhisperer": "*",
         "copyfiles": "^2.4.1",
         "cross-env": "^7.0.3",
diff --git a/app/aws-lsp-identity-runtimes/package.json b/app/aws-lsp-identity-runtimes/package.json
index 46abf7d958..869a30cb20 100644
--- a/app/aws-lsp-identity-runtimes/package.json
+++ b/app/aws-lsp-identity-runtimes/package.json
@@ -7,7 +7,7 @@
         "compile": "tsc --build"
     },
     "dependencies": {
-        "@aws/language-server-runtimes": "^0.2.123",
+        "@aws/language-server-runtimes": "^0.2.125",
         "@aws/lsp-identity": "^0.0.1"
     }
 }
diff --git a/app/aws-lsp-json-runtimes/package.json b/app/aws-lsp-json-runtimes/package.json
index 24ae3535ac..f63dd4e985 100644
--- a/app/aws-lsp-json-runtimes/package.json
+++ b/app/aws-lsp-json-runtimes/package.json
@@ -11,7 +11,7 @@
         "webpack": "webpack"
     },
     "dependencies": {
-        "@aws/language-server-runtimes": "^0.2.123",
+        "@aws/language-server-runtimes": "^0.2.125",
         "@aws/lsp-json": "*"
     },
     "devDependencies": {
diff --git a/app/aws-lsp-notification-runtimes/package.json b/app/aws-lsp-notification-runtimes/package.json
index 1e7641e2a8..faf9e4c24c 100644
--- a/app/aws-lsp-notification-runtimes/package.json
+++ b/app/aws-lsp-notification-runtimes/package.json
@@ -7,7 +7,7 @@
         "compile": "tsc --build"
     },
     "dependencies": {
-        "@aws/language-server-runtimes": "^0.2.123",
+        "@aws/language-server-runtimes": "^0.2.125",
         "@aws/lsp-notification": "^0.0.1"
     }
 }
diff --git a/app/aws-lsp-partiql-runtimes/package.json b/app/aws-lsp-partiql-runtimes/package.json
index 0d5e07cddf..d483f3d0ce 100644
--- a/app/aws-lsp-partiql-runtimes/package.json
+++ b/app/aws-lsp-partiql-runtimes/package.json
@@ -11,7 +11,7 @@
         "package": "npm run compile && npm run compile:webpack"
     },
     "dependencies": {
-        "@aws/language-server-runtimes": "^0.2.120",
+        "@aws/language-server-runtimes": "^0.2.125",
         "@aws/lsp-partiql": "^0.0.5"
     },
     "devDependencies": {
diff --git a/app/aws-lsp-s3-runtimes/package.json b/app/aws-lsp-s3-runtimes/package.json
index ad84f62776..42efa998be 100644
--- a/app/aws-lsp-s3-runtimes/package.json
+++ b/app/aws-lsp-s3-runtimes/package.json
@@ -10,7 +10,7 @@
         "compile": "tsc --build"
     },
     "dependencies": {
-        "@aws/language-server-runtimes": "^0.2.123",
+        "@aws/language-server-runtimes": "^0.2.125",
         "@aws/lsp-s3": "^0.0.1"
     }
 }
diff --git a/app/aws-lsp-yaml-json-webworker/package.json b/app/aws-lsp-yaml-json-webworker/package.json
index 7079d1fa3b..6190893816 100644
--- a/app/aws-lsp-yaml-json-webworker/package.json
+++ b/app/aws-lsp-yaml-json-webworker/package.json
@@ -11,7 +11,7 @@
         "serve:webpack": "NODE_ENV=development webpack serve"
     },
     "dependencies": {
-        "@aws/language-server-runtimes": "^0.2.123",
+        "@aws/language-server-runtimes": "^0.2.125",
         "@aws/lsp-json": "*",
         "@aws/lsp-yaml": "*"
     },
diff --git a/app/aws-lsp-yaml-runtimes/package.json b/app/aws-lsp-yaml-runtimes/package.json
index a59f919477..eb76a46e38 100644
--- a/app/aws-lsp-yaml-runtimes/package.json
+++ b/app/aws-lsp-yaml-runtimes/package.json
@@ -11,7 +11,7 @@
         "webpack": "webpack"
     },
     "dependencies": {
-        "@aws/language-server-runtimes": "^0.2.123",
+        "@aws/language-server-runtimes": "^0.2.125",
         "@aws/lsp-yaml": "*"
     },
     "devDependencies": {
diff --git a/app/hello-world-lsp-runtimes/package.json b/app/hello-world-lsp-runtimes/package.json
index 54018d89d0..14a3a75ff4 100644
--- a/app/hello-world-lsp-runtimes/package.json
+++ b/app/hello-world-lsp-runtimes/package.json
@@ -15,7 +15,7 @@
     },
     "dependencies": {
         "@aws/hello-world-lsp": "^0.0.1",
-        "@aws/language-server-runtimes": "^0.2.123"
+        "@aws/language-server-runtimes": "^0.2.125"
     },
     "devDependencies": {
         "@types/chai": "^4.3.5",
diff --git a/chat-client/package.json b/chat-client/package.json
index df0378f3e4..2ee60a8bec 100644
--- a/chat-client/package.json
+++ b/chat-client/package.json
@@ -25,7 +25,7 @@
     },
     "dependencies": {
         "@aws/chat-client-ui-types": "^0.1.56",
-        "@aws/language-server-runtimes": "^0.2.123",
+        "@aws/language-server-runtimes": "^0.2.125",
         "@aws/language-server-runtimes-types": "^0.1.50",
         "@aws/mynah-ui": "^4.36.4"
     },
diff --git a/client/vscode/package.json b/client/vscode/package.json
index 975a395d66..409a4fc50d 100644
--- a/client/vscode/package.json
+++ b/client/vscode/package.json
@@ -352,7 +352,7 @@
         "@aws-sdk/credential-providers": "^3.731.1",
         "@aws-sdk/types": "^3.734.0",
         "@aws/chat-client-ui-types": "^0.1.56",
-        "@aws/language-server-runtimes": "^0.2.123",
+        "@aws/language-server-runtimes": "^0.2.125",
         "@types/uuid": "^9.0.8",
         "@types/vscode": "^1.98.0",
         "jose": "^5.2.4",
diff --git a/core/aws-lsp-core/package.json b/core/aws-lsp-core/package.json
index aeff582d34..5a3d438d47 100644
--- a/core/aws-lsp-core/package.json
+++ b/core/aws-lsp-core/package.json
@@ -28,7 +28,7 @@
         "prepack": "shx cp ../../LICENSE ../../NOTICE ../../SECURITY.md ."
     },
     "dependencies": {
-        "@aws/language-server-runtimes": "^0.2.123",
+        "@aws/language-server-runtimes": "^0.2.125",
         "@gerhobbelt/gitignore-parser": "^0.2.0-9",
         "cross-spawn": "7.0.6",
         "jose": "^5.2.4",
diff --git a/integration-tests/q-agentic-chat-server/package.json b/integration-tests/q-agentic-chat-server/package.json
index 5431142f5c..1e93a252dd 100644
--- a/integration-tests/q-agentic-chat-server/package.json
+++ b/integration-tests/q-agentic-chat-server/package.json
@@ -9,7 +9,7 @@
         "test-integ": "npm run compile && mocha --timeout 30000 \"./out/**/*.test.js\" --retries 2"
     },
     "dependencies": {
-        "@aws/language-server-runtimes": "^0.2.123",
+        "@aws/language-server-runtimes": "^0.2.125",
         "@aws/lsp-core": "*"
     },
     "devDependencies": {
diff --git a/package-lock.json b/package-lock.json
index b42f206c44..d1ac2ece1c 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -48,7 +48,7 @@
             "name": "@aws/lsp-antlr4-runtimes",
             "version": "0.0.1",
             "dependencies": {
-                "@aws/language-server-runtimes": "^0.2.123",
+                "@aws/language-server-runtimes": "^0.2.125",
                 "@aws/lsp-antlr4": "*",
                 "antlr4-c3": "^3.4.1",
                 "antlr4ng": "^3.0.4"
@@ -71,7 +71,7 @@
             "name": "@aws/lsp-buildspec-runtimes",
             "version": "0.0.1",
             "dependencies": {
-                "@aws/language-server-runtimes": "^0.2.123",
+                "@aws/language-server-runtimes": "^0.2.125",
                 "@aws/lsp-buildspec": "^0.0.1"
             }
         },
@@ -79,7 +79,7 @@
             "name": "@aws/lsp-cloudformation-runtimes",
             "version": "0.0.1",
             "dependencies": {
-                "@aws/language-server-runtimes": "^0.2.123",
+                "@aws/language-server-runtimes": "^0.2.125",
                 "@aws/lsp-cloudformation": "^0.0.1"
             }
         },
@@ -87,7 +87,7 @@
             "name": "@aws/lsp-codewhisperer-runtimes",
             "version": "0.0.1",
             "dependencies": {
-                "@aws/language-server-runtimes": "^0.2.123",
+                "@aws/language-server-runtimes": "^0.2.125",
                 "@aws/lsp-codewhisperer": "*",
                 "copyfiles": "^2.4.1",
                 "cross-env": "^7.0.3",
@@ -120,7 +120,7 @@
             "name": "@aws/lsp-identity-runtimes",
             "version": "0.1.0",
             "dependencies": {
-                "@aws/language-server-runtimes": "^0.2.123",
+                "@aws/language-server-runtimes": "^0.2.125",
                 "@aws/lsp-identity": "^0.0.1"
             }
         },
@@ -128,7 +128,7 @@
             "name": "@aws/lsp-json-runtimes",
             "version": "0.0.1",
             "dependencies": {
-                "@aws/language-server-runtimes": "^0.2.123",
+                "@aws/language-server-runtimes": "^0.2.125",
                 "@aws/lsp-json": "*"
             },
             "devDependencies": {
@@ -148,7 +148,7 @@
             "name": "@aws/lsp-notification-runtimes",
             "version": "0.1.0",
             "dependencies": {
-                "@aws/language-server-runtimes": "^0.2.123",
+                "@aws/language-server-runtimes": "^0.2.125",
                 "@aws/lsp-notification": "^0.0.1"
             }
         },
@@ -156,7 +156,7 @@
             "name": "@aws/lsp-partiql-runtimes",
             "version": "0.0.1",
             "dependencies": {
-                "@aws/language-server-runtimes": "^0.2.120",
+                "@aws/language-server-runtimes": "^0.2.125",
                 "@aws/lsp-partiql": "^0.0.5"
             },
             "devDependencies": {
@@ -181,7 +181,7 @@
             "name": "@aws/lsp-s3-runtimes",
             "version": "0.0.1",
             "dependencies": {
-                "@aws/language-server-runtimes": "^0.2.123",
+                "@aws/language-server-runtimes": "^0.2.125",
                 "@aws/lsp-s3": "^0.0.1"
             },
             "bin": {
@@ -192,7 +192,7 @@
             "name": "@aws/lsp-yaml-json-webworker",
             "version": "0.0.1",
             "dependencies": {
-                "@aws/language-server-runtimes": "^0.2.123",
+                "@aws/language-server-runtimes": "^0.2.125",
                 "@aws/lsp-json": "*",
                 "@aws/lsp-yaml": "*"
             },
@@ -212,7 +212,7 @@
             "name": "@aws/lsp-yaml-runtimes",
             "version": "0.0.1",
             "dependencies": {
-                "@aws/language-server-runtimes": "^0.2.123",
+                "@aws/language-server-runtimes": "^0.2.125",
                 "@aws/lsp-yaml": "*"
             },
             "devDependencies": {
@@ -234,7 +234,7 @@
             "version": "0.0.1",
             "dependencies": {
                 "@aws/hello-world-lsp": "^0.0.1",
-                "@aws/language-server-runtimes": "^0.2.123"
+                "@aws/language-server-runtimes": "^0.2.125"
             },
             "devDependencies": {
                 "@types/chai": "^4.3.5",
@@ -255,7 +255,7 @@
             "license": "Apache-2.0",
             "dependencies": {
                 "@aws/chat-client-ui-types": "^0.1.56",
-                "@aws/language-server-runtimes": "^0.2.123",
+                "@aws/language-server-runtimes": "^0.2.125",
                 "@aws/language-server-runtimes-types": "^0.1.50",
                 "@aws/mynah-ui": "^4.36.4"
             },
@@ -280,7 +280,7 @@
                 "@aws-sdk/credential-providers": "^3.731.1",
                 "@aws-sdk/types": "^3.734.0",
                 "@aws/chat-client-ui-types": "^0.1.56",
-                "@aws/language-server-runtimes": "^0.2.123",
+                "@aws/language-server-runtimes": "^0.2.125",
                 "@types/uuid": "^9.0.8",
                 "@types/vscode": "^1.98.0",
                 "jose": "^5.2.4",
@@ -296,7 +296,7 @@
             "version": "0.0.13",
             "license": "Apache-2.0",
             "dependencies": {
-                "@aws/language-server-runtimes": "^0.2.123",
+                "@aws/language-server-runtimes": "^0.2.125",
                 "@gerhobbelt/gitignore-parser": "^0.2.0-9",
                 "cross-spawn": "7.0.6",
                 "jose": "^5.2.4",
@@ -327,7 +327,7 @@
             "name": "@aws/q-agentic-chat-server-integration-tests",
             "version": "0.0.1",
             "dependencies": {
-                "@aws/language-server-runtimes": "^0.2.123",
+                "@aws/language-server-runtimes": "^0.2.125",
                 "@aws/lsp-core": "*"
             },
             "devDependencies": {
@@ -4036,12 +4036,12 @@
             "link": true
         },
         "node_modules/@aws/language-server-runtimes": {
-            "version": "0.2.123",
-            "resolved": "https://registry.npmjs.org/@aws/language-server-runtimes/-/language-server-runtimes-0.2.123.tgz",
-            "integrity": "sha512-gxjnBcQY+HR9+F1NXQUEQ6ikJhrLMJEbrpIxlBLILtQ75hVtRDsfGET3KW5Nn0dgbrQTx6VqwvXDfolUkmi06g==",
+            "version": "0.2.125",
+            "resolved": "https://registry.npmjs.org/@aws/language-server-runtimes/-/language-server-runtimes-0.2.125.tgz",
+            "integrity": "sha512-tjXJEagZ6rm09fcgJGu1zbFNzi0+7R1mdNFa6zCIv68c76xq5JHjc++Hne9aOgp61O6BM9uNnX3KR57v9/0E1g==",
             "license": "Apache-2.0",
             "dependencies": {
-                "@aws/language-server-runtimes-types": "^0.1.55",
+                "@aws/language-server-runtimes-types": "^0.1.56",
                 "@opentelemetry/api": "^1.9.0",
                 "@opentelemetry/api-logs": "^0.200.0",
                 "@opentelemetry/core": "^2.0.0",
@@ -4068,9 +4068,9 @@
             }
         },
         "node_modules/@aws/language-server-runtimes-types": {
-            "version": "0.1.55",
-            "resolved": "https://registry.npmjs.org/@aws/language-server-runtimes-types/-/language-server-runtimes-types-0.1.55.tgz",
-            "integrity": "sha512-KRy3fTCNGvAQxA4amTODXPuubxrYlqKsyJOXPaIn+YDACwJa7shrOryHg6xrib6uHAHT2fEkcTMk9TT4MRPxQA==",
+            "version": "0.1.56",
+            "resolved": "https://registry.npmjs.org/@aws/language-server-runtimes-types/-/language-server-runtimes-types-0.1.56.tgz",
+            "integrity": "sha512-Md/L750JShCHUsCQUJva51Ofkn/GDBEX8PpZnWUIVqkpddDR00SLQS2smNf4UHtKNJ2fefsfks/Kqfuatjkjvg==",
             "license": "Apache-2.0",
             "dependencies": {
                 "vscode-languageserver-textdocument": "^1.0.12",
@@ -28608,7 +28608,7 @@
             "version": "0.1.17",
             "license": "Apache-2.0",
             "dependencies": {
-                "@aws/language-server-runtimes": "^0.2.123",
+                "@aws/language-server-runtimes": "^0.2.125",
                 "@aws/lsp-core": "^0.0.13"
             },
             "devDependencies": {
@@ -28650,7 +28650,7 @@
             "name": "@aws/lsp-buildspec",
             "version": "0.0.1",
             "dependencies": {
-                "@aws/language-server-runtimes": "^0.2.123",
+                "@aws/language-server-runtimes": "^0.2.125",
                 "@aws/lsp-json": "*",
                 "@aws/lsp-yaml": "*",
                 "vscode-languageserver": "^9.0.1",
@@ -28661,7 +28661,7 @@
             "name": "@aws/lsp-cloudformation",
             "version": "0.0.1",
             "dependencies": {
-                "@aws/language-server-runtimes": "^0.2.123",
+                "@aws/language-server-runtimes": "^0.2.125",
                 "@aws/lsp-core": "*",
                 "@aws/lsp-json": "*",
                 "vscode-languageserver": "^9.0.1",
@@ -28683,7 +28683,7 @@
                 "@aws-sdk/util-arn-parser": "^3.723.0",
                 "@aws-sdk/util-retry": "^3.374.0",
                 "@aws/chat-client-ui-types": "^0.1.56",
-                "@aws/language-server-runtimes": "^0.2.123",
+                "@aws/language-server-runtimes": "^0.2.125",
                 "@aws/lsp-core": "^0.0.13",
                 "@modelcontextprotocol/sdk": "^1.15.0",
                 "@smithy/node-http-handler": "^2.5.0",
@@ -28823,7 +28823,7 @@
             "dependencies": {
                 "@aws-sdk/client-sso-oidc": "^3.616.0",
                 "@aws-sdk/token-providers": "^3.744.0",
-                "@aws/language-server-runtimes": "^0.2.123",
+                "@aws/language-server-runtimes": "^0.2.125",
                 "@aws/lsp-core": "^0.0.12",
                 "@smithy/node-http-handler": "^3.2.5",
                 "@smithy/shared-ini-file-loader": "^4.0.1",
@@ -28888,7 +28888,7 @@
             "version": "0.1.17",
             "license": "Apache-2.0",
             "dependencies": {
-                "@aws/language-server-runtimes": "^0.2.123",
+                "@aws/language-server-runtimes": "^0.2.125",
                 "@aws/lsp-core": "^0.0.13",
                 "vscode-languageserver": "^9.0.1",
                 "vscode-languageserver-textdocument": "^1.0.8"
@@ -28905,7 +28905,7 @@
             "version": "0.0.1",
             "license": "Apache-2.0",
             "dependencies": {
-                "@aws/language-server-runtimes": "^0.2.123",
+                "@aws/language-server-runtimes": "^0.2.125",
                 "@aws/lsp-core": "^0.0.12",
                 "vscode-languageserver": "^9.0.1"
             },
@@ -28966,7 +28966,7 @@
             "version": "0.0.16",
             "license": "Apache-2.0",
             "dependencies": {
-                "@aws/language-server-runtimes": "^0.2.123",
+                "@aws/language-server-runtimes": "^0.2.125",
                 "antlr4-c3": "3.4.2",
                 "antlr4ng": "3.0.14",
                 "web-tree-sitter": "0.22.6"
@@ -28988,7 +28988,7 @@
             "dependencies": {
                 "@aws-sdk/client-s3": "^3.623.0",
                 "@aws-sdk/types": "^3.734.0",
-                "@aws/language-server-runtimes": "^0.2.123",
+                "@aws/language-server-runtimes": "^0.2.125",
                 "@aws/lsp-core": "^0.0.12",
                 "vscode-languageserver": "^9.0.1",
                 "vscode-languageserver-textdocument": "^1.0.8"
@@ -29019,7 +29019,7 @@
             "hasInstallScript": true,
             "license": "Apache-2.0",
             "dependencies": {
-                "@aws/language-server-runtimes": "^0.2.123",
+                "@aws/language-server-runtimes": "^0.2.125",
                 "@aws/lsp-core": "^0.0.13",
                 "vscode-languageserver": "^9.0.1",
                 "vscode-languageserver-textdocument": "^1.0.8",
@@ -29033,7 +29033,7 @@
             "name": "@amzn/device-sso-auth-lsp",
             "version": "0.0.1",
             "dependencies": {
-                "@aws/language-server-runtimes": "^0.2.123",
+                "@aws/language-server-runtimes": "^0.2.125",
                 "vscode-languageserver": "^9.0.1"
             },
             "devDependencies": {
@@ -29044,7 +29044,7 @@
             "name": "@aws/hello-world-lsp",
             "version": "0.0.1",
             "dependencies": {
-                "@aws/language-server-runtimes": "^0.2.123",
+                "@aws/language-server-runtimes": "^0.2.125",
                 "vscode-languageserver": "^9.0.1"
             },
             "devDependencies": {
diff --git a/server/aws-lsp-antlr4/package.json b/server/aws-lsp-antlr4/package.json
index 9d6c925b40..f540c8ae21 100644
--- a/server/aws-lsp-antlr4/package.json
+++ b/server/aws-lsp-antlr4/package.json
@@ -28,7 +28,7 @@
         "clean": "rm -rf node_modules"
     },
     "dependencies": {
-        "@aws/language-server-runtimes": "^0.2.123",
+        "@aws/language-server-runtimes": "^0.2.125",
         "@aws/lsp-core": "^0.0.13"
     },
     "peerDependencies": {
diff --git a/server/aws-lsp-buildspec/package.json b/server/aws-lsp-buildspec/package.json
index f59edb5549..2cf0b776ac 100644
--- a/server/aws-lsp-buildspec/package.json
+++ b/server/aws-lsp-buildspec/package.json
@@ -7,7 +7,7 @@
         "compile": "tsc --build"
     },
     "dependencies": {
-        "@aws/language-server-runtimes": "^0.2.123",
+        "@aws/language-server-runtimes": "^0.2.125",
         "@aws/lsp-json": "*",
         "@aws/lsp-yaml": "*",
         "vscode-languageserver": "^9.0.1",
diff --git a/server/aws-lsp-cloudformation/package.json b/server/aws-lsp-cloudformation/package.json
index bfc8ebd7e5..ad01b4457a 100644
--- a/server/aws-lsp-cloudformation/package.json
+++ b/server/aws-lsp-cloudformation/package.json
@@ -7,7 +7,7 @@
         "compile": "tsc --build"
     },
     "dependencies": {
-        "@aws/language-server-runtimes": "^0.2.123",
+        "@aws/language-server-runtimes": "^0.2.125",
         "@aws/lsp-core": "*",
         "@aws/lsp-json": "*",
         "vscode-languageserver": "^9.0.1",
diff --git a/server/aws-lsp-codewhisperer/package.json b/server/aws-lsp-codewhisperer/package.json
index fdd34884b1..8600148090 100644
--- a/server/aws-lsp-codewhisperer/package.json
+++ b/server/aws-lsp-codewhisperer/package.json
@@ -36,7 +36,7 @@
         "@aws-sdk/util-arn-parser": "^3.723.0",
         "@aws-sdk/util-retry": "^3.374.0",
         "@aws/chat-client-ui-types": "^0.1.56",
-        "@aws/language-server-runtimes": "^0.2.123",
+        "@aws/language-server-runtimes": "^0.2.125",
         "@aws/lsp-core": "^0.0.13",
         "@modelcontextprotocol/sdk": "^1.15.0",
         "@smithy/node-http-handler": "^2.5.0",
diff --git a/server/aws-lsp-codewhisperer/src/language-server/inline-completion/codeWhispererServer.test.ts b/server/aws-lsp-codewhisperer/src/language-server/inline-completion/codeWhispererServer.test.ts
index 29390248f7..8151602dd4 100644
--- a/server/aws-lsp-codewhisperer/src/language-server/inline-completion/codeWhispererServer.test.ts
+++ b/server/aws-lsp-codewhisperer/src/language-server/inline-completion/codeWhispererServer.test.ts
@@ -12,7 +12,7 @@ import { TestFeatures } from '@aws/language-server-runtimes/testing'
 import * as assert from 'assert'
 import { AWSError } from 'aws-sdk'
 import sinon, { StubbedInstance } from 'ts-sinon'
-import { CodewhispererServerFactory } from './codeWhispererServer'
+import { CodewhispererServerFactory, getLanguageIdFromUri } from './codeWhispererServer'
 import {
     CodeWhispererServiceBase,
     CodeWhispererServiceToken,
@@ -2427,4 +2427,51 @@ describe('CodeWhisperer Server', () => {
             TestAmazonQServiceManager.resetInstance()
         })
     })
+    describe('getLanguageIdFromUri', () => {
+        it('should return python for notebook cell URIs', () => {
+            const uri = 'vscode-notebook-cell:/some/path/notebook.ipynb#cell1'
+            assert.strictEqual(getLanguageIdFromUri(uri), 'python')
+        })
+
+        it('should return abap for files with ABAP extensions', () => {
+            const uris = ['file:///path/to/file.asprog']
+
+            uris.forEach(uri => {
+                assert.strictEqual(getLanguageIdFromUri(uri), 'abap')
+            })
+        })
+
+        it('should return empty string for non-ABAP files', () => {
+            const uris = ['file:///path/to/file.js', 'file:///path/to/file.ts', 'file:///path/to/file.py']
+
+            uris.forEach(uri => {
+                assert.strictEqual(getLanguageIdFromUri(uri), '')
+            })
+        })
+
+        it('should return empty string for invalid URIs', () => {
+            const invalidUris = ['', 'invalid-uri', 'file:///']
+
+            invalidUris.forEach(uri => {
+                assert.strictEqual(getLanguageIdFromUri(uri), '')
+            })
+        })
+
+        it('should log errors when provided with a logging object', () => {
+            const mockLogger = {
+                log: sinon.spy(),
+            }
+
+            const invalidUri = {} as string // Force type error
+            getLanguageIdFromUri(invalidUri, mockLogger)
+
+            sinon.assert.calledOnce(mockLogger.log)
+            sinon.assert.calledWith(mockLogger.log, sinon.match(/Error parsing URI to determine language:.*/))
+        })
+
+        it('should handle URIs without extensions', () => {
+            const uri = 'file:///path/to/file'
+            assert.strictEqual(getLanguageIdFromUri(uri), '')
+        })
+    })
 })
diff --git a/server/aws-lsp-codewhisperer/src/language-server/inline-completion/codeWhispererServer.ts b/server/aws-lsp-codewhisperer/src/language-server/inline-completion/codeWhispererServer.ts
index 23a72e3528..c1f2b464b2 100644
--- a/server/aws-lsp-codewhisperer/src/language-server/inline-completion/codeWhispererServer.ts
+++ b/server/aws-lsp-codewhisperer/src/language-server/inline-completion/codeWhispererServer.ts
@@ -15,13 +15,14 @@ import {
 } from '@aws/language-server-runtimes/server-interface'
 import { autoTrigger, getAutoTriggerType, getNormalizeOsName, triggerType } from './auto-trigger/autoTrigger'
 import {
+    FileContext,
     GenerateSuggestionsRequest,
     GenerateSuggestionsResponse,
     getFileContext,
     Suggestion,
     SuggestionType,
 } from '../../shared/codeWhispererService'
-import { getSupportedLanguageId } from '../../shared/languageDetection'
+import { CodewhispererLanguage, getSupportedLanguageId } from '../../shared/languageDetection'
 import { mergeEditSuggestionsWithFileContext, truncateOverlapWithRightContext } from './mergeRightUtils'
 import { CodeWhispererSession, SessionManager } from './session/sessionManager'
 import { CodePercentageTracker } from './codePercentage'
@@ -41,7 +42,6 @@ import { AmazonQWorkspaceConfig } from '../../shared/amazonQServiceManager/confi
 import { hasConnectionExpired } from '../../shared/utils'
 import { getOrThrowBaseIAMServiceManager } from '../../shared/amazonQServiceManager/AmazonQIAMServiceManager'
 import { WorkspaceFolderManager } from '../workspaceContext/workspaceFolderManager'
-import path = require('path')
 import { UserWrittenCodeTracker } from '../../shared/userWrittenCodeTracker'
 import { RecentEditTracker, RecentEditTrackerDefaultConfig } from './tracker/codeEditTracker'
 import { CursorTracker } from './tracker/cursorTracker'
@@ -191,7 +191,10 @@ export const CodewhispererServerFactory =
                         return EMPTY_RESULT
                     }
 
-                    const inferredLanguageId = getSupportedLanguageId(textDocument)
+                    let inferredLanguageId = getSupportedLanguageId(textDocument)
+                    if (params.fileContextOverride?.programmingLanguage) {
+                        inferredLanguageId = params.fileContextOverride?.programmingLanguage as CodewhispererLanguage
+                    }
                     if (!inferredLanguageId) {
                         logging.log(
                             `textDocument [${params.textDocument.uri}] with languageId [${textDocument.languageId}] not supported`
@@ -204,12 +207,29 @@ export const CodewhispererServerFactory =
                         params.context.triggerKind == InlineCompletionTriggerKind.Automatic
                     const maxResults = isAutomaticLspTriggerKind ? 1 : 5
                     const selectionRange = params.context.selectedCompletionInfo?.range
-                    const fileContext = getFileContext({
-                        textDocument,
-                        inferredLanguageId,
-                        position: params.position,
-                        workspaceFolder: workspace.getWorkspaceFolder(textDocument.uri),
-                    })
+
+                    // For Jupyter Notebook in VSC, the language server does not have access to
+                    // its internal states including current active cell index, etc
+                    // we rely on VSC to calculate file context
+                    let fileContext: FileContext | undefined = undefined
+                    if (params.fileContextOverride) {
+                        fileContext = {
+                            leftFileContent: params.fileContextOverride.leftFileContent,
+                            rightFileContent: params.fileContextOverride.rightFileContent,
+                            filename: params.fileContextOverride.filename,
+                            fileUri: params.fileContextOverride.fileUri,
+                            programmingLanguage: {
+                                languageName: inferredLanguageId,
+                            },
+                        }
+                    } else {
+                        fileContext = getFileContext({
+                            textDocument,
+                            inferredLanguageId,
+                            position: params.position,
+                            workspaceFolder: workspace.getWorkspaceFolder(textDocument.uri),
+                        })
+                    }
 
                     const workspaceState = WorkspaceFolderManager.getInstance()?.getWorkspaceState()
                     const workspaceId = workspaceState?.webSocketClient?.isConnected()
@@ -327,7 +347,7 @@ export const CodewhispererServerFactory =
                         document: textDocument,
                         startPosition: params.position,
                         triggerType: isAutomaticLspTriggerKind ? 'AutoTrigger' : 'OnDemand',
-                        language: fileContext.programmingLanguage.languageName,
+                        language: fileContext.programmingLanguage.languageName as CodewhispererLanguage,
                         requestContext: requestContext,
                         autoTriggerType: isAutomaticLspTriggerKind ? codewhispererAutoTriggerType : undefined,
                         triggerCharacter: triggerCharacters,
@@ -892,8 +912,12 @@ export const CodewhispererServerFactory =
 export const CodeWhispererServerIAM = CodewhispererServerFactory(getOrThrowBaseIAMServiceManager)
 export const CodeWhispererServerToken = CodewhispererServerFactory(getOrThrowBaseTokenServiceManager)
 
-const getLanguageIdFromUri = (uri: string, logging?: any): string => {
+export const getLanguageIdFromUri = (uri: string, logging?: any): string => {
     try {
+        if (uri.startsWith('vscode-notebook-cell:')) {
+            // use python for now as lsp does not support JL cell language detection
+            return 'python'
+        }
         const extension = uri.split('.').pop()?.toLowerCase()
         return ABAP_EXTENSIONS.has(extension || '') ? 'abap' : ''
     } catch (err) {
diff --git a/server/aws-lsp-codewhisperer/src/language-server/inline-completion/trigger.ts b/server/aws-lsp-codewhisperer/src/language-server/inline-completion/trigger.ts
index 06453355a8..305b9b6e5c 100644
--- a/server/aws-lsp-codewhisperer/src/language-server/inline-completion/trigger.ts
+++ b/server/aws-lsp-codewhisperer/src/language-server/inline-completion/trigger.ts
@@ -1,24 +1,19 @@
-import { CodewhispererLanguage } from '../../shared/languageDetection'
 import { SessionManager } from './session/sessionManager'
 import { InlineCompletionWithReferencesParams } from '@aws/language-server-runtimes/protocol'
 import { editPredictionAutoTrigger } from './auto-trigger/editPredictionAutoTrigger'
 import { CursorTracker } from './tracker/cursorTracker'
 import { RecentEditTracker } from './tracker/codeEditTracker'
-import { CodeWhispererServiceBase, CodeWhispererServiceToken } from '../../shared/codeWhispererService'
+import {
+    CodeWhispererServiceBase,
+    CodeWhispererServiceToken,
+    ClientFileContext,
+} from '../../shared/codeWhispererService'
 
 export class NepTrigger {}
 
 export function shouldTriggerEdits(
     service: CodeWhispererServiceBase,
-    fileContext: {
-        fileUri: string
-        filename: string
-        programmingLanguage: {
-            languageName: CodewhispererLanguage
-        }
-        leftFileContent: string
-        rightFileContent: string
-    },
+    fileContext: ClientFileContext,
     inlineParams: InlineCompletionWithReferencesParams,
     cursorTracker: CursorTracker,
     recentEditsTracker: RecentEditTracker,
diff --git a/server/aws-lsp-codewhisperer/src/shared/codeWhispererService.ts b/server/aws-lsp-codewhisperer/src/shared/codeWhispererService.ts
index a162ff44e6..fa909fa1dc 100644
--- a/server/aws-lsp-codewhisperer/src/shared/codeWhispererService.ts
+++ b/server/aws-lsp-codewhisperer/src/shared/codeWhispererService.ts
@@ -71,20 +71,22 @@ export interface GenerateSuggestionsResponse {
     responseContext: ResponseContext
 }
 
+export interface ClientFileContext {
+    leftFileContent: string
+    rightFileContent: string
+    filename: string
+    fileUri: string
+    programmingLanguage: {
+        languageName: CodewhispererLanguage
+    }
+}
+
 export function getFileContext(params: {
     textDocument: TextDocument
     position: Position
     inferredLanguageId: CodewhispererLanguage
     workspaceFolder: WorkspaceFolder | null | undefined
-}): {
-    fileUri: string
-    filename: string
-    programmingLanguage: {
-        languageName: CodewhispererLanguage
-    }
-    leftFileContent: string
-    rightFileContent: string
-} {
+}): ClientFileContext {
     const left = params.textDocument.getText({
         start: { line: 0, character: 0 },
         end: params.position,
diff --git a/server/aws-lsp-identity/package.json b/server/aws-lsp-identity/package.json
index e8cb3b2c8a..acaeb6d15d 100644
--- a/server/aws-lsp-identity/package.json
+++ b/server/aws-lsp-identity/package.json
@@ -26,7 +26,7 @@
     "dependencies": {
         "@aws-sdk/client-sso-oidc": "^3.616.0",
         "@aws-sdk/token-providers": "^3.744.0",
-        "@aws/language-server-runtimes": "^0.2.123",
+        "@aws/language-server-runtimes": "^0.2.125",
         "@aws/lsp-core": "^0.0.12",
         "@smithy/node-http-handler": "^3.2.5",
         "@smithy/shared-ini-file-loader": "^4.0.1",
diff --git a/server/aws-lsp-json/package.json b/server/aws-lsp-json/package.json
index 298f3820f0..7b1768f995 100644
--- a/server/aws-lsp-json/package.json
+++ b/server/aws-lsp-json/package.json
@@ -26,7 +26,7 @@
         "prepack": "shx cp ../../LICENSE ../../NOTICE ../../SECURITY.md ."
     },
     "dependencies": {
-        "@aws/language-server-runtimes": "^0.2.123",
+        "@aws/language-server-runtimes": "^0.2.125",
         "@aws/lsp-core": "^0.0.13",
         "vscode-languageserver": "^9.0.1",
         "vscode-languageserver-textdocument": "^1.0.8"
diff --git a/server/aws-lsp-notification/package.json b/server/aws-lsp-notification/package.json
index a9e3cf9d4c..45194be66b 100644
--- a/server/aws-lsp-notification/package.json
+++ b/server/aws-lsp-notification/package.json
@@ -22,7 +22,7 @@
         "coverage:report": "c8 report --reporter=html --reporter=text"
     },
     "dependencies": {
-        "@aws/language-server-runtimes": "^0.2.123",
+        "@aws/language-server-runtimes": "^0.2.125",
         "@aws/lsp-core": "^0.0.12",
         "vscode-languageserver": "^9.0.1"
     },
diff --git a/server/aws-lsp-partiql/package.json b/server/aws-lsp-partiql/package.json
index 9ff685cfdc..263275dced 100644
--- a/server/aws-lsp-partiql/package.json
+++ b/server/aws-lsp-partiql/package.json
@@ -24,7 +24,7 @@
         "out"
     ],
     "dependencies": {
-        "@aws/language-server-runtimes": "^0.2.123",
+        "@aws/language-server-runtimes": "^0.2.125",
         "antlr4-c3": "3.4.2",
         "antlr4ng": "3.0.14",
         "web-tree-sitter": "0.22.6"
diff --git a/server/aws-lsp-s3/package.json b/server/aws-lsp-s3/package.json
index caa7801b5f..53355ff18a 100644
--- a/server/aws-lsp-s3/package.json
+++ b/server/aws-lsp-s3/package.json
@@ -9,7 +9,7 @@
     "dependencies": {
         "@aws-sdk/client-s3": "^3.623.0",
         "@aws-sdk/types": "^3.734.0",
-        "@aws/language-server-runtimes": "^0.2.123",
+        "@aws/language-server-runtimes": "^0.2.125",
         "@aws/lsp-core": "^0.0.12",
         "vscode-languageserver": "^9.0.1",
         "vscode-languageserver-textdocument": "^1.0.8"
diff --git a/server/aws-lsp-yaml/package.json b/server/aws-lsp-yaml/package.json
index 58fd5e591d..deeddd9694 100644
--- a/server/aws-lsp-yaml/package.json
+++ b/server/aws-lsp-yaml/package.json
@@ -26,7 +26,7 @@
         "postinstall": "node patchYamlPackage.js"
     },
     "dependencies": {
-        "@aws/language-server-runtimes": "^0.2.123",
+        "@aws/language-server-runtimes": "^0.2.125",
         "@aws/lsp-core": "^0.0.13",
         "vscode-languageserver": "^9.0.1",
         "vscode-languageserver-textdocument": "^1.0.8",
diff --git a/server/device-sso-auth-lsp/package.json b/server/device-sso-auth-lsp/package.json
index 573170a3a9..698bbf353e 100644
--- a/server/device-sso-auth-lsp/package.json
+++ b/server/device-sso-auth-lsp/package.json
@@ -7,7 +7,7 @@
         "compile": "tsc --build"
     },
     "dependencies": {
-        "@aws/language-server-runtimes": "^0.2.123",
+        "@aws/language-server-runtimes": "^0.2.125",
         "vscode-languageserver": "^9.0.1"
     },
     "devDependencies": {
diff --git a/server/hello-world-lsp/package.json b/server/hello-world-lsp/package.json
index 827509803e..a0ad8e8469 100644
--- a/server/hello-world-lsp/package.json
+++ b/server/hello-world-lsp/package.json
@@ -13,7 +13,7 @@
         "coverage:report": "c8 report --reporter=html --reporter=text"
     },
     "dependencies": {
-        "@aws/language-server-runtimes": "^0.2.123",
+        "@aws/language-server-runtimes": "^0.2.125",
         "vscode-languageserver": "^9.0.1"
     },
     "devDependencies": {