Merge master into feature/ui-e2e-tests

Author: aws-toolkit-automation

package-lock.json

@@ -0,0 +1,10 @@
+{
+	"date": "2025-07-07",
+	"version": "1.82.0",
+	"entries": [
+		{
+			"type": "Bug Fix",
+			"description": "Prompt re-authenticate if auto trigger failed with expired token"
+		}
+	]
+}

packages/amazonq/.changes/1.82.0.json

@@ -1,3 +1,7 @@
+## 1.82.0 2025-07-07
+
+- **Bug Fix** Prompt re-authenticate if auto trigger failed with expired token
+
 ## 1.81.0 2025-07-02
 
 - **Bug Fix** Stop auto inline completion when deleting code

packages/amazonq/.changes/next-release/Bug Fix-da82b914-41c2-4003-8691-73f9ec62cc68.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.82.0-SNAPSHOT",
+    "version": "1.83.0-SNAPSHOT",
     "extensionKind": [
         "workspace"
     ],

packages/amazonq/CHANGELOG.md

@@ -5,9 +5,6 @@
 
 import vscode from 'vscode'
 import { getLogger } from '../logger/logger'
-import { tmpdir } from 'os'
-import { join } from 'path'
-import * as nodefs from 'fs' // eslint-disable-line no-restricted-imports
 
 interface ProxyConfig {
     proxyUrl: string | undefined
@@ -101,41 +98,6 @@ export class ProxyUtil {
             process.env.NODE_EXTRA_CA_CERTS = config.certificateAuthority
             process.env.AWS_CA_BUNDLE = config.certificateAuthority
             this.logger.debug(`Set certificate bundle path: ${config.certificateAuthority}`)
-        } else {
-            // Fallback to system certificates if no custom CA is configured
-            await this.setSystemCertificates()
-        }
-    }
-
-    /**
-     * Sets system certificates as fallback when no custom CA is configured
-     */
-    private static async setSystemCertificates(): Promise<void> {
-        try {
-            const tls = await import('tls')
-            // @ts-ignore Get system certificates
-            const systemCerts = tls.getCACertificates('system')
-            // @ts-ignore Get any existing extra certificates
-            const extraCerts = tls.getCACertificates('extra')
-            const allCerts = [...systemCerts, ...extraCerts]
-            if (allCerts && allCerts.length > 0) {
-                this.logger.debug(`Found ${allCerts.length} certificates in system's trust store`)
-
-                const tempDir = join(tmpdir(), 'aws-toolkit-vscode')
-                if (!nodefs.existsSync(tempDir)) {
-                    nodefs.mkdirSync(tempDir, { recursive: true })
-                }
-
-                const certPath = join(tempDir, 'vscode-ca-certs.pem')
-                const certContent = allCerts.join('\n')
-
-                nodefs.writeFileSync(certPath, certContent)
-                process.env.NODE_EXTRA_CA_CERTS = certPath
-                process.env.AWS_CA_BUNDLE = certPath
-                this.logger.debug(`Set system certificate bundle path: ${certPath}`)
-            }
-        } catch (err) {
-            this.logger.error(`Failed to extract system certificates: ${err}`)
         }
     }
 }