Merge remote-tracking branch 'origin/staging' into HEAD

Author: jpinkney-aws

.changes/next-release/Bug Fix-240f643e-f2f5-4a3b-81bf-477f76429423.json

@@ -0,0 +1,4 @@
+{
+	"type": "Bug Fix",
+	"description": "fix(CodeTransform): Updating commands for copying dependencies"
+}

.changes/next-release/Bug Fix-caa49c08-b446-4349-8228-31b5f00af5e5.json

@@ -0,0 +1,4 @@
+{
+	"type": "Bug Fix",
+	"description": "Amazon Q: Fix code snippet borders, action button border radius, text alignment and overlay UI issues"
+}

.eslintignore

@@ -12,8 +12,8 @@ src/codewhisperer/client/codewhispererclient.d.ts
 src/codewhisperer/client/codewhispereruserclient.d.ts
 src/amazonqFeatureDev/client/featuredevproxyclient.d.ts
 src/testFixtures/**
-packages/toolkit/src/shared/telemetry/clienttelemetry.d.ts
-packages/toolkit/src/codewhisperer/client/codewhispererclient.d.ts
-packages/toolkit/src/codewhisperer/client/codewhispereruserclient.d.ts
-packages/toolkit/src/amazonqFeatureDev/client/featuredevproxyclient.d.ts
-packages/toolkit/src/testFixtures/**
+packages/core/src/shared/telemetry/clienttelemetry.d.ts
+packages/core/src/codewhisperer/client/codewhispererclient.d.ts
+packages/core/src/codewhisperer/client/codewhispereruserclient.d.ts
+packages/core/src/amazonqFeatureDev/client/featuredevproxyclient.d.ts
+packages/core/src/testFixtures/**

.github/CODEOWNERS

@@ -1,5 +1,5 @@
 * @aws/aws-ides-team
-packages/toolkit/src/codewhisperer/ @aws/codewhisperer-team
-packages/toolkit/src/amazonqFeatureDev/ @aws/earlybird
-packages/toolkit/src/codewhispererChat/ @aws/aws-mynah
-packages/toolkit/src/amazonq/ @aws/aws-mynah
+packages/core/src/codewhisperer/ @aws/codewhisperer-team
+packages/core/src/amazonqFeatureDev/ @aws/earlybird
+packages/core/src/codewhispererChat/ @aws/aws-mynah
+packages/core/src/amazonq/ @aws/aws-mynah

.github/dependabot.yml

@@ -7,7 +7,7 @@
 version: 2
 updates:
     - package-ecosystem: 'npm'
-      directory: './packages/toolkit/' # Location of package manifests.
+      directory: './packages/core/' # Location of package manifests.
       target-branch: 'master' # Avoid updates to "staging".
       commit-message:
           prefix: 'deps'
@@ -25,7 +25,7 @@ updates:
                   - '@smithy*'
                   - 'smithy*'
     - package-ecosystem: 'github-actions'
-      directory: './packages/toolkit/'
+      directory: './packages/core/'
       target-branch: 'master' # Avoid updates to "staging".
       commit-message:
           prefix: 'deps'

.gitignore

@@ -19,34 +19,37 @@ __pycache__
 /dependency-graph.svg
 
 # Auto generated definitions
-packages/toolkit/src/**/*.gen.ts
+packages/*/src/**/*.gen.ts
 src.gen/*
+
 # Telemetry definition for testing adding telemetry
-packages/toolkit/src/shared/telemetry/vscodeTelemetry.json
+packages/core/src/shared/telemetry/vscodeTelemetry.json
 
 # Test reports
 .test-reports
 
 # Auto generated type definitions
-packages/toolkit/src/shared/telemetry/clienttelemetry.d.ts
-packages/toolkit/src/codewhisperer/client/codewhispererclient.d.ts
-packages/toolkit/src/codewhisperer/client/codewhispereruserclient.d.ts
-packages/toolkit/src/amazonqFeatureDev/client/featuredevproxyclient.d.ts
+packages/core/src/shared/telemetry/clienttelemetry.d.ts
+packages/core/src/codewhisperer/client/codewhispererclient.d.ts
+packages/core/src/codewhisperer/client/codewhispereruserclient.d.ts
+packages/core/src/amazonqFeatureDev/client/featuredevproxyclient.d.ts
 
 # Generated by tests
-packages/toolkit/src/testFixtures/**/bin
-packages/toolkit/src/testFixtures/**/obj
+packages/core/src/testFixtures/**/bin
+packages/core/src/testFixtures/**/obj
 
 # Generated by copyFiles.ts
 packages/*/README*
 packages/*/CHANGELOG.md
 packages/*/LICENSE
 packages/*/NOTICE
+packages/toolkit/package.nls.json
+packages/toolkit/resources
 
 # Icons
-packages/toolkit/resources/icons/cloud9/generated/**
-packages/toolkit/resources/fonts/aws-toolkit-icons.woff
-packages/toolkit/resources/css/icons.css
+packages/*/resources/icons/cloud9/generated/**
+packages/*/resources/fonts/aws-toolkit-icons.woff
+packages/*/resources/css/icons.css
 
 # local configuration
 .local.env

.prettierignore

@@ -11,5 +11,5 @@ src.gen/**
 src/shared/telemetry/service-2.json
 src/testFixtures/**
 
-packages/toolkit/src/shared/telemetry/service-2.json
-packages/toolkit/src/testFixtures/**
+packages/core/src/shared/telemetry/service-2.json
+packages/core/src/testFixtures/**

CONTRIBUTING.md

@@ -9,8 +9,9 @@ codebase and sending pull requests.
 ## Getting Started
 
 This project is set up as a typescript monorepo. The documentation throughout this project
-is referring to the subproject in [`packages/toolkit/`](./packages/toolkit/). For more information,
-see [ARCHITECTURE.md](./docs/ARCHITECTURE.md#monorepo-structure)
+is referring to the subprojects [`packages/toolkit/`](./packages/toolkit/) and [`packages/core/`](./packages/core/).
+Please see [ARCHITECTURE.md](./docs/ARCHITECTURE.md#monorepo-structure) to understand the
+structure of thispackage before contributing.
 
 ### Find things to do
 
@@ -40,8 +41,8 @@ Then clone the repository and install NPM packages:
 
 ### Run
 
-Due to the monorepo structure of the project, you can run the extension in VSCode by either opening the
-`aws-toolkit-vscode/packages/toolkit` folder directly, or adding it as a root folder in the VSCode Workspace.
+Due to the monorepo structure of the project, you must have the `aws-toolkit-vscode/packages/toolkit` folder open as root folder in the workspace.
+The easiest way to open the project: File > Open Workspace from File > choose `aws-toolkit-vscode/aws-toolkit-vscode.code-workspace`
 
 To run the extension from VSCode as a Node.js app:
 
@@ -161,9 +162,8 @@ See [web.md](./docs/web.md) for working with the web mode implementation of the
 See [TESTPLAN.md](./docs/TESTPLAN.md) to understand the project's test
 structure, mechanics and philosophy.
 
-You can run tests directly from VSCode. Due to the monorepo structure of the project, you must either open
-the `aws-toolkit-vscode/packages/toolkit/` folder directly, or add it as a root folder in the VSCode Workspace.
-Then:
+You can run tests directly from VSCode. Due to the monorepo structure of the project, you must have the `aws-toolkit-vscode/packages/toolkit` folder open as root folder in the workspace.
+The easiest way to open the project: File > Open Workspace from File > choose `aws-toolkit-vscode/aws-toolkit-vscode.code-workspace`
 
 1. Select `View > Debug`, or select the Debug pane from the sidebar.
 2. From the dropdown at the top of the Debug pane, select the `Extension Tests` configuration.

aws-toolkit-vscode.code-workspace

@@ -0,0 +1,19 @@
+{
+	"folders": [
+		{
+			"path": "."
+		},
+		{
+			"path": "packages/core"
+		},
+		{
+			"path": "packages/toolkit"
+		},
+		{
+			"path": "packages/amazonq"
+		}
+	],
+	"settings": {
+		"typescript.tsdk": "node_modules/typescript/lib"
+	}
+}

buildspec/linuxE2ETests.yml

@@ -8,6 +8,11 @@ env:
         AWS_TOOLKIT_TEST_NO_COLOR: '1'
         # Suppress noisy apt-get/dpkg warnings like "debconf: unable to initialize frontend: Dialog").
         DEBIAN_FRONTEND: 'noninteractive'
+        # Required dir overrides, otherwise the test will likely fail due to too long path names.
+        # E.g. WARNING: IPC handle <path> is longer than 107 chars, try a shorter --user-data-dir
+        # followed by Error: Could not delete obsolete instance handle Error: ENOENT: no such file or directory, unlink <path>
+        AWS_TOOLKIT_TEST_CACHE_DIR: '/tmp/.vscode-test/'
+        AWS_TOOLKIT_TEST_USER_DIR: '/tmp/.vscode-test/user-data/'
 
 phases:
     install: