Merge branch 'feature/ui-e2e-tests' into basic-chat-test

surajrdy-aws · web-flow · commit 57a6ba976105 · 2025-08-13T11:20:54.000-04:00
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -12,7 +12,7 @@ on:
                 required: false
                 default: prerelease
     push:
-        branches: [master, feature/*]
+        branches: [master, feature/*, release/*]
         # tags:
         #   - v[0-9]+.[0-9]+.[0-9]+
 
@@ -40,12 +40,16 @@ jobs:
             #   run: echo 'TAG_NAME=prerelease' >> $GITHUB_ENV
             - if: github.event_name == 'workflow_dispatch'
               run: echo "TAG_NAME=${{ github.event.inputs.tag_name }}" >> $GITHUB_ENV
-            - if: github.ref_name != 'master'
+            - if: startsWith(github.ref_name, 'feature/')
               run: |
-                  TAG_NAME=${{ github.ref_name }}
-                  FEAT_NAME=$(echo $TAG_NAME | sed 's/feature\///')
+                  FEAT_NAME=$(echo ${{ github.ref_name }} | sed 's/feature\///')
                   echo "FEAT_NAME=$FEAT_NAME" >> $GITHUB_ENV
                   echo "TAG_NAME=pre-$FEAT_NAME" >> $GITHUB_ENV
+            - if: startsWith(github.ref_name, 'release/')
+              run: |
+                  RC_NAME=$(echo ${{ github.ref_name }} | sed 's/release\///')
+                  echo "FEAT_NAME=" >> $GITHUB_ENV
+                  echo "TAG_NAME=$RC_NAME" >> $GITHUB_ENV
             - if: github.ref_name == 'master'
               run: |
                   echo "FEAT_NAME=" >> $GITHUB_ENV
@@ -105,10 +109,14 @@ jobs:
             - uses: actions/checkout@v4
             - uses: actions/download-artifact@v4
             - name: Delete existing prerelease
-              # "prerelease" (main branch) or "pre-<feature>"
-              if: "env.TAG_NAME == 'prerelease' || startsWith(env.TAG_NAME, 'pre-')"
+              # "prerelease" (main branch), "pre-<feature>", or "rc-<date>"
+              if: env.TAG_NAME == 'prerelease' || startsWith(env.TAG_NAME, 'pre-') || startsWith(env.TAG_NAME, 'rc-')
               run: |
-                  echo "SUBJECT=AWS IDE Extensions: ${FEAT_NAME:-${TAG_NAME}}" >> $GITHUB_ENV
+                  if [[ "$TAG_NAME" == rc-* ]]; then
+                    echo "SUBJECT=AWS IDE Extensions Release Candidate: ${TAG_NAME#rc-}" >> $GITHUB_ENV
+                  else
+                    echo "SUBJECT=AWS IDE Extensions: ${FEAT_NAME:-${TAG_NAME}}" >> $GITHUB_ENV
+                  fi
                   gh release delete "$TAG_NAME" --cleanup-tag --yes || true
                   # git push origin :"$TAG_NAME" || true
             - name: Publish Prerelease
diff --git a/.github/workflows/setup-release-candidate.yml b/.github/workflows/setup-release-candidate.yml
@@ -0,0 +1,45 @@
+name: Setup Release Candidate
+
+on:
+    workflow_dispatch:
+        inputs:
+            commitId:
+                description: 'Commit ID to create RC from'
+                required: true
+                type: string
+
+jobs:
+    setup-rc:
+        runs-on: ubuntu-latest
+        permissions:
+            contents: write
+        steps:
+            - uses: actions/checkout@v4
+              with:
+                  ref: ${{ inputs.commitId }}
+                  token: ${{ secrets.GITHUB_TOKEN }}
+                  persist-credentials: true
+
+            - name: Setup Node.js
+              uses: actions/setup-node@v4
+              with:
+                  node-version: '18'
+                  cache: 'npm'
+
+            - name: Generate Branch Name
+              id: branch-name
+              run: |
+                  echo "BRANCH_NAME=release/rc-$(date +%Y%m%d)" >> $GITHUB_OUTPUT
+
+            - name: Create RC Branch
+              env:
+                  BRANCH_NAME: ${{ steps.branch-name.outputs.BRANCH_NAME }}
+              run: |
+                  git config user.name "aws-toolkit-automation"
+                  git config user.email "<>"
+
+                  # Create RC branch from specified commit
+                  git checkout -b $BRANCH_NAME
+
+                  # Push RC branch
+                  git push origin $BRANCH_NAME
diff --git a/packages/amazonq/src/app/inline/EditRendering/displayImage.ts b/packages/amazonq/src/app/inline/EditRendering/displayImage.ts
@@ -16,6 +16,8 @@ import { EditSuggestionState } from '../editSuggestionState'
 import type { AmazonQInlineCompletionItemProvider } from '../completion'
 import { vsCodeState } from 'aws-core-vscode/codewhisperer'
 
+const autoRejectEditCursorDistance = 25
+
 export class EditDecorationManager {
     private imageDecorationType: vscode.TextEditorDecorationType
     private removedCodeDecorationType: vscode.TextEditorDecorationType
@@ -346,6 +348,19 @@ export async function displaySvgDecoration(
             void vscode.commands.executeCommand('aws.amazonq.inline.rejectEdit')
         }
     })
+    const cursorChangeListener = vscode.window.onDidChangeTextEditorSelection((e) => {
+        if (!EditSuggestionState.isEditSuggestionActive()) {
+            return
+        }
+        if (e.textEditor !== editor) {
+            return
+        }
+        const currentPosition = e.selections[0].active
+        const distance = Math.abs(currentPosition.line - startLine)
+        if (distance > autoRejectEditCursorDistance) {
+            void vscode.commands.executeCommand('aws.amazonq.inline.rejectEdit')
+        }
+    })
     await decorationManager.displayEditSuggestion(
         editor,
         svgImage,
@@ -371,6 +386,7 @@ export async function displaySvgDecoration(
 
             await decorationManager.clearDecorations(editor)
             documentChangeListener.dispose()
+            cursorChangeListener.dispose()
             const params: LogInlineCompletionSessionResultsParams = {
                 sessionId: session.sessionId,
                 completionSessionResult: {
@@ -405,6 +421,7 @@ export async function displaySvgDecoration(
             getLogger().info('Edit suggestion rejected')
             await decorationManager.clearDecorations(editor)
             documentChangeListener.dispose()
+            cursorChangeListener.dispose()
             const params: LogInlineCompletionSessionResultsParams = {
                 sessionId: session.sessionId,
                 completionSessionResult: {
diff --git a/packages/amazonq/test/unit/amazonq/apps/inline/recommendationService.test.ts b/packages/amazonq/test/unit/amazonq/apps/inline/recommendationService.test.ts
@@ -129,6 +129,9 @@ describe('RecommendationService', () => {
 
     describe('getAllRecommendations', () => {
         it('should handle single request with no partial result token', async () => {
+            // Mock EditSuggestionState to return false (no edit suggestion active)
+            sandbox.stub(EditSuggestionState, 'isEditSuggestionActive').returns(false)
+
             const mockFirstResult = {
                 sessionId: 'test-session',
                 items: [mockInlineCompletionItemOne],
@@ -172,6 +175,9 @@ describe('RecommendationService', () => {
         })
 
         it('should handle multiple request with partial result token', async () => {
+            // Mock EditSuggestionState to return false (no edit suggestion active)
+            sandbox.stub(EditSuggestionState, 'isEditSuggestionActive').returns(false)
+
             const mockFirstResult = {
                 sessionId: 'test-session',
                 items: [mockInlineCompletionItemOne],
diff --git a/packages/amazonq/test/unit/app/inline/EditRendering/displayImage.test.ts b/packages/amazonq/test/unit/app/inline/EditRendering/displayImage.test.ts
@@ -6,7 +6,30 @@
 import * as vscode from 'vscode'
 import * as sinon from 'sinon'
 import assert from 'assert'
-import { EditDecorationManager } from '../../../../../src/app/inline/EditRendering/displayImage'
+import { EditDecorationManager, displaySvgDecoration } from '../../../../../src/app/inline/EditRendering/displayImage'
+import { EditSuggestionState } from '../../../../../src/app/inline/editSuggestionState'
+
+// Shared helper function to create common stubs
+function createCommonStubs(sandbox: sinon.SinonSandbox) {
+    const documentStub = {
+        getText: sandbox.stub().returns('Original code content'),
+        uri: vscode.Uri.file('/test/file.ts'),
+        lineAt: sandbox.stub().returns({
+            text: 'Line text content',
+            range: new vscode.Range(0, 0, 0, 18),
+            rangeIncludingLineBreak: new vscode.Range(0, 0, 0, 19),
+            firstNonWhitespaceCharacterIndex: 0,
+            isEmptyOrWhitespace: false,
+        }),
+    } as unknown as sinon.SinonStubbedInstance<vscode.TextDocument>
+
+    const editorStub = {
+        document: documentStub,
+        setDecorations: sandbox.stub(),
+    } as unknown as sinon.SinonStubbedInstance<vscode.TextEditor>
+
+    return { documentStub, editorStub }
+}
 
 describe('EditDecorationManager', function () {
     let sandbox: sinon.SinonSandbox
@@ -25,23 +48,13 @@ describe('EditDecorationManager', function () {
             dispose: sandbox.stub(),
         } as unknown as sinon.SinonStubbedInstance<vscode.TextEditorDecorationType>
 
-        documentStub = {
-            getText: sandbox.stub().returns('Original code content'),
-            lineCount: 5,
-            lineAt: sandbox.stub().returns({
-                text: 'Line text content',
-                range: new vscode.Range(0, 0, 0, 18),
-                rangeIncludingLineBreak: new vscode.Range(0, 0, 0, 19),
-                firstNonWhitespaceCharacterIndex: 0,
-                isEmptyOrWhitespace: false,
-            }),
-        } as unknown as sinon.SinonStubbedInstance<vscode.TextDocument>
-
-        editorStub = {
-            document: documentStub,
-            setDecorations: sandbox.stub(),
-            edit: sandbox.stub().resolves(true),
-        } as unknown as sinon.SinonStubbedInstance<vscode.TextEditor>
+        const commonStubs = createCommonStubs(sandbox)
+        documentStub = commonStubs.documentStub
+        editorStub = commonStubs.editorStub
+
+        // Add additional properties needed for this test suite - extend the stub objects
+        Object.assign(documentStub, { lineCount: 5 })
+        Object.assign(editorStub, { edit: sandbox.stub().resolves(true) })
 
         windowStub = sandbox.stub(vscode.window)
         windowStub.createTextEditorDecorationType.returns(decorationTypeStub as any)
@@ -174,3 +187,124 @@ describe('EditDecorationManager', function () {
         sinon.assert.calledWith(editorStub.setDecorations.secondCall, manager['removedCodeDecorationType'], [])
     })
 })
+
+describe('displaySvgDecoration cursor distance auto-reject', function () {
+    let sandbox: sinon.SinonSandbox
+    let editorStub: sinon.SinonStubbedInstance<vscode.TextEditor>
+    let windowStub: sinon.SinonStub
+    let commandsStub: sinon.SinonStub
+    let editSuggestionStateStub: sinon.SinonStub
+    let onDidChangeTextEditorSelectionStub: sinon.SinonStub
+    let selectionChangeListener: (e: vscode.TextEditorSelectionChangeEvent) => void
+
+    // Helper function to setup displaySvgDecoration
+    async function setupDisplaySvgDecoration(startLine: number) {
+        return await displaySvgDecoration(
+            editorStub as unknown as vscode.TextEditor,
+            vscode.Uri.parse('data:image/svg+xml;base64,test'),
+            startLine,
+            'new code',
+            [],
+            {} as any,
+            {} as any,
+            { itemId: 'test', insertText: 'patch' } as any
+        )
+    }
+
+    // Helper function to create selection change event
+    function createSelectionChangeEvent(line: number): vscode.TextEditorSelectionChangeEvent {
+        const position = new vscode.Position(line, 0)
+        const selection = new vscode.Selection(position, position)
+        return {
+            textEditor: editorStub,
+            selections: [selection],
+            kind: vscode.TextEditorSelectionChangeKind.Mouse,
+        } as vscode.TextEditorSelectionChangeEvent
+    }
+
+    beforeEach(function () {
+        sandbox = sinon.createSandbox()
+
+        const commonStubs = createCommonStubs(sandbox)
+        editorStub = commonStubs.editorStub
+
+        // Mock vscode.window.onDidChangeTextEditorSelection
+        onDidChangeTextEditorSelectionStub = sandbox.stub()
+        onDidChangeTextEditorSelectionStub.returns({ dispose: sandbox.stub() })
+        windowStub = sandbox.stub(vscode.window, 'onDidChangeTextEditorSelection')
+        windowStub.callsFake((callback) => {
+            selectionChangeListener = callback
+            return { dispose: sandbox.stub() }
+        })
+
+        // Mock vscode.commands.executeCommand
+        commandsStub = sandbox.stub(vscode.commands, 'executeCommand')
+
+        // Mock EditSuggestionState
+        editSuggestionStateStub = sandbox.stub(EditSuggestionState, 'isEditSuggestionActive')
+        editSuggestionStateStub.returns(true)
+
+        // Mock other required dependencies
+        sandbox.stub(vscode.workspace, 'onDidChangeTextDocument').returns({ dispose: sandbox.stub() })
+    })
+
+    afterEach(function () {
+        sandbox.restore()
+    })
+
+    it('should not reject when cursor moves less than 25 lines away', async function () {
+        const startLine = 50
+        await setupDisplaySvgDecoration(startLine)
+
+        selectionChangeListener(createSelectionChangeEvent(startLine + 24))
+
+        sinon.assert.notCalled(commandsStub)
+    })
+
+    it('should not reject when cursor moves exactly 25 lines away', async function () {
+        const startLine = 50
+        await setupDisplaySvgDecoration(startLine)
+
+        selectionChangeListener(createSelectionChangeEvent(startLine + 25))
+
+        sinon.assert.notCalled(commandsStub)
+    })
+
+    it('should reject when cursor moves more than 25 lines away', async function () {
+        const startLine = 50
+        await setupDisplaySvgDecoration(startLine)
+
+        selectionChangeListener(createSelectionChangeEvent(startLine + 26))
+
+        sinon.assert.calledOnceWithExactly(commandsStub, 'aws.amazonq.inline.rejectEdit')
+    })
+
+    it('should reject when cursor moves more than 25 lines before the edit', async function () {
+        const startLine = 50
+        await setupDisplaySvgDecoration(startLine)
+
+        selectionChangeListener(createSelectionChangeEvent(startLine - 26))
+
+        sinon.assert.calledOnceWithExactly(commandsStub, 'aws.amazonq.inline.rejectEdit')
+    })
+
+    it('should not reject when edit is near beginning of file and cursor cannot move far enough', async function () {
+        const startLine = 10
+        await setupDisplaySvgDecoration(startLine)
+
+        selectionChangeListener(createSelectionChangeEvent(0))
+
+        sinon.assert.notCalled(commandsStub)
+    })
+
+    it('should not reject when edit suggestion is not active', async function () {
+        editSuggestionStateStub.returns(false)
+
+        const startLine = 50
+        await setupDisplaySvgDecoration(startLine)
+
+        selectionChangeListener(createSelectionChangeEvent(startLine + 100))
+
+        sinon.assert.notCalled(commandsStub)
+    })
+})
