Merge main into feature/mynah-ui-4.39.1

.github/CODEOWNERS

@@ -1 +1 @@
-* @aws/flare
+* @Amazon-Q-Developer/sync-team-dae-production-eng-team

.release-please-manifest.json

@@ -1,9 +1,9 @@
 {
-    "chat-client": "0.1.55",
-    "core/aws-lsp-core": "0.0.21",
-    "server/aws-lsp-antlr4": "0.1.25",
-    "server/aws-lsp-codewhisperer": "0.0.123",
-    "server/aws-lsp-json": "0.1.26",
-    "server/aws-lsp-partiql": "0.0.23",
-    "server/aws-lsp-yaml": "0.1.26"
+    "chat-client": "0.1.56",
+    "core/aws-lsp-core": "0.0.22",
+    "server/aws-lsp-antlr4": "0.1.26",
+    "server/aws-lsp-codewhisperer": "0.0.125",
+    "server/aws-lsp-json": "0.1.27",
+    "server/aws-lsp-partiql": "0.0.24",
+    "server/aws-lsp-yaml": "0.1.27"
 }

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

@@ -1,3 +1,3 @@
 {
-    "agenticChat": "1.74.0"
+    "agenticChat": "1.75.0"
 }

chat-client/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## [0.1.56](https://github.com/Amazon-Q-Developer/language-servers/compare/chat-client/v0.1.55...chat-client/v0.1.56) (2026-08-18)
+
+
+### Bug Fixes
+
+* repoint CODEOWNERS and package repository URLs to the new org ([#2838](https://github.com/Amazon-Q-Developer/language-servers/issues/2838)) ([43e44dc](https://github.com/Amazon-Q-Developer/language-servers/commit/43e44dc5af94703f51456cd8a913f0d61af7570e))
+
 ## [0.1.55](https://github.com/aws/language-servers/compare/chat-client/v0.1.54...chat-client/v0.1.55) (2026-06-30)
 
 

chat-client/package.json

@@ -1,11 +1,11 @@
 {
     "name": "@aws/chat-client",
-    "version": "0.1.55",
+    "version": "0.1.56",
     "description": "AWS Chat Client",
     "main": "out/index.js",
     "repository": {
         "type": "git",
-        "url": "https://github.com/aws/language-servers"
+        "url": "https://github.com/Amazon-Q-Developer/language-servers"
     },
     "files": [
         "build",

core/aws-lsp-core/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## [0.0.22](https://github.com/Amazon-Q-Developer/language-servers/compare/lsp-core/v0.0.21...lsp-core/v0.0.22) (2026-08-18)
+
+
+### Bug Fixes
+
+* repoint CODEOWNERS and package repository URLs to the new org ([#2838](https://github.com/Amazon-Q-Developer/language-servers/issues/2838)) ([43e44dc](https://github.com/Amazon-Q-Developer/language-servers/commit/43e44dc5af94703f51456cd8a913f0d61af7570e))
+
 ## [0.0.21](https://github.com/aws/language-servers/compare/lsp-core/v0.0.20...lsp-core/v0.0.21) (2026-02-17)
 
 

core/aws-lsp-core/package.json

@@ -1,11 +1,11 @@
 {
     "name": "@aws/lsp-core",
-    "version": "0.0.21",
+    "version": "0.0.22",
     "description": "Core library, contains common code and utilities",
     "main": "out/index.js",
     "repository": {
         "type": "git",
-        "url": "https://github.com/aws/language-servers"
+        "url": "https://github.com/Amazon-Q-Developer/language-servers"
     },
     "author": "Amazon Web Services",
     "license": "Apache-2.0",

server/aws-lsp-antlr4/CHANGELOG.md

@@ -1,5 +1,19 @@
 # Changelog
 
+## [0.1.26](https://github.com/Amazon-Q-Developer/language-servers/compare/lsp-antlr4/v0.1.25...lsp-antlr4/v0.1.26) (2026-08-18)
+
+
+### Bug Fixes
+
+* repoint CODEOWNERS and package repository URLs to the new org ([#2838](https://github.com/Amazon-Q-Developer/language-servers/issues/2838)) ([43e44dc](https://github.com/Amazon-Q-Developer/language-servers/commit/43e44dc5af94703f51456cd8a913f0d61af7570e))
+
+
+### Dependencies
+
+* The following workspace dependencies were updated
+  * dependencies
+    * @aws/lsp-core bumped from ^0.0.21 to ^0.0.22
+
 ## [0.1.25](https://github.com/aws/language-servers/compare/lsp-antlr4/v0.1.24...lsp-antlr4/v0.1.25) (2026-02-17)
 
 

server/aws-lsp-antlr4/package.json

@@ -1,11 +1,11 @@
 {
     "name": "@aws/lsp-antlr4",
-    "version": "0.1.25",
+    "version": "0.1.26",
     "description": "ANTLR4 language server",
     "main": "out/index.js",
     "repository": {
         "type": "git",
-        "url": "https://github.com/aws/language-servers"
+        "url": "https://github.com/Amazon-Q-Developer/language-servers"
     },
     "author": "Amazon Web Services",
     "engines": {
@@ -29,7 +29,7 @@
     },
     "dependencies": {
         "@aws/language-server-runtimes": "^0.3.14",
-        "@aws/lsp-core": "^0.0.21"
+        "@aws/lsp-core": "^0.0.22"
     },
     "peerDependencies": {
         "antlr4-c3": ">=3.4 < 4",

server/aws-lsp-codewhisperer/CHANGELOG.md

@@ -1,5 +1,38 @@
 # Changelog
 
+## [0.0.125](https://github.com/Amazon-Q-Developer/language-servers/compare/lsp-codewhisperer/v0.0.124...lsp-codewhisperer/v0.0.125) (2026-08-18)
+
+
+### Features
+
+* **amazonq:** initialize Q services when credentials arrive ([#2840](https://github.com/Amazon-Q-Developer/language-servers/issues/2840)) ([4e0d3b0](https://github.com/Amazon-Q-Developer/language-servers/commit/4e0d3b0d69e0aa7a230f64a1b168a09bcfd4b7cd))
+
+
+### Bug Fixes
+
+* **amazonq:** retry truncated tool-use streams instead of dropping them silently ([#2841](https://github.com/Amazon-Q-Developer/language-servers/issues/2841)) ([368a099](https://github.com/Amazon-Q-Developer/language-servers/commit/368a099cc9b5cc3cf7bb1f2298718824a1ab1118))
+* repoint CODEOWNERS and package repository URLs to the new org ([#2838](https://github.com/Amazon-Q-Developer/language-servers/issues/2838)) ([43e44dc](https://github.com/Amazon-Q-Developer/language-servers/commit/43e44dc5af94703f51456cd8a913f0d61af7570e))
+
+
+### Dependencies
+
+* The following workspace dependencies were updated
+  * dependencies
+    * @aws/lsp-core bumped from ^0.0.21 to ^0.0.22
+
+## [0.0.124](https://github.com/aws/language-servers/compare/lsp-codewhisperer/v0.0.123...lsp-codewhisperer/v0.0.124) (2026-08-13)
+
+
+### Features
+
+* **amazonq:** surface Q Developer plugin access-blocked rejections to the client ([#2794](https://github.com/aws/language-servers/issues/2794)) ([724f629](https://github.com/aws/language-servers/commit/724f62909ef16e750f52f5ba8b570b42b8bf00c8))
+* scope local build verification to the loaded beamed repo and add beam discovery/download ([#2798](https://github.com/aws/language-servers/issues/2798)) ([49867d7](https://github.com/aws/language-servers/commit/49867d7d2d3c93a5ac9472aaac33b0a26c23cf00))
+
+
+### Bug Fixes
+
+* **amazonq:** deliver Q Developer access-blocked notifications to the client ([#2800](https://github.com/aws/language-servers/issues/2800)) ([5e92430](https://github.com/aws/language-servers/commit/5e924300c371f36df57994b56666e96b5b5b0c1d))
+
 ## [0.0.123](https://github.com/aws/language-servers/compare/lsp-codewhisperer/v0.0.122...lsp-codewhisperer/v0.0.123) (2026-07-23)
 
 

server/aws-lsp-codewhisperer/package.json

@@ -1,11 +1,11 @@
 {
     "name": "@aws/lsp-codewhisperer",
-    "version": "0.0.123",
+    "version": "0.0.125",
     "description": "CodeWhisperer Language Server",
     "main": "out/index.js",
     "repository": {
         "type": "git",
-        "url": "https://github.com/aws/language-servers"
+        "url": "https://github.com/Amazon-Q-Developer/language-servers"
     },
     "author": "Amazon Web Services",
     "license": "Apache-2.0",
@@ -38,8 +38,8 @@
         "@aws-sdk/util-arn-parser": "^3.723.0",
         "@aws-sdk/util-retry": "^3.374.0",
         "@aws/chat-client-ui-types": "0.1.71",
-        "@aws/language-server-runtimes": "^0.3.19",
-        "@aws/lsp-core": "^0.0.21",
+        "@aws/language-server-runtimes": "^0.3.21",
+        "@aws/lsp-core": "^0.0.22",
         "@modelcontextprotocol/sdk": "^1.23.0",
         "@mozilla/readability": "^0.6.0",
         "@smithy/node-http-handler": "^2.5.0",

server/aws-lsp-codewhisperer/src/language-server/agenticChat/agenticChatController.ts

@@ -3,9 +3,9 @@
  * Will be deleted or merged.
  */
 
 import * as crypto from 'crypto'
 import * as path from 'path'
 import * as os from 'os'
 import {
     ChatTriggerType,
     Origin,
@@ -4668,7 +4668,10 @@
             cwsprChatResponseLength: chatEventParser.body?.length ?? 0,
         })
 
-        return chatEventParser.getResult()
+        // Use finalize() (not getResult()) so a tool use whose stream ended before its
+        // terminating `stop` event is surfaced as an incomplete-input error and retried,
+        // rather than being silently dropped and reported as a successful turn.
+        return chatEventParser.finalize()
     }
 
     /**

server/aws-lsp-codewhisperer/src/language-server/agenticChat/agenticChatEventParser.test.ts

@@ -304,4 +304,56 @@ describe('AgenticChatEventParser', () => {
 
         assert.deepStrictEqual(chatEventParser.getResult(), { success: true, data: expectedData })
     })
+
+    it('finalize flags an unterminated tool use (no stop event) as incomplete and marks it stopped', () => {
+        const chatEventParser = new AgenticChatEventParser(mockMessageId, new Metric<AddMessageEvent>(), logging)
+
+        // A tool use whose input streams in fragments but never receives a `stop` event
+        // (e.g. the response hit the output-token limit mid tool-input).
+        chatEventParser.processPartialEvent({
+            toolUseEvent: {
+                toolUseId: 'tool-1',
+                name: 'fsWrite',
+                input: '{"path":"out.py","fileText":"import os',
+                stop: false,
+            },
+        })
+        const midStream = chatEventParser.processPartialEvent({
+            toolUseEvent: {
+                toolUseId: 'tool-1',
+                name: 'fsWrite',
+                input: '\\nprint(1)',
+                stop: false,
+            },
+        })
+
+        // Mid-stream this looks like a clean success and would be filtered out (dropped) by the loop.
+        assert.strictEqual(midStream.success, true)
+        assert.strictEqual(midStream.data?.toolUses['tool-1'].stop, false)
+
+        // After the stream ends, finalize() surfaces it as an error and marks it stopped so it
+        // survives the pending-tool-use filter and is routed into the existing retry path.
+        const result = chatEventParser.finalize()
+        assert.strictEqual(result.success, false)
+        assert.ok(result.error?.startsWith('ToolUse input is invalid JSON:'))
+        assert.strictEqual(result.data?.toolUses['tool-1'].stop, true)
+    })
+
+    it('finalize leaves a properly stopped tool use untouched', () => {
+        const chatEventParser = new AgenticChatEventParser(mockMessageId, new Metric<AddMessageEvent>(), logging)
+
+        chatEventParser.processPartialEvent({
+            toolUseEvent: {
+                toolUseId: 'tool-1',
+                name: 'fsWrite',
+                input: '{"path":"out.py","fileText":"print(1)"}',
+                stop: true,
+            },
+        })
+
+        const result = chatEventParser.finalize()
+        assert.strictEqual(result.success, true)
+        assert.strictEqual(result.data?.toolUses['tool-1'].stop, true)
+        assert.deepStrictEqual(result.data?.toolUses['tool-1'].input, { path: 'out.py', fileText: 'print(1)' })
+    })
 })