Merge main into feature/qdev-signup-block-delay

.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.124",
-    "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.127",
+    "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.75.0"
+    "agenticChat": "1.77.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,6 +1,6 @@
 {
     "name": "@aws/chat-client",
-    "version": "0.1.55",
+    "version": "0.1.56",
     "description": "AWS Chat Client",
     "main": "out/index.js",
     "repository": {

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,6 +1,6 @@
 {
     "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": {

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,6 +1,6 @@
 {
     "name": "@aws/lsp-antlr4",
-    "version": "0.1.25",
+    "version": "0.1.26",
     "description": "ANTLR4 language server",
     "main": "out/index.js",
     "repository": {
@@ -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,42 @@
 # Changelog
 
+## [0.0.127](https://github.com/Amazon-Q-Developer/language-servers/compare/lsp-codewhisperer/v0.0.126...lsp-codewhisperer/v0.0.127) (2026-08-24)
+
+
+### Bug Fixes
+
+* **amazonq:** cover merged env and headers in MCP consent fingerprint ([#2851](https://github.com/Amazon-Q-Developer/language-servers/issues/2851)) ([#2853](https://github.com/Amazon-Q-Developer/language-servers/issues/2853)) ([529aed4](https://github.com/Amazon-Q-Developer/language-servers/commit/529aed43259503cf71b475fb3496de7bfab25f17))
+* beam - flat-named transformed zips + lightweight discovery + IsLbvPending ([#2849](https://github.com/Amazon-Q-Developer/language-servers/issues/2849)) ([863c5bf](https://github.com/Amazon-Q-Developer/language-servers/commit/863c5bf00a6c30ec7658056a155f1ca1005127e6))
+* surface backend interactive mode in getTransformInfo ([836b756](https://github.com/Amazon-Q-Developer/language-servers/commit/836b756ee2d8a553d9b26cf095e12979141e2367))
+
+## [0.0.126](https://github.com/Amazon-Q-Developer/language-servers/compare/lsp-codewhisperer/v0.0.125...lsp-codewhisperer/v0.0.126) (2026-08-20)
+
+
+### Bug Fixes
+
+* **amazonq:** narrow tool-use   truncation detection and classify retries in telemetry ([#2847](https://github.com/Amazon-Q-Developer/language-servers/issues/2847)) ([1eb2f9f](https://github.com/Amazon-Q-Developer/language-servers/commit/1eb2f9f270c479ca457658e22f2ef0d06f6517ca))
+* scope and forward stepId for the planning-branch LBV HITL ([#2835](https://github.com/Amazon-Q-Developer/language-servers/issues/2835)) ([9f8bb89](https://github.com/Amazon-Q-Developer/language-servers/commit/9f8bb8943c41edc105c460d4b2c60836183cdd2b))
+
+## [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)
 
 

server/aws-lsp-codewhisperer/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@aws/lsp-codewhisperer",
-    "version": "0.0.124",
+    "version": "0.0.127",
     "description": "CodeWhisperer Language Server",
     "main": "out/index.js",
     "repository": {
@@ -39,7 +39,7 @@
         "@aws-sdk/util-retry": "^3.374.0",
         "@aws/chat-client-ui-types": "0.1.71",
         "@aws/language-server-runtimes": "^0.3.21",
-        "@aws/lsp-core": "^0.0.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,
@@ -180,6 +180,10 @@
     OUTPUT_LIMIT_EXCEEDS_PARTIAL_MSG,
     RESPONSE_TIMEOUT_MS,
     RESPONSE_TIMEOUT_PARTIAL_MSG,
+    INCOMPLETE_TOOL_USE_RETRY_LIMIT_MSG,
+    MAX_INCOMPLETE_TOOL_USE_RETRIES,
+    INVOKE_LLM_REASON_INCOMPLETE_TOOL_USE_RETRYING,
+    INVOKE_LLM_REASON_INCOMPLETE_TOOL_USE_EXHAUSTED,
     COMPACTION_BODY,
     COMPACTION_HEADER_BODY,
     DEFAULT_MACOS_RUN_SHORTCUT,
@@ -1427,6 +1431,9 @@
         let iterationCount = 0
         let shouldDisplayMessage = true
         let currentRequestCount = 0
+        // Number of consecutive responses that produced an incomplete tool-use input. Bounded
+        // so a model that keeps truncating cannot keep the agent loop running indefinitely.
+        let consecutiveIncompleteToolUses = 0
         const pinnedContext = additionalContext?.filter(item => item.pinned)
 
         metric.recordStart()
@@ -1645,6 +1652,8 @@
             let toolResults: ToolResult[]
             session.setConversationType('AgenticChatWithToolUse')
             if (result.success) {
+                // A complete tool use was received, so the incomplete-input streak is over.
+                consecutiveIncompleteToolUses = 0
                 // Process tool uses and update the request input for the next iteration
                 toolResults = await this.processToolUses(
                     pendingToolUses,
@@ -1689,6 +1698,21 @@
                     status: ToolResultStatus.ERROR,
                     content: [{ text: result.error }],
                 }))
+                // Classify the failure *before* emitting telemetry. An incomplete tool-use input is
+                // retried inside this loop and usually recovers within the same user turn, so it is
+                // not a user-visible failure and should not depress a per-call success rate. Because
+                // the retry budget is bounded we already know here whether this iteration will be
+                // retried, which lets us distinguish the transient case from the terminal give-up.
+                const isIncompleteToolUse = result.error.startsWith('ToolUse input is invalid JSON:')
+                let willRetryIncompleteToolUse = false
+                let invokeLlmReason: string | undefined
+                if (isIncompleteToolUse) {
+                    consecutiveIncompleteToolUses++
+                    willRetryIncompleteToolUse = consecutiveIncompleteToolUses <= MAX_INCOMPLETE_TOOL_USE_RETRIES
+                    invokeLlmReason = willRetryIncompleteToolUse
+                        ? INVOKE_LLM_REASON_INCOMPLETE_TOOL_USE_RETRYING
+                        : INVOKE_LLM_REASON_INCOMPLETE_TOOL_USE_EXHAUSTED
+                }
                 this.#telemetryController.emitAgencticLoop_InvokeLLM(
                     response.$metadata.requestId!,
                     conversationId,
@@ -1704,9 +1728,25 @@
                     this.#timeBetweenChunks,
                     session.pairProgrammingMode,
                     this.#abTestingAllocation?.experimentName,
-                    this.#abTestingAllocation?.userVariation
+                    this.#abTestingAllocation?.userVariation,
+                    invokeLlmReason
                 )
-                if (result.error.startsWith('ToolUse input is invalid JSON:')) {
+                if (isIncompleteToolUse) {
+                    if (!willRetryIncompleteToolUse) {
+                        // The model has failed to produce a complete tool request several times
+                        // in a row. Retrying again is unlikely to help and would keep the agent
+                        // loop running, so stop and surface a real error to the user instead.
+                        this.#features.logging.error(
+                            `Giving up after ${consecutiveIncompleteToolUses} consecutive incomplete tool uses: ${result.error}`
+                        )
+                        await chatResultStream.updateOngoingProgressResult('Error')
+                        finalResult = {
+                            success: false,
+                            error: INCOMPLETE_TOOL_USE_RETRY_LIMIT_MSG,
+                            data: result.data,
+                        }
+                        break
+                    }
                     content =
                         'Your toolUse input is incomplete, try again. If the error happens consistently, break this task down into multiple tool uses with smaller input. Do not apologize.'
                     shouldDisplayMessage = false
@@ -4668,7 +4708,12 @@
             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. The abort
+        // state is passed in so a timed-out/cancelled request is not misreported as a
+        // truncated tool input.
+        return chatEventParser.finalize({ aborted: abortSignal?.aborted === true })
     }
 
     /**