Merging Master into feature/stepfunction-execution (#7588)

## Problem
Merge conflict: 
#7549


## Solution
Fixing Merge Conflicts

---

- Treat all work as PUBLIC. Private `feature/x` branches will not be
squash-merged at release time.
- Your code changes must meet the guidelines in
[CONTRIBUTING.md](https://github.com/aws/aws-toolkit-vscode/blob/master/CONTRIBUTING.md#guidelines).
- License: I confirm that my contribution is made under the terms of the
Apache 2.0 license.

---------

Co-authored-by: samgst-amazon <[email protected]>
Co-authored-by: Diler Zaza <[email protected]>
Co-authored-by: David <[email protected]>
Co-authored-by: David Hasani <[email protected]>
Co-authored-by: Ashish Reddy Podduturi <[email protected]>
Co-authored-by: invictus <[email protected]>
Co-authored-by: aws-toolkit-automation <>
Co-authored-by: Tyrone Smith <[email protected]>
Co-authored-by: tsmithsz <[email protected]>
Co-authored-by: zelzhou <[email protected]>
Co-authored-by: Ralph Flora <[email protected]>

Author: 9 people

package-lock.json

@@ -45,6 +45,7 @@
         "@playwright/browser-chromium": "^1.43.1",
         "@stylistic/eslint-plugin": "^2.11.0",
         "@types/he": "^1.2.3",
+        "@types/jaro-winkler": "^0.2.4",
         "@types/vscode": "^1.68.0",
         "@types/vscode-webview": "^1.57.1",
         "@types/webpack-env": "^1.18.5",
@@ -74,6 +75,7 @@
     },
     "dependencies": {
         "@types/node": "^22.7.5",
+        "jaro-winkler": "^0.2.8",
         "vscode-nls": "^5.2.0",
         "vscode-nls-dev": "^4.0.4"
     }

package.json

@@ -0,0 +1,18 @@
+{
+	"date": "2025-06-25",
+	"version": "1.79.0",
+	"entries": [
+		{
+			"type": "Bug Fix",
+			"description": "Added automatic system certificate detection and VSCode proxy settings support"
+		},
+		{
+			"type": "Bug Fix",
+			"description": "Improved Amazon Linux 2 support with better SageMaker environment detection"
+		},
+		{
+			"type": "Feature",
+			"description": "/transform: run all builds client-side"
+		}
+	]
+}

packages/amazonq/.changes/1.79.0.json

@@ -1,3 +1,9 @@
+## 1.79.0 2025-06-25
+
+- **Bug Fix** Added automatic system certificate detection and VSCode proxy settings support
+- **Bug Fix** Improved Amazon Linux 2 support with better SageMaker environment detection
+- **Feature** /transform: run all builds client-side
+
 ## 1.78.0 2025-06-20
 
 - **Bug Fix** Resolve missing chat options in Amazon Q chat interface.

packages/amazonq/CHANGELOG.md

@@ -2,7 +2,7 @@
     "name": "amazon-q-vscode",
     "displayName": "Amazon Q",
     "description": "The most capable generative AI-powered assistant for building, operating, and transforming software, with advanced capabilities for managing data and AI",
-    "version": "1.79.0-SNAPSHOT",
+    "version": "1.80.0-SNAPSHOT",
     "extensionKind": [
         "workspace"
     ],
@@ -828,6 +828,18 @@
                 "command": "aws.amazonq.clearCache",
                 "title": "%AWS.amazonq.clearCache%",
                 "category": "%AWS.amazonq.title%"
+            },
+            {
+                "command": "aws.amazonq.inline.acceptEdit",
+                "title": "%aws.amazonq.inline.acceptEdit%"
+            },
+            {
+                "command": "aws.amazonq.inline.rejectEdit",
+                "title": "%aws.amazonq.inline.rejectEdit%"
+            },
+            {
+                "command": "aws.amazonq.toggleNextEditPredictionPanel",
+                "title": "%aws.amazonq.toggleNextEditPredictionPanel%"
             }
         ],
         "keybindings": [
@@ -837,6 +849,18 @@
                 "mac": "cmd+alt+i",
                 "linux": "meta+alt+i"
             },
+            {
+                "command": "aws.amazonq.inline.debugAcceptEdit",
+                "key": "ctrl+alt+a",
+                "mac": "cmd+alt+a",
+                "when": "editorTextFocus"
+            },
+            {
+                "command": "aws.amazonq.inline.debugRejectEdit",
+                "key": "ctrl+alt+r",
+                "mac": "cmd+alt+r",
+                "when": "editorTextFocus"
+            },
             {
                 "command": "aws.amazonq.explainCode",
                 "win": "win+alt+e",
@@ -917,6 +941,16 @@
                 "command": "aws.amazonq.inline.waitForUserDecisionRejectAll",
                 "key": "escape",
                 "when": "editorTextFocus && aws.codewhisperer.connected && amazonq.inline.codelensShortcutEnabled"
+            },
+            {
+                "command": "aws.amazonq.inline.acceptEdit",
+                "key": "tab",
+                "when": "editorTextFocus && aws.amazonq.editSuggestionActive"
+            },
+            {
+                "command": "aws.amazonq.inline.rejectEdit",
+                "key": "escape",
+                "when": "editorTextFocus && aws.amazonq.editSuggestionActive"
             }
         ],
         "icons": {

packages/amazonq/package.json

@@ -0,0 +1,142 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+// TODO: deprecate this file in favor of core/shared/utils/diffUtils
+import { applyPatch } from 'diff'
+
+export type LineDiff =
+    | { type: 'added'; content: string }
+    | { type: 'removed'; content: string }
+    | { type: 'modified'; before: string; after: string }
+
+/**
+ * Apply a unified diff to original code to generate modified code
+ * @param originalCode The original code as a string
+ * @param unifiedDiff The unified diff content
+ * @returns The modified code after applying the diff
+ */
+export function applyUnifiedDiff(
+    docText: string,
+    unifiedDiff: string
+): { appliedCode: string; addedCharacterCount: number; deletedCharacterCount: number } {
+    try {
+        const { addedCharacterCount, deletedCharacterCount } = getAddedAndDeletedCharCount(unifiedDiff)
+        // First try the standard diff package
+        try {
+            const result = applyPatch(docText, unifiedDiff)
+            if (result !== false) {
+                return {
+                    appliedCode: result,
+                    addedCharacterCount: addedCharacterCount,
+                    deletedCharacterCount: deletedCharacterCount,
+                }
+            }
+        } catch (error) {}
+
+        // Parse the unified diff to extract the changes
+        const diffLines = unifiedDiff.split('\n')
+        let result = docText
+
+        // Find all hunks in the diff
+        const hunkStarts = diffLines
+            .map((line, index) => (line.startsWith('@@ ') ? index : -1))
+            .filter((index) => index !== -1)
+
+        // Process each hunk
+        for (const hunkStart of hunkStarts) {
+            // Parse the hunk header
+            const hunkHeader = diffLines[hunkStart]
+            const match = hunkHeader.match(/@@ -(\d+),(\d+) \+(\d+),(\d+) @@/)
+
+            if (!match) {
+                continue
+            }
+
+            const oldStart = parseInt(match[1])
+            const oldLines = parseInt(match[2])
+
+            // Extract the content lines for this hunk
+            let i = hunkStart + 1
+            const contentLines = []
+            while (i < diffLines.length && !diffLines[i].startsWith('@@')) {
+                contentLines.push(diffLines[i])
+                i++
+            }
+
+            // Build the old and new text
+            let oldText = ''
+            let newText = ''
+
+            for (const line of contentLines) {
+                if (line.startsWith('-')) {
+                    oldText += line.substring(1) + '\n'
+                } else if (line.startsWith('+')) {
+                    newText += line.substring(1) + '\n'
+                } else if (line.startsWith(' ')) {
+                    oldText += line.substring(1) + '\n'
+                    newText += line.substring(1) + '\n'
+                }
+            }
+
+            // Remove trailing newline if it was added
+            oldText = oldText.replace(/\n$/, '')
+            newText = newText.replace(/\n$/, '')
+
+            // Find the text to replace in the document
+            const docLines = docText.split('\n')
+            const startLine = oldStart - 1 // Convert to 0-based
+            const endLine = startLine + oldLines
+
+            // Extract the text that should be replaced
+            const textToReplace = docLines.slice(startLine, endLine).join('\n')
+
+            // Replace the text
+            result = result.replace(textToReplace, newText)
+        }
+        return {
+            appliedCode: result,
+            addedCharacterCount: addedCharacterCount,
+            deletedCharacterCount: deletedCharacterCount,
+        }
+    } catch (error) {
+        return {
+            appliedCode: docText, // Return original text if all methods fail
+            addedCharacterCount: 0,
+            deletedCharacterCount: 0,
+        }
+    }
+}
+
+export function getAddedAndDeletedCharCount(diff: string): {
+    addedCharacterCount: number
+    deletedCharacterCount: number
+} {
+    let addedCharacterCount = 0
+    let deletedCharacterCount = 0
+    let i = 0
+    const lines = diff.split('\n')
+    while (i < lines.length) {
+        const line = lines[i]
+        if (line.startsWith('+') && !line.startsWith('+++')) {
+            addedCharacterCount += line.length - 1
+        } else if (line.startsWith('-') && !line.startsWith('---')) {
+            const removedLine = line.substring(1)
+            deletedCharacterCount += removedLine.length
+
+            // Check if this is a modified line rather than a pure deletion
+            const nextLine = lines[i + 1]
+            if (nextLine && nextLine.startsWith('+') && !nextLine.startsWith('+++') && nextLine.includes(removedLine)) {
+                // This is a modified line, not a pure deletion
+                // We've already counted the deletion, so we'll just increment i to skip the next line
+                // since we'll process the addition on the next iteration
+                i += 1
+            }
+        }
+        i += 1
+    }
+    return {
+        addedCharacterCount,
+        deletedCharacterCount,
+    }
+}