Merge branch 'master' into feature/stepfunctions-execution

Zelin Zhou · Zelin Zhou · commit 67c62af839c6 · 2025-10-06T12:02:14.000-07:00
diff --git a/.github/workflows/setup-release-candidate.yml b/.github/workflows/setup-release-candidate.yml
@@ -31,6 +31,12 @@ jobs:
               run: |
                   echo "BRANCH_NAME=release/rc-$(date +%Y%m%d)" >> $GITHUB_OUTPUT
 
+            - name: Install dependencies
+              run: npm ci
+
+            - name: Generate license attribution
+              run: npm run scan-licenses
+
             - name: Create RC Branch
               env:
                   BRANCH_NAME: ${{ steps.branch-name.outputs.BRANCH_NAME }}
@@ -41,5 +47,9 @@ jobs:
                   # Create RC branch from specified commit
                   git checkout -b $BRANCH_NAME
 
+                  # Add generated license files
+                  git add LICENSE-THIRD-PARTY
+                  git commit -m "Update third-party license attribution for $BRANCH_NAME"
+
                   # Push RC branch
                   git push origin $BRANCH_NAME
diff --git a/.gitignore b/.gitignore
@@ -57,3 +57,6 @@ packages/*/resources/css/icons.css
 
 # Created by `npm run webRun` when testing extension in web mode
 .vscode-test-web
+
+# License scanning output
+licenses-full.json
diff --git a/LICENSE-THIRD-PARTY b/LICENSE-THIRD-PARTY
diff --git a/README.md b/README.md
@@ -56,6 +56,22 @@ We want your feedback!
 -   [File an issue](https://github.com/aws/aws-toolkit-vscode/issues/new?labels=bug&template=bug_report.md)
 -   Or [send a pull request](CONTRIBUTING.md)!
 
+## License Scanning
+
+To generate license reports and attribution documents for third-party dependencies:
+
+```bash
+npm run scan-licenses
+
+# Or run directly
+./scripts/scan-licenses.sh
+```
+
+This generates:
+
+-   `LICENSE-THIRD-PARTY` - Attribution document for distribution
+-   `licenses-full.json` - Complete license data
+
 ## License
 
 This project and the subprojects within **(AWS Toolkit for Visual Studio Code, Amazon Q for Visual Studio Code)** is distributed under the [Apache License, Version 2.0](https://www.apache.org/licenses/LICENSE-2.0).
diff --git a/package.json b/package.json
@@ -38,7 +38,8 @@
         "reset": "npm run clean && ts-node ./scripts/clean.ts node_modules && npm install",
         "generateNonCodeFiles": "npm run generateNonCodeFiles -w packages/ --if-present",
         "mergeReports": "ts-node ./scripts/mergeReports.ts",
-        "skippedTestReport": "ts-node ./scripts/skippedTestReport.ts ./packages/amazonq/test/e2e/"
+        "skippedTestReport": "ts-node ./scripts/skippedTestReport.ts ./packages/amazonq/test/e2e/",
+        "scan-licenses": "ts-node ./scripts/scan-licenses.ts"
     },
     "devDependencies": {
         "@aws-toolkits/telemetry": "^1.0.329",
diff --git a/packages/amazonq/src/app/inline/EditRendering/displayImage.ts b/packages/amazonq/src/app/inline/EditRendering/displayImage.ts
@@ -136,10 +136,11 @@ export class EditDecorationManager {
         newCode: string,
         originalCodeHighlightRanges: Array<{ line: number; start: number; end: number }>
     ): Promise<void> {
-        await this.clearDecorations(editor)
-
-        await setContext('aws.amazonq.editSuggestionActive' as any, true)
-        EditSuggestionState.setEditSuggestionActive(true)
+        // Clear old decorations but don't reset state (state is already set in displaySvgDecoration)
+        editor.setDecorations(this.imageDecorationType, [])
+        editor.setDecorations(this.removedCodeDecorationType, [])
+        this.currentImageDecoration = undefined
+        this.currentRemovedCodeDecorations = []
 
         this.acceptHandler = onAccept
         this.rejectHandler = onReject
@@ -313,8 +314,16 @@ export async function displaySvgDecoration(
 ) {
     const originalCode = editor.document.getText()
 
+    // Set edit state immediately to prevent race condition with completion requests
+    await setContext('aws.amazonq.editSuggestionActive' as any, true)
+    EditSuggestionState.setEditSuggestionActive(true)
+
     // Check if a completion suggestion is currently active - if so, discard edit suggestion
     if (inlineCompletionProvider && (await inlineCompletionProvider.isCompletionActive())) {
+        // Clean up state since we're not showing the edit
+        await setContext('aws.amazonq.editSuggestionActive' as any, false)
+        EditSuggestionState.setEditSuggestionActive(false)
+
         // Emit DISCARD telemetry for edit suggestion that can't be shown due to active completion
         const params = createDiscardTelemetryParams(session, item)
         languageClient.sendNotification('aws/logInlineCompletionSessionResults', params)
@@ -326,6 +335,10 @@ export async function displaySvgDecoration(
 
     const isPatchValid = applyPatch(editor.document.getText(), item.insertText as string)
     if (!isPatchValid) {
+        // Clean up state since we're not showing the edit
+        await setContext('aws.amazonq.editSuggestionActive' as any, false)
+        EditSuggestionState.setEditSuggestionActive(false)
+
         const params = createDiscardTelemetryParams(session, item)
         // TODO: this session is closed on flare side hence discarded is not emitted in flare
         languageClient.sendNotification('aws/logInlineCompletionSessionResults', params)
diff --git a/packages/amazonq/src/app/inline/recommendationService.ts b/packages/amazonq/src/app/inline/recommendationService.ts
@@ -145,7 +145,7 @@ export class RecommendationService {
              * Completions use PartialResultToken with single 1 call of [getAllRecommendations].
              * Edits leverage partialResultToken to achieve EditStreak such that clients can pull all continuous suggestions generated by the model within 1 EOS block.
              */
-            if (!isTriggerByDeletion && !request.partialResultToken) {
+            if (!isTriggerByDeletion && !request.partialResultToken && !EditSuggestionState.isEditSuggestionActive()) {
                 const completionPromise: Promise<InlineCompletionListWithReferences> = languageClient.sendRequest(
                     inlineCompletionWithReferencesRequestType.method,
                     request,
@@ -196,6 +196,9 @@ export class RecommendationService {
             })
 
             if (result.items.length > 0 && result.items[0].isInlineEdit === false) {
+                if (isTriggerByDeletion) {
+                    return []
+                }
                 // Completion will not be rendered if an edit suggestion has been active for longer than 1 second
                 if (EditSuggestionState.isEditSuggestionDisplayingOverOneSecond()) {
                     const session = this.sessionManager.getActiveSession()
diff --git a/packages/amazonq/test/unit/amazonq/apps/inline/recommendationService.test.ts b/packages/amazonq/test/unit/amazonq/apps/inline/recommendationService.test.ts
@@ -333,7 +333,7 @@ describe('RecommendationService', () => {
             }
         })
 
-        it('should make completion request when edit suggestion is active', async () => {
+        it('should not make completion request when edit suggestion is active', async () => {
             // Mock EditSuggestionState to return true (edit suggestion is active)
             sandbox.stub(EditSuggestionState, 'isEditSuggestionActive').returns(true)
 
@@ -360,13 +360,15 @@ describe('RecommendationService', () => {
             const completionCalls = cs.filter((c) => c.firstArg === completionApi)
             const editCalls = cs.filter((c) => c.firstArg === editApi)
 
-            assert.strictEqual(cs.length, 2) // Only edit call
-            assert.strictEqual(completionCalls.length, 1) // No completion calls
+            assert.strictEqual(cs.length, 1) // Only edit call
+            assert.strictEqual(completionCalls.length, 0) // No completion calls
             assert.strictEqual(editCalls.length, 1) // One edit call
         })
 
         it('should make completion request when edit suggestion is not active', async () => {
             // Mock EditSuggestionState to return false (no edit suggestion active)
+            sandbox.stub(EditSuggestionState, 'isEditSuggestionActive').returns(false)
+
             const mockResult = {
                 sessionId: 'test-session',
                 items: [mockInlineCompletionItemOne],
diff --git a/packages/core/src/amazonqGumby/chat/controller/controller.ts b/packages/core/src/amazonqGumby/chat/controller/controller.ts
@@ -580,11 +580,11 @@ export class GumbyController {
             return
         }
         const fileContents = await fs.readFileText(fileUri[0].fsPath)
-        const missingKey = await validateCustomVersionsFile(fileContents)
+        const errorMessage = validateCustomVersionsFile(fileContents)
 
-        if (missingKey) {
+        if (errorMessage) {
             this.messenger.sendMessage(
-                CodeWhispererConstants.invalidCustomVersionsFileMessage(missingKey),
+                CodeWhispererConstants.invalidCustomVersionsFileMessage(errorMessage),
                 message.tabID,
                 'ai-prompt'
             )
diff --git a/packages/core/src/codewhisperer/models/constants.ts b/packages/core/src/codewhisperer/models/constants.ts
@@ -588,8 +588,8 @@ export const invalidMetadataFileUnsupportedSourceDB =
 export const invalidMetadataFileUnsupportedTargetDB =
     'I can only convert SQL for migrations to Aurora PostgreSQL or Amazon RDS for PostgreSQL target databases. The provided .sct file indicates another target database for this migration.'
 
-export const invalidCustomVersionsFileMessage = (missingKey: string) =>
-    `The dependency upgrade file provided is missing required field \`${missingKey}\`. Check that it is configured properly and try again. For an example of the required dependency upgrade file format, see the [documentation](https://docs.aws.amazon.com/amazonq/latest/qdeveloper-ug/code-transformation.html#dependency-upgrade-file).`
+export const invalidCustomVersionsFileMessage = (errorMessage: string) =>
+    `The dependency upgrade file provided is malformed: ${errorMessage}. Check that it is configured properly and try again. For an example of the required dependency upgrade file format, see the [documentation](https://docs.aws.amazon.com/amazonq/latest/qdeveloper-ug/code-transformation.html#dependency-upgrade-file).`
 
 export const invalidMetadataFileErrorParsing =
     "It looks like the .sct file you provided isn't valid. Make sure that you've uploaded the .zip file you retrieved from your schema conversion in AWS DMS."
diff --git a/packages/core/src/codewhisperer/service/transformByQ/transformFileHandler.ts b/packages/core/src/codewhisperer/service/transformByQ/transformFileHandler.ts
@@ -6,6 +6,7 @@
 import * as vscode from 'vscode'
 import * as path from 'path'
 import * as os from 'os'
+import * as YAML from 'js-yaml'
 import xml2js = require('xml2js')
 import * as CodeWhispererConstants from '../../models/constants'
 import { existsSync, readFileSync, writeFileSync } from 'fs' // eslint-disable-line no-restricted-imports
@@ -119,15 +120,52 @@ export async function parseBuildFile() {
     return undefined
 }
 
-// return the first missing key in the custom versions file, or undefined if all required keys are present
-export async function validateCustomVersionsFile(fileContents: string) {
+// return an error message, or undefined if YAML file is valid
+export function validateCustomVersionsFile(fileContents: string) {
     const requiredKeys = ['dependencyManagement', 'identifier', 'targetVersion', 'originType']
     for (const key of requiredKeys) {
         if (!fileContents.includes(key)) {
             getLogger().info(`CodeTransformation: .YAML file is missing required key: ${key}`)
-            return key
+            return `Missing required key: \`${key}\``
         }
     }
+    try {
+        const yaml = YAML.load(fileContents) as any
+        const dependencies = yaml?.dependencyManagement?.dependencies || []
+        const plugins = yaml?.dependencyManagement?.plugins || []
+        const dependenciesAndPlugins = dependencies.concat(plugins)
+
+        if (dependenciesAndPlugins.length === 0) {
+            getLogger().info('CodeTransformation: .YAML file must contain at least dependencies or plugins')
+            return `YAML file must contain at least \`dependencies\` or \`plugins\` under \`dependencyManagement\``
+        }
+        for (const item of dependenciesAndPlugins) {
+            const errorMessage = validateItem(item)
+            if (errorMessage) {
+                return errorMessage
+            }
+        }
+        return undefined
+    } catch (err: any) {
+        getLogger().info(`CodeTransformation: Invalid YAML format: ${err.message}`)
+        return `Invalid YAML format: ${err.message}`
+    }
+}
+
+// return an error message, or undefined if item is valid
+function validateItem(item: any, validOriginTypes: string[] = ['FIRST_PARTY', 'THIRD_PARTY']) {
+    if (!/^[^\s:]+:[^\s:]+$/.test(item.identifier)) {
+        getLogger().info(`CodeTransformation: Invalid identifier format: ${item.identifier}`)
+        return `Invalid identifier format: \`${item.identifier}\`. Must be in format \`groupId:artifactId\` without spaces`
+    }
+    if (!validOriginTypes.includes(item.originType)) {
+        getLogger().info(`CodeTransformation: Invalid originType: ${item.originType}`)
+        return `Invalid originType: \`${item.originType}\`. Must be either \`FIRST_PARTY\` or \`THIRD_PARTY\``
+    }
+    if (!item.targetVersion?.trim()) {
+        getLogger().info(`CodeTransformation: Missing targetVersion in: ${item.identifier}`)
+        return `Missing \`targetVersion\` in: \`${item.identifier}\``
+    }
     return undefined
 }
 
diff --git a/packages/core/src/test/codewhisperer/commands/transformByQ.test.ts b/packages/core/src/test/codewhisperer/commands/transformByQ.test.ts
@@ -67,7 +67,8 @@ dependencyManagement:
   plugins:
     - identifier: "com.example:plugin"
       targetVersion: "1.2.0"
-      versionProperty: "plugin.version"  # Optional`
+      versionProperty: "plugin.version"  # Optional
+      originType: "FIRST_PARTY" # or "THIRD_PARTY"`
 
     const validSctFile = `<?xml version="1.0" encoding="UTF-8"?>
     <tree>
@@ -570,15 +571,39 @@ dependencyManagement:
         assert.strictEqual(expectedWarning, warningMessage)
     })
 
-    it(`WHEN validateCustomVersionsFile on fully valid .yaml file THEN passes validation`, async function () {
-        const missingKey = await validateCustomVersionsFile(validCustomVersionsFile)
-        assert.strictEqual(missingKey, undefined)
+    it(`WHEN validateCustomVersionsFile on fully valid .yaml file THEN passes validation`, function () {
+        const errorMessage = validateCustomVersionsFile(validCustomVersionsFile)
+        assert.strictEqual(errorMessage, undefined)
     })
 
-    it(`WHEN validateCustomVersionsFile on invalid .yaml file THEN fails validation`, async function () {
+    it(`WHEN validateCustomVersionsFile on .yaml file with missing key THEN fails validation`, function () {
         const invalidFile = validCustomVersionsFile.replace('dependencyManagement', 'invalidKey')
-        const missingKey = await validateCustomVersionsFile(invalidFile)
-        assert.strictEqual(missingKey, 'dependencyManagement')
+        const errorMessage = validateCustomVersionsFile(invalidFile)
+        assert.strictEqual(errorMessage, `Missing required key: \`dependencyManagement\``)
+    })
+
+    it(`WHEN validateCustomVersionsFile on .yaml file with invalid identifier format THEN fails validation`, function () {
+        const invalidFile = validCustomVersionsFile.replace('com.example:library1', 'com.example-library1')
+        const errorMessage = validateCustomVersionsFile(invalidFile)
+        assert.strictEqual(
+            errorMessage,
+            `Invalid identifier format: \`com.example-library1\`. Must be in format \`groupId:artifactId\` without spaces`
+        )
+    })
+
+    it(`WHEN validateCustomVersionsFile on .yaml file with invalid originType THEN fails validation`, function () {
+        const invalidFile = validCustomVersionsFile.replace('FIRST_PARTY', 'INVALID_TYPE')
+        const errorMessage = validateCustomVersionsFile(invalidFile)
+        assert.strictEqual(
+            errorMessage,
+            `Invalid originType: \`INVALID_TYPE\`. Must be either \`FIRST_PARTY\` or \`THIRD_PARTY\``
+        )
+    })
+
+    it(`WHEN validateCustomVersionsFile on .yaml file with missing targetVersion THEN fails validation`, function () {
+        const invalidFile = validCustomVersionsFile.replace('targetVersion: "2.1.0"', '')
+        const errorMessage = validateCustomVersionsFile(invalidFile)
+        assert.strictEqual(errorMessage, `Missing \`targetVersion\` in: \`com.example:library1\``)
     })
 
     it(`WHEN validateMetadataFile on fully valid .sct file THEN passes validation`, async function () {
diff --git a/scripts/scan-licenses.sh b/scripts/scan-licenses.sh
@@ -0,0 +1,83 @@
+#!/bin/bash
+banner()
+{
+  echo "*****************************************"
+  echo "**     AWS Toolkit License Scanner     **"
+  echo "*****************************************"
+  echo ""
+}
+
+help()
+{
+    banner
+    echo "Usage: ./scan-licenses.sh"
+    echo ""
+    echo "This script scans the npm dependencies in the current project"
+    echo "and generates license reports and attribution documents."
+    echo ""
+}
+
+gen_attribution(){
+  echo ""
+  echo " == Generating Attribution Document =="
+  npm install -g oss-attribution-generator
+  generate-attribution
+  if [ -d "oss-attribution" ]; then
+    mv oss-attribution/attribution.txt LICENSE-THIRD-PARTY
+    rm -rf oss-attribution
+    echo "Attribution document generated: LICENSE-THIRD-PARTY"
+  else
+    echo "Warning: oss-attribution directory not found"
+  fi
+}
+
+gen_full_license_report(){
+  echo ""
+  echo " == Generating Full License Report =="
+  npm install -g license-checker
+  license-checker --json > licenses-full.json
+  echo "Full license report generated: licenses-full.json"
+}
+
+main()
+{
+  banner
+  
+  # Check if we're in the right directory
+  if [ ! -f "package.json" ]; then
+    echo "Error: package.json not found. Please run this script from the project root."
+    exit 1
+  fi
+  
+  # Check if node_modules exists
+  if [ ! -d "node_modules" ]; then
+    echo "node_modules not found. Running npm install..."
+    npm install
+    if [ $? -ne 0 ]; then
+      echo "Error: npm install failed"
+      exit 1
+    fi
+  fi
+  
+  echo "Scanning licenses for AWS Toolkit VS Code project..."
+  echo "Project root: $(pwd)"
+  echo ""
+  
+  gen_attribution
+  gen_full_license_report
+  
+  echo ""
+  echo "=== License Scan Complete ==="
+  echo "Generated files:"
+  echo "  - LICENSE-THIRD-PARTY (attribution document)"
+  echo "  - licenses-full.json (complete license data)"
+  echo ""
+}
+
+if [ "$1" = "--help" ] || [ "$1" = "-h" ]
+then
+  help
+  exit 0
+else
+  main
+fi
diff --git a/scripts/scan-licenses.ts b/scripts/scan-licenses.ts

Original file line number	Diff line number	Diff line change
`@@ -580,11 +580,11 @@ export class GumbyController {`
`580`	`580`	`return`
`581`	`581`	`}`
`582`	`582`	`const fileContents = await fs.readFileText(fileUri[0].fsPath)`
`583`		`- const missingKey = await validateCustomVersionsFile(fileContents)`
	`583`	`+ const errorMessage = validateCustomVersionsFile(fileContents)`
`584`	`584`
`585`		`- if (missingKey) {`
	`585`	`+ if (errorMessage) {`
`586`	`586`	`this.messenger.sendMessage(`
`587`		`- CodeWhispererConstants.invalidCustomVersionsFileMessage(missingKey),`
	`587`	`+ CodeWhispererConstants.invalidCustomVersionsFileMessage(errorMessage),`
`588`	`588`	`message.tabID,`
`589`	`589`	`'ai-prompt'`
`590`	`590`	`)`